diff --git a/resources/static/dialog/views/add_email.ejs b/resources/static/dialog/views/add_email.ejs
index d37fd22b40fd64ee3ad5e00746d93757cd6b023d..5edfa50aee6b7973d8046133269b631fd40c991e 100644
--- a/resources/static/dialog/views/add_email.ejs
+++ b/resources/static/dialog/views/add_email.ejs
@@ -2,36 +2,36 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-  <strong>Sign in using</strong>
+  <strong><%= gettext('Sign in using') %></strong>
 
   <div id="addEmail" class="cf form_section">
 
       <ul class="inputs">
           <li>
-              <label for="newEmail" class="serif">New email address</label>
+              <label for="newEmail" class="serif"><%= gettext('New email address') %></label>
               <input id="newEmail" name="newEmail" type="email" class="sans" autocapitalize="off" autocorrect="off" maxlength="254"/>
 
               <div id="email_format" class="tooltip" for="newEmail">
-                This field must be an email address.
+                <%= gettext('This field must be an email address.') %>
               </div>
 
               <div id="email_required" class="tooltip" for="newEmail">
-                The email field is required.
+                <%= gettext('The email field is required.') %>
               </div>
 
               <div id="could_not_add" class="tooltip" for="newEmail">
-                We just sent an email to that address!  If you really want to send another, wait a minute or two and try again.
+                <%= gettext('We just sent an email to that address!  If you really want to send another, wait a minute or two and try again.') %>
               </div>
 
               <div id="already_own_address" class="tooltip" for="newEmail">
-                That address is already added to your account!
+                <%= gettext('That address is already added to your account!') %>
               </div>
           </li>
       </ul>
 
       <div class="submit cf">
-          <button id="addNewEmail">add</button>
-          <button id="cancelNewEmail">cancel</button>
+          <button id="addNewEmail"><%= gettext('add') %></button>
+          <button id="cancelNewEmail"><%= gettext('cancel') %></button>
       </div>
 
   </div>
diff --git a/resources/static/dialog/views/confirm_email.ejs b/resources/static/dialog/views/confirm_email.ejs
index 09be4ae836a547c4fbc4c729f0b1f70e11f820b8..04576d703678b77a84f390c527b1fdbbcb19ec5b 100644
--- a/resources/static/dialog/views/confirm_email.ejs
+++ b/resources/static/dialog/views/confirm_email.ejs
@@ -4,5 +4,5 @@
 
     <h2><%= gettext('Check your email!') %></h2>
     <p><%= format(gettext('We sent a confirmation email to <strong>%s</strong>'), [email]) %></p>
-    <p><% gettext('To finish signing in just click the verify link we sent to your email address.') %></p><br />
-    <p><% gettext('If this is a mistake, just ignore the sent email and <a href="#" class="cancelVerify" id="back">use another email address</a>.') %></p>
+    <p><%= gettext('To finish signing in just click the verify link we sent to your email address.') %></p><br />
+    <p><%= gettext('If this is a mistake, just ignore the sent email and <a href="#" class="cancelVerify" id="back">use another email address</a>.') %></p>
diff --git a/resources/static/dialog/views/invalid_required_email.ejs b/resources/static/dialog/views/invalid_required_email.ejs
index 439ccf5719d3b2d42acfc4390fb1eb0fed987a03..fe3c5071441791ae093ed6d64e71d299ee56624c 100644
--- a/resources/static/dialog/views/invalid_required_email.ejs
+++ b/resources/static/dialog/views/invalid_required_email.ejs
@@ -3,10 +3,10 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 
-  <h2 id="invalidRequiredEmail">*<%= email %>* is not a valid email address!</h2>
+  <h2 id="invalidRequiredEmail"><%= format(gettext('*%s* is not a valid email address!'), [email]) %></h2>
 
   <p>
-    To continue, please close the window and enter a valid address.
+    <%= gettext('To continue, please close the window and enter a valid address.') %>
   </p>
 
 
diff --git a/resources/static/dialog/views/offline.ejs b/resources/static/dialog/views/offline.ejs
index e084ece8a831bc1564bf72e80f128f2b8a774ac7..942e98958271b64dd78554a3fe6d2295dde58362 100644
--- a/resources/static/dialog/views/offline.ejs
+++ b/resources/static/dialog/views/offline.ejs
@@ -3,10 +3,10 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 
-  <h2 id="offline">You are offline!</h2>
+  <h2 id="offline"><%= gettext('You are offline!') %></h2>
 
   <p>
-    We are sorry, but we cannot communicate with BrowserID while you are offline.
+    <%= gettext('We are sorry, but we cannot communicate with BrowserID while you are offline.') %>
   </p>
 
 
diff --git a/resources/static/dialog/views/required_email.ejs b/resources/static/dialog/views/required_email.ejs
index 0a2c71aa8c0832104d42640c7f8fe01dd9160771..4254dc123df70da33d94cd7a75c02724b96da4b7 100644
--- a/resources/static/dialog/views/required_email.ejs
+++ b/resources/static/dialog/views/required_email.ejs
@@ -4,48 +4,47 @@
 
   <strong>
     <% if(secondary_auth) { %>
-      Sign in using
+      <%= gettext("Sign in using") %>
     <% } else { %>
-      The site requested you sign in using
+      <%= gettext("The site requested you sign in using") %>
     <% } %>
   </strong>
   <div class="form_section">
       <ul class="inputs">
 
           <li>
-              <label for="email" class="serif">Email</label>
+              <label for="email" class="serif"><%= gettext("Email") %></label>
               <input id="required_email" class="sans" type="email" value="<%= email %>" disabled />
               <div id="could_not_add" class="tooltip" for="required_email">
-                We just sent an email to that address! If you really want to send another, wait a minute or two and try again.
+                <%= gettext("We just sent an email to that address! If you really want to send another, wait a minute or two and try again.") %>
               </div>
           </li>
 
           <% if (verify && primary) { %>
               <li>
-                  To verify that you own this address, you must
-                  sign in with your provider.  This window will be redirected to
+                  <%= gettext("To verify that you own this address, you must sign in with your provider.  This window will be redirected to") %>
 
                   <p>
-                      <strong>http://192.168.1.88:10005/sign_in.html</strong>.
+                      <strong></strong>.
                   </p>
               </li>
           <% } %>
 
           <% if (password) { %>
               <li id="password_section">
-                  <label for="password" class="half serif">Password</label>
+                  <label for="password" class="half serif"><%= gettext("Password") %></label>
                   <div class="half right">
-                      <a id="forgotPassword" href="#" tabindex="4">forgot your password?</a>
+                      <a id="forgotPassword" href="#" tabindex="4"><%= gettext("forgot your password?") %></a>
                   </div>
 
                   <input id="password" class="sans" type="password" maxlength="80" tabindex="2" />
 
                   <div id="password_required" class="tooltip" for="password">
-                    The password field is required.
+                    <%= gettext("The password field is required.") %>
                   </div>
 
                   <div id="cannot_authenticate" class="tooltip" for="password">
-                    The account cannot be logged in with this username and password.
+                    <%= gettext("The account cannot be logged in with this username and password.") %>
                   </div>
 
               </li>
@@ -55,13 +54,13 @@
 
       <div class="submit cf">
           <% if (signin) { %>
-            <button id="sign_in" tabindex="3">sign in</button>
+            <button id="sign_in" tabindex="3"><%= gettext("sign in") %></button>
           <% } else if (verify) { %>
-            <button id="verify_address" tabindex="3">verify email</button>
+            <button id="verify_address" tabindex="3"><%= gettext("verify email") %></button>
           <% } %>
 
           <% if (secondary_auth) { %>
-            <button id="cancel" tabindex="4">cancel</button>
+            <button id="cancel" tabindex="4"><%= gettext("cancel") %></button>
           <% } %>
       </div>
   </div>
diff --git a/resources/static/dialog/views/testBodyTemplate.ejs b/resources/static/dialog/views/testBodyTemplate.ejs
index 86d4ffa2a8d0dfcc8d44e6b930926dd6a4f887e1..60e33f244b2597b7a2acdf0e235ef904cf1f8a73 100644
--- a/resources/static/dialog/views/testBodyTemplate.ejs
+++ b/resources/static/dialog/views/testBodyTemplate.ejs
@@ -4,3 +4,5 @@
 
 <input id="templateInput" type="text" value="" />
 
+<%= gettext("translated text") %>
+
diff --git a/resources/static/dialog/views/verify_primary_user.ejs b/resources/static/dialog/views/verify_primary_user.ejs
index b0e17b9ff374f8ae4e3771674b9754a3f7b9cbc4..e413fb5c4d53d426b620be42184f229c114b5ffd 100644
--- a/resources/static/dialog/views/verify_primary_user.ejs
+++ b/resources/static/dialog/views/verify_primary_user.ejs
@@ -3,47 +3,45 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <% if (requiredEmail) { %>
-  <strong>The site requested you sign in using</strong>
+  <strong><%= gettext('The site requested you sign in using') %></strong>
   <div class="form_section">
       <ul class="inputs">
 
           <li>
-              <label for="email" class="serif">Email</label>
+              <label for="email" class="serif"><%= gettext('Email') %></label>
               <input id="required_email" class="sans" type="email" value="<%= email %>" disabled />
               <div id="could_not_add" class="tooltip" for="required_email">
-                We just sent an email to that address! If you really want to send another, wait a minute or two and try again.
+                <%= gettext("We just sent an email to that address! If you really want to send another, wait a minute or two and try again.") %>
               </div>
           </li>
 
           <li>
-              To verify that you own this address, you must
-              sign in with your provider.  This window will be redirected to
+              <%= gettext("To verify that you own this address, you must sign in with your provider.  This window will be redirected to") %>
 
               <p>
-                  <strong>http://192.168.1.88:10005/sign_in.html</strong>.
+                  <strong></strong>.
               </p>
           </li>
       </ul>
 
       <div class="submit cf">
-          <button id="VerifyWithPrimary">Verify</button>
+          <button id="VerifyWithPrimary"><%= gettext("Verify") %></button>
       </div>
   </div>
 
 <% } else { %>
-  <strong>Verify With Email Provider</strong>
+  <strong><%= gettext("Verify With Email Provider") %></strong>
 
   <div class="cf form_section">
-    To verify that you own <strong id="primary_email"><%= email %></strong>, you must
-    sign in with your provider.  This window will be redirected to
+    <%= format(gettext("To verify that you own <strong id='primary_email'>%s</strong>, you must sign in with your provider.  This window will be redirected to"), [email]) %>
 
     <p>
       <strong><%= auth_url %></strong>.
     </p>
 
     <div class="submit cf">
-      <button id="verifyWithPrimary">Verify</button>
-      <button id="cancel">Cancel</button>
+      <button id="verifyWithPrimary"><%= gettext("Verify") %></button>
+      <button id="cancel"><%= gettext("Cancel") %></button>
     </div>
 
   </div>
diff --git a/resources/static/i18n/db_LB/client.json b/resources/static/i18n/db_LB/client.json
index cffeba9725d7dfc29e4cb4a4b542d534d1f7d4a4..32a2d8fea79a26b1272cdf0ce269f415160b0b85 100644
--- a/resources/static/i18n/db_LB/client.json
+++ b/resources/static/i18n/db_LB/client.json
@@ -1,12 +1,9 @@
 var json_locale_data = {
    "client" : {
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again." : [
-         null,
-         "‮Ｍǝ ɾnsʇ sǝuʇ ɐu ǝɯɐıʅ ʇo ʇɥɐʇ ɐppɹǝss¡ Iɟ ʎon ɹǝɐʅʅʎ ʍɐuʇ ʇo sǝup ɐuoʇɥǝɹ´ ʍɐıʇ ɐ ɯıunʇǝ oɹ ʇʍo ɐup ʇɹʎ ɐƃɐıu·"
-      ],
       "" : {
          "MIME-Version" : " 1.0",
-         "POT-Creation-Date" : " 2012-01-19 17:47-0800",
+         "POT-Creation-Date" : " 2012-01-20 12:38+0000",
+         "Language" : " ",
          "Last-Translator" : " FULL NAME <EMAIL@ADDRESS>",
          "Content-Type" : " text/plain; charset=UTF-8",
          "PO-Revision-Date" : " YEAR-MO-DA HO:MI+ZONE",
@@ -23,26 +20,18 @@ var json_locale_data = {
          null,
          "‮uǝxʇ"
       ],
-      "Enter your email address to sign in to <strong>%s</strong>" : [
-         null,
-         "‮Ǝuʇǝɹ ʎonɹ ǝɯɐıʅ ɐppɹǝss ʇo sıƃu ıu ʇo <strong>%s</strong>"
-      ],
       "This email looks new, so let&apos;s get you set up." : [
          null,
-         "‮⊥ɥıs ǝɯɐıʅ ʅooʞs uǝʍ´ so ʅǝʇ&apos;‮s ƃǝʇ ʎon sǝʇ nd·"
-      ],
-      "The email field is required." : [
-         null,
-         "‮⊥ɥǝ ǝɯɐıʅ ɟıǝʅp ıs ɹǝbnıɹǝp·"
-      ],
-      "verify email" : [
-         null,
-         "‮ʌǝɹıɟʎ ǝɯɐıʅ"
+         "‮⊥ɥıs ǝɯɐıʅ ʅooʞs uǝʍ´ so ʅǝʇ&apos;‮s ƃǝʇ ʎon sǝʇ nd˙"
       ],
       "Sign in using" : [
          null,
          "‮Sıƃu ıu nsıuƃ"
       ],
+      "You are offline!" : [
+         null,
+         "‮⅄on ɐɹǝ oɟɟʅıuǝ¡"
+      ],
       "Password" : [
          null,
          "‮Ԁɐssʍoɹp"
@@ -53,15 +42,19 @@ var json_locale_data = {
       ],
       "To finish signing in just click the verify link we sent to your email address." : [
          null,
-         "‮⊥o ɟıuısɥ sıƃuıuƃ ıu ɾnsʇ ɔʅıɔʞ ʇɥǝ ʌǝɹıɟʎ ʅıuʞ ʍǝ sǝuʇ ʇo ʎonɹ ǝɯɐıʅ ɐppɹǝss·"
+         "‮⊥o ɟıuısɥ sıƃuıuƃ ıu ɾnsʇ ɔʅıɔʞ ʇɥǝ ʌǝɹıɟʎ ʅıuʞ ʍǝ sǝuʇ ʇo ʎonɹ ǝɯɐıʅ ɐppɹǝss˙"
       ],
       "forgot your password?" : [
          null,
-         "‮ɟoɹƃoʇ ʎonɹ dɐssʍoɹp?"
+         "‮ɟoɹƃoʇ ʎonɹ dɐssʍoɹp¿"
+      ],
+      "We are sorry, but we cannot communicate with BrowserID while you are offline." : [
+         null,
+         "‮Ｍǝ ɐɹǝ soɹɹʎ´ qnʇ ʍǝ ɔɐuuoʇ ɔoɯɯnuıɔɐʇǝ ʍıʇɥ ԐɹoʍsǝɹIᗡ ʍɥıʅǝ ʎon ɐɹǝ oɟɟʅıuǝ˙"
       ],
       "This field must be an email address." : [
          null,
-         "‮⊥ɥıs ɟıǝʅp ɯnsʇ qǝ ɐu ǝɯɐıʅ ɐppɹǝss·"
+         "‮⊥ɥıs ɟıǝʅp ɯnsʇ qǝ ɐu ǝɯɐıʅ ɐppɹǝss˙"
       ],
       "Cancel" : [
          null,
@@ -71,37 +64,101 @@ var json_locale_data = {
          null,
          "‮Ǝɯɐıʅ"
       ],
+      "To verify that you own <strong id='primary_email'>%s</strong>, you must sign in with your provider.  This window will be redirected to" : [
+         null,
+         "‮⊥o ʌǝɹıɟʎ ʇɥɐʇ ʎon oʍu <strong id='primary_email'>%s</strong>‮´ ʎon ɯnsʇ sıƃu ıu ʍıʇɥ ʎonɹ dɹoʌıpǝɹ˙  ⊥ɥıs ʍıupoʍ ʍıʅʅ qǝ ɹǝpıɹǝɔʇǝp ʇo"
+      ],
       "Reset Password" : [
          null,
          "‮ᴚǝsǝʇ Ԁɐssʍoɹp"
       ],
-      "sign in" : [
+      "select email" : [
          null,
-         "‮sıƃu ıu"
+         "‮sǝʅǝɔʇ ǝɯɐıʅ"
       ],
-      "The account cannot be logged in with this username and password." : [
+      "To verify that you own this address, you must sign in with your provider.  This window will be redirected to" : [
          null,
-         "‮⊥ɥǝ ɐɔɔonuʇ ɔɐuuoʇ qǝ ʅoƃƃǝp ıu ʍıʇɥ ʇɥıs nsǝɹuɐɯǝ ɐup dɐssʍoɹp·"
+         "‮⊥o ʌǝɹıɟʎ ʇɥɐʇ ʎon oʍu ʇɥıs ɐppɹǝss´ ʎon ɯnsʇ sıƃu ıu ʍıʇɥ ʎonɹ dɹoʌıpǝɹ˙  ⊥ɥıs ʍıupoʍ ʍıʅʅ qǝ ɹǝpıɹǝɔʇǝp ʇo"
       ],
-      "select email" : [
+      "Verify With Email Provider" : [
          null,
-         "‮sǝʅǝɔʇ ǝɯɐıʅ"
+         "‮Ʌǝɹıɟʎ Ｍıʇɥ Ǝɯɐıʅ Ԁɹoʌıpǝɹ"
       ],
       "This is not me..." : [
          null,
-         "‮⊥ɥıs ıs uoʇ ɯǝ···"
+         "‮⊥ɥıs ıs uoʇ ɯǝ˙˙˙"
+      ],
+      "We just sent an email to that address!  If you really want to send another, wait a minute or two and try again." : [
+         null,
+         "‮Ｍǝ ɾnsʇ sǝuʇ ɐu ǝɯɐıʅ ʇo ʇɥɐʇ ɐppɹǝss¡  Iɟ ʎon ɹǝɐʅʅʎ ʍɐuʇ ʇo sǝup ɐuoʇɥǝɹ´ ʍɐıʇ ɐ ɯıunʇǝ oɹ ʇʍo ɐup ʇɹʎ ɐƃɐıu˙"
+      ],
+      "cancel" : [
+         null,
+         "‮ɔɐuɔǝʅ"
+      ],
+      "The password field is required." : [
+         null,
+         "‮⊥ɥǝ dɐssʍoɹp ɟıǝʅp ıs ɹǝbnıɹǝp˙"
+      ],
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again." : [
+         null,
+         "‮Ｍǝ ɾnsʇ sǝuʇ ɐu ǝɯɐıʅ ʇo ʇɥɐʇ ɐppɹǝss¡ Iɟ ʎon ɹǝɐʅʅʎ ʍɐuʇ ʇo sǝup ɐuoʇɥǝɹ´ ʍɐıʇ ɐ ɯıunʇǝ oɹ ʇʍo ɐup ʇɹʎ ɐƃɐıu˙"
+      ],
+      "To continue, please close the window and enter a valid address." : [
+         null,
+         "‮⊥o ɔouʇıunǝ´ dʅǝɐsǝ ɔʅosǝ ʇɥǝ ʍıupoʍ ɐup ǝuʇǝɹ ɐ ʌɐʅıp ɐppɹǝss˙"
+      ],
+      "add" : [
+         null,
+         "‮ɐpp"
+      ],
+      "Enter your email address to sign in to <strong>%s</strong>" : [
+         null,
+         "‮Ǝuʇǝɹ ʎonɹ ǝɯɐıʅ ɐppɹǝss ʇo sıƃu ıu ʇo <strong>%s</strong>"
+      ],
+      "translated text" : [
+         null,
+         "‮ʇɹɐusʅɐʇǝp ʇǝxʇ"
+      ],
+      "The email field is required." : [
+         null,
+         "‮⊥ɥǝ ǝɯɐıʅ ɟıǝʅp ıs ɹǝbnıɹǝp˙"
+      ],
+      "verify email" : [
+         null,
+         "‮ʌǝɹıɟʎ ǝɯɐıʅ"
+      ],
+      "New email address" : [
+         null,
+         "‮Nǝʍ ǝɯɐıʅ ɐppɹǝss"
+      ],
+      "That address is already added to your account!" : [
+         null,
+         "‮⊥ɥɐʇ ɐppɹǝss ıs ɐʅɹǝɐpʎ ɐppǝp ʇo ʎonɹ ɐɔɔonuʇ¡"
+      ],
+      "Verify" : [
+         null,
+         "‮Ʌǝɹıɟʎ"
+      ],
+      "sign in" : [
+         null,
+         "‮sıƃu ıu"
+      ],
+      "The account cannot be logged in with this username and password." : [
+         null,
+         "‮⊥ɥǝ ɐɔɔonuʇ ɔɐuuoʇ qǝ ʅoƃƃǝp ıu ʍıʇɥ ʇɥıs nsǝɹuɐɯǝ ɐup dɐssʍoɹp˙"
       ],
       "Welcome to BrowserID!" : [
          null,
          "‮Ｍǝʅɔoɯǝ ʇo ԐɹoʍsǝɹIᗡ¡"
       ],
-      "We just sent an email to that address!  If you really want to send another, wait a minute or two and try again." : [
+      "*%s* is not a valid email address!" : [
          null,
-         "‮Ｍǝ ɾnsʇ sǝuʇ ɐu ǝɯɐıʅ ʇo ʇɥɐʇ ɐppɹǝss¡  Iɟ ʎon ɹǝɐʅʅʎ ʍɐuʇ ʇo sǝup ɐuoʇɥǝɹ´ ʍɐıʇ ɐ ɯıunʇǝ oɹ ʇʍo ɐup ʇɹʎ ɐƃɐıu·"
+         "‮⁎%s‮⁎ ıs uoʇ ɐ ʌɐʅıp ǝɯɐıʅ ɐppɹǝss¡"
       ],
       "If this is a mistake, just ignore the sent email and <a href=\"#\" class=\"cancelVerify\" id=\"back\">use another email address</a>." : [
          null,
-         "‮Iɟ ʇɥıs ıs ɐ ɯısʇɐʞǝ´ ɾnsʇ ıƃuoɹǝ ʇɥǝ sǝuʇ ǝɯɐıʅ ɐup <a href=\"#\" class=\"cancelVerify\" id=\"back\">‮nsǝ ɐuoʇɥǝɹ ǝɯɐıʅ ɐppɹǝss</a>‮·"
+         "‮Iɟ ʇɥıs ıs ɐ ɯısʇɐʞǝ´ ɾnsʇ ıƃuoɹǝ ʇɥǝ sǝuʇ ǝɯɐıʅ ɐup <a href=\"#\" class=\"cancelVerify\" id=\"back\">‮nsǝ ɐuoʇɥǝɹ ǝɯɐıʅ ɐppɹǝss</a>‮˙"
       ],
       "Check your email!" : [
          null,
@@ -111,10 +168,6 @@ var json_locale_data = {
          null,
          "‮⊥ɥǝ sıʇǝ ɹǝbnǝsʇǝp ʎon sıƃu ıu nsıuƃ"
       ],
-      "The password field is required." : [
-         null,
-         "‮⊥ɥǝ dɐssʍoɹp ɟıǝʅp ıs ɹǝbnıɹǝp·"
-      ],
       "Use a different email" : [
          null,
          "‮∩sǝ ɐ pıɟɟǝɹǝuʇ ǝɯɐıʅ"
diff --git a/resources/static/i18n/db_LB/messages.json b/resources/static/i18n/db_LB/messages.json
index a6179b1464eacf058dd3ff9bd850886b6b5e0eb8..67cde695197f9bc2eb88da72d2e2e3f5745975b6 100644
--- a/resources/static/i18n/db_LB/messages.json
+++ b/resources/static/i18n/db_LB/messages.json
@@ -2,11 +2,12 @@ var json_locale_data = {
    "messages" : {
       "Error encountered trying to complete registration." : [
          null,
-         "‮Ǝɹɹoɹ ǝuɔonuʇǝɹǝp ʇɹʎıuƃ ʇo ɔoɯdʅǝʇǝ ɹǝƃısʇɹɐʇıou·"
+         "‮Ǝɹɹoɹ ǝuɔonuʇǝɹǝp ʇɹʎıuƃ ʇo ɔoɯdʅǝʇǝ ɹǝƃısʇɹɐʇıou˙"
       ],
       "" : {
          "MIME-Version" : " 1.0",
-         "POT-Creation-Date" : " 2012-01-19 17:47-0800",
+         "POT-Creation-Date" : " 2012-01-20 12:38+0000",
+         "Language" : " ",
          "Last-Translator" : " FULL NAME <EMAIL@ADDRESS>",
          "Content-Type" : " text/plain; charset=UTF-8",
          "PO-Revision-Date" : " YEAR-MO-DA HO:MI+ZONE",
@@ -21,11 +22,7 @@ var json_locale_data = {
       ],
       "Verification password is required." : [
          null,
-         "‮Ʌǝɹıɟıɔɐʇıou dɐssʍoɹp ıs ɹǝbnıɹǝp·"
-      ],
-      "Communicating with server" : [
-         null,
-         "‮Ↄoɯɯnuıɔɐʇıuƃ ʍıʇɥ sǝɹʌǝɹ"
+         "‮Ʌǝɹıɟıɔɐʇıou dɐssʍoɹp ıs ɹǝbnıɹǝp˙"
       ],
       "Finish signing into: " : [
          null,
@@ -35,105 +32,109 @@ var json_locale_data = {
          null,
          "‮⅄onɹ Ǝɯɐıʅ"
       ],
+      "Error comunicating with server." : [
+         null,
+         "‮Ǝɹɹoɹ ɔoɯnuıɔɐʇıuƃ ʍıʇɥ sǝɹʌǝɹ˙"
+      ],
+      "Last step!" : [
+         null,
+         "‮⅂ɐsʇ sʇǝd¡"
+      ],
+      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>" : [
+         null,
+         "‮ԐɹoʍsǝɹIᗡ ıs ʇɥǝ ɟɐsʇ ɐup sǝɔnɹǝ ʍɐʎ ʇo sıƃu ıu &mdash;‮ <a target=\"_blank\" href=\"/about\">‮ʅǝɐɹu ɯoɹǝ</a>"
+      ],
+      "Your new address is set up and you should now be signed in. You may now close this window and go back to" : [
+         null,
+         "‮⅄onɹ uǝʍ ɐppɹǝss ıs sǝʇ nd ɐup ʎon sɥonʅp uoʍ qǝ sıƃuǝp ıu˙ ⅄on ɯɐʎ uoʍ ɔʅosǝ ʇɥıs ʍıupoʍ ɐup ƃo qɐɔʞ ʇo"
+      ],
+      "Verify Password" : [
+         null,
+         "‮Ʌǝɹıɟʎ Ԁɐssʍoɹp"
+      ],
+      "Password must be between 8 and 80 characters long." : [
+         null,
+         "‮Ԁɐssʍoɹp ɯnsʇ qǝ qǝʇʍǝǝu 8‮ ɐup 80‮ ɔɥɐɹɐɔʇǝɹs ʅouƃ˙"
+      ],
+      "(A better way to sign in)" : [
+         null,
+         "‮(∀ qǝʇʇǝɹ ʍɐʎ ʇo sıƃu ıu)"
+      ],
+      "Finish registration by clicking this link:" : [
+         null,
+         "‮Ⅎıuısɥ ɹǝƃısʇɹɐʇıou qʎ ɔʅıɔʞıuƃ ʇɥıs ʅıuʞ:"
+      ],
+      "Thanks," : [
+         null,
+         "‮⊥ɥɐuʞs´"
+      ],
+      "Communicating with server" : [
+         null,
+         "‮Ↄoɯɯnuıɔɐʇıuƃ ʍıʇɥ sǝɹʌǝɹ"
+      ],
       "Enter a Password" : [
          null,
          "‮Ǝuʇǝɹ ɐ Ԁɐssʍoɹp"
       ],
       "Error encountered while attempting to confirm your address. Have you previously verified this address?" : [
          null,
-         "‮Ǝɹɹoɹ ǝuɔonuʇǝɹǝp ʍɥıʅǝ ɐʇʇǝɯdʇıuƃ ʇo ɔouɟıɹɯ ʎonɹ ɐppɹǝss· Hɐʌǝ ʎon dɹǝʌıonsʅʎ ʌǝɹıɟıǝp ʇɥıs ɐppɹǝss?"
+         "‮Ǝɹɹoɹ ǝuɔonuʇǝɹǝp ʍɥıʅǝ ɐʇʇǝɯdʇıuƃ ʇo ɔouɟıɹɯ ʎonɹ ɐppɹǝss˙ Hɐʌǝ ʎon dɹǝʌıonsʅʎ ʌǝɹıɟıǝp ʇɥıs ɐppɹǝss¿"
       ],
       "Thank you for signing up with <strong>BrowserID</strong>. You can now use your <strong>BrowserID</strong> account to <em>Sign In</em> or <em>Sign Up</em> to websites all across the web!" : [
          null,
-         "‮⊥ɥɐuʞ ʎon ɟoɹ sıƃuıuƃ nd ʍıʇɥ <strong>‮ԐɹoʍsǝɹIᗡ</strong>‮· ⅄on ɔɐu uoʍ nsǝ ʎonɹ <strong>‮ԐɹoʍsǝɹIᗡ</strong>‮ ɐɔɔonuʇ ʇo <em>‮Sıƃu Iu</em>‮ oɹ <em>‮Sıƃu ∩d</em>‮ ʇo ʍǝqsıʇǝs ɐʅʅ ɐɔɹoss ʇɥǝ ʍǝq¡"
-      ],
-      "<strong class=\"email\">Your address</strong> has been verified!" : [
-         null,
-         "<strong class=\"email\">‮⅄onɹ ɐppɹǝss</strong>‮ ɥɐs qǝǝu ʌǝɹıɟıǝp¡"
+         "‮⊥ɥɐuʞ ʎon ɟoɹ sıƃuıuƃ nd ʍıʇɥ <strong>‮ԐɹoʍsǝɹIᗡ</strong>‮˙ ⅄on ɔɐu uoʍ nsǝ ʎonɹ <strong>‮ԐɹoʍsǝɹIᗡ</strong>‮ ɐɔɔonuʇ ʇo <em>‮Sıƃu Iu</em>‮ oɹ <em>‮Sıƃu ∩d</em>‮ ʇo ʍǝqsıʇǝs ɐʅʅ ɐɔɹoss ʇɥǝ ʍǝq¡"
       ],
       "Email Verification" : [
          null,
          "‮Ǝɯɐıʅ Ʌǝɹıɟıɔɐʇıou"
       ],
-      "Error comunicating with server." : [
-         null,
-         "‮Ǝɹɹoɹ ɔoɯnuıɔɐʇıuƃ ʍıʇɥ sǝɹʌǝɹ·"
-      ],
-      "Browser ID" : [
+      "<strong class=\"email\">Your address</strong> has been verified!" : [
          null,
-         "‮Ԑɹoʍsǝɹ Iᗡ"
+         "<strong class=\"email\">‮⅄onɹ ɐppɹǝss</strong>‮ ɥɐs qǝǝu ʌǝɹıɟıǝp¡"
       ],
       "Finish" : [
          null,
          "‮Ⅎıuısɥ"
       ],
-      "Last step!" : [
+      "Browser ID" : [
          null,
-         "‮⅂ɐsʇ sʇǝd¡"
+         "‮Ԑɹoʍsǝɹ Iᗡ"
       ],
       "There was a problem with your signup link.  Has this address already been registered?" : [
          null,
-         "‮⊥ɥǝɹǝ ʍɐs ɐ dɹoqʅǝɯ ʍıʇɥ ʎonɹ sıƃund ʅıuʞ·  Hɐs ʇɥıs ɐppɹǝss ɐʅɹǝɐpʎ qǝǝu ɹǝƃısʇǝɹǝp?"
-      ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>" : [
-         null,
-         "‮ԐɹoʍsǝɹIᗡ ıs ʇɥǝ ɟɐsʇ ɐup sǝɔnɹǝ ʍɐʎ ʇo sıƃu ıu &mdash;‮ <a target=\"_blank\" href=\"/about\">‮ʅǝɐɹu ɯoɹǝ</a>"
-      ],
-      "Password is required." : [
-         null,
-         "‮Ԁɐssʍoɹp ıs ɹǝbnıɹǝp·"
+         "‮⊥ɥǝɹǝ ʍɐs ɐ dɹoqʅǝɯ ʍıʇɥ ʎonɹ sıƃund ʅıuʞ˙  Hɐs ʇɥıs ɐppɹǝss ɐʅɹǝɐpʎ qǝǝu ɹǝƃısʇǝɹǝp¿"
       ],
       "Passwords do not match." : [
          null,
-         "‮Ԁɐssʍoɹps po uoʇ ɯɐʇɔɥ·"
+         "‮Ԁɐssʍoɹps po uoʇ ɯɐʇɔɥ˙"
       ],
-      "Your new address is set up and you should now be signed in. You may now close this window and go back to" : [
+      "Password is required." : [
          null,
-         "‮⅄onɹ uǝʍ ɐppɹǝss ıs sǝʇ nd ɐup ʎon sɥonʅp uoʍ qǝ sıƃuǝp ıu· ⅄on ɯɐʎ uoʍ ɔʅosǝ ʇɥıs ʍıupoʍ ɐup ƃo qɐɔʞ ʇo"
+         "‮Ԁɐssʍoɹp ıs ɹǝbnıɹǝp˙"
       ],
       "New Password" : [
          null,
          "‮Nǝʍ Ԁɐssʍoɹp"
       ],
-      "Verify Password" : [
-         null,
-         "‮Ʌǝɹıɟʎ Ԁɐssʍoɹp"
-      ],
       "Complete Login to %s using BrowserID" : [
          null,
          "‮Ↄoɯdʅǝʇǝ ⅂oƃıu ʇo %s‮ nsıuƃ ԐɹoʍsǝɹIᗡ"
       ],
-      "Password must be between 8 and 80 characters long." : [
-         null,
-         "‮Ԁɐssʍoɹp ɯnsʇ qǝ qǝʇʍǝǝu 8‮ ɐup 80‮ ɔɥɐɹɐɔʇǝɹs ʅouƃ·"
-      ],
       "Repeat Password" : [
          null,
          "‮ᴚǝdǝɐʇ Ԁɐssʍoɹp"
       ],
       "Just a moment while we talk with the server." : [
          null,
-         "‮ſnsʇ ɐ ɯoɯǝuʇ ʍɥıʅǝ ʍǝ ʇɐʅʞ ʍıʇɥ ʇɥǝ sǝɹʌǝɹ·"
+         "‮ſnsʇ ɐ ɯoɯǝuʇ ʍɥıʅǝ ʍǝ ʇɐʅʞ ʍıʇɥ ʇɥǝ sǝɹʌǝɹ˙"
       ],
       "Email Address" : [
          null,
          "‮Ǝɯɐıʅ ∀ppɹǝss"
       ],
-      "(A better way to sign in)" : [
-         null,
-         "‮(∀ qǝʇʇǝɹ ʍɐʎ ʇo sıƃu ıu)"
-      ],
-      "Finish registration by clicking this link:" : [
-         null,
-         "‮Ⅎıuısɥ ɹǝƃısʇɹɐʇıou qʎ ɔʅıɔʞıuƃ ʇɥıs ʅıuʞ:"
-      ],
-      "Thanks," : [
-         null,
-         "‮⊥ɥɐuʞs´"
-      ],
       "If you are NOT trying to sign into this site, just ignore this email." : [
          null,
-         "‮Iɟ ʎon ɐɹǝ NO⊥ ʇɹʎıuƃ ʇo sıƃu ıuʇo ʇɥıs sıʇǝ´ ɾnsʇ ıƃuoɹǝ ʇɥıs ǝɯɐıʅ·"
+         "‮Iɟ ʎon ɐɹǝ NO⊥ ʇɹʎıuƃ ʇo sıƃu ıuʇo ʇɥıs sıʇǝ´ ɾnsʇ ıƃuoɹǝ ʇɥıs ǝɯɐıʅ˙"
       ]
    }
 }
diff --git a/resources/static/i18n/en_US/client.json b/resources/static/i18n/en_US/client.json
index 3f850d316dfb70170b238ee81bbef8a4cd6b255f..b383dc71265b52b973512c72900af594c0885148 100644
--- a/resources/static/i18n/en_US/client.json
+++ b/resources/static/i18n/en_US/client.json
@@ -1,20 +1,17 @@
 var json_locale_data = {
    "client" : {
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again." : [
-         null,
-         "We just sent an email to that address!  If you really want to send another, wait a minute or two and try again."
-      ],
       "" : {
          "Plural-Forms" : " nplurals=2; plural=(n != 1);",
          "MIME-Version" : " 1.0",
-         "POT-Creation-Date" : " 2012-01-19 17:47-0800",
+         "POT-Creation-Date" : " 2012-01-20 12:38+0000",
+         "Language" : " ",
          "Last-Translator" : " Austin King <ozten@mozilla.com>",
          "Content-Type" : " text/plain; charset=UTF-8",
          "PO-Revision-Date" : " 2012-01-10 17:32-0800",
          "Language-Team" : " English",
          "Content-Transfer-Encoding" : " 8bit",
-         "Project-Id-Version" : " PACKAGE VERSION",
-         "Report-Msgid-Bugs-To" : " "
+         "Report-Msgid-Bugs-To" : " ",
+         "Project-Id-Version" : " PACKAGE VERSION"
       },
       "Always sign in using this email" : [
          null,
@@ -24,26 +21,18 @@ var json_locale_data = {
          null,
          "next"
       ],
-      "Enter your email address to sign in to <strong>%s</strong>" : [
-         null,
-         ""
-      ],
       "This email looks new, so let&apos;s get you set up." : [
          null,
          "This email looks new, so let&apos;s get you set up."
       ],
-      "The email field is required." : [
-         null,
-         "The email field is required."
-      ],
-      "verify email" : [
-         null,
-         "verify email"
-      ],
       "Sign in using" : [
          null,
          "Sign in using"
       ],
+      "You are offline!" : [
+         null,
+         ""
+      ],
       "Password" : [
          null,
          "Password"
@@ -60,6 +49,10 @@ var json_locale_data = {
          null,
          "forgot your password?"
       ],
+      "We are sorry, but we cannot communicate with BrowserID while you are offline." : [
+         null,
+         ""
+      ],
       "This field must be an email address." : [
          null,
          "This field must be an email address."
@@ -72,33 +65,97 @@ var json_locale_data = {
          null,
          "Email"
       ],
+      "To verify that you own <strong id='primary_email'>%s</strong>, you must sign in with your provider.  This window will be redirected to" : [
+         null,
+         ""
+      ],
       "Reset Password" : [
          null,
          "Password"
       ],
-      "sign in" : [
+      "select email" : [
          null,
-         ""
+         "select email"
       ],
-      "The account cannot be logged in with this username and password." : [
+      "To verify that you own this address, you must sign in with your provider.  This window will be redirected to" : [
          null,
-         "The account cannot be logged in with this username and password."
+         ""
       ],
-      "select email" : [
+      "Verify With Email Provider" : [
          null,
-         "select email"
+         ""
       ],
       "This is not me..." : [
          null,
          ""
       ],
+      "We just sent an email to that address!  If you really want to send another, wait a minute or two and try again." : [
+         null,
+         "We just sent an email to that address!  If you really want to send another, wait a minute or two and try again."
+      ],
+      "cancel" : [
+         null,
+         ""
+      ],
+      "The password field is required." : [
+         null,
+         "The password field is required."
+      ],
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again." : [
+         null,
+         "We just sent an email to that address!  If you really want to send another, wait a minute or two and try again."
+      ],
+      "To continue, please close the window and enter a valid address." : [
+         null,
+         ""
+      ],
+      "add" : [
+         null,
+         ""
+      ],
+      "Enter your email address to sign in to <strong>%s</strong>" : [
+         null,
+         ""
+      ],
+      "translated text" : [
+         null,
+         ""
+      ],
+      "The email field is required." : [
+         null,
+         "The email field is required."
+      ],
+      "verify email" : [
+         null,
+         "verify email"
+      ],
+      "New email address" : [
+         null,
+         ""
+      ],
+      "That address is already added to your account!" : [
+         null,
+         ""
+      ],
+      "Verify" : [
+         null,
+         ""
+      ],
+      "sign in" : [
+         null,
+         ""
+      ],
+      "The account cannot be logged in with this username and password." : [
+         null,
+         "The account cannot be logged in with this username and password."
+      ],
       "Welcome to BrowserID!" : [
          null,
          "Welcome to BrowserID!"
       ],
-      "We just sent an email to that address!  If you really want to send another, wait a minute or two and try again." : [
+      "*%s* is not a valid email address!" : [
          null,
-         "We just sent an email to that address!  If you really want to send another, wait a minute or two and try again."
+         "This field must be an email address."
       ],
       "If this is a mistake, just ignore the sent email and <a href=\"#\" class=\"cancelVerify\" id=\"back\">use another email address</a>." : [
          null,
@@ -112,10 +169,6 @@ var json_locale_data = {
          null,
          ""
       ],
-      "The password field is required." : [
-         null,
-         "The password field is required."
-      ],
       "Use a different email" : [
          null,
          ""
diff --git a/resources/static/i18n/en_US/messages.json b/resources/static/i18n/en_US/messages.json
index ea9b5b02f0192d1f01afbeab8d92f10b4fe0bcb0..41436a5f1cd297cae77b279cac9f09acf21591bc 100644
--- a/resources/static/i18n/en_US/messages.json
+++ b/resources/static/i18n/en_US/messages.json
@@ -6,7 +6,8 @@ var json_locale_data = {
       ],
       "" : {
          "MIME-Version" : " 1.0",
-         "POT-Creation-Date" : " 2012-01-19 17:47-0800",
+         "POT-Creation-Date" : " 2012-01-20 12:38+0000",
+         "Language" : " ",
          "Last-Translator" : " FULL NAME <EMAIL@ADDRESS>",
          "Content-Type" : " text/plain; charset=UTF-8",
          "PO-Revision-Date" : " YEAR-MO-DA HO:MI+ZONE",
@@ -23,111 +24,111 @@ var json_locale_data = {
          null,
          ""
       ],
-      "Communicating with server" : [
+      "Finish signing into: " : [
          null,
          ""
       ],
-      "Finish signing into: " : [
+      "Your Email" : [
          null,
          ""
       ],
-      "Your Email" : [
+      "Error comunicating with server." : [
          null,
          ""
       ],
-      "Enter a Password" : [
+      "Last step!" : [
          null,
          ""
       ],
-      "Error encountered while attempting to confirm your address. Have you previously verified this address?" : [
+      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>" : [
          null,
          ""
       ],
-      "Thank you for signing up with <strong>BrowserID</strong>. You can now use your <strong>BrowserID</strong> account to <em>Sign In</em> or <em>Sign Up</em> to websites all across the web!" : [
+      "Your new address is set up and you should now be signed in. You may now close this window and go back to" : [
          null,
          ""
       ],
-      "<strong class=\"email\">Your address</strong> has been verified!" : [
+      "Verify Password" : [
          null,
          ""
       ],
-      "Email Verification" : [
+      "Password must be between 8 and 80 characters long." : [
          null,
          ""
       ],
-      "Error comunicating with server." : [
+      "(A better way to sign in)" : [
          null,
          ""
       ],
-      "Browser ID" : [
+      "Finish registration by clicking this link:" : [
          null,
          ""
       ],
-      "Finish" : [
+      "Thanks," : [
          null,
          ""
       ],
-      "Last step!" : [
+      "Communicating with server" : [
          null,
          ""
       ],
-      "There was a problem with your signup link.  Has this address already been registered?" : [
+      "Enter a Password" : [
          null,
          ""
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>" : [
+      "Error encountered while attempting to confirm your address. Have you previously verified this address?" : [
          null,
          ""
       ],
-      "Password is required." : [
+      "Thank you for signing up with <strong>BrowserID</strong>. You can now use your <strong>BrowserID</strong> account to <em>Sign In</em> or <em>Sign Up</em> to websites all across the web!" : [
          null,
          ""
       ],
-      "Passwords do not match." : [
+      "Email Verification" : [
          null,
          ""
       ],
-      "Your new address is set up and you should now be signed in. You may now close this window and go back to" : [
+      "<strong class=\"email\">Your address</strong> has been verified!" : [
          null,
          ""
       ],
-      "New Password" : [
+      "Finish" : [
          null,
          ""
       ],
-      "Verify Password" : [
+      "Browser ID" : [
          null,
          ""
       ],
-      "Complete Login to %s using BrowserID" : [
+      "There was a problem with your signup link.  Has this address already been registered?" : [
          null,
          ""
       ],
-      "Password must be between 8 and 80 characters long." : [
+      "Passwords do not match." : [
          null,
          ""
       ],
-      "Repeat Password" : [
+      "Password is required." : [
          null,
          ""
       ],
-      "Just a moment while we talk with the server." : [
+      "New Password" : [
          null,
          ""
       ],
-      "Email Address" : [
+      "Complete Login to %s using BrowserID" : [
          null,
          ""
       ],
-      "(A better way to sign in)" : [
+      "Repeat Password" : [
          null,
          ""
       ],
-      "Finish registration by clicking this link:" : [
+      "Just a moment while we talk with the server." : [
          null,
          ""
       ],
-      "Thanks," : [
+      "Email Address" : [
          null,
          ""
       ],
diff --git a/resources/static/i18n/eo/client.json b/resources/static/i18n/eo/client.json
new file mode 100644
index 0000000000000000000000000000000000000000..c6ce38ec9a6db1b282fcad58d16f202df1ba5eb2
--- /dev/null
+++ b/resources/static/i18n/eo/client.json
@@ -0,0 +1,177 @@
+var json_locale_data = {
+   "client" : {
+      "" : {
+         "MIME-Version" : " 1.0",
+         "POT-Creation-Date" : " 2012-01-20 12:38+0000",
+         "Language" : " ",
+         "Last-Translator" : " FULL NAME <EMAIL@ADDRESS>",
+         "Content-Type" : " text/plain; charset=UTF-8",
+         "PO-Revision-Date" : " YEAR-MO-DA HO:MI+ZONE",
+         "Language-Team" : " LANGUAGE <LL@li.org>",
+         "Content-Transfer-Encoding" : " 8bit",
+         "Project-Id-Version" : " PACKAGE VERSION",
+         "Report-Msgid-Bugs-To" : " "
+      },
+      "Always sign in using this email" : [
+         null,
+         "‮∀ʅʍɐʎs sıƃu ıu nsıuƃ ʇɥıs ǝɯɐıʅ"
+      ],
+      "next" : [
+         null,
+         "‮uǝxʇ"
+      ],
+      "This email looks new, so let&apos;s get you set up." : [
+         null,
+         "‮⊥ɥıs ǝɯɐıʅ ʅooʞs uǝʍ´ so ʅǝʇ&apos;‮s ƃǝʇ ʎon sǝʇ nd·"
+      ],
+      "Sign in using" : [
+         null,
+         "‮Sıƃu ıu nsıuƃ"
+      ],
+      "You are offline!" : [
+         null,
+         ""
+      ],
+      "Password" : [
+         null,
+         "‮Ԁɐssʍoɹp"
+      ],
+      "We sent a confirmation email to <strong>%s</strong>" : [
+         null,
+         "‮Ｍǝ sǝuʇ ɐ ɔouɟıɹɯɐʇıou ǝɯɐıʅ ʇo <strong>%s</strong>"
+      ],
+      "To finish signing in just click the verify link we sent to your email address." : [
+         null,
+         "‮⊥o ɟıuısɥ sıƃuıuƃ ıu ɾnsʇ ɔʅıɔʞ ʇɥǝ ʌǝɹıɟʎ ʅıuʞ ʍǝ sǝuʇ ʇo ʎonɹ ǝɯɐıʅ ɐppɹǝss·"
+      ],
+      "forgot your password?" : [
+         null,
+         "‮ɟoɹƃoʇ ʎonɹ dɐssʍoɹp?"
+      ],
+      "We are sorry, but we cannot communicate with BrowserID while you are offline." : [
+         null,
+         ""
+      ],
+      "This field must be an email address." : [
+         null,
+         "‮⊥ɥıs ɟıǝʅp ɯnsʇ qǝ ɐu ǝɯɐıʅ ɐppɹǝss·"
+      ],
+      "Cancel" : [
+         null,
+         ""
+      ],
+      "Email" : [
+         null,
+         "‮Ǝɯɐıʅ"
+      ],
+      "To verify that you own <strong id='primary_email'>%s</strong>, you must sign in with your provider.  This window will be redirected to" : [
+         null,
+         ""
+      ],
+      "Reset Password" : [
+         null,
+         "‮Ԁɐssʍoɹp"
+      ],
+      "select email" : [
+         null,
+         "‮sǝʅǝɔʇ ǝɯɐıʅ"
+      ],
+      "To verify that you own this address, you must sign in with your provider.  This window will be redirected to" : [
+         null,
+         ""
+      ],
+      "Verify With Email Provider" : [
+         null,
+         ""
+      ],
+      "This is not me..." : [
+         null,
+         "‮⊥ɥıs ıs uoʇ ɯǝ···"
+      ],
+      "We just sent an email to that address!  If you really want to send another, wait a minute or two and try again." : [
+         null,
+         "‮Ｍǝ ɾnsʇ sǝuʇ ɐu ǝɯɐıʅ ʇo ʇɥɐʇ ɐppɹǝss¡  Iɟ ʎon ɹǝɐʅʅʎ ʍɐuʇ ʇo sǝup ɐuoʇɥǝɹ´ ʍɐıʇ ɐ ɯıunʇǝ oɹ ʇʍo ɐup ʇɹʎ ɐƃɐıu·"
+      ],
+      "cancel" : [
+         null,
+         ""
+      ],
+      "The password field is required." : [
+         null,
+         "‮⊥ɥǝ dɐssʍoɹp ɟıǝʅp ıs ɹǝbnıɹǝp·"
+      ],
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again." : [
+         null,
+         "‮Ｍǝ ɾnsʇ sǝuʇ ɐu ǝɯɐıʅ ʇo ʇɥɐʇ ɐppɹǝss¡  Iɟ ʎon ɹǝɐʅʅʎ ʍɐuʇ ʇo sǝup ɐuoʇɥǝɹ´ ʍɐıʇ ɐ ɯıunʇǝ oɹ ʇʍo ɐup ʇɹʎ ɐƃɐıu·"
+      ],
+      "To continue, please close the window and enter a valid address." : [
+         null,
+         ""
+      ],
+      "add" : [
+         null,
+         ""
+      ],
+      "Enter your email address to sign in to <strong>%s</strong>" : [
+         null,
+         "‮Ǝuʇǝɹ ʎonɹ ǝɯɐıʅ ɐppɹǝss ʇo sıƃu ıu ʇo <strong>%s</strong>"
+      ],
+      "translated text" : [
+         null,
+         ""
+      ],
+      "The email field is required." : [
+         null,
+         "‮⊥ɥǝ ǝɯɐıʅ ɟıǝʅp ıs ɹǝbnıɹǝp·"
+      ],
+      "verify email" : [
+         null,
+         "‮ʌǝɹıɟʎ ǝɯɐıʅ"
+      ],
+      "New email address" : [
+         null,
+         ""
+      ],
+      "That address is already added to your account!" : [
+         null,
+         ""
+      ],
+      "Verify" : [
+         null,
+         ""
+      ],
+      "sign in" : [
+         null,
+         "‮sıƃu ıu"
+      ],
+      "The account cannot be logged in with this username and password." : [
+         null,
+         "‮⊥ɥǝ ɐɔɔonuʇ ɔɐuuoʇ qǝ ʅoƃƃǝp ıu ʍıʇɥ ʇɥıs nsǝɹuɐɯǝ ɐup dɐssʍoɹp·"
+      ],
+      "Welcome to BrowserID!" : [
+         null,
+         "‮Ｍǝʅɔoɯǝ ʇo ԐɹoʍsǝɹIᗡ¡"
+      ],
+      "*%s* is not a valid email address!" : [
+         null,
+         "‮⊥ɥıs ɟıǝʅp ɯnsʇ qǝ ɐu ǝɯɐıʅ ɐppɹǝss·"
+      ],
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" class=\"cancelVerify\" id=\"back\">use another email address</a>." : [
+         null,
+         "‮Iɟ ʇɥıs ıs ɐ ɯısʇɐʞǝ´ ɾnsʇ ıƃuoɹǝ ʇɥǝ sǝuʇ ǝɯɐıʅ ɐup <a href=\"#\" class=\"cancelVerify\" id=\"back\">‮nsǝ ɐuoʇɥǝɹ ǝɯɐıʅ ɐppɹǝss</a>‮·"
+      ],
+      "Check your email!" : [
+         null,
+         "‮Ↄɥǝɔʞ ʎonɹ ǝɯɐıʅ¡"
+      ],
+      "The site requested you sign in using" : [
+         null,
+         ""
+      ],
+      "Use a different email" : [
+         null,
+         "‮∩sǝ ɐ pıɟɟǝɹǝuʇ ǝɯɐıʅ"
+      ]
+   }
+}
+;
diff --git a/resources/static/i18n/eo/messages.json b/resources/static/i18n/eo/messages.json
new file mode 100644
index 0000000000000000000000000000000000000000..f649c92fafd843f451cfe308f9e892caa1098749
--- /dev/null
+++ b/resources/static/i18n/eo/messages.json
@@ -0,0 +1,141 @@
+var json_locale_data = {
+   "messages" : {
+      "Error encountered trying to complete registration." : [
+         null,
+         "‮Ǝɹɹoɹ ǝuɔonuʇǝɹǝp ʇɹʎıuƃ ʇo ɔoɯdʅǝʇǝ ɹǝƃısʇɹɐʇıou·"
+      ],
+      "" : {
+         "MIME-Version" : " 1.0",
+         "POT-Creation-Date" : " 2012-01-20 12:38+0000",
+         "Language" : " ",
+         "Last-Translator" : " FULL NAME <EMAIL@ADDRESS>",
+         "Content-Type" : " text/plain; charset=UTF-8",
+         "PO-Revision-Date" : " YEAR-MO-DA HO:MI+ZONE",
+         "Language-Team" : " LANGUAGE <LL@li.org>",
+         "Content-Transfer-Encoding" : " 8bit",
+         "Project-Id-Version" : " PACKAGE VERSION",
+         "Report-Msgid-Bugs-To" : " "
+      },
+      "BrowserID" : [
+         null,
+         "‮ԐɹoʍsǝɹIᗡ"
+      ],
+      "Verification password is required." : [
+         null,
+         "‮Ʌǝɹıɟıɔɐʇıou dɐssʍoɹp ıs ɹǝbnıɹǝp·"
+      ],
+      "Finish signing into: " : [
+         null,
+         "‮Ⅎıuısɥ sıƃuıuƃ ıuʇo: "
+      ],
+      "Your Email" : [
+         null,
+         "‮⅄onɹ Ǝɯɐıʅ"
+      ],
+      "Error comunicating with server." : [
+         null,
+         "‮Ǝɹɹoɹ ɔoɯnuıɔɐʇıuƃ ʍıʇɥ sǝɹʌǝɹ·"
+      ],
+      "Last step!" : [
+         null,
+         "‮⅂ɐsʇ sʇǝd¡"
+      ],
+      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>" : [
+         null,
+         "‮ԐɹoʍsǝɹIᗡ ıs ʇɥǝ ɟɐsʇ ɐup sǝɔnɹǝ ʍɐʎ ʇo sıƃu ıu &mdash;‮ <a target=\"_blank\" href=\"/about\">‮ʅǝɐɹu ɯoɹǝ</a>"
+      ],
+      "Your new address is set up and you should now be signed in. You may now close this window and go back to" : [
+         null,
+         "‮⅄onɹ uǝʍ ɐppɹǝss ıs sǝʇ nd ɐup ʎon sɥonʅp uoʍ qǝ sıƃuǝp ıu· ⅄on ɯɐʎ uoʍ ɔʅosǝ ʇɥıs ʍıupoʍ ɐup ƃo qɐɔʞ ʇo"
+      ],
+      "Verify Password" : [
+         null,
+         "‮Ʌǝɹıɟʎ Ԁɐssʍoɹp"
+      ],
+      "Password must be between 8 and 80 characters long." : [
+         null,
+         "‮Ԁɐssʍoɹp ɯnsʇ qǝ qǝʇʍǝǝu 8‮ ɐup 80‮ ɔɥɐɹɐɔʇǝɹs ʅouƃ·"
+      ],
+      "(A better way to sign in)" : [
+         null,
+         "‮(∀ qǝʇʇǝɹ ʍɐʎ ʇo sıƃu ıu)"
+      ],
+      "Finish registration by clicking this link:" : [
+         null,
+         "‮Ⅎıuısɥ ɹǝƃısʇɹɐʇıou qʎ ɔʅıɔʞıuƃ ʇɥıs ʅıuʞ:"
+      ],
+      "Thanks," : [
+         null,
+         "‮⊥ɥɐuʞs´"
+      ],
+      "Communicating with server" : [
+         null,
+         "‮Ↄoɯɯnuıɔɐʇıuƃ ʍıʇɥ sǝɹʌǝɹ"
+      ],
+      "Enter a Password" : [
+         null,
+         "‮Ǝuʇǝɹ ɐ Ԁɐssʍoɹp"
+      ],
+      "Error encountered while attempting to confirm your address. Have you previously verified this address?" : [
+         null,
+         "‮Ǝɹɹoɹ ǝuɔonuʇǝɹǝp ʍɥıʅǝ ɐʇʇǝɯdʇıuƃ ʇo ɔouɟıɹɯ ʎonɹ ɐppɹǝss· Hɐʌǝ ʎon dɹǝʌıonsʅʎ ʌǝɹıɟıǝp ʇɥıs ɐppɹǝss?"
+      ],
+      "Thank you for signing up with <strong>BrowserID</strong>. You can now use your <strong>BrowserID</strong> account to <em>Sign In</em> or <em>Sign Up</em> to websites all across the web!" : [
+         null,
+         "‮⊥ɥɐuʞ ʎon ɟoɹ sıƃuıuƃ nd ʍıʇɥ <strong>‮ԐɹoʍsǝɹIᗡ</strong>‮· ⅄on ɔɐu uoʍ nsǝ ʎonɹ <strong>‮ԐɹoʍsǝɹIᗡ</strong>‮ ɐɔɔonuʇ ʇo <em>‮Sıƃu Iu</em>‮ oɹ <em>‮Sıƃu ∩d</em>‮ ʇo ʍǝqsıʇǝs ɐʅʅ ɐɔɹoss ʇɥǝ ʍǝq¡"
+      ],
+      "Email Verification" : [
+         null,
+         "‮Ǝɯɐıʅ Ʌǝɹıɟıɔɐʇıou"
+      ],
+      "<strong class=\"email\">Your address</strong> has been verified!" : [
+         null,
+         "<strong class=\"email\">‮⅄onɹ ɐppɹǝss</strong>‮ ɥɐs qǝǝu ʌǝɹıɟıǝp¡"
+      ],
+      "Finish" : [
+         null,
+         "‮Ⅎıuısɥ"
+      ],
+      "Browser ID" : [
+         null,
+         "‮Ԑɹoʍsǝɹ Iᗡ"
+      ],
+      "There was a problem with your signup link.  Has this address already been registered?" : [
+         null,
+         "‮⊥ɥǝɹǝ ʍɐs ɐ dɹoqʅǝɯ ʍıʇɥ ʎonɹ sıƃund ʅıuʞ·  Hɐs ʇɥıs ɐppɹǝss ɐʅɹǝɐpʎ qǝǝu ɹǝƃısʇǝɹǝp?"
+      ],
+      "Passwords do not match." : [
+         null,
+         "‮Ԁɐssʍoɹps po uoʇ ɯɐʇɔɥ·"
+      ],
+      "Password is required." : [
+         null,
+         "‮Ԁɐssʍoɹp ıs ɹǝbnıɹǝp·"
+      ],
+      "New Password" : [
+         null,
+         "‮Nǝʍ Ԁɐssʍoɹp"
+      ],
+      "Complete Login to %s using BrowserID" : [
+         null,
+         "‮Ↄoɯdʅǝʇǝ ⅂oƃıu ʇo %s‮ nsıuƃ ԐɹoʍsǝɹIᗡ"
+      ],
+      "Repeat Password" : [
+         null,
+         "‮ᴚǝdǝɐʇ Ԁɐssʍoɹp"
+      ],
+      "Just a moment while we talk with the server." : [
+         null,
+         "‮ſnsʇ ɐ ɯoɯǝuʇ ʍɥıʅǝ ʍǝ ʇɐʅʞ ʍıʇɥ ʇɥǝ sǝɹʌǝɹ·"
+      ],
+      "Email Address" : [
+         null,
+         "‮Ǝɯɐıʅ ∀ppɹǝss"
+      ],
+      "If you are NOT trying to sign into this site, just ignore this email." : [
+         null,
+         "‮Iɟ ʎon ɐɹǝ NO⊥ ʇɹʎıuƃ ʇo sıƃu ıuʇo ʇɥıs sıʇǝ´ ɾnsʇ ıƃuoɹǝ ʇɥıs ǝɯɐıʅ·"
+      ]
+   }
+}
+;
diff --git a/resources/static/shared/renderer.js b/resources/static/shared/renderer.js
index 1c6acdd6012d794dfb98dda8cf690a9e837c64c1..91ef971e9c92e56f112fbf2bbf3149cf83714c00 100644
--- a/resources/static/shared/renderer.js
+++ b/resources/static/shared/renderer.js
@@ -12,7 +12,8 @@ BrowserID.Renderer = (function() {
 
   function getTemplateHTML(templateName, vars) {
     var config,
-        templateText = bid.Templates[templateName];
+        templateText = bid.Templates[templateName],
+        vars = vars || {};
 
     if(templateText) {
       config = {
@@ -26,15 +27,13 @@ BrowserID.Renderer = (function() {
       };
     }
     // TODO(aok) Do caching like EJS below
-    if (vars) {
-      var params = {
-            "domain" : "client",
-            "locale_data" : json_locale_data
-      };
-      var gt = new Gettext(params);
-      vars['gettext'] = gt.gettext.bind(gt);
-      vars['format'] = gt.format.bind(gt);
-    }
+    var params = {
+          "domain" : "client",
+          "locale_data" : json_locale_data
+    };
+    var gt = new Gettext(params);
+    vars['gettext'] = gt.gettext.bind(gt);
+    vars['format'] = gt.format.bind(gt);
 
     var template = templateCache[templateName];
     if(!template) {
diff --git a/resources/static/test/qunit/shared/modules/cookie_check_unit_test.js b/resources/static/test/qunit/shared/modules/cookie_check_unit_test.js
index 607e02dda06ac19fc860466714a8be8be00772c1..86e49d7ca00cd65ead97619e4c02fb60b8a42671 100644
--- a/resources/static/test/qunit/shared/modules/cookie_check_unit_test.js
+++ b/resources/static/test/qunit/shared/modules/cookie_check_unit_test.js
@@ -50,6 +50,9 @@
     });
   });
 
+  /*
+  // XXX - disabling this test until we have the full solution for how we are going
+  // to interact with the backend.
   asyncTest("createController with cookies disabled - ready returns with false status, error shown", function() {
     transport.setContextInfo("cookies_enabled", false);
     createController({
@@ -60,5 +63,6 @@
       }
     });
   });
+  */
 }());
 
diff --git a/resources/static/test/qunit/shared/renderer_unit_test.js b/resources/static/test/qunit/shared/renderer_unit_test.js
index 4390cfa355fc032d6b4e0f771dfa28d1ba2cbb92..d65a20ecd4a4ee132b36d287d9fdb43ba7ee2451 100644
--- a/resources/static/test/qunit/shared/renderer_unit_test.js
+++ b/resources/static/test/qunit/shared/renderer_unit_test.js
@@ -46,6 +46,7 @@
     ok($("#formWrap > #templateInput").length && $("#formWrap > .contents"), "template appended to element instead of overwriting it");
 
   });
+
 }());