diff --git a/lang/translator.js b/lang/translator.js
index 8a38b687..190f3284 100644
--- a/lang/translator.js
+++ b/lang/translator.js
@@ -17,10 +17,11 @@ window.SwaggerTranslator = {
 
     _words:[],
 
-    translate: function() {
+    translate: function(sel) {
       var $this = this;
+      var sel = sel || '[data-sw-translate]';
 
-      $('[data-sw-translate]').each(function() {
+      $(sel).each(function() {
         $(this).html($this._tryTranslate($(this).html()));
 
         $(this).val($this._tryTranslate($(this).val()));
diff --git a/src/main/html/index.html b/src/main/html/index.html
index a6904d0f..8fe50d02 100644
--- a/src/main/html/index.html
+++ b/src/main/html/index.html
@@ -21,6 +21,11 @@
   <script src='lib/marked.js' type='text/javascript'></script>
   <script src='lib/swagger-oauth.js' type='text/javascript'></script>
 
+  <!-- Some basic translations -->
+  <!-- <script src='lang/translator.js' type='text/javascript'></script> -->
+  <!-- <script src='lang/ru.js' type='text/javascript'></script> -->
+  <!-- <script src='lang/en.js' type='text/javascript'></script> -->
+
   <script type="text/javascript">
     $(function () {
       var url = window.location.search.match(/url=([^&]+)/);
@@ -29,6 +34,11 @@
       } else {
         url = "http://petstore.swagger.io/v2/swagger.json";
       }
+
+      // Pre load translate...
+      if(window.SwaggerTranslator) {
+        window.SwaggerTranslator.translate();
+      }
       window.swaggerUi = new SwaggerUi({
         url: url,
         dom_id: "swagger-ui-container",
@@ -42,6 +52,10 @@
             });
           }
 
+          if(window.SwaggerTranslator) {
+            window.SwaggerTranslator.translate();
+          }
+
           $('pre code').each(function(i, e) {
             hljs.highlightBlock(e)
           });
@@ -91,12 +105,12 @@
     <form id='api_selector'>
       <div class='input'><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text"/></div>
       <div class='input'><input placeholder="api_key" id="input_apiKey" name="apiKey" type="text"/></div>
-      <div class='input'><a id="explore" href="#">Explore</a></div>
+      <div class='input'><a id="explore" href="#" data-sw-translate>Explore</a></div>
     </form>
   </div>
 </div>
 
-<div id="message-bar" class="swagger-ui-wrap">&nbsp;</div>
+<div id="message-bar" class="swagger-ui-wrap" data-sw-translate>&nbsp;</div>
 <div id="swagger-ui-container" class="swagger-ui-wrap"></div>
 </body>
 </html>
diff --git a/src/main/javascript/SwaggerUi.js b/src/main/javascript/SwaggerUi.js
index 2dd795c5..604aa7f8 100644
--- a/src/main/javascript/SwaggerUi.js
+++ b/src/main/javascript/SwaggerUi.js
@@ -173,9 +173,13 @@ window.SwaggerUi = Backbone.Router.extend({
     if (data === undefined) {
       data = '';
     }
-    $('#message-bar').removeClass('message-fail');
-    $('#message-bar').addClass('message-success');
-    $('#message-bar').text(data);
+    var $msgbar = $('#message-bar');
+    $msgbar.removeClass('message-fail');
+    $msgbar.addClass('message-success');
+    $msgbar.html(data);
+    if(window.SwaggerTranslator) {
+      window.SwaggerTranslator.translate($msgbar);
+    }
   },
 
   // shows message in red
diff --git a/src/main/template/apikey_button_view.handlebars b/src/main/template/apikey_button_view.handlebars
index 998f911a..ece59509 100644
--- a/src/main/template/apikey_button_view.handlebars
+++ b/src/main/template/apikey_button_view.handlebars
@@ -1,9 +1,9 @@
 <!--div class='auth_button' id='apikey_button'><img class='auth_icon' alt='apply api key' src='images/apikey.jpeg'></div-->
 <div class='auth_container' id='apikey_container'>
   <div class='key_input_container'>
-    <div class='auth_label'><label for='input_apiKey_entry'>{{keyName}}</label></div>
-    <input placeholder='api_key' class='auth_input' id='input_apiKey_entry' name='apiKey' type='text'/>
-    <div class='auth_submit'><a class='auth_submit_button' id='apply_api_key' href='#''>apply</a></div>
+    <div class='auth_label'>{{keyName}}</div>
+    <input placeholder="api_key" class="auth_input" id="input_apiKey_entry" name="apiKey" type="text"/>
+    <div class='auth_submit'><a class='auth_submit_button' id="apply_api_key" href="#" data-sw-translate>apply</a></div>
   </div>
 </div>
 
diff --git a/src/main/template/basic_auth_button_view.handlebars b/src/main/template/basic_auth_button_view.handlebars
index 13497b88..636ae4e8 100644
--- a/src/main/template/basic_auth_button_view.handlebars
+++ b/src/main/template/basic_auth_button_view.handlebars
@@ -1,9 +1,9 @@
 <div class='auth_button' id='basic_auth_button'><img class='auth_icon' src='images/password.jpeg'></div>
 <div class='auth_container' id='basic_auth_container'>
   <div class='key_input_container'>
-    <div class="auth_label"><label for="input_username">Username</label></div>
+    <div class="auth_label"><label for="input_username" data-sw-translate>Username</label></div>
     <input placeholder="username" class="auth_input" id="input_username" name="username" type="text"/>
-    <div class="auth_label"><label for="password">Password</label></div>
+    <div class="auth_label"><label for="password" data-sw-translate>Password</label></div>
     <input placeholder="password" class="auth_input" id="input_password" name="password" type="password"/>
     <div class='auth_submit'><a class='auth_submit_button' id="apply_basic_auth" href="#">apply</a></div>
   </div>
diff --git a/src/main/template/main.handlebars b/src/main/template/main.handlebars
index 6afa1b67..09efbd4c 100644
--- a/src/main/template/main.handlebars
+++ b/src/main/template/main.handlebars
@@ -6,10 +6,10 @@
   <p>{{externalDocs.description}}</p>
   <a href="{{externalDocs.url}}" target="_blank">{{externalDocs.url}}</a>
   {{/if}}
-  {{#if info.termsOfServiceUrl}}<div class="info_tos"><a href="{{info.termsOfServiceUrl}}">Terms of service</a></div>{{/if}}
-  {{#if info.contact.name}}<div class='info_name'>Created by {{info.contact.name}}</div>{{/if}}
-  {{#if info.contact.url}}<div class='info_url'>See more at <a href="{{info.contact.url}}">{{info.contact.url}}</a></div>{{/if}}
-  {{#if info.contact.email}}<div class='info_email'><a href="mailto:{{info.contact.email}}?subject={{info.title}}">Contact the developer</a></div>{{/if}}
+  {{#if info.termsOfServiceUrl}}<div class="info_tos"><a href="{{info.termsOfServiceUrl}}" data-sw-translate>Terms of service</a></div>{{/if}}
+  {{#if info.contact.name}}<div class='info_name' data-sw-translate>Created by {{info.contact.name}}</div>{{/if}}
+  {{#if info.contact.url}}<div class='info_url' data-sw-translate>See more at <a href="{{info.contact.url}}">{{info.contact.url}}</a></div>{{/if}}
+  {{#if info.contact.email}}<div class='info_email'><a href="mailto:{{info.contact.email}}?subject={{info.title}}" data-sw-translate>Contact the developer</a></div>{{/if}}
   {{#if info.license}}<div class='info_license'><a href='{{info.license.url}}'>{{info.license.name}}</a></div>{{/if}}
   {{/if}}
 </div>
@@ -19,7 +19,7 @@
   <div class="footer">
     <h4 style="color: #999">[ <span style="font-variant: small-caps">base url</span>: {{basePath}}
     {{#if info.version}}
-    , <span style="font-variant: small-caps">api version</span>: {{info.version}}
+  , <span style="font-variant: small-caps" data-sw-translate>api version</span>: {{info.version}}
     {{/if}}]
     {{#if validatorUrl}}
     <span style="float:right"><a href="{{validatorUrl}}/debug?url={{url}}"><img id="validator" src="{{validatorUrl}}?url={{url}}"></a>
diff --git a/src/main/template/operation.handlebars b/src/main/template/operation.handlebars
index 832e1359..a5759b16 100644
--- a/src/main/template/operation.handlebars
+++ b/src/main/template/operation.handlebars
@@ -94,17 +94,17 @@
         <div class='response' style='display:none'>
           <h4>Curl</h4>
           <div class='block curl'></div>
-          <h4>Request URL</h4>
+          <h4 data-sw-translate>Request URL</h4>
           <div class='block request_url'></div>
           {{#if showRequestHeaders}}
-          <h4>Request Headers</h4>
+          <h4 data-sw-translate>Request Headers</h4>
           <div class='block request_headers'></div>
           {{/if}}
-          <h4>Response Body</h4>
+          <h4 data-sw-translate>Response Body</h4>
           <div class='block response_body'></div>
-          <h4>Response Code</h4>
+          <h4 data-sw-translate>Response Code</h4>
           <div class='block response_code'></div>
-          <h4>Response Headers</h4>
+          <h4 data-sw-translate>Response Headers</h4>
           <div class='block response_headers'></div>
         </div>
       </div>
diff --git a/src/main/template/resource.handlebars b/src/main/template/resource.handlebars
index fc912ceb..a9be1ee8 100644
--- a/src/main/template/resource.handlebars
+++ b/src/main/template/resource.handlebars
@@ -4,21 +4,21 @@
   </h2>
   <ul class='options'>
     <li>
-      <a href='#!/{{id}}' id='endpointListTogger_{{id}}' class="toggleEndpointList" data-id="{{id}}">Show/Hide</a>
+      <a href='#!/{{id}}' id='endpointListTogger_{{id}}' class="toggleEndpointList" data-id="{{id}}" data-sw-translate>Show/Hide</a>
     </li>
     <li>
-      <a href='#' class="collapseResource" data-id="{{id}}">
+      <a href='#' class="collapseResource" data-id="{{id}}" data-sw-translate>
         List Operations
       </a>
     </li>
     <li>
-      <a href='#' class="expandResource" data-id="{{id}}">
+      <a href='#' class="expandResource" data-id="{{id}}" data-sw-translate>
         Expand Operations
       </a>
     </li>
     {{#if url}}
     <li>
-      <a href='{{url}}'>Raw</a>
+      <a href='{{url}}' data-sw-translate>Raw</a>
     </li>
     {{/if}}
   </ul>
diff --git a/src/main/template/signature.handlebars b/src/main/template/signature.handlebars
index c1b2920f..bc360376 100644
--- a/src/main/template/signature.handlebars
+++ b/src/main/template/signature.handlebars
@@ -1,7 +1,7 @@
 <div>
 <ul class="signature-nav">
-  <li><a class="description-link" href="#">Model</a></li>
-  <li><a class="snippet-link" href="#">Model Schema</a></li>
+  <li><a class="description-link" href="#" data-sw-translate>Model</a></li>
+  <li><a class="snippet-link" href="#" data-sw-translate>Model Schema</a></li>
 </ul>
 <div>