diff --git a/resources/static/dialog/views/forgot_password.ejs b/resources/static/dialog/views/forgot_password.ejs
index 09dfcdb40e80e7d17ab9b8d5bfff3e001dcfcf90..ef7a7145e064c814db3db44161d57759820d2ebb 100644
--- a/resources/static/dialog/views/forgot_password.ejs
+++ b/resources/static/dialog/views/forgot_password.ejs
@@ -4,27 +4,27 @@
 
   <strong>
   <% if (requiredEmail) { %>
-    The site requested you sign in using
+    <%= gettext('The site requested you sign in using') %>
   <% } else { %>
-    Sign in using
+    <%= gettext('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="email" class="sans" type="email" value="<%= email %>" disabled />
 
               <div id="could_not_add" class="tooltip" for="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>
 
       </ul>
 
       <div class="submit cf">
-          <button tabindex="1">Reset Password</button>
-          <button id="cancel_forgot_password" tabindex="2">Cancel</button>
+          <button tabindex="1"><%= gettext('Reset Password') %></button>
+          <button id="cancel_forgot_password" tabindex="2"><%= gettext('Cancel') %></button>
       </div>
   </div>
diff --git a/resources/static/i18n/db_LB/client.json b/resources/static/i18n/db_LB/client.json
index e218693a87fdae08d93c6aacdc213b95da9abc26..cffeba9725d7dfc29e4cb4a4b542d534d1f7d4a4 100644
--- a/resources/static/i18n/db_LB/client.json
+++ b/resources/static/i18n/db_LB/client.json
@@ -1,8 +1,12 @@
 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-18 16:46-0800",
+         "POT-Creation-Date" : " 2012-01-19 17:47-0800",
          "Last-Translator" : " FULL NAME <EMAIL@ADDRESS>",
          "Content-Type" : " text/plain; charset=UTF-8",
          "PO-Revision-Date" : " YEAR-MO-DA HO:MI+ZONE",
@@ -59,13 +63,21 @@ var json_locale_data = {
          null,
          "‮⊥ɥıs ɟıǝʅp ɯnsʇ qǝ ɐu ǝɯɐıʅ ɐppɹǝss·"
       ],
+      "Cancel" : [
+         null,
+         "‮Ↄɐuɔǝʅ"
+      ],
       "Email" : [
          null,
          "‮Ǝɯɐıʅ"
       ],
+      "Reset Password" : [
+         null,
+         "‮ᴚǝsǝʇ Ԁɐssʍoɹp"
+      ],
       "sign in" : [
          null,
-         "\"‮sıƃu ıu"
+         "‮sıƃu ıu"
       ],
       "The account cannot be logged in with this username and password." : [
          null,
@@ -95,6 +107,10 @@ var json_locale_data = {
          null,
          "‮Ↄɥǝɔʞ ʎonɹ ǝɯɐıʅ¡"
       ],
+      "The site requested you sign in using" : [
+         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·"
diff --git a/resources/static/i18n/db_LB/messages.json b/resources/static/i18n/db_LB/messages.json
index bbeff06c16dd896bb3cf022d49ee6acefb2ade19..a6179b1464eacf058dd3ff9bd850886b6b5e0eb8 100644
--- a/resources/static/i18n/db_LB/messages.json
+++ b/resources/static/i18n/db_LB/messages.json
@@ -6,7 +6,7 @@ var json_locale_data = {
       ],
       "" : {
          "MIME-Version" : " 1.0",
-         "POT-Creation-Date" : " 2012-01-18 16:46-0800",
+         "POT-Creation-Date" : " 2012-01-19 17:47-0800",
          "Last-Translator" : " FULL NAME <EMAIL@ADDRESS>",
          "Content-Type" : " text/plain; charset=UTF-8",
          "PO-Revision-Date" : " YEAR-MO-DA HO:MI+ZONE",
@@ -23,6 +23,10 @@ var json_locale_data = {
          null,
          "‮Ʌǝɹıɟıɔɐʇıou dɐssʍoɹp ıs ɹǝbnıɹǝp·"
       ],
+      "Communicating with server" : [
+         null,
+         "‮Ↄoɯɯnuıɔɐʇıuƃ ʍıʇɥ sǝɹʌǝɹ"
+      ],
       "Finish signing into: " : [
          null,
          "‮Ⅎıuısɥ sıƃuıuƃ ıuʇo: "
@@ -31,46 +35,6 @@ 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"
@@ -83,42 +47,66 @@ var json_locale_data = {
          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¡"
+      ],
       "Email Verification" : [
          null,
          "‮Ǝɯɐıʅ Ʌǝɹıɟıɔɐʇıou"
       ],
-      "<strong class=\"email\">Your address</strong> has been verified!" : [
+      "Error comunicating with server." : [
          null,
-         "<strong class=\"email\">‮⅄onɹ ɐppɹǝss</strong>‮ ɥɐs qǝǝu ʌǝɹıɟıǝp¡"
+         "‮Ǝɹɹoɹ ɔoɯnuıɔɐʇıuƃ ʍıʇɥ sǝɹʌǝɹ·"
+      ],
+      "Browser ID" : [
+         null,
+         "‮Ԑɹoʍsǝɹ Iᗡ"
       ],
       "Finish" : [
          null,
          "‮Ⅎıuısɥ"
       ],
-      "Browser ID" : [
+      "Last step!" : [
          null,
-         "‮Ԑɹoʍsǝɹ Iᗡ"
+         "‮⅂ɐsʇ sʇǝd¡"
       ],
       "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." : [
+      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>" : [
          null,
-         "‮Ԁɐssʍoɹps po uoʇ ɯɐʇɔɥ·"
+         "‮Ԑɹ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·"
       ],
+      "Passwords do not match." : [
+         null,
+         "‮Ԁɐ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" : [
+         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"
+      ],
       "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"
@@ -131,6 +119,18 @@ var json_locale_data = {
          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 ǝɯɐıʅ·"
diff --git a/resources/static/i18n/en_US/client.json b/resources/static/i18n/en_US/client.json
index d0c128d6542329ea57880db46a385986ff824378..3f850d316dfb70170b238ee81bbef8a4cd6b255f 100644
--- a/resources/static/i18n/en_US/client.json
+++ b/resources/static/i18n/en_US/client.json
@@ -1,9 +1,13 @@
 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-18 16:46-0800",
+         "POT-Creation-Date" : " 2012-01-19 17:47-0800",
          "Last-Translator" : " Austin King <ozten@mozilla.com>",
          "Content-Type" : " text/plain; charset=UTF-8",
          "PO-Revision-Date" : " 2012-01-10 17:32-0800",
@@ -18,7 +22,7 @@ var json_locale_data = {
       ],
       "next" : [
          null,
-         ""
+         "next"
       ],
       "Enter your email address to sign in to <strong>%s</strong>" : [
          null,
@@ -26,23 +30,23 @@ var json_locale_data = {
       ],
       "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"
       ],
       "Password" : [
          null,
-         ""
+         "Password"
       ],
       "We sent a confirmation email to <strong>%s</strong>" : [
          null,
@@ -54,15 +58,23 @@ var json_locale_data = {
       ],
       "forgot your password?" : [
          null,
-         ""
+         "forgot your password?"
       ],
       "This field must be an email address." : [
+         null,
+         "This field must be an email address."
+      ],
+      "Cancel" : [
          null,
          ""
       ],
       "Email" : [
          null,
-         ""
+         "Email"
+      ],
+      "Reset Password" : [
+         null,
+         "Password"
       ],
       "sign in" : [
          null,
@@ -70,11 +82,11 @@ var json_locale_data = {
       ],
       "The account cannot be logged in with this username and password." : [
          null,
-         ""
+         "The account cannot be logged in with this username and password."
       ],
       "select email" : [
          null,
-         ""
+         "select email"
       ],
       "This is not me..." : [
          null,
@@ -82,11 +94,11 @@ var json_locale_data = {
       ],
       "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." : [
          null,
-         ""
+         "We just sent an email to that address!  If you really want to send another, wait a minute or two and try again."
       ],
       "If this is a mistake, just ignore the sent email and <a href=\"#\" class=\"cancelVerify\" id=\"back\">use another email address</a>." : [
          null,
@@ -96,10 +108,14 @@ var json_locale_data = {
          null,
          ""
       ],
-      "The password field is required." : [
+      "The site requested you sign in using" : [
          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 2a1e0a76a2c1abba73922edd79e093defb630c3f..ea9b5b02f0192d1f01afbeab8d92f10b4fe0bcb0 100644
--- a/resources/static/i18n/en_US/messages.json
+++ b/resources/static/i18n/en_US/messages.json
@@ -6,7 +6,7 @@ var json_locale_data = {
       ],
       "" : {
          "MIME-Version" : " 1.0",
-         "POT-Creation-Date" : " 2012-01-18 16:46-0800",
+         "POT-Creation-Date" : " 2012-01-19 17:47-0800",
          "Last-Translator" : " FULL NAME <EMAIL@ADDRESS>",
          "Content-Type" : " text/plain; charset=UTF-8",
          "PO-Revision-Date" : " YEAR-MO-DA HO:MI+ZONE",
@@ -23,111 +23,111 @@ var json_locale_data = {
          null,
          ""
       ],
-      "Finish signing into: " : [
+      "Communicating with server" : [
          null,
          ""
       ],
-      "Your Email" : [
+      "Finish signing into: " : [
          null,
          ""
       ],
-      "Error comunicating with server." : [
+      "Your Email" : [
          null,
          ""
       ],
-      "Last step!" : [
+      "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,
          ""
       ],
-      "Your new address is set up and you should now be signed in. You may now close this window and go back to" : [
+      "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,
          ""
       ],
-      "Verify Password" : [
+      "<strong class=\"email\">Your address</strong> has been verified!" : [
          null,
          ""
       ],
-      "Password must be between 8 and 80 characters long." : [
+      "Email Verification" : [
          null,
          ""
       ],
-      "(A better way to sign in)" : [
+      "Error comunicating with server." : [
          null,
          ""
       ],
-      "Finish registration by clicking this link:" : [
+      "Browser ID" : [
          null,
          ""
       ],
-      "Thanks," : [
+      "Finish" : [
          null,
          ""
       ],
-      "Communicating with server" : [
+      "Last step!" : [
          null,
          ""
       ],
-      "Enter a Password" : [
+      "There was a problem with your signup link.  Has this address already been registered?" : [
          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!" : [
+      "Password is required." : [
          null,
          ""
       ],
-      "Email Verification" : [
+      "Passwords do not match." : [
          null,
          ""
       ],
-      "<strong class=\"email\">Your address</strong> has been verified!" : [
+      "Your new address is set up and you should now be signed in. You may now close this window and go back to" : [
          null,
          ""
       ],
-      "Finish" : [
+      "New Password" : [
          null,
          ""
       ],
-      "Browser ID" : [
+      "Verify Password" : [
          null,
          ""
       ],
-      "There was a problem with your signup link.  Has this address already been registered?" : [
+      "Complete Login to %s using BrowserID" : [
          null,
          ""
       ],
-      "Passwords do not match." : [
+      "Password must be between 8 and 80 characters long." : [
          null,
          ""
       ],
-      "Password is required." : [
+      "Repeat Password" : [
          null,
          ""
       ],
-      "New Password" : [
+      "Just a moment while we talk with the server." : [
          null,
          ""
       ],
-      "Complete Login to %s using BrowserID" : [
+      "Email Address" : [
          null,
          ""
       ],
-      "Repeat Password" : [
+      "(A better way to sign in)" : [
          null,
          ""
       ],
-      "Just a moment while we talk with the server." : [
+      "Finish registration by clicking this link:" : [
          null,
          ""
       ],
-      "Email Address" : [
+      "Thanks," : [
          null,
          ""
       ],