diff --git a/resources/static/i18n/db_LB/client.json b/resources/static/i18n/db_LB/client.json
index 6bb478793b45e2b15668ae6714365bd365b734fc..d89c69da871cc7174c63c6d18850baba47af9c58 100644
--- a/resources/static/i18n/db_LB/client.json
+++ b/resources/static/i18n/db_LB/client.json
@@ -1,8 +1,13 @@
 var json_locale_data = {
    "client" : {
+      "Cancelling User Account" : [
+         null,
+         "‮Ↄɐuɔǝʅʅıuƃ ∩sǝɹ ∀ɔɔonuʇ"
+      ],
       "" : {
          "MIME-Version" : " 1.0",
-         "POT-Creation-Date" : " 2012-01-20 13:06-0800",
+         "POT-Creation-Date" : " 2012-01-20 21:33+0000",
+         "Language" : " ",
          "Last-Translator" : " FULL NAME <EMAIL@ADDRESS>",
          "Content-Type" : " text/plain; charset=UTF-8",
          "PO-Revision-Date" : " YEAR-MO-DA HO:MI+ZONE",
@@ -15,21 +20,25 @@ var json_locale_data = {
          null,
          "‮∀ʅʍɐʎs sıƃu ıu nsıuƃ ʇɥıs ǝɯɐıʅ"
       ],
-      "next" : [
+      "Sync Keys for Address" : [
          null,
-         "‮uǝxʇ"
+         "‮Sʎuɔ Ӽǝʎs ɟoɹ ∀ppɹǝss"
       ],
-      "This email looks new, so let&apos;s get you set up." : [
+      "Syncing Email Addresses" : [
+         null,
+         "‮Sʎuɔıuƃ Ǝɯɐıʅ ∀ppɹǝssǝs"
+      ],
+      "Unfortunately, BrowserID cannot communicate while offline!" : [
          null,
-         "‮⊥ɥıs ǝɯɐıʅ ʅooʞs uǝʍ´ so ʅǝʇ&apos;‮s ƃǝʇ ʎon sǝʇ nd·"
+         "‮∩uɟoɹʇnuɐʇǝʅʎ´ ԐɹoʍsǝɹIᗡ ɔɐuuoʇ ɔoɯɯnuıɔɐʇǝ ʍɥıʅǝ oɟɟʅıuǝ¡"
       ],
       "Sign in using" : [
          null,
          "‮Sıƃu ıu nsıuƃ"
       ],
-      "You are offline!" : [
+      "Relay frame could not be found" : [
          null,
-         "‮⅄on ɐɹǝ oɟɟʅıuǝ¡"
+         "‮ᴚǝʅɐʎ ɟɹɐɯǝ ɔonʅp uoʇ qǝ ɟonup"
       ],
       "Password" : [
          null,
@@ -41,115 +50,275 @@ 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?" : [
+      "Cancel" : [
          null,
-         "‮ɟoɹƃoʇ ʎonɹ dɐssʍoɹp?"
+         "‮Ↄɐuɔǝʅ"
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline." : [
+      "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"
+      ],
+      "Authenticating with Assertion" : [
+         null,
+         "‮∀nʇɥǝuʇıɔɐʇıuƃ ʍıʇɥ ∀ssǝɹʇıou"
+      ],
+      "Reset Password" : [
+         null,
+         "‮ᴚǝsǝʇ Ԁɐssʍoɹp"
+      ],
+      "Resetting Password" : [
+         null,
+         "‮ᴚǝsǝʇʇıuƃ Ԁɐssʍoɹp"
+      ],
+      "Logout Failed" : [
+         null,
+         "‮⅂oƃonʇ Ⅎɐıʅǝp"
+      ],
+      "Checking Email Address" : [
+         null,
+         "‮Ↄɥǝɔʞıuƃ Ǝɯɐıʅ ∀ppɹǝss"
+      ],
+      "To verify that you own this address, you must sign in with your provider.  This window will be redirected to" : [
+         null,
+         "‮⊥o ʌǝɹıɟʎ ʇɥɐʇ ʎon oʍu ʇɥıs ɐppɹǝss´ ʎon ɯnsʇ sıƃu ıu ʍıʇɥ ʎonɹ dɹoʌıpǝɹ˙  ⊥ɥıs ʍıupoʍ ʍıʅʅ qǝ ɹǝpıɹǝɔʇǝp ʇo"
+      ],
+      "This is not me..." : [
+         null,
+         "‮⊥ɥıs ıs uoʇ ɯǝ˙˙˙"
+      ],
+      "In just a moment you'll be signed into BrowserID." : [
+         null,
+         "‮Iu ɾnsʇ ɐ ɯoɯǝuʇ ʎon,ʅʅ qǝ sıƃuǝp ıuʇo ԐɹoʍsǝɹIᗡ˙"
+      ],
+      "We are sorry, BrowserID requires cookies" : [
+         null,
+         "‮Ｍǝ ɐɹǝ soɹɹʎ´ ԐɹoʍsǝɹIᗡ ɹǝbnıɹǝs ɔooʞıǝs"
+      ],
+      "Getting Assertion" : [
+         null,
+         "‮⅁ǝʇʇıuƃ ∀ssǝɹʇıou"
+      ],
+      "Completing User Registration" : [
+         null,
+         "‮Ↄoɯdʅǝʇıuƃ ∩sǝɹ ᴚǝƃısʇɹɐʇıou"
+      ],
+      "Registration Failed" : [
+         null,
+         "‮ᴚǝƃısʇɹɐʇıou Ⅎɐıʅǝp"
+      ],
+      "This message will go away when the request completes (hopefully soon).  If you wait too long, close this window and try again." : [
+         null,
+         "‮⊥ɥıs ɯǝssɐƃǝ ʍıʅʅ ƃo ɐʍɐʎ ʍɥǝu ʇɥǝ ɹǝbnǝsʇ ɔoɯdʅǝʇǝs (ɥodǝɟnʅʅʎ soou)˙  Iɟ ʎon ʍɐıʇ ʇoo ʅouƃ´ ɔʅosǝ ʇɥıs ʍıupoʍ ɐup ʇɹʎ ɐƃɐıu˙"
+      ],
+      "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"
+      ],
+      "Checking if Cookies are Enabled" : [
+         null,
+         "‮Ↄɥǝɔʞıuƃ ıɟ Ↄooʞıǝs ɐɹǝ Ǝuɐqʅǝp"
+      ],
+      "Provisioning Unsupported Identity Provider" : [
+         null,
+         "‮Ԁɹoʌısıouıuƃ ∩usnddoɹʇǝp Ipǝuʇıʇʎ Ԁɹoʌıpǝɹ"
+      ],
+      "That address is already added to your account!" : [
+         null,
+         "‮⊥ɥɐʇ ɐppɹǝss ıs ɐʅɹǝɐpʎ ɐppǝp ʇo ʎonɹ ɐɔɔonuʇ¡"
+      ],
+      "Authenticating with Identity Provider" : [
+         null,
+         "‮∀nʇɥǝuʇıɔɐʇıuƃ ʍıʇɥ Ipǝuʇıʇʎ Ԁɹoʌıpǝɹ"
+      ],
+      "Remove Email Address from Account" : [
+         null,
+         "‮ᴚǝɯoʌǝ Ǝɯɐıʅ ∀ppɹǝss ɟɹoɯ ∀ɔɔonuʇ"
+      ],
+      "Communication Error" : [
+         null,
+         "‮Ↄoɯɯnuıɔɐʇıou Ǝɹɹoɹ"
+      ],
+      "Provisioning with Identity Provider" : [
+         null,
+         "‮Ԁɹoʌısıouıuƃ ʍıʇɥ Ipǝuʇıʇʎ Ԁɹoʌıpǝɹ"
+      ],
+      "Adding Address" : [
+         null,
+         "‮∀ppıuƃ ∀ppɹǝss"
+      ],
+      "Check your email!" : [
+         null,
+         "‮Ↄɥǝɔʞ ʎonɹ ǝɯɐıʅ¡"
+      ],
+      "The site requested you sign in using" : [
+         null,
+         "‮⊥ɥǝ sıʇǝ ɹǝbnǝsʇǝp ʎon sıƃu ıu nsıuƃ"
+      ],
+      "Syncing Address" : [
          null,
-         "‮Ｍǝ ɐɹǝ soɹɹʎ´ qnʇ ʍǝ ɔɐuuoʇ ɔoɯɯnuıɔɐʇǝ ʍıʇɥ ԐɹoʍsǝɹIᗡ ʍɥıʅǝ ʎon ɐɹǝ oɟɟʅıuǝ·"
+         "‮Sʎuɔıuƃ ∀ppɹǝss"
+      ],
+      "Use a different email" : [
+         null,
+         "‮∩sǝ ɐ pıɟɟǝɹǝuʇ ǝɯɐıʅ"
+      ],
+      "next" : [
+         null,
+         "‮uǝxʇ"
+      ],
+      "Verifying email address" : [
+         null,
+         "‮Ʌǝɹıɟʎıuƃ ǝɯɐıʅ ɐppɹǝss"
+      ],
+      "Signup Failed" : [
+         null,
+         "‮Sıƃund Ⅎɐıʅǝp"
+      ],
+      "This email looks new, so let&apos;s get you set up." : [
+         null,
+         "‮⊥ɥıs ǝɯɐıʅ ʅooʞs uǝʍ´ so ʅǝʇ&apos;‮s ƃǝʇ ʎon sǝʇ nd˙"
+      ],
+      "Checking Script Version" : [
+         null,
+         "‮Ↄɥǝɔʞıuƃ Sɔɹıdʇ Ʌǝɹsıou"
+      ],
+      "You are offline!" : [
+         null,
+         "‮⅄on ɐɹǝ oɟɟʅıuǝ¡"
+      ],
+      "Unfortunately, the email address provided cannot act as a Primary Identity Provider" : [
+         null,
+         "‮∩uɟoɹʇnuɐʇǝʅʎ´ ʇɥǝ ǝɯɐıʅ ɐppɹǝss dɹoʌıpǝp ɔɐuuoʇ ɐɔʇ ɐs ɐ Ԁɹıɯɐɹʎ Ipǝuʇıʇʎ Ԁɹoʌıpǝɹ"
+      ],
+      "Checking Authentication" : [
+         null,
+         "‮Ↄɥǝɔʞıuƃ ∀nʇɥǝuʇıɔɐʇıou"
+      ],
+      "Getting Token Info" : [
+         null,
+         "‮⅁ǝʇʇıuƃ ⊥oʞǝu Iuɟo"
+      ],
+      "forgot your password?" : [
+         null,
+         "‮ɟoɹƃoʇ ʎonɹ dɐssʍoɹp¿"
       ],
       "This field must be an email address." : [
          null,
-         "‮⊥ɥıs ɟıǝʅp ɯnsʇ qǝ ɐu ǝɯɐıʅ ɐppɹǝss·"
+         "‮⊥ɥıs ɟıǝʅp ɯnsʇ qǝ ɐu ǝɯɐıʅ ɐppɹǝss˙"
       ],
-      "Cancel" : [
+      "We are sorry, but we cannot communicate with BrowserID while you are offline." : [
          null,
-         "‮Ↄɐuɔǝʅ"
+         "‮Ｍǝ ɐɹǝ soɹɹʎ´ qnʇ ʍǝ ɔɐuuoʇ ɔoɯɯnuıɔɐʇǝ ʍıʇɥ ԐɹoʍsǝɹIᗡ ʍɥıʅǝ ʎon ɐɹǝ oɟɟʅıuǝ˙"
+      ],
+      "Authenticating User" : [
+         null,
+         "‮∀nʇɥǝuʇıɔɐʇıuƃ ∩sǝɹ"
       ],
       "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" : [
+      "Setting Password" : [
          null,
-         "‮⊥o ʌǝɹıɟʎ ʇɥɐʇ ʎon oʍu <sʇɹouƃ ıp=,dɹıɯɐɹʎ_ǝɯɐıʅ,>%s</strong>‮´ ʎon ɯnsʇ sıƃu ıu ʍıʇɥ ʎonɹ dɹoʌıpǝɹ·  ⊥ɥıs ʍıupoʍ ʍıʅʅ qǝ ɹǝpıɹǝɔʇǝp ʇo"
+         "‮Sǝʇʇıuƃ Ԁɐssʍoɹp"
       ],
       "Finishing Sign In..." : [
          null,
-         "‮Ⅎıuısɥıuƃ Sıƃu Iu···"
-      ],
-      "Reset Password" : [
-         null,
-         "‮ᴚǝsǝʇ Ԁɐssʍoɹp"
+         "‮Ⅎıuısɥıuƃ Sıƃu Iu˙˙˙"
       ],
       "select email" : [
          null,
          "‮sǝʅǝɔʇ ǝɯɐıʅ"
       ],
-      "To verify that you own this address, you must sign in with your provider.  This window will be redirected to" : [
+      "Checking Address Info" : [
+         null,
+         "‮Ↄɥǝɔʞıuƃ ∀ppɹǝss Iuɟo"
+      ],
+      "Adding Primary Email Address to User" : [
          null,
-         "‮⊥o ʌǝɹıɟʎ ʇɥɐʇ ʎon oʍu ʇɥıs ɐppɹǝss´ ʎon ɯnsʇ sıƃu ıu ʍıʇɥ ʎonɹ dɹoʌıpǝɹ·  ⊥ɥıs ʍıupoʍ ʍıʅʅ qǝ ɹǝpıɹǝɔʇǝp ʇo"
+         "‮∀ppıuƃ Ԁɹıɯɐɹʎ Ǝɯɐıʅ ∀ppɹǝss ʇo ∩sǝɹ"
       ],
       "Verify With Email Provider" : [
          null,
          "‮Ʌǝɹıɟʎ Ｍıʇɥ Ǝɯɐıʅ Ԁɹoʌıpǝɹ"
       ],
-      "This is not me..." : [
+      "Checking Whether User is Authenticated with IdP" : [
          null,
-         "‮⊥ɥıs ıs uoʇ ɯǝ···"
+         "‮Ↄɥǝɔʞıuƃ Ｍɥǝʇɥǝɹ ∩sǝɹ ıs ∀nʇɥǝuʇıɔɐʇǝp ʍıʇɥ IpԀ"
       ],
-      "In just a moment you'll be signed into BrowserID." : [
+      "Updating password" : [
          null,
-         "‮Iu ɾnsʇ ɐ ɯoɯǝuʇ ʎon,ʅʅ qǝ sıƃuǝp ıuʇo ԐɹoʍsǝɹIᗡ·"
+         "‮∩dpɐʇıuƃ dɐssʍoɹ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·"
+         "‮Ｍǝ ɾnsʇ sǝuʇ ɐu ǝɯɐıʅ ʇo ʇɥɐʇ ɐppɹǝss¡  Iɟ ʎon ɹǝɐʅʅʎ ʍɐuʇ ʇo sǝup ɐuoʇɥǝɹ´ ʍɐıʇ ɐ ɯıunʇǝ oɹ ʇʍo ɐup ʇɹʎ ɐƃɐıu˙"
+      ],
+      "The password field is required." : [
+         null,
+         "‮⊥ɥǝ dɐssʍoɹp ɟıǝʅp ıs ɹǝbnıɹǝp˙"
       ],
       "cancel" : [
          null,
          "‮ɔɐuɔǝʅ"
       ],
-      "The password field is required." : [
+      "We had trouble communicating with your email provider, please try again!" : [
          null,
-         "‮⊥ɥǝ dɐssʍoɹp ɟıǝʅp ıs ɹǝbnıɹǝp·"
+         "‮Ｍǝ ɥɐp ʇɹonqʅǝ ɔoɯɯnuıɔɐʇıuƃ ʍıʇɥ ʎonɹ ǝɯɐıʅ dɹoʌıpǝɹ´ dʅǝɐsǝ ʇɹʎ ɐƃɐıu¡"
       ],
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again." : [
+      "Creating Account" : [
          null,
-         "‮Ｍǝ ɾnsʇ sǝuʇ ɐu ǝɯɐıʅ ʇo ʇɥɐʇ ɐppɹǝss¡ Iɟ ʎon ɹǝɐʅʅʎ ʍɐuʇ ʇo sǝup ɐuoʇɥǝɹ´ ʍɐıʇ ɐ ɯıunʇǝ oɹ ʇʍo ɐup ʇɹʎ ɐƃɐıu·"
+         "‮Ↄɹǝɐʇıuƃ ∀ɔɔonuʇ"
       ],
       "We are sorry, this request is taking a LOOONG time." : [
          null,
-         "‮Ｍǝ ɐɹǝ soɹɹʎ´ ʇɥıs ɹǝbnǝsʇ ıs ʇɐʞıuƃ ɐ ⅂OOON⅁ ʇıɯǝ·"
+         "‮Ｍǝ ɐɹǝ soɹɹʎ´ ʇɥıs ɹǝbnǝsʇ ıs ʇɐʞıuƃ ɐ ⅂OOON⅁ ʇıɯǝ˙"
       ],
-      "This message will go away when the request completes (hopefully soon).  If you wait too long, close this window and try again." : [
-         null,
-         "‮⊥ɥıs ɯǝssɐƃǝ ʍıʅʅ ƃo ɐʍɐʎ ʍɥǝu ʇɥǝ ɹǝbnǝsʇ ɔoɯdʅǝʇǝs (ɥodǝɟnʅʅʎ soou)·  Iɟ ʎon ʍɐıʇ ʇoo ʅouƃ´ ɔʅosǝ ʇɥıs ʍıupoʍ ɐup ʇɹʎ ɐƃɐıu·"
-      ],
-      "To continue, please close the window and enter a valid address." : [
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again." : [
          null,
-         "‮⊥o ɔouʇıunǝ´ dʅǝɐsǝ ɔʅosǝ ʇɥǝ ʍıupoʍ ɐup ǝuʇǝɹ ɐ ʌɐʅıp ɐppɹǝss·"
+         "‮Ｍǝ ɾnsʇ sǝuʇ ɐu ǝɯɐıʅ ʇo ʇɥɐʇ ɐppɹǝss¡ Iɟ ʎon ɹǝɐʅʅʎ ʍɐuʇ ʇo sǝup ɐuoʇɥǝɹ´ ʍɐıʇ ɐ ɯıunʇǝ oɹ ʇʍo ɐup ʇɹʎ ɐƃɐıu˙"
       ],
-      "add" : [
+      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again" : [
          null,
-         "‮ɐpp"
+         "‮ԐɹoʍsǝɹIᗡ ɹǝbnıɹǝs ʎonɹ qɹoʍsǝɹ,s ɔooʞıǝs ʇo qǝ ǝuɐqʅǝp ʇo odǝɹɐʇǝ˙  Ԁʅǝɐsǝ ǝuɐqʅǝ ʎonɹ qɹoʍsǝɹ,s ɔooʞıǝs ɐup ʇɹʎ ɐƃɐıu"
       ],
-      "Enter your email address to sign in to <strong>%s</strong>" : [
+      "Checking Registration Token" : [
          null,
-         "‮Ǝuʇǝɹ ʎonɹ ǝɯɐıʅ ɐppɹǝss ʇo sıƃu ıu ʇo <strong>%s</strong>"
+         "‮Ↄɥǝɔʞıuƃ ᴚǝƃısʇɹɐʇıou ⊥oʞǝu"
       ],
-      "translated text" : [
+      "add" : [
          null,
-         "‮ʇɹɐusʅɐʇǝp ʇǝxʇ"
+         "‮ɐpp"
       ],
-      "The email field is required." : [
+      "To continue, please close the window and enter a valid address." : [
          null,
-         "‮⊥ɥǝ ǝɯɐıʅ ɟıǝʅp ıs ɹǝbnıɹǝp·"
+         "‮⊥o ɔouʇıunǝ´ dʅǝɐsǝ ɔʅosǝ ʇɥǝ ʍıupoʍ ɐup ǝuʇǝɹ ɐ ʌɐʅıp ɐppɹǝss˙"
       ],
-      "New email address" : [
+      "Enter your email address to sign in to <strong>%s</strong>" : [
          null,
-         "‮Nǝʍ ǝɯɐıʅ ɐppɹǝss"
+         "‮Ǝuʇǝɹ ʎonɹ ǝɯɐıʅ ɐppɹǝss ʇo sıƃu ıu ʇo <strong>%s</strong>"
       ],
-      "verify email" : [
+      "Establishing Relay" : [
          null,
-         "‮ʌǝɹıɟʎ ǝɯɐıʅ"
+         "‮Ǝsʇɐqʅısɥıuƃ ᴚǝʅɐʎ"
       ],
-      "That address is already added to your account!" : [
+      "Signin Failed" : [
          null,
-         "‮⊥ɥɐʇ ɐppɹǝss ıs ɐʅɹǝɐpʎ ɐppǝp ʇo ʎonɹ ɐɔɔonuʇ¡"
+         "‮Sıƃuıu Ⅎɐıʅǝp"
       ],
       "Verify" : [
          null,
@@ -161,35 +330,23 @@ var json_locale_data = {
       ],
       "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·"
+         "‮⊥ɥǝ ɐɔɔ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‮⁎ ı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!" : [
+      "*%s* is not a valid email address!" : [
          null,
-         "‮Ↄɥǝɔʞ ʎonɹ ǝɯɐıʅ¡"
+         "‮⁎%s‮⁎ ıs uoʇ ɐ ʌɐʅıp ǝɯɐıʅ ɐppɹǝss¡"
       ],
       "Please wait a few seconds while we sign you into the site." : [
          null,
-         "‮Ԁʅǝɐsǝ ʍɐıʇ ɐ ɟǝʍ sǝɔoups ʍɥıʅǝ ʍǝ sıƃu ʎon ıuʇo ʇɥǝ sıʇǝ·"
-      ],
-      "The site requested you sign in using" : [
-         null,
-         "‮⊥ɥǝ sıʇǝ ɹǝbnǝsʇǝp ʎon sıƃu ıu nsıuƃ"
-      ],
-      "Use a different email" : [
-         null,
-         "‮∩sǝ ɐ pıɟɟǝɹǝuʇ ǝɯɐıʅ"
+         "‮Ԁʅǝɐsǝ ʍɐıʇ ɐ ɟǝʍ sǝɔoups ʍɥıʅǝ ʍǝ sıƃu ʎon ıuʇo ʇɥǝ sıʇǝ˙"
       ]
    }
 }
diff --git a/resources/static/i18n/db_LB/messages.json b/resources/static/i18n/db_LB/messages.json
index 5eeef3c71978bcebb189e23878c80ceba1c9f178..6db75f64493cf61dfce301890509f2d5f251bbfb 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-20 13:06-0800",
+         "POT-Creation-Date" : " 2012-01-20 21:33+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 873bf08b981c27e52dc05499a86896e766c0a275..819122d5846b6e2d39dcedd0371d0791100b6b1a 100644
--- a/resources/static/i18n/en_US/client.json
+++ b/resources/static/i18n/en_US/client.json
@@ -1,34 +1,43 @@
 var json_locale_data = {
    "client" : {
+      "Cancelling User Account" : [
+         null,
+         ""
+      ],
       "" : {
          "Plural-Forms" : " nplurals=2; plural=(n != 1);",
          "MIME-Version" : " 1.0",
-         "POT-Creation-Date" : " 2012-01-20 13:06-0800",
+         "POT-Creation-Date" : " 2012-01-20 21:33+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,
          ""
       ],
-      "next" : [
+      "Sync Keys for Address" : [
          null,
-         "next"
+         ""
       ],
-      "This email looks new, so let&apos;s get you set up." : [
+      "Syncing Email Addresses" : [
          null,
-         "This email looks new, so let&apos;s get you set up."
+         ""
+      ],
+      "Unfortunately, BrowserID cannot communicate while offline!" : [
+         null,
+         ""
       ],
       "Sign in using" : [
          null,
          "Sign in using"
       ],
-      "You are offline!" : [
+      "Relay frame could not be found" : [
          null,
          ""
       ],
@@ -44,19 +53,179 @@ var json_locale_data = {
          null,
          ""
       ],
-      "forgot your password?" : [
+      "Cancel" : [
          null,
-         "forgot your password?"
+         ""
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline." : [
+      "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,
+         ""
+      ],
+      "Authenticating with Assertion" : [
+         null,
+         ""
+      ],
+      "Reset Password" : [
+         null,
+         "Password"
+      ],
+      "Resetting Password" : [
+         null,
+         "Password"
+      ],
+      "Logout Failed" : [
+         null,
+         ""
+      ],
+      "Checking Email Address" : [
+         null,
+         ""
+      ],
+      "To verify that you own this address, you must sign in with your provider.  This window will be redirected to" : [
+         null,
+         ""
+      ],
+      "This is not me..." : [
+         null,
+         ""
+      ],
+      "In just a moment you'll be signed into BrowserID." : [
+         null,
+         ""
+      ],
+      "We are sorry, BrowserID requires cookies" : [
+         null,
+         ""
+      ],
+      "Getting Assertion" : [
+         null,
+         ""
+      ],
+      "Completing User Registration" : [
+         null,
+         ""
+      ],
+      "Registration Failed" : [
+         null,
+         ""
+      ],
+      "This message will go away when the request completes (hopefully soon).  If you wait too long, close this window and try again." : [
+         null,
+         ""
+      ],
+      "translated text" : [
+         null,
+         ""
+      ],
+      "The email field is required." : [
+         null,
+         "The email field is required."
+      ],
+      "verify email" : [
+         null,
+         "verify email"
+      ],
+      "New email address" : [
          null,
          ""
       ],
+      "Checking if Cookies are Enabled" : [
+         null,
+         ""
+      ],
+      "Provisioning Unsupported Identity Provider" : [
+         null,
+         ""
+      ],
+      "That address is already added to your account!" : [
+         null,
+         ""
+      ],
+      "Authenticating with Identity Provider" : [
+         null,
+         ""
+      ],
+      "Remove Email Address from Account" : [
+         null,
+         ""
+      ],
+      "Communication Error" : [
+         null,
+         ""
+      ],
+      "Provisioning with Identity Provider" : [
+         null,
+         ""
+      ],
+      "Adding Address" : [
+         null,
+         ""
+      ],
+      "Check your email!" : [
+         null,
+         ""
+      ],
+      "The site requested you sign in using" : [
+         null,
+         ""
+      ],
+      "Syncing Address" : [
+         null,
+         ""
+      ],
+      "Use a different email" : [
+         null,
+         ""
+      ],
+      "next" : [
+         null,
+         "next"
+      ],
+      "Verifying email address" : [
+         null,
+         "verify email"
+      ],
+      "Signup Failed" : [
+         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."
+      ],
+      "Checking Script Version" : [
+         null,
+         ""
+      ],
+      "You are offline!" : [
+         null,
+         ""
+      ],
+      "Unfortunately, the email address provided cannot act as a Primary Identity Provider" : [
+         null,
+         ""
+      ],
+      "Checking Authentication" : [
+         null,
+         ""
+      ],
+      "Getting Token Info" : [
+         null,
+         ""
+      ],
+      "forgot your password?" : [
+         null,
+         "forgot your password?"
+      ],
       "This field must be an email address." : [
          null,
          "This field must be an email address."
       ],
-      "Cancel" : [
+      "We are sorry, but we cannot communicate with BrowserID while you are offline." : [
+         null,
+         ""
+      ],
+      "Authenticating User" : [
          null,
          ""
       ],
@@ -64,23 +233,23 @@ 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" : [
+      "Setting Password" : [
          null,
-         ""
+         "Password"
       ],
       "Finishing Sign In..." : [
          null,
          ""
       ],
-      "Reset Password" : [
-         null,
-         "Password"
-      ],
       "select email" : [
          null,
          "select email"
       ],
-      "To verify that you own this address, you must sign in with your provider.  This window will be redirected to" : [
+      "Checking Address Info" : [
+         null,
+         ""
+      ],
+      "Adding Primary Email Address to User" : [
          null,
          ""
       ],
@@ -88,11 +257,11 @@ var json_locale_data = {
          null,
          ""
       ],
-      "This is not me..." : [
+      "Checking Whether User is Authenticated with IdP" : [
          null,
          ""
       ],
-      "In just a moment you'll be signed into BrowserID." : [
+      "Updating password" : [
          null,
          ""
       ],
@@ -100,58 +269,58 @@ var json_locale_data = {
          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." : [
+      "cancel" : [
          null,
-         "We just sent an email to that address!  If you really want to send another, wait a minute or two and try again."
+         ""
       ],
-      "We are sorry, this request is taking a LOOONG time." : [
+      "We had trouble communicating with your email provider, please try again!" : [
          null,
          ""
       ],
-      "This message will go away when the request completes (hopefully soon).  If you wait too long, close this window and try again." : [
+      "Creating Account" : [
          null,
          ""
       ],
-      "To continue, please close the window and enter a valid address." : [
+      "We are sorry, this request is taking a LOOONG time." : [
          null,
          ""
       ],
-      "add" : [
+      "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."
       ],
-      "Enter your email address to sign in to <strong>%s</strong>" : [
+      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again" : [
          null,
          ""
       ],
-      "translated text" : [
+      "Checking Registration Token" : [
          null,
          ""
       ],
-      "The email field is required." : [
+      "add" : [
          null,
-         "The email field is required."
+         ""
       ],
-      "New email address" : [
+      "To continue, please close the window and enter a valid address." : [
          null,
          ""
       ],
-      "verify email" : [
+      "Enter your email address to sign in to <strong>%s</strong>" : [
          null,
-         "verify email"
+         ""
       ],
-      "That address is already added to your account!" : [
+      "Establishing Relay" : [
          null,
          ""
       ],
+      "Signin Failed" : [
+         null,
+         "Sign in using"
+      ],
       "Verify" : [
          null,
          ""
@@ -168,29 +337,17 @@ var json_locale_data = {
          null,
          "Welcome to BrowserID!"
       ],
-      "*%s* is not a valid email address!" : [
-         null,
-         "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,
          ""
       ],
-      "Check your email!" : [
+      "*%s* is not a valid email address!" : [
          null,
-         ""
+         "This field must be an email address."
       ],
       "Please wait a few seconds while we sign you into the site." : [
          null,
          ""
-      ],
-      "The site requested you sign in using" : [
-         null,
-         ""
-      ],
-      "Use a different email" : [
-         null,
-         ""
       ]
    }
 }
diff --git a/resources/static/i18n/en_US/messages.json b/resources/static/i18n/en_US/messages.json
index 99835c0dcef8b0b6c3347c8a7d4f86d650a43338..5b3a6c06ef8f27c48c3ed395578127c02e5a603d 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-20 13:06-0800",
+         "POT-Creation-Date" : " 2012-01-20 21:33+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
index e54c7c0ddb3aef1eafd358c7d75b4ded0de3c16d..55b023fb98a2fb0786f220dffeb9ed4c328b490e 100644
--- a/resources/static/i18n/eo/client.json
+++ b/resources/static/i18n/eo/client.json
@@ -1,8 +1,13 @@
 var json_locale_data = {
    "client" : {
+      "Cancelling User Account" : [
+         null,
+         ""
+      ],
       "" : {
          "MIME-Version" : " 1.0",
-         "POT-Creation-Date" : " 2012-01-20 13:06-0800",
+         "POT-Creation-Date" : " 2012-01-20 21:33+0000",
+         "Language" : " ",
          "Last-Translator" : " FULL NAME <EMAIL@ADDRESS>",
          "Content-Type" : " text/plain; charset=UTF-8",
          "PO-Revision-Date" : " YEAR-MO-DA HO:MI+ZONE",
@@ -15,11 +20,15 @@ var json_locale_data = {
          null,
          ""
       ],
-      "next" : [
+      "Sync Keys for Address" : [
          null,
          ""
       ],
-      "This email looks new, so let&apos;s get you set up." : [
+      "Syncing Email Addresses" : [
+         null,
+         ""
+      ],
+      "Unfortunately, BrowserID cannot communicate while offline!" : [
          null,
          ""
       ],
@@ -27,7 +36,7 @@ var json_locale_data = {
          null,
          ""
       ],
-      "You are offline!" : [
+      "Relay frame could not be found" : [
          null,
          ""
       ],
@@ -43,11 +52,167 @@ var json_locale_data = {
          null,
          ""
       ],
-      "forgot your password?" : [
+      "Cancel" : [
          null,
          ""
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline." : [
+      "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,
+         ""
+      ],
+      "Authenticating with Assertion" : [
+         null,
+         ""
+      ],
+      "Reset Password" : [
+         null,
+         ""
+      ],
+      "Resetting Password" : [
+         null,
+         ""
+      ],
+      "Logout Failed" : [
+         null,
+         ""
+      ],
+      "Checking Email Address" : [
+         null,
+         ""
+      ],
+      "To verify that you own this address, you must sign in with your provider.  This window will be redirected to" : [
+         null,
+         ""
+      ],
+      "This is not me..." : [
+         null,
+         ""
+      ],
+      "In just a moment you'll be signed into BrowserID." : [
+         null,
+         ""
+      ],
+      "We are sorry, BrowserID requires cookies" : [
+         null,
+         ""
+      ],
+      "Getting Assertion" : [
+         null,
+         ""
+      ],
+      "Completing User Registration" : [
+         null,
+         ""
+      ],
+      "Registration Failed" : [
+         null,
+         ""
+      ],
+      "This message will go away when the request completes (hopefully soon).  If you wait too long, close this window and try again." : [
+         null,
+         ""
+      ],
+      "translated text" : [
+         null,
+         ""
+      ],
+      "The email field is required." : [
+         null,
+         ""
+      ],
+      "verify email" : [
+         null,
+         ""
+      ],
+      "New email address" : [
+         null,
+         ""
+      ],
+      "Checking if Cookies are Enabled" : [
+         null,
+         ""
+      ],
+      "Provisioning Unsupported Identity Provider" : [
+         null,
+         ""
+      ],
+      "That address is already added to your account!" : [
+         null,
+         ""
+      ],
+      "Authenticating with Identity Provider" : [
+         null,
+         ""
+      ],
+      "Remove Email Address from Account" : [
+         null,
+         ""
+      ],
+      "Communication Error" : [
+         null,
+         ""
+      ],
+      "Provisioning with Identity Provider" : [
+         null,
+         ""
+      ],
+      "Adding Address" : [
+         null,
+         ""
+      ],
+      "Check your email!" : [
+         null,
+         ""
+      ],
+      "The site requested you sign in using" : [
+         null,
+         ""
+      ],
+      "Syncing Address" : [
+         null,
+         ""
+      ],
+      "Use a different email" : [
+         null,
+         ""
+      ],
+      "next" : [
+         null,
+         ""
+      ],
+      "Verifying email address" : [
+         null,
+         ""
+      ],
+      "Signup Failed" : [
+         null,
+         ""
+      ],
+      "This email looks new, so let&apos;s get you set up." : [
+         null,
+         ""
+      ],
+      "Checking Script Version" : [
+         null,
+         ""
+      ],
+      "You are offline!" : [
+         null,
+         ""
+      ],
+      "Unfortunately, the email address provided cannot act as a Primary Identity Provider" : [
+         null,
+         ""
+      ],
+      "Checking Authentication" : [
+         null,
+         ""
+      ],
+      "Getting Token Info" : [
+         null,
+         ""
+      ],
+      "forgot your password?" : [
          null,
          ""
       ],
@@ -55,7 +220,11 @@ var json_locale_data = {
          null,
          ""
       ],
-      "Cancel" : [
+      "We are sorry, but we cannot communicate with BrowserID while you are offline." : [
+         null,
+         ""
+      ],
+      "Authenticating User" : [
          null,
          ""
       ],
@@ -63,7 +232,7 @@ 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" : [
+      "Setting Password" : [
          null,
          ""
       ],
@@ -71,15 +240,15 @@ var json_locale_data = {
          null,
          ""
       ],
-      "Reset Password" : [
+      "select email" : [
          null,
          ""
       ],
-      "select email" : [
+      "Checking Address Info" : [
          null,
          ""
       ],
-      "To verify that you own this address, you must sign in with your provider.  This window will be redirected to" : [
+      "Adding Primary Email Address to User" : [
          null,
          ""
       ],
@@ -87,11 +256,11 @@ var json_locale_data = {
          null,
          ""
       ],
-      "This is not me..." : [
+      "Checking Whether User is Authenticated with IdP" : [
          null,
          ""
       ],
-      "In just a moment you'll be signed into BrowserID." : [
+      "Updating password" : [
          null,
          ""
       ],
@@ -99,55 +268,55 @@ var json_locale_data = {
          null,
          ""
       ],
-      "cancel" : [
+      "The password field is required." : [
          null,
          ""
       ],
-      "The password field is required." : [
+      "cancel" : [
          null,
          ""
       ],
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again." : [
+      "We had trouble communicating with your email provider, please try again!" : [
          null,
          ""
       ],
-      "We are sorry, this request is taking a LOOONG time." : [
+      "Creating Account" : [
          null,
          ""
       ],
-      "This message will go away when the request completes (hopefully soon).  If you wait too long, close this window and try again." : [
+      "We are sorry, this request is taking a LOOONG time." : [
          null,
          ""
       ],
-      "To continue, please close the window and enter a valid address." : [
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again." : [
          null,
          ""
       ],
-      "add" : [
+      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again" : [
          null,
          ""
       ],
-      "Enter your email address to sign in to <strong>%s</strong>" : [
+      "Checking Registration Token" : [
          null,
          ""
       ],
-      "translated text" : [
+      "add" : [
          null,
          ""
       ],
-      "The email field is required." : [
+      "To continue, please close the window and enter a valid address." : [
          null,
          ""
       ],
-      "New email address" : [
+      "Enter your email address to sign in to <strong>%s</strong>" : [
          null,
          ""
       ],
-      "verify email" : [
+      "Establishing Relay" : [
          null,
          ""
       ],
-      "That address is already added to your account!" : [
+      "Signin Failed" : [
          null,
          ""
       ],
@@ -167,29 +336,17 @@ var json_locale_data = {
          null,
          ""
       ],
-      "*%s* is not a valid email address!" : [
-         null,
-         ""
-      ],
       "If this is a mistake, just ignore the sent email and <a href=\"#\" class=\"cancelVerify\" id=\"back\">use another email address</a>." : [
          null,
          ""
       ],
-      "Check your email!" : [
+      "*%s* is not a valid email address!" : [
          null,
          ""
       ],
       "Please wait a few seconds while we sign you into the site." : [
          null,
          ""
-      ],
-      "The site requested you sign in using" : [
-         null,
-         ""
-      ],
-      "Use a different email" : [
-         null,
-         ""
       ]
    }
 }
diff --git a/resources/static/i18n/eo/messages.json b/resources/static/i18n/eo/messages.json
index 99835c0dcef8b0b6c3347c8a7d4f86d650a43338..5b3a6c06ef8f27c48c3ed395578127c02e5a603d 100644
--- a/resources/static/i18n/eo/messages.json
+++ b/resources/static/i18n/eo/messages.json
@@ -6,7 +6,8 @@ var json_locale_data = {
       ],
       "" : {
          "MIME-Version" : " 1.0",
-         "POT-Creation-Date" : " 2012-01-20 13:06-0800",
+         "POT-Creation-Date" : " 2012-01-20 21:33+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/shared/error-messages.js b/resources/static/shared/error-messages.js
index 9764ddc17dc047da7b5d2993de70e8974194fe1f..3c199bb47d20ffc4b65b458186ef893c8df1c92e 100644
--- a/resources/static/shared/error-messages.js
+++ b/resources/static/shared/error-messages.js
@@ -1,4 +1,4 @@
-/*global BrowserID: true*/
+/*global BrowserID: true, gettext: true*/
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
@@ -7,149 +7,149 @@ BrowserID.Errors = (function(){
 
   var Errors = {
     authenticate: {
-      title: "Authenticating User"
+      title: gettext("Authenticating User")
     },
 
     addEmail: {
-      title: "Adding Address"
+      title: gettext("Adding Address")
     },
 
     addEmailWithAssertion: {
-      title: "Adding Primary Email Address to User"
+      title: gettext("Adding Primary Email Address to User")
     },
 
     addressInfo: {
-      title: "Checking Address Info"
+      title: gettext("Checking Address Info")
     },
 
     authenticateWithAssertion: {
-      title: "Authenticating with Assertion"
+      title: gettext("Authenticating with Assertion")
     },
 
     cancelUser: {
-      title: "Cancelling User Account"
+      title: gettext("Cancelling User Account")
     },
 
     checkAuthentication: {
-      title: "Checking Authentication"
+      title: gettext("Checking Authentication")
     },
 
     checkScriptVersion: {
-      title: "Checking Script Version"
+      title: gettext("Checking Script Version")
     },
 
     completeUserRegistration: {
-      title: "Completing User Registration"
+      title: gettext("Completing User Registration")
     },
 
     cookiesDisabled: {
-      title: "We are sorry, BrowserID requires cookies",
-      message: "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again"
+      title: gettext("We are sorry, BrowserID requires cookies"),
+      message: gettext("BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again")
     },
 
     cookiesEnabled: {
-      title: "Checking if Cookies are Enabled"
+      title: gettext("Checking if Cookies are Enabled")
     },
 
     createUser: {
-      title: "Creating Account"
+      title: gettext("Creating Account")
     },
 
     getAssertion: {
-      title: "Getting Assertion"
+      title: gettext("Getting Assertion")
     },
 
     getTokenInfo: {
-      title: "Checking Registration Token"
+      title: gettext("Checking Registration Token")
     },
 
     isEmailRegistered: {
-      title: "Checking Email Address"
+      title: gettext("Checking Email Address")
     },
 
     isUserAuthenticatedToPrimary: {
-      title: "Checking Whether User is Authenticated with IdP"
+      title: gettext("Checking Whether User is Authenticated with IdP")
     },
 
     logoutUser: {
-      title: "Logout Failed"
+      title: gettext("Logout Failed")
     },
 
     offline: {
-      title: "You are offline!",
-      message: "Unfortunately, BrowserID cannot communicate while offline!"
+      title: gettext("You are offline!"),
+      message: gettext("Unfortunately, BrowserID cannot communicate while offline!")
     },
 
     primaryAuthentication: {
-      title: "Authenticating with Identity Provider",
-      message: "We had trouble communicating with your email provider, please try again!"
+      title: gettext("Authenticating with Identity Provider"),
+      message: gettext("We had trouble communicating with your email provider, please try again!")
     },
 
     provisioningPrimary: {
-      title: "Provisioning with Identity Provider",
-      message: "We had trouble communicating with your email provider, please try again!"
+      title: gettext("Provisioning with Identity Provider"),
+      message: gettext("We had trouble communicating with your email provider, please try again!")
     },
 
     provisioningBadPrimary: {
-      title: "Provisioning Unsupported Identity Provider",
-      message: "Unfortunately, the email address provided cannot act as a Primary Identity Provider"
+      title: gettext("Provisioning Unsupported Identity Provider"),
+      message: gettext("Unfortunately, the email address provided cannot act as a Primary Identity Provider")
     },
 
     registration: {
-      title: "Registration Failed"
+      title: gettext("Registration Failed")
     },
 
     relaySetup: {
-      title: "Establishing Relay",
-      message: "Relay frame could not be found"
+      title: gettext("Establishing Relay"),
+      message: gettext("Relay frame could not be found")
     },
 
     requestPasswordReset: {
-      title: "Resetting Password"
+      title: gettext("Resetting Password")
     },
 
     removeEmail: {
-      title: "Remove Email Address from Account"
+      title: gettext("Remove Email Address from Account")
     },
 
     setPassword: {
-      title: "Setting Password"
+      title: gettext("Setting Password")
     },
 
     signIn: {
-      title: "Signin Failed"
+      title: gettext("Signin Failed")
     },
 
     signUp: {
-      title: "Signup Failed"
+      title: gettext("Signup Failed")
     },
 
     syncAddress: {
-      title: "Syncing Address"
+      title: gettext("Syncing Address")
     },
 
     syncEmails: {
-      title: "Syncing Email Addresses"
+      title: gettext("Syncing Email Addresses")
     },
 
     syncEmailKeypair: {
-      title: "Sync Keys for Address"
+      title: gettext("Sync Keys for Address")
     },
 
     tokenInfo: {
-      title: "Getting Token Info"
+      title: gettext("Getting Token Info")
     },
 
     updatePassword: {
-      title: "Updating password"
+      title: gettext("Updating password")
     },
 
     verifyEmail: {
-      title: "Verifying email address"
+      title: gettext("Verifying email address")
     },
 
     xhrError: {
-      title: "Communication Error"
+      title: gettext("Communication Error")
     }
 
   };
diff --git a/resources/views/dialog_layout.ejs b/resources/views/dialog_layout.ejs
index 777e9a173f9cd0aaa2f292bd0e3946293e45e5e4..fa757911c8c5691b20adb80bccc48cfa6716f93d 100644
--- a/resources/views/dialog_layout.ejs
+++ b/resources/views/dialog_layout.ejs
@@ -44,7 +44,7 @@
                 </ul-->
 
                 <div class="learn">
-<%- gettext('BrowserID is the fast and secure way to sign in &mdash; <a target="_blank" href="/about">learn more</a>') %>
+<%= gettext('BrowserID is the fast and secure way to sign in &mdash; <a target="_blank" href="/about">learn more</a>') %>
                 </div>
 
           </footer>