From e52aca6ce79da9cd6582fdb57bf225f4ba76a41b Mon Sep 17 00:00:00 2001
From: Shane Tomlinson <stomlinson@mozilla.com>
Date: Tue, 13 Mar 2012 14:41:25 +0000
Subject: [PATCH] Updating the i18n JSON strings.

---
 resources/static/i18n/af/client.json      | 212 +++---------
 resources/static/i18n/af/messages.json    |  20 +-
 resources/static/i18n/ca/client.json      | 376 +++++++++++----------
 resources/static/i18n/ca/messages.json    |  34 +-
 resources/static/i18n/cs/client.json      | 376 +++++++++++----------
 resources/static/i18n/cs/messages.json    |  28 +-
 resources/static/i18n/da/client.json      | 228 ++++---------
 resources/static/i18n/da/messages.json    |  22 +-
 resources/static/i18n/db_LB/client.json   | 212 +++---------
 resources/static/i18n/db_LB/messages.json |  32 +-
 resources/static/i18n/de/client.json      | 374 +++++++++++----------
 resources/static/i18n/de/messages.json    |  32 +-
 resources/static/i18n/el/client.json      | 384 +++++++++++----------
 resources/static/i18n/el/messages.json    |  50 +--
 resources/static/i18n/en_US/client.json   | 234 +++----------
 resources/static/i18n/en_US/messages.json |  22 +-
 resources/static/i18n/eo/client.json      | 274 ++++++---------
 resources/static/i18n/eo/messages.json    |  20 +-
 resources/static/i18n/es/client.json      | 376 +++++++++++----------
 resources/static/i18n/es/messages.json    |  30 +-
 resources/static/i18n/es_MX/client.json   | 192 ++---------
 resources/static/i18n/es_MX/messages.json |  20 +-
 resources/static/i18n/et/client.json      | 384 +++++++++++----------
 resources/static/i18n/et/messages.json    | 112 ++++---
 resources/static/i18n/eu/client.json      | 377 +++++++++++----------
 resources/static/i18n/eu/messages.json    | 107 +++---
 resources/static/i18n/fi/client.json      | 378 +++++++++++----------
 resources/static/i18n/fi/messages.json    | 110 +++---
 resources/static/i18n/fr/client.json      | 381 +++++++++++----------
 resources/static/i18n/fr/messages.json    | 109 +++---
 resources/static/i18n/fy/client.json      | 380 +++++++++++----------
 resources/static/i18n/fy/messages.json    |  32 +-
 resources/static/i18n/ga/client.json      | 372 ++++++++++----------
 resources/static/i18n/ga/messages.json    |  30 +-
 resources/static/i18n/gd/client.json      | 192 ++---------
 resources/static/i18n/gd/messages.json    |  20 +-
 resources/static/i18n/gl/client.json      | 192 ++---------
 resources/static/i18n/gl/messages.json    |  20 +-
 resources/static/i18n/he/client.json      | 227 +++++++++++++
 resources/static/i18n/he/messages.json    | 191 +++++++++++
 resources/static/i18n/hr/client.json      | 381 +++++++++++----------
 resources/static/i18n/hr/messages.json    | 109 +++---
 resources/static/i18n/hu/client.json      | 226 +++++++++++++
 resources/static/i18n/hu/messages.json    | 190 +++++++++++
 resources/static/i18n/it/client.json      | 382 +++++++++++----------
 resources/static/i18n/it/messages.json    |  26 +-
 resources/static/i18n/ja/client.json      | 377 +++++++++++----------
 resources/static/i18n/ja/messages.json    | 109 +++---
 resources/static/i18n/ko/client.json      | 387 +++++++++++++++++++++
 resources/static/i18n/ko/messages.json    | 191 +++++++++++
 resources/static/i18n/lij/client.json     | 381 +++++++++++----------
 resources/static/i18n/lij/messages.json   |  33 +-
 resources/static/i18n/lt/client.json      | 361 ++++++++++----------
 resources/static/i18n/lt/messages.json    | 107 +++---
 resources/static/i18n/ml/client.json      | 192 ++---------
 resources/static/i18n/ml/messages.json    |  20 +-
 resources/static/i18n/nl/client.json      | 380 +++++++++++----------
 resources/static/i18n/nl/messages.json    |  32 +-
 resources/static/i18n/pa/client.json      | 391 ++++++++++++++++++++++
 resources/static/i18n/pa/messages.json    | 191 +++++++++++
 resources/static/i18n/pl/client.json      | 242 +++----------
 resources/static/i18n/pl/messages.json    |  34 +-
 resources/static/i18n/pt/client.json      | 192 ++---------
 resources/static/i18n/pt/messages.json    |  20 +-
 resources/static/i18n/pt_BR/client.json   | 352 ++++++++++---------
 resources/static/i18n/pt_BR/messages.json | 112 ++++---
 resources/static/i18n/rm/client.json      | 332 +++++++++---------
 resources/static/i18n/rm/messages.json    |  30 +-
 resources/static/i18n/ro/client.json      | 282 ++++++----------
 resources/static/i18n/ro/messages.json    |  20 +-
 resources/static/i18n/ru/client.json      | 383 +++++++++++----------
 resources/static/i18n/ru/messages.json    |  36 +-
 resources/static/i18n/sk/client.json      | 381 +++++++++++----------
 resources/static/i18n/sk/messages.json    | 109 +++---
 resources/static/i18n/sl/client.json      | 378 +++++++++++----------
 resources/static/i18n/sl/messages.json    |  30 +-
 resources/static/i18n/son/client.json     | 192 ++---------
 resources/static/i18n/son/messages.json   |  20 +-
 resources/static/i18n/sq/client.json      | 364 ++++++++++----------
 resources/static/i18n/sq/messages.json    |  24 +-
 resources/static/i18n/sr/client.json      | 378 +++++++++++----------
 resources/static/i18n/sr/messages.json    |  24 +-
 resources/static/i18n/sv/client.json      | 378 +++++++++++----------
 resources/static/i18n/sv/messages.json    |  33 +-
 resources/static/i18n/tr/client.json      | 374 +++++++++++----------
 resources/static/i18n/tr/messages.json    |  28 +-
 resources/static/i18n/uk/client.json      | 245 ++++++++++++++
 resources/static/i18n/uk/messages.json    | 189 +++++++++++
 resources/static/i18n/zh_CN/client.json   | 372 ++++++++++----------
 resources/static/i18n/zh_CN/messages.json |  26 +-
 resources/static/i18n/zh_TW/client.json   | 376 +++++++++++----------
 resources/static/i18n/zh_TW/messages.json |  28 +-
 92 files changed, 9710 insertions(+), 7902 deletions(-)
 create mode 100644 resources/static/i18n/he/client.json
 create mode 100644 resources/static/i18n/he/messages.json
 create mode 100644 resources/static/i18n/hu/client.json
 create mode 100644 resources/static/i18n/hu/messages.json
 create mode 100644 resources/static/i18n/ko/client.json
 create mode 100644 resources/static/i18n/ko/messages.json
 create mode 100644 resources/static/i18n/pa/client.json
 create mode 100644 resources/static/i18n/pa/messages.json
 create mode 100644 resources/static/i18n/uk/client.json
 create mode 100644 resources/static/i18n/uk/messages.json

diff --git a/resources/static/i18n/af/client.json b/resources/static/i18n/af/client.json
index 4e36efbb6..070538317 100644
--- a/resources/static/i18n/af/client.json
+++ b/resources/static/i18n/af/client.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " 2012-02-04 23:58+0200",
          "Last-Translator": " Friedel <friedel@translate.org.za>",
          "Language-Team": " LANGUAGE <LL@li.org>",
@@ -14,159 +14,11 @@
          "Plural-Forms": " nplurals=2; plural=(n != 1);",
          "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
          ""
       ],
-      "Adding Address": [
-         null,
-         ""
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         ""
-      ],
-      "Checking Address Info": [
-         null,
-         ""
-      ],
-      "Authenticating with Assertion": [
-         null,
-         ""
-      ],
-      "Cancelling User Account": [
-         null,
-         ""
-      ],
-      "Checking Authentication": [
-         null,
-         ""
-      ],
-      "Checking Script Version": [
-         null,
-         ""
-      ],
-      "Completing User Registration": [
-         null,
-         ""
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         ""
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         ""
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         ""
-      ],
-      "Creating Account": [
-         null,
-         ""
-      ],
-      "Getting Assertion": [
-         null,
-         ""
-      ],
-      "Checking Registration Token": [
-         null,
-         ""
-      ],
-      "Checking Email Address": [
-         null,
-         ""
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         ""
-      ],
-      "Logout Failed": [
-         null,
-         ""
-      ],
-      "You are offline!": [
-         null,
-         ""
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         ""
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         ""
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         ""
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         ""
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         ""
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         ""
-      ],
-      "Registration Failed": [
-         null,
-         ""
-      ],
-      "Establishing Relay": [
-         null,
-         ""
-      ],
-      "Relay frame could not be found": [
-         null,
-         ""
-      ],
-      "Resetting Password": [
-         null,
-         ""
-      ],
-      "Remove Email Address from Account": [
-         null,
-         ""
-      ],
-      "Setting Password": [
-         null,
-         ""
-      ],
-      "Signin Failed": [
-         null,
-         ""
-      ],
-      "Signup Failed": [
-         null,
-         ""
-      ],
-      "Syncing Address": [
-         null,
-         ""
-      ],
-      "Syncing Email Addresses": [
-         null,
-         ""
-      ],
-      "Sync Keys for Address": [
-         null,
-         ""
-      ],
-      "Getting Token Info": [
-         null,
-         ""
-      ],
-      "Updating password": [
-         null,
-         ""
-      ],
-      "Verifying email address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
          ""
       ],
@@ -238,7 +90,7 @@
          null,
          "Welkom by BrowserID!"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
          "Dié e-posadres lyk nuut. Laat ons dit gou opstel."
       ],
@@ -258,6 +110,10 @@
          null,
          "Kan nie aanmeld by die rekening met dié gebruikernaam en wagwoord nie."
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         ""
+      ],
       "next": [
          null,
          "volgende"
@@ -266,9 +122,9 @@
          null,
          "bevestig e-posadres"
       ],
-      "select email": [
+      "sign in": [
          null,
-         "kies e-posadres"
+         "meld aan"
       ],
       "Cannot verify %s": [
          null,
@@ -298,18 +154,34 @@
          null,
          "As dit 'n fout is, ignoreer die gestuurde boodskap en <a href=\"#\" id=\"back\">gebruik 'n ander e-posadres</a>."
       ],
+      "We are very sorry, the server is under extreme load!": [
+         null,
+         ""
+      ],
+      "We are very sorry, there has been an error!": [
+         null,
+         ""
+      ],
+      "Please reload the page and try again.": [
+         null,
+         ""
+      ],
+      "Please close this window and try again.": [
+         null,
+         "Om voort te gaan, sluit die venster en gee 'n geldige e-posadres."
+      ],
+      "See more info": [
+         null,
+         ""
+      ],
       "The site requested you sign in using": [
          null,
          "Dié werf vra dat u aanmeld met"
       ],
-      "Reset Password": [
+      "reset password": [
          null,
          "Stel wagwoord terug"
       ],
-      "Cancel": [
-         null,
-         "Kanselleer"
-      ],
       "*%s* is not a valid email address!": [
          null,
          "*%s* is nie ’n geldige e-posadres nie."
@@ -318,10 +190,6 @@
          null,
          "Om voort te gaan, sluit die venster en gee 'n geldige e-posadres."
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
-         null,
-         "Ons kan ongelukkig nie met BrowserID kommunikeer terwyl u vanlyn is nie."
-      ],
       "This is not me...": [
          null,
          "Dis nie ek nie..."
@@ -334,10 +202,6 @@
          null,
          "Meld altyd aan met dié e-posadres"
       ],
-      "sign in": [
-         null,
-         "meld aan"
-      ],
       "Address Verified!": [
          null,
          "Adres is bevestig!"
@@ -350,13 +214,25 @@
          null,
          "U moet aanmeld met u e-posverskaffer om eienaarskap van dié adres te bevestig. Dié venster gaan aanstuur na"
       ],
-      "Verify": [
+      "verify": [
          null,
          "Bevestig"
       ],
       "Verify With Email Provider": [
          null,
          "Bevestig met e-posverskaffer"
+      ],
+      "select email": [
+         null,
+         "kies e-posadres"
+      ],
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
+         null,
+         "#~ \"Ons kan ongelukkig nie met BrowserID kommunikeer terwyl u vanlyn is nie.\""
+      ],
+      "Cancel": [
+         null,
+         "Kanselleer"
       ]
    }
 }
diff --git a/resources/static/i18n/af/messages.json b/resources/static/i18n/af/messages.json
index 5ba877986..34741911d 100644
--- a/resources/static/i18n/af/messages.json
+++ b/resources/static/i18n/af/messages.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " 2012-02-04 23:58+0200",
          "Last-Translator": " Friedel <friedel@translate.org.za>",
          "Language-Team": " LANGUAGE <LL@li.org>",
@@ -26,7 +26,7 @@
          null,
          "Kon nie registrasie voltooi nie."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          "Voltooi aanmelding by:"
       ],
@@ -74,7 +74,7 @@
          null,
          "Wagwoorde stem nie ooreen nie."
       ],
-      "Finish": [
+      "finish": [
          null,
          ""
       ],
@@ -86,6 +86,14 @@
          null,
          "Die nuwe adres is opgestel en u kan nou aanmeld. Sluit gerus dié venster en gaan terug na"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "Tuiste van BrowserID"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
       "Communicating with server": [
          null,
          "Kommunikeer tans met bediener"
@@ -98,7 +106,7 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
          "BrowserID is die vinnige en veilige manier om mee aan te meld &mdash; <a target=\"_blank\" href=\"/about\">Meer inligting</a>"
       ],
@@ -126,7 +134,7 @@
          null,
          "Meld af"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
          "Deur die <a href=\"%s\" target=\"_blank\">Identiteitspan</a> by <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
       ],
@@ -146,7 +154,7 @@
          null,
          "Daar was 'n probleem met die inskrywingskakel. Is dié adres dalk reeds geregistreer?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "Fout met kommunikasie met bediener."
       ],
diff --git a/resources/static/i18n/ca/client.json b/resources/static/i18n/ca/client.json
index b8ac929dc..385b518b0 100644
--- a/resources/static/i18n/ca/client.json
+++ b/resources/static/i18n/ca/client.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-04 17:46+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-04 17:44+0200",
          "Last-Translator": " Eduard <edu@eduard-gamonal.net>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " ca",
@@ -14,349 +14,377 @@
          "Plural-Forms": " nplurals=2; plural=(n != 1);",
          "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
-         "S'està autenticant l'usuari"
+         "Disculpeu. El BrowserID necessita utilitzar galetes"
       ],
-      "Adding Address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "S'està afegint l'adreça"
+         "Tanqueu aquesta finestra, <a %s>habiliteu les galetes</a> i torneu-ho a provar"
       ],
-      "Adding Primary Email Address to User": [
+      "Communication Error": [
          null,
-         "S'està afegint l'adreça principal de correu electrònic a l'usuari"
+         "S'ha produït un error en la comunicació"
       ],
-      "Checking Address Info": [
+      "Finishing Sign In...": [
          null,
-         "S'estan comprovant ĺes dades de l'adreça"
+         "S'està acabant l'inici de sessió..."
       ],
-      "Authenticating with Assertion": [
+      "In just a moment you'll be signed into BrowserID.": [
          null,
-         "Autenticació amb asserció"
+         "En un moment haureu iniciat la sessió al BrowserID."
       ],
-      "Cancelling User Account": [
+      "Please wait a few seconds while we sign you into the site.": [
          null,
-         "S'està cancel·lant el compte de l'usuari"
+         "Espereu uns segons mentre iniciem la sessió al lloc."
       ],
-      "Checking Authentication": [
+      "We are sorry, this request is taking a LOOONG time.": [
          null,
-         "S'està comprovant l'autenticació"
+         "Lamentem que la petició tardi tanta estona."
       ],
-      "Checking Script Version": [
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
          null,
-         "S'està comprovant la versió de l'script"
+         "Aquest missatge marxarà quan s'hagi acabat la sol·licitud. En cas que tardi massa, tanqueu aquesta finestra i torneu a provar-ho."
       ],
-      "Completing User Registration": [
+      "Sign in using": [
          null,
-         "S'està finalitzant el registre de l'usuari"
+         "Inicieu una sessió utilitzant"
       ],
-      "We are sorry, BrowserID requires cookies": [
+      "New email address": [
          null,
-         "Disculpeu. El BrowserID requereix l'utilització de galetes"
+         "Nova adreça electrònica"
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
+      "This field must be an email address.": [
          null,
-         "Per operar el BrowserID necessita que el vostre navegador tingui habilitades les galetes.  Habiliteu-les i torneu a provar-ho."
+         "Cal que el camp contingui una adreça electrònica."
       ],
-      "Checking if Cookies are Enabled": [
+      "The email field is required.": [
          null,
-         "S'està comprovant si les galetes estan habilitades"
+         "El camp d'adreça electrònica és obligatori."
       ],
-      "Creating Account": [
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
          null,
-         "S'està creant el compte"
+         "Acabem d'enviar un correu a aquesta adreça. Si realment en voleu enviar un altre, espereu un minut o dos i torneu-ho a provar."
       ],
-      "Getting Assertion": [
+      "That address is already added to your account!": [
          null,
-         "S'està comprovant l'asserció"
+         "Ja heu afegit aquesta adreça al vostre compte."
       ],
-      "Checking Registration Token": [
+      "add": [
          null,
-         "S'està comprovant el testimoni de registre"
+         "afegeix"
       ],
-      "Checking Email Address": [
+      "cancel": [
          null,
-         "Comprovació de l'adreça electrònica"
+         "cancel·la"
       ],
-      "Checking Whether User is Authenticated with IdP": [
+      "Email": [
          null,
-         "Comprovació de si l'usuari s'està autenticant amb IdP"
+         "Adreça electrònica"
       ],
-      "Logout Failed": [
+      "Enter your email address to sign in to <strong>%s</strong>": [
          null,
-         "Ha fallat la sortida de sessió"
+         "Introduïu la vostra adreça electrònica per registrar-vos a <strong>%s</strong>"
       ],
-      "You are offline!": [
+      "Welcome to BrowserID!": [
          null,
-         "No esteu connectat"
+         "Benvinguts al BrowserID!"
       ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
+      "This email looks new, so let's get you set up.": [
          null,
-         "El BrowserID no es pot comunicar si esteu connectat."
+         "Aquesta adreça electrònica sembla nova. Configurem el vostre compte."
       ],
-      "Authenticating with Identity Provider": [
+      "Password": [
          null,
-         "S'està autenticant amb el proveïdor d'identitat"
+         "Contrasenya"
       ],
-      "We had trouble communicating with your email provider, please try again!": [
+      "forgot your password?": [
          null,
-         "Tenim problemes per comunicar-nos amb el vostre proveïdor de correu. Torneu a provar-ho."
+         "heu oblidat la contrasenya?"
       ],
-      "Provisioning with Identity Provider": [
+      "The password field is required.": [
          null,
-         "S'està comprovant el proveïdor d'identitat"
+         "El camp de contrasenya és obligatori."
       ],
-      "Provisioning Unsupported Identity Provider": [
+      "The account cannot be logged in with this username and password.": [
          null,
-         "S'està provant un proveïdor d'identitat incompatible"
+         "No es pot iniciar una sessió al compte amb aquest nom d'usuari i contrasenya."
       ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
          null,
-         "Desafortunadament, l'adreça electrònica que heu indicat no pot actuar com a proveïdor d'identitat primari."
+         "Si cliqueu en %s, estareu confirmant que accepteu les <a %s>Condicions d'ús</a> i la <a %s>Política de privadesa</a>."
       ],
-      "Registration Failed": [
+      "next": [
          null,
-         "Ha fallat el registre"
+         "següent"
       ],
-      "Establishing Relay": [
+      "verify email": [
          null,
-         "S'està establint la comunicació"
+         "verifiqueu l'adreça electrònica"
       ],
-      "Relay frame could not be found": [
+      "sign in": [
          null,
-         "No s'ha pogut trobar el marc de comunicacions"
+         "inici de sessió"
       ],
-      "Resetting Password": [
+      "Cannot verify %s": [
          null,
-         "S'està reiniciant la contrasenya"
+         "No s'ha pogut verificar %s"
       ],
-      "Remove Email Address from Account": [
+      "%s is a required address, but we cannot verify that you own this address.": [
          null,
-         "S'està suprimint l'adreça electrònica del compte"
+         "%s és una adreça obligatòria però no podem verificar que en sigueu el propietari."
       ],
-      "Setting Password": [
+      "Check your email!": [
          null,
-         "S'està establint la contrasenya"
+         "Comproveu el vostre correu!"
       ],
-      "Signin Failed": [
+      "We sent a confirmation email to <strong>%s</strong>": [
          null,
-         "Ha fallat l'inici de sessió"
+         "Hem enviat un missatge de confirmació a <strong>%s</strong>"
       ],
-      "Signup Failed": [
+      "To finish signing in just click the verify link we sent to your email address.": [
          null,
-         "Ha fallat el registre de l'usuari"
+         "Per finalitzar l'inici de sessió, simplement feu clic a l'enllaç de verificació que us vam enviar per correu electrònic."
       ],
-      "Syncing Address": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
          null,
-         "S'estan sincronitzant les adreces"
+         "Si això és un error, ignoreu el correu enviat i <a href=\"#\" id=\"cancel\">cancel·leu-ho</a>."
       ],
-      "Syncing Email Addresses": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          null,
-         "S'estan sincronitzant les adreces electròniques"
+         "Si això és un error, ignoreu el correu enviat i <a href=\"#\" id=\"back\">utilitzeu una altra adreça electrònica</a>."
       ],
-      "Sync Keys for Address": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         "Sincronitza les claus per l'adreça"
+         "És lamentable, el servidor està molt carregat."
       ],
-      "Getting Token Info": [
+      "We are very sorry, there has been an error!": [
          null,
-         "S'està obtenint informació del testimoni"
+         "S'ha produït un error."
       ],
-      "Updating password": [
+      "Please reload the page and try again.": [
          null,
-         "S'està actualitzant la contrasenya"
+         "Actualitzeu la pàgina i torneu-ho a provar."
       ],
-      "Verifying email address": [
+      "Please close this window and try again.": [
          null,
-         "S'està validant l'adreça electrònica"
+         "Tanqueu aquesta finestra i torneu-ho a provar."
       ],
-      "Communication Error": [
+      "See more info": [
          null,
-         "S'ha produït un error en la comunicació"
+         "Més informació"
       ],
-      "Finishing Sign In...": [
+      "The site requested you sign in using": [
          null,
-         "S'està acabant l'inici de sessió..."
+         "El lloc ha sol·licitat que inicieu una sessió utilitzant"
       ],
-      "In just a moment you'll be signed into BrowserID.": [
+      "reset password": [
          null,
-         "En un moment haureu iniciat la sessió al BrowserID."
+         "Reinicia la contrasenya"
       ],
-      "Please wait a few seconds while we sign you into the site.": [
+      "*%s* is not a valid email address!": [
          null,
-         "Espereu uns segons mentre iniciem la sessió al lloc."
+         "*%s* no és una adreça electrònica vàlida"
       ],
-      "We are sorry, this request is taking a LOOONG time.": [
+      "To continue, please close the window and enter a valid address.": [
          null,
-         "Lamentem que la petició tardi tanta estona."
+         "Per continuar, tanqueu la finestra i introduïu una adreça vàlida."
       ],
-      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+      "This is not me...": [
          null,
-         "Aquest missatge marxarà quan s'hagi acabat la sol·licitud. En cas que tardi massa, tanqueu aquesta finestra i torneu a provar-ho."
+         "No sóc jo..."
       ],
-      "Sign in using": [
+      "Use a different email": [
          null,
-         "Inicieu una sessió utilitzant"
+         "Utilitzeu una adreça electrònica diferent"
       ],
-      "New email address": [
+      "Always sign in using this email": [
          null,
-         "Nova adreça de correu electrònic"
+         "Inicieu una sessió sempre amb aquesta adreça electrònica"
       ],
-      "This field must be an email address.": [
+      "Address Verified!": [
          null,
-         "El camp cal que contingui una adreça electrònica."
+         "S'ha verificat l'adreça."
       ],
-      "The email field is required.": [
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
          null,
-         "El camp d'adreça electrònica és obligatori."
+         "S'ha verificat la vostra identitat amb el proveïdor de correu electrònic. Ara intentarem iniciar la sessió."
       ],
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
          null,
-         "Acabem d'enviar un correu a aquesta adreça! Si realment en voleu enviar un altre, espereu un minut o dos i torneu-ho a provar."
+         "Cal que inicieu la sessió amb el vostre proveïdor de correu electrònic per verificar que aquesta adreça és vostra. Aquesta finestra serà redirigida a"
       ],
-      "That address is already added to your account!": [
+      "verify": [
          null,
-         "Ja heu afegit aquesta adreça al vostre compte."
+         "Verifica"
       ],
-      "add": [
+      "Verify With Email Provider": [
          null,
-         "afegeix"
+         "Comprova amb el proveïdor de correu electrònic"
       ],
-      "cancel": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         "cancel·la"
+         "#~ \"Per operar el BrowserID necessita que el vostre navegador tingui \"#~ \"habilitades les galetes. Habiliteu-les i torneu a provar-ho\""
       ],
-      "Email": [
+      "You are offline!": [
          null,
-         "Adreça electrònica"
+         "No esteu connectat"
       ],
-      "Enter your email address to sign in to <strong>%s</strong>": [
+      "Unfortunately, BrowserID cannot communicate while offline!": [
          null,
-         "Introduïu la vostra adreça de correu electrònic per registrar-vos a <strong>%s</strong>"
+         "El BrowserID no es pot comunicar si esteu connectat."
       ],
-      "Welcome to BrowserID!": [
+      "select email": [
          null,
-         "Benvinguts al BrowserID!"
+         "seleccioneu l'adreça electrònica"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
          null,
-         "Aquesta adreça electrònica sembla nova. Configurem el vostre compte."
+         "No podem comunicar-nos amb el BrowserID quan esteu desconnectat."
       ],
-      "Password": [
+      "Authenticating User": [
          null,
-         "Contrasenya"
+         "S'està autenticant l'usuari"
       ],
-      "forgot your password?": [
+      "Adding Address": [
          null,
-         "heu oblidat la contrasenya?"
+         "S'està afegint l'adreça"
       ],
-      "The password field is required.": [
+      "Adding Primary Email Address to User": [
          null,
-         "El camp de contrasenya és obligatori."
+         "S'està afegint l'adreça principal de correu electrònic a l'usuari"
       ],
-      "The account cannot be logged in with this username and password.": [
+      "Checking Address Info": [
          null,
-         "No es pot iniciar una sessió al compte amb aquest nom d'usuari i contrasenya."
+         "S'estan comprovant ĺes dades de l'adreça"
       ],
-      "next": [
+      "Authenticating with Assertion": [
          null,
-         "següent"
+         "Autenticació amb asserció"
       ],
-      "verify email": [
+      "Cancelling User Account": [
          null,
-         "verifiqueu l'adreça electrònica"
+         "S'està cancel·lant el compte de l'usuari"
       ],
-      "select email": [
+      "Checking Authentication": [
          null,
-         "seleccioneu l'adreça electrònica"
+         "S'està comprovant l'autenticació"
       ],
-      "Cannot verify %s": [
+      "Checking Script Version": [
          null,
-         "No s'ha pogut verificar %s"
+         "S'està comprovant la versió de l'script"
       ],
-      "%s is a required address, but we cannot verify that you own this address.": [
+      "Completing User Registration": [
          null,
-         "%s és una adreça obligatòria però no podem verificar que en sigueu el propietari."
+         "S'està finalitzant el registre de l'usuari"
       ],
-      "Check your email!": [
+      "Checking if Cookies are Enabled": [
          null,
-         "Comproveu el vostre correu!"
+         "S'està comprovant si les galetes estan habilitades"
       ],
-      "We sent a confirmation email to <strong>%s</strong>": [
+      "Creating Account": [
          null,
-         "Hem enviat un missatge de confirmació a <strong>%s</strong>"
+         "S'està creant el compte"
       ],
-      "To finish signing in just click the verify link we sent to your email address.": [
+      "Getting Assertion": [
          null,
-         "Per finalitzar l'inici de sessió, simplement feu clic a l'enllaç de verificació que us vam enviar per correu electrònic."
+         "S'està comprovant l'asserció"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+      "Checking Registration Token": [
          null,
-         "Si això és un error, ignoreu el correu enviat i <a href=\"#\" id=\"cancel\">cancel·leu-ho</a>."
+         "S'està comprovant el testimoni de registre"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+      "Checking Email Address": [
          null,
-         "Si això és un error, ignoreu el correu enviat i <a href=\"#\" id=\"back\">utilitzeu una altra adreça electrònica</a>."
+         "Comprovació de l'adreça electrònica"
       ],
-      "The site requested you sign in using": [
+      "Checking Whether User is Authenticated with IdP": [
          null,
-         "El lloc ha sol·licitat que inicieu una sessió utilitzant"
+         "Comprovació de si l'usuari s'està autenticant amb IdP"
       ],
-      "Reset Password": [
+      "Logout Failed": [
          null,
-         "Reinicia la contrasenya"
+         "Ha fallat la sortida de sessió"
       ],
-      "Cancel": [
+      "Authenticating with Identity Provider": [
          null,
-         "Cancel·la"
+         "S'està autenticant amb el proveïdor d'identitat"
       ],
-      "*%s* is not a valid email address!": [
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
          null,
-         "*%s* no és una adreça de correu electrònic vàlida"
+         "#~ \"Tenim problemes per comunicar-nos amb el vostre proveïdor de correu. \"#~ \"Torneu a provar-ho.\""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "Provisioning with Identity Provider": [
          null,
-         "Per continuar, tanqueu la finestra i introduïu una adreça vàlida."
+         "S'està comprovant el proveïdor d'identitat"
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "Provisioning Unsupported Identity Provider": [
          null,
-         "No podem comunicar-nos amb el BrowserID quan esteu desconnectat."
+         "S'està provant un proveïdor d'identitat incompatible"
       ],
-      "This is not me...": [
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
          null,
-         "No sóc jo..."
+         "#~ \"Desafortunadament, l'adreça electrònica que heu indicat no pot actuar com \"#~ \"a proveïdor d'identitat primari.\""
       ],
-      "Use a different email": [
+      "Registration Failed": [
          null,
-         "Utilitzeu una adreça electrònica diferent"
+         "Ha fallat el registre"
       ],
-      "Always sign in using this email": [
+      "Establishing Relay": [
          null,
-         "Inicieu una sessió sempre amb aquesta adreça electrònica"
+         "S'està establint la comunicació"
       ],
-      "sign in": [
+      "Relay frame could not be found": [
          null,
-         "inici de sessió"
+         "No s'ha pogut trobar el marc de comunicacions"
       ],
-      "Address Verified!": [
+      "Resetting Password": [
          null,
-         "S'ha verificat l'adreça."
+         "S'està reiniciant la contrasenya"
       ],
-      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+      "Remove Email Address from Account": [
          null,
-         "S'ha verificat la vostra identitat amb el proveïdor de correu electrònic. Ara intentarem iniciar la sessió."
+         "S'està suprimint l'adreça electrònica del compte"
       ],
-      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+      "Setting Password": [
          null,
-         "Cal que inicieu la sessió amb el vostre proveïdor de correu electrònic per verificar que aquesta adreça és vostra. Aquesta finestra serà redirigida a"
+         "S'està establint la contrasenya"
       ],
-      "Verify": [
+      "Signin Failed": [
          null,
-         "Comprova"
+         "Ha fallat l'inici de sessió"
       ],
-      "Verify With Email Provider": [
+      "Signup Failed": [
          null,
-         "Comprova amb el proveïdor de correu electrònic"
+         "Ha fallat el registre de l'usuari"
+      ],
+      "Syncing Address": [
+         null,
+         "S'estan sincronitzant les adreces"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "S'estan sincronitzant les adreces electròniques"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Sincronitza les claus per l'adreça"
+      ],
+      "Getting Token Info": [
+         null,
+         "S'està obtenint informació del testimoni"
+      ],
+      "Updating password": [
+         null,
+         "S'està actualitzant la contrasenya"
+      ],
+      "Verifying email address": [
+         null,
+         "S'està validant l'adreça electrònica"
+      ],
+      "Cancel": [
+         null,
+         "Cancel·la"
       ]
    }
 }
diff --git a/resources/static/i18n/ca/messages.json b/resources/static/i18n/ca/messages.json
index 40302724f..27392b8b0 100644
--- a/resources/static/i18n/ca/messages.json
+++ b/resources/static/i18n/ca/messages.json
@@ -3,9 +3,9 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-04 20:14+0200",
-         "Last-Translator": " Joaquim <noguer@gmail.com>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-04 00:34+0200",
+         "Last-Translator": " Eduard <edu@eduard-gamonal.net>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " ca",
          "MIME-Version": " 1.0",
@@ -26,9 +26,9 @@
          null,
          "S'ha trobat un error en intentar completar el registre."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         "Inici de sessió a:"
+         "Acaba l'inici de sessió a:"
       ],
       "Email Verification": [
          null,
@@ -44,7 +44,7 @@
       ],
       "New Password": [
          null,
-         "Adreça electrònica nova"
+         "Contrasenya nova"
       ],
       "Enter a Password": [
          null,
@@ -74,7 +74,7 @@
          null,
          "Les contrasenyes no coincideixen."
       ],
-      "Finish": [
+      "finish": [
          null,
          "Finalitza"
       ],
@@ -86,6 +86,14 @@
          null,
          "Ja s'ha configurat satisfactòriament la vostra adreça electrònica nova i heu iniciat una sessió. Tanqueu aquesta finestra per tornar a"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "El BrowserID necessita utilitzar galetes"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "Tanqueu aquesta finestra, <a %s>habiliteu les galetes</a> i torneu a provar-ho"
+      ],
       "Communicating with server": [
          null,
          "S'està comunicant amb el servidor"
@@ -98,9 +106,9 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         "El BrowserID és una manera ràpida i segura per iniciar una sessió &mdash; <a target=\"_blank\" href=\"/about\">més informació</a>"
+         "El BrowserID és la manera ràpida i segura per iniciar una sessió &mdash; <a target=\"_blank\" href=\"/about\">més informació</a>"
       ],
       "BrowserID: %s": [
          null,
@@ -126,9 +134,9 @@
          null,
          "Surt de la sessió"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         "Desenvolupat per <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
+         "Desenvolupat per l'<a href=\"%s\" target=\"_blank\">equip d'identitat</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
@@ -146,9 +154,9 @@
          null,
          "Hi ha un problema amb l'enllaç per registrar-se. Potser havíeu registrat aquesta adreça abans?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
-         "S'ha produït un error de comunicacions amb el servidor."
+         "S'ha produït un error en comunicar-se amb el servidor."
       ],
       "Last step!": [
          null,
diff --git a/resources/static/i18n/cs/client.json b/resources/static/i18n/cs/client.json
index 80cf635ce..11eeee0d7 100644
--- a/resources/static/i18n/cs/client.json
+++ b/resources/static/i18n/cs/client.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-04 15:14+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-09 20:58+0200",
          "Last-Translator": " Pavel <jasnapaka@jasnapaka.com>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " cs",
@@ -14,349 +14,377 @@
          "Plural-Forms": " nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;",
          "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
-         "Ověřování uživatele"
+         "BrowserID vyžaduje cookies"
       ],
-      "Adding Address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "Přidávání adresy"
+         "Zavřete prosím okno, <a %s>povolte cookies</a> a zkuste to znovu."
       ],
-      "Adding Primary Email Address to User": [
+      "Communication Error": [
          null,
-         "Přidávání primární e-mailové adresy k uživateli"
+         "Chyba při komunikaci"
       ],
-      "Checking Address Info": [
+      "Finishing Sign In...": [
          null,
-         "Kontrola informací o adrese"
+         "Probíhá dokončování přihlašování"
       ],
-      "Authenticating with Assertion": [
+      "In just a moment you'll be signed into BrowserID.": [
          null,
-         ""
+         "Za chvíli budete přihlášeni k BrowserID."
       ],
-      "Cancelling User Account": [
+      "Please wait a few seconds while we sign you into the site.": [
          null,
-         "Rušení uživatelského účtu"
+         "Počkejte prosím několik sekund, probíhá přihlášení k webu."
       ],
-      "Checking Authentication": [
+      "We are sorry, this request is taking a LOOONG time.": [
          null,
-         "Kontrola autentifikace"
+         "Omlouváme se, tento požadavek trvá DLOUHO."
       ],
-      "Checking Script Version": [
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
          null,
-         ""
+         "Tato zpráva zmizí, jakmile se požadavek dokončí (doufejme brzy). Pokud čekáte příliš dlouho, zavřete toto okno a zkuste to znovu."
       ],
-      "Completing User Registration": [
+      "Sign in using": [
          null,
-         "Dokočnování registrace uživatele"
+         "Přihlášení pomocí"
       ],
-      "We are sorry, BrowserID requires cookies": [
+      "New email address": [
          null,
-         "Omlouváme se, ale BrowserID vyžaduje cookies."
+         "Nová e-mailová adresa"
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
+      "This field must be an email address.": [
          null,
-         "BrowserID pro svou funkčnost vyžaduje ve vašem prohlížeči povolené cookies. Povolte prosím ve vašem prohlížeči a zkuste to znovu."
+         "Pole musí obsahovat e-mailovou adresu."
       ],
-      "Checking if Cookies are Enabled": [
+      "The email field is required.": [
          null,
-         "Kontrola, zda jsou cookies povoleny"
+         "Pole s e-mailem je vyžadováno."
       ],
-      "Creating Account": [
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
          null,
-         "Vytváření účtu"
+         "Právě jsme poslali e-mail na vaši adresu! Pokud skutečně chcete poslat další, počkejte minutu či dvě a zkuste to znovu."
       ],
-      "Getting Assertion": [
+      "That address is already added to your account!": [
          null,
-         ""
+         "Tato adresa již byla k vašemu účtu přidána!"
       ],
-      "Checking Registration Token": [
+      "add": [
          null,
-         "Kontrola registračního řetězce"
+         "přidat"
       ],
-      "Checking Email Address": [
+      "cancel": [
          null,
-         "Kontrola e-mailové adresy"
+         "zrušit"
       ],
-      "Checking Whether User is Authenticated with IdP": [
+      "Email": [
          null,
-         ""
+         "E-mail"
       ],
-      "Logout Failed": [
+      "Enter your email address to sign in to <strong>%s</strong>": [
          null,
-         "Odhlášení selhalo"
+         "Vložte svou e-mailovou adresou a přihlašte se k <strong>%s</strong>"
       ],
-      "You are offline!": [
+      "Welcome to BrowserID!": [
          null,
-         "Jste offline!"
+         "Vítá vás BrowserID!"
       ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
+      "This email looks new, so let's get you set up.": [
          null,
-         "BrowserID bohužel nemůže komunikovat, když jste offline!"
+         "E-mail vypadá nově. Proveďte jeho nastavení."
       ],
-      "Authenticating with Identity Provider": [
+      "Password": [
          null,
-         ""
+         "Heslo"
       ],
-      "We had trouble communicating with your email provider, please try again!": [
+      "forgot your password?": [
          null,
-         "Vyskytl se problém při komunikaci s vaším poskytovatelem pošty. Zkuste to prosím znovu!"
+         "zapomněl(a) jste heslo?"
       ],
-      "Provisioning with Identity Provider": [
+      "The password field is required.": [
          null,
-         ""
+         "Pole s heslem je vyžadováno."
       ],
-      "Provisioning Unsupported Identity Provider": [
+      "The account cannot be logged in with this username and password.": [
          null,
-         ""
+         "K účtu se nemůžete přihlásit s tímto uživatelským jménem a heslem."
       ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
          null,
-         ""
+         "Klepnutím na %s potvrzujete, že souhlasíte se <a %s>zásadami použití</a>  a <a %s>zásadami pro soukromí</a> webu."
       ],
-      "Registration Failed": [
+      "next": [
          null,
-         "Registrace selhala"
+         "další"
       ],
-      "Establishing Relay": [
+      "verify email": [
          null,
-         "Navazování relace"
+         "ověření e-mailu"
       ],
-      "Relay frame could not be found": [
+      "sign in": [
          null,
-         ""
+         "přihlášení"
       ],
-      "Resetting Password": [
+      "Cannot verify %s": [
          null,
-         "Obnova hesla"
+         "Nelze ověřit %s"
       ],
-      "Remove Email Address from Account": [
+      "%s is a required address, but we cannot verify that you own this address.": [
          null,
-         "Odebrání e-mailové adresy z účtu"
+         "%s je požadovaná adresa, ale my nemůžeme ověřit, že je to vaše adresa."
       ],
-      "Setting Password": [
+      "Check your email!": [
          null,
-         "Nastavení hesla"
+         "Zkontrolujte si svůj e-mail"
       ],
-      "Signin Failed": [
+      "We sent a confirmation email to <strong>%s</strong>": [
          null,
-         "Přihlášení selhalo"
+         "Poslali jsme vám ověřovací e-mail na adresu <strong>%s</strong>."
       ],
-      "Signup Failed": [
+      "To finish signing in just click the verify link we sent to your email address.": [
          null,
-         "Odhlášení selhalo"
+         "Pro dokončení ověřování jednoduše klepněte na odkaz, který jsme zaslali na vaši e-mailovou adresu."
       ],
-      "Syncing Address": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
          null,
-         "Synchronizace adresy"
+         "Pokud je to omyl, jednoduše zaslaný e-mail ignorujte a <a href=\"#\" id=\"back\">zrušte jej</a>."
       ],
-      "Syncing Email Addresses": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          null,
-         "Synchronizace e-mailových adres"
+         "Pokud je to omyl, jednoduše zaslaný e-mail ignorujte a <a href=\"#\" id=\"back\">použijte jinou e-mailovou adresu</a>."
       ],
-      "Sync Keys for Address": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         "Synchronizace klíčů pro adresu"
+         "Velice se omlouváme, ale server je momentálně přetížen."
       ],
-      "Getting Token Info": [
+      "We are very sorry, there has been an error!": [
          null,
-         ""
+         "Velice se omlouváme, ale vyskytla se chyba."
       ],
-      "Updating password": [
+      "Please reload the page and try again.": [
          null,
-         "Aktualizace hesla"
+         "Obnovte prosím stránku a zkuste to znovu."
       ],
-      "Verifying email address": [
+      "Please close this window and try again.": [
          null,
-         "Ověření e-mailové adresy"
+         "Zavřete prosím okno a zkuste to znovu."
       ],
-      "Communication Error": [
+      "See more info": [
          null,
-         "Chyba při komunikaci"
+         "Zobrazení více informací"
       ],
-      "Finishing Sign In...": [
+      "The site requested you sign in using": [
          null,
-         "Probíhá dokončování přihlašování"
+         "Stránka, ke které se chcete přihlásit, používá"
       ],
-      "In just a moment you'll be signed into BrowserID.": [
+      "reset password": [
          null,
-         "Za chvíli budete přihlášeni k BrowserID."
+         "obnova hesla"
       ],
-      "Please wait a few seconds while we sign you into the site.": [
+      "*%s* is not a valid email address!": [
          null,
-         "Počkejte prosím několik sekund, probíhá přihlášení k webu."
+         "*%s* není platnou e-mailovou adresou!"
       ],
-      "We are sorry, this request is taking a LOOONG time.": [
+      "To continue, please close the window and enter a valid address.": [
          null,
-         "Omlouváme se, tento požadavek trvá DLOUHO."
+         "Pro pokračování prosím zavřete okno a vložte platnou e-mailovou adresu."
       ],
-      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+      "This is not me...": [
          null,
-         ""
+         "Nejsem to já..."
       ],
-      "Sign in using": [
+      "Use a different email": [
          null,
-         "Přihlášení pomocí"
+         "Použít jiný e-mail"
       ],
-      "New email address": [
+      "Always sign in using this email": [
          null,
-         "Nový e-mailová adresa"
+         "Vždy se přihlašovat pomocí tohoto e-mailu"
       ],
-      "This field must be an email address.": [
+      "Address Verified!": [
          null,
-         "Pole musí obsahovat e-mailovou adresu."
+         "Adresa ověřena!"
       ],
-      "The email field is required.": [
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
          null,
-         "Pole s e-mailem je vyžadováno."
+         "Vaše identita byla pomocí poskytovatele pošty ověřena. Nyní vás zkusíme přihlásit."
       ],
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
          null,
-         "Právě jsme poslali e-mail na vaši adresu! Pokud skutečně chcete poslat další, počkejte minutu či dvě a zkuste to znovu."
+         "Nyní musíte ověřit, že zvolená e-mailová adresa je skutečně vaše. Toto okno bude přesměrováno na"
       ],
-      "That address is already added to your account!": [
+      "verify": [
          null,
-         "Tato adresa již byla k vašemu účtu přidána!"
+         "ověření"
       ],
-      "add": [
+      "Verify With Email Provider": [
          null,
-         "přidat"
+         "Ověření pomocí poskytovatele pošty"
       ],
-      "cancel": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         "zrušit"
+         "#~ \"Pro fungování BrowserID je nutné mít v prohlížeči povolené cookies. \"#~ \"Povolte prosím ve svém prohlížeči cookies a zkuste to znovu.\""
       ],
-      "Email": [
+      "You are offline!": [
          null,
-         "E-mail"
+         "Jste offline!"
       ],
-      "Enter your email address to sign in to <strong>%s</strong>": [
+      "Unfortunately, BrowserID cannot communicate while offline!": [
          null,
-         "Vložte svou e-mailovou adresou a přihlašte se k <strong>%s</strong>"
+         "BrowserID bohužel nemůže komunikovat, když jste offline!"
       ],
-      "Welcome to BrowserID!": [
+      "select email": [
          null,
-         "Vítá vás BrowserID!"
+         "volba e-mailu"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
          null,
-         "E-mail vypadá nově. Proveďte jeho nastavení."
+         "#~ \"Omlouváme se, ale nemůže komunikovat s BrowserID v situaci, kdy jste \"#~ \"offline.\""
       ],
-      "Password": [
+      "Authenticating User": [
          null,
-         "Heslo"
+         "Ověřování uživatele"
       ],
-      "forgot your password?": [
+      "Adding Address": [
          null,
-         "zapomněl(a) jste heslo?"
+         "Přidávání adresy"
       ],
-      "The password field is required.": [
+      "Adding Primary Email Address to User": [
          null,
-         "Pole s heslem je vyžadováno."
+         "Přidávání primární e-mailové adresy k uživateli"
       ],
-      "The account cannot be logged in with this username and password.": [
+      "Checking Address Info": [
          null,
-         ""
+         "Kontrola informací o adrese"
       ],
-      "next": [
+      "Authenticating with Assertion": [
          null,
-         "další"
+         "Autentizace s potvrzením"
       ],
-      "verify email": [
+      "Cancelling User Account": [
          null,
-         "ověření e-mailu"
+         "Rušení uživatelského účtu"
       ],
-      "select email": [
+      "Checking Authentication": [
          null,
-         "volba e-mailu"
+         "Kontrola autentifikace"
       ],
-      "Cannot verify %s": [
+      "Checking Script Version": [
          null,
-         "Nelze ověřit %s"
+         "Kontrola verze skriptu"
       ],
-      "%s is a required address, but we cannot verify that you own this address.": [
+      "Completing User Registration": [
          null,
-         "%s je požadovaná adresa, ale my nemůžeme ověřit, že je to vaše adresa."
+         "Dokončování registrace uživatele"
       ],
-      "Check your email!": [
+      "Checking if Cookies are Enabled": [
          null,
-         "Zkontrolujte si svůj e-mail"
+         "Kontrola, zda jsou cookies povoleny"
       ],
-      "We sent a confirmation email to <strong>%s</strong>": [
+      "Creating Account": [
          null,
-         "Poslali jsme vám ověřovací e-mail na adresu <strong>%s</strong>."
+         "Vytváření účtu"
       ],
-      "To finish signing in just click the verify link we sent to your email address.": [
+      "Getting Assertion": [
          null,
-         "Pro dokončení ověřování jednoduše klepněte na odkaz, který jsme zaslali na vaši e-mailovou adresu."
+         "Získání potvrzení"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+      "Checking Registration Token": [
          null,
-         "Pokud je to omyl, jednoduše zaslaný e-mail ignorujte a <a href=\"#\" class=\"cancel\" id=\"back\">použijte jinou e-mailovou adresu</a>."
+         "Kontrola registračního tokenu"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+      "Checking Email Address": [
          null,
-         "Pokud je to omyl, jednoduše zaslaný e-mail ignorujte a <a href=\"#\" class=\"cancel\" id=\"back\">použijte jinou e-mailovou adresu</a>."
+         "Kontrola e-mailové adresy"
       ],
-      "The site requested you sign in using": [
+      "Checking Whether User is Authenticated with IdP": [
          null,
-         ""
+         "Kontrola, zde je uživatel autentizován pomocí IdP"
       ],
-      "Reset Password": [
+      "Logout Failed": [
          null,
-         "Obnova hesla"
+         "Odhlášení selhalo"
       ],
-      "Cancel": [
+      "Authenticating with Identity Provider": [
          null,
-         "Zrušit"
+         "Autentizace pomocí poskytovatele identity"
       ],
-      "*%s* is not a valid email address!": [
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
          null,
-         "*%s* není platnou e-mailovou adresou!"
+         "#~ \"Vyskytl se problém při komunikaci s vaším poskytovatelem pošty. Zkuste to \"#~ \"prosím znovu!\""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "Provisioning with Identity Provider": [
          null,
-         "Pro pokračování prosím zavřete okno a vložte platnou e-mailovou adresu."
+         "Zprovoznění poskytovatele identity"
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "Provisioning Unsupported Identity Provider": [
          null,
-         "Omlouváme se, ale nemůže komunikovat s BrowserID v situaci, kdy jste offline."
+         "Zprovoznění nepodporovaného poskytovatele identity"
       ],
-      "This is not me...": [
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
          null,
-         "Nejsem to já..."
+         "#~ \"Zadaná e-mailová adresa nemůže bohužel sloužit jako primární poskytovatel \"#~ \"identity\""
       ],
-      "Use a different email": [
+      "Registration Failed": [
          null,
-         "Použít jiný e-mail"
+         "Registrace selhala"
       ],
-      "Always sign in using this email": [
+      "Establishing Relay": [
          null,
-         "Vždy se přihlašovat pomocí tohoto e-mailu"
+         "Navazování přenosu"
       ],
-      "sign in": [
+      "Relay frame could not be found": [
          null,
-         "přihlášení"
+         "Rámec přenosu se nepodařilo najít"
       ],
-      "Address Verified!": [
+      "Resetting Password": [
          null,
-         "Adresa ověřena!"
+         "Obnova hesla"
       ],
-      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+      "Remove Email Address from Account": [
          null,
-         ""
+         "Odebrání e-mailové adresy z účtu"
       ],
-      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+      "Setting Password": [
          null,
-         ""
+         "Nastavení hesla"
       ],
-      "Verify": [
+      "Signin Failed": [
          null,
-         "Ověření"
+         "Přihlášení selhalo"
       ],
-      "Verify With Email Provider": [
+      "Signup Failed": [
          null,
-         "Ověření pomocí poskytovatele pošty"
+         "Odhlášení selhalo"
+      ],
+      "Syncing Address": [
+         null,
+         "Synchronizace adresy"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "Synchronizace e-mailových adres"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Synchronizace klíčů adresy"
+      ],
+      "Getting Token Info": [
+         null,
+         "Získání informace o tokenu"
+      ],
+      "Updating password": [
+         null,
+         "Aktualizace hesla"
+      ],
+      "Verifying email address": [
+         null,
+         "Ověření e-mailové adresy"
+      ],
+      "Cancel": [
+         null,
+         "Zrušit"
       ],
       "This email looks new, so let&apos;s get you set up.": [
          null,
diff --git a/resources/static/i18n/cs/messages.json b/resources/static/i18n/cs/messages.json
index e131a1a4e..210ddef98 100644
--- a/resources/static/i18n/cs/messages.json
+++ b/resources/static/i18n/cs/messages.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-04 14:36+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-09 21:00+0200",
          "Last-Translator": " Pavel <jasnapaka@jasnapaka.com>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " cs",
@@ -26,7 +26,7 @@
          null,
          "Při pokusu o dokončení registrace nastala chyba."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          "Dokončení přihlášení k:"
       ],
@@ -74,9 +74,9 @@
          null,
          "Hesla si neodpovídají."
       ],
-      "Finish": [
+      "finish": [
          null,
-         "Dokončit"
+         "dokončit"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
@@ -86,6 +86,14 @@
          null,
          "Nová adresa je nastavena a vy se nyní můžete přihlásit. Můžete toto okno zavřít a přejít zpět na"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID vyžaduje cookies"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "Zavřete prosím toto okno, <a %s>povolte cookies</a> a zkuste to znovu."
+      ],
       "Communicating with server": [
          null,
          "Probíhá komunikace se serverem"
@@ -98,9 +106,9 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         "BrowserID je rychlý a bezpečný způsob pro přihlašování &mdash; <a target=\"_blank\" href=\"/about\">dozvědět se více</a>"
+         "BrowserID je rychlý a bezpečný způsob pro přihlašování &mdash; <a %s>dozvědět se více</a>"
       ],
       "BrowserID: %s": [
          null,
@@ -126,9 +134,9 @@
          null,
          "Odhlášení"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         "Od <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
+         "Od <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
@@ -146,7 +154,7 @@
          null,
          "U přihlašovacího odkazu se vyskytl problém. Nebyla tato adresa již zaregistrována?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "Chyba při komunikaci se serverem."
       ],
diff --git a/resources/static/i18n/da/client.json b/resources/static/i18n/da/client.json
index 49d3176e2..fbda975bc 100644
--- a/resources/static/i18n/da/client.json
+++ b/resources/static/i18n/da/client.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-05 15:04+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-27 18:36+0100",
          "Last-Translator": " Dan Storm <storm@catalystcode.net>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " ",
@@ -12,161 +12,13 @@
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit"
       },
-      "Authenticating User": [
-         null,
-         "Godkender bruger"
-      ],
-      "Adding Address": [
-         null,
-         "Tilføjer adresse"
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         "Tilføjer primær mailadresse til bruger"
-      ],
-      "Checking Address Info": [
-         null,
-         "Kontrollerer adresseinformation"
-      ],
-      "Authenticating with Assertion": [
-         null,
-         "Godkender med påstand"
-      ],
-      "Cancelling User Account": [
-         null,
-         "Annullerer brugerkonto"
-      ],
-      "Checking Authentication": [
-         null,
-         "Kontrollerer godkendelse"
-      ],
-      "Checking Script Version": [
-         null,
-         "Kontrollerer script-version"
-      ],
-      "Completing User Registration": [
-         null,
-         "Afslutter brugertilmelding."
-      ],
-      "We are sorry, BrowserID requires cookies": [
+      "BrowserID requires cookies": [
          null,
          "Vi beklager, men BrowserID kræver cookies"
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         "BrowserID kræver, at din browser accepterer cookies, for at virke. Aktiver cookies i din browser, og prøv igen."
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         "Kontrollerer at cookies er aktiveret"
-      ],
-      "Creating Account": [
-         null,
-         "Opretter konto"
-      ],
-      "Getting Assertion": [
-         null,
-         "Henter påstand"
-      ],
-      "Checking Registration Token": [
-         null,
-         "Kontrollerer registreringsnøgle"
-      ],
-      "Checking Email Address": [
-         null,
-         "Kontrollerer mailadresse"
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         "Kontrollerer om brugeren er godkendt gennem IdP"
-      ],
-      "Logout Failed": [
-         null,
-         "Log ud mislykkedes"
-      ],
-      "You are offline!": [
-         null,
-         "Du er offline!"
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         "BrowserID kan beklageligvis ikke kommunikere i offline tilstand!"
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         "Godkender med identitetsudbyder"
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         "Vi kunne ikke kommunikere med din mailudbyder. Prøv igen!"
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         "Provisionerer med identitetsudbyder"
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         "Provisionerer ikke-understøttet identitetsudbyder"
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         "Den angivne mailadresse kan desværre ikke agere som primær identitetsudbyder"
-      ],
-      "Registration Failed": [
-         null,
-         "Tilmeldingen mislykkedes"
-      ],
-      "Establishing Relay": [
-         null,
-         "Etablerer relay"
-      ],
-      "Relay frame could not be found": [
-         null,
-         "Relay ramme kunne ikke findes"
-      ],
-      "Resetting Password": [
-         null,
-         "Nulstiller adgangskode"
-      ],
-      "Remove Email Address from Account": [
-         null,
-         "Fjerner mailadresse fra konto"
-      ],
-      "Setting Password": [
-         null,
-         "Indstiller adgangskode"
-      ],
-      "Signin Failed": [
-         null,
-         "Log ind mislykkkedes"
-      ],
-      "Signup Failed": [
-         null,
-         "Tilmelding mislykkedes"
-      ],
-      "Syncing Address": [
-         null,
-         "Synkroniserer adresse"
-      ],
-      "Syncing Email Addresses": [
-         null,
-         "Synkroniserer mailadresser"
-      ],
-      "Sync Keys for Address": [
-         null,
-         "Synkroniserer nøgler for adresser"
-      ],
-      "Getting Token Info": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "Henter nøgleinformation"
-      ],
-      "Updating password": [
-         null,
-         "Opdaterer adgangskode"
-      ],
-      "Verifying email address": [
-         null,
-         "Bekræfter mailadresse"
+         ""
       ],
       "Communication Error": [
          null,
@@ -236,7 +88,7 @@
          null,
          "Velkommen til BrowserID"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
          "Denne mailadresse ser ny ud, så lad os få dig i gang."
       ],
@@ -256,6 +108,10 @@
          null,
          "Du kan ikke logge ind på denne konto med det angivne brugernavn og adgangskode."
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         ""
+      ],
       "next": [
          null,
          "næste"
@@ -264,9 +120,9 @@
          null,
          "bekræft mailadresse"
       ],
-      "select email": [
+      "sign in": [
          null,
-         "vælg mailadresse"
+         "log ind"
       ],
       "Cannot verify %s": [
          null,
@@ -296,17 +152,33 @@
          null,
          "Hvis dette er en fejl, kan du ignorere den sendte mail og <a href=\"#\" id=\"back\">bruge en anden mailadresse</a>."
       ],
-      "The site requested you sign in using": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         "Websitet ønsker, at du logger ind ved at bruge"
+         "Vi beklager virkelig, men serveren er under ekstremt pres!"
       ],
-      "Reset Password": [
+      "We are very sorry, there has been an error!": [
          null,
-         "Nulstil adgangskode"
+         "Vi beklager meget, men der opstod en fejl!"
       ],
-      "Cancel": [
+      "Please reload the page and try again.": [
          null,
-         "Annuller"
+         "For at prøve igen, skal du genindlæse siden og prøve på ny."
+      ],
+      "Please close this window and try again.": [
+         null,
+         "For at fortsætte skal du lukke vinduet og prøve på ny."
+      ],
+      "See more info": [
+         null,
+         "Se flere oplysninger"
+      ],
+      "The site requested you sign in using": [
+         null,
+         "Websitet ønsker, at du logger ind ved at bruge"
+      ],
+      "reset password": [
+         null,
+         "nulstil adgangskode"
       ],
       "*%s* is not a valid email address!": [
          null,
@@ -316,10 +188,6 @@
          null,
          "For at fortsætte skal du lukke vinduet og indtaste en gyldig adresse."
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
-         null,
-         "Vi kan beklageligvis ikke kommunikere med BrowserID mens du er offline."
-      ],
       "This is not me...": [
          null,
          "Dette er ikke mig..."
@@ -332,10 +200,6 @@
          null,
          "Brug altid denne mailadresse"
       ],
-      "sign in": [
-         null,
-         "log ind"
-      ],
       "Address Verified!": [
          null,
          "Adresse bekræftet!"
@@ -348,13 +212,33 @@
          null,
          "Du skal logge ind med din mailudbyder for at bekræfte ejerskab over denne adresse. Dette vindue vil nu stille videre til"
       ],
-      "Verify": [
+      "verify": [
          null,
-         "Bekræft"
+         "bekræft"
       ],
       "Verify With Email Provider": [
          null,
          "Bekræft med mailudbyder"
+      ],
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
+         null,
+         "#~ \"BrowserID kræver, at din browser accepterer cookies, for at virke. \"#~ \"Aktiver cookies i din browser, og prøv igen.\""
+      ],
+      "You are offline!": [
+         null,
+         "Du er offline!"
+      ],
+      "Unfortunately, BrowserID cannot communicate while offline!": [
+         null,
+         "BrowserID kan beklageligvis ikke kommunikere i offline tilstand!"
+      ],
+      "select email": [
+         null,
+         "vælg mailadresse"
+      ],
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
+         null,
+         "#~ \"Vi kan beklageligvis ikke kommunikere med BrowserID mens du er offline.\""
       ]
    }
 }
diff --git a/resources/static/i18n/da/messages.json b/resources/static/i18n/da/messages.json
index cd41b9c69..89246c5f7 100644
--- a/resources/static/i18n/da/messages.json
+++ b/resources/static/i18n/da/messages.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " 2012-02-05 14:29+0100",
          "Last-Translator": " Dan Storm <storm@catalystcode.net>",
          "Language-Team": " LANGUAGE <LL@li.org>",
@@ -24,7 +24,7 @@
          null,
          "Der opstod en fejl under registreringen."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          "Log ind på:"
       ],
@@ -72,9 +72,9 @@
          null,
          "Adgangskoder stemmer ikke overens."
       ],
-      "Finish": [
+      "finish": [
          null,
-         "Afslut"
+         "afslut"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
@@ -84,6 +84,14 @@
          null,
          "Din nye adresse er nu sat op og du skulle nu være logget ind. Du kan lukke dette vindue og gå tilbage til"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID Hjem"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
       "Communicating with server": [
          null,
          "Kommunikerer med serveren"
@@ -96,7 +104,7 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
          "BrowserID er den hurtige og sikre måde at logge ind på &mdash; <a target=\"_blank\" href=\"/about\">lær mere</a>"
       ],
@@ -124,7 +132,7 @@
          null,
          "Log ud"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
          "Af <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
       ],
@@ -144,7 +152,7 @@
          null,
          "Der opstod en fejl med dit tilmeldingslink. Er denne adresse allerede registreret?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "Der opstod en fejl under kommunikationen med serveren."
       ],
diff --git a/resources/static/i18n/db_LB/client.json b/resources/static/i18n/db_LB/client.json
index 2795f7aee..bbf827441 100644
--- a/resources/static/i18n/db_LB/client.json
+++ b/resources/static/i18n/db_LB/client.json
@@ -3,170 +3,22 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
          "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " ",
          "MIME-Version": " 1.0",
-         "Content-Type": " text/plain; charset=UTF-8",
+         "Content-Type": " text/plain; charset=CHARSET",
          "Content-Transfer-Encoding": " 8bit"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
-         "‮∀nʇɥǝuʇıɔɐʇıuƃ ∩sǝɹ"
+         "‮ԐɹoʍsǝɹIᗡ ɹǝbnıɹǝs ɔooʞıǝs"
       ],
-      "Adding Address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "‮∀ppıuƃ ∀ppɹǝss"
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         "‮∀ppıuƃ Ԁɹıɯɐɹʎ Ǝɯɐıʅ ∀ppɹǝss ʇo ∩sǝɹ"
-      ],
-      "Checking Address Info": [
-         null,
-         "‮Ↄɥǝɔʞıuƃ ∀ppɹǝss Iuɟo"
-      ],
-      "Authenticating with Assertion": [
-         null,
-         "‮∀nʇɥǝuʇıɔɐʇıuƃ ʍıʇɥ ∀ssǝɹʇıou"
-      ],
-      "Cancelling User Account": [
-         null,
-         "‮Ↄɐuɔǝʅʅıuƃ ∩sǝɹ ∀ɔɔonuʇ"
-      ],
-      "Checking Authentication": [
-         null,
-         "‮Ↄɥǝɔʞıuƃ ∀nʇɥǝuʇıɔɐʇıou"
-      ],
-      "Checking Script Version": [
-         null,
-         "‮Ↄɥǝɔʞıuƃ Sɔɹıdʇ Ʌǝɹsıou"
-      ],
-      "Completing User Registration": [
-         null,
-         "‮Ↄoɯdʅǝʇıuƃ ∩sǝɹ ᴚǝƃısʇɹɐʇıou"
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         "‮Mǝ ɐɹǝ soɹɹʎ´ ԐɹoʍsǝɹIᗡ ɹǝbnıɹǝs ɔooʞıǝs"
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         "‮Ԑɹ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"
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         "‮Ↄɥǝɔʞıuƃ ıɟ Ↄooʞıǝs ɐɹǝ Ǝuɐqʅǝp"
-      ],
-      "Creating Account": [
-         null,
-         "‮Ↄɹǝɐʇıuƃ ∀ɔɔonuʇ"
-      ],
-      "Getting Assertion": [
-         null,
-         "‮⅁ǝʇʇıuƃ ∀ssǝɹʇıou"
-      ],
-      "Checking Registration Token": [
-         null,
-         "‮Ↄɥǝɔʞıuƃ ᴚǝƃısʇɹɐʇıou ⊥oʞǝu"
-      ],
-      "Checking Email Address": [
-         null,
-         "‮Ↄɥǝɔʞıuƃ Ǝɯɐıʅ ∀ppɹǝss"
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         "‮Ↄɥǝɔʞıuƃ Mɥǝʇɥǝɹ ∩sǝɹ ıs ∀nʇɥǝuʇıɔɐʇǝp ʍıʇɥ IpԀ"
-      ],
-      "Logout Failed": [
-         null,
-         "‮⅂oƃonʇ Ⅎɐıʅǝp"
-      ],
-      "You are offline!": [
-         null,
-         "‮⅄on ɐɹǝ oɟɟʅıuǝ¡"
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         "‮∩uɟoɹʇnuɐʇǝʅʎ´ ԐɹoʍsǝɹIᗡ ɔɐuuoʇ ɔoɯɯnuıɔɐʇǝ ʍɥıʅǝ oɟɟʅıuǝ¡"
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         "‮∀nʇɥǝuʇıɔɐʇıuƃ ʍıʇɥ Ipǝuʇıʇʎ Ԁɹoʌıpǝɹ"
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         "‮Mǝ ɥɐp ʇɹonqʅǝ ɔoɯɯnuıɔɐʇıuƃ ʍıʇɥ ʎonɹ ǝɯɐıʅ dɹoʌıpǝɹ´ dʅǝɐsǝ ʇɹʎ ɐƃɐıu¡"
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         "‮Ԁɹoʌısıouıuƃ ʍıʇɥ Ipǝuʇıʇʎ Ԁɹoʌıpǝɹ"
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         "‮Ԁɹoʌısıouıuƃ ∩usnddoɹʇǝp Ipǝuʇıʇʎ Ԁɹoʌıpǝɹ"
-      ],
-      "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ǝɹ"
-      ],
-      "Registration Failed": [
-         null,
-         "‮ᴚǝƃısʇɹɐʇıou Ⅎɐıʅǝp"
-      ],
-      "Establishing Relay": [
-         null,
-         "‮Ǝsʇɐqʅısɥıuƃ ᴚǝʅɐʎ"
-      ],
-      "Relay frame could not be found": [
-         null,
-         "‮ᴚǝʅɐʎ ɟɹɐɯǝ ɔonʅp uoʇ qǝ ɟonup"
-      ],
-      "Resetting Password": [
-         null,
-         "‮ᴚǝsǝʇʇıuƃ Ԁɐssʍoɹp"
-      ],
-      "Remove Email Address from Account": [
-         null,
-         "‮ᴚǝɯoʌǝ Ǝɯɐıʅ ∀ppɹǝss ɟɹoɯ ∀ɔɔonuʇ"
-      ],
-      "Setting Password": [
-         null,
-         "‮Sǝʇʇıuƃ Ԁɐssʍoɹp"
-      ],
-      "Signin Failed": [
-         null,
-         "‮Sıƃuıu Ⅎɐıʅǝp"
-      ],
-      "Signup Failed": [
-         null,
-         "‮Sıƃund Ⅎɐıʅǝp"
-      ],
-      "Syncing Address": [
-         null,
-         "‮Sʎuɔıuƃ ∀ppɹǝss"
-      ],
-      "Syncing Email Addresses": [
-         null,
-         "‮Sʎuɔıuƃ Ǝɯɐıʅ ∀ppɹǝssǝs"
-      ],
-      "Sync Keys for Address": [
-         null,
-         "‮Sʎuɔ Ӽǝʎs ɟoɹ ∀ppɹǝss"
-      ],
-      "Getting Token Info": [
-         null,
-         "‮⅁ǝʇʇıuƃ ⊥oʞǝu Iuɟo"
-      ],
-      "Updating password": [
-         null,
-         "‮∩dpɐʇıuƃ dɐssʍoɹp"
-      ],
-      "Verifying email address": [
-         null,
-         "‮Ʌǝɹıɟʎıuƃ ǝɯɐıʅ ɐppɹǝss"
+         "‮Ԁʅǝɐsǝ ɔʅosǝ ʇɥıs ʍıupoʍ´ <ɐ %s‮>ǝuɐqʅǝ ɔooʞıǝs</a>‮ ɐup ʇɹʎ ɐƃɐıu"
       ],
       "Communication Error": [
          null,
@@ -236,9 +88,9 @@
          null,
          "‮Mǝʅɔoɯǝ ʇo ԐɹoʍsǝɹIᗡ¡"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
-         "‮⊥ɥıs ǝɯɐıʅ ʅooʞs uǝʍ´ so ʅǝʇ&#39;‮s ƃǝʇ ʎon sǝʇ nd·"
+         "‮⊥ɥıs ǝɯɐıʅ ʅooʞs uǝʍ´ so ʅǝʇ,s ƃǝʇ ʎon sǝʇ nd·"
       ],
       "Password": [
          null,
@@ -256,6 +108,10 @@
          null,
          "‮⊥ɥǝ ɐɔɔonuʇ ɔɐuuoʇ qǝ ʅoƃƃǝp ıu ʍıʇɥ ʇɥıs nsǝɹuɐɯǝ ɐup dɐssʍoɹp·"
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         "‮Ԑʎ ɔʅıɔʞıuƃ %s‮´ ʎon ɔouɟıɹɯ ʇɥɐʇ ʎon ɐɔɔǝdʇ ʇɥıs sıʇǝ,s <ɐ %s‮>⊥ǝɹɯs oɟ ∩sǝ</a>‮ ɐup <ɐ %s‮>Ԁɹıʌɐɔʎ Ԁoʅıɔʎ</a>‮·"
+      ],
       "next": [
          null,
          "‮uǝxʇ"
@@ -264,9 +120,9 @@
          null,
          "‮ʌǝɹıɟʎ ǝɯɐıʅ"
       ],
-      "select email": [
+      "sign in": [
          null,
-         "‮sǝʅǝɔʇ ǝɯɐıʅ"
+         "‮sıƃu ıu"
       ],
       "Cannot verify %s": [
          null,
@@ -296,17 +152,33 @@
          null,
          "‮Iɟ ʇɥıs ıs ɐ ɯısʇɐʞǝ´ ɾnsʇ ıƃuoɹǝ ʇɥǝ sǝuʇ ǝɯɐıʅ ɐup <a href=\"#\" id=\"back\">‮nsǝ ɐuoʇɥǝɹ ǝɯɐıʅ ɐppɹǝss</a>‮·"
       ],
-      "The site requested you sign in using": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         "‮⊥ɥǝ sıʇǝ ɹǝbnǝsʇǝp ʎon sıƃu ıu nsıuƃ"
+         "‮Mǝ ɐɹǝ ʌǝɹʎ soɹɹʎ´ ʇɥǝ sǝɹʌǝɹ ıs nupǝɹ ǝxʇɹǝɯǝ ʅoɐp¡"
+      ],
+      "We are very sorry, there has been an error!": [
+         null,
+         "‮Mǝ ɐɹǝ ʌǝɹʎ soɹɹʎ´ ʇɥǝɹǝ ɥɐs qǝǝu ɐu ǝɹɹoɹ¡"
+      ],
+      "Please reload the page and try again.": [
+         null,
+         "‮Ԁʅǝɐsǝ ɹǝʅoɐp ʇɥǝ dɐƃǝ ɐup ʇɹʎ ɐƃɐıu·"
       ],
-      "Reset Password": [
+      "Please close this window and try again.": [
          null,
-         "‮ᴚǝsǝʇ Ԁɐssʍoɹp"
+         "‮Ԁʅǝɐsǝ ɔʅosǝ ʇɥıs ʍıupoʍ ɐup ʇɹʎ ɐƃɐıu·"
       ],
-      "Cancel": [
+      "See more info": [
          null,
-         "‮Ↄɐuɔǝʅ"
+         "‮Sǝǝ ɯoɹǝ ıuɟo"
+      ],
+      "The site requested you sign in using": [
+         null,
+         "‮⊥ɥǝ sıʇǝ ɹǝbnǝsʇǝp ʎon sıƃu ıu nsıuƃ"
+      ],
+      "reset password": [
+         null,
+         "‮ɹǝsǝʇ dɐssʍoɹp"
       ],
       "*%s* is not a valid email address!": [
          null,
@@ -316,10 +188,6 @@
          null,
          "‮⊥o ɔouʇıunǝ´ dʅǝɐsǝ ɔʅosǝ ʇɥǝ ʍıupoʍ ɐup ǝuʇǝɹ ɐ ʌɐʅıp ɐppɹǝss·"
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
-         null,
-         "‮Mǝ ɐɹǝ soɹɹʎ´ qnʇ ʍǝ ɔɐuuoʇ ɔoɯɯnuıɔɐʇǝ ʍıʇɥ ԐɹoʍsǝɹIᗡ ʍɥıʅǝ ʎon ɐɹǝ oɟɟʅıuǝ·"
-      ],
       "This is not me...": [
          null,
          "‮⊥ɥıs ıs uoʇ ɯǝ···"
@@ -332,10 +200,6 @@
          null,
          "‮∀ʅʍɐʎs sıƃu ıu nsıuƃ ʇɥıs ǝɯɐıʅ"
       ],
-      "sign in": [
-         null,
-         "‮sıƃu ıu"
-      ],
       "Address Verified!": [
          null,
          "‮∀ppɹǝss Ʌǝɹıɟıǝp¡"
@@ -348,9 +212,9 @@
          null,
          "‮⅄on ɯnsʇ sıƃu ıu ʍıʇɥ ʎonɹ ǝɯɐıʅ dɹoʌıpǝɹ ʇo ʌǝɹıɟʎ oʍuǝɹsɥıd oɟ ʇɥıs ɐppɹǝss· ⊥ɥıs ʍıupoʍ ʍıʅʅ qǝ ɹǝpıɹǝɔʇǝp ʇo"
       ],
-      "Verify": [
+      "verify": [
          null,
-         "‮Ʌǝɹıɟʎ"
+         "‮ʌǝɹıɟʎ"
       ],
       "Verify With Email Provider": [
          null,
diff --git a/resources/static/i18n/db_LB/messages.json b/resources/static/i18n/db_LB/messages.json
index f7a404d29..28f5101ac 100644
--- a/resources/static/i18n/db_LB/messages.json
+++ b/resources/static/i18n/db_LB/messages.json
@@ -3,13 +3,13 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
          "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " ",
          "MIME-Version": " 1.0",
-         "Content-Type": " text/plain; charset=UTF-8",
+         "Content-Type": " text/plain; charset=CHARSET",
          "Content-Transfer-Encoding": " 8bit"
       },
       "Complete Login to %s using BrowserID": [
@@ -24,9 +24,9 @@
          null,
          "‮Ǝɹɹoɹ ǝuɔonuʇǝɹǝp ʇɹʎıuƃ ʇo ɔoɯdʅǝʇǝ ɹǝƃısʇɹɐʇıou·"
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         "‮Ⅎıuısɥ sıƃuıuƃ ıuʇo: "
+         "‮Ⅎıuısɥ sıƃuıuƃ ıuʇo:"
       ],
       "Email Verification": [
          null,
@@ -72,9 +72,9 @@
          null,
          "‮Ԁɐssʍoɹps po uoʇ ɯɐʇɔɥ·"
       ],
-      "Finish": [
+      "finish": [
          null,
-         "‮Ⅎıuısɥ"
+         "‮ɟıuısɥ"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
@@ -84,6 +84,14 @@
          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"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "‮ԐɹoʍsǝɹIᗡ ɹǝbnıɹǝs ɔooʞıǝs"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "‮Ԁʅǝɐsǝ ɔʅosǝ ʇɥıs ʍıupoʍ´ <ɐ %s‮>ǝuɐqʅǝ ɔooʞıǝs</a>‮ ɐup ʇɹʎ ɐƃɐıu"
+      ],
       "Communicating with server": [
          null,
          "‮Ↄoɯɯnuıɔɐʇıuƃ ʍıʇɥ sǝɹʌǝɹ"
@@ -96,9 +104,9 @@
          null,
          "‮ԐɹoʍsǝɹIᗡ"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>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>"
+         "‮ԐɹoʍsǝɹIᗡ ıs ʇɥǝ ɟɐsʇ ɐup sǝɔnɹǝ ʍɐʎ ʇo sıƃu ıu &mdash;‮ <ɐ %s‮>ʅǝɐɹu ɯoɹǝ</a>"
       ],
       "BrowserID: %s": [
          null,
@@ -124,9 +132,9 @@
          null,
          "‮Sıƃu Onʇ"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         "‮Ԑʎ ʇɥǝ <a href=\"%s\" target=\"_blank\">‮Ipǝuʇıʇʎ ⊥ǝɐɯ</a>‮ @ <a href=\"%s\" target=\"_blank\">‮Wozıʅʅɐ ⅂ɐqs</a>"
+         "‮Ԑʎ ʇɥǝ <ɐ %s‮>Ipǝuʇıʇʎ ⊥ǝɐɯ</a>‮ @ <ɐ %s‮>Wozıʅʅɐ ⅂ɐqs</a>"
       ],
       "Privacy": [
          null,
@@ -144,9 +152,9 @@
          null,
          "‮⊥ɥǝɹǝ ʍɐs ɐ dɹoqʅǝɯ ʍıʇɥ ʎonɹ sıƃund ʅıuʞ· Hɐs ʇɥıs ɐppɹǝss ɐʅɹǝɐpʎ qǝǝu ɹǝƃısʇǝɹǝp?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
-         "‮Ǝɹɹoɹ ɔoɯnuıɔɐʇıuƃ ʍıʇɥ sǝɹʌǝɹ·"
+         "‮Ǝɹɹoɹ ɔoɯɯnuıɔɐʇıuƃ ʍıʇɥ sǝɹʌǝɹ·"
       ],
       "Last step!": [
          null,
diff --git a/resources/static/i18n/de/client.json b/resources/static/i18n/de/client.json
index c98a1ff9a..fc3d0ed30 100644
--- a/resources/static/i18n/de/client.json
+++ b/resources/static/i18n/de/client.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-03 21:38+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-02 17:13+0200",
          "Last-Translator": " Michael <michael.koehler1@gmx.de>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " de",
@@ -14,161 +14,13 @@
          "Plural-Forms": " nplurals=2; plural=(n != 1);",
          "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
-         null,
-         "Benutzer wird authentifiziert"
-      ],
-      "Adding Address": [
-         null,
-         "Adresse wird hinzugefügt"
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         "Primäre E-Mail-Adresse wird zum Benutzer hinzugefügt"
-      ],
-      "Checking Address Info": [
-         null,
-         "Adressdaten werden überprüft"
-      ],
-      "Authenticating with Assertion": [
-         null,
-         "Authentifizierung mit Versicherung"
-      ],
-      "Cancelling User Account": [
-         null,
-         "Benutzerkonto wird entfernt"
-      ],
-      "Checking Authentication": [
-         null,
-         "Authentifizierung wird überprüft"
-      ],
-      "Checking Script Version": [
-         null,
-         "Skript-Version wird überprüft"
-      ],
-      "Completing User Registration": [
-         null,
-         "Benutzerregistrierung wird abgeschlossen"
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         "Es tut uns Leid, BrowserID erfordert Cookies"
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         "Für BrowserID müssen Cookies in Ihrem Browser aktiviert sein. Bitte aktivieren Sie die Cookies in Ihrem Browser und versuchen Sie es erneut."
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         "Überprüfung, ob Cookies aktiviert sind"
-      ],
-      "Creating Account": [
-         null,
-         "Benutzerkonto wird erstellt"
-      ],
-      "Getting Assertion": [
-         null,
-         "Versicherung wird geholt"
-      ],
-      "Checking Registration Token": [
-         null,
-         "Registrierungsschlüssel wird überprüft"
-      ],
-      "Checking Email Address": [
-         null,
-         "E-Mail-Adresse wird überprüft"
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         "Überprüfung, ob der Benutzer bei Identitätsanbieter authentifiziert ist"
-      ],
-      "Logout Failed": [
-         null,
-         "Abmeldung fehlgeschlagen"
-      ],
-      "You are offline!": [
-         null,
-         "Sie sind offline!"
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         "Leider kann BrowserID nicht kommunizieren, wenn Sie offline sind!"
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         "Authentifizierung mit Identitätsanbieter"
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         "Wir hatten Schwierigkeiten, mit Ihrem E-Mail-Anbieter zu kommunizieren, bitte versuchen Sie es erneut!"
-      ],
-      "Provisioning with Identity Provider": [
+      "BrowserID requires cookies": [
          null,
-         "Identitätsanbieter wird bereitgestellt"
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         "Bereitstellung von nicht unterstütztem Identitätsanbieter"
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         "Leider kann die angegebene E-Mail-Adresse nicht als primärer Identitätsanbieter fungieren"
-      ],
-      "Registration Failed": [
-         null,
-         "Registrierung fehlgeschlagen"
-      ],
-      "Establishing Relay": [
-         null,
-         "Ãœbertragung wird eingerichtet"
-      ],
-      "Relay frame could not be found": [
-         null,
-         "Ãœbertragungsrahmen konnte nicht gefunden werden"
-      ],
-      "Resetting Password": [
-         null,
-         "Passwort wird zurückgesetzt"
-      ],
-      "Remove Email Address from Account": [
-         null,
-         "E-Mail-Adresse von Benutzerkonto entfernen"
-      ],
-      "Setting Password": [
-         null,
-         "Passwort wird gesetzt"
-      ],
-      "Signin Failed": [
-         null,
-         "Anmeldung fehlgeschlagen"
-      ],
-      "Signup Failed": [
-         null,
-         "Registrierung fehlgeschlagen"
-      ],
-      "Syncing Address": [
-         null,
-         "Adresse wird synchronisiert"
+         "BrowserID erfordert Cookies"
       ],
-      "Syncing Email Addresses": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "E-Mail-Adressen werden synchronisiert"
-      ],
-      "Sync Keys for Address": [
-         null,
-         "Synchronisierungsschlüssel für Adresse"
-      ],
-      "Getting Token Info": [
-         null,
-         "Schlüsseldaten werden geholt"
-      ],
-      "Updating password": [
-         null,
-         "Passwort wird aktualisiert"
-      ],
-      "Verifying email address": [
-         null,
-         "E-Mail-Adresse wird verifiziert"
+         "Bitte schließen Sie dieses Fenster, <a %s>aktivieren Sie Cookies</a> und versuchen Sie es erneut"
       ],
       "Communication Error": [
          null,
@@ -238,7 +90,7 @@
          null,
          "Willkommen zu BrowserID!"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
          "Diese E-Mail-Adresse sieht neu aus, also richten wir Sie mal ein."
       ],
@@ -258,6 +110,10 @@
          null,
          "Zu diesem Benutzerkonto können Sie sich nicht mit diesem Benutzernamen und Passwort anmelden."
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         "Indem Sie %s anklicken, bestätigen Sie, dass Sie die <a %s>Nutzungsbedingungen</a> und die <a %s>Datenschutzerklärung</a> dieser Website akzeptieren."
+      ],
       "next": [
          null,
          "Weiter"
@@ -266,9 +122,9 @@
          null,
          "E-Mail-Adresse bestätigen"
       ],
-      "select email": [
+      "sign in": [
          null,
-         "E-Mail-Adresse auswählen"
+         "Anmelden"
       ],
       "Cannot verify %s": [
          null,
@@ -298,18 +154,34 @@
          null,
          "Wenn das ein Fehler ist, ignorieren Sie die verschickte E-Mail einfach und <a href=\"#\" id=\"back\">verwenden Sie eine andere E-Mail-Adresse</a>."
       ],
+      "We are very sorry, the server is under extreme load!": [
+         null,
+         "Es tut uns sehr Leid, der Server steht unter extremer Last!"
+      ],
+      "We are very sorry, there has been an error!": [
+         null,
+         "Es tut uns sehr Leid, es ist ein Fehler aufgetreten!"
+      ],
+      "Please reload the page and try again.": [
+         null,
+         "Bitte laden Sie die Seite neu und versuchen Sie es erneut."
+      ],
+      "Please close this window and try again.": [
+         null,
+         "Bitte schließen Sie dieses Fenster und versuchen Sie es erneut."
+      ],
+      "See more info": [
+         null,
+         "Weitere Informationen erhalten"
+      ],
       "The site requested you sign in using": [
          null,
          "Die Website verlangt, dass Sie sich anmelden mit"
       ],
-      "Reset Password": [
+      "reset password": [
          null,
          "Passwort zurücksetzen"
       ],
-      "Cancel": [
-         null,
-         "Abbrechen"
-      ],
       "*%s* is not a valid email address!": [
          null,
          "*%s* ist keine gültige E-Mail-Adresse!"
@@ -318,10 +190,6 @@
          null,
          "Um fortzufahren schließen Sie bitte dieses Fenster und geben Sie eine gültige Adresse ein."
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
-         null,
-         "Es tut uns Leid, aber wir können nicht mit BrowserID kommunizieren, während Sie offline sind."
-      ],
       "This is not me...": [
          null,
          "Das bin ich nicht …"
@@ -334,10 +202,6 @@
          null,
          "Immer mit dieser E-Mail-Adresse anmelden"
       ],
-      "sign in": [
-         null,
-         "Anmelden"
-      ],
       "Address Verified!": [
          null,
          "Adresse verifiziert!"
@@ -350,7 +214,7 @@
          null,
          "Sie müssen sich bei Ihrem E-Mail-Anbieter anmelden, um zu bestätigen, dass diese Adresse Ihnen gehört. Dieses Fenster wird weitergeleitet zu"
       ],
-      "Verify": [
+      "verify": [
          null,
          "Bestätigen"
       ],
@@ -358,13 +222,173 @@
          null,
          "Beim E-Mail-Anbieter bestätigen"
       ],
-      "#~ \"We just sent an email to that address!  If you really want to send \"#~ \"another, wait a minute or two and try again.\"": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         "#~ \"Wir haben gerade eine E-Mail an diese Adresse verschickt! Wenn Sie \"#~ \"wirklich noch eine senden möchten, warten Sie ein oder zwei Minuten und \"#~ \"versuchen Sie es dann erneut.\""
+         "#~ \"Für BrowserID müssen Cookies in Ihrem Browser aktiviert sein. Bitte \"#~ \"aktivieren Sie die Cookies in Ihrem Browser und versuchen Sie es erneut.\""
       ],
-      "This email looks new, so let&apos;s get you set up.": [
+      "You are offline!": [
          null,
-         "Diese E-Mail-Adresse sieht neu aus, also richten wir Sie mal ein."
+         "Sie sind offline!"
+      ],
+      "Unfortunately, BrowserID cannot communicate while offline!": [
+         null,
+         "Leider kann BrowserID nicht kommunizieren, wenn Sie offline sind!"
+      ],
+      "select email": [
+         null,
+         "E-Mail-Adresse auswählen"
+      ],
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
+         null,
+         "#~ \"Es tut uns Leid, aber wir können nicht mit BrowserID kommunizieren, \"#~ \"während Sie offline sind.\""
+      ],
+      "Authenticating User": [
+         null,
+         "Benutzer wird authentifiziert"
+      ],
+      "Adding Address": [
+         null,
+         "Adresse wird hinzugefügt"
+      ],
+      "Adding Primary Email Address to User": [
+         null,
+         "Primäre E-Mail-Adresse wird zum Benutzer hinzugefügt"
+      ],
+      "Checking Address Info": [
+         null,
+         "Adressdaten werden überprüft"
+      ],
+      "Authenticating with Assertion": [
+         null,
+         "Authentifizierung mit Versicherung"
+      ],
+      "Cancelling User Account": [
+         null,
+         "Benutzerkonto wird entfernt"
+      ],
+      "Checking Authentication": [
+         null,
+         "Authentifizierung wird überprüft"
+      ],
+      "Checking Script Version": [
+         null,
+         "Skript-Version wird überprüft"
+      ],
+      "Completing User Registration": [
+         null,
+         "Benutzerregistrierung wird abgeschlossen"
+      ],
+      "Checking if Cookies are Enabled": [
+         null,
+         "Überprüfung, ob Cookies aktiviert sind"
+      ],
+      "Creating Account": [
+         null,
+         "Benutzerkonto wird erstellt"
+      ],
+      "Getting Assertion": [
+         null,
+         "Versicherung wird geholt"
+      ],
+      "Checking Registration Token": [
+         null,
+         "Registrierungsschlüssel wird überprüft"
+      ],
+      "Checking Email Address": [
+         null,
+         "E-Mail-Adresse wird überprüft"
+      ],
+      "Checking Whether User is Authenticated with IdP": [
+         null,
+         "#~ \"Überprüfung, ob der Benutzer bei Identitätsanbieter authentifiziert ist\""
+      ],
+      "Logout Failed": [
+         null,
+         "Abmeldung fehlgeschlagen"
+      ],
+      "Authenticating with Identity Provider": [
+         null,
+         "Authentifizierung mit Identitätsanbieter"
+      ],
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
+         null,
+         "#~ \"Wir hatten Schwierigkeiten, mit Ihrem E-Mail-Anbieter zu kommunizieren, \"#~ \"bitte versuchen Sie es erneut!\""
+      ],
+      "Provisioning with Identity Provider": [
+         null,
+         "Identitätsanbieter wird bereitgestellt"
+      ],
+      "Provisioning Unsupported Identity Provider": [
+         null,
+         "Bereitstellung von nicht unterstütztem Identitätsanbieter"
+      ],
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
+         null,
+         "#~ \"Leider kann die angegebene E-Mail-Adresse nicht als primärer \"#~ \"Identitätsanbieter fungieren\""
+      ],
+      "Registration Failed": [
+         null,
+         "Registrierung fehlgeschlagen"
+      ],
+      "Establishing Relay": [
+         null,
+         "Ãœbertragung wird eingerichtet"
+      ],
+      "Relay frame could not be found": [
+         null,
+         "Ãœbertragungsrahmen konnte nicht gefunden werden"
+      ],
+      "Resetting Password": [
+         null,
+         "Passwort wird zurückgesetzt"
+      ],
+      "Remove Email Address from Account": [
+         null,
+         "E-Mail-Adresse von Benutzerkonto entfernen"
+      ],
+      "Setting Password": [
+         null,
+         "Passwort wird gesetzt"
+      ],
+      "Signin Failed": [
+         null,
+         "Anmeldung fehlgeschlagen"
+      ],
+      "Signup Failed": [
+         null,
+         "Registrierung fehlgeschlagen"
+      ],
+      "Syncing Address": [
+         null,
+         "Adresse wird synchronisiert"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "E-Mail-Adressen werden synchronisiert"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Synchronisierungsschlüssel für Adresse"
+      ],
+      "Getting Token Info": [
+         null,
+         "Schlüsseldaten werden geholt"
+      ],
+      "Updating password": [
+         null,
+         "Passwort wird aktualisiert"
+      ],
+      "Verifying email address": [
+         null,
+         "E-Mail-Adresse wird verifiziert"
+      ],
+      "Cancel": [
+         null,
+         "Abbrechen"
+      ],
+      "#~ \"We just sent an email to that address!  If you really want to send \"#~ \"another, wait a minute or two and try again.\"": [
+         null,
+         "#~ \"Wir haben gerade eine E-Mail an diese Adresse verschickt! Wenn Sie \"#~ \"wirklich noch eine senden möchten, warten Sie ein oder zwei Minuten und \"#~ \"versuchen Sie es dann erneut.\""
       ],
       "#~ \"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,
diff --git a/resources/static/i18n/de/messages.json b/resources/static/i18n/de/messages.json
index 0dac2dc46..2b695d791 100644
--- a/resources/static/i18n/de/messages.json
+++ b/resources/static/i18n/de/messages.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-03 21:40+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-02 17:15+0200",
          "Last-Translator": " Michael <michael.koehler1@gmx.de>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " de",
@@ -26,9 +26,9 @@
          null,
          "Es ist ein Fehler aufgetreten beim Versuch die Registrierung abzuschließen."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         "Anmeldung wird abgeschlossen bei: "
+         "Anmeldung wird abgeschlossen bei:"
       ],
       "Email Verification": [
          null,
@@ -74,7 +74,7 @@
          null,
          "Passwörter stimmen nicht überein."
       ],
-      "Finish": [
+      "finish": [
          null,
          "Abschließen"
       ],
@@ -86,21 +86,29 @@
          null,
          "Ihre neue Adresse wurde eingerichtet und Sie sollten jetzt angemeldet sein. Sie können dieses Fenster jetzt schließen und zurückkehren zu"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID erfordert Cookies"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "Bitte schließen Sie dieses Fenster, <a %s>aktivieren Sie Cookies</a> und versuchen Sie es erneut"
+      ],
       "Communicating with server": [
          null,
          "Kommunikation mit dem Server"
       ],
       "Just a moment while we talk with the server.": [
          null,
-         "Einen Moment bitte, währen wir mit dem Server sprechen."
+         "Einen Moment bitte, während wir mit dem Server sprechen."
       ],
       "BrowserID": [
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         "BrowserID ist die schnelle und sichere Möglichkeit zur Anmeldung &ndash; <a target=\"_blank\" href=\"/about\">erfahren Sie mehr</a>"
+         "BrowserID ist die schnelle und sichere Möglichkeit zur Anmeldung &mdash; <a %s>erfahren Sie mehr</a>"
       ],
       "BrowserID: %s": [
          null,
@@ -126,9 +134,9 @@
          null,
          "Abmelden"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         "Vom <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
+         "Vom <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
@@ -146,9 +154,9 @@
          null,
          "Bei Ihrem Registrierungslink ist ein Fehler aufgetreten. Wurde diese Adresse bereits registriert?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
-         "Bei der Kommunikation mit dem Server ist ein Fehler aufgetreten."
+         "Fehler bei Kommunikation mit dem Server."
       ],
       "Last step!": [
          null,
diff --git a/resources/static/i18n/el/client.json b/resources/static/i18n/el/client.json
index c9bec9bb5..0c80dd386 100644
--- a/resources/static/i18n/el/client.json
+++ b/resources/static/i18n/el/client.json
@@ -3,173 +3,27 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-06 20:10+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-03 01:57+0200",
          "Last-Translator": " Γιώργος Φιωτάκης <fiotakis@otenet.gr>",
          "Language-Team": " Greek <fiotakis@otenet.gr>",
-         "Language": " ",
+         "Language": " el",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
+         "Plural-Forms": " nplurals=2; plural=(n != 1);",
+         "X-Generator": " Pootle 2.1.6",
+         "X-Poedit-SourceCharset": " utf-8",
          "X-Poedit-Language": " Greek",
-         "X-Poedit-Country": " GREECE",
-         "X-Poedit-SourceCharset": " utf-8"
+         "X-Poedit-Country": " GREECE"
       },
-      "Authenticating User": [
-         null,
-         "Γίνεται πιστοποίηση χρήστη"
-      ],
-      "Adding Address": [
+      "BrowserID requires cookies": [
          null,
-         "Προστίθεται διεύθυνση"
+         "Το BrowserID απαιτεί cookies"
       ],
-      "Adding Primary Email Address to User": [
-         null,
-         "Προστίθεται πρωτεύουσα διεύθυνση ηλ. ταχυδρομείου χρήστη"
-      ],
-      "Checking Address Info": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "Γίνεται έλεγχος διεύθυνσης"
-      ],
-      "Authenticating with Assertion": [
-         null,
-         "Πιστοποίηση μέσω διαβεβαίωσης"
-      ],
-      "Cancelling User Account": [
-         null,
-         "Ακυρώνεται ο λογαριασμός χρήστη"
-      ],
-      "Checking Authentication": [
-         null,
-         "Γίνεται έλεγχος πιστοποίησης"
-      ],
-      "Checking Script Version": [
-         null,
-         "Γίνεται έλεγχος έκδοσης σεναρίου εντολών"
-      ],
-      "Completing User Registration": [
-         null,
-         "Ολοκληρώνεται η εγγραφή χρήστη"
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         "Λυπούμαστε αλλά το BrowserID απαιτεί cookies"
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         "Το BrowserID απαιτεί την ενεργοποίηση των cookies στον περιηγητή για να λειτουργήσει. Σας παρακαλούμε να ενεργοποιήσετε τα cookies στον περιηγητή σας και να προσπαθήσετε ξανά."
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         "Γίνεται έλεγχος ενεργοποίησης cookies"
-      ],
-      "Creating Account": [
-         null,
-         "Γίνεται δημιουργία λογαριασμού"
-      ],
-      "Getting Assertion": [
-         null,
-         "Λήψη διαβεβαίωσης"
-      ],
-      "Checking Registration Token": [
-         null,
-         "Γίνεται έλεγχος token εγγραφής"
-      ],
-      "Checking Email Address": [
-         null,
-         "Γίνεται έλεγχος διεύθυνσης ηλ. ταχυδρομείου"
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         "Γίνεται έλεγχος πιστοποίησης χρήστη μέσω IdP"
-      ],
-      "Logout Failed": [
-         null,
-         "Απέτυχε η αποσύνδεση"
-      ],
-      "You are offline!": [
-         null,
-         "Έχετε αποσυνδεθεί!"
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         "Δυστυχώς το BrowserID δεν μπορεί να επικοινωνήσει εκτός σύνδεσης!"
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         "Γίνεται πιστοποίηση μέσω πάροχου ταυτοποίησης"
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         "Παρουσιάστηκε πρόβλημα στην επικοινωνία μας με τον παροχέα ηλ. ταχυδρομείου σας, παρακαλούμε προσπαθήστε ξανά!"
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         "Τροφοδοσία παρόχου ταυτοποίησης"
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         "Τροφοδοσία μη υποστηριζόμενου παρόχου ταυτοποίησης"
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         "Δυστυχώς η διεύθυνση ηλ. ταχυδρομείου που παρείχατε δεν μπορεί να χρησιμοποιηθεί σαν πρωτεύουσα παροχή ταυτοποίησης"
-      ],
-      "Registration Failed": [
-         null,
-         "Απέτυχε η εγγραφή"
-      ],
-      "Establishing Relay": [
-         null,
-         "Δημιουργείται ο συσχετισμός"
-      ],
-      "Relay frame could not be found": [
-         null,
-         "Δεν βρέθηκε το πλαίσιο συσχέτισης"
-      ],
-      "Resetting Password": [
-         null,
-         "Γίνεται επαναφορά κωδικού"
-      ],
-      "Remove Email Address from Account": [
-         null,
-         "Αφαίρεση διεύθυνσης ηλ. ταχυδρομείου από τον λογαριασμό"
-      ],
-      "Setting Password": [
-         null,
-         "Γίνεται ορισμός κωδικού"
-      ],
-      "Signin Failed": [
-         null,
-         "Απέτυχε η σύνδεση"
-      ],
-      "Signup Failed": [
-         null,
-         "Απέτυχε η εγγραφή"
-      ],
-      "Syncing Address": [
-         null,
-         "Γίνεται συγχρονισμός διεύθυνσης"
-      ],
-      "Syncing Email Addresses": [
-         null,
-         "Γίνεται συγχρονισμός διεύθυνσης ηλ. ταχυδρομείου"
-      ],
-      "Sync Keys for Address": [
-         null,
-         "Συγχρονισμός κλειδιών για τη διεύθυνση"
-      ],
-      "Getting Token Info": [
-         null,
-         "Γίνεται λήψη πληροφοριών token"
-      ],
-      "Updating password": [
-         null,
-         "Γίνεται ενημέρωση κωδικού"
-      ],
-      "Verifying email address": [
-         null,
-         "Γίνεται επαλήθευση διεύθυνσης ηλ. ταχυδρομείου"
+         "Παρακαλούμε κλείστε αυτό το παράθυρο, <a %s>ενεργοποιήστε τα cookies</a> και δοκιμάστε ξανά."
       ],
       "Communication Error": [
          null,
@@ -239,7 +93,7 @@
          null,
          "Καλώς ορίσατε στο BrowserID"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
          "Αυτή η διεύθυνση ηλ. ταχυδρομείου φαίνεται καινούρια, ας κάνουμε λοιπόν τις ρυθμίσεις."
       ],
@@ -259,6 +113,10 @@
          null,
          "Δεν είναι δυνατή η σύνδεση στο λογαριασμό με αυτό τον κωδικό και το όνομα χρήστη."
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         "Κάνοντας κλικ στο %s, συμφωνείτε ότι αποδέχεστε τους <a %s>όρους χρήσης</a> και την <a %s>πολιτική απορρήτου</a> του ιστότοπου."
+      ],
       "next": [
          null,
          "Επόμενο"
@@ -267,9 +125,9 @@
          null,
          "Επαλήθευση διεύθυνσης"
       ],
-      "select email": [
+      "sign in": [
          null,
-         "Επιλογή διεύθυνσης ηλ. ταχυδρομείου"
+         "Σύνδεση"
       ],
       "Cannot verify %s": [
          null,
@@ -297,20 +155,36 @@
       ],
       "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          null,
-         "Αν πρόκειται για λάθος, απλά αγνοήστε το μήνυμα που σας στείλαμε και <a href=\"#\" id=\"back\">χρησιμοποιήστε άλλη διεύθυνση</a>."
+         "Αν πρόκειται για λάθος, απλά αγνοήστε το μήνυμα που σας στείλαμε και <a href=\"#\" id=\"back\">χρησιμοποιήστε άλλη διεύθυνση ηλ. ταχυδρομείου</a>."
+      ],
+      "We are very sorry, the server is under extreme load!": [
+         null,
+         "Ο διακομιστής έχει υπερβολικό φόρτο, σας ζητάμε συγνώμη!"
+      ],
+      "We are very sorry, there has been an error!": [
+         null,
+         "Παρουσιάστηκε σφάλμα, ζητάμε συγνώμη!"
+      ],
+      "Please reload the page and try again.": [
+         null,
+         "Παρακαλούμε ανανεώστε τη σελίδα και προσπαθήστε ξανά."
+      ],
+      "Please close this window and try again.": [
+         null,
+         "Παρακαλούμε κλείστε το παράθυρο και προσπαθήσετε ξανά."
+      ],
+      "See more info": [
+         null,
+         "Δείτε περισσότερες πληροφορίες"
       ],
       "The site requested you sign in using": [
          null,
          "Ο ιστότοπος απαιτεί να συνδεθείτε ως"
       ],
-      "Reset Password": [
+      "reset password": [
          null,
          "Επαναφορά κωδικού"
       ],
-      "Cancel": [
-         null,
-         "Ακύρωση"
-      ],
       "*%s* is not a valid email address!": [
          null,
          "Δεν είναι έγκυρη η διεύθυνση *%s*!"
@@ -319,10 +193,6 @@
          null,
          "Για να συνεχίσετε, σας παρακαλούμε να κλείσετε το παράθυρο και να εισάγετε μια έγκυρη διεύθυνση ηλ. ταχυδρομείου."
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
-         null,
-         "Λυπούμαστε αλλά δεν μπορούμε να επικοινωνήσουμε με το BrowserID εφόσον είστε εκτός σύνδεσης."
-      ],
       "This is not me...": [
          null,
          "Δεν είμαι εγώ..."
@@ -335,29 +205,189 @@
          null,
          "Να γίνεται πάντα σύνδεση με αυτή τη διεύθυνση."
       ],
-      "sign in": [
-         null,
-         "Σύνδεση"
-      ],
       "Address Verified!": [
          null,
          "Η διεύθυνση επαληθεύτηκε!"
       ],
       "Your identity has been verified with your email provider, we will now try to sign you in.": [
          null,
-         "Η ταυτότητα σας πιστοποιήθηκε από τον παροχέα του ηλεκτρονικού σας ταχυδρομείου, θα προσπαθήσουμε τώρα να σας συνδέσουμε."
+         "Η ταυτότητα σας επαληθεύτηκε από τον παροχέα του ηλεκτρονικού σας ταχυδρομείου, θα προσπαθήσουμε τώρα να σας συνδέσουμε."
       ],
       "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
          null,
-         "Θα πρέπει να συνδεθείτε στην υπηρεσία ηλεκτρονικού ταχυδρομείου σας για να επιβεβαιωθεί ότι σας ανήκει η διεύθυνση. Θα γίνει ανακατεύθυνση του παράθυρου στο"
+         "Θα πρέπει να συνδεθείτε στην υπηρεσία ηλεκτρονικού ταχυδρομείου σας για να επιβεβαιωθεί ότι σας ανήκει η διεύθυνση. Αυτό το παράθυρο θα σας ανακατευθύνει στο"
       ],
-      "Verify": [
+      "verify": [
          null,
          "Επαλήθευση"
       ],
       "Verify With Email Provider": [
          null,
          "Επιβεβαίωση μέσω παροχέα ηλ. ταχυδρομείου"
+      ],
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
+         null,
+         "#~ \"Το BrowserID απαιτεί την ενεργοποίηση των cookies στον περιηγητή για να \"#~ \"λειτουργήσει. Σας παρακαλούμε να ενεργοποιήσετε τα cookies στον περιηγητή \"#~ \"σας και να προσπαθήσετε ξανά.\""
+      ],
+      "You are offline!": [
+         null,
+         "Έχετε αποσυνδεθεί!"
+      ],
+      "Unfortunately, BrowserID cannot communicate while offline!": [
+         null,
+         "Δυστυχώς το BrowserID δεν μπορεί να επικοινωνήσει εκτός σύνδεσης!"
+      ],
+      "select email": [
+         null,
+         "Επιλογή διεύθυνσης"
+      ],
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
+         null,
+         "#~ \"Λυπούμαστε αλλά δεν μπορούμε να επικοινωνήσουμε με το BrowserID εφόσον \"#~ \"είστε εκτός σύνδεσης.\""
+      ],
+      "Authenticating User": [
+         null,
+         "Γίνεται πιστοποίηση χρήστη"
+      ],
+      "Adding Address": [
+         null,
+         "Προστίθεται διεύθυνση"
+      ],
+      "Adding Primary Email Address to User": [
+         null,
+         "Προστίθεται πρωτεύουσα διεύθυνση ηλ. ταχυδρομείου χρήστη"
+      ],
+      "Checking Address Info": [
+         null,
+         "Γίνεται έλεγχος διεύθυνσης"
+      ],
+      "Authenticating with Assertion": [
+         null,
+         "Πιστοποίηση μέσω διαβεβαίωσης"
+      ],
+      "Cancelling User Account": [
+         null,
+         "Ακυρώνεται ο λογαριασμός χρήστη"
+      ],
+      "Checking Authentication": [
+         null,
+         "Γίνεται έλεγχος πιστοποίησης"
+      ],
+      "Checking Script Version": [
+         null,
+         "Γίνεται έλεγχος έκδοσης σεναρίου εντολών"
+      ],
+      "Completing User Registration": [
+         null,
+         "Ολοκληρώνεται η εγγραφή χρήστη"
+      ],
+      "Checking if Cookies are Enabled": [
+         null,
+         "Γίνεται έλεγχος ενεργοποίησης cookies"
+      ],
+      "Creating Account": [
+         null,
+         "Γίνεται δημιουργία λογαριασμού"
+      ],
+      "Getting Assertion": [
+         null,
+         "Γίνεται λήψη διαβεβαίωσης"
+      ],
+      "Checking Registration Token": [
+         null,
+         "Γίνεται έλεγχος token εγγραφής"
+      ],
+      "Checking Email Address": [
+         null,
+         "Γίνεται έλεγχος διεύθυνσης ηλ. ταχυδρομείου"
+      ],
+      "Checking Whether User is Authenticated with IdP": [
+         null,
+         "Γίνεται έλεγχος πιστοποίησης χρήστη μέσω IdP"
+      ],
+      "Logout Failed": [
+         null,
+         "Απέτυχε η αποσύνδεση"
+      ],
+      "Authenticating with Identity Provider": [
+         null,
+         "Γίνεται πιστοποίηση μέσω πάροχου ταυτοποίησης"
+      ],
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
+         null,
+         "#~ \"Παρουσιάστηκε πρόβλημα στην επικοινωνία μας με τον παροχέα ηλ. \"#~ \"ταχυδρομείου σας, παρακαλούμε προσπαθήστε ξανά!\""
+      ],
+      "Provisioning with Identity Provider": [
+         null,
+         "Τροφοδοσία παρόχου ταυτοποίησης"
+      ],
+      "Provisioning Unsupported Identity Provider": [
+         null,
+         "Τροφοδοσία μη υποστηριζόμενου παρόχου ταυτοποίησης"
+      ],
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
+         null,
+         "#~ \"Δυστυχώς η διεύθυνση ηλ. ταχυδρομείου που δώσατε δεν μπορεί να \"#~ \"χρησιμοποιηθεί σαν βασικός πάροχος ταυτοποίησης\""
+      ],
+      "Registration Failed": [
+         null,
+         "Απέτυχε η εγγραφή"
+      ],
+      "Establishing Relay": [
+         null,
+         "Δημιουργείται ο συσχετισμός"
+      ],
+      "Relay frame could not be found": [
+         null,
+         "Δεν βρέθηκε το πλαίσιο συσχέτισης"
+      ],
+      "Resetting Password": [
+         null,
+         "Γίνεται επαναφορά κωδικού"
+      ],
+      "Remove Email Address from Account": [
+         null,
+         "Αφαίρεση διεύθυνσης ηλ. ταχυδρομείου από τον λογαριασμό"
+      ],
+      "Setting Password": [
+         null,
+         "Γίνεται ορισμός κωδικού"
+      ],
+      "Signin Failed": [
+         null,
+         "Απέτυχε η σύνδεση"
+      ],
+      "Signup Failed": [
+         null,
+         "Απέτυχε η εγγραφή"
+      ],
+      "Syncing Address": [
+         null,
+         "Γίνεται συγχρονισμός διεύθυνσης"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "Γίνεται συγχρονισμός διεύθυνσης ηλ. ταχυδρομείου"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Συγχρονισμός κλειδιών για τη διεύθυνση"
+      ],
+      "Getting Token Info": [
+         null,
+         "Γίνεται λήψη πληροφοριών token"
+      ],
+      "Updating password": [
+         null,
+         "Γίνεται ενημέρωση κωδικού"
+      ],
+      "Verifying email address": [
+         null,
+         "Γίνεται επαλήθευση διεύθυνσης ηλ. ταχυδρομείου"
+      ],
+      "Cancel": [
+         null,
+         "Ακύρωση"
       ]
    }
 }
diff --git a/resources/static/i18n/el/messages.json b/resources/static/i18n/el/messages.json
index 968fa6d17..2d5ade27c 100644
--- a/resources/static/i18n/el/messages.json
+++ b/resources/static/i18n/el/messages.json
@@ -3,16 +3,16 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-06 20:08+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-03 02:01+0200",
          "Last-Translator": " Γιώργος Φιωτάκης <fiotakis@otenet.gr>",
          "Language-Team": " el locale <fiotakis@otenet.gr>",
-         "Language": " ",
+         "Language": " el",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
-         "X-Poedit-Language": " Greek",
-         "X-Poedit-Country": " GREECE",
+         "Plural-Forms": " nplurals=2; plural=(n != 1);",
+         "X-Generator": " Pootle 2.1.6",
          "X-Poedit-SourceCharset": " utf-8"
       },
       "Complete Login to %s using BrowserID": [
@@ -27,13 +27,13 @@
          null,
          "Παρουσιάστηκε σφάλμα κατά την ολοκλήρωση της εγγραφής"
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         "Ολοκλήρωση σύνδεσης σε:"
+         "Ολοκληρώστε την σύνδεσή σας στο: "
       ],
       "Email Verification": [
          null,
-         "Επαλήθευση διεύθυνσης"
+         "Επιβεβαίωση διεύθυνσης"
       ],
       "Email Address": [
          null,
@@ -53,11 +53,11 @@
       ],
       "Password is required.": [
          null,
-         "Απαιτείται κωδικός"
+         "Απαιτείται κωδικός."
       ],
       "Password must be between 8 and 80 characters long.": [
          null,
-         "Το μήκος του κωδικού πρέπει να είναι από 8 ως 80 χαρακτήρες."
+         "Ο κωδικός πρέπει να είναι από 8 έως 80 χαρακτήρες."
       ],
       "Verify Password": [
          null,
@@ -75,33 +75,41 @@
          null,
          "Οι κωδικοί δεν ταιριάζουν."
       ],
-      "Finish": [
+      "finish": [
          null,
          "Ολοκλήρωση"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
-         "<strong class=\"email\">Η διεύθυνση σας</strong> επαληθεύτηκε!"
+         "<strong class=\"email\">Η διεύθυνσή σας</strong> έχει επαληθευθεί!"
       ],
       "Your new address is set up and you should now be signed in. You may now close this window and go back to": [
          null,
-         "Η νέα σας διεύθυνση ρυθμίστηκε και κανονικά έχετε συνδεθεί. Μπορείτε τώρα να κλείσετε αυτό το παράθυρο και να επιστρέψετε στο"
+         "Η νέα σας διεύθυνση ρυθμίστηκε και κανονικά έχετε συνδεθεί. Μπορείτε τώρα να κλείσετε αυτό το παράθυρο και να πάτε πίσω στο"
+      ],
+      "BrowserID requires cookies": [
+         null,
+         "Το BrowserID απαιτεί τη χρήση cookies."
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "Παρακαλούμε κλείστε το παράθυρο, <a %s>ενεργοποιήστε τα cookies</a> και προσπαθήστε ξανά."
       ],
       "Communicating with server": [
          null,
-         "Γίνεται επικοινωνία με το διακομιστή"
+         "Γίνεται επικοινωνία με τον διακομιστή"
       ],
       "Just a moment while we talk with the server.": [
          null,
-         "Επικοινωνούμε με το διακομιστή, περιμένετε μια στιγμή. "
+         "Παρακαλούμε περιμένετε όσο επικοινωνούμε με το διακομιστή."
       ],
       "BrowserID": [
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         "Το BrowserID είναι ο γρήγορος και ασφαλής τρόπος για να συνδέεστε &mdash; <a target=\"_blank\" href=\"/about\">μάθετε περισσότερα</a>"
+         "Το BrowserID είναι ο γρήγορος και ασφαλής τρόπος να συνδέεστε &mdash; <a target=\"_blank\" href=\"/about\">μάθετε περισσότερα</a>"
       ],
       "BrowserID: %s": [
          null,
@@ -127,9 +135,9 @@
          null,
          "Αποσύνδεση"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         "Από την ομάδα <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
+         "Από την ομάδα <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
@@ -147,9 +155,9 @@
          null,
          "Παρουσιάστηκε σφάλμα με το δεσμό εγγραφής. Μήπως έχετε ήδη εγγραφεί με αυτή τη διεύθυνση;"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
-         "Σφάλμα επικοινωνίας με το διακομιστή"
+         "Σφάλμα επικοινωνίας με το διακομιστή."
       ],
       "Last step!": [
          null,
diff --git a/resources/static/i18n/en_US/client.json b/resources/static/i18n/en_US/client.json
index 47170fd49..b0016b84c 100644
--- a/resources/static/i18n/en_US/client.json
+++ b/resources/static/i18n/en_US/client.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " 2012-01-10 17:32-0800",
          "Last-Translator": " Austin King <ozten@mozilla.com>",
          "Language-Team": " English",
@@ -13,162 +13,14 @@
          "Content-Transfer-Encoding": " 8bit",
          "Plural-Forms": " nplurals=2; plural=(n != 1);"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
          ""
       ],
-      "Adding Address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
          ""
       ],
-      "Adding Primary Email Address to User": [
-         null,
-         ""
-      ],
-      "Checking Address Info": [
-         null,
-         ""
-      ],
-      "Authenticating with Assertion": [
-         null,
-         ""
-      ],
-      "Cancelling User Account": [
-         null,
-         ""
-      ],
-      "Checking Authentication": [
-         null,
-         ""
-      ],
-      "Checking Script Version": [
-         null,
-         ""
-      ],
-      "Completing User Registration": [
-         null,
-         ""
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         ""
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         ""
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         ""
-      ],
-      "Creating Account": [
-         null,
-         ""
-      ],
-      "Getting Assertion": [
-         null,
-         ""
-      ],
-      "Checking Registration Token": [
-         null,
-         ""
-      ],
-      "Checking Email Address": [
-         null,
-         ""
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         ""
-      ],
-      "Logout Failed": [
-         null,
-         ""
-      ],
-      "You are offline!": [
-         null,
-         ""
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         ""
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         ""
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         ""
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         ""
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         ""
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         ""
-      ],
-      "Registration Failed": [
-         null,
-         ""
-      ],
-      "Establishing Relay": [
-         null,
-         ""
-      ],
-      "Relay frame could not be found": [
-         null,
-         ""
-      ],
-      "Resetting Password": [
-         null,
-         "Password"
-      ],
-      "Remove Email Address from Account": [
-         null,
-         ""
-      ],
-      "Setting Password": [
-         null,
-         "Password"
-      ],
-      "Signin Failed": [
-         null,
-         "Sign in using"
-      ],
-      "Signup Failed": [
-         null,
-         ""
-      ],
-      "Syncing Address": [
-         null,
-         ""
-      ],
-      "Syncing Email Addresses": [
-         null,
-         ""
-      ],
-      "Sync Keys for Address": [
-         null,
-         ""
-      ],
-      "Getting Token Info": [
-         null,
-         ""
-      ],
-      "Updating password": [
-         null,
-         ""
-      ],
-      "Verifying email address": [
-         null,
-         "verify email"
-      ],
       "Communication Error": [
          null,
          ""
@@ -195,7 +47,7 @@
       ],
       "Sign in using": [
          null,
-         "Sign in using"
+         ""
       ],
       "New email address": [
          null,
@@ -203,15 +55,15 @@
       ],
       "This field must be an email address.": [
          null,
-         "This field must be an email address."
+         ""
       ],
       "The email field is required.": [
          null,
-         "The email 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."
+         ""
       ],
       "That address is already added to your account!": [
          null,
@@ -227,7 +79,7 @@
       ],
       "Email": [
          null,
-         "Email"
+         ""
       ],
       "Enter your email address to sign in to <strong>%s</strong>": [
          null,
@@ -235,39 +87,43 @@
       ],
       "Welcome to BrowserID!": [
          null,
-         "Welcome to BrowserID!"
+         ""
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
-         "This email looks new, so let&apos;s get you set up."
+         ""
       ],
       "Password": [
          null,
-         "Password"
+         ""
       ],
       "forgot your password?": [
          null,
-         "forgot your password?"
+         ""
       ],
       "The password field is required.": [
          null,
-         "The password field is required."
+         ""
       ],
       "The account cannot be logged in with this username and password.": [
          null,
-         "The account cannot be logged in with this username and password."
+         ""
+      ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         ""
       ],
       "next": [
          null,
-         "next"
+         ""
       ],
       "verify email": [
          null,
-         "verify email"
+         ""
       ],
-      "select email": [
+      "sign in": [
          null,
-         "select email"
+         ""
       ],
       "Cannot verify %s": [
          null,
@@ -297,43 +153,51 @@
          null,
          ""
       ],
-      "The site requested you sign in using": [
+      "We are very sorry, the server is under extreme load!": [
          null,
          ""
       ],
-      "Reset Password": [
+      "We are very sorry, there has been an error!": [
          null,
-         "Password"
+         ""
       ],
-      "Cancel": [
+      "Please reload the page and try again.": [
          null,
          ""
       ],
-      "*%s* is not a valid email address!": [
+      "Please close this window and try again.": [
          null,
-         "This field must be an email address."
+         ""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "See more info": [
          null,
          ""
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "The site requested you sign in using": [
          null,
          ""
       ],
-      "This is not me...": [
+      "reset password": [
+         null,
+         "reset password"
+      ],
+      "*%s* is not a valid email address!": [
          null,
          ""
       ],
-      "Use a different email": [
+      "To continue, please close the window and enter a valid address.": [
          null,
          ""
       ],
-      "Always sign in using this email": [
+      "This is not me...": [
          null,
          ""
       ],
-      "sign in": [
+      "Use a different email": [
+         null,
+         ""
+      ],
+      "Always sign in using this email": [
          null,
          ""
       ],
@@ -349,21 +213,17 @@
          null,
          ""
       ],
-      "Verify": [
+      "verify": [
          null,
-         ""
+         "verify"
       ],
       "Verify With Email Provider": [
          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.\""
-      ],
-      "This email looks new, so let&apos;s get you set up.": [
+      "Cancel": [
          null,
-         "This email looks new, so let&apos;s get you set up."
+         "cancel"
       ]
    }
 }
diff --git a/resources/static/i18n/en_US/messages.json b/resources/static/i18n/en_US/messages.json
index 14ebc83b7..a8c15822a 100644
--- a/resources/static/i18n/en_US/messages.json
+++ b/resources/static/i18n/en_US/messages.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
          "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
          "Language-Team": " LANGUAGE <LL@li.org>",
@@ -24,7 +24,7 @@
          null,
          ""
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          ""
       ],
@@ -72,9 +72,9 @@
          null,
          ""
       ],
-      "Finish": [
+      "finish": [
          null,
-         ""
+         "finish"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
@@ -84,6 +84,14 @@
          null,
          ""
       ],
+      "BrowserID requires cookies": [
+         null,
+         ""
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
       "Communicating with server": [
          null,
          ""
@@ -96,7 +104,7 @@
          null,
          ""
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
          ""
       ],
@@ -124,7 +132,7 @@
          null,
          ""
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
          ""
       ],
@@ -144,7 +152,7 @@
          null,
          ""
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          ""
       ],
diff --git a/resources/static/i18n/eo/client.json b/resources/static/i18n/eo/client.json
index e4e257824..3b7e8f1ac 100644
--- a/resources/static/i18n/eo/client.json
+++ b/resources/static/i18n/eo/client.json
@@ -3,359 +3,303 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
-         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-06 16:51+0200",
+         "Last-Translator": " Eduardo <eduardo@esperanto.org.uy>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " eo",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
-         "X-Generator": " Translate Toolkit 1.9.0"
+         "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
-         ""
+         "Ni bedaÅ­ras, BrowserID postulas kuketojn"
       ],
-      "Adding Address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
          ""
       ],
-      "Adding Primary Email Address to User": [
-         null,
-         ""
-      ],
-      "Checking Address Info": [
-         null,
-         ""
-      ],
-      "Authenticating with Assertion": [
-         null,
-         ""
-      ],
-      "Cancelling User Account": [
-         null,
-         ""
-      ],
-      "Checking Authentication": [
-         null,
-         ""
-      ],
-      "Checking Script Version": [
-         null,
-         ""
-      ],
-      "Completing User Registration": [
-         null,
-         ""
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         ""
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         ""
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         ""
-      ],
-      "Creating Account": [
-         null,
-         ""
-      ],
-      "Getting Assertion": [
-         null,
-         ""
-      ],
-      "Checking Registration Token": [
-         null,
-         ""
-      ],
-      "Checking Email Address": [
-         null,
-         ""
-      ],
-      "Checking Whether User is Authenticated with IdP": [
+      "Communication Error": [
          null,
          ""
       ],
-      "Logout Failed": [
+      "Finishing Sign In...": [
          null,
          ""
       ],
-      "You are offline!": [
+      "In just a moment you'll be signed into BrowserID.": [
          null,
          ""
       ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
+      "Please wait a few seconds while we sign you into the site.": [
          null,
          ""
       ],
-      "Authenticating with Identity Provider": [
+      "We are sorry, this request is taking a LOOONG time.": [
          null,
          ""
       ],
-      "We had trouble communicating with your email provider, please try again!": [
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
          null,
          ""
       ],
-      "Provisioning with Identity Provider": [
+      "Sign in using": [
          null,
-         ""
+         "Sin anonci per"
       ],
-      "Provisioning Unsupported Identity Provider": [
+      "New email address": [
          null,
          ""
       ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
+      "This field must be an email address.": [
          null,
-         ""
+         "Tiu teksto devas esti retpoŝta adreso."
       ],
-      "Registration Failed": [
+      "The email field is required.": [
          null,
-         ""
+         "La teksto \"Retpoŝta adreso\" estas deviga."
       ],
-      "Establishing Relay": [
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
          null,
          ""
       ],
-      "Relay frame could not be found": [
+      "That address is already added to your account!": [
          null,
          ""
       ],
-      "Resetting Password": [
+      "add": [
          null,
          ""
       ],
-      "Remove Email Address from Account": [
+      "cancel": [
          null,
          ""
       ],
-      "Setting Password": [
+      "Email": [
          null,
-         ""
+         "Retpoŝta adreso"
       ],
-      "Signin Failed": [
+      "Enter your email address to sign in to <strong>%s</strong>": [
          null,
-         ""
+         "Bonvolu tajpi vian retpoŝtadreson por anonci vin al <strong>%s</strong>"
       ],
-      "Signup Failed": [
+      "Welcome to BrowserID!": [
          null,
-         ""
+         "Bonvenon al BrowserID!"
       ],
-      "Syncing Address": [
+      "This email looks new, so let's get you set up.": [
          null,
          ""
       ],
-      "Syncing Email Addresses": [
+      "Password": [
          null,
-         ""
+         "Pasvorto"
       ],
-      "Sync Keys for Address": [
+      "forgot your password?": [
          null,
-         ""
+         "ĉu vi forgesis vian pasvorton?"
       ],
-      "Getting Token Info": [
+      "The password field is required.": [
          null,
          ""
       ],
-      "Updating password": [
+      "The account cannot be logged in with this username and password.": [
          null,
          ""
       ],
-      "Verifying email address": [
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
          null,
          ""
       ],
-      "Communication Error": [
+      "next": [
          null,
          ""
       ],
-      "Finishing Sign In...": [
+      "verify email": [
          null,
          ""
       ],
-      "In just a moment you'll be signed into BrowserID.": [
+      "sign in": [
          null,
          ""
       ],
-      "Please wait a few seconds while we sign you into the site.": [
+      "Cannot verify %s": [
          null,
          ""
       ],
-      "We are sorry, this request is taking a LOOONG time.": [
+      "%s is a required address, but we cannot verify that you own this address.": [
          null,
          ""
       ],
-      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+      "Check your email!": [
          null,
-         ""
+         "Kontrolu vian retpoŝton!"
       ],
-      "Sign in using": [
+      "We sent a confirmation email to <strong>%s</strong>": [
          null,
-         ""
+         "Ni sendis konfirman retmesaĝon al <strong>%s</strong>"
       ],
-      "New email address": [
+      "To finish signing in just click the verify link we sent to your email address.": [
          null,
-         ""
+         "Por fini, alklaku la ligilon kiu troviĝas en la retmesaĝo kiun ni sendis."
       ],
-      "This field must be an email address.": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
          null,
          ""
       ],
-      "The email field is required.": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          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 very sorry, the server is under extreme load!": [
          null,
          ""
       ],
-      "That address is already added to your account!": [
+      "We are very sorry, there has been an error!": [
          null,
          ""
       ],
-      "add": [
+      "Please reload the page and try again.": [
          null,
          ""
       ],
-      "cancel": [
+      "Please close this window and try again.": [
          null,
          ""
       ],
-      "Email": [
+      "See more info": [
          null,
          ""
       ],
-      "Enter your email address to sign in to <strong>%s</strong>": [
+      "The site requested you sign in using": [
          null,
          ""
       ],
-      "Welcome to BrowserID!": [
+      "reset password": [
          null,
-         ""
+         "Pasvorto"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "*%s* is not a valid email address!": [
          null,
          ""
       ],
-      "Password": [
+      "To continue, please close the window and enter a valid address.": [
          null,
          ""
       ],
-      "forgot your password?": [
+      "This is not me...": [
          null,
          ""
       ],
-      "The password field is required.": [
+      "Use a different email": [
          null,
          ""
       ],
-      "The account cannot be logged in with this username and password.": [
+      "Always sign in using this email": [
          null,
          ""
       ],
-      "next": [
+      "Address Verified!": [
          null,
          ""
       ],
-      "verify email": [
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
          null,
          ""
       ],
-      "select email": [
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
          null,
          ""
       ],
-      "Cannot verify %s": [
+      "verify": [
          null,
          ""
       ],
-      "%s is a required address, but we cannot verify that you own this address.": [
+      "Verify With Email Provider": [
          null,
          ""
       ],
-      "Check your email!": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         ""
+         "#~ \"BrowserID postulas ke kuketoj estu aktivaj en via retesplorilo. Bonvolu \"#~ \"aktivigi la kuketojn kaj klopodi denove.\""
       ],
-      "We sent a confirmation email to <strong>%s</strong>": [
+      "You are offline!": [
          null,
-         ""
+         "Vi ne estas konektita!"
       ],
-      "To finish signing in just click the verify link we sent to your email address.": [
+      "Unfortunately, BrowserID cannot communicate while offline!": [
          null,
-         ""
+         "Bedaŭrinde BrowserID ne povas komunikiĝi se vi ne estas konektita!"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+      "Adding Address": [
          null,
-         ""
+         "Aldonado de adreso"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+      "Adding Primary Email Address to User": [
          null,
-         ""
+         "Aldonado de ĉefa adreso de la uzanto"
       ],
-      "The site requested you sign in using": [
+      "Checking Address Info": [
          null,
-         ""
+         "Kontrolado de la informo de la adreso"
       ],
-      "Reset Password": [
+      "Authenticating with Assertion": [
          null,
-         ""
+         "AÅ­tentikigado kun aserto"
       ],
-      "Cancel": [
+      "Cancelling User Account": [
          null,
-         ""
+         "Nuligado de la konto de uzanto"
       ],
-      "*%s* is not a valid email address!": [
+      "Checking Authentication": [
          null,
-         ""
+         "Kontrolado de aÅ­tentikigado"
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "Checking Script Version": [
          null,
-         ""
+         "Kontrolado de la versio de skripto"
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "Completing User Registration": [
          null,
-         ""
+         "Finado de la registrado de uzanto"
       ],
-      "This is not me...": [
+      "Checking if Cookies are Enabled": [
          null,
-         ""
+         "Kontrolado de la aktiveco de kuketoj"
       ],
-      "Use a different email": [
+      "Creating Account": [
          null,
-         ""
+         "Kreado de konto"
       ],
-      "Always sign in using this email": [
+      "Getting Assertion": [
          null,
-         ""
+         "Akirado de aserto"
       ],
-      "sign in": [
+      "Checking Registration Token": [
          null,
-         ""
+         "Kontrolado de la registra ĵetono"
       ],
-      "Address Verified!": [
+      "Checking Email Address": [
          null,
-         ""
+         "Kontrolado de la retpoŝta adreso"
       ],
-      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+      "Checking Whether User is Authenticated with IdP": [
          null,
-         ""
+         "Ĉu la uzanto estis aŭtentikigita de IdP?"
       ],
-      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+      "Logout Failed": [
          null,
-         ""
+         "Malkonektiĝo malsukcesa"
       ],
-      "Verify": [
+      "Authenticating with Identity Provider": [
          null,
-         ""
+         "AÅ­tentikigado kun provizanto de idento"
       ],
-      "Verify With Email Provider": [
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
          null,
-         ""
+         "#~ \"Ni havis problemojn komunikajn kun via retpoŝtprovizanto, bonvolu klopodi \"#~ \"denove!\""
       ]
    }
 }
diff --git a/resources/static/i18n/eo/messages.json b/resources/static/i18n/eo/messages.json
index f370c1dcc..7a0434995 100644
--- a/resources/static/i18n/eo/messages.json
+++ b/resources/static/i18n/eo/messages.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
          "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
          "Language-Team": " LANGUAGE <LL@li.org>",
@@ -25,7 +25,7 @@
          null,
          ""
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          ""
       ],
@@ -73,7 +73,7 @@
          null,
          ""
       ],
-      "Finish": [
+      "finish": [
          null,
          ""
       ],
@@ -85,6 +85,14 @@
          null,
          ""
       ],
+      "BrowserID requires cookies": [
+         null,
+         ""
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
       "Communicating with server": [
          null,
          ""
@@ -97,7 +105,7 @@
          null,
          ""
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
          ""
       ],
@@ -125,7 +133,7 @@
          null,
          ""
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
          ""
       ],
@@ -145,7 +153,7 @@
          null,
          ""
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          ""
       ],
diff --git a/resources/static/i18n/es/client.json b/resources/static/i18n/es/client.json
index e233f91ae..cafbc9ae5 100644
--- a/resources/static/i18n/es/client.json
+++ b/resources/static/i18n/es/client.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-06 13:51+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-03 15:05+0200",
          "Last-Translator": " Inma <inma.barrios@mozilla-hispano.org>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " es",
@@ -14,161 +14,13 @@
          "Plural-Forms": " nplurals=2; plural=(n != 1);",
          "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
-         null,
-         "Autenticando al usuario"
-      ],
-      "Adding Address": [
-         null,
-         "Agregando la dirección"
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         "Agregando la dirección de correo electrónico principal al usuario"
-      ],
-      "Checking Address Info": [
-         null,
-         "Comprobando los datos de la dirección"
-      ],
-      "Authenticating with Assertion": [
-         null,
-         "Autenticando con aseveración"
-      ],
-      "Cancelling User Account": [
-         null,
-         "Cancelando la cuenta del usuario"
-      ],
-      "Checking Authentication": [
-         null,
-         "Comprobando autenticación"
-      ],
-      "Checking Script Version": [
-         null,
-         "Verificando la versión del script"
-      ],
-      "Completing User Registration": [
-         null,
-         "Completando el registro del usuario"
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         "Lo sentimos, BrowserID necesita cookies"
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         "BrowserID necesita que las cookies de tu navegador estén habilitadas para operar.  Por favor, habilita las cookies de tu navegador e inténtalo otra vez."
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         "Comprobando si las cookies están habilitadas"
-      ],
-      "Creating Account": [
-         null,
-         "Creando una cuenta"
-      ],
-      "Getting Assertion": [
-         null,
-         "Obteniendo la aseveración"
-      ],
-      "Checking Registration Token": [
-         null,
-         "Verificando el token de registro"
-      ],
-      "Checking Email Address": [
-         null,
-         "Comprobando la dirección de correo"
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         "Verificando si el usuario está autentificado con IdP"
-      ],
-      "Logout Failed": [
-         null,
-         "Falló la salida de la sesión"
-      ],
-      "You are offline!": [
-         null,
-         "¡Estás desconectado!"
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         "¡Lamentablemente BrowserID no puede establecer comunicación si no hay conexión!"
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         "Autenticando con el proveedor de identidad"
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         "Hemos tenido problemas al comunicarnos con tu proveedor de correo electrónico, ¡por favor, inténtalo de nuevo!"
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         "Aprovisionando con el proveedor de identidad"
-      ],
-      "Provisioning Unsupported Identity Provider": [
+      "BrowserID requires cookies": [
          null,
-         "Aprovisionando con un proveedor de identidad no compatible"
+         "BrowserID necesita cookies"
       ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "Desafortunadamente, la dirección de correo electrónico proporcionada no puede usarse como proveedor de identidad primario"
-      ],
-      "Registration Failed": [
-         null,
-         "Registro fallido"
-      ],
-      "Establishing Relay": [
-         null,
-         "Estableciendo servidor de correo"
-      ],
-      "Relay frame could not be found": [
-         null,
-         "No se ha podido encontrar el grupo de servidores"
-      ],
-      "Resetting Password": [
-         null,
-         "Restableciendo la contraseña"
-      ],
-      "Remove Email Address from Account": [
-         null,
-         "Eliminar de la cuenta la dirección de correo"
-      ],
-      "Setting Password": [
-         null,
-         "Configurando la contraseña"
-      ],
-      "Signin Failed": [
-         null,
-         "Inicio de sesión fallido"
-      ],
-      "Signup Failed": [
-         null,
-         "Registro fallido"
-      ],
-      "Syncing Address": [
-         null,
-         "Sincronizando la dirección"
-      ],
-      "Syncing Email Addresses": [
-         null,
-         "Sincronizando las direcciones de correo"
-      ],
-      "Sync Keys for Address": [
-         null,
-         "Sincronizar claves de esa dirección"
-      ],
-      "Getting Token Info": [
-         null,
-         "Obteniendo información del token"
-      ],
-      "Updating password": [
-         null,
-         "Actualizando la contraseña"
-      ],
-      "Verifying email address": [
-         null,
-         "Verificando la dirección de correo"
+         "Por favor, cierra esta ventana, <a %s>habilita las cookies</a> y vuelve a intentarlo"
       ],
       "Communication Error": [
          null,
@@ -238,7 +90,7 @@
          null,
          "¡Bienvenido a BrowserID!"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
          "Este correo parece que es nuevo, así que vamos a configurar tu cuenta."
       ],
@@ -256,7 +108,11 @@
       ],
       "The account cannot be logged in with this username and password.": [
          null,
-         "No es posible ingresar a la cuenta con ese usuario y contraseña."
+         "No es posible acceder a la cuenta con ese usuario y contraseña."
+      ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         "Al hacer clic en %s, confirmas que aceptas las <a %s>Condiciones de uso</a> y la <a %s>Política de privacidad</a> de este sitio web."
       ],
       "next": [
          null,
@@ -266,9 +122,9 @@
          null,
          "verificar el correo electrónico"
       ],
-      "select email": [
+      "sign in": [
          null,
-         "seleccionar correo electrónico"
+         "conectar"
       ],
       "Cannot verify %s": [
          null,
@@ -298,17 +154,33 @@
          null,
          "Si esto es un error, simplemente ignora el mensaje enviado y <a href=\"#\" id=\"back\">usa otra dirección de correo</a>."
       ],
-      "The site requested you sign in using": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         "El sitio pidió que te conectes usando"
+         "Lo lamentamos, pero el servidor está sobrecargado."
       ],
-      "Reset Password": [
+      "We are very sorry, there has been an error!": [
          null,
-         "Reiniciar contraseña"
+         "Lo lamentamos, pero ha habido un error."
       ],
-      "Cancel": [
+      "Please reload the page and try again.": [
          null,
-         "Cancelar"
+         "Por favor, recarga la página y vuelve a intentarlo."
+      ],
+      "Please close this window and try again.": [
+         null,
+         "Por favor, cierra esta ventana y vuelve a intentarlo."
+      ],
+      "See more info": [
+         null,
+         "Mira más información"
+      ],
+      "The site requested you sign in using": [
+         null,
+         "El sitio pidió que te conectes usando"
+      ],
+      "reset password": [
+         null,
+         "reiniciar contraseña"
       ],
       "*%s* is not a valid email address!": [
          null,
@@ -318,10 +190,6 @@
          null,
          "Para continuar, por favor, cierra la ventana y escribe una dirección válida."
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
-         null,
-         "Lo sentimos, pero no podemos comunicarnos con BrowserID si no tienes conexión."
-      ],
       "This is not me...": [
          null,
          "No soy yo..."
@@ -334,10 +202,6 @@
          null,
          "Conectarse usando siempre este correo"
       ],
-      "sign in": [
-         null,
-         "conectar"
-      ],
       "Address Verified!": [
          null,
          "¡Dirección verificada!"
@@ -350,13 +214,177 @@
          null,
          "Debes conectarte usando tu proveedor de correo electrónico para verificar que esta dirección es tuya. Esta ventana sera redirigida a"
       ],
-      "Verify": [
+      "verify": [
          null,
-         "Verificar"
+         "verificar"
       ],
       "Verify With Email Provider": [
          null,
          "Verificar con el proveedor de correo electrónico"
+      ],
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
+         null,
+         "#~ \"BrowserID necesita que las cookies de tu navegador estén habilitadas para \"#~ \"operar.  Por favor, habilita las cookies de tu navegador e inténtalo otra \"#~ \"vez.\""
+      ],
+      "You are offline!": [
+         null,
+         "¡Estás desconectado!"
+      ],
+      "Unfortunately, BrowserID cannot communicate while offline!": [
+         null,
+         "#~ \"¡Lamentablemente BrowserID no puede establecer comunicación si no hay \"#~ \"conexión!\""
+      ],
+      "select email": [
+         null,
+         "seleccionar correo electrónico"
+      ],
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
+         null,
+         "#~ \"Lo sentimos, pero no podemos comunicarnos con BrowserID si no tienes \"#~ \"conexión.\""
+      ],
+      "Authenticating User": [
+         null,
+         "Autenticando al usuario"
+      ],
+      "Adding Address": [
+         null,
+         "Agregando la dirección"
+      ],
+      "Adding Primary Email Address to User": [
+         null,
+         "Agregando la dirección de correo electrónico principal al usuario"
+      ],
+      "Checking Address Info": [
+         null,
+         "Comprobando los datos de la dirección"
+      ],
+      "Authenticating with Assertion": [
+         null,
+         "Autenticando con aseveración"
+      ],
+      "Cancelling User Account": [
+         null,
+         "Cancelando la cuenta del usuario"
+      ],
+      "Checking Authentication": [
+         null,
+         "Comprobando autenticación"
+      ],
+      "Checking Script Version": [
+         null,
+         "Verificando la versión del script"
+      ],
+      "Completing User Registration": [
+         null,
+         "Completando el registro del usuario"
+      ],
+      "Checking if Cookies are Enabled": [
+         null,
+         "Comprobando si las cookies están habilitadas"
+      ],
+      "Creating Account": [
+         null,
+         "Creando una cuenta"
+      ],
+      "Getting Assertion": [
+         null,
+         "Obteniendo la aseveración"
+      ],
+      "Checking Registration Token": [
+         null,
+         "Verificando el token de registro"
+      ],
+      "Checking Email Address": [
+         null,
+         "Comprobando la dirección de correo"
+      ],
+      "Checking Whether User is Authenticated with IdP": [
+         null,
+         "Verificando si el usuario está autentificado con IdP"
+      ],
+      "Logout Failed": [
+         null,
+         "Falló la salida de la sesión"
+      ],
+      "Authenticating with Identity Provider": [
+         null,
+         "Autenticando con el proveedor de identidad"
+      ],
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
+         null,
+         "#~ \"Hemos tenido problemas al comunicarnos con tu proveedor de correo \"#~ \"electrónico, ¡por favor, inténtalo de nuevo!\""
+      ],
+      "Provisioning with Identity Provider": [
+         null,
+         "Aprovisionando con el proveedor de identidad"
+      ],
+      "Provisioning Unsupported Identity Provider": [
+         null,
+         "Aprovisionando con un proveedor de identidad no compatible"
+      ],
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
+         null,
+         "#~ \"Desafortunadamente, la dirección de correo electrónico proporcionada no \"#~ \"puede usarse como proveedor de identidad primario\""
+      ],
+      "Registration Failed": [
+         null,
+         "Registro fallido"
+      ],
+      "Establishing Relay": [
+         null,
+         "Estableciendo servidor de correo"
+      ],
+      "Relay frame could not be found": [
+         null,
+         "No se ha podido encontrar el grupo de servidores"
+      ],
+      "Resetting Password": [
+         null,
+         "Restableciendo la contraseña"
+      ],
+      "Remove Email Address from Account": [
+         null,
+         "Eliminar de la cuenta la dirección de correo"
+      ],
+      "Setting Password": [
+         null,
+         "Configurando la contraseña"
+      ],
+      "Signin Failed": [
+         null,
+         "Inicio de sesión fallido"
+      ],
+      "Signup Failed": [
+         null,
+         "Registro fallido"
+      ],
+      "Syncing Address": [
+         null,
+         "Sincronizando la dirección"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "Sincronizando las direcciones de correo"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Sincronizar claves de esa dirección"
+      ],
+      "Getting Token Info": [
+         null,
+         "Obteniendo información del token"
+      ],
+      "Updating password": [
+         null,
+         "Actualizando la contraseña"
+      ],
+      "Verifying email address": [
+         null,
+         "Verificando la dirección de correo"
+      ],
+      "Cancel": [
+         null,
+         "Cancelar"
       ]
    }
 }
diff --git a/resources/static/i18n/es/messages.json b/resources/static/i18n/es/messages.json
index 37a5d0c1f..64766bb85 100644
--- a/resources/static/i18n/es/messages.json
+++ b/resources/static/i18n/es/messages.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-06 14:08+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-02 19:17+0200",
          "Last-Translator": " Inma <inma.barrios@mozilla-hispano.org>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " es",
@@ -16,7 +16,7 @@
       },
       "Complete Login to %s using BrowserID": [
          null,
-         "Completar el proceso de identificación en %s usando BrowserID"
+         "Completa el proceso de identificación en %s usando BrowserID"
       ],
       "Error encountered while attempting to confirm your address. Have you previously verified this address?": [
          null,
@@ -26,7 +26,7 @@
          null,
          "Se encontró un error al intentar completar el registro."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          "Finalizar el registro en:"
       ],
@@ -74,9 +74,9 @@
          null,
          "Las contraseñas no coinciden."
       ],
-      "Finish": [
+      "finish": [
          null,
-         "Finalizar"
+         "finalizar"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
@@ -86,6 +86,14 @@
          null,
          "Tu nueva dirección ya está configurada y ahora debería iniciarse tu sesión. Puedes cerrar esta ventana y regresar a"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID necesita cookies"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "Por favor, cierra esta ventana, <a %s>habilita las cookies</a> y vuelve a intentarlo"
+      ],
       "Communicating with server": [
          null,
          "Comunicando con el servidor"
@@ -98,9 +106,9 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         "BrowserID es la forma rápida y segura de identificación desde el navegador &mdash; <a target=\"_blank\" href=\"/about\">saber más</a>"
+         "BrowserID es la forma rápida y segura de identificación desde el navegador &mdash; <a %s>descubre más</a>"
       ],
       "BrowserID: %s": [
          null,
@@ -126,9 +134,9 @@
          null,
          "Desconectar"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         "Creado por el <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
+         "Creado por el <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
@@ -146,7 +154,7 @@
          null,
          "Hubo un problema con el enlace de tu registro. ¿Estaba esta dirección registrada ya?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "Error al comunicarse con el servidor."
       ],
diff --git a/resources/static/i18n/es_MX/client.json b/resources/static/i18n/es_MX/client.json
index 0bccf680f..cb1cde598 100644
--- a/resources/static/i18n/es_MX/client.json
+++ b/resources/static/i18n/es_MX/client.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
          "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
          "Language-Team": " LANGUAGE <LL@li.org>",
@@ -13,159 +13,11 @@
          "Content-Transfer-Encoding": " 8bit",
          "X-Generator": " Translate Toolkit 1.9.0"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
          ""
       ],
-      "Adding Address": [
-         null,
-         ""
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         ""
-      ],
-      "Checking Address Info": [
-         null,
-         ""
-      ],
-      "Authenticating with Assertion": [
-         null,
-         ""
-      ],
-      "Cancelling User Account": [
-         null,
-         ""
-      ],
-      "Checking Authentication": [
-         null,
-         ""
-      ],
-      "Checking Script Version": [
-         null,
-         ""
-      ],
-      "Completing User Registration": [
-         null,
-         ""
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         ""
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         ""
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         ""
-      ],
-      "Creating Account": [
-         null,
-         ""
-      ],
-      "Getting Assertion": [
-         null,
-         ""
-      ],
-      "Checking Registration Token": [
-         null,
-         ""
-      ],
-      "Checking Email Address": [
-         null,
-         ""
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         ""
-      ],
-      "Logout Failed": [
-         null,
-         ""
-      ],
-      "You are offline!": [
-         null,
-         ""
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         ""
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         ""
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         ""
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         ""
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         ""
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         ""
-      ],
-      "Registration Failed": [
-         null,
-         ""
-      ],
-      "Establishing Relay": [
-         null,
-         ""
-      ],
-      "Relay frame could not be found": [
-         null,
-         ""
-      ],
-      "Resetting Password": [
-         null,
-         ""
-      ],
-      "Remove Email Address from Account": [
-         null,
-         ""
-      ],
-      "Setting Password": [
-         null,
-         ""
-      ],
-      "Signin Failed": [
-         null,
-         ""
-      ],
-      "Signup Failed": [
-         null,
-         ""
-      ],
-      "Syncing Address": [
-         null,
-         ""
-      ],
-      "Syncing Email Addresses": [
-         null,
-         ""
-      ],
-      "Sync Keys for Address": [
-         null,
-         ""
-      ],
-      "Getting Token Info": [
-         null,
-         ""
-      ],
-      "Updating password": [
-         null,
-         ""
-      ],
-      "Verifying email address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
          ""
       ],
@@ -237,7 +89,7 @@
          null,
          ""
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
          ""
       ],
@@ -257,6 +109,10 @@
          null,
          ""
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         ""
+      ],
       "next": [
          null,
          ""
@@ -265,7 +121,7 @@
          null,
          ""
       ],
-      "select email": [
+      "sign in": [
          null,
          ""
       ],
@@ -297,43 +153,51 @@
          null,
          ""
       ],
-      "The site requested you sign in using": [
+      "We are very sorry, the server is under extreme load!": [
          null,
          ""
       ],
-      "Reset Password": [
+      "We are very sorry, there has been an error!": [
          null,
          ""
       ],
-      "Cancel": [
+      "Please reload the page and try again.": [
          null,
          ""
       ],
-      "*%s* is not a valid email address!": [
+      "Please close this window and try again.": [
          null,
          ""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "See more info": [
          null,
          ""
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "The site requested you sign in using": [
          null,
          ""
       ],
-      "This is not me...": [
+      "reset password": [
          null,
          ""
       ],
-      "Use a different email": [
+      "*%s* is not a valid email address!": [
          null,
          ""
       ],
-      "Always sign in using this email": [
+      "To continue, please close the window and enter a valid address.": [
          null,
          ""
       ],
-      "sign in": [
+      "This is not me...": [
+         null,
+         ""
+      ],
+      "Use a different email": [
+         null,
+         ""
+      ],
+      "Always sign in using this email": [
          null,
          ""
       ],
@@ -349,7 +213,7 @@
          null,
          ""
       ],
-      "Verify": [
+      "verify": [
          null,
          ""
       ],
diff --git a/resources/static/i18n/es_MX/messages.json b/resources/static/i18n/es_MX/messages.json
index 9c14e93b7..0831a041c 100644
--- a/resources/static/i18n/es_MX/messages.json
+++ b/resources/static/i18n/es_MX/messages.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
          "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
          "Language-Team": " LANGUAGE <LL@li.org>",
@@ -25,7 +25,7 @@
          null,
          ""
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          ""
       ],
@@ -73,7 +73,7 @@
          null,
          ""
       ],
-      "Finish": [
+      "finish": [
          null,
          ""
       ],
@@ -85,6 +85,14 @@
          null,
          ""
       ],
+      "BrowserID requires cookies": [
+         null,
+         ""
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
       "Communicating with server": [
          null,
          ""
@@ -97,7 +105,7 @@
          null,
          ""
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
          ""
       ],
@@ -125,7 +133,7 @@
          null,
          ""
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
          ""
       ],
@@ -145,7 +153,7 @@
          null,
          ""
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          ""
       ],
diff --git a/resources/static/i18n/et/client.json b/resources/static/i18n/et/client.json
index b20074275..acf62b8ca 100644
--- a/resources/static/i18n/et/client.json
+++ b/resources/static/i18n/et/client.json
@@ -3,358 +3,388 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
-         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-06 18:54+0200",
+         "Last-Translator": " Merike <merike.sell@eesti.ee>",
          "Language-Team": " LANGUAGE <LL@li.org>",
-         "Language": " ",
+         "Language": " et",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
-         "Content-Transfer-Encoding": " 8bit"
+         "Content-Transfer-Encoding": " 8bit",
+         "Plural-Forms": " nplurals=2; plural=(n != 1);",
+         "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
-         ""
+         "BrowserID vajab küpsiseid"
       ],
-      "Adding Address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         ""
+         "Palun sulge see aken, <a %s>luba küpsised</a> ja proovi uuesti"
       ],
-      "Adding Primary Email Address to User": [
+      "Communication Error": [
          null,
-         ""
+         "Kommunikatsiooni viga"
       ],
-      "Checking Address Info": [
+      "Finishing Sign In...": [
          null,
-         ""
+         "Sisse logimise lõpetamine..."
       ],
-      "Authenticating with Assertion": [
+      "In just a moment you'll be signed into BrowserID.": [
          null,
-         ""
+         "Hetke pärast logitakse sind BrowserID-sse."
       ],
-      "Cancelling User Account": [
+      "Please wait a few seconds while we sign you into the site.": [
          null,
-         ""
+         "Palun oota mõni sekund, kuni sind leheküljele sisse logime."
       ],
-      "Checking Authentication": [
+      "We are sorry, this request is taking a LOOONG time.": [
          null,
-         ""
+         "Vabandust, antud päring kestab VÄGA KAUA."
       ],
-      "Checking Script Version": [
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
          null,
-         ""
+         "Sõnum kaob, kui päring on lõpetatud (loodetavasti varsti). Kui ooteaeg on olnud liiga pikk, soovitame akna sulgeda ja uuesti proovida."
       ],
-      "Completing User Registration": [
+      "Sign in using": [
          null,
-         ""
+         "Logi sisse kasutades"
       ],
-      "We are sorry, BrowserID requires cookies": [
+      "New email address": [
          null,
-         ""
+         "Uus e-posti aadress"
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
+      "This field must be an email address.": [
          null,
-         ""
+         "Sellel väljal peab olema e-posti aadress."
       ],
-      "Checking if Cookies are Enabled": [
+      "The email field is required.": [
          null,
-         ""
+         "E-posti väli on nõutav."
       ],
-      "Creating Account": [
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
          null,
-         ""
+         "Me alles saatsime e-kirja sellele aadressile! Kui soovid saata veel üht, siis oota mõni minut ja proovi uuesti."
       ],
-      "Getting Assertion": [
+      "That address is already added to your account!": [
          null,
-         ""
+         "Antud aadress on juba kontole lisatud!"
       ],
-      "Checking Registration Token": [
+      "add": [
          null,
-         ""
+         "Lisa"
       ],
-      "Checking Email Address": [
+      "cancel": [
          null,
-         ""
+         "Loobu"
       ],
-      "Checking Whether User is Authenticated with IdP": [
+      "Email": [
          null,
-         ""
+         "E-posti aadress"
       ],
-      "Logout Failed": [
+      "Enter your email address to sign in to <strong>%s</strong>": [
          null,
-         ""
+         "<strong>%s</strong> sisse logimiseks sisesta e-posti aadress"
       ],
-      "You are offline!": [
+      "Welcome to BrowserID!": [
          null,
-         ""
+         "Tere tulemast BrowserID-sse!"
       ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
+      "This email looks new, so let's get you set up.": [
          null,
-         ""
+         "See e-post tundub uus, nii et seadistame selle ära."
       ],
-      "Authenticating with Identity Provider": [
+      "Password": [
          null,
-         ""
+         "Parool"
       ],
-      "We had trouble communicating with your email provider, please try again!": [
+      "forgot your password?": [
          null,
-         ""
+         "unustasid parooli?"
       ],
-      "Provisioning with Identity Provider": [
+      "The password field is required.": [
          null,
-         ""
+         "Parooli väli on nõutav."
       ],
-      "Provisioning Unsupported Identity Provider": [
+      "The account cannot be logged in with this username and password.": [
          null,
-         ""
+         "Selle kasutajanime ja parooliga ei ole võimalik kontosse siseneda."
       ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
          null,
-         ""
+         "Klõpsates %s, kinnitad nõustumise lehekülje <a %s>Kasutamistingimuste</a> ja <a %s>Privaatsuspoliitikaga</a>."
       ],
-      "Registration Failed": [
+      "next": [
          null,
-         ""
+         "Edasi"
       ],
-      "Establishing Relay": [
+      "verify email": [
          null,
-         ""
+         "Kontrolli e-posti"
       ],
-      "Relay frame could not be found": [
+      "sign in": [
          null,
-         ""
+         "Logi sisse"
       ],
-      "Resetting Password": [
+      "Cannot verify %s": [
          null,
-         ""
+         "Ei ole võimalik kontrollida %s"
       ],
-      "Remove Email Address from Account": [
+      "%s is a required address, but we cannot verify that you own this address.": [
          null,
-         ""
+         "%s on nõutav, aga pole võimalik kontrollida, kas oled antud aadressi omanik."
       ],
-      "Setting Password": [
+      "Check your email!": [
          null,
-         ""
+         "Vaata oma e-posti!"
       ],
-      "Signin Failed": [
+      "We sent a confirmation email to <strong>%s</strong>": [
          null,
-         ""
+         "Saatsime kinnituskirja aadressile <strong>%s</strong>"
       ],
-      "Signup Failed": [
+      "To finish signing in just click the verify link we sent to your email address.": [
          null,
-         ""
+         "Registreerumise lõpetamiseks klõpsa lihtsalt kinnitamislinki, mille saatsime sinu e-posti aadressile."
       ],
-      "Syncing Address": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
          null,
-         ""
+         "Kui see on eksitus, siis lihtsalt ignoreeri saadetud e-kirja ja <a href=\"#\" id=\"cancel\">loobu</a>."
       ],
-      "Syncing Email Addresses": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          null,
-         ""
+         "Kui see on eksitus, siis lihtsalt ignoreeri saadetud e-kirja ja <a href=\"#\" id=\"back\">kasuta teist e-posti aadressi</a>."
       ],
-      "Sync Keys for Address": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         ""
+         "Meil on väga kahju, server on väga ülekoormatud!"
       ],
-      "Getting Token Info": [
+      "We are very sorry, there has been an error!": [
          null,
-         ""
+         "Meil on väga kahju, on tekkinud viga!"
       ],
-      "Updating password": [
+      "Please reload the page and try again.": [
          null,
-         ""
+         "Uuesti proovimiseks tuleb leht uuesti laadida."
       ],
-      "Verifying email address": [
+      "Please close this window and try again.": [
          null,
-         ""
+         "Palun sulge aken ja proovi siis uuesti."
       ],
-      "Communication Error": [
+      "See more info": [
          null,
-         ""
+         "Rohkem infot"
       ],
-      "Finishing Sign In...": [
+      "The site requested you sign in using": [
          null,
-         ""
+         "Lehekülg nõuab sisse logimist kasutades"
       ],
-      "In just a moment you'll be signed into BrowserID.": [
+      "reset password": [
          null,
-         ""
+         "Lähtesta parool"
       ],
-      "Please wait a few seconds while we sign you into the site.": [
+      "*%s* is not a valid email address!": [
          null,
-         ""
+         "*%s* ei ole kehtiv e-posti aadress!"
       ],
-      "We are sorry, this request is taking a LOOONG time.": [
+      "To continue, please close the window and enter a valid address.": [
          null,
-         ""
+         "Jätkamiseks, palun sulge aken ja sisesta kehtiv aadress."
       ],
-      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+      "This is not me...": [
          null,
-         ""
+         "See ei ole mina..."
       ],
-      "Sign in using": [
+      "Use a different email": [
          null,
-         ""
+         "Kasuta teist e-posti aadressi"
       ],
-      "New email address": [
+      "Always sign in using this email": [
          null,
-         ""
+         "Logi alati sisse selle e-posti aadressiga"
       ],
-      "This field must be an email address.": [
+      "Address Verified!": [
          null,
-         ""
+         "Aadress on kontrollitud!"
       ],
-      "The email field is required.": [
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
          null,
-         ""
+         "Sinu identiteet on kontrollitud e-posti teenusepakkuja poolt, me proovime sind nüüd sisse logida."
       ],
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
          null,
-         ""
+         "Et kontrollida, kas oled antud e-posti aadressi omanik, peaksid sisse logima oma e-posti teenusesse. See aken suunatakse"
       ],
-      "That address is already added to your account!": [
+      "verify": [
          null,
-         ""
+         "Kontrolli"
       ],
-      "add": [
+      "Verify With Email Provider": [
          null,
-         ""
+         "E-posti aadressi kontrollimine teenusepakkujaga"
       ],
-      "cancel": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         ""
+         "#~ \"BrowserID vajab, et brauseri küpsised oleks lubatud. Palun luba brauseril \"#~ \"küpsiste kasutamine ja proovi uuesti\""
       ],
-      "Email": [
+      "You are offline!": [
          null,
-         ""
+         "Arvutil puudub internetiühendus!"
       ],
-      "Enter your email address to sign in to <strong>%s</strong>": [
+      "Unfortunately, BrowserID cannot communicate while offline!": [
          null,
-         ""
+         "BrowserID ei saa kahjuks internetiühenduseta suhelda!"
       ],
-      "Welcome to BrowserID!": [
+      "select email": [
          null,
-         ""
+         "Vali e-posti aadress"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
          null,
-         ""
+         "#~ \"Vabandust, BrowserID'ga ei ole võimalik suhelda, kuna arvutil puudub \"#~ \"interneti ühendus.\""
       ],
-      "Password": [
+      "Authenticating User": [
          null,
-         ""
+         "Kasutaja autentimine"
       ],
-      "forgot your password?": [
+      "Adding Address": [
          null,
-         ""
+         "E-posti aadressi lisamine"
       ],
-      "The password field is required.": [
+      "Adding Primary Email Address to User": [
          null,
-         ""
+         "Peamise e-posti aadressi lisamine kasutajale"
       ],
-      "The account cannot be logged in with this username and password.": [
+      "Checking Address Info": [
          null,
-         ""
+         "Aadressi kontrollimine"
       ],
-      "next": [
+      "Authenticating with Assertion": [
          null,
-         ""
+         "Kinnitusega autentimine"
       ],
-      "verify email": [
+      "Cancelling User Account": [
          null,
-         ""
+         "Kasutaja konto tühistamine"
       ],
-      "select email": [
+      "Checking Authentication": [
          null,
-         ""
+         "Autentimise kontrollimine"
       ],
-      "Cannot verify %s": [
+      "Checking Script Version": [
          null,
-         ""
+         "Skripti versiooni kontrollimine"
       ],
-      "%s is a required address, but we cannot verify that you own this address.": [
+      "Completing User Registration": [
          null,
-         ""
+         "Kasutaja registreerimise lõpetamine"
       ],
-      "Check your email!": [
+      "Checking if Cookies are Enabled": [
          null,
-         ""
+         "Kontrollitakse, kas küpsised on lubatud"
       ],
-      "We sent a confirmation email to <strong>%s</strong>": [
+      "Creating Account": [
          null,
-         ""
+         "Konto loomine"
       ],
-      "To finish signing in just click the verify link we sent to your email address.": [
+      "Getting Assertion": [
          null,
-         ""
+         "Kinnituse hankimine"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+      "Checking Registration Token": [
          null,
-         ""
+         "Registreerimisloa kontrollimine"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+      "Checking Email Address": [
          null,
-         ""
+         "E-posti aadressi kontrollimine"
       ],
-      "The site requested you sign in using": [
+      "Checking Whether User is Authenticated with IdP": [
          null,
-         ""
+         "Kontrollimine, kas kasutaja on autenditud IdP-ga"
       ],
-      "Reset Password": [
+      "Logout Failed": [
          null,
-         ""
+         "Väljalogimine ebaõnnestus"
       ],
-      "Cancel": [
+      "Authenticating with Identity Provider": [
          null,
-         ""
+         "Autentimine koos identiteedipakkujaga"
       ],
-      "*%s* is not a valid email address!": [
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
          null,
-         ""
+         "#~ \"Suhtlemisel sinu e-posti teenusepakkujaga tekkis probleem, palun proovi \"#~ \"uuesti!\""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "Provisioning with Identity Provider": [
          null,
-         ""
+         "Identiteedi kontrollimine identiteedipakkuja poolt"
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "Provisioning Unsupported Identity Provider": [
          null,
-         ""
+         "Identiteedi kontrollimine toetamata identiteedipakkuja poolt"
       ],
-      "This is not me...": [
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
          null,
-         ""
+         "#~ \"Kahjuks ei saa antud e-posti aadress olla peamiseks identiteedipakkujaks\""
       ],
-      "Use a different email": [
+      "Registration Failed": [
          null,
-         ""
+         "Registreerimine ebaõnnestus"
       ],
-      "Always sign in using this email": [
+      "Establishing Relay": [
          null,
-         ""
+         "Ãœlekande loomine"
       ],
-      "sign in": [
+      "Relay frame could not be found": [
          null,
-         ""
+         "Ãœlekandepaketti ei leitud"
       ],
-      "Address Verified!": [
+      "Resetting Password": [
          null,
-         ""
+         "Parooli lähtestamine"
       ],
-      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+      "Remove Email Address from Account": [
          null,
-         ""
+         "E-posti aadressi eemaldamine kontolt"
       ],
-      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+      "Setting Password": [
          null,
-         ""
+         "Parooli seadistamine"
       ],
-      "Verify": [
+      "Signin Failed": [
          null,
-         ""
+         "Sisenemine ebaõnnestus"
       ],
-      "Verify With Email Provider": [
+      "Signup Failed": [
+         null,
+         "Registreerimine ebaõnnestus"
+      ],
+      "Syncing Address": [
+         null,
+         "Aadressi sünkroonimine"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "E-posti aadresside sünkroonimine"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Aadressile võtmete sünkroonimine"
+      ],
+      "Getting Token Info": [
+         null,
+         "Loa hankimine"
+      ],
+      "Updating password": [
+         null,
+         "Parooli uuendamine"
+      ],
+      "Verifying email address": [
+         null,
+         "E-posti aadressi kontrollimine"
+      ],
+      "Cancel": [
          null,
-         ""
+         "Loobu"
       ]
    }
 }
diff --git a/resources/static/i18n/et/messages.json b/resources/static/i18n/et/messages.json
index 14ebc83b7..df9379756 100644
--- a/resources/static/i18n/et/messages.json
+++ b/resources/static/i18n/et/messages.json
@@ -3,178 +3,188 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
-         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-06 18:54+0200",
+         "Last-Translator": " Merike <merike.sell@eesti.ee>",
          "Language-Team": " LANGUAGE <LL@li.org>",
-         "Language": " ",
+         "Language": " et",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
-         "Content-Transfer-Encoding": " 8bit"
+         "Content-Transfer-Encoding": " 8bit",
+         "Plural-Forms": " nplurals=2; plural=(n != 1);",
+         "X-Generator": " Pootle 2.1.6"
       },
       "Complete Login to %s using BrowserID": [
          null,
-         ""
+         "Sisse logimise lõpetamine aadressile %s BrowserID kasutades"
       ],
       "Error encountered while attempting to confirm your address. Have you previously verified this address?": [
          null,
-         ""
+         "Tekkis viga aadressi kinnitamisel. Kas oled antud aadressi varem kontrollinud?"
       ],
       "Error encountered trying to complete registration.": [
          null,
-         ""
+         "Registreerimise lõpetamisel tekkis viga."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         ""
+         "Sisselogimise lõpetamine:"
       ],
       "Email Verification": [
          null,
-         ""
+         "E-posti aadressi kontrollimine"
       ],
       "Email Address": [
          null,
-         ""
+         "E-posti aadress"
       ],
       "Your Email": [
          null,
-         ""
+         "Sinu e-posti aadress"
       ],
       "New Password": [
          null,
-         ""
+         "Uus parool"
       ],
       "Enter a Password": [
          null,
-         ""
+         "Sisesta parool"
       ],
       "Password is required.": [
          null,
-         ""
+         "Parool on nõutav."
       ],
       "Password must be between 8 and 80 characters long.": [
          null,
-         ""
+         "Parooli pikkus peab olema vahemikus 8 kuni 80 tähemärki."
       ],
       "Verify Password": [
          null,
-         ""
+         "Parooli kontrollimine"
       ],
       "Repeat Password": [
          null,
-         ""
+         "Korda parooli"
       ],
       "Verification password is required.": [
          null,
-         ""
+         "Kontrollparool on nõutav."
       ],
       "Passwords do not match.": [
          null,
-         ""
+         "Paroolid ei kattu."
       ],
-      "Finish": [
+      "finish": [
          null,
-         ""
+         "Valmis"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
-         ""
+         "<strong class=\"email\">Aadress</strong> on kontrollitud!"
       ],
       "Your new address is set up and you should now be signed in. You may now close this window and go back to": [
          null,
-         ""
+         "Uus aadress on seadistatud ja peaksid nüüd olema sisse logitud. Võid selle akna sulgeda ja minna tagasi"
+      ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID vajab küpsiseid"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "Palun sulge see aken, <a %s>luba küpsised</a> ja proovi uuesti"
       ],
       "Communicating with server": [
          null,
-         ""
+         "Suheldakse serveriga"
       ],
       "Just a moment while we talk with the server.": [
          null,
-         ""
+         "Ãœks hetk, toimub suhtlemine serveriga."
       ],
       "BrowserID": [
          null,
-         ""
+         "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         ""
+         "BrowserID on kiire ja turvaline viis sisselogimiseks &mdash; <a %s>loe lähemalt</a>"
       ],
       "BrowserID: %s": [
          null,
-         ""
+         "BrowserID: %s"
       ],
       "BrowserID Home": [
          null,
-         ""
+         "BrowserID avaleht"
       ],
       "How it works": [
          null,
-         ""
+         "Kuidas see töötab"
       ],
       "Developers": [
          null,
-         ""
+         "Arendajad"
       ],
       "Sign In": [
          null,
-         ""
+         "Logi sisse"
       ],
       "Sign Out": [
          null,
-         ""
+         "Logi välja"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         ""
+         "Autor: <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
-         ""
+         "Privaatsus"
       ],
       "TOS": [
          null,
-         ""
+         "Kasutamistingimused"
       ],
       "Need Help?": [
          null,
-         ""
+         "Vajad abi?"
       ],
       "There was a problem with your signup link. Has this address already been registered?": [
          null,
-         ""
+         "Registreerumise lingiga oli probleeme. Kas oled varem antud aadressiga registreerunud?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
-         ""
+         "Tekkis viga serveriga suhtlemisel."
       ],
       "Last step!": [
          null,
-         ""
+         "Viimane samm!"
       ],
       "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,
-         ""
+         "Täname registreerumast <strong>BrowserID</strong>-ga. Nüüd saad <strong>BrowserID</strong> kontot kasutada <em>sisse logimiseks</em> või <em>registreerumiseks</em> paljudel erinevatel veebilehtedel!"
       ],
       "Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.": [
          null,
-         ""
+         "Täname, et kontrollisid oma e-posti aadressi. See sõnum saadeti %s sisse logimise lõpetamiseks."
       ],
       "Finish registration by clicking this link:": [
          null,
-         ""
+         "Registreerumise lõpetamiseks klõpsa seda linki:"
       ],
       "If you are NOT trying to sign into this site, just ignore this email.": [
          null,
-         ""
+         "Kui sa EI soovinud registreeruda antud veebilehel, siis eira saadetud e-kirja."
       ],
       "Thanks,": [
          null,
-         ""
+         "Täname,"
       ],
       "(A better way to sign in)": [
          null,
-         ""
+         "(Parem viis sisse logimiseks)"
       ]
    }
 }
diff --git a/resources/static/i18n/eu/client.json b/resources/static/i18n/eu/client.json
index 58d2876e2..27766565d 100644
--- a/resources/static/i18n/eu/client.json
+++ b/resources/static/i18n/eu/client.json
@@ -3,359 +3,388 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
-         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-20 00:15+0200",
+         "Last-Translator": " Julen <julenx@gmail.com>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " eu",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
-         "X-Generator": " Translate Toolkit 1.9.0"
+         "Plural-Forms": " nplurals=2; plural=(n != 1);",
+         "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
-         ""
+         "Barkatu, BrowserID-k cookie-ak behar ditu"
       ],
-      "Adding Address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
          ""
       ],
-      "Adding Primary Email Address to User": [
+      "Communication Error": [
          null,
-         ""
+         "Komunikazio-errorea"
       ],
-      "Checking Address Info": [
+      "Finishing Sign In...": [
          null,
-         ""
+         "Saio-hasiera amaitzen..."
       ],
-      "Authenticating with Assertion": [
+      "In just a moment you'll be signed into BrowserID.": [
          null,
-         ""
+         "Une batetik bestera hasiko duzu saioa BrowserID-n."
       ],
-      "Cancelling User Account": [
+      "Please wait a few seconds while we sign you into the site.": [
          null,
-         ""
+         "Itxaron segundo batzuk gunean saioa hasten dugun bitartean."
       ],
-      "Checking Authentication": [
+      "We are sorry, this request is taking a LOOONG time.": [
          null,
-         ""
+         "Sentitzen dugu, eskaera hau oso LUUUZE doa."
       ],
-      "Checking Script Version": [
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
          null,
-         ""
+         "Eskaera burutzean (laster espero dugu) desagertuko da mezu hau. Oso luze itxaroten baduzu, itxi leiho hau eta saiatu berriro."
       ],
-      "Completing User Registration": [
+      "Sign in using": [
          null,
-         ""
+         "Hasi saioa hau erabiliz"
       ],
-      "We are sorry, BrowserID requires cookies": [
+      "New email address": [
          null,
-         ""
+         "Helbide elektroniko berria"
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
+      "This field must be an email address.": [
          null,
-         ""
+         "Eremu honek helbide elektronikoa izan behar du"
       ],
-      "Checking if Cookies are Enabled": [
+      "The email field is required.": [
          null,
-         ""
+         "Helbide elektronikoaren eremua beharrezkoa da."
       ],
-      "Creating Account": [
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
          null,
-         ""
+         "Mezu bat bidali berri dugu helbide horretara! Benetan beste bat bidaltzea nahi baduzu, itxaron minutu bat edo bi eta saiatu berriro."
       ],
-      "Getting Assertion": [
+      "That address is already added to your account!": [
          null,
-         ""
+         "Helbide hori dagoeneko gehituta dago zure kontuan!"
       ],
-      "Checking Registration Token": [
+      "add": [
          null,
-         ""
+         "gehitu"
       ],
-      "Checking Email Address": [
+      "cancel": [
          null,
-         ""
+         "utzi"
       ],
-      "Checking Whether User is Authenticated with IdP": [
+      "Email": [
          null,
-         ""
+         "Helbide elektronikoa"
       ],
-      "Logout Failed": [
+      "Enter your email address to sign in to <strong>%s</strong>": [
          null,
-         ""
+         "Idatzi zure helbide elektronikoa <strong>%s</strong> gunean saioa hasteko"
       ],
-      "You are offline!": [
+      "Welcome to BrowserID!": [
          null,
-         ""
+         "Ongi etorri BrowserID-ra!"
       ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
+      "This email looks new, so let's get you set up.": [
          null,
-         ""
+         "Helbide elektroniko honek berria dirudi; konfigura dezagun zure kontua."
       ],
-      "Authenticating with Identity Provider": [
+      "Password": [
          null,
-         ""
+         "Pasahitza"
       ],
-      "We had trouble communicating with your email provider, please try again!": [
+      "forgot your password?": [
          null,
-         ""
+         "pasahitza ahaztu duzu?"
       ],
-      "Provisioning with Identity Provider": [
+      "The password field is required.": [
          null,
-         ""
+         "Pasahitzaren eremua beharrezkoa da."
       ],
-      "Provisioning Unsupported Identity Provider": [
+      "The account cannot be logged in with this username and password.": [
          null,
-         ""
+         "Ezin da kontuaren saio-hasiera burutu erabiltzaile-izen eta pasahitz hauekin."
       ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
          null,
          ""
       ],
-      "Registration Failed": [
+      "next": [
          null,
-         ""
+         "hurrengoa"
       ],
-      "Establishing Relay": [
+      "verify email": [
          null,
-         ""
+         "egiaztatu helbide elektronikoa"
       ],
-      "Relay frame could not be found": [
+      "sign in": [
          null,
-         ""
+         "hasi saioa"
       ],
-      "Resetting Password": [
+      "Cannot verify %s": [
          null,
-         ""
+         "Ezin da %s egiaztatu"
       ],
-      "Remove Email Address from Account": [
+      "%s is a required address, but we cannot verify that you own this address.": [
          null,
-         ""
+         "%s beharrezko helbidea da baina ezin dugu egiaztatu zure jabetzakoa denik."
       ],
-      "Setting Password": [
+      "Check your email!": [
          null,
-         ""
+         "Egiaztatu zure posta elektronikoa!"
       ],
-      "Signin Failed": [
+      "We sent a confirmation email to <strong>%s</strong>": [
          null,
-         ""
+         "Berrespen-mezua bidali dugu <strong>%s</strong> helbidera"
       ],
-      "Signup Failed": [
+      "To finish signing in just click the verify link we sent to your email address.": [
          null,
-         ""
+         "Saio-hasiera amaitzeko, egin klik zure helbide elektronikora bidali dugun egiaztapen-loturan."
       ],
-      "Syncing Address": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
          null,
-         ""
+         "Hau akatsa baldin bada, besterik gabe ezikusi bidalitako mezua eta <a href=\"#\" id=\"cancel\">utzi</a>."
       ],
-      "Syncing Email Addresses": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          null,
-         ""
+         "Hau akatsa baldin bada, besterik gabe ezikusi bidalitako mezua eta <a href=\"#\" id=\"back\">erabili beste helbide elektroniko bat</a>."
       ],
-      "Sync Keys for Address": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         ""
+         "Sentitzen dugu, zerbitzariak ikaragarrizko karga dauka!"
       ],
-      "Getting Token Info": [
+      "We are very sorry, there has been an error!": [
          null,
-         ""
+         "Sentitzen dugu, errore bat gertatu da!"
       ],
-      "Updating password": [
+      "Please reload the page and try again.": [
          null,
-         ""
+         "Orria berritu beharko duzu berriro saiatzeko."
       ],
-      "Verifying email address": [
+      "Please close this window and try again.": [
          null,
-         ""
+         "Leiho hau itxi beharko duzu berriro saiatzeko."
       ],
-      "Communication Error": [
+      "See more info": [
          null,
-         ""
+         "Informazio gehiago"
       ],
-      "Finishing Sign In...": [
+      "The site requested you sign in using": [
          null,
-         ""
+         "Ondorengoa erabiliz saioa has dezazun eskatu du guneak"
       ],
-      "In just a moment you'll be signed into BrowserID.": [
+      "reset password": [
          null,
-         ""
+         "berrezarri pasahitza"
       ],
-      "Please wait a few seconds while we sign you into the site.": [
+      "*%s* is not a valid email address!": [
          null,
-         ""
+         "*%s* ez da baliozko helbide elektronikoa!"
       ],
-      "We are sorry, this request is taking a LOOONG time.": [
+      "To continue, please close the window and enter a valid address.": [
          null,
-         ""
+         "Jarraitzeko, itxi leihoa eta idatzi baliozko helbidea."
       ],
-      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+      "This is not me...": [
          null,
-         ""
+         "Ez naiz ni..."
       ],
-      "Sign in using": [
+      "Use a different email": [
          null,
-         ""
+         "Erabili beste helbide elektroniko bat"
       ],
-      "New email address": [
+      "Always sign in using this email": [
          null,
-         ""
+         "Hasi saioa beti helbide elektroniko hau erabiliz"
       ],
-      "This field must be an email address.": [
+      "Address Verified!": [
          null,
-         ""
+         "Helbidea egiaztatuta!"
       ],
-      "The email field is required.": [
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
          null,
-         ""
+         "Zure identitatea egiaztatu egin da posta-hornitzailearekin, saioa hasten saiatuko gara orain."
       ],
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
          null,
-         ""
+         "Zure posta-hornitzailearekin hasi behar duzu saioa helbide honen jabetza egiaztatzeko. Leiho hau hona berbideratuko da:"
       ],
-      "That address is already added to your account!": [
+      "verify": [
          null,
-         ""
+         "egiaztatu"
       ],
-      "add": [
+      "Verify With Email Provider": [
          null,
-         ""
+         "Egiaztatu posta-hornitzailearekin"
       ],
-      "cancel": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         ""
+         "#~ \"BrowserID ibiltzeko nabigatzailearen cookie-ak gaituta egon behar dute. \"#~ \"Gaitu nabigatzailearen cookie-ak eta saiatu berriro\""
       ],
-      "Email": [
+      "You are offline!": [
          null,
-         ""
+         "Lineaz kanpo zaude!"
       ],
-      "Enter your email address to sign in to <strong>%s</strong>": [
+      "Unfortunately, BrowserID cannot communicate while offline!": [
          null,
-         ""
+         "BrowserID-k ezin du komunikatu lineaz kanpo badago!"
       ],
-      "Welcome to BrowserID!": [
+      "select email": [
          null,
-         ""
+         "hautatu helbide elektronikoa"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
          null,
-         ""
+         "#~ \"Sentitzen dugu baina ezin dugu BrowserID-rekin komunikatu lineaz kanpo \"#~ \"zauden bitartean.\""
       ],
-      "Password": [
+      "Authenticating User": [
          null,
-         ""
+         "Erabiltzailea autentifikatzen"
       ],
-      "forgot your password?": [
+      "Adding Address": [
          null,
-         ""
+         "Helbidea gehitzen"
       ],
-      "The password field is required.": [
+      "Adding Primary Email Address to User": [
          null,
-         ""
+         "Erabiltzaileari helbide elektroniko nagusia gehitzen"
       ],
-      "The account cannot be logged in with this username and password.": [
+      "Checking Address Info": [
          null,
-         ""
+         "Helbidearen informazioa egiaztatzen"
       ],
-      "next": [
+      "Authenticating with Assertion": [
          null,
-         ""
+         "Baieztapenarekin autentifikatzen"
       ],
-      "verify email": [
+      "Cancelling User Account": [
          null,
-         ""
+         "Erabiltzaile-kontua bertan behera uzten"
       ],
-      "select email": [
+      "Checking Authentication": [
          null,
-         ""
+         "Autentifikazioa egiaztatzen"
       ],
-      "Cannot verify %s": [
+      "Checking Script Version": [
          null,
-         ""
+         "Script-aren bertsioa egiaztatzen"
       ],
-      "%s is a required address, but we cannot verify that you own this address.": [
+      "Completing User Registration": [
          null,
-         ""
+         "Erabiltzailearen erregistroa burutzen"
       ],
-      "Check your email!": [
+      "Checking if Cookies are Enabled": [
          null,
-         ""
+         "Cookie-ak gaituta dauden egiaztatzen"
       ],
-      "We sent a confirmation email to <strong>%s</strong>": [
+      "Creating Account": [
          null,
-         ""
+         "Kontua sortzen"
       ],
-      "To finish signing in just click the verify link we sent to your email address.": [
+      "Getting Assertion": [
          null,
-         ""
+         "Baieztapena eskuratzen"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+      "Checking Registration Token": [
          null,
-         ""
+         "Erregistratze-tokena egiaztatzen"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+      "Checking Email Address": [
          null,
-         ""
+         "Helbide elektronikoa egiaztatzen"
       ],
-      "The site requested you sign in using": [
+      "Checking Whether User is Authenticated with IdP": [
          null,
-         ""
+         "#~ \"Erabiltzailea identitate-hornitzailearekin autentifikatuta dagoen \"#~ \"egiaztatzen\""
       ],
-      "Reset Password": [
+      "Logout Failed": [
          null,
-         ""
+         "Saioa ixteak huts egin du"
       ],
-      "Cancel": [
+      "Authenticating with Identity Provider": [
          null,
-         ""
+         "Identitate-hornitzailearekin autentifikatzen"
       ],
-      "*%s* is not a valid email address!": [
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
          null,
-         ""
+         "#~ \"Arazoak izan ditugu zure posta elektronikoaren hornitzailearekin \"#~ \"komunikatzean, saiatu berriro mesedez!\""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "Provisioning with Identity Provider": [
          null,
-         ""
+         "Identitate-hornitzailearekin hornitzen"
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "Provisioning Unsupported Identity Provider": [
          null,
-         ""
+         "Onartzen ez den identitate-hornitzailearekin hornitzen"
       ],
-      "This is not me...": [
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
          null,
-         ""
+         "#~ \"Emandako helbide elektronikoa ezin da identitate-hornitzaile nagusi gisa \"#~ \"erabili\""
       ],
-      "Use a different email": [
+      "Registration Failed": [
          null,
-         ""
+         "Erregistroak huts egin du"
       ],
-      "Always sign in using this email": [
+      "Establishing Relay": [
          null,
-         ""
+         "Helaraztea ezartzen"
       ],
-      "sign in": [
+      "Relay frame could not be found": [
          null,
-         ""
+         "Ezin da helarazteko markoa aurkitu"
       ],
-      "Address Verified!": [
+      "Resetting Password": [
          null,
-         ""
+         "Pasahitza berrezartzen"
       ],
-      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+      "Remove Email Address from Account": [
          null,
-         ""
+         "Kendu helbide elektronikoa kontutik"
       ],
-      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+      "Setting Password": [
          null,
-         ""
+         "Pasahitza ezartzen"
       ],
-      "Verify": [
+      "Signin Failed": [
          null,
-         ""
+         "Saio-hasierak huts egin du"
       ],
-      "Verify With Email Provider": [
+      "Signup Failed": [
          null,
-         ""
+         "Erregistroak huts egin du"
+      ],
+      "Syncing Address": [
+         null,
+         "Helbidea sinkronizatzen"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "Helbide elektronikoa sinkronizatzen"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Sinkronizatu helbidearen gakoak"
+      ],
+      "Getting Token Info": [
+         null,
+         "Tokenaren informazioa eskuratzen"
+      ],
+      "Updating password": [
+         null,
+         "Pasahitza eguneratzen"
+      ],
+      "Verifying email address": [
+         null,
+         "Helbide elektronikoa egiaztatzen"
+      ],
+      "Cancel": [
+         null,
+         "Utzi"
       ]
    }
 }
diff --git a/resources/static/i18n/eu/messages.json b/resources/static/i18n/eu/messages.json
index c764f846c..cf4c4f93b 100644
--- a/resources/static/i18n/eu/messages.json
+++ b/resources/static/i18n/eu/messages.json
@@ -3,179 +3,188 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
-         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-13 01:22+0200",
+         "Last-Translator": " Julen <julenx@gmail.com>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " eu",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
-         "X-Generator": " Translate Toolkit 1.9.0"
+         "Plural-Forms": " nplurals=2; plural=(n != 1);",
+         "X-Generator": " Pootle 2.1.6"
       },
       "Complete Login to %s using BrowserID": [
          null,
-         ""
+         "Burutu %s guneko saio-hasiera BrowserID erabiliz"
       ],
       "Error encountered while attempting to confirm your address. Have you previously verified this address?": [
          null,
-         ""
+         "Errorea aurkitu da zure helbide elektronikoa berresten saiatzean. Aurretik egiaztatu duzu helbide hau?"
       ],
       "Error encountered trying to complete registration.": [
          null,
-         ""
+         "Errorea aurkitu da erregistroa burutzen saiatzean."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         ""
+         "Saio-hasiera amaitzen: "
       ],
       "Email Verification": [
          null,
-         ""
+         "Helbide elektronikoaren egiaztapena"
       ],
       "Email Address": [
          null,
-         ""
+         "Helbide elektronikoa"
       ],
       "Your Email": [
          null,
-         ""
+         "Zure helbide elektronikoa"
       ],
       "New Password": [
          null,
-         ""
+         "Pasahitz berria"
       ],
       "Enter a Password": [
          null,
-         ""
+         "Idatzi pasahitza"
       ],
       "Password is required.": [
          null,
-         ""
+         "Pasahitza beharrezkoa da."
       ],
       "Password must be between 8 and 80 characters long.": [
          null,
-         ""
+         "Pasahitzak 8 eta 80 karaktere artekoa izan behar du."
       ],
       "Verify Password": [
          null,
-         ""
+         "Egiaztatu pasahitza"
       ],
       "Repeat Password": [
          null,
-         ""
+         "Errepikatu pasahitza"
       ],
       "Verification password is required.": [
          null,
-         ""
+         "Egiaztapen-pasahitza beharrezkoa da."
       ],
       "Passwords do not match.": [
          null,
-         ""
+         "Pasahitzak ez datoz bat."
       ],
-      "Finish": [
+      "finish": [
          null,
-         ""
+         "amaitu"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
-         ""
+         "<strong class=\"email\">Zure helbidea</strong> egiaztatu egin da!"
       ],
       "Your new address is set up and you should now be signed in. You may now close this window and go back to": [
+         null,
+         "Zure helbide berria konfiguratuta dago eta saioa hasita behar zenuke orain. Leiho hau itxi eta atzera joan zaitezke"
+      ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID hasiera-orria"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
          ""
       ],
       "Communicating with server": [
          null,
-         ""
+         "Zerbitzariarekin komunikatzen"
       ],
       "Just a moment while we talk with the server.": [
          null,
-         ""
+         "Itxaron pixka bat zerbitzariarekin hitz egiten dugun bitartean."
       ],
       "BrowserID": [
          null,
-         ""
+         "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         ""
+         "Saioa hasteko modu azkar eta segurua da BrowserID &mdash; <a target=\"_blank\" href=\"/about\">argibide gehiago</a>"
       ],
       "BrowserID: %s": [
          null,
-         ""
+         "BrowserID: %s"
       ],
       "BrowserID Home": [
          null,
-         ""
+         "BrowserID hasiera-orria"
       ],
       "How it works": [
          null,
-         ""
+         "Nola dabilen"
       ],
       "Developers": [
          null,
-         ""
+         "Garatzaileak"
       ],
       "Sign In": [
          null,
-         ""
+         "Hasi saioa"
       ],
       "Sign Out": [
          null,
-         ""
+         "Amaitu saioa"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         ""
+         "<a href=\"%s\" target=\"_blank\">Mozilla Labs</a>eko <a href=\"%s\" target=\"_blank\">Identitate Taldea</a>k egina"
       ],
       "Privacy": [
          null,
-         ""
+         "Pribatutasuna"
       ],
       "TOS": [
          null,
-         ""
+         "Erabiltzeko baldintzak"
       ],
       "Need Help?": [
          null,
-         ""
+         "Laguntza behar duzu?"
       ],
       "There was a problem with your signup link. Has this address already been registered?": [
          null,
-         ""
+         "Arazoa egon da zure erregistrorako loturarekin. Helbide hau dagoeneko erregistratu da?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
-         ""
+         "Errorea zerbitzariarekin komunikatzean."
       ],
       "Last step!": [
          null,
-         ""
+         "Azken urratsa!"
       ],
       "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,
-         ""
+         "Eskerrik asko <strong>BrowserID</strong> zerbitzuan erregistratzeagatik. Zure <strong>BrowserID</strong> kontua erabil dezakezu orain web guztian zehar webguneetan <em>erregistratu</em> edo <em>saioa hasteko</em>!"
       ],
       "Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.": [
          null,
-         ""
+         "Eskerrik asko zure helbide elektronikoa egiaztatzeagatik. Mezu hau %s gunerako saio-hasiera burutzeko bidali zaizu."
       ],
       "Finish registration by clicking this link:": [
          null,
-         ""
+         "Erregistroa amaitzeko, egin klik ondorengo loturan:"
       ],
       "If you are NOT trying to sign into this site, just ignore this email.": [
          null,
-         ""
+         "Gune honetan saiorik hasi nahi EZ baduzu, ezikusi mezu hau."
       ],
       "Thanks,": [
          null,
-         ""
+         "Eskerrik asko."
       ],
       "(A better way to sign in)": [
          null,
-         ""
+         "(Saioa hasteko modu hobe bat)"
       ]
    }
 }
diff --git a/resources/static/i18n/fi/client.json b/resources/static/i18n/fi/client.json
index c573ca897..dc3a1b4df 100644
--- a/resources/static/i18n/fi/client.json
+++ b/resources/static/i18n/fi/client.json
@@ -3,9 +3,9 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-06 19:47+0200",
-         "Last-Translator": " Ville <villepohjanheimo@fastmail.fm>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-19 14:21+0200",
+         "Last-Translator": " Konsta <konstar@nic.fi>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " fi",
          "MIME-Version": " 1.0",
@@ -14,349 +14,377 @@
          "Plural-Forms": " nplurals=2; plural=(n != 1);",
          "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
-         "Todennetaan käyttäjää"
+         "Ikävä kyllä BrowserID-palvelu ei toimi ilman evästeitä"
       ],
-      "Adding Address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "Lisätään osoitetta"
+         ""
       ],
-      "Adding Primary Email Address to User": [
+      "Communication Error": [
          null,
-         "Lisätään ensisijaista sähköpostiosoitetta käyttäjälle"
+         "Kommunikointivirhe"
       ],
-      "Checking Address Info": [
+      "Finishing Sign In...": [
          null,
-         "Tarkistetaan osoitetiedot"
+         "Viimeistellään kirjautumista..."
       ],
-      "Authenticating with Assertion": [
+      "In just a moment you'll be signed into BrowserID.": [
          null,
-         "Varmennetaan vakuudella"
+         "Kirjaudut sisään BrowserID-palveluun hetken päästä."
       ],
-      "Cancelling User Account": [
+      "Please wait a few seconds while we sign you into the site.": [
          null,
-         "Peruutetaan käyttäjätiliä"
+         "Odota hetki, kun kirjaamme sinut sisään sivustolle."
       ],
-      "Checking Authentication": [
+      "We are sorry, this request is taking a LOOONG time.": [
          null,
-         "Tarkistetaan todennus"
+         "Olemme pahoillamme, tämä pyyntö kestää piiitkään."
       ],
-      "Checking Script Version": [
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
          null,
-         "Tarkistetaan komentosarjan versiota"
+         "Tämä viesti häviää kun pyyntö valmistuu (toivottavasti pian). Jos olet odottanut liian kauan, sulje tämä ikkuna ja yritä uudestaan."
       ],
-      "Completing User Registration": [
+      "Sign in using": [
          null,
-         "Viimeistellään käyttäjän rekisteröitymistä"
+         "Kirjaudu sisään käyttäen"
       ],
-      "We are sorry, BrowserID requires cookies": [
+      "New email address": [
          null,
-         "Ikävä kyllä BrowserID-palvelu ei toimi ilman evästeitä"
+         "Uusi sähköpostiosoite"
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
+      "This field must be an email address.": [
          null,
-         "Toimiakseen BrowserID-palvelu vaatii, että selaimesi sallii evästeet.  Aseta evästeet sallituksi selaimessasi ja kokeile uudelleen"
+         "Tämän kentän täytyy olla sähköpostiosoite."
       ],
-      "Checking if Cookies are Enabled": [
+      "The email field is required.": [
          null,
-         "Tarkistetaan, voidaanko asettaa evästeitä"
+         "Sähköpostikenttä on pakollinen."
       ],
-      "Creating Account": [
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
          null,
-         "Luodaan käyttäjätiliä"
+         "Lähetimme juuri sähköpostin tähän osoitteeseen! Jos todella haluat lähettää uuden, kokeile parin minuutin päästä uudelleen."
       ],
-      "Getting Assertion": [
+      "That address is already added to your account!": [
          null,
-         "Vastaanotetaan vakuutta"
+         "Tämä osoite on jo lisätty tiliisi!"
       ],
-      "Checking Registration Token": [
+      "add": [
          null,
-         "Tarkistetaan rekisteröintitunnistetta"
+         "Lisää"
       ],
-      "Checking Email Address": [
+      "cancel": [
          null,
-         "Tarkistetaan sähköpostiosoitetta"
+         "Peruuta"
       ],
-      "Checking Whether User is Authenticated with IdP": [
+      "Email": [
          null,
-         "Tarkistetaan, onko käyttäjä todennettu IdP:llä"
+         "Sähköpostia"
       ],
-      "Logout Failed": [
+      "Enter your email address to sign in to <strong>%s</strong>": [
          null,
-         "Kirjautuminen ulos epäonnistui"
+         "Syötä sähköpostiosoitteesi kirjautuaksesi <strong>%s</strong> -sivustolle"
       ],
-      "You are offline!": [
+      "Welcome to BrowserID!": [
          null,
-         "Olet yhteydettömässä tilassa!"
+         "Tervetuloa käyttämään BrowserID-palvelua!"
       ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
+      "This email looks new, so let's get you set up.": [
          null,
-         "Valitettavasti BrowserID-palvelu ei toimi yhteydettömässä tilassa!"
+         "Tämä sähköpostiosoite näyttää uudelta, joten luodaan sille asetukset."
       ],
-      "Authenticating with Identity Provider": [
+      "Password": [
          null,
-         "Varmennetaan sähköisen henkilöllisyyden tarjoajalla"
+         "Salasana"
       ],
-      "We had trouble communicating with your email provider, please try again!": [
+      "forgot your password?": [
          null,
-         "Keskustelu sähköpostin palveluntarjoajan kanssa epäonnistui, yritä uudelleen!"
+         "unohditko salasanasi?"
       ],
-      "Provisioning with Identity Provider": [
+      "The password field is required.": [
          null,
-         "Varmennetaan sähköisen henkilöllisyyden tarjoajan kanssa"
+         "Salasana-kenttä on pakollinen."
       ],
-      "Provisioning Unsupported Identity Provider": [
+      "The account cannot be logged in with this username and password.": [
          null,
-         "Varmennetaan ei-tuetun sähköisen henkilöllisyyden tarjoajan kanssa"
+         "Käyttäjätilille ei voida kirjautua tällä käyttäjänimellä ja salasanalla."
       ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
          null,
-         "Valitettavasti annettu sähköpostiosoite ei voi toimia ensisijaisena sähköisen henkilöllisyyden varmentajana."
+         ""
       ],
-      "Registration Failed": [
+      "next": [
          null,
-         "Rekisteröinti epäonnistui"
+         "Seuraava"
       ],
-      "Establishing Relay": [
+      "verify email": [
          null,
-         "Muodostetaan välityskanavaa"
+         "Vahvista sähköpostiosoite"
       ],
-      "Relay frame could not be found": [
+      "sign in": [
          null,
-         "Välityskanavan kehystä ei löytynyt"
+         "Kirjaudu sisään"
       ],
-      "Resetting Password": [
+      "Cannot verify %s": [
          null,
-         "Nollataan salasana"
+         "Ei voida vahvistaa %s"
       ],
-      "Remove Email Address from Account": [
+      "%s is a required address, but we cannot verify that you own this address.": [
          null,
-         "Poista tiliin liitetty sähköpostiosoite"
+         "Annoit osoitteen %s, mutta emme ole onnistuneet vahvistamaan, että tämä osoite on sinun."
       ],
-      "Setting Password": [
+      "Check your email!": [
          null,
-         "Asetetaan salasanaa"
+         "Tarkista sähköpostisi!"
       ],
-      "Signin Failed": [
+      "We sent a confirmation email to <strong>%s</strong>": [
          null,
-         "Kirjautuminen epäonnistui"
+         "Lähetimme vahvistusviestin osoitteeseen <strong>%s</strong>"
       ],
-      "Signup Failed": [
+      "To finish signing in just click the verify link we sent to your email address.": [
          null,
-         "Rekisteröityminen epäonnistui"
+         "Viimeistelläksesi rekisteröitymisen avaa linkki, jonka lähetimme sähköpostiisi."
       ],
-      "Syncing Address": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
          null,
-         "Synkronoidaan osoitetta"
+         "Jos tämä on virhe, älä välitä lähetetystä sähköpostista ja valitse <a href=\"#\" id=\"cancel\">peruuta</a>."
       ],
-      "Syncing Email Addresses": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          null,
-         "Synkronoidaan sähköpostiosoitteita"
+         "Jos tämä on virhe, älä välitä lähetetystä sähköpostista ja <a href=\"#\" id=\"back\">käytä toista sähköpostiosoitetta</a>."
       ],
-      "Sync Keys for Address": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         "Synkronoi avaimet osoitteelle"
+         "Olemme pahoillamme, mutta palvelin on kovassa kuormituksessa!"
       ],
-      "Getting Token Info": [
+      "We are very sorry, there has been an error!": [
          null,
-         "Haetaan tunnistetietoja"
+         "Olemme pahoillamme, mutta on tapahtunut virhe!"
       ],
-      "Updating password": [
+      "Please reload the page and try again.": [
          null,
-         "Päivitetään salasana"
+         "Sinun täytyy päivittää sivu yrittääksesi uudelleen."
       ],
-      "Verifying email address": [
+      "Please close this window and try again.": [
          null,
-         "Varmistetaan sähköpostiosoitetta"
+         "Sulje ikkuna ja syötä toimiva osoite jatkaaksesi."
       ],
-      "Communication Error": [
+      "See more info": [
          null,
-         "Kommunikointivirhe"
+         "Katso lisätietoja"
       ],
-      "Finishing Sign In...": [
+      "The site requested you sign in using": [
          null,
-         "Viimeistellään kirjautumista..."
+         "Sivusto ehdotti kirjautumista käyttäen"
       ],
-      "In just a moment you'll be signed into BrowserID.": [
+      "reset password": [
          null,
-         "Kirjaudut sisään BrowserID-palveluun hetken päästä."
+         "Nollaa salasana"
       ],
-      "Please wait a few seconds while we sign you into the site.": [
+      "*%s* is not a valid email address!": [
          null,
-         "Odota hetki, kun kirjaamme sinut sisään sivustolle."
+         "*%s* ei ole kelvollinen sähköpostiosoite!"
       ],
-      "We are sorry, this request is taking a LOOONG time.": [
+      "To continue, please close the window and enter a valid address.": [
          null,
-         "Olemme pahoillamme, tämä pyyntö kestää piiitkään."
+         "Sulje ikkuna ja syötä toimiva osoite jatkaaksesi."
       ],
-      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+      "This is not me...": [
          null,
-         "Tämä viesti häviää kun pyyntö valmistuu (toivottavasti pian). Jos olet odottanut liian kauan, sulje tämä ikkuna ja yritä uudestaan."
+         "Tämä ei ole minun..."
       ],
-      "Sign in using": [
+      "Use a different email": [
          null,
-         "Kirjaudu sisään käyttäen"
+         "Käytä eri sähköpostiosoitetta"
       ],
-      "New email address": [
+      "Always sign in using this email": [
          null,
-         "Uusi sähköpostiosoite"
+         "Kirjaudu aina tällä sähköpostiosoitteella"
       ],
-      "This field must be an email address.": [
+      "Address Verified!": [
          null,
-         "Tämän kentän täytyy olla sähköpostiosoite."
+         "Osoite varmistettu!"
       ],
-      "The email field is required.": [
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
          null,
-         "Sähköpostikenttä on pakollinen."
+         "Sähköinen henkilöllisyytesi on varmistettu sähköpostipalveluntarjoajallasi, yritämme nyt kirjata sinut sisään."
       ],
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
          null,
-         "Lähetimme juuri sähköpostin tähän osoitteeseen! Jos todella haluat lähettää uuden, kokeile parin minuutin päästä uudelleen."
+         "Sinun tulee kirjautua sisään sähköpostipalveluntarjoajallesi varmistaaksesi tämän osoitteen omistajuuden. Tämä ikkuna ohjautuu sivustolle"
       ],
-      "That address is already added to your account!": [
+      "verify": [
          null,
-         "Tämä osoite on jo lisätty tiliisi!"
+         "Vahvista"
       ],
-      "add": [
+      "Verify With Email Provider": [
          null,
-         "lisää"
+         "Vahvista sähköpostin palveluntarjoajalla"
       ],
-      "cancel": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         "peruuta"
+         "#~ \"Toimiakseen BrowserID-palvelu vaatii, että selaimesi sallii evästeet. \"#~ \"Aseta evästeet sallituksi selaimessasi ja kokeile uudelleen\""
       ],
-      "Email": [
+      "You are offline!": [
          null,
-         "Sähköpostia"
+         "Olet yhteydettömässä tilassa!"
       ],
-      "Enter your email address to sign in to <strong>%s</strong>": [
+      "Unfortunately, BrowserID cannot communicate while offline!": [
          null,
-         "Syötä sähköpostiosoitteesi kirjautuaksesi <strong>%s</strong> -sivustolle"
+         "Valitettavasti BrowserID-palvelu ei toimi yhteydettömässä tilassa!"
       ],
-      "Welcome to BrowserID!": [
+      "select email": [
          null,
-         "Tervetuloa käyttämään BrowserID-palvelua!"
+         "Valitse sähköpostiosoite"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
          null,
-         "Tämä sähköpostiosoite näyttää uudelta, joten luodaan sille asetukset."
+         "#~ \"Olemme pahoillamme, mutta emme voi keskustella BrowserID-palvelun kanssa \"#~ \"kun olet yhteydettömässä tilassa.\""
       ],
-      "Password": [
+      "Authenticating User": [
          null,
-         "Salasana"
+         "Todennetaan käyttäjää"
       ],
-      "forgot your password?": [
+      "Adding Address": [
          null,
-         "unohditko salasanasi?"
+         "Lisätään osoitetta"
       ],
-      "The password field is required.": [
+      "Adding Primary Email Address to User": [
          null,
-         "Salasana-kenttä on pakollinen."
+         "Lisätään ensisijaista sähköpostiosoitetta käyttäjälle"
       ],
-      "The account cannot be logged in with this username and password.": [
+      "Checking Address Info": [
          null,
-         "Käyttäjätilille ei voida kirjautua tällä käyttäjänimellä ja salasanalla."
+         "Tarkistetaan osoitetiedot"
       ],
-      "next": [
+      "Authenticating with Assertion": [
          null,
-         "seuraava"
+         "Varmennetaan vakuudella"
       ],
-      "verify email": [
+      "Cancelling User Account": [
          null,
-         "vahvista sähköpostiosoite"
+         "Peruutetaan käyttäjätiliä"
       ],
-      "select email": [
+      "Checking Authentication": [
          null,
-         "valitse sähköpostiosoite"
+         "Tarkistetaan todennus"
       ],
-      "Cannot verify %s": [
+      "Checking Script Version": [
          null,
-         "Ei voida vahvistaa"
+         "Tarkistetaan komentosarjan versiota"
       ],
-      "%s is a required address, but we cannot verify that you own this address.": [
+      "Completing User Registration": [
          null,
-         "Annoit osoitteen %s, mutta emme ole onnistuneet vahvistamaan, että tämä osoite on sinun."
+         "Viimeistellään käyttäjän rekisteröitymistä"
       ],
-      "Check your email!": [
+      "Checking if Cookies are Enabled": [
          null,
-         "Tarkista sähköpostisi!"
+         "Tarkistetaan, voidaanko asettaa evästeitä"
       ],
-      "We sent a confirmation email to <strong>%s</strong>": [
+      "Creating Account": [
          null,
-         "Lähetimme vahvistusviestin osoitteeseen <strong>%s</strong>"
+         "Luodaan käyttäjätiliä"
       ],
-      "To finish signing in just click the verify link we sent to your email address.": [
+      "Getting Assertion": [
          null,
-         "Viimeistelläksesi rekisteröitymisen avaa linkki, jonka lähetimme sähköpostiisi."
+         "Vastaanotetaan vakuutta"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+      "Checking Registration Token": [
          null,
-         "Jos tämä on virhe, älä välitä lähetetystä sähköpostista ja valitse <a href=\"#\" id=\"cancel\">peruuta</a>."
+         "Tarkistetaan rekisteröintitunnistetta"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+      "Checking Email Address": [
          null,
-         "Jos tämä on virhe, älä välitä lähetetystä sähköpostista ja <a href=\"#\" id=\"back\">käytä toista sähköpostiosoitetta</a>."
+         "Tarkistetaan sähköpostiosoitetta"
       ],
-      "The site requested you sign in using": [
+      "Checking Whether User is Authenticated with IdP": [
          null,
-         "Sivusto ehdotti kirjautumista käyttäen"
+         "Tarkistetaan, onko käyttäjä todennettu IdP:llä"
       ],
-      "Reset Password": [
+      "Logout Failed": [
          null,
-         "Nollaa salasana"
+         "Kirjautuminen ulos epäonnistui"
       ],
-      "Cancel": [
+      "Authenticating with Identity Provider": [
          null,
-         "Peruuta"
+         "Varmennetaan sähköisen henkilöllisyyden tarjoajalla"
       ],
-      "*%s* is not a valid email address!": [
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
          null,
-         "*%s* ei ole kelvollinen sähköpostiosoite!"
+         "#~ \"Keskustelu sähköpostin palveluntarjoajan kanssa epäonnistui, yritä \"#~ \"uudelleen!\""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "Provisioning with Identity Provider": [
          null,
-         "Sulje ikkuna ja syötä toimiva osoite jatkaaksesi."
+         "Varmennetaan sähköisen henkilöllisyyden tarjoajan kanssa"
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "Provisioning Unsupported Identity Provider": [
          null,
-         "Olemme pahoillamme, mutta emme voi keskustella BrowserID-palvelun kanssa kun olet yhteydettömässä tilassa."
+         "Varmennetaan ei-tuetun sähköisen henkilöllisyyden tarjoajan kanssa"
       ],
-      "This is not me...": [
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
          null,
-         "Tämä ei ole minun..."
+         "#~ \"Valitettavasti annettu sähköpostiosoite ei voi toimia ensisijaisena \"#~ \"sähköisen henkilöllisyyden varmentajana.\""
       ],
-      "Use a different email": [
+      "Registration Failed": [
          null,
-         "Käytä eri sähköpostiosoitetta"
+         "Rekisteröinti epäonnistui"
       ],
-      "Always sign in using this email": [
+      "Establishing Relay": [
          null,
-         "Kirjaudu aina tällä sähköpostiosoitteella"
+         "Muodostetaan välityskanavaa"
       ],
-      "sign in": [
+      "Relay frame could not be found": [
          null,
-         "kirjaudu sisään"
+         "Välityskanavan kehystä ei löytynyt"
       ],
-      "Address Verified!": [
+      "Resetting Password": [
          null,
-         "Osoite varmistettu!"
+         "Nollataan salasana"
       ],
-      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+      "Remove Email Address from Account": [
          null,
-         "Sähköinen henkilöllisyytesi on varmistettu sähköpostipalveluntarjoajallasi, yritämme nyt kirjata sinut sisään."
+         "Poista tiliin liitetty sähköpostiosoite"
       ],
-      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+      "Setting Password": [
          null,
-         "Sinun tulee kirjautua sisään sähköpostipalveluntarjoajallesi varmistaaksesi tämän osoitteen omistajuuden. Tämä ikkuna ohjautuu sivustolle"
+         "Asetetaan salasanaa"
       ],
-      "Verify": [
+      "Signin Failed": [
          null,
-         "Vahvista"
+         "Kirjautuminen epäonnistui"
       ],
-      "Verify With Email Provider": [
+      "Signup Failed": [
+         null,
+         "Rekisteröityminen epäonnistui"
+      ],
+      "Syncing Address": [
+         null,
+         "Synkronoidaan osoitetta"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "Synkronoidaan sähköpostiosoitteita"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Synkronoi avaimet osoitteelle"
+      ],
+      "Getting Token Info": [
+         null,
+         "Haetaan tunnistetietoja"
+      ],
+      "Updating password": [
+         null,
+         "Päivitetään salasana"
+      ],
+      "Verifying email address": [
          null,
-         "Vahvista sähköpostin palveluntarjoajalla."
+         "Varmistetaan sähköpostiosoitetta"
+      ],
+      "Cancel": [
+         null,
+         "Peruuta"
       ]
    }
 }
diff --git a/resources/static/i18n/fi/messages.json b/resources/static/i18n/fi/messages.json
index 14ebc83b7..f6fde5afa 100644
--- a/resources/static/i18n/fi/messages.json
+++ b/resources/static/i18n/fi/messages.json
@@ -3,178 +3,188 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
-         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-19 14:05+0200",
+         "Last-Translator": " Konsta <konstar@nic.fi>",
          "Language-Team": " LANGUAGE <LL@li.org>",
-         "Language": " ",
+         "Language": " fi",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
-         "Content-Transfer-Encoding": " 8bit"
+         "Content-Transfer-Encoding": " 8bit",
+         "Plural-Forms": " nplurals=2; plural=(n != 1);",
+         "X-Generator": " Pootle 2.1.6"
       },
       "Complete Login to %s using BrowserID": [
          null,
-         ""
+         "Viimeistele kirjautuminen sivulle %s käyttäen BrowserID-palvelua"
       ],
       "Error encountered while attempting to confirm your address. Have you previously verified this address?": [
          null,
-         ""
+         "Osoitteesi vahvistamisessa tapahtui virhe. Oletko vahvistanut tämän osoitteen aikaisemmin?"
       ],
       "Error encountered trying to complete registration.": [
          null,
-         ""
+         "Rekisteröinnin viimeistelyssä tapahtui virhe."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         ""
+         "Viimeistele sisäänkirjautuminen sivulle:"
       ],
       "Email Verification": [
          null,
-         ""
+         "Sähköpostivarmistus"
       ],
       "Email Address": [
          null,
-         ""
+         "Sähköpostiosoite"
       ],
       "Your Email": [
          null,
-         ""
+         "Sinun sähköpostisi"
       ],
       "New Password": [
          null,
-         ""
+         "Uusi salasana"
       ],
       "Enter a Password": [
          null,
-         ""
+         "Syötä salasana"
       ],
       "Password is required.": [
          null,
-         ""
+         "Salasana on pakollinen."
       ],
       "Password must be between 8 and 80 characters long.": [
          null,
-         ""
+         "Salasanan täytyy olla 8-80 merkkiä pitkä."
       ],
       "Verify Password": [
          null,
-         ""
+         "Vahvista salasana"
       ],
       "Repeat Password": [
          null,
-         ""
+         "Toista salasana"
       ],
       "Verification password is required.": [
          null,
-         ""
+         "Salasanan vahvistus vaaditaan."
       ],
       "Passwords do not match.": [
          null,
-         ""
+         "Salasanat eivät täsmää."
       ],
-      "Finish": [
+      "finish": [
          null,
-         ""
+         "Valmis"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
-         ""
+         "<strong class=\"email\">Sinun osoitteesi</strong> on vahvistettu!"
       ],
       "Your new address is set up and you should now be signed in. You may now close this window and go back to": [
+         null,
+         "Uusi osoitteesi on asetettu ja sinun pitäisi olla nyt kirjautuneena sisään. Voit nyt sulkea tämän ikkunan ja mennä takaisin sivulle"
+      ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID Koti"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
          ""
       ],
       "Communicating with server": [
          null,
-         ""
+         "Kommunikoidaan serverin kanssa."
       ],
       "Just a moment while we talk with the server.": [
          null,
-         ""
+         "Odota hetki kun keskustelemme serverin kanssa."
       ],
       "BrowserID": [
          null,
-         ""
+         "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         ""
+         "BrowserID on nopea ja turvallinen tapa kirjautua &mdash; <a target=\"_blank\" href=\"/about\">lue lisää</a>"
       ],
       "BrowserID: %s": [
          null,
-         ""
+         "BrowserID: %s"
       ],
       "BrowserID Home": [
          null,
-         ""
+         "BrowserID Koti"
       ],
       "How it works": [
          null,
-         ""
+         "Kuinka tämä toimii"
       ],
       "Developers": [
          null,
-         ""
+         "Kehittäjät"
       ],
       "Sign In": [
          null,
-         ""
+         "Kirjaudu sisään"
       ],
       "Sign Out": [
          null,
-         ""
+         "Kirjaudu ulos"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         ""
+         "Tehnyt <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
-         ""
+         "Tietosuoja"
       ],
       "TOS": [
          null,
-         ""
+         "Käyttöehdot"
       ],
       "Need Help?": [
          null,
-         ""
+         "Tarvitsetko apua?"
       ],
       "There was a problem with your signup link. Has this address already been registered?": [
          null,
-         ""
+         "Rekisteröitymislinkkisi kanssa oli ongelmia. Onko tämä osoite jo rekisteröity?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
-         ""
+         "Virhe keskustellessa serverin kanssa."
       ],
       "Last step!": [
          null,
-         ""
+         "Viimeinen askel!"
       ],
       "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,
-         ""
+         "Kiitos rekisteröitymisestä <strong>BrowserID</strong>-palvelun käyttäjäksi. Voit nyt käyttää <strong>BrowserID</strong>-tiliäsi <em>Kirjautuaksesi</em> tai <em>Rekisteröityäksesi</em> sivustoille ympäri Internetiä!"
       ],
       "Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.": [
          null,
-         ""
+         "Kiitos että vahvistit sähköpostiosoitteesi. Tämän sähköpostin tarkoitus on varmistaa kirjautumisesi sivulle %s."
       ],
       "Finish registration by clicking this link:": [
          null,
-         ""
+         "Vahvistat rekisteröitymisen avaamalla tämän linkin:"
       ],
       "If you are NOT trying to sign into this site, just ignore this email.": [
          null,
-         ""
+         "Jos ET yritä kirjautua tälle sivulle, voit poistaa tämän viestin."
       ],
       "Thanks,": [
          null,
-         ""
+         "Kiittäen,"
       ],
       "(A better way to sign in)": [
          null,
-         ""
+         "(Parempi tapa kirjautua)"
       ]
    }
 }
diff --git a/resources/static/i18n/fr/client.json b/resources/static/i18n/fr/client.json
index 1480d967f..b9d08b93f 100644
--- a/resources/static/i18n/fr/client.json
+++ b/resources/static/i18n/fr/client.json
@@ -3,359 +3,388 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
-         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-02 16:58+0200",
+         "Last-Translator": " Benoit <benoit.leseul@gmail.com>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " fr",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
-         "X-Generator": " Translate Toolkit 1.9.0"
+         "Plural-Forms": " nplurals=2; plural=(n > 1);",
+         "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
-         ""
+         "BrowserID nécessite l'utilisation de cookies"
       ],
-      "Adding Address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         ""
+         "Veuillez fermer cette fenêtre, <a %s>activer les cookies</a> et réessayer"
       ],
-      "Adding Primary Email Address to User": [
+      "Communication Error": [
          null,
-         ""
+         "Erreur de communication"
       ],
-      "Checking Address Info": [
+      "Finishing Sign In...": [
          null,
-         ""
+         "Fin de l'enregistrement…"
       ],
-      "Authenticating with Assertion": [
+      "In just a moment you'll be signed into BrowserID.": [
          null,
-         ""
+         "Dans un instant, vous serez identifié dans BrowserID."
       ],
-      "Cancelling User Account": [
+      "Please wait a few seconds while we sign you into the site.": [
          null,
-         ""
+         "Veuillez patienter quelques secondes pendant que nous envoyons votre identification au site."
       ],
-      "Checking Authentication": [
+      "We are sorry, this request is taking a LOOONG time.": [
          null,
-         ""
+         "Nous sommes désolés. Cette requête prend BEAUCOUP de temps."
       ],
-      "Checking Script Version": [
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
          null,
-         ""
+         "Ce message disparaîtra lorsque la requête sera achevée. Si cela dure trop longtemps, fermez cette fenêtre et essayez à nouveau."
       ],
-      "Completing User Registration": [
+      "Sign in using": [
          null,
-         ""
+         "Identifiez-vous en utilisant"
       ],
-      "We are sorry, BrowserID requires cookies": [
+      "New email address": [
          null,
-         ""
+         "Nouvelle adresse électronique"
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
+      "This field must be an email address.": [
          null,
-         ""
+         "Ce champ doit contenir une adresse électronique."
       ],
-      "Checking if Cookies are Enabled": [
+      "The email field is required.": [
          null,
-         ""
+         "Le champ « Adresse électronique » est obligatoire."
       ],
-      "Creating Account": [
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
          null,
-         ""
+         "Nous venons d'envoyer un courriel à cette adresse ! Si vous voulez vraiment en envoyer un autre, patientez une minute ou deux et essayez à nouveau."
       ],
-      "Getting Assertion": [
+      "That address is already added to your account!": [
          null,
-         ""
+         "Cette adresse a déjà été ajoutée à votre compte !"
       ],
-      "Checking Registration Token": [
+      "add": [
          null,
-         ""
+         "ajouter"
       ],
-      "Checking Email Address": [
+      "cancel": [
          null,
-         ""
+         "annuler"
       ],
-      "Checking Whether User is Authenticated with IdP": [
+      "Email": [
          null,
-         ""
+         "Adresse électronique"
       ],
-      "Logout Failed": [
+      "Enter your email address to sign in to <strong>%s</strong>": [
          null,
-         ""
+         "Saisissez votre adresse de courrier électronique pour vous enregistrer dans <strong>%s</strong>"
       ],
-      "You are offline!": [
+      "Welcome to BrowserID!": [
          null,
-         ""
+         "Bienvenue dans BrowserID !"
       ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
+      "This email looks new, so let's get you set up.": [
          null,
-         ""
+         "Cette adresse électronique semble nouvelle, commençons à la paramétrer."
       ],
-      "Authenticating with Identity Provider": [
+      "Password": [
          null,
-         ""
+         "Mot de passe"
       ],
-      "We had trouble communicating with your email provider, please try again!": [
+      "forgot your password?": [
          null,
-         ""
+         "Mot de passe oublié ?"
       ],
-      "Provisioning with Identity Provider": [
+      "The password field is required.": [
          null,
-         ""
+         "Le champ « Mot de passe » est obligatoire."
       ],
-      "Provisioning Unsupported Identity Provider": [
+      "The account cannot be logged in with this username and password.": [
          null,
-         ""
+         "Vous ne pouvez vous connecter à ce compte avec ce nom d'utilisateur et ce mot de passe."
       ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
          null,
-         ""
+         "En cliquant sur %s, vous confirmez que vous acceptez les <a %s>conditions d'utilisation</a> de ce site et sa <a %s>politique de confidentialité</a>."
       ],
-      "Registration Failed": [
+      "next": [
          null,
-         ""
+         "suivant"
       ],
-      "Establishing Relay": [
+      "verify email": [
          null,
-         ""
+         "vérifiez l'adresse électronique"
       ],
-      "Relay frame could not be found": [
+      "sign in": [
          null,
-         ""
+         "identification"
       ],
-      "Resetting Password": [
+      "Cannot verify %s": [
          null,
-         ""
+         "Impossible de vérifier %s"
       ],
-      "Remove Email Address from Account": [
+      "%s is a required address, but we cannot verify that you own this address.": [
          null,
-         ""
+         "%s est une adresse requise mais nous ne pouvons vérifier qu'elle vous appartient."
       ],
-      "Setting Password": [
+      "Check your email!": [
          null,
-         ""
+         "Vérifiez votre messagerie !"
       ],
-      "Signin Failed": [
+      "We sent a confirmation email to <strong>%s</strong>": [
          null,
-         ""
+         "Nous avons envoyé un courriel de confirmation à <strong>%s</strong>"
       ],
-      "Signup Failed": [
+      "To finish signing in just click the verify link we sent to your email address.": [
          null,
-         ""
+         "Pour terminer votre enregistrement, cliquez sur le lien « vérification » dans le courriel que nous avons envoyé."
       ],
-      "Syncing Address": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
          null,
-         ""
+         "S'il s'agit d'une erreur, ignorez ce courriel et cliquez sur <a href=\"#\" id=\"cancel\">annuler</a>."
       ],
-      "Syncing Email Addresses": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          null,
-         ""
+         "S'il s'agit d'une erreur, ignorez le courriel envoyé et <a href=\"#\" id=\"back\">utilisez une autre adresse électronique</a>."
       ],
-      "Sync Keys for Address": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         ""
+         "Nous sommes vraiment désolés, mais le serveur est extrêmement sollicité !"
       ],
-      "Getting Token Info": [
+      "We are very sorry, there has been an error!": [
          null,
-         ""
+         "Nous sommes vraiment désolés : il y a eu une erreur !"
       ],
-      "Updating password": [
+      "Please reload the page and try again.": [
          null,
-         ""
+         "Veuillez actualiser la page et essayer à nouveau."
       ],
-      "Verifying email address": [
+      "Please close this window and try again.": [
          null,
-         ""
+         "Veuillez fermer cette fenêtre et essayer à nouveau."
       ],
-      "Communication Error": [
+      "See more info": [
          null,
-         ""
+         "Plus de détails"
       ],
-      "Finishing Sign In...": [
+      "The site requested you sign in using": [
          null,
-         ""
+         "Le site requiert que vous vous identifiiez en utilisant"
       ],
-      "In just a moment you'll be signed into BrowserID.": [
+      "reset password": [
          null,
-         ""
+         "réinitialiser le mot de passe"
       ],
-      "Please wait a few seconds while we sign you into the site.": [
+      "*%s* is not a valid email address!": [
          null,
-         ""
+         "*%s* n'est pas une adresse électronique valide !"
       ],
-      "We are sorry, this request is taking a LOOONG time.": [
+      "To continue, please close the window and enter a valid address.": [
          null,
-         ""
+         "Pour continuer, veuillez fermer la fenêtre et saisir une adresse électronique valide."
       ],
-      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+      "This is not me...": [
          null,
-         ""
+         "Ce n'est pas moi…"
       ],
-      "Sign in using": [
+      "Use a different email": [
          null,
-         ""
+         "Utiliser une adresse électronique différente"
       ],
-      "New email address": [
+      "Always sign in using this email": [
          null,
-         ""
+         "Toujours m'identifier en utilisant cette adresse électronique"
       ],
-      "This field must be an email address.": [
+      "Address Verified!": [
          null,
-         ""
+         "Adresse électronique vérifiée !"
       ],
-      "The email field is required.": [
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
          null,
-         ""
+         "Votre identité a été vérifiée auprès de votre fournisseur, nous allons maintenant essayer de vous identifier sur le site."
       ],
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
          null,
-         ""
+         "Vous devez vous identifier auprès de votre fournisseur pour la vérification de l'appartenance de cette adresse. Cette fenêtre sera redirigée vers"
       ],
-      "That address is already added to your account!": [
+      "verify": [
          null,
-         ""
+         "vérification"
       ],
-      "add": [
+      "Verify With Email Provider": [
          null,
-         ""
+         "Vérification auprès du fournisseur de l'adresse électronique"
       ],
-      "cancel": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         ""
+         "#~ \"BrowserID nécessite que la gestion des cookies soit activée dans votre \"#~ \"navigateur. Veuillez activer la gestion des cookies et essayer à nouveau.\""
       ],
-      "Email": [
+      "You are offline!": [
          null,
-         ""
+         "Vous n'êtes pas connecté !"
       ],
-      "Enter your email address to sign in to <strong>%s</strong>": [
+      "Unfortunately, BrowserID cannot communicate while offline!": [
          null,
-         ""
+         "#~ \"Malheureusement, BrowserID ne peut pas communiquer en mode déconnecté !\""
       ],
-      "Welcome to BrowserID!": [
+      "select email": [
          null,
-         ""
+         "sélectionnez l'adresse électronique"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
          null,
-         ""
+         "#~ \"Nous sommes désolés, mais nous ne pouvons pas communiquer avec BrowserID \"#~ \"lors que vous n'êtes pas connecté.\""
       ],
-      "Password": [
+      "Authenticating User": [
          null,
-         ""
+         "Authentification de l'utilisateur"
       ],
-      "forgot your password?": [
+      "Adding Address": [
          null,
-         ""
+         "Ajout d'une adresse"
       ],
-      "The password field is required.": [
+      "Adding Primary Email Address to User": [
          null,
-         ""
+         "Ajout de l'adresse électronique principale de l'utilisateur"
       ],
-      "The account cannot be logged in with this username and password.": [
+      "Checking Address Info": [
          null,
-         ""
+         "Vérification des informations de l'adresse"
       ],
-      "next": [
+      "Authenticating with Assertion": [
          null,
-         ""
+         "Authentification avec affirmation"
       ],
-      "verify email": [
+      "Cancelling User Account": [
          null,
-         ""
+         "Annulation du compte utilisateur"
       ],
-      "select email": [
+      "Checking Authentication": [
          null,
-         ""
+         "Vérification de l'authentification"
       ],
-      "Cannot verify %s": [
+      "Checking Script Version": [
          null,
-         ""
+         "Vérification de la version du script"
       ],
-      "%s is a required address, but we cannot verify that you own this address.": [
+      "Completing User Registration": [
          null,
-         ""
+         "Fin de l'enregistrement utilisateur"
       ],
-      "Check your email!": [
+      "Checking if Cookies are Enabled": [
          null,
-         ""
+         "Vérification de l'activation des cookies"
       ],
-      "We sent a confirmation email to <strong>%s</strong>": [
+      "Creating Account": [
          null,
-         ""
+         "Création de compte"
       ],
-      "To finish signing in just click the verify link we sent to your email address.": [
+      "Getting Assertion": [
          null,
-         ""
+         "Obtention de l'affirmation"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+      "Checking Registration Token": [
          null,
-         ""
+         "Vérification du jeton d'enregistrement"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+      "Checking Email Address": [
          null,
-         ""
+         "Vérification de l'adresse électronique"
       ],
-      "The site requested you sign in using": [
+      "Checking Whether User is Authenticated with IdP": [
          null,
-         ""
+         "L'utilisateur est-il authentifié avec un fournisseur d'identité ?"
       ],
-      "Reset Password": [
+      "Logout Failed": [
          null,
-         ""
+         "La déconnexion a échoué"
       ],
-      "Cancel": [
+      "Authenticating with Identity Provider": [
          null,
-         ""
+         "Authentification avec un fournisseur d'identité"
       ],
-      "*%s* is not a valid email address!": [
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
          null,
-         ""
+         "#~ \"Nous avons eu des problèmes de communication avec votre fournisseur \"#~ \"d'adresse électronique. Veuillez essayer à nouveau !\""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "Provisioning with Identity Provider": [
          null,
-         ""
+         "Enregistrement avec fournisseur d'identité"
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "Provisioning Unsupported Identity Provider": [
          null,
-         ""
+         "Enregistrement non géré avec fournisseur d'identité"
       ],
-      "This is not me...": [
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
          null,
-         ""
+         "#~ \"Malheureusement, l'adresse électronique fournie ne peut être utilisée \"#~ \"comme fournisseur d'identité principal\""
       ],
-      "Use a different email": [
+      "Registration Failed": [
          null,
-         ""
+         "L'enregistrement a échoué"
       ],
-      "Always sign in using this email": [
+      "Establishing Relay": [
          null,
-         ""
+         "Établissement de relais"
       ],
-      "sign in": [
+      "Relay frame could not be found": [
          null,
-         ""
+         "Le relais n'a pu être trouvé"
       ],
-      "Address Verified!": [
+      "Resetting Password": [
          null,
-         ""
+         "Réinitialisation du mot de passe"
       ],
-      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+      "Remove Email Address from Account": [
          null,
-         ""
+         "Supprimer l'adresse électronique du compte"
       ],
-      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+      "Setting Password": [
          null,
-         ""
+         "Définition du mot de passe"
       ],
-      "Verify": [
+      "Signin Failed": [
          null,
-         ""
+         "L'identification a échoué"
       ],
-      "Verify With Email Provider": [
+      "Signup Failed": [
+         null,
+         "L'identification a échoué"
+      ],
+      "Syncing Address": [
+         null,
+         "Synchronisation de l'adresse"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "Synchronisation des adresses électroniques"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Synchronisation des clés pour l'adresse"
+      ],
+      "Getting Token Info": [
+         null,
+         "Obtention des informations du jeton"
+      ],
+      "Updating password": [
+         null,
+         "Mise à jour du mot de passe"
+      ],
+      "Verifying email address": [
+         null,
+         "Vérification de l'adresse électronique"
+      ],
+      "Cancel": [
          null,
-         ""
+         "Annuler"
       ]
    }
 }
diff --git a/resources/static/i18n/fr/messages.json b/resources/static/i18n/fr/messages.json
index c4b8f5fbc..f9bce61a7 100644
--- a/resources/static/i18n/fr/messages.json
+++ b/resources/static/i18n/fr/messages.json
@@ -3,179 +3,188 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
-         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-02 17:00+0200",
+         "Last-Translator": " Benoit <benoit.leseul@gmail.com>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " fr",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
-         "X-Generator": " Translate Toolkit 1.9.0"
+         "Plural-Forms": " nplurals=2; plural=(n > 1);",
+         "X-Generator": " Pootle 2.1.6"
       },
       "Complete Login to %s using BrowserID": [
          null,
-         ""
+         "Connexion à %s en utilisant BrowserID"
       ],
       "Error encountered while attempting to confirm your address. Have you previously verified this address?": [
          null,
-         ""
+         "Une erreur est survenue en tentant de confirmer votre adresse. Avez-vous précédemment vérifié cette adresse ?"
       ],
       "Error encountered trying to complete registration.": [
          null,
-         ""
+         "Une erreur est survenue en tentant de terminer l'enregistrement."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         ""
+         "Fin de l'identification pour :"
       ],
       "Email Verification": [
          null,
-         ""
+         "Vérification de l'adresse élctronique"
       ],
       "Email Address": [
          null,
-         ""
+         "Adresse électronique"
       ],
       "Your Email": [
          null,
-         ""
+         "Votre adresse électronique"
       ],
       "New Password": [
          null,
-         ""
+         "Nouveau mot de passe"
       ],
       "Enter a Password": [
          null,
-         ""
+         "Saisissez un mot de passe"
       ],
       "Password is required.": [
          null,
-         ""
+         "Un mot de passe est obligatoire"
       ],
       "Password must be between 8 and 80 characters long.": [
          null,
-         ""
+         "Le mot de passe doit contenir entre 8 et 80 caractères."
       ],
       "Verify Password": [
          null,
-         ""
+         "Vérification du mot de passe"
       ],
       "Repeat Password": [
          null,
-         ""
+         "Ressaisissez le mot de passe"
       ],
       "Verification password is required.": [
          null,
-         ""
+         "La vérification du mot de passe est obligatoire."
       ],
       "Passwords do not match.": [
          null,
-         ""
+         "Les mots de passe ne correspondent pas."
       ],
-      "Finish": [
+      "finish": [
          null,
-         ""
+         "terminer"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
-         ""
+         "<strong class=\"email\">Votre adresse électronique</strong> a été vérifiée !"
       ],
       "Your new address is set up and you should now be signed in. You may now close this window and go back to": [
          null,
-         ""
+         "Votre nouvelle adresse est définie et vous pouvez être à présent identifié. Vous pouvez maintenant fermer cette fenêtre et retourner sur"
+      ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID nécessite l'utilisation de cookies"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "Veuillez fermer cette fenêtre, <a %s>activer les cookies</a> et réessayer"
       ],
       "Communicating with server": [
          null,
-         ""
+         "Communication avec le serveur"
       ],
       "Just a moment while we talk with the server.": [
          null,
-         ""
+         "Veuillez patienter pendant la communication avec le serveur."
       ],
       "BrowserID": [
          null,
-         ""
+         "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         ""
+         "BrowserID est un moyen rapide et sûr de s'identifier &mdash; <a target=\"_blank\" href=\"/about\">en apprendre plus</a>"
       ],
       "BrowserID: %s": [
          null,
-         ""
+         "BrowserID : %s"
       ],
       "BrowserID Home": [
          null,
-         ""
+         "Accueil de BrowserID"
       ],
       "How it works": [
          null,
-         ""
+         "Comment ça fonctionne"
       ],
       "Developers": [
          null,
-         ""
+         "Développeurs"
       ],
       "Sign In": [
          null,
-         ""
+         "Connexion"
       ],
       "Sign Out": [
          null,
-         ""
+         "Déconnexion"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         ""
+         "Par l'<a %s>Équipe Identité</a> @ <a %s>Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
-         ""
+         "Confidentialité"
       ],
       "TOS": [
          null,
-         ""
+         "Conditions d'utilisation"
       ],
       "Need Help?": [
          null,
-         ""
+         "Besoin d'aide ?"
       ],
       "There was a problem with your signup link. Has this address already been registered?": [
          null,
-         ""
+         "Il y a eu un problème avec votre lien de confirmation. Cette adresse a-t-elle déjà été enregistrée ?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
-         ""
+         "Erreur de communication avec le serveur."
       ],
       "Last step!": [
          null,
-         ""
+         "Dernière étape !"
       ],
       "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,
-         ""
+         "Merci d'utiliser <strong>BrowserID</strong>. Vous pouvez à présent utiliser votre compte <strong>BrowserID</strong> pour vous <em>connecter</em> ou vous <em>identifier</em> sur les sites Web ! "
       ],
       "Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.": [
          null,
-         ""
+         "Merci d'avoir vérifié votre adresse électronique. Ce message va vous être envoyé pour terminer votre enregistrement à %s."
       ],
       "Finish registration by clicking this link:": [
          null,
-         ""
+         "Terminer l'enregistrement en cliquant sur ce lien :"
       ],
       "If you are NOT trying to sign into this site, just ignore this email.": [
          null,
-         ""
+         "Si vous n'essayez PAS de vous identifier sur ce site, veuillez ignorer ce courriel."
       ],
       "Thanks,": [
          null,
-         ""
+         "Merci,"
       ],
       "(A better way to sign in)": [
          null,
-         ""
+         "(Une meilleure manière de s'identifier)"
       ]
    }
 }
diff --git a/resources/static/i18n/fy/client.json b/resources/static/i18n/fy/client.json
index 8580dc256..ddb51765e 100644
--- a/resources/static/i18n/fy/client.json
+++ b/resources/static/i18n/fy/client.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " BrowserID 1.0",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 12:35+0100",
-         "PO-Revision-Date": " 2012-02-03 21:59+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-08 19:25+0200",
          "Last-Translator": " Wim <fryskefirefox@gmail.com>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " fy",
@@ -14,357 +14,381 @@
          "Plural-Forms": " nplurals=2; plural=(n != 1);",
          "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
-         "Brûker ferifiearje"
+         "BrowserID fereasket cookies"
       ],
-      "Adding Address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "Adres tafoegje"
+         "Slút dit finster, <a %s>skeakel cookies yn</a> en probearje it nochris"
       ],
-      "Adding Primary Email Address to User": [
+      "Communication Error": [
          null,
-         "Primêr e-mailadres oan brûker tafoegje"
+         "Kommunikaasjeflater"
       ],
-      "Checking Address Info": [
+      "Finishing Sign In...": [
          null,
-         "Adresynformaasje kontrolearje"
+         "Oanmelden foltôge…"
       ],
-      "Authenticating with Assertion": [
+      "In just a moment you'll be signed into BrowserID.": [
          null,
-         "Ferifiearje mei befestiging"
+         "Oer inkele mominten binne jo by BrowserID oanmeld."
       ],
-      "Cancelling User Account": [
+      "Please wait a few seconds while we sign you into the site.": [
          null,
-         "Brûkersaccount annulearje"
+         "Wacht inkele sekonden wylst wy jo oanmelde by de website."
       ],
-      "Checking Authentication": [
+      "We are sorry, this request is taking a LOOONG time.": [
          null,
-         "Autentikaasje kontrolearje"
+         "Sorry, dit fersyk kost IN PROTTE tiid."
       ],
-      "Checking Script Version": [
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
          null,
-         "Skriptferzje kontrolearje"
+         "Dit berjocht sil ferdwine sa gau as jo fersyk foltôge is (hooplik fluch).  As jo te lang wachte, slút dan dit finster en probearje it opnij."
       ],
-      "Completing User Registration": [
+      "Sign in using": [
          null,
-         "Brûkersregistraasje foltôgje"
+         "Oanmelde mei"
       ],
-      "We are sorry, BrowserID requires cookies": [
+      "New email address": [
          null,
-         "Sorry, BrowserID fereasket cookies"
+         "Nij e-mailadres"
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
+      "This field must be an email address.": [
          null,
-         "Foar BrowserID moatte de cookies fan jo browser ynskeakele wêze.  Skeakel de cookies fan jo browser yn en probearje it opnij"
+         "Dit fjild moat in e-mailadres wêze."
       ],
-      "Checking if Cookies are Enabled": [
+      "The email field is required.": [
          null,
-         "Kontrolearje of cookies ynskeakele binne"
+         "It e-mailfjild is ferplichte."
       ],
-      "Creating Account": [
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
          null,
-         "Account oanmeitsje"
+         "Wy hawwe sa krekt in e-mail nei dat adres stjoerd! As jo wier noch ien stjoere wolle, wacht dan in minút of twa en probearje it opnij."
       ],
-      "Getting Assertion": [
+      "That address is already added to your account!": [
          null,
-         "Befestiging krije"
+         "Dat adres is al oan jo account tafoege!"
       ],
-      "Checking Registration Token": [
+      "add": [
          null,
-         "Registraasjetoken kontrolearje"
+         "tafoegje"
       ],
-      "Checking Email Address": [
+      "cancel": [
          null,
-         "E-mailadres kontrolearje"
+         "annulearje"
       ],
-      "Checking Whether User is Authenticated with IdP": [
+      "Email": [
          null,
-         "Kontrolearje oft brûker ferifiearre is mei IdP"
+         "E-mail"
       ],
-      "Logout Failed": [
+      "Enter your email address to sign in to <strong>%s</strong>": [
          null,
-         "Ofmelden mislearre"
+         "Fier jo e-mailadres yn om jo oan te melden by <strong>%s</strong>"
       ],
-      "You are offline!": [
+      "Welcome to BrowserID!": [
          null,
-         "Jo binne offline!"
+         "Wolkom by BrowserID!"
       ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
+      "This email looks new, so let's get you set up.": [
          null,
-         "Spitigernôch kin BrowserID net offline kommunisearje!"
+         "Dit e-mailadres liket nij, dus litte wy de boel ynstelle."
       ],
-      "Authenticating with Identity Provider": [
+      "Password": [
          null,
-         "Ferifiearjen me Identityprovider"
+         "Wachtwurd"
       ],
-      "We had trouble communicating with your email provider, please try again!": [
+      "forgot your password?": [
          null,
-         "Wy hienen in probleem mei it kommunisearjen mei jo e-mailprovider, probearje it opnij!"
+         "wachtwurd ferjitten?"
       ],
-      "Provisioning with Identity Provider": [
+      "The password field is required.": [
          null,
-         "Provisioning mei Identityprovider"
+         "It wachtwurdfjild is ferplichte."
       ],
-      "Provisioning Unsupported Identity Provider": [
+      "The account cannot be logged in with this username and password.": [
          null,
-         "Provisioning net-stipe Identityprovider"
+         "It account kin mei dizze brûkersnamme en dit wachtwurd net oanmeld wurde."
       ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
          null,
-         "Spitich, it opjûne e-mailadres kin net as primêr Identityprovider brûkt wurde"
+         "Troch op %s te klikken befêstigje jo dat jo de <a %s>brûkersbetingsten</a> en it <a %s>privacybelied</a> fan dizze webstee akseptearje."
       ],
-      "Registration Failed": [
+      "next": [
          null,
-         "Registraasje mislearre"
+         "folgjende"
       ],
-      "Establishing Relay": [
+      "verify email": [
          null,
-         "Relay opsette"
+         "e-mailadres ferifiearje"
       ],
-      "Relay frame could not be found": [
+      "sign in": [
          null,
-         "Relayframe is net fûn"
+         "oanmelde"
       ],
-      "Resetting Password": [
+      "Cannot verify %s": [
          null,
-         "Wachtwurd werinisjalisearje"
+         "Kin %s net ferifiearje"
       ],
-      "Remove Email Address from Account": [
+      "%s is a required address, but we cannot verify that you own this address.": [
          null,
-         "E-mailadres út account fuortsmite"
+         "%s is in ferplicht adres mar wy kinne net ferifiearje dat it adres fan jo is."
       ],
-      "Setting Password": [
+      "Check your email!": [
          null,
-         "Wachtwurd ynstelle"
+         "Kontrolearje jo e-mail!"
       ],
-      "Signin Failed": [
+      "We sent a confirmation email to <strong>%s</strong>": [
          null,
-         "Oanmelden mislearre"
+         "Wy hawwe in befestigings-e-mail stjoerd nei <strong>%s</strong>"
       ],
-      "Signup Failed": [
+      "To finish signing in just click the verify link we sent to your email address.": [
          null,
-         "Registraasje mislearre"
+         "Klik op de ferifikaasjekeppeling dy't wy nei jo e-mailadres stjoerd hawwe om it oanmelden te foltôgjen."
       ],
-      "Syncing Address": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
          null,
-         "Adres syngronisearje"
+         "Negear de ferstjoerde e-mail as dit in fersin is en <a href=\"#\" id=\"cancel\">annulearje</a>."
       ],
-      "Syncing Email Addresses": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          null,
-         "E-mailadres syngronisearje"
+         "Negear de ferstjoerde e-mail as dit in fersin is en <a href=\"#\" id=\"back\">brûk in oar e-mailadres</a>."
       ],
-      "Sync Keys for Address": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         "Sync-kaaien foar adres"
+         "It spyt ús, de tsjinner hat it bysûnder drok!"
       ],
-      "Getting Token Info": [
+      "We are very sorry, there has been an error!": [
          null,
-         "Tokenynformaasje krije"
+         "It spyt ús, der is in flater bard!"
       ],
-      "Updating password": [
+      "Please reload the page and try again.": [
          null,
-         "Wachtwurd bywurkje"
+         "Laad de side opnij en probearje it nochris."
       ],
-      "Verifying email address": [
+      "Please close this window and try again.": [
          null,
-         "E-mailadres ferifiearje"
+         "Slút it finster en probearje it nochris."
       ],
-      "Communication Error": [
+      "See more info": [
          null,
-         "Kommunikaasjeflater"
+         "Mear ynfo besjen"
       ],
-      "Finishing Sign In...": [
+      "The site requested you sign in using": [
          null,
-         "Oanmelden foltôge…"
+         "De website freget jo jo oan te melden mei"
       ],
-      "In just a moment you'll be signed into BrowserID.": [
+      "reset password": [
          null,
-         "Oer inkele mominten binne jo by BrowserID oanmeld."
+         "wachtwurd werinisjalisearje"
       ],
-      "Please wait a few seconds while we sign you into the site.": [
+      "*%s* is not a valid email address!": [
          null,
-         "Wacht inkele sekonden wylst wy jo oanmelde by de website."
+         "*%s* is gjin jildich e-mailadres!"
       ],
-      "We are sorry, this request is taking a LOOONG time.": [
+      "To continue, please close the window and enter a valid address.": [
          null,
-         "Sorry, dit fersyk kost IN PROTTE tiid."
+         "Slút it finster en fier in jildich adres yn om troch te gean."
       ],
-      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+      "This is not me...": [
          null,
-         "Dit berjocht sil ferdwine sa gau as jo fersyk foltôge is (hooplik fluch).  As jo te lang wachte, slút dan dit finster en probearje it opnij."
+         "Dit bin ik net…"
       ],
-      "Sign in using": [
+      "Use a different email": [
          null,
-         "Oanmelde mei"
+         "Brûk in oar e-mailadres"
       ],
-      "New email address": [
+      "Always sign in using this email": [
          null,
-         "Nij e-mailadres"
+         "Altyd oanmelde mei dit e-mailadres"
       ],
-      "This field must be an email address.": [
+      "Address Verified!": [
          null,
-         "Dit fjild moat in e-mailadres wêze."
+         "Adres ferifiearre!"
       ],
-      "The email field is required.": [
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
          null,
-         "It e-mailfjild is ferplichte."
+         "Jo identiteit is ferifiearre fia jo e-mailprovider, wy sille no probearje jo oan te melden."
       ],
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
          null,
-         "Wy hawwe sa krekt in e-mail nei dat adres stjoerd! As jo wier noch ien stjoere wolle, wacht dan in minút of twa en probearje it opnij."
+         "Om te ferifiearjen dat jo de eigener fan dit adres binne moatte jo jo oanmelde mei jo provider.  Dit finster wurdt trochstjoerd nei"
       ],
-      "That address is already added to your account!": [
+      "verify": [
          null,
-         "Dat adres is al oan jo account tafoege!"
+         "ferifiearje"
       ],
-      "add": [
+      "Verify With Email Provider": [
          null,
-         "tafoegje"
+         "Ferifiearje mei e-mailprovider"
       ],
-      "cancel": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         "annulearje"
+         "#~ \"Foar BrowserID moatte de cookies fan jo browser ynskeakele wêze.  Skeakel \"#~ \"de cookies fan jo browser yn en probearje it opnij\""
       ],
-      "Email": [
+      "You are offline!": [
          null,
-         "E-mail"
+         "Jo binne offline!"
       ],
-      "Enter your email address to sign in to <strong>%s</strong>": [
+      "Unfortunately, BrowserID cannot communicate while offline!": [
          null,
-         "Fier jo e-mailadres yn om jo oan te melden by <strong>%s</strong>"
+         "Spitigernôch kin BrowserID net offline kommunisearje!"
       ],
-      "Welcome to BrowserID!": [
+      "select email": [
          null,
-         "Wolkom by BrowserID!"
+         "e-mailadres selektearje"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
          null,
-         "Dit e-mailadres liket nij, dus litte wy de boel ynstelle."
+         "#~ \"Sorry, wy kinne net mei BrowserID kommunisearje wylst jo offline binne.\""
       ],
-      "Password": [
+      "Authenticating User": [
          null,
-         "Wachtwurd"
+         "Brûker ferifiearje"
       ],
-      "forgot your password?": [
+      "Adding Address": [
          null,
-         "wachtwurd ferjitten?"
+         "Adres tafoegje"
       ],
-      "The password field is required.": [
+      "Adding Primary Email Address to User": [
          null,
-         "It wachtwurdfjild is ferplichte."
+         "Primêr e-mailadres oan brûker tafoegje"
       ],
-      "The account cannot be logged in with this username and password.": [
+      "Checking Address Info": [
          null,
-         "It account kin mei dizze brûkersnamme en dit wachtwurd net oanmeld wurde."
+         "Adresynformaasje kontrolearje"
       ],
-      "next": [
+      "Authenticating with Assertion": [
          null,
-         "folgjende"
+         "Ferifiearje mei befestiging"
       ],
-      "verify email": [
+      "Cancelling User Account": [
          null,
-         "e-mailadres ferifiearje"
+         "Brûkersaccount annulearje"
       ],
-      "select email": [
+      "Checking Authentication": [
          null,
-         "e-mailadres selektearje"
+         "Autentikaasje kontrolearje"
       ],
-      "Cannot verify %s": [
+      "Checking Script Version": [
          null,
-         "Kin %s net ferifiearje"
+         "Skriptferzje kontrolearje"
       ],
-      "%s is a required address, but we cannot verify that you own this address.": [
+      "Completing User Registration": [
          null,
-         "%s is in ferplicht adres mar wy kinne net ferifiearje dat it adres fan jo is."
+         "Brûkersregistraasje foltôgje"
       ],
-      "Check your email!": [
+      "Checking if Cookies are Enabled": [
          null,
-         "Kontrolearje jo e-mail!"
+         "Kontrolearje of cookies ynskeakele binne"
       ],
-      "We sent a confirmation email to <strong>%s</strong>": [
+      "Creating Account": [
          null,
-         "Wy hawwe in befvestigings-e-mail stjoerd nei <strong>%s</strong>"
+         "Account oanmeitsje"
       ],
-      "To finish signing in just click the verify link we sent to your email address.": [
+      "Getting Assertion": [
          null,
-         "Klik op de ferifikaasjekeppeling dy't wy nei jo e-mailadres stjoerd hawwe om it oanmelden te foltôgjen."
+         "Befestiging krije"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+      "Checking Registration Token": [
          null,
-         "Negear de ferstjoerde e-mail as dit in fersin is en <a href=\"#\" id=\"cancel\">annulearje</a>."
+         "Registraasjetoken kontrolearje"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+      "Checking Email Address": [
          null,
-         "Negear de ferstjoerde e-mail as dit in fersin is en <a href=\"#\" id=\"back\">brûk in oar e-mailadres</a>."
+         "E-mailadres kontrolearje"
       ],
-      "The site requested you sign in using": [
+      "Checking Whether User is Authenticated with IdP": [
          null,
-         "De website freget jo jo oan te melden mei"
+         "Kontrolearje oft brûker ferifiearre is mei IdP"
       ],
-      "Reset Password": [
+      "Logout Failed": [
          null,
-         "Wachtwurd werinisjalisearje"
+         "Ofmelden mislearre"
       ],
-      "Cancel": [
+      "Authenticating with Identity Provider": [
          null,
-         "Annulearje"
+         "Ferifiearjen mei Identityprovider"
       ],
-      "*%s* is not a valid email address!": [
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
          null,
-         "*%s* is gjin jildich e-mailadres!"
+         "#~ \"Wy hienen in probleem mei it kommunisearjen mei jo e-mailprovider, \"#~ \"probearje it opnij!\""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "Provisioning with Identity Provider": [
          null,
-         "Slút it finster en fier in jildich adres yn om troch te gean."
+         "Provisioning mei Identityprovider"
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "Provisioning Unsupported Identity Provider": [
          null,
-         "Sorry, wy kinne net mei BrowserID kommunisearje wylst jo offline binne."
+         "Provisioning net-stipe Identityprovider"
       ],
-      "This is not me...": [
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
          null,
-         "Dit bin ik net…"
+         "#~ \"Spitich, it opjûne e-mailadres kin net as primêr Identityprovider brûkt \"#~ \"wurde\""
       ],
-      "Use a different email": [
+      "Registration Failed": [
          null,
-         "Brûk in oar e-mailadres"
+         "Registraasje mislearre"
       ],
-      "Always sign in using this email": [
+      "Establishing Relay": [
          null,
-         "Altyd oanmelde mei dit e-mailadres"
+         "Relay opsette"
       ],
-      "sign in": [
+      "Relay frame could not be found": [
          null,
-         "oanmelde"
+         "Relayframe is net fûn"
       ],
-      "Address Verified!": [
+      "Resetting Password": [
          null,
-         "Adres ferifiearre!"
+         "Wachtwurd werinisjalisearje"
       ],
-      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+      "Remove Email Address from Account": [
          null,
-         "Jo identiteit is ferifiearre fia jo e-mailprovider, wy gean no probearje jo oan te melden."
+         "E-mailadres út account fuortsmite"
       ],
-      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+      "Setting Password": [
          null,
-         "Om te ferifiearjen dat jo de eigener fan dit adres binne moatte jo jo oanmelde mei jo provider.  Dit finster wurdt trochstjoerd nei"
+         "Wachtwurd ynstelle"
       ],
-      "Verify": [
+      "Signin Failed": [
          null,
-         "Ferifiearje"
+         "Oanmelden mislearre"
       ],
-      "Verify With Email Provider": [
+      "Signup Failed": [
          null,
-         "Ferifiearje mei e-mailprovider"
+         "Registraasje mislearre"
       ],
-      "#~ \"We just sent an email to that address!  If you really want to send \"#~ \"another, wait a minute or two and try again.\"": [
+      "Syncing Address": [
          null,
-         "#~ \"Wy hawwe sa krekt in e-mail nei dat adres stjoerd!  As jo wier noch ien \"#~ \"stjoere wolle, wacht dan in minút of twa en probearje it opnij.\""
+         "Adres syngronisearje"
       ],
-      "This email looks new, so let&apos;s get you set up.": [
+      "Syncing Email Addresses": [
          null,
-         "Dit e-mailadres liket nij, dus litte wy de boel ynstelle."
+         "E-mailadres syngronisearje"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Sync-kaaien foar adres"
+      ],
+      "Getting Token Info": [
+         null,
+         "Tokenynformaasje krije"
+      ],
+      "Updating password": [
+         null,
+         "Wachtwurd bywurkje"
+      ],
+      "Verifying email address": [
+         null,
+         "E-mailadres ferifiearje"
+      ],
+      "Cancel": [
+         null,
+         "Annulearje"
+      ],
+      "#~ \"We just sent an email to that address!  If you really want to send \"#~ \"another, wait a minute or two and try again.\"": [
+         null,
+         "#~ \"Wy hawwe sa krekt in e-mail nei dat adres stjoerd!  As jo wier noch ien \"#~ \"stjoere wolle, wacht dan in minút of twa en probearje it opnij.\""
       ],
       "#~ \"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,
diff --git a/resources/static/i18n/fy/messages.json b/resources/static/i18n/fy/messages.json
index 90349ded2..f754f7579 100644
--- a/resources/static/i18n/fy/messages.json
+++ b/resources/static/i18n/fy/messages.json
@@ -3,9 +3,9 @@
       "": {
          "Project-Id-Version": " BrowserID 1.0",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 12:35+0100",
-         "PO-Revision-Date": " 2012-02-03 22:22+0200",
-         "Last-Translator": " Wim <fryskefirefox@gmail.com>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-08 19:51+0200",
+         "Last-Translator": " Matjaž <m@owca.info>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " fy",
          "MIME-Version": " 1.0",
@@ -26,9 +26,9 @@
          null,
          "Der is in flater bard by it foltôgjen fan de registraasje."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         "Oanmelden beëinigje by: "
+         "Oanmelden foltôgje by: "
       ],
       "Email Verification": [
          null,
@@ -74,9 +74,9 @@
          null,
          "Wachtwurden komme net oerien."
       ],
-      "Finish": [
+      "finish": [
          null,
-         "Foltôgje"
+         "foltôgje"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
@@ -86,6 +86,14 @@
          null,
          "Jo nije e-mailadres is ynsteld en jo binne no oanmeld. Jo kinne dit finster no slute en weromgean nei"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID fereasket cookies"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "Slút dit finster, <a %s>skeakel cookies yn</a> en probearje it nochris"
+      ],
       "Communicating with server": [
          null,
          "Kommunisearje mei tsjinner"
@@ -98,9 +106,9 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         "BrowserID is de flugge en feilige manier fan oanmelden &ndash; <a target=\"_blank\" href=\"/about\">Mear ynfo</a>"
+         "BrowserID is de flugge en feilige manier fan oanmelden &ndash; <a %s>mear ynfo</a>"
       ],
       "BrowserID: %s": [
          null,
@@ -126,9 +134,9 @@
          null,
          "Ofmelde"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         "Troch it <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
+         "Troch it <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
@@ -146,7 +154,7 @@
          null,
          "Der is in probleem mei jo registraasjekeppeling. Is dit adres al registrearre?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "Flater by kommunikaasje mei tsjinner."
       ],
diff --git a/resources/static/i18n/ga/client.json b/resources/static/i18n/ga/client.json
index 9606c57af..8d97f99fb 100644
--- a/resources/static/i18n/ga/client.json
+++ b/resources/static/i18n/ga/client.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:27+0100",
          "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
          "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
          "Language-Team": " LANGUAGE <LL@li.org>",
@@ -11,161 +11,13 @@
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit"
       },
-      "Authenticating User": [
-         null,
-         "Úsáideoir á Fhíordheimhniú"
-      ],
-      "Adding Address": [
-         null,
-         "Seoladh á Chur Leis"
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         "Príomhsheoladh Ríomhphoist á chur le hÚsáideoir"
-      ],
-      "Checking Address Info": [
-         null,
-         "Seoladh á Sheiceáil"
-      ],
-      "Authenticating with Assertion": [
-         null,
-         "Á Fhíordheimhniú trí Assertion"
-      ],
-      "Cancelling User Account": [
-         null,
-         "Cuntas Úsáideora á Chealú"
-      ],
-      "Checking Authentication": [
-         null,
-         "Fíordheimhniú á Sheiceáil"
-      ],
-      "Checking Script Version": [
-         null,
-         "Leagan na Scripte á Sheiceáil"
-      ],
-      "Completing User Registration": [
-         null,
-         "Clárú Úsáideora á Chur i gCrích"
-      ],
-      "We are sorry, BrowserID requires cookies": [
+      "BrowserID requires cookies": [
          null,
          "Caithfidh tú fianáin a cheadú chun BrowserID a úsáid"
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         "Úsáideann BrowserID fianáin i do bhrabhsálaí. Ní mór duit fianáin a chumasú, ansin bain triail eile as"
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         "Fianáin á Seiceáil"
-      ],
-      "Creating Account": [
-         null,
-         "Cuntas á Chruthú"
-      ],
-      "Getting Assertion": [
-         null,
-         "Dearbhú á Fháil"
-      ],
-      "Checking Registration Token": [
-         null,
-         "Ceadchomhartha Cláraithe á Sheiceáil"
-      ],
-      "Checking Email Address": [
-         null,
-         "Seoladh Ríomhphoist á Sheiceáil"
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         "Ag seiceáil an bhfuil an t-úsáideoir fíordheimhnithe trí IdP"
-      ],
-      "Logout Failed": [
-         null,
-         "Theip ar Logáil Amach"
-      ],
-      "You are offline!": [
-         null,
-         "Tá tú as líne!"
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         "Faraor, níl BrowserID in ann cumarsáid a dhéanamh nuair a bhíonn tú as líne!"
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         "Fíordheimhniú trí Sholáthraí Aitheantais"
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         "Bhí fadhb againn ag dul i dteagmháil le do sholáthraí ríomhphoist; bain triail eile as!"
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         "Faisnéis á fáil ó Sholáthraí Aitheantais"
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         "Faisnéis á fáil ó Sholáthraí Aitheantais gan tacaíocht"
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "Faraor, ní féidir an seoladh ríomhphoist a úsáid mar Phríomhsholáthraí Aitheantais"
-      ],
-      "Registration Failed": [
-         null,
-         "Theip ar Chlárú"
-      ],
-      "Establishing Relay": [
-         null,
-         "Seachadán á Bhunú"
-      ],
-      "Relay frame could not be found": [
-         null,
-         "Níorbh fhéidir fráma seachadáin a aimsiú"
-      ],
-      "Resetting Password": [
-         null,
-         "Focal Faire á Athshocrú"
-      ],
-      "Remove Email Address from Account": [
-         null,
-         "Bain Seoladh Ríomhphoist ón Chuntas"
-      ],
-      "Setting Password": [
-         null,
-         "Focal Faire á Shocrú"
-      ],
-      "Signin Failed": [
-         null,
-         "Theip ar Logáil Isteach"
-      ],
-      "Signup Failed": [
-         null,
-         "Theip ar Chlárú"
-      ],
-      "Syncing Address": [
-         null,
-         "Seoladh á Shioncrónú"
-      ],
-      "Syncing Email Addresses": [
-         null,
-         "Seoltaí Ríomhphoist á Sioncrónú"
-      ],
-      "Sync Keys for Address": [
-         null,
-         "Eochracha á Sioncrónú"
-      ],
-      "Getting Token Info": [
-         null,
-         "Faisnéis Cheadchomhartha á Fáil"
-      ],
-      "Updating password": [
-         null,
-         "Focal faire á nuashonrú"
-      ],
-      "Verifying email address": [
-         null,
-         "Seoladh ríomhphoist á dheimhniú"
+         "Dún an fhuinneog seo, <a %s>cumasaigh fianáin</a> agus bain triail eile as"
       ],
       "Communication Error": [
          null,
@@ -235,7 +87,7 @@
          null,
          "Fáilte go BrowserID!"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
          "Is seoladh nua é seo, mar sin socróimid do chuntas anois."
       ],
@@ -245,7 +97,7 @@
       ],
       "forgot your password?": [
          null,
-         "an ndearna tú dearmad ar d'fhocal faire?"
+         "an ndearna tú dearmad de d'fhocal faire?"
       ],
       "The password field is required.": [
          null,
@@ -255,6 +107,10 @@
          null,
          "Ní féidir logáil isteach leis an ainm úsáideora seo agus leis an focal faire seo."
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         "Má chliceálann tú %s, dearbhaíonn tú go nglacann tú le <a %s>Téarmaí Úsáide</a> agus le <a %s>Polasaí Príobháideachta</a> an tsuímh seo."
+      ],
       "next": [
          null,
          "ar aghaidh"
@@ -263,9 +119,9 @@
          null,
          "deimhnigh do ríomhphost"
       ],
-      "select email": [
+      "sign in": [
          null,
-         "roghnaigh seoladh ríomhphoist"
+         "logáil isteach"
       ],
       "Cannot verify %s": [
          null,
@@ -295,17 +151,33 @@
          null,
          "Más botún é seo, ná bac leis an teachtaireacht agus <a href=\"#\" id=\"back\">úsáid seoladh ríomhphoist eile</a>."
       ],
-      "The site requested you sign in using": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         "Tá an suíomh ag iarraidh ort logáil isteach trí"
+         "Tá brón orainn, tá an freastalaí an-ghnóthach faoi láthair!"
       ],
-      "Reset Password": [
+      "We are very sorry, there has been an error!": [
          null,
-         "Athshocraigh an Focal Faire"
+         "Tá brón orainn, tharla earráid!"
       ],
-      "Cancel": [
+      "Please reload the page and try again.": [
          null,
-         "Cealaigh"
+         "Athluchtaigh an leathanach agus bain triail eile as."
+      ],
+      "Please close this window and try again.": [
+         null,
+         "Dún an fhuinneog seo agus bain triail eile as."
+      ],
+      "See more info": [
+         null,
+         "Tuilleadh eolais"
+      ],
+      "The site requested you sign in using": [
+         null,
+         "Tá an suíomh ag iarraidh ort logáil isteach trí"
+      ],
+      "reset password": [
+         null,
+         "athshocraigh an focal faire"
       ],
       "*%s* is not a valid email address!": [
          null,
@@ -315,10 +187,6 @@
          null,
          "Chun dul ar aghaidh, dún an fhuinneog agus cuir seoladh bailí isteach."
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
-         null,
-         "Ní féidir linn dul i dteagmháil le BrowserID nuair a bhíonn tú as líne."
-      ],
       "This is not me...": [
          null,
          "Ní mise é seo..."
@@ -331,10 +199,6 @@
          null,
          "Logáil isteach leis an seoladh seo i gcónaí"
       ],
-      "sign in": [
-         null,
-         "logáil isteach"
-      ],
       "Address Verified!": [
          null,
          "Seoladh Deimhnithe!"
@@ -347,14 +211,178 @@
          null,
          "Chun bheith cinnte gur leatsa an seoladh ríomhphoist seo, caithfidh tú logáil isteach le do sholáthraí ríomhphoist. Athdhíreofar an fhuinneog seo chuig"
       ],
-      "Verify": [
+      "verify": [
          null,
-         "Deimhnigh"
+         "deimhnigh"
       ],
       "Verify With Email Provider": [
          null,
          "Deimhnigh le Soláthraí Ríomhphoist"
       ],
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
+         null,
+         "#~ \"Úsáideann BrowserID fianáin i do bhrabhsálaí. Ní mór duit fianáin a \"#~ \"chumasú, ansin bain triail eile as\""
+      ],
+      "You are offline!": [
+         null,
+         "Tá tú as líne!"
+      ],
+      "Unfortunately, BrowserID cannot communicate while offline!": [
+         null,
+         "#~ \"Faraor, níl BrowserID in ann cumarsáid a dhéanamh nuair a bhíonn tú as \"#~ \"líne!\""
+      ],
+      "select email": [
+         null,
+         "roghnaigh seoladh ríomhphoist"
+      ],
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
+         null,
+         "#~ \"Ní féidir linn dul i dteagmháil le BrowserID nuair a bhíonn tú as líne.\""
+      ],
+      "Authenticating User": [
+         null,
+         "Úsáideoir á Fhíordheimhniú"
+      ],
+      "Adding Address": [
+         null,
+         "Seoladh á Chur Leis"
+      ],
+      "Adding Primary Email Address to User": [
+         null,
+         "Príomhsheoladh Ríomhphoist á chur le hÚsáideoir"
+      ],
+      "Checking Address Info": [
+         null,
+         "Seoladh á Sheiceáil"
+      ],
+      "Authenticating with Assertion": [
+         null,
+         "Á Fhíordheimhniú trí Assertion"
+      ],
+      "Cancelling User Account": [
+         null,
+         "Cuntas Úsáideora á Chealú"
+      ],
+      "Checking Authentication": [
+         null,
+         "Fíordheimhniú á Sheiceáil"
+      ],
+      "Checking Script Version": [
+         null,
+         "Leagan na Scripte á Sheiceáil"
+      ],
+      "Completing User Registration": [
+         null,
+         "Clárú Úsáideora á Chur i gCrích"
+      ],
+      "Checking if Cookies are Enabled": [
+         null,
+         "Fianáin á Seiceáil"
+      ],
+      "Creating Account": [
+         null,
+         "Cuntas á Chruthú"
+      ],
+      "Getting Assertion": [
+         null,
+         "Dearbhú á Fháil"
+      ],
+      "Checking Registration Token": [
+         null,
+         "Ceadchomhartha Cláraithe á Sheiceáil"
+      ],
+      "Checking Email Address": [
+         null,
+         "Seoladh Ríomhphoist á Sheiceáil"
+      ],
+      "Checking Whether User is Authenticated with IdP": [
+         null,
+         "Ag seiceáil an bhfuil an t-úsáideoir fíordheimhnithe trí IdP"
+      ],
+      "Logout Failed": [
+         null,
+         "Theip ar Logáil Amach"
+      ],
+      "Authenticating with Identity Provider": [
+         null,
+         "Fíordheimhniú trí Sholáthraí Aitheantais"
+      ],
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
+         null,
+         "#~ \"Bhí fadhb againn ag dul i dteagmháil le do sholáthraí ríomhphoist; bain \"#~ \"triail eile as!\""
+      ],
+      "Provisioning with Identity Provider": [
+         null,
+         "Faisnéis á fáil ó Sholáthraí Aitheantais"
+      ],
+      "Provisioning Unsupported Identity Provider": [
+         null,
+         "Faisnéis á fáil ó Sholáthraí Aitheantais gan tacaíocht"
+      ],
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
+         null,
+         "#~ \"Faraor, ní féidir an seoladh ríomhphoist a úsáid mar Phríomhsholáthraí \"#~ \"Aitheantais\""
+      ],
+      "Registration Failed": [
+         null,
+         "Theip ar Chlárú"
+      ],
+      "Establishing Relay": [
+         null,
+         "Seachadán á Bhunú"
+      ],
+      "Relay frame could not be found": [
+         null,
+         "Níorbh fhéidir fráma seachadáin a aimsiú"
+      ],
+      "Resetting Password": [
+         null,
+         "Focal Faire á Athshocrú"
+      ],
+      "Remove Email Address from Account": [
+         null,
+         "Bain Seoladh Ríomhphoist ón Chuntas"
+      ],
+      "Setting Password": [
+         null,
+         "Focal Faire á Shocrú"
+      ],
+      "Signin Failed": [
+         null,
+         "Theip ar Logáil Isteach"
+      ],
+      "Signup Failed": [
+         null,
+         "Theip ar Chlárú"
+      ],
+      "Syncing Address": [
+         null,
+         "Seoladh á Shioncrónú"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "Seoltaí Ríomhphoist á Sioncrónú"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Eochracha á Sioncrónú"
+      ],
+      "Getting Token Info": [
+         null,
+         "Faisnéis Cheadchomhartha á Fáil"
+      ],
+      "Updating password": [
+         null,
+         "Focal faire á nuashonrú"
+      ],
+      "Verifying email address": [
+         null,
+         "Seoladh ríomhphoist á dheimhniú"
+      ],
+      "Cancel": [
+         null,
+         "Cealaigh"
+      ],
       "#~ \"We just sent an email to that address!  If you really want to send \"#~ \"another, wait a minute or two and try again.\"": [
          null,
          "#~ \"Táimid tar éis teachtaireacht ríomhphoist a chur chuig an seoladh sin! \"#~ \"Más mian leat ceann eile a sheoladh, fan nóiméad agus bain triail eile as.\""
diff --git a/resources/static/i18n/ga/messages.json b/resources/static/i18n/ga/messages.json
index 9c47dcc8f..ba747f6b8 100644
--- a/resources/static/i18n/ga/messages.json
+++ b/resources/static/i18n/ga/messages.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:27+0100",
          "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
          "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
          "Language-Team": " LANGUAGE <LL@li.org>",
@@ -23,9 +23,9 @@
          null,
          "Tharla earráid agus an clárú á chur i gcrích."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         "Ag logáil isteach i: "
+         "Críochnaigh logáil isteach i:"
       ],
       "Email Verification": [
          null,
@@ -71,9 +71,9 @@
          null,
          "Ní ionann na focail fhaire."
       ],
-      "Finish": [
+      "finish": [
          null,
-         "Críochnaigh"
+         "críochnaigh"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
@@ -83,6 +83,14 @@
          null,
          "Tá do sheoladh nua socraithe agus tá tú logáilte isteach anois. Tá cead agat an fhuinneog seo a dhúnadh anois agus filleadh ar"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "Caithfidh tú fianáin a cheadú chun BrowserID a úsáid"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "Dún an fhuinneog seo, <a %s>cumasaigh fianáin</a> agus bain triail eile as"
+      ],
       "Communicating with server": [
          null,
          "Ag caint leis an bhfreastalaí"
@@ -95,9 +103,9 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         "Logáil isteach go tapaidh agus go sábháilte le BrowserID &mdash; <a target=\"_blank\" href=\"/about\">tuilleadh eolais</a>"
+         "Logáil isteach go tapaidh agus go sábháilte le BrowserID &mdash; <a %s>tuilleadh eolais</a>"
       ],
       "BrowserID: %s": [
          null,
@@ -123,9 +131,9 @@
          null,
          "Logáil Amach"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         "Cruthaithe ag an <a href=\"%s\" target=\"_blank\">Foireann Aitheantas</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
+         "Cruthaithe ag an <a %s>Foireann Aitheantais</a> i <a %s>Saotharlann Mhozilla</a>"
       ],
       "Privacy": [
          null,
@@ -143,7 +151,7 @@
          null,
          "Bhí fadhb le do nasc cláraithe. An raibh an seoladh seo cláraithe cheana?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "Earráid chumarsáide leis an bhfreastalaí."
       ],
@@ -157,7 +165,7 @@
       ],
       "Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.": [
          null,
-         "Go raibh maith agat as do sheoladh ríomhphoist a dhearbhú. Sheolamar an teachtaireacht chugat chun an logáil isteach i %s a chur i gcrích."
+         "Go raibh maith agat as do sheoladh ríomhphoist a dhearbhú. Sheolamar an teachtaireacht seo chugat chun an logáil isteach i %s a chur i gcrích."
       ],
       "Finish registration by clicking this link:": [
          null,
diff --git a/resources/static/i18n/gd/client.json b/resources/static/i18n/gd/client.json
index e2b2d5319..b51302712 100644
--- a/resources/static/i18n/gd/client.json
+++ b/resources/static/i18n/gd/client.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
          "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
          "Language-Team": " LANGUAGE <LL@li.org>",
@@ -13,159 +13,11 @@
          "Content-Transfer-Encoding": " 8bit",
          "X-Generator": " Translate Toolkit 1.9.0"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
          ""
       ],
-      "Adding Address": [
-         null,
-         ""
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         ""
-      ],
-      "Checking Address Info": [
-         null,
-         ""
-      ],
-      "Authenticating with Assertion": [
-         null,
-         ""
-      ],
-      "Cancelling User Account": [
-         null,
-         ""
-      ],
-      "Checking Authentication": [
-         null,
-         ""
-      ],
-      "Checking Script Version": [
-         null,
-         ""
-      ],
-      "Completing User Registration": [
-         null,
-         ""
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         ""
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         ""
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         ""
-      ],
-      "Creating Account": [
-         null,
-         ""
-      ],
-      "Getting Assertion": [
-         null,
-         ""
-      ],
-      "Checking Registration Token": [
-         null,
-         ""
-      ],
-      "Checking Email Address": [
-         null,
-         ""
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         ""
-      ],
-      "Logout Failed": [
-         null,
-         ""
-      ],
-      "You are offline!": [
-         null,
-         ""
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         ""
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         ""
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         ""
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         ""
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         ""
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         ""
-      ],
-      "Registration Failed": [
-         null,
-         ""
-      ],
-      "Establishing Relay": [
-         null,
-         ""
-      ],
-      "Relay frame could not be found": [
-         null,
-         ""
-      ],
-      "Resetting Password": [
-         null,
-         ""
-      ],
-      "Remove Email Address from Account": [
-         null,
-         ""
-      ],
-      "Setting Password": [
-         null,
-         ""
-      ],
-      "Signin Failed": [
-         null,
-         ""
-      ],
-      "Signup Failed": [
-         null,
-         ""
-      ],
-      "Syncing Address": [
-         null,
-         ""
-      ],
-      "Syncing Email Addresses": [
-         null,
-         ""
-      ],
-      "Sync Keys for Address": [
-         null,
-         ""
-      ],
-      "Getting Token Info": [
-         null,
-         ""
-      ],
-      "Updating password": [
-         null,
-         ""
-      ],
-      "Verifying email address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
          ""
       ],
@@ -237,7 +89,7 @@
          null,
          ""
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
          ""
       ],
@@ -257,6 +109,10 @@
          null,
          ""
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         ""
+      ],
       "next": [
          null,
          ""
@@ -265,7 +121,7 @@
          null,
          ""
       ],
-      "select email": [
+      "sign in": [
          null,
          ""
       ],
@@ -297,43 +153,51 @@
          null,
          ""
       ],
-      "The site requested you sign in using": [
+      "We are very sorry, the server is under extreme load!": [
          null,
          ""
       ],
-      "Reset Password": [
+      "We are very sorry, there has been an error!": [
          null,
          ""
       ],
-      "Cancel": [
+      "Please reload the page and try again.": [
          null,
          ""
       ],
-      "*%s* is not a valid email address!": [
+      "Please close this window and try again.": [
          null,
          ""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "See more info": [
          null,
          ""
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "The site requested you sign in using": [
          null,
          ""
       ],
-      "This is not me...": [
+      "reset password": [
          null,
          ""
       ],
-      "Use a different email": [
+      "*%s* is not a valid email address!": [
          null,
          ""
       ],
-      "Always sign in using this email": [
+      "To continue, please close the window and enter a valid address.": [
          null,
          ""
       ],
-      "sign in": [
+      "This is not me...": [
+         null,
+         ""
+      ],
+      "Use a different email": [
+         null,
+         ""
+      ],
+      "Always sign in using this email": [
          null,
          ""
       ],
@@ -349,7 +213,7 @@
          null,
          ""
       ],
-      "Verify": [
+      "verify": [
          null,
          ""
       ],
diff --git a/resources/static/i18n/gd/messages.json b/resources/static/i18n/gd/messages.json
index 1e51f63cc..e462238b2 100644
--- a/resources/static/i18n/gd/messages.json
+++ b/resources/static/i18n/gd/messages.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
          "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
          "Language-Team": " LANGUAGE <LL@li.org>",
@@ -25,7 +25,7 @@
          null,
          ""
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          ""
       ],
@@ -73,7 +73,7 @@
          null,
          ""
       ],
-      "Finish": [
+      "finish": [
          null,
          ""
       ],
@@ -85,6 +85,14 @@
          null,
          ""
       ],
+      "BrowserID requires cookies": [
+         null,
+         ""
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
       "Communicating with server": [
          null,
          ""
@@ -97,7 +105,7 @@
          null,
          ""
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
          ""
       ],
@@ -125,7 +133,7 @@
          null,
          ""
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
          ""
       ],
@@ -145,7 +153,7 @@
          null,
          ""
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          ""
       ],
diff --git a/resources/static/i18n/gl/client.json b/resources/static/i18n/gl/client.json
index 43e6e24df..2cc40eb97 100644
--- a/resources/static/i18n/gl/client.json
+++ b/resources/static/i18n/gl/client.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
          "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
          "Language-Team": " LANGUAGE <LL@li.org>",
@@ -13,159 +13,11 @@
          "Content-Transfer-Encoding": " 8bit",
          "X-Generator": " Translate Toolkit 1.9.0"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
          ""
       ],
-      "Adding Address": [
-         null,
-         ""
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         ""
-      ],
-      "Checking Address Info": [
-         null,
-         ""
-      ],
-      "Authenticating with Assertion": [
-         null,
-         ""
-      ],
-      "Cancelling User Account": [
-         null,
-         ""
-      ],
-      "Checking Authentication": [
-         null,
-         ""
-      ],
-      "Checking Script Version": [
-         null,
-         ""
-      ],
-      "Completing User Registration": [
-         null,
-         ""
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         ""
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         ""
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         ""
-      ],
-      "Creating Account": [
-         null,
-         ""
-      ],
-      "Getting Assertion": [
-         null,
-         ""
-      ],
-      "Checking Registration Token": [
-         null,
-         ""
-      ],
-      "Checking Email Address": [
-         null,
-         ""
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         ""
-      ],
-      "Logout Failed": [
-         null,
-         ""
-      ],
-      "You are offline!": [
-         null,
-         ""
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         ""
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         ""
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         ""
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         ""
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         ""
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         ""
-      ],
-      "Registration Failed": [
-         null,
-         ""
-      ],
-      "Establishing Relay": [
-         null,
-         ""
-      ],
-      "Relay frame could not be found": [
-         null,
-         ""
-      ],
-      "Resetting Password": [
-         null,
-         ""
-      ],
-      "Remove Email Address from Account": [
-         null,
-         ""
-      ],
-      "Setting Password": [
-         null,
-         ""
-      ],
-      "Signin Failed": [
-         null,
-         ""
-      ],
-      "Signup Failed": [
-         null,
-         ""
-      ],
-      "Syncing Address": [
-         null,
-         ""
-      ],
-      "Syncing Email Addresses": [
-         null,
-         ""
-      ],
-      "Sync Keys for Address": [
-         null,
-         ""
-      ],
-      "Getting Token Info": [
-         null,
-         ""
-      ],
-      "Updating password": [
-         null,
-         ""
-      ],
-      "Verifying email address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
          ""
       ],
@@ -237,7 +89,7 @@
          null,
          ""
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
          ""
       ],
@@ -257,6 +109,10 @@
          null,
          ""
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         ""
+      ],
       "next": [
          null,
          ""
@@ -265,7 +121,7 @@
          null,
          ""
       ],
-      "select email": [
+      "sign in": [
          null,
          ""
       ],
@@ -297,43 +153,51 @@
          null,
          ""
       ],
-      "The site requested you sign in using": [
+      "We are very sorry, the server is under extreme load!": [
          null,
          ""
       ],
-      "Reset Password": [
+      "We are very sorry, there has been an error!": [
          null,
          ""
       ],
-      "Cancel": [
+      "Please reload the page and try again.": [
          null,
          ""
       ],
-      "*%s* is not a valid email address!": [
+      "Please close this window and try again.": [
          null,
          ""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "See more info": [
          null,
          ""
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "The site requested you sign in using": [
          null,
          ""
       ],
-      "This is not me...": [
+      "reset password": [
          null,
          ""
       ],
-      "Use a different email": [
+      "*%s* is not a valid email address!": [
          null,
          ""
       ],
-      "Always sign in using this email": [
+      "To continue, please close the window and enter a valid address.": [
          null,
          ""
       ],
-      "sign in": [
+      "This is not me...": [
+         null,
+         ""
+      ],
+      "Use a different email": [
+         null,
+         ""
+      ],
+      "Always sign in using this email": [
          null,
          ""
       ],
@@ -349,7 +213,7 @@
          null,
          ""
       ],
-      "Verify": [
+      "verify": [
          null,
          ""
       ],
diff --git a/resources/static/i18n/gl/messages.json b/resources/static/i18n/gl/messages.json
index d0201d91c..b65be455d 100644
--- a/resources/static/i18n/gl/messages.json
+++ b/resources/static/i18n/gl/messages.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
          "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
          "Language-Team": " LANGUAGE <LL@li.org>",
@@ -25,7 +25,7 @@
          null,
          ""
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          ""
       ],
@@ -73,7 +73,7 @@
          null,
          ""
       ],
-      "Finish": [
+      "finish": [
          null,
          ""
       ],
@@ -85,6 +85,14 @@
          null,
          ""
       ],
+      "BrowserID requires cookies": [
+         null,
+         ""
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
       "Communicating with server": [
          null,
          ""
@@ -97,7 +105,7 @@
          null,
          ""
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
          ""
       ],
@@ -125,7 +133,7 @@
          null,
          ""
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
          ""
       ],
@@ -145,7 +153,7 @@
          null,
          ""
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          ""
       ],
diff --git a/resources/static/i18n/he/client.json b/resources/static/i18n/he/client.json
new file mode 100644
index 000000000..61a192320
--- /dev/null
+++ b/resources/static/i18n/he/client.json
@@ -0,0 +1,227 @@
+;var json_locale_data = {
+   "client": {
+      "": {
+         "Project-Id-Version": " PACKAGE VERSION",
+         "Report-Msgid-Bugs-To": " ",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-02 18:11+0200",
+         "Last-Translator": " amire80 <amir.aharoni@mail.huji.ac.il>",
+         "Language-Team": " LANGUAGE <LL@li.org>",
+         "Language": " he",
+         "MIME-Version": " 1.0",
+         "Content-Type": " text/plain; charset=UTF-8",
+         "Content-Transfer-Encoding": " 8bit",
+         "Plural-Forms": " nplurals=2; plural=(n != 1);",
+         "X-Generator": " Pootle 2.1.6"
+      },
+      "BrowserID requires cookies": [
+         null,
+         "להפעלת BrowserID נדרשות עוגיות"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "בבקשה לסגור את החלון הזה, <a %s>לאפשר עוגיות</a> ולנסות שוב"
+      ],
+      "Communication Error": [
+         null,
+         "תקלת תקשורת"
+      ],
+      "Finishing Sign In...": [
+         null,
+         "ההתחברות מסתיימת..."
+      ],
+      "In just a moment you'll be signed into BrowserID.": [
+         null,
+         "בעוד רגעים ספורים נהיה מחוברים אל BrowserID."
+      ],
+      "Please wait a few seconds while we sign you into the site.": [
+         null,
+         "נא להמתין מספר שניות בזמן שאנו מחברים אותך לאתר."
+      ],
+      "We are sorry, this request is taking a LOOONG time.": [
+         null,
+         "אנו מצטערים, הבקשה הזאת לוקחת המווון זמן."
+      ],
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+         null,
+         "ההודעה הזאת תיעלם כשהבקשה תושלם (בתקווה בקרוב). אם נראה לך שחיכית יותר מדי, נא לסגור את החלון ולנסות שוב."
+      ],
+      "Sign in using": [
+         null,
+         "התחברות באמצעות"
+      ],
+      "New email address": [
+         null,
+         "כתובת דואר אלקטרוני חדשה"
+      ],
+      "This field must be an email address.": [
+         null,
+         "בשדה הזה חייבת להיות כתובת דואר אלקטרוני."
+      ],
+      "The email field is required.": [
+         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,
+         "זה עתה שלחנו מכתב לכתובת הזאת! אם ברצונך לקבל עוד אחד, נא לחכות דקה או שתיים ולנסות שוב."
+      ],
+      "That address is already added to your account!": [
+         null,
+         "הכתובת הזאת כבר נוספה לחשבונך!"
+      ],
+      "add": [
+         null,
+         "הוספה"
+      ],
+      "cancel": [
+         null,
+         "ביטול"
+      ],
+      "Email": [
+         null,
+         "דואר אלקטרוני"
+      ],
+      "Enter your email address to sign in to <strong>%s</strong>": [
+         null,
+         "נא להכניס את כתובת הדואר האלקטרוני שלך כדי להתחבר אל <strong>%s</strong>"
+      ],
+      "Welcome to BrowserID!": [
+         null,
+         "ברוך בואך אל BrowserID!"
+      ],
+      "This email looks new, so let's get you set up.": [
+         null,
+         "נראה שזו כתובת דואר אלקטרוני חדשה, ולכן נצטרך להגדיר אותה עבורך."
+      ],
+      "Password": [
+         null,
+         "ססמה"
+      ],
+      "forgot your password?": [
+         null,
+         "האם שכחת את ססמתך?"
+      ],
+      "The password field is required.": [
+         null,
+         "שדה הססמה נדרש."
+      ],
+      "The account cannot be logged in with this username and password.": [
+         null,
+         "לא ניתן להתחבר לחשבון עם שם המשתמש והססמה הללו."
+      ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         "לחיצה על %s היא אישור שקיבלת את <a %s>תנאי השימוש</a> ואת <a %s>מדיניות הפרטיות</a>."
+      ],
+      "next": [
+         null,
+         "הבא"
+      ],
+      "verify email": [
+         null,
+         "אימות דואר אלקטרוני"
+      ],
+      "sign in": [
+         null,
+         "כניסה"
+      ],
+      "Cannot verify %s": [
+         null,
+         "לא ניתן לאמת את %s"
+      ],
+      "%s is a required address, but we cannot verify that you own this address.": [
+         null,
+         "%s היא כתובת נדרשת, אבל איננו יכולים לוודא שהיא שלך."
+      ],
+      "Check your email!": [
+         null,
+         "נא לבדוק את תיבת הדואר האלקטרוני!"
+      ],
+      "We sent a confirmation email to <strong>%s</strong>": [
+         null,
+         "שלחנו הודעת אימות בדואר האלקטרוני אל <strong>%s</strong>"
+      ],
+      "To finish signing in just click the verify link we sent to your email address.": [
+         null,
+         "לסיום הכניסה נא ללחוץ על קישור האימות ששלחנו לכתובת הדואר האלקטרוני שלך."
+      ],
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+         null,
+         "אם זאת טעות, אפשר פשוט להתעלם מהמכתב ששלחנו ו<a href=\"#\" id=\"cancel\">לבטל</a>."
+      ],
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+         null,
+         "אם זאת טעות, אפשר פשוט להתעלם מהמכתב ששלחנו ו<a href=\"#\" id=\"back\">להשתמש בכתובת דואר אלקטרוני אחרת</a>."
+      ],
+      "We are very sorry, the server is under extreme load!": [
+         null,
+         "סליחה, אבל השרת תחת עומס קיצוני!"
+      ],
+      "We are very sorry, there has been an error!": [
+         null,
+         "סליחה, אירעה תקלה!"
+      ],
+      "Please reload the page and try again.": [
+         null,
+         "נא לרענן את הדף ולנסות שוב."
+      ],
+      "Please close this window and try again.": [
+         null,
+         "נא לסגור את החלון ולנסות שוב."
+      ],
+      "See more info": [
+         null,
+         "מידע נוסף"
+      ],
+      "The site requested you sign in using": [
+         null,
+         "האתר ביקש להיכנס באמצעות"
+      ],
+      "reset password": [
+         null,
+         "איפוס ססמה"
+      ],
+      "*%s* is not a valid email address!": [
+         null,
+         "*%s* אינה כתובת דואר אלקטרוני תקינה!"
+      ],
+      "To continue, please close the window and enter a valid address.": [
+         null,
+         "להמשך, נא לסגור את החלון ולזין כתובת תקינה."
+      ],
+      "This is not me...": [
+         null,
+         "זה לא אני..."
+      ],
+      "Use a different email": [
+         null,
+         "נא להשתמש בכתובת דואר אלקטרוני אחרת"
+      ],
+      "Always sign in using this email": [
+         null,
+         "תמיד להיכנס באמצעות הדואר האלקטרוני הזה"
+      ],
+      "Address Verified!": [
+         null,
+         "הכתובת אומתה!"
+      ],
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+         null,
+         "הזהות שלך אומתה מול ספק הדואר האלקטרוני שלך, עכשיו ננסה להכניס אותך."
+      ],
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+         null,
+         "יש להיכנס באמצעות ספק הדואר האלקטרוני שלך כדי לאמת את הבעלות על הכתובת הזאת. החלון הזה יופנה אל"
+      ],
+      "verify": [
+         null,
+         "אימות"
+      ],
+      "Verify With Email Provider": [
+         null,
+         "אימות עם ספק דואר אלקטרוני"
+      ]
+   }
+}
+;
diff --git a/resources/static/i18n/he/messages.json b/resources/static/i18n/he/messages.json
new file mode 100644
index 000000000..730084e43
--- /dev/null
+++ b/resources/static/i18n/he/messages.json
@@ -0,0 +1,191 @@
+;var json_locale_data = {
+   "messages": {
+      "": {
+         "Project-Id-Version": " PACKAGE VERSION",
+         "Report-Msgid-Bugs-To": " ",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-02 18:11+0200",
+         "Last-Translator": " amire80 <amir.aharoni@mail.huji.ac.il>",
+         "Language-Team": " LANGUAGE <LL@li.org>",
+         "Language": " he",
+         "MIME-Version": " 1.0",
+         "Content-Type": " text/plain; charset=UTF-8",
+         "Content-Transfer-Encoding": " 8bit",
+         "Plural-Forms": " nplurals=2; plural=(n != 1);",
+         "X-Generator": " Pootle 2.1.6"
+      },
+      "Complete Login to %s using BrowserID": [
+         null,
+         "השלמת הכניסה אל %s באמצעות BrowserID"
+      ],
+      "Error encountered while attempting to confirm your address. Have you previously verified this address?": [
+         null,
+         "אירעה שגיאה בעת ניסיון לאמת את כתובתך. האם ייתכן שכתובת זו אומתה בעבר?"
+      ],
+      "Error encountered trying to complete registration.": [
+         null,
+         "אירעה שגיאה בעת ניסיון להשלים את הרישום."
+      ],
+      "Finish signing into:": [
+         null,
+         "לסיים כניסה אל:"
+      ],
+      "Email Verification": [
+         null,
+         "אימות דואר אלקטרוני"
+      ],
+      "Email Address": [
+         null,
+         "כתובת דואר אלקטרוני"
+      ],
+      "Your Email": [
+         null,
+         "כתובת הדואר האלקטרוני שלך"
+      ],
+      "New Password": [
+         null,
+         "ססמה חדשה"
+      ],
+      "Enter a Password": [
+         null,
+         "נא להכניס ססמה"
+      ],
+      "Password is required.": [
+         null,
+         "נדרשת ססמה."
+      ],
+      "Password must be between 8 and 80 characters long.": [
+         null,
+         "ססמאות חייבות להיות באורך שבין 8 ל־80 תווים."
+      ],
+      "Verify Password": [
+         null,
+         "אימות ססמה"
+      ],
+      "Repeat Password": [
+         null,
+         "נא לחזור על הססמה"
+      ],
+      "Verification password is required.": [
+         null,
+         "נדרשת ססמת אימות."
+      ],
+      "Passwords do not match.": [
+         null,
+         "אין התאמה בין הססמאות."
+      ],
+      "finish": [
+         null,
+         "סיום"
+      ],
+      "<strong class=\"email\">Your address</strong> has been verified!": [
+         null,
+         "<strong class=\"email\">כתובת הדואר האלקטרוני שלך</strong> אומתה!"
+      ],
+      "Your new address is set up and you should now be signed in. You may now close this window and go back to": [
+         null,
+         "הכתובת החדשה שלך הוגדרה ואם הכול בסדר, נכנסת לחשבון. עכשיו אפשר לסגור את החלון הזה ולחזור אל"
+      ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID דורש עוגיות"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "נא לסגור את החלון, <a %s>להפעיל עוגיות</a> ולנסות שוב"
+      ],
+      "Communicating with server": [
+         null,
+         "מתבצעת תקשורת עם השרת"
+      ],
+      "Just a moment while we talk with the server.": [
+         null,
+         "נא להמתין רק רגע בזמן שאנחנו מדברים עם השרת."
+      ],
+      "BrowserID": [
+         null,
+         "BrowserID"
+      ],
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
+         null,
+         "BrowserID היא הדרך המהירה והמאובטחת להיכנס – <a %s>מידע נוסף</a>"
+      ],
+      "BrowserID: %s": [
+         null,
+         "BrowserID: %s"
+      ],
+      "BrowserID Home": [
+         null,
+         "דף הבית של BrowserId"
+      ],
+      "How it works": [
+         null,
+         "כיצד זה עובד"
+      ],
+      "Developers": [
+         null,
+         "מפתחים"
+      ],
+      "Sign In": [
+         null,
+         "כניסה"
+      ],
+      "Sign Out": [
+         null,
+         "יציאה"
+      ],
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
+         null,
+         "מאת <a %s>צוות זהות</a> של <a %s>מעבדות מוזילה</a>"
+      ],
+      "Privacy": [
+         null,
+         "פרטיות"
+      ],
+      "TOS": [
+         null,
+         "תנאי שימוש"
+      ],
+      "Need Help?": [
+         null,
+         "דרושה לך עזרה?"
+      ],
+      "There was a problem with your signup link. Has this address already been registered?": [
+         null,
+         "הייתה בעיה עם קישור הרישום שלך. האם הכתובת הזאת כבר נרשמה?"
+      ],
+      "Error communicating with server.": [
+         null,
+         "שגיאה בתקשורת עם השרת."
+      ],
+      "Last step!": [
+         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!": [
+         null,
+         "תודה שנרשמת עם <strong>BrowserID</strong>. ניתן מעתה להשתמש בחשבון <strong>BrowserID</strong> שלך כדי <em>להירשם</em> או <em>להיכנס</em> לאתרים בכל רחבי הרשת!"
+      ],
+      "Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.": [
+         null,
+         "תודה על אימות כתובת הדואר האלקטרוני. הודעה זו נשלחה אליך כדי להשלים את כניסתך אל %s."
+      ],
+      "Finish registration by clicking this link:": [
+         null,
+         "נא לסיים את ההרשמה באמצעות לחיצה על הקישור הבא:"
+      ],
+      "If you are NOT trying to sign into this site, just ignore this email.": [
+         null,
+         "אם לא ניסית להיכנס לאתר זה, אפשר להתעלם מהודעה זו."
+      ],
+      "Thanks,": [
+         null,
+         "תודה,"
+      ],
+      "(A better way to sign in)": [
+         null,
+         "(דרך טובה יותר להתחבר לאתרים)"
+      ]
+   }
+}
+;
diff --git a/resources/static/i18n/hr/client.json b/resources/static/i18n/hr/client.json
index 50a4c35ca..eba0e6866 100644
--- a/resources/static/i18n/hr/client.json
+++ b/resources/static/i18n/hr/client.json
@@ -3,359 +3,388 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
-         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-02 18:29+0200",
+         "Last-Translator": " Vedran <vedran.kovacevic@mozilla-hr.org>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " hr",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
-         "X-Generator": " Translate Toolkit 1.9.0"
+         "Plural-Forms": " nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);",
+         "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
-         ""
+         "BrowserID zahtijeva kolačiće"
       ],
-      "Adding Address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         ""
+         "Molimo zatvorite ovaj prozor, <a %s>dozvolite kolačiće</a> i pokušajte ponovno"
       ],
-      "Adding Primary Email Address to User": [
+      "Communication Error": [
          null,
-         ""
+         "Greška pri komunikaciji"
       ],
-      "Checking Address Info": [
+      "Finishing Sign In...": [
          null,
-         ""
+         "Završavanje prijave..."
       ],
-      "Authenticating with Assertion": [
+      "In just a moment you'll be signed into BrowserID.": [
          null,
-         ""
+         "Za koji trenutak bit ćete prijavljeni na BrowserID."
       ],
-      "Cancelling User Account": [
+      "Please wait a few seconds while we sign you into the site.": [
          null,
-         ""
+         "Molimo pričekajte prijavu na stranicu nekoliko sekundi."
       ],
-      "Checking Authentication": [
+      "We are sorry, this request is taking a LOOONG time.": [
          null,
-         ""
+         "Žao nam je, ovaj zahtjev traje JAAAKO dugo."
       ],
-      "Checking Script Version": [
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
          null,
-         ""
+         "Ova poruka će nestati kada se zahtjev završi (nadamo se uskoro). Ako čekate predugo, zatvorite ovaj prozor i pokušajte ponovno."
       ],
-      "Completing User Registration": [
+      "Sign in using": [
          null,
-         ""
+         "Prijavi se koristeći"
       ],
-      "We are sorry, BrowserID requires cookies": [
+      "New email address": [
          null,
-         ""
+         "Nova email adresa"
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
+      "This field must be an email address.": [
          null,
-         ""
+         "U ovo polje potrebno je unijeti email adresu."
       ],
-      "Checking if Cookies are Enabled": [
+      "The email field is required.": [
          null,
-         ""
+         "Email polje je obavezno."
       ],
-      "Creating Account": [
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
          null,
-         ""
+         "Upravo smo poslali email na tu adresu! Ako zaista želite poslati još jedan, pričekajte minutu ili dvije i pokušajte ponovno."
       ],
-      "Getting Assertion": [
+      "That address is already added to your account!": [
          null,
-         ""
+         "Ta adresa je već dodana vašem korisničkom računu!"
       ],
-      "Checking Registration Token": [
+      "add": [
          null,
-         ""
+         "dodaj"
       ],
-      "Checking Email Address": [
+      "cancel": [
          null,
-         ""
+         "odustani"
       ],
-      "Checking Whether User is Authenticated with IdP": [
+      "Email": [
          null,
-         ""
+         "Email"
       ],
-      "Logout Failed": [
+      "Enter your email address to sign in to <strong>%s</strong>": [
          null,
-         ""
+         "Unesite email adresu kako biste se prijavili na <strong>%s</strong>"
       ],
-      "You are offline!": [
+      "Welcome to BrowserID!": [
          null,
-         ""
+         "Dobrodošli u BrowserID!"
       ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
+      "This email looks new, so let's get you set up.": [
          null,
-         ""
+         "Ova email adresa izgleda novo, tako da je prvo moramo postaviti."
       ],
-      "Authenticating with Identity Provider": [
+      "Password": [
          null,
-         ""
+         "Lozinka"
       ],
-      "We had trouble communicating with your email provider, please try again!": [
+      "forgot your password?": [
          null,
-         ""
+         "zaboravili ste lozinku?"
       ],
-      "Provisioning with Identity Provider": [
+      "The password field is required.": [
          null,
-         ""
+         "Polje za lozinku je obavezno."
       ],
-      "Provisioning Unsupported Identity Provider": [
+      "The account cannot be logged in with this username and password.": [
          null,
-         ""
+         "Nije moguće prijaviti se sa ovim korisničkim imenom i lozinkom."
       ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
          null,
-         ""
+         "Klikom na %s, potvrđujuete da prihvaćate <a %s>Uvjete korištenja</a> i <a %s>Pravila privatnosti</a>."
       ],
-      "Registration Failed": [
+      "next": [
          null,
-         ""
+         "sljedeći"
       ],
-      "Establishing Relay": [
+      "verify email": [
          null,
-         ""
+         "potvrdite email"
       ],
-      "Relay frame could not be found": [
+      "sign in": [
          null,
-         ""
+         "prijava"
       ],
-      "Resetting Password": [
+      "Cannot verify %s": [
          null,
-         ""
+         "Nije moguće potvrditi %s"
       ],
-      "Remove Email Address from Account": [
+      "%s is a required address, but we cannot verify that you own this address.": [
          null,
-         ""
+         "%s je potrebna adresa, ali ne možemo potvrditi posjedujete li ovu adresu."
       ],
-      "Setting Password": [
+      "Check your email!": [
          null,
-         ""
+         "Provjerite svoj email!"
       ],
-      "Signin Failed": [
+      "We sent a confirmation email to <strong>%s</strong>": [
          null,
-         ""
+         "Poslali smo mail za potvrdu na <strong>%s</strong>"
       ],
-      "Signup Failed": [
+      "To finish signing in just click the verify link we sent to your email address.": [
          null,
-         ""
+         "Kako biste dovršili prijavu, kliknite na link koji je poslan na Vašu email adresu."
       ],
-      "Syncing Address": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
          null,
-         ""
+         "Ako postoji greška, zanemari poslan mail i <a href=\"#\" id=\"cancel\">odustani</a>."
       ],
-      "Syncing Email Addresses": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          null,
-         ""
+         "Ako postoji greška, zanemari poslan mail i <a href=\"#\" id=\"back\">koristi drugu email adresu</a>."
       ],
-      "Sync Keys for Address": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         ""
+         "Žao nam je, ali poslužitelj je pod velikim opterećenjem!"
       ],
-      "Getting Token Info": [
+      "We are very sorry, there has been an error!": [
          null,
-         ""
+         "Žao nam je, ali došlo je do pogreške!"
       ],
-      "Updating password": [
+      "Please reload the page and try again.": [
          null,
-         ""
+         "Molimo učitajte stranicu iznova i pokušajte ponovno."
       ],
-      "Verifying email address": [
+      "Please close this window and try again.": [
          null,
-         ""
+         "Molimo zatvorite ovaj prozor i pokušajte ponovno."
       ],
-      "Communication Error": [
+      "See more info": [
          null,
-         ""
+         "Vidi više informacija"
       ],
-      "Finishing Sign In...": [
+      "The site requested you sign in using": [
          null,
-         ""
+         "Stranica zahtjeva da se prijavite koristeći"
       ],
-      "In just a moment you'll be signed into BrowserID.": [
+      "reset password": [
          null,
-         ""
+         "restiraj lozinku"
       ],
-      "Please wait a few seconds while we sign you into the site.": [
+      "*%s* is not a valid email address!": [
          null,
-         ""
+         "*%s* nije važeća email adresa!"
       ],
-      "We are sorry, this request is taking a LOOONG time.": [
+      "To continue, please close the window and enter a valid address.": [
          null,
-         ""
+         "Da biste nastavili, molimo Vas da zatvorite prozor i unesete ispravnu adresu."
       ],
-      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+      "This is not me...": [
          null,
-         ""
+         "Ovo nisam ja..."
       ],
-      "Sign in using": [
+      "Use a different email": [
          null,
-         ""
+         "Koristi drugi email"
       ],
-      "New email address": [
+      "Always sign in using this email": [
          null,
-         ""
+         "Uvijek se prijavi koristeći ovaj email"
       ],
-      "This field must be an email address.": [
+      "Address Verified!": [
          null,
-         ""
+         "Adresa potvrđena!"
       ],
-      "The email field is required.": [
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
          null,
-         ""
+         "Vaš identitet je potvrđen s email dobavljačem. Sada ćemo Vas pokušati prijaviti."
       ],
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
          null,
-         ""
+         "Kako biste potvrdili vlasništvo ove adrese, morate se prijaviti sa Vašim email dobavljačem. Ovaj prozor će biti preusmjeren na"
       ],
-      "That address is already added to your account!": [
+      "verify": [
          null,
-         ""
+         "potvrdi"
       ],
-      "add": [
+      "Verify With Email Provider": [
          null,
-         ""
+         "Potvrdi s email dobavljačem"
       ],
-      "cancel": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         ""
+         "#~ \"BrowserID zahtjeva da su Kolačići u vašem pregledniku uključeni kako bi \"#~ \"radio. Molimo uključite Kolačiće u vašem pregledniku i pokušajte ponovno\""
       ],
-      "Email": [
+      "You are offline!": [
          null,
-         ""
+         "Niste povezani na mrežu!"
       ],
-      "Enter your email address to sign in to <strong>%s</strong>": [
+      "Unfortunately, BrowserID cannot communicate while offline!": [
          null,
-         ""
+         "Nažalost, BrowserID ne radi ako niste povezani na mrežu!"
       ],
-      "Welcome to BrowserID!": [
+      "select email": [
          null,
-         ""
+         "odaberite email"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
          null,
-         ""
+         "#~ \"Žao nam je, ali ne možemo komunicirati s BrowserID-om ako niste spojeni \"#~ \"na mrežu.\""
       ],
-      "Password": [
+      "Authenticating User": [
          null,
-         ""
+         "Provjera Korisnika"
       ],
-      "forgot your password?": [
+      "Adding Address": [
          null,
-         ""
+         "Dodavanje adrese"
       ],
-      "The password field is required.": [
+      "Adding Primary Email Address to User": [
          null,
-         ""
+         "Dodavanje primarne email adrese Korisniku"
       ],
-      "The account cannot be logged in with this username and password.": [
+      "Checking Address Info": [
          null,
-         ""
+         "Provjera informacija adrese"
       ],
-      "next": [
+      "Authenticating with Assertion": [
          null,
-         ""
+         "Provjera autentičnosti s tvrdnjom"
       ],
-      "verify email": [
+      "Cancelling User Account": [
          null,
-         ""
+         "Otkazivanje korisničkog računa"
       ],
-      "select email": [
+      "Checking Authentication": [
          null,
-         ""
+         "Provjera autentičnosti"
       ],
-      "Cannot verify %s": [
+      "Checking Script Version": [
          null,
-         ""
+         "Provjera inačice skripte"
       ],
-      "%s is a required address, but we cannot verify that you own this address.": [
+      "Completing User Registration": [
          null,
-         ""
+         "Završavanje registracije Korisnika"
       ],
-      "Check your email!": [
+      "Checking if Cookies are Enabled": [
          null,
-         ""
+         "Provjera jesu li Kolačići uključeni"
       ],
-      "We sent a confirmation email to <strong>%s</strong>": [
+      "Creating Account": [
          null,
-         ""
+         "Stvaranje korisničkog računa"
       ],
-      "To finish signing in just click the verify link we sent to your email address.": [
+      "Getting Assertion": [
          null,
-         ""
+         "Dobivanje tvrdnje"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+      "Checking Registration Token": [
          null,
-         ""
+         "Provjera registracijske oznake"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+      "Checking Email Address": [
          null,
-         ""
+         "Provjera email adrese"
       ],
-      "The site requested you sign in using": [
+      "Checking Whether User is Authenticated with IdP": [
          null,
-         ""
+         "Provjera autentifikacije Korisnika s Dobavljačem Identiteta"
       ],
-      "Reset Password": [
+      "Logout Failed": [
          null,
-         ""
+         "Odjava nije uspjela"
       ],
-      "Cancel": [
+      "Authenticating with Identity Provider": [
          null,
-         ""
+         "Autentifikacija s Dobavljačem Identiteta"
       ],
-      "*%s* is not a valid email address!": [
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
          null,
-         ""
+         "#~ \"Komunikacija s Vašim pružateljem email usluga nije uspjela. Pokušajte \"#~ \"ponovo!\""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "Provisioning with Identity Provider": [
          null,
-         ""
+         "Omogućavanje uporabe Dobavljača Identiteta"
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "Provisioning Unsupported Identity Provider": [
          null,
-         ""
+         "Omogućavanje uporabe nepodržanog Dobavljača Identiteta"
       ],
-      "This is not me...": [
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
          null,
-         ""
+         "#~ \"Nažalost, email adresa koju ste dali ne može poslužiti kao glavni \"#~ \"Dobavljač Identiteta\""
       ],
-      "Use a different email": [
+      "Registration Failed": [
          null,
-         ""
+         "Registracija nije uspjela"
       ],
-      "Always sign in using this email": [
+      "Establishing Relay": [
          null,
-         ""
+         "Uspostavljanje posrednika"
       ],
-      "sign in": [
+      "Relay frame could not be found": [
          null,
-         ""
+         "Blok za posredovanje nije moguće pronaći"
       ],
-      "Address Verified!": [
+      "Resetting Password": [
          null,
-         ""
+         "Resetiranje lozinke"
       ],
-      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+      "Remove Email Address from Account": [
          null,
-         ""
+         "Uklonite email adresu s Vašeg korisničkog računa"
       ],
-      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+      "Setting Password": [
          null,
-         ""
+         "Postavljanje lozinke"
       ],
-      "Verify": [
+      "Signin Failed": [
          null,
-         ""
+         "Prijava nije uspjela"
       ],
-      "Verify With Email Provider": [
+      "Signup Failed": [
+         null,
+         "Registracija nije uspjela"
+      ],
+      "Syncing Address": [
+         null,
+         "Sinkronizacija adrese"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "Sinkronizacija email adresa"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Uskladi ključeve za adrese"
+      ],
+      "Getting Token Info": [
+         null,
+         "Dobivanje informacija o oznakama"
+      ],
+      "Updating password": [
+         null,
+         "Ažuriranje lozinke"
+      ],
+      "Verifying email address": [
+         null,
+         "Provjera email adrese"
+      ],
+      "Cancel": [
          null,
-         ""
+         "Odustani"
       ]
    }
 }
diff --git a/resources/static/i18n/hr/messages.json b/resources/static/i18n/hr/messages.json
index 7ea25aa37..45bcfc541 100644
--- a/resources/static/i18n/hr/messages.json
+++ b/resources/static/i18n/hr/messages.json
@@ -3,179 +3,188 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
-         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-02 18:34+0200",
+         "Last-Translator": " Vedran <vedran.kovacevic@mozilla-hr.org>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " hr",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
-         "X-Generator": " Translate Toolkit 1.9.0"
+         "Plural-Forms": " nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);",
+         "X-Generator": " Pootle 2.1.6"
       },
       "Complete Login to %s using BrowserID": [
          null,
-         ""
+         "Cijela prijava na %s koristeći BrowserID"
       ],
       "Error encountered while attempting to confirm your address. Have you previously verified this address?": [
          null,
-         ""
+         "Pri potvrdi Vaše adrese došlo je do pogreške. Jeste li već potvrdili ovu adresu?"
       ],
       "Error encountered trying to complete registration.": [
          null,
-         ""
+         "Pri dovršenju registracije došlo je do pogreške."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         ""
+         "Završi prijavu na:"
       ],
       "Email Verification": [
          null,
-         ""
+         "Email potvrda"
       ],
       "Email Address": [
          null,
-         ""
+         "Email adresa"
       ],
       "Your Email": [
          null,
-         ""
+         "Vaš email"
       ],
       "New Password": [
          null,
-         ""
+         "Nova lozinka"
       ],
       "Enter a Password": [
          null,
-         ""
+         "Unesi lozinku"
       ],
       "Password is required.": [
          null,
-         ""
+         "Lozinka je potrebna."
       ],
       "Password must be between 8 and 80 characters long.": [
          null,
-         ""
+         "Lozinka mora sadržavati najmanje 8, a najviše 80 znakova."
       ],
       "Verify Password": [
          null,
-         ""
+         "Potvrdi lozinku"
       ],
       "Repeat Password": [
          null,
-         ""
+         "Ponovi lozinku"
       ],
       "Verification password is required.": [
          null,
-         ""
+         "Potrebna je potvrda lozinke."
       ],
       "Passwords do not match.": [
          null,
-         ""
+         "Unesene lozinke se ne podudaraju."
       ],
-      "Finish": [
+      "finish": [
          null,
-         ""
+         "kraj"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
-         ""
+         "<strong class=\"email\">Vaša adresa</strong> je potvrđena!"
       ],
       "Your new address is set up and you should now be signed in. You may now close this window and go back to": [
          null,
-         ""
+         "Vaša nova adresa je postavljena i trebali biste biti prijavljeni. Sada možete zatvoriti ovaj prozor i vratiti se na"
+      ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID zahtijeva kolačiće"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "Molimo zatvorite ovaj prozor, <a %s>omogućite kolačiće</a> i pokušajte ponovno"
       ],
       "Communicating with server": [
          null,
-         ""
+         "Komunikacija s poslužiteljem"
       ],
       "Just a moment while we talk with the server.": [
          null,
-         ""
+         "Samo trenutak dok se ne obavi razgovor s poslužiteljem."
       ],
       "BrowserID": [
          null,
-         ""
+         "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         ""
+         "BrowsedID je brz i siguran način za prijavu &mdash; <a %s>saznajte više</a>"
       ],
       "BrowserID: %s": [
          null,
-         ""
+         "BrowserID: %s"
       ],
       "BrowserID Home": [
          null,
-         ""
+         "BrowserID Početna strana"
       ],
       "How it works": [
          null,
-         ""
+         "Kako radi"
       ],
       "Developers": [
          null,
-         ""
+         "Programeri"
       ],
       "Sign In": [
          null,
-         ""
+         "Prijavi se"
       ],
       "Sign Out": [
          null,
-         ""
+         "Odjavi se"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         ""
+         "Od strane <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
-         ""
+         "Privatnost"
       ],
       "TOS": [
          null,
-         ""
+         "Uvjeti korištenja"
       ],
       "Need Help?": [
          null,
-         ""
+         "Trebate li pomoć?"
       ],
       "There was a problem with your signup link. Has this address already been registered?": [
          null,
-         ""
+         "Došlo je do problema s Vašim linkom za prijavu. Je li ova adresa već registrirana?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
-         ""
+         "Pogreška pri komunikaciji s poslužiteljem."
       ],
       "Last step!": [
          null,
-         ""
+         "Zadnji korak!"
       ],
       "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,
-         ""
+         "Hvala Vam što ste se registrirali na <strong>BrowserID</strong>. Sada možete koristiti svoj <strong>BrowserID</strong> korisnički račun za <em>prijavu</em> ili <em>registraciju</em> na internet stranice širom svijeta!"
       ],
       "Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.": [
          null,
-         ""
+         "Hvala što ste potvrdili Vašu email adresu. Ova poruka bit će Vam poslana da završite s prijavom na %s."
       ],
       "Finish registration by clicking this link:": [
          null,
-         ""
+         "Završite registraciju klikom na ovaj link:"
       ],
       "If you are NOT trying to sign into this site, just ignore this email.": [
          null,
-         ""
+         "Ako se NE pokušavate prijaviti na ovu stranicu, ignorirajte ovaj email."
       ],
       "Thanks,": [
          null,
-         ""
+         "Hvala,"
       ],
       "(A better way to sign in)": [
          null,
-         ""
+         "(Bolji način da se prijavite)"
       ]
    }
 }
diff --git a/resources/static/i18n/hu/client.json b/resources/static/i18n/hu/client.json
new file mode 100644
index 000000000..f98c2ab53
--- /dev/null
+++ b/resources/static/i18n/hu/client.json
@@ -0,0 +1,226 @@
+;var json_locale_data = {
+   "client": {
+      "": {
+         "Project-Id-Version": " PACKAGE VERSION",
+         "Report-Msgid-Bugs-To": " ",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
+         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "Language-Team": " LANGUAGE <LL@li.org>",
+         "Language": " hu",
+         "MIME-Version": " 1.0",
+         "Content-Type": " text/plain; charset=UTF-8",
+         "Content-Transfer-Encoding": " 8bit",
+         "X-Generator": " Translate Toolkit 1.9.0"
+      },
+      "BrowserID requires cookies": [
+         null,
+         ""
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
+      "Communication Error": [
+         null,
+         ""
+      ],
+      "Finishing Sign In...": [
+         null,
+         ""
+      ],
+      "In just a moment you'll be signed into BrowserID.": [
+         null,
+         ""
+      ],
+      "Please wait a few seconds while we sign you into the site.": [
+         null,
+         ""
+      ],
+      "We are sorry, this request is taking a LOOONG time.": [
+         null,
+         ""
+      ],
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+         null,
+         ""
+      ],
+      "Sign in using": [
+         null,
+         ""
+      ],
+      "New email address": [
+         null,
+         ""
+      ],
+      "This field must be an email address.": [
+         null,
+         ""
+      ],
+      "The email field is required.": [
+         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,
+         ""
+      ],
+      "That address is already added to your account!": [
+         null,
+         ""
+      ],
+      "add": [
+         null,
+         ""
+      ],
+      "cancel": [
+         null,
+         ""
+      ],
+      "Email": [
+         null,
+         ""
+      ],
+      "Enter your email address to sign in to <strong>%s</strong>": [
+         null,
+         ""
+      ],
+      "Welcome to BrowserID!": [
+         null,
+         ""
+      ],
+      "This email looks new, so let's get you set up.": [
+         null,
+         ""
+      ],
+      "Password": [
+         null,
+         ""
+      ],
+      "forgot your password?": [
+         null,
+         ""
+      ],
+      "The password field is required.": [
+         null,
+         ""
+      ],
+      "The account cannot be logged in with this username and password.": [
+         null,
+         ""
+      ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         ""
+      ],
+      "next": [
+         null,
+         ""
+      ],
+      "verify email": [
+         null,
+         ""
+      ],
+      "sign in": [
+         null,
+         ""
+      ],
+      "Cannot verify %s": [
+         null,
+         ""
+      ],
+      "%s is a required address, but we cannot verify that you own this address.": [
+         null,
+         ""
+      ],
+      "Check your email!": [
+         null,
+         ""
+      ],
+      "We sent a confirmation email to <strong>%s</strong>": [
+         null,
+         ""
+      ],
+      "To finish signing in just click the verify link we sent to your email address.": [
+         null,
+         ""
+      ],
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+         null,
+         ""
+      ],
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+         null,
+         ""
+      ],
+      "We are very sorry, the server is under extreme load!": [
+         null,
+         ""
+      ],
+      "We are very sorry, there has been an error!": [
+         null,
+         ""
+      ],
+      "Please reload the page and try again.": [
+         null,
+         ""
+      ],
+      "Please close this window and try again.": [
+         null,
+         ""
+      ],
+      "See more info": [
+         null,
+         ""
+      ],
+      "The site requested you sign in using": [
+         null,
+         ""
+      ],
+      "reset password": [
+         null,
+         ""
+      ],
+      "*%s* is not a valid email address!": [
+         null,
+         ""
+      ],
+      "To continue, please close the window and enter a valid address.": [
+         null,
+         ""
+      ],
+      "This is not me...": [
+         null,
+         ""
+      ],
+      "Use a different email": [
+         null,
+         ""
+      ],
+      "Always sign in using this email": [
+         null,
+         ""
+      ],
+      "Address Verified!": [
+         null,
+         ""
+      ],
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+         null,
+         ""
+      ],
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+         null,
+         ""
+      ],
+      "verify": [
+         null,
+         ""
+      ],
+      "Verify With Email Provider": [
+         null,
+         ""
+      ]
+   }
+}
+;
diff --git a/resources/static/i18n/hu/messages.json b/resources/static/i18n/hu/messages.json
new file mode 100644
index 000000000..a3b92be70
--- /dev/null
+++ b/resources/static/i18n/hu/messages.json
@@ -0,0 +1,190 @@
+;var json_locale_data = {
+   "messages": {
+      "": {
+         "Project-Id-Version": " PACKAGE VERSION",
+         "Report-Msgid-Bugs-To": " ",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
+         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "Language-Team": " LANGUAGE <LL@li.org>",
+         "Language": " hu",
+         "MIME-Version": " 1.0",
+         "Content-Type": " text/plain; charset=UTF-8",
+         "Content-Transfer-Encoding": " 8bit",
+         "X-Generator": " Translate Toolkit 1.9.0"
+      },
+      "Complete Login to %s using BrowserID": [
+         null,
+         ""
+      ],
+      "Error encountered while attempting to confirm your address. Have you previously verified this address?": [
+         null,
+         ""
+      ],
+      "Error encountered trying to complete registration.": [
+         null,
+         ""
+      ],
+      "Finish signing into:": [
+         null,
+         ""
+      ],
+      "Email Verification": [
+         null,
+         ""
+      ],
+      "Email Address": [
+         null,
+         ""
+      ],
+      "Your Email": [
+         null,
+         ""
+      ],
+      "New Password": [
+         null,
+         ""
+      ],
+      "Enter a Password": [
+         null,
+         ""
+      ],
+      "Password is required.": [
+         null,
+         ""
+      ],
+      "Password must be between 8 and 80 characters long.": [
+         null,
+         ""
+      ],
+      "Verify Password": [
+         null,
+         ""
+      ],
+      "Repeat Password": [
+         null,
+         ""
+      ],
+      "Verification password is required.": [
+         null,
+         ""
+      ],
+      "Passwords do not match.": [
+         null,
+         ""
+      ],
+      "finish": [
+         null,
+         ""
+      ],
+      "<strong class=\"email\">Your address</strong> has been verified!": [
+         null,
+         ""
+      ],
+      "Your new address is set up and you should now be signed in. You may now close this window and go back to": [
+         null,
+         ""
+      ],
+      "BrowserID requires cookies": [
+         null,
+         ""
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
+      "Communicating with server": [
+         null,
+         ""
+      ],
+      "Just a moment while we talk with the server.": [
+         null,
+         ""
+      ],
+      "BrowserID": [
+         null,
+         ""
+      ],
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
+         null,
+         ""
+      ],
+      "BrowserID: %s": [
+         null,
+         ""
+      ],
+      "BrowserID Home": [
+         null,
+         ""
+      ],
+      "How it works": [
+         null,
+         ""
+      ],
+      "Developers": [
+         null,
+         ""
+      ],
+      "Sign In": [
+         null,
+         ""
+      ],
+      "Sign Out": [
+         null,
+         ""
+      ],
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
+         null,
+         ""
+      ],
+      "Privacy": [
+         null,
+         ""
+      ],
+      "TOS": [
+         null,
+         ""
+      ],
+      "Need Help?": [
+         null,
+         ""
+      ],
+      "There was a problem with your signup link. Has this address already been registered?": [
+         null,
+         ""
+      ],
+      "Error communicating with server.": [
+         null,
+         ""
+      ],
+      "Last step!": [
+         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!": [
+         null,
+         ""
+      ],
+      "Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.": [
+         null,
+         ""
+      ],
+      "Finish registration by clicking this link:": [
+         null,
+         ""
+      ],
+      "If you are NOT trying to sign into this site, just ignore this email.": [
+         null,
+         ""
+      ],
+      "Thanks,": [
+         null,
+         ""
+      ],
+      "(A better way to sign in)": [
+         null,
+         ""
+      ]
+   }
+}
+;
diff --git a/resources/static/i18n/it/client.json b/resources/static/i18n/it/client.json
index 27fddc39b..ee7306127 100644
--- a/resources/static/i18n/it/client.json
+++ b/resources/static/i18n/it/client.json
@@ -3,9 +3,9 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-04 13:06+0200",
-         "Last-Translator": " Francesco <francesco.lodolo@mozillaitalia.org>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-08 12:38+0200",
+         "Last-Translator": " Sandro <gialloporpora@mozillaitalia.org>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " it",
          "MIME-Version": " 1.0",
@@ -14,357 +14,381 @@
          "Plural-Forms": " nplurals=2; plural=(n != 1);",
          "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
-         "Autenticazione utente"
+         "Per utilizzare BrowserID è necessario attivare i cookie"
       ],
-      "Adding Address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "Aggiunta indirizzo"
+         "Chiudi questa finestra, <a %s>abilita i cookie</a> e riprova"
       ],
-      "Adding Primary Email Address to User": [
+      "Communication Error": [
          null,
-         "Aggiunta dell'indirizzo email primario all'utente"
+         "Errore di comunicazione"
       ],
-      "Checking Address Info": [
+      "Finishing Sign In...": [
          null,
-         "Controllo delle informazioni relative all'ndirizzo"
+         "Completamento accesso"
       ],
-      "Authenticating with Assertion": [
+      "In just a moment you'll be signed into BrowserID.": [
          null,
-         "Autenticazione con asserzione"
+         "Entro qualche momento avrai accesso a BrowserID"
       ],
-      "Cancelling User Account": [
+      "Please wait a few seconds while we sign you into the site.": [
          null,
-         "Eliminazione account utente"
+         "Attendi qualche secondo mentre l'accesso al sito viene completato."
       ],
-      "Checking Authentication": [
+      "We are sorry, this request is taking a LOOONG time.": [
          null,
-         "Controllo autenticazione"
+         "Siamo spiacenti, ma questa operazione sta richiedendo un tempo molto lungo."
       ],
-      "Checking Script Version": [
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
          null,
-         "Verifica versione dello script"
+         "Questo messaggio scomparirà quando l'operazione sarà completata (speriamo presto). Se stai attendendo da molto, chiudi questa finestra e prova di nuovo."
       ],
-      "Completing User Registration": [
+      "Sign in using": [
          null,
-         "Completamento della registrazione utente"
+         "Accedi"
       ],
-      "We are sorry, BrowserID requires cookies": [
+      "New email address": [
          null,
-         "Siamo spiacenti ma BrowserID ha bisogno dei cookie"
+         "Nuovo indirizzo email"
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
+      "This field must be an email address.": [
          null,
-         "Per funzionare correttamente BrowserID ha bisogno che la gestione dei cookie sia attivata sul browser. Attivali e riprova"
+         "Il campo deve contenere un indirizzo email."
       ],
-      "Checking if Cookies are Enabled": [
+      "The email field is required.": [
          null,
-         "Verifica dell'attivazione dei cookie"
+         "Il campo email è obbligatorio."
       ],
-      "Creating Account": [
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
          null,
-         "Creazione dell'account"
+         "Abbiamo appena inviato una email a questo indirizzo. Se veramente desideri invarne un'altra, attendi uno o due minuti e prova di nuovo."
       ],
-      "Getting Assertion": [
+      "That address is already added to your account!": [
          null,
-         "Ricezione asserzione"
+         "Questo indirizzo email è stato aggiunto al tuo account."
       ],
-      "Checking Registration Token": [
+      "add": [
          null,
-         "Verifica del token di registrazione"
+         "Aggiungi"
       ],
-      "Checking Email Address": [
+      "cancel": [
          null,
-         "Verifica indirizzo email"
+         "Annulla"
       ],
-      "Checking Whether User is Authenticated with IdP": [
+      "Email": [
          null,
-         "Verifica dell'autenticazione IdP dell'utente"
+         "Email"
       ],
-      "Logout Failed": [
+      "Enter your email address to sign in to <strong>%s</strong>": [
          null,
-         "Disconnessione fallita"
+         "Inserisci il tuo indirizzo email per accedere a <strong>%s</strong>"
       ],
-      "You are offline!": [
+      "Welcome to BrowserID!": [
          null,
-         "Sei scollegato."
+         "Benvenuto in BrowserID"
       ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
+      "This email looks new, so let's get you set up.": [
          null,
-         "Sfortunatamente BrowserID non è in grado di comunicare mentre sei scollegato."
+         "Questo indirizzo email sembra nuovo, perciò cerchiamo di configurarlo."
       ],
-      "Authenticating with Identity Provider": [
+      "Password": [
          null,
-         "Autenticazione con Identity Provider"
+         "Password"
       ],
-      "We had trouble communicating with your email provider, please try again!": [
+      "forgot your password?": [
          null,
-         "Abbiamo riscontrato un problema comunicando con il fornitore della tua email, riprova."
+         "Hai dimenticato la password?"
       ],
-      "Provisioning with Identity Provider": [
+      "The password field is required.": [
          null,
-         "Provisioning con l'Identity Provider"
+         "Il campo password è obbligatorio."
       ],
-      "Provisioning Unsupported Identity Provider": [
+      "The account cannot be logged in with this username and password.": [
          null,
-         "Provisioning Identity Provider non supportato."
+         "Impossibile accedere all'account con questo nome utente e password."
       ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
          null,
-         "Sfortunatamente l'indirizzo email fornito non può funzionare da Identity Provider primario"
+         "Facendo clic su %s confermi di accettare i <a %s>termini d'uso</a> e la <a %s>politica sulla privacy</a> di questo sito."
       ],
-      "Registration Failed": [
+      "next": [
          null,
-         "Registrazione non riuscita"
+         "Avanti"
       ],
-      "Establishing Relay": [
+      "verify email": [
          null,
-         "Creazione delle relazioni"
+         "email di verifica"
       ],
-      "Relay frame could not be found": [
+      "sign in": [
          null,
-         "Impossibile trovare il frame di inoltro"
+         "accedi"
       ],
-      "Resetting Password": [
+      "Cannot verify %s": [
          null,
-         "Reimpostazione password"
+         "Impossibile verificare %s"
       ],
-      "Remove Email Address from Account": [
+      "%s is a required address, but we cannot verify that you own this address.": [
          null,
-         "Rimozione dell'indirizzo email dall'account"
+         "L'indirizzo email %s è obbligatorio, ma non riusciamo a verificare che tu sia il proprietario di questo indirizzo."
       ],
-      "Setting Password": [
+      "Check your email!": [
          null,
-         "Impostazione password"
+         "Controlla la tua posta"
       ],
-      "Signin Failed": [
+      "We sent a confirmation email to <strong>%s</strong>": [
          null,
-         "Accesso non riuscito"
+         "È stata inviata una mail di conferma a <strong>%s</strong>"
       ],
-      "Signup Failed": [
+      "To finish signing in just click the verify link we sent to your email address.": [
          null,
-         "Registrazione non riuscita"
+         "Per completare l'iscrizione fai clic sul link di verifica che è stato inviato al tuo indirizzo email."
       ],
-      "Syncing Address": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
          null,
-         "Sincronizzazione indirizzo"
+         "Se si tratta di un errore, ignora semplicemente l'email inviata e <a href=\"#\" id=\"cancel\">annulla</a>."
       ],
-      "Syncing Email Addresses": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          null,
-         "Sincronizzazione indirizzo email"
+         "Se si tratta di un errore, ignora semplicemente l'email inviata e <a href=\"#\" id=\"back\">usa un altro indirizzo email</a>."
       ],
-      "Sync Keys for Address": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         "Sincronizzazione chiavi per indirizzo"
+         "Siamo spiacenti ma in questo momento il server è sovraccarico."
       ],
-      "Getting Token Info": [
+      "We are very sorry, there has been an error!": [
          null,
-         "Recupero informazioni per il token"
+         "Siamo spiacenti, si è verificato un errore."
       ],
-      "Updating password": [
+      "Please reload the page and try again.": [
          null,
-         "Aggiornamento password"
+         "Ricarica la pagina e riprova."
       ],
-      "Verifying email address": [
+      "Please close this window and try again.": [
          null,
-         "Verifica dell'indirizzo email in corso"
+         "Chiudi questa finestra e riprova."
       ],
-      "Communication Error": [
+      "See more info": [
          null,
-         "Errore di comunicazione"
+         "Ulteriori informazioni"
       ],
-      "Finishing Sign In...": [
+      "The site requested you sign in using": [
          null,
-         "Completamento accesso"
+         "Il sito ha richiesto l'accesso utilizzando"
       ],
-      "In just a moment you'll be signed into BrowserID.": [
+      "reset password": [
          null,
-         "Entro qualche momento avrai accesso a BrowserID"
+         "Reimposta la password"
       ],
-      "Please wait a few seconds while we sign you into the site.": [
+      "*%s* is not a valid email address!": [
          null,
-         "Attendi qualche secondo mentre l'accesso al sito viene completato."
+         "*%s* non è un indirizzo email valido!"
       ],
-      "We are sorry, this request is taking a LOOONG time.": [
+      "To continue, please close the window and enter a valid address.": [
          null,
-         "Siamo spiacenti, ma questa operazione sta richiedendo un tempo molto lungo."
+         "Per continuare chiudi la finestra e inserisci un indirizzo email valido."
       ],
-      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+      "This is not me...": [
          null,
-         "Questo messaggio scomparirà quando l'operazione sarà completata (speriamo presto). Se stai attendendo da molto, chiudi questa finestra e prova di nuovo."
+         "Non sono io…"
       ],
-      "Sign in using": [
+      "Use a different email": [
          null,
-         "Uso dell'accesso"
+         "Usa un altro indirizzo email"
       ],
-      "New email address": [
+      "Always sign in using this email": [
          null,
-         "Nuovo indirizzo email"
+         "Accedi sempre usando questa email"
       ],
-      "This field must be an email address.": [
+      "Address Verified!": [
          null,
-         "Il campo deve contenere un indirizzo email."
+         "Indirizzo verificato."
       ],
-      "The email field is required.": [
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
          null,
-         "Il campo email è obbligatorio."
+         "La tua identità è stata verificata mediante il fornitore della tua email, ora cercheremo di farti accedere."
       ],
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
          null,
-         "Abbiamo appena inviato una email a questo indirizzo. Se veramente desideri invarne un'altra, attendi uno o due minuti e prova di nuovo."
+         "Per confermare la proprietà di questo indirizzo email devi accedere con il fornitore della tua posta. Questa finestra sarà reindirizzata verso"
       ],
-      "That address is already added to your account!": [
+      "verify": [
          null,
-         "Questo indirizzo email è stato aggiunto al tuo account."
+         "Verifica"
       ],
-      "add": [
+      "Verify With Email Provider": [
          null,
-         "aggiungi"
+         "Verifica con fornitore email"
       ],
-      "cancel": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         "annulla"
+         "#~ \"Per funzionare correttamente BrowserID ha bisogno che la gestione dei \"#~ \"cookie sia attivata sul browser. Attivali e riprova\""
       ],
-      "Email": [
+      "You are offline!": [
          null,
-         "Email"
+         "Sei scollegato."
       ],
-      "Enter your email address to sign in to <strong>%s</strong>": [
+      "Unfortunately, BrowserID cannot communicate while offline!": [
          null,
-         "Inserisci il tuo indirizzo email per accedere a <strong>%s</strong>"
+         "#~ \"Sfortunatamente BrowserID non è in grado di comunicare mentre sei \"#~ \"scollegato.\""
       ],
-      "Welcome to BrowserID!": [
+      "select email": [
          null,
-         "Benvenuto in BrowserID"
+         "seleziona email"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
          null,
-         "Questo indirizzo email sembra nuovo, perciò cerchiamo di configurarlo."
+         "#~ \"Siamo spiacenti ma ci è impossibile comunicare con BrowserID mentre sei \"#~ \"scollegato.\""
       ],
-      "Password": [
+      "Authenticating User": [
          null,
-         "Password"
+         "Autenticazione utente"
       ],
-      "forgot your password?": [
+      "Adding Address": [
          null,
-         "Hai dimenticato la password?"
+         "Aggiunta indirizzo"
       ],
-      "The password field is required.": [
+      "Adding Primary Email Address to User": [
          null,
-         "Il campo password è obbligatorio."
+         "Aggiunta dell'indirizzo email primario all'utente"
       ],
-      "The account cannot be logged in with this username and password.": [
+      "Checking Address Info": [
          null,
-         "Impossibile accedere all'account con questo nome utente e password."
+         "Controllo delle informazioni relative all'ndirizzo"
       ],
-      "next": [
+      "Authenticating with Assertion": [
          null,
-         "prossimo"
+         "Autenticazione con asserzione"
       ],
-      "verify email": [
+      "Cancelling User Account": [
          null,
-         "email di verifica"
+         "Eliminazione account utente"
       ],
-      "select email": [
+      "Checking Authentication": [
          null,
-         "seleziona email"
+         "Controllo autenticazione"
       ],
-      "Cannot verify %s": [
+      "Checking Script Version": [
          null,
-         "Impossibile verificare %s"
+         "Verifica versione dello script"
       ],
-      "%s is a required address, but we cannot verify that you own this address.": [
+      "Completing User Registration": [
          null,
-         "L'indirizzo email %s è obbligatorio, ma non riusciamo a verificare che tu sia il proprietario di questo indirizzo."
+         "Completamento della registrazione utente"
       ],
-      "Check your email!": [
+      "Checking if Cookies are Enabled": [
          null,
-         "Controlla la tua posta"
+         "Verifica dell'attivazione dei cookie"
       ],
-      "We sent a confirmation email to <strong>%s</strong>": [
+      "Creating Account": [
          null,
-         "È stata inviata una mail di conferma a <strong>%s</strong>"
+         "Creazione dell'account"
       ],
-      "To finish signing in just click the verify link we sent to your email address.": [
+      "Getting Assertion": [
          null,
-         "Per completare l'iscrizione fai clic sul link di verifica che è stato inviato al tuo indirizzo email."
+         "Ricezione asserzione"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+      "Checking Registration Token": [
          null,
-         "Se si tratta di un errore, ignora semplicemente l'email inviata e <a href=\"#\" id=\"cancel\">annulla</a>."
+         "Verifica del token di registrazione"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+      "Checking Email Address": [
          null,
-         "Se si tratta di un errore, ignora semplicemente l'email inviata e <a href=\"#\" id=\"back\">usa un altro indirizzo email</a>."
+         "Verifica indirizzo email"
       ],
-      "The site requested you sign in using": [
+      "Checking Whether User is Authenticated with IdP": [
          null,
-         "Il sito ha richiesto l'accesso utilizzando"
+         "Verifica dell'autenticazione IdP dell'utente"
       ],
-      "Reset Password": [
+      "Logout Failed": [
          null,
-         "Reimposta la password"
+         "Disconnessione fallita"
       ],
-      "Cancel": [
+      "Authenticating with Identity Provider": [
          null,
-         "Annulla"
+         "Autenticazione con Identity Provider"
       ],
-      "*%s* is not a valid email address!": [
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
          null,
-         "*%s* non è un indirizzo email valido!"
+         "#~ \"Abbiamo riscontrato un problema comunicando con il fornitore della tua \"#~ \"email, riprova.\""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "Provisioning with Identity Provider": [
          null,
-         "Per continuare chiudi la finestra e inserisci un indirizzo email valido."
+         "Provisioning con l'Identity Provider"
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "Provisioning Unsupported Identity Provider": [
          null,
-         "Siamo spiacenti ma ci è impossibile comunicare con BrowserID mentre sei scollegato."
+         "Provisioning Identity Provider non supportato."
       ],
-      "This is not me...": [
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
          null,
-         "Non sono io…"
+         "#~ \"Sfortunatamente l'indirizzo email fornito non può funzionare da Identity \"#~ \"Provider primario\""
       ],
-      "Use a different email": [
+      "Registration Failed": [
          null,
-         "Usa un altro indirizzo email"
+         "Registrazione non riuscita"
       ],
-      "Always sign in using this email": [
+      "Establishing Relay": [
          null,
-         "Accedi sempre usando questa email"
+         "Creazione delle relazioni"
       ],
-      "sign in": [
+      "Relay frame could not be found": [
          null,
-         "accedi"
+         "Impossibile trovare il frame di inoltro"
       ],
-      "Address Verified!": [
+      "Resetting Password": [
          null,
-         "Indirizzo verificato."
+         "Reimpostazione password"
       ],
-      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+      "Remove Email Address from Account": [
          null,
-         "La tua identità è stata verificata mediante il fornitore della tua email, ora cercheremo di farti accedere."
+         "Rimozione dell'indirizzo email dall'account"
       ],
-      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+      "Setting Password": [
          null,
-         "Per confermare la proprietà di questo indirizzo email devi accedere con il fornitore della tua posta. Questa finestra sarà reindirizzata verso"
+         "Impostazione password"
       ],
-      "Verify": [
+      "Signin Failed": [
          null,
-         "Verifica"
+         "Accesso non riuscito"
       ],
-      "Verify With Email Provider": [
+      "Signup Failed": [
          null,
-         "Verifica con fornitore email"
+         "Registrazione non riuscita"
       ],
-      "#~ \"We just sent an email to that address!  If you really want to send \"#~ \"another, wait a minute or two and try again.\"": [
+      "Syncing Address": [
          null,
-         "#~ \"Abbiamo appena inviato una email a questo indirizzo. Se desideri \"#~ \"veramente l'invio di un altro messaggio, attendi un minuto o due e prova \"#~ \"di nuovo.\""
+         "Sincronizzazione indirizzo"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "Sincronizzazione indirizzo email"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Sincronizzazione chiavi per indirizzo"
+      ],
+      "Getting Token Info": [
+         null,
+         "Recupero informazioni per il token"
+      ],
+      "Updating password": [
+         null,
+         "Aggiornamento password"
       ],
-      "This email looks new, so let&apos;s get you set up.": [
+      "Verifying email address": [
+         null,
+         "Verifica dell'indirizzo email in corso"
+      ],
+      "Cancel": [
          null,
-         "Questo indirizzo email sembra nuovo, bisogna configurarlo."
+         "Annulla"
+      ],
+      "#~ \"We just sent an email to that address!  If you really want to send \"#~ \"another, wait a minute or two and try again.\"": [
+         null,
+         "#~ \"Abbiamo appena inviato una email a questo indirizzo. Se desideri \"#~ \"veramente l'invio di un altro messaggio, attendi un minuto o due e prova \"#~ \"di nuovo.\""
       ],
       "#~ \"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,
diff --git a/resources/static/i18n/it/messages.json b/resources/static/i18n/it/messages.json
index caa391831..e31112920 100644
--- a/resources/static/i18n/it/messages.json
+++ b/resources/static/i18n/it/messages.json
@@ -3,9 +3,9 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-04 13:09+0200",
-         "Last-Translator": " Francesco <francesco.lodolo@mozillaitalia.org>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-19 21:51+0200",
+         "Last-Translator": " Sandro <gialloporpora@mozillaitalia.org>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " it",
          "MIME-Version": " 1.0",
@@ -16,7 +16,7 @@
       },
       "Complete Login to %s using BrowserID": [
          null,
-         "Completa la procedura di accesso a %S utilizzando BrowserID"
+         "Completa la procedura di accesso a %s utilizzando BrowserID"
       ],
       "Error encountered while attempting to confirm your address. Have you previously verified this address?": [
          null,
@@ -26,7 +26,7 @@
          null,
          "Si è verificato un errore durante il tentativo di completare la registrazione."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          "Identificazione completata per: "
       ],
@@ -74,7 +74,7 @@
          null,
          "Le password inserite non corrispondono."
       ],
-      "Finish": [
+      "finish": [
          null,
          "Fine"
       ],
@@ -86,6 +86,14 @@
          null,
          "Il tuo nuovo indirizzo è stato impostato e puoi utilizzarlo per l'accesso. Adesso puoi chiudere questa finestra e ritornare a"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "Home BrowserID"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
       "Communicating with server": [
          null,
          "Comunicazione con il server"
@@ -98,7 +106,7 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
          "BrowserID è un modo sicuro e veloce per identificarsi sui siti web &mdash; <a target=\"_blank\" href=\"/about\">per saperne di più</a>"
       ],
@@ -126,7 +134,7 @@
          null,
          "Disconnetti"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
          "Realizzato da <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
       ],
@@ -146,7 +154,7 @@
          null,
          "Si è verificato un problema con il link per l'iscrizione. Avevi già registrato questo indirizzo email?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "Errore durante la connessione con il server."
       ],
diff --git a/resources/static/i18n/ja/client.json b/resources/static/i18n/ja/client.json
index 91f50f7ac..501f8561d 100644
--- a/resources/static/i18n/ja/client.json
+++ b/resources/static/i18n/ja/client.json
@@ -3,359 +3,384 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
-         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-03 14:06+0200",
+         "Last-Translator": " OHZEKI <saneyuki.s.snyk@gmail.com>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " ja",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
-         "X-Generator": " Translate Toolkit 1.9.0"
+         "Plural-Forms": " nplurals=1; plural=0;",
+         "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
-         ""
+         "申し訳ありませんが、BrowserID を利用するには Cookie を有効にする必要があります"
       ],
-      "Adding Address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         ""
+         "このウィンドウを閉じて、<a %s>Cookie を有効にしてから</a>再度試してください。"
       ],
-      "Adding Primary Email Address to User": [
+      "Communication Error": [
          null,
-         ""
+         "通信エラー"
       ],
-      "Checking Address Info": [
+      "Finishing Sign In...": [
          null,
-         ""
+         "ログインが完了しました..."
       ],
-      "Authenticating with Assertion": [
+      "In just a moment you'll be signed into BrowserID.": [
          null,
-         ""
+         "間もなく BrowserID にログインします"
       ],
-      "Cancelling User Account": [
+      "Please wait a few seconds while we sign you into the site.": [
          null,
-         ""
+         "サイトへのログイン処理の間、数秒お待ちください"
       ],
-      "Checking Authentication": [
+      "We are sorry, this request is taking a LOOONG time.": [
          null,
-         ""
+         "申し訳ありません。このリクエストは非常に長い時間がかかっています"
       ],
-      "Checking Script Version": [
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
          null,
-         ""
+         "このメッセージはリクエストが完了した時に消えます (間もなく)。長い時間待っている場合は、このウィンドウを閉じて再び試してください。"
       ],
-      "Completing User Registration": [
+      "Sign in using": [
          null,
-         ""
+         "ログイン情報の選択"
       ],
-      "We are sorry, BrowserID requires cookies": [
+      "New email address": [
          null,
-         ""
+         "新しいメールアドレス"
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
+      "This field must be an email address.": [
          null,
-         ""
+         "この欄にはメールアドレスを入力してください。"
       ],
-      "Checking if Cookies are Enabled": [
+      "The email field is required.": [
          null,
-         ""
+         "メールアドレスの入力が必要です。"
       ],
-      "Creating Account": [
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
          null,
-         ""
+         "このアドレスに確認のメールを送信しました! 他のメールアドレスにしたいときは、数分待ってから再度行ってください。"
       ],
-      "Getting Assertion": [
+      "That address is already added to your account!": [
          null,
-         ""
+         "このアドレスは、すでにあなたのアカウントに追加されています!"
       ],
-      "Checking Registration Token": [
+      "add": [
          null,
-         ""
+         "追加"
       ],
-      "Checking Email Address": [
+      "cancel": [
          null,
-         ""
+         "キャンセル"
       ],
-      "Checking Whether User is Authenticated with IdP": [
+      "Email": [
          null,
-         ""
+         "メールアドレス"
       ],
-      "Logout Failed": [
+      "Enter your email address to sign in to <strong>%s</strong>": [
          null,
-         ""
+         "<strong>%s</strong> へのログインに使うメールアドレスを入力してください"
       ],
-      "You are offline!": [
+      "Welcome to BrowserID!": [
          null,
-         ""
+         "BrowserID にようこそ!"
       ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
+      "This email looks new, so let's get you set up.": [
          null,
-         ""
+         "新しいメールアドレスの場合は、設定を完了してください"
       ],
-      "Authenticating with Identity Provider": [
+      "Password": [
          null,
-         ""
+         "パスワード"
       ],
-      "We had trouble communicating with your email provider, please try again!": [
+      "forgot your password?": [
          null,
-         ""
+         "パスワードを忘れた場合"
       ],
-      "Provisioning with Identity Provider": [
+      "The password field is required.": [
          null,
-         ""
+         "パスワードの入力が必要です。"
       ],
-      "Provisioning Unsupported Identity Provider": [
+      "The account cannot be logged in with this username and password.": [
          null,
-         ""
+         "このユーザ名とパスワードではログインできません。"
       ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
          null,
-         ""
+         "%s をクリックする前に、<a %s>利用規約</a>および<a %s>プライバシーポリシー</a>の確認と同意をお願いします。"
       ],
-      "Registration Failed": [
+      "next": [
          null,
-         ""
+         "次へ"
       ],
-      "Establishing Relay": [
+      "verify email": [
          null,
-         ""
+         "メールアドレスを認証する"
       ],
-      "Relay frame could not be found": [
+      "sign in": [
          null,
-         ""
+         "ログイン"
       ],
-      "Resetting Password": [
+      "Cannot verify %s": [
          null,
-         ""
+         "%s を認証できません"
       ],
-      "Remove Email Address from Account": [
+      "%s is a required address, but we cannot verify that you own this address.": [
          null,
-         ""
+         "%s が要求されたメールアドレスですが、あなたのメールアドレスであると認証できません。"
       ],
-      "Setting Password": [
+      "Check your email!": [
          null,
-         ""
+         "認証用のメールを確認してください"
       ],
-      "Signin Failed": [
+      "We sent a confirmation email to <strong>%s</strong>": [
          null,
-         ""
+         "確認のためのメールを <strong>%s</strong> に送信しました。"
       ],
-      "Signup Failed": [
+      "To finish signing in just click the verify link we sent to your email address.": [
          null,
-         ""
+         "私達から送られてきたメールに記載されている認証用のリンクを開き、登録を完了してください。"
       ],
-      "Syncing Address": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
          null,
-         ""
+         "これが間違いであった場合、送られてきたメールは無視して<a href=\"#\" id=\"cancel\">キャンセル</a>をお願いします。"
       ],
-      "Syncing Email Addresses": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          null,
-         ""
+         "これが間違いであった場合、送られてきたメールを無視して、<a href=\"#\" id=\"back\">別のアドレスを使用してください</a>。"
       ],
-      "Sync Keys for Address": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         ""
+         "申し訳ありません。サーバーが高負荷な状態です。"
       ],
-      "Getting Token Info": [
+      "We are very sorry, there has been an error!": [
          null,
-         ""
+         "申し訳ありません。エラーが発生しました"
       ],
-      "Updating password": [
+      "Please reload the page and try again.": [
          null,
-         ""
+         "ページを再読み込みしてから、もう一度お試しください。"
       ],
-      "Verifying email address": [
+      "Please close this window and try again.": [
          null,
-         ""
+         "一度ウィンドウを閉じて、再び試してください。"
       ],
-      "Communication Error": [
+      "See more info": [
          null,
-         ""
+         "もっと詳しい情報を見る"
       ],
-      "Finishing Sign In...": [
+      "The site requested you sign in using": [
          null,
-         ""
+         "サイトへのログインに使うアドレス"
       ],
-      "In just a moment you'll be signed into BrowserID.": [
+      "reset password": [
          null,
-         ""
+         "パスワードのリセット"
       ],
-      "Please wait a few seconds while we sign you into the site.": [
+      "*%s* is not a valid email address!": [
          null,
-         ""
+         "*%s* は正しいメールアドレスではありません!"
       ],
-      "We are sorry, this request is taking a LOOONG time.": [
+      "To continue, please close the window and enter a valid address.": [
          null,
-         ""
+         "続けるには、ウィンドウを閉じて正しいアドレスを入力してください。"
       ],
-      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+      "This is not me...": [
          null,
-         ""
+         "BrowserID をログアウト"
       ],
-      "Sign in using": [
+      "Use a different email": [
          null,
-         ""
+         "別のメールアドレスをログインに使う"
       ],
-      "New email address": [
+      "Always sign in using this email": [
          null,
-         ""
+         "常にこのメールアドレスをログインに使う"
       ],
-      "This field must be an email address.": [
+      "Address Verified!": [
          null,
-         ""
+         "アドレスが認証されました"
       ],
-      "The email field is required.": [
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
          null,
-         ""
+         "メールプロバイダによって、アドレスの所持者本人であることが認証されました。BrowserID へログインします。"
       ],
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
          null,
-         ""
+         "メールプロバイダにログインし、このアドレスの所持者であることを認証しなければなりません。このウィンドウはリダイレクトされます。"
       ],
-      "That address is already added to your account!": [
+      "verify": [
          null,
-         ""
+         "認証"
       ],
-      "add": [
+      "Verify With Email Provider": [
          null,
-         ""
+         "メールプロバイダによる認証"
       ],
-      "cancel": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         ""
+         "#~ \"BrowserID を利用するには、ブラウザの Cookie を有効にする必要があります。  \"#~ \"ブラウザの設定で Cookie を有効にして再度試してください。\""
       ],
-      "Email": [
+      "You are offline!": [
          null,
-         ""
+         "現在、あなたはオフラインです!"
       ],
-      "Enter your email address to sign in to <strong>%s</strong>": [
+      "Unfortunately, BrowserID cannot communicate while offline!": [
          null,
-         ""
+         "#~ \"申し訳ありませんが、BorwserID はオフラインモードでは利用できません!\""
       ],
-      "Welcome to BrowserID!": [
+      "select email": [
          null,
-         ""
+         "メールアドレスを選ぶ"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
          null,
-         ""
+         "#~ \"申し訳ありません。オフライン状態にあるため BrowserID との通信ができませ\"#~ \"ん。\""
       ],
-      "Password": [
+      "Authenticating User": [
          null,
-         ""
+         "ユーザーを認証しています"
       ],
-      "forgot your password?": [
+      "Adding Address": [
          null,
-         ""
+         "メールアドレスを追加しています"
       ],
-      "The password field is required.": [
+      "Adding Primary Email Address to User": [
          null,
-         ""
+         "ユーザーがメインで使うアドレスを追加しています"
       ],
-      "The account cannot be logged in with this username and password.": [
+      "Checking Address Info": [
          null,
-         ""
+         "メールアドレス情報を確認しています"
       ],
-      "next": [
+      "Authenticating with Assertion": [
          null,
-         ""
+         "検証結果を元に認証しています"
       ],
-      "verify email": [
+      "Cancelling User Account": [
          null,
-         ""
+         "あなたのユーザーアカウントを削除する"
       ],
-      "select email": [
+      "Checking Authentication": [
          null,
-         ""
+         "認証情報を確認しています"
       ],
-      "Cannot verify %s": [
+      "Checking Script Version": [
          null,
-         ""
+         "スクリプトのバージョンを確認しています"
       ],
-      "%s is a required address, but we cannot verify that you own this address.": [
+      "Completing User Registration": [
          null,
-         ""
+         "ユーザーの登録が完了しました"
       ],
-      "Check your email!": [
+      "Checking if Cookies are Enabled": [
          null,
-         ""
+         "Cookie が有効かどうか確認しています"
       ],
-      "We sent a confirmation email to <strong>%s</strong>": [
+      "Creating Account": [
          null,
-         ""
+         "アカウントを作成しています"
       ],
-      "To finish signing in just click the verify link we sent to your email address.": [
+      "Getting Assertion": [
          null,
-         ""
+         "検証結果を取得しています"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+      "Checking Registration Token": [
          null,
-         ""
+         "登録トークンを確認しています"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+      "Checking Email Address": [
          null,
-         ""
+         "メールアドレスを確認しています"
       ],
-      "The site requested you sign in using": [
+      "Checking Whether User is Authenticated with IdP": [
          null,
-         ""
+         "ユーザが ID プロバイダで認証されているか確認しています"
       ],
-      "Reset Password": [
+      "Logout Failed": [
          null,
-         ""
+         "ログアウトに失敗しました"
       ],
-      "Cancel": [
+      "Authenticating with Identity Provider": [
          null,
-         ""
+         "ID プロバイダ と認証しています"
       ],
-      "*%s* is not a valid email address!": [
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
          null,
-         ""
+         "#~ \"あなたのメールプロバイダとの通信に問題が発生しました。もう一度やり直してく\"#~ \"ださい\""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "Provisioning with Identity Provider": [
          null,
-         ""
+         "ID プロバイダ を設定しています"
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "Provisioning Unsupported Identity Provider": [
          null,
-         ""
+         "未サポートの ID プロバイダを設定しています"
       ],
-      "This is not me...": [
+      "Registration Failed": [
          null,
-         ""
+         "登録に失敗しました"
       ],
-      "Use a different email": [
+      "Establishing Relay": [
          null,
-         ""
+         "中継を確立しています"
       ],
-      "Always sign in using this email": [
+      "Relay frame could not be found": [
          null,
-         ""
+         "ログインの中継フレームが見つかりません"
       ],
-      "sign in": [
+      "Resetting Password": [
          null,
-         ""
+         "パスワードをリセットしています"
       ],
-      "Address Verified!": [
+      "Remove Email Address from Account": [
          null,
-         ""
+         "アカウントからメールアドレスを削除する"
       ],
-      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+      "Setting Password": [
          null,
-         ""
+         "パスワードを設定しています"
       ],
-      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+      "Signin Failed": [
          null,
-         ""
+         "ログインに失敗しました"
       ],
-      "Verify": [
+      "Signup Failed": [
          null,
-         ""
+         "サインアップに失敗しました"
       ],
-      "Verify With Email Provider": [
+      "Syncing Address": [
+         null,
+         "アドレスを同期しています"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "メールアドレスを同期しています"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "それぞれのアドレスと対になるキーを同期します"
+      ],
+      "Getting Token Info": [
+         null,
+         "トークン情報を取得しています"
+      ],
+      "Updating password": [
+         null,
+         "パスワードを更新しています"
+      ],
+      "Verifying email address": [
+         null,
+         "メールアドレスを検証しています"
+      ],
+      "Cancel": [
          null,
-         ""
+         "キャンセル"
       ]
    }
 }
diff --git a/resources/static/i18n/ja/messages.json b/resources/static/i18n/ja/messages.json
index b08e31dcf..adb5c63f6 100644
--- a/resources/static/i18n/ja/messages.json
+++ b/resources/static/i18n/ja/messages.json
@@ -3,179 +3,188 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
-         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-03 14:07+0200",
+         "Last-Translator": " OHZEKI <saneyuki.s.snyk@gmail.com>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " ja",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
-         "X-Generator": " Translate Toolkit 1.9.0"
+         "Plural-Forms": " nplurals=1; plural=0;",
+         "X-Generator": " Pootle 2.1.6"
       },
       "Complete Login to %s using BrowserID": [
          null,
-         ""
+         "BrowserID による %s へのログインが完了しました"
       ],
       "Error encountered while attempting to confirm your address. Have you previously verified this address?": [
          null,
-         ""
+         "メールアドレスの確認中にエラーが発生しました。このアドレスは検証済みではありませんか?"
       ],
       "Error encountered trying to complete registration.": [
          null,
-         ""
+         "登録処理中にエラーが発生しました。"
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         ""
+         "右のサイトへのログインが完了しました:"
       ],
       "Email Verification": [
          null,
-         ""
+         "メールの検証"
       ],
       "Email Address": [
          null,
-         ""
+         "メールアドレス"
       ],
       "Your Email": [
          null,
-         ""
+         "あなたのメールアドレス"
       ],
       "New Password": [
          null,
-         ""
+         "新しいパスワード"
       ],
       "Enter a Password": [
          null,
-         ""
+         "パスワードを入力してください"
       ],
       "Password is required.": [
          null,
-         ""
+         "パスワードの入力が必要です。"
       ],
       "Password must be between 8 and 80 characters long.": [
          null,
-         ""
+         "パスワードの長さは 8 文字以上、80 文字以下でなければなりません。"
       ],
       "Verify Password": [
          null,
-         ""
+         "パスワードの検証"
       ],
       "Repeat Password": [
          null,
-         ""
+         "パスワード (確認のため再入力)"
       ],
       "Verification password is required.": [
          null,
-         ""
+         "確認のパスワードの入力が必要です。"
       ],
       "Passwords do not match.": [
          null,
-         ""
+         "パスワードが一致しません。"
       ],
-      "Finish": [
+      "finish": [
          null,
-         ""
+         "登録を完了"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
-         ""
+         "<strong class=\"email\">あなたのメールアドレス</strong>は検証されました!"
       ],
       "Your new address is set up and you should now be signed in. You may now close this window and go back to": [
          null,
-         ""
+         "新たにセットアップされたメールアドレスでログインしてください。このウィンドウを閉じて戻ります: "
+      ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID を使うには Cookie を有効にする必要があります"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "ウィンドウを閉じて、<a %s>Cookie を有効にして</a> もう一度試してください"
       ],
       "Communicating with server": [
          null,
-         ""
+         "サーバと通信しています"
       ],
       "Just a moment while we talk with the server.": [
          null,
-         ""
+         "サーバと通信している間、少々お待ちください。"
       ],
       "BrowserID": [
          null,
-         ""
+         "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         ""
+         "BroserID は速く安全なログイン手段です。&mdash; <a target=\"_blank\" href=\"/about\">詳しくはこちら</a>"
       ],
       "BrowserID: %s": [
          null,
-         ""
+         "BrowserID: %s"
       ],
       "BrowserID Home": [
          null,
-         ""
+         "BrowserID ホーム"
       ],
       "How it works": [
          null,
-         ""
+         "使い方"
       ],
       "Developers": [
          null,
-         ""
+         "開発者向け資料"
       ],
       "Sign In": [
          null,
-         ""
+         "ログイン"
       ],
       "Sign Out": [
          null,
-         ""
+         "ログアウト"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         ""
+         "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
-         ""
+         "プライバシー"
       ],
       "TOS": [
          null,
-         ""
+         "サービス利用規約"
       ],
       "Need Help?": [
          null,
-         ""
+         "ヘルプ"
       ],
       "There was a problem with your signup link. Has this address already been registered?": [
          null,
-         ""
+         "この登録確認用リンクには問題があります。このリンクが届いたメールアドレスは既に登録されていませんか?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
-         ""
+         "サーバとの通信にエラーが発生しました。"
       ],
       "Last step!": [
          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!": [
          null,
-         ""
+         "<strong>BrowserID</strong> のご登録ありがとうございます。あなたの <strong>BrowserID</strong> アカウントを使用して様々な Web サイトに <em>ログイン</em> または <em>アカウント登録</em> できます!"
       ],
       "Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.": [
          null,
-         ""
+         "メールアドレスの登録確認ありがとうございます。このメッセージは %s へのログインを完了するために送信されています。"
       ],
       "Finish registration by clicking this link:": [
          null,
-         ""
+         "登録を完了するには、このリンクをクリックしてください:"
       ],
       "If you are NOT trying to sign into this site, just ignore this email.": [
          null,
-         ""
+         "このメールに心当たりがない場合、何も行わずにこのメールを破棄してください。"
       ],
       "Thanks,": [
          null,
-         ""
+         "登録ありがとうございます。"
       ],
       "(A better way to sign in)": [
          null,
-         ""
+         "ログインのためのより良い方法"
       ]
    }
 }
diff --git a/resources/static/i18n/ko/client.json b/resources/static/i18n/ko/client.json
new file mode 100644
index 000000000..ba2a0e5a7
--- /dev/null
+++ b/resources/static/i18n/ko/client.json
@@ -0,0 +1,387 @@
+;var json_locale_data = {
+   "client": {
+      "": {
+         "Project-Id-Version": " PACKAGE VERSION",
+         "Report-Msgid-Bugs-To": " ",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-18 05:52+0200",
+         "Last-Translator": " Channy <channy@mozilla.or.kr>",
+         "Language-Team": " LANGUAGE <LL@li.org>",
+         "Language": " ko",
+         "MIME-Version": " 1.0",
+         "Content-Type": " text/plain; charset=UTF-8",
+         "Content-Transfer-Encoding": " 8bit",
+         "Plural-Forms": " nplurals=1; plural=0;",
+         "X-Generator": " Pootle 2.1.6"
+      },
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID는 쿠키를 사용을 지정해야 합니다."
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "현재 창을 닫아 주시고, <a %s>쿠키 사용하기</a>를 설정한 후 다시 해 주십시오."
+      ],
+      "Communication Error": [
+         null,
+         "통신 에러"
+      ],
+      "Finishing Sign In...": [
+         null,
+         "로그인 완료 중..."
+      ],
+      "In just a moment you'll be signed into BrowserID.": [
+         null,
+         "곧 BrowserID에 로그인합니다."
+      ],
+      "Please wait a few seconds while we sign you into the site.": [
+         null,
+         "웹 사이트로 로그인 처리 중... 잠시만 기다려 주세요!"
+      ],
+      "We are sorry, this request is taking a LOOONG time.": [
+         null,
+         "죄송합니다. 요청이 너무 오래 걸립니다."
+      ],
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+         null,
+         "요청이 완료되려면 시간이 걸립니다. 만약 너무 오래 기다리시면, 창을 닫고 다시 시도해 주십시오."
+      ],
+      "Sign in using": [
+         null,
+         "로그인 정보 선택"
+      ],
+      "New email address": [
+         null,
+         "새 메일 주소"
+      ],
+      "This field must be an email address.": [
+         null,
+         "이 란에는 메일 주소를 입력해 주세요."
+      ],
+      "The email field is required.": [
+         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,
+         "이 메일 주소로 확인 메일을 송신했습니다! 다른 메일 주소를 사용 하고 싶을 때는몇 분 기다리고 나서 다시 시도해 주십시오."
+      ],
+      "That address is already added to your account!": [
+         null,
+         "이 주소는 이미 여러분의 계정에 추가되었습니다!"
+      ],
+      "add": [
+         null,
+         "추가"
+      ],
+      "cancel": [
+         null,
+         "취소"
+      ],
+      "Email": [
+         null,
+         "메일 주소"
+      ],
+      "Enter your email address to sign in to <strong>%s</strong>": [
+         null,
+         "<strong>%s</strong> 로그인에 사용하는 메일 주소를 입력해 주세요."
+      ],
+      "Welcome to BrowserID!": [
+         null,
+         "BrowserID에 어서 오십시오!"
+      ],
+      "This email looks new, so let's get you set up.": [
+         null,
+         "새로운 메일 주소의 경우, 먼저 설정 해 주십시오."
+      ],
+      "Password": [
+         null,
+         "암호"
+      ],
+      "forgot your password?": [
+         null,
+         "암호 분실"
+      ],
+      "The password field is required.": [
+         null,
+         "암호 입력이 필요합니다."
+      ],
+      "The account cannot be logged in with this username and password.": [
+         null,
+         "현재 사용자명과 암호로 로그인할 수 없습니다."
+      ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         "%s를 누르면, 여러분은 현재 사이트의 <a %s>사용자 약관</a> 및 <a %s>개인 정보 정책</a>에 동의하는 것입니다."
+      ],
+      "next": [
+         null,
+         "다음"
+      ],
+      "verify email": [
+         null,
+         "메일 주소 인증"
+      ],
+      "sign in": [
+         null,
+         "로그인"
+      ],
+      "Cannot verify %s": [
+         null,
+         "%s를 인증할 수 없습니다"
+      ],
+      "%s is a required address, but we cannot verify that you own this address.": [
+         null,
+         "%s 가 요구된 메일 주소이나 자신이 소유한 메일 주소인지 인증하기 어렵습니다."
+      ],
+      "Check your email!": [
+         null,
+         "인증 메일을 확인하십시오!"
+      ],
+      "We sent a confirmation email to <strong>%s</strong>": [
+         null,
+         "인증 확인을 위한 메일을 <strong>%s</strong>에 보냈습니다."
+      ],
+      "To finish signing in just click the verify link we sent to your email address.": [
+         null,
+         "받은 인증 확인 메일에 기재되어 있는 인증용 링크를 클릭하여 등록을 완료해 주시기 바랍니다."
+      ],
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+         null,
+         "만약 실수였을 경우, 보낸 메일은 무시하시고 <a href=\"#\" id=\"cancel\">취소</a>를 선택하세요."
+      ],
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+         null,
+         "만약 실수였을 경우, 보낸 메일은 무시하시고 <a href=\"#\" id=\"back\">다른 이메일 사용</a>를 선택하세요."
+      ],
+      "We are very sorry, the server is under extreme load!": [
+         null,
+         "죄송합니다. 서버에 요청이 많아 처리하기 힘듭니다!"
+      ],
+      "We are very sorry, there has been an error!": [
+         null,
+         "죄송합니다. 무언가 오류가 있네요!"
+      ],
+      "Please reload the page and try again.": [
+         null,
+         "페이지를 새로 고침하고 다시 시도해 주십시오."
+      ],
+      "Please close this window and try again.": [
+         null,
+         "창을 닫고 다시 시도해 주십시오."
+      ],
+      "See more info": [
+         null,
+         "자세히 보기"
+      ],
+      "The site requested you sign in using": [
+         null,
+         "로그인 사용 요청한 웹 사이트"
+      ],
+      "reset password": [
+         null,
+         "암호 재설정"
+      ],
+      "*%s* is not a valid email address!": [
+         null,
+         "*%s*는 올바른 메일 주소가 아닙니다!"
+      ],
+      "To continue, please close the window and enter a valid address.": [
+         null,
+         "계속하려면, 창을 닫고 올바른 메일 주소를 입력해 주세요."
+      ],
+      "This is not me...": [
+         null,
+         "로그아웃"
+      ],
+      "Use a different email": [
+         null,
+         "다른 이메일 사용"
+      ],
+      "Always sign in using this email": [
+         null,
+         "항상 현재 메일 주소를 사용"
+      ],
+      "Address Verified!": [
+         null,
+         "주소가 인증되었습니다!"
+      ],
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+         null,
+         "이메일 주소 제공자로 부터 인증이 확인되었습니다. 이제 등록 절차를 시작합니다."
+      ],
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+         null,
+         "이메일 주소 제공자에 로그인하여 소유권을 확인합니다. 그리고 아래 주소로 다시 돌아갑니다."
+      ],
+      "verify": [
+         null,
+         "인증"
+      ],
+      "Verify With Email Provider": [
+         null,
+         "메일 제공자에 의한 인증"
+      ],
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
+         null,
+         "#~ \"BrowserID 를 이용하려면 , 브라우저의 Cookie 를 유효하게 할 필요가 있습니다.  \"#~ \"브라우저의 설정으로 Cookie 를 유효하게 해 재차 시험해 주세요.\""
+      ],
+      "You are offline!": [
+         null,
+         "오프 라인입니다!"
+      ],
+      "Unfortunately, BrowserID cannot communicate while offline!": [
+         null,
+         "#~ \"죄송합니다만, BorwserID 는 오프 라인 모드에서는 이용할 수 없습니다!\""
+      ],
+      "select email": [
+         null,
+         "메일 주소를 선택한다"
+      ],
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
+         null,
+         "#~ \"죄송합니다.오프 라인 상태에 있기 위해 BrowserID 와의 통신‚ヅ\"#~ \"응.\""
+      ],
+      "Authenticating User": [
+         null,
+         "유저를 인증하고 있습니다"
+      ],
+      "Adding Address": [
+         null,
+         "메일 주소를 추가하고 있습니다"
+      ],
+      "Adding Primary Email Address to User": [
+         null,
+         "유저가 메인에서 사용하는 주소를 추가하고 있습니다"
+      ],
+      "Checking Address Info": [
+         null,
+         "메일 주소 정보를 확인하고 있습니다"
+      ],
+      "Authenticating with Assertion": [
+         null,
+         "검증 결과를 바탕으로 인증하고 있습니다"
+      ],
+      "Cancelling User Account": [
+         null,
+         "당신의 유저 어카운트를 삭제한다"
+      ],
+      "Checking Authentication": [
+         null,
+         "인증 정보를 확인하고 있습니다"
+      ],
+      "Checking Script Version": [
+         null,
+         "스크립트의 버젼을 확인하고 있습니다"
+      ],
+      "Completing User Registration": [
+         null,
+         "유저의 등록이 완료했습니다"
+      ],
+      "Checking if Cookies are Enabled": [
+         null,
+         "Cookie 가 유효할지 확인하고 있습니다"
+      ],
+      "Creating Account": [
+         null,
+         "어카운트를 작성합니다"
+      ],
+      "Getting Assertion": [
+         null,
+         "검증 결과를 취득하고 있습니다"
+      ],
+      "Checking Registration Token": [
+         null,
+         "등록 토큰을 확인하고 있습니다"
+      ],
+      "Checking Email Address": [
+         null,
+         "메일 주소를 확인하고 있습니다"
+      ],
+      "Checking Whether User is Authenticated with IdP": [
+         null,
+         "유저가 ID 프로바이더로 인증되고 있을까 확인하고 있습니다"
+      ],
+      "Logout Failed": [
+         null,
+         "로그아웃에 실패했습니다"
+      ],
+      "Authenticating with Identity Provider": [
+         null,
+         "ID 프로바이더와 인증하고 있습니다"
+      ],
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
+         null,
+         "#~ \"당신의 메일 프로바이더와의 통신에 문제가 발생했습니다.한번 더 다시 해 간다\"#~ \"(이)다 차이\""
+      ],
+      "Provisioning with Identity Provider": [
+         null,
+         "ID 프로바이더를 설정해 있습니다"
+      ],
+      "Provisioning Unsupported Identity Provider": [
+         null,
+         "미서포트의 ID 프로바이더를 설정해 있습니다"
+      ],
+      "Registration Failed": [
+         null,
+         "등록에 실패했습니다"
+      ],
+      "Establishing Relay": [
+         null,
+         "중계를 확립해 있습니다"
+      ],
+      "Relay frame could not be found": [
+         null,
+         "로그인의 중계 프레임이 발견되지 않습니다"
+      ],
+      "Resetting Password": [
+         null,
+         "패스워드를 리셋트 하고 있습니다"
+      ],
+      "Remove Email Address from Account": [
+         null,
+         "어카운트로부터 메일 주소를 삭제한다"
+      ],
+      "Setting Password": [
+         null,
+         "패스워드를 설정해 있습니다"
+      ],
+      "Signin Failed": [
+         null,
+         "로그인에 실패했습니다"
+      ],
+      "Signup Failed": [
+         null,
+         "싸인 업에 실패했습니다"
+      ],
+      "Syncing Address": [
+         null,
+         "주소를 동기 하고 있습니다"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "메일 주소를 동기 하고 있습니다"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "각각의 주소와 대가 되는 키를 동기 합니다"
+      ],
+      "Getting Token Info": [
+         null,
+         "토큰 정보를 취득하고 있습니다"
+      ],
+      "Updating password": [
+         null,
+         "패스워드를 갱신하고 있습니다"
+      ],
+      "Verifying email address": [
+         null,
+         "메일 주소를 검증하고 있습니다"
+      ],
+      "Cancel": [
+         null,
+         "취소"
+      ]
+   }
+}
+;
diff --git a/resources/static/i18n/ko/messages.json b/resources/static/i18n/ko/messages.json
new file mode 100644
index 000000000..fd24b108f
--- /dev/null
+++ b/resources/static/i18n/ko/messages.json
@@ -0,0 +1,191 @@
+;var json_locale_data = {
+   "messages": {
+      "": {
+         "Project-Id-Version": " PACKAGE VERSION",
+         "Report-Msgid-Bugs-To": " ",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-18 05:52+0200",
+         "Last-Translator": " Channy <channy@mozilla.or.kr>",
+         "Language-Team": " LANGUAGE <LL@li.org>",
+         "Language": " ko",
+         "MIME-Version": " 1.0",
+         "Content-Type": " text/plain; charset=UTF-8",
+         "Content-Transfer-Encoding": " 8bit",
+         "Plural-Forms": " nplurals=1; plural=0;",
+         "X-Generator": " Pootle 2.1.6"
+      },
+      "Complete Login to %s using BrowserID": [
+         null,
+         "BrowserID 사용해 %s 로그인 완료"
+      ],
+      "Error encountered while attempting to confirm your address. Have you previously verified this address?": [
+         null,
+         "메일 주소 확인중에 에러가 발생했습니다.이 주소는 검증이 끝난 상태 입니까?"
+      ],
+      "Error encountered trying to complete registration.": [
+         null,
+         "등록 처리중에 에러가 발생했습니다."
+      ],
+      "Finish signing into:": [
+         null,
+         "로그인 완료:"
+      ],
+      "Email Verification": [
+         null,
+         "메일 검증"
+      ],
+      "Email Address": [
+         null,
+         "이메일 주소"
+      ],
+      "Your Email": [
+         null,
+         "이메일 주소"
+      ],
+      "New Password": [
+         null,
+         "새 암호"
+      ],
+      "Enter a Password": [
+         null,
+         "암호 입력"
+      ],
+      "Password is required.": [
+         null,
+         "암호 입력 필수입니다."
+      ],
+      "Password must be between 8 and 80 characters long.": [
+         null,
+         "암호 길이는 8 문자 이상 80 문자 이하여야 합니다."
+      ],
+      "Verify Password": [
+         null,
+         "암호 검증"
+      ],
+      "Repeat Password": [
+         null,
+         "암호 재확인"
+      ],
+      "Verification password is required.": [
+         null,
+         "암호 재입력이 필요합니다."
+      ],
+      "Passwords do not match.": [
+         null,
+         "암호가 일치하지 않습니다."
+      ],
+      "finish": [
+         null,
+         "완료"
+      ],
+      "<strong class=\"email\">Your address</strong> has been verified!": [
+         null,
+         "<strong class=\"email\">메일 주소</strong>는 검증되었습니다!"
+      ],
+      "Your new address is set up and you should now be signed in. You may now close this window and go back to": [
+         null,
+         "새롭게 설정된 메일 주소로 로그인해 주세요.현재 창을 닫고돌아옵니다: "
+      ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID는 쿠키를 필요로 합니다"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "창을 닫고 <a %s>쿠키 사용 허용</a>한 후 다시 시도해 주십시오."
+      ],
+      "Communicating with server": [
+         null,
+         "서버와 통신하고 있는 중"
+      ],
+      "Just a moment while we talk with the server.": [
+         null,
+         "서버와 통신하고 있는 동안 조금 기다려 주세요."
+      ],
+      "BrowserID": [
+         null,
+         "BrowserID"
+      ],
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
+         null,
+         "BroserID는 빠르고 안전한 로그인 수단입니다. &mdash; <a %s>자세히 보기</a>"
+      ],
+      "BrowserID: %s": [
+         null,
+         "BrowserID: %s"
+      ],
+      "BrowserID Home": [
+         null,
+         "BrowserID 첫호면"
+      ],
+      "How it works": [
+         null,
+         "사용법"
+      ],
+      "Developers": [
+         null,
+         "개발자 문서"
+      ],
+      "Sign In": [
+         null,
+         "로그인"
+      ],
+      "Sign Out": [
+         null,
+         "로그아웃"
+      ],
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
+         null,
+         "개발: <a %s>Mozilla Labs</a> <a %s>인증팀</a>"
+      ],
+      "Privacy": [
+         null,
+         "개인 정보 보호 정책"
+      ],
+      "TOS": [
+         null,
+         "서비스 이용 약관"
+      ],
+      "Need Help?": [
+         null,
+         "도움말"
+      ],
+      "There was a problem with your signup link. Has this address already been registered?": [
+         null,
+         "등록 확인용 링크에 문제가 있습니다. 이 링크가 있는 메일 주소는 등록되어 있지 않습니까?"
+      ],
+      "Error communicating with server.": [
+         null,
+         "서버와 통신시에 에러가 발생했습니다."
+      ],
+      "Last step!": [
+         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!": [
+         null,
+         "<strong>BrowserID</strong> 등록을 감사합니다. 여러분이 만드신 <strong>BrowserID</strong> 계정을 사용해 여러 웹 사이트에 <em>로그인</em> 또는 <em>계정 등록</em>을 할 수 있습니다!"
+      ],
+      "Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.": [
+         null,
+         "메일 주소 등록 확인 감사합니다. 이 메세지는 %s  로그인을 완료하기 위해서 전달 되었습니다."
+      ],
+      "Finish registration by clicking this link:": [
+         null,
+         "등록을 완료하려면 이 링크를 클릭해 주세요:"
+      ],
+      "If you are NOT trying to sign into this site, just ignore this email.": [
+         null,
+         "현재 사이트에 등록할 의향이 없는 경우, 이 메일을 무시해 주십시오."
+      ],
+      "Thanks,": [
+         null,
+         "등록 감사합니다."
+      ],
+      "(A better way to sign in)": [
+         null,
+         "(로그인의 또 다른 방법)"
+      ]
+   }
+}
+;
diff --git a/resources/static/i18n/lij/client.json b/resources/static/i18n/lij/client.json
index e25e766aa..5ffa1d91e 100644
--- a/resources/static/i18n/lij/client.json
+++ b/resources/static/i18n/lij/client.json
@@ -3,171 +3,24 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-03 13:54+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-02 17:24+0200",
          "Last-Translator": " Alessio <alessio.gastaldi@libero.it>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " lij",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
+         "Plural-Forms": " nplurals=2; plural=(n != 1);",
          "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
-         null,
-         "Aotenticaçión de l'ùtente"
-      ],
-      "Adding Address": [
-         null,
-         "Azónta de l'indirìsso"
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         "Azónta de l'indirìsso email primâio de l'ùtente."
-      ],
-      "Checking Address Info": [
-         null,
-         "Contròllo de informaçioìn in sce l'indirìsso"
-      ],
-      "Authenticating with Assertion": [
-         null,
-         "Aotenticaçión con l'aserçión"
-      ],
-      "Cancelling User Account": [
-         null,
-         "Scancéllo l'account de l'ùtente"
-      ],
-      "Checking Authentication": [
-         null,
-         "Contròllo l'aotenticaçión"
-      ],
-      "Checking Script Version": [
-         null,
-         "Verìfica a versción do script"
-      ],
-      "Completing User Registration": [
-         null,
-         "Finìscio a registraçión de l'ùtente"
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         "Sémmo dispiaxûi ma o BrowserID o veu i cookie"
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         "Pe fonçionâ bén o BrowserID o l'à bezéugno che ghe ségge a gestión di cookie atîva in sciô navegatô. Atîvali e prêuva tórna"
-      ],
-      "Checking if Cookies are Enabled": [
+      "BrowserID requires cookies": [
          null,
-         "Contròlla se i cookie son atîvi"
-      ],
-      "Creating Account": [
-         null,
-         "Creaçión de l'account"
+         "O BrowserID o veu i cookie"
       ],
-      "Getting Assertion": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "Riceçión de l'aserçión"
-      ],
-      "Checking Registration Token": [
-         null,
-         "Contròllo o token de registraçión"
-      ],
-      "Checking Email Address": [
-         null,
-         "Contròllo l'indirìsso email"
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         "Contòllo se l'ùtente o l'é aotenticòu co-o IdP"
-      ],
-      "Logout Failed": [
-         null,
-         "Disconesción falîa"
-      ],
-      "You are offline!": [
-         null,
-         "Ti ê scolegòu!"
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         "Pe desfortùnn-a o BrowserID o no l'é in gràddo de comunicâ fintànto che t'ê scolegòu."
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         "Aotenticaçión con Identity Provider"
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         "Niâtri émmo atrovòu in problêma inta comonicaçión co-o fornitô da teu email, pe favô prêuva tórna."
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         "Provisioning con l'Identity Provider"
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         "Provisioning Identity Provider no soportòu."
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         "Pe desfortùnn-a l'indirìsso email che ti me dæto o no peu fonçionâ da l'Identity Provider primâio"
-      ],
-      "Registration Failed": [
-         null,
-         "Registraçión no ariêscia"
-      ],
-      "Establishing Relay": [
-         null,
-         "Creaçión de relaçoìn"
-      ],
-      "Relay frame could not be found": [
-         null,
-         "No l'é poscìbile atrovâ o frame d'invîo"
-      ],
-      "Resetting Password": [
-         null,
-         "Reinpòsto a paròlla segrétta"
-      ],
-      "Remove Email Address from Account": [
-         null,
-         "Rimoçión de l'indirìsso email de l'account"
-      ],
-      "Setting Password": [
-         null,
-         "Inpostaçión da paròlla segrétta"
-      ],
-      "Signin Failed": [
-         null,
-         "Acésso no ariêscio"
-      ],
-      "Signup Failed": [
-         null,
-         "Registraçión no ariêscia"
-      ],
-      "Syncing Address": [
-         null,
-         "Sincronizaçión de l'indirìsso"
-      ],
-      "Syncing Email Addresses": [
-         null,
-         "Sincronizaçión de l'indirìsso email"
-      ],
-      "Sync Keys for Address": [
-         null,
-         "Sincronizaçión de ciâvi pe l'indirìsso"
-      ],
-      "Getting Token Info": [
-         null,
-         "Repìggio informaçioìn pe-o token"
-      ],
-      "Updating password": [
-         null,
-         "Agiórno a paròlla segrétta"
-      ],
-      "Verifying email address": [
-         null,
-         "Verìfico l'indirìsso email"
+         "Pe favô særa o barcón, <a %s>abìlita i cookie</a> e prêuva tórna"
       ],
       "Communication Error": [
          null,
@@ -237,9 +90,9 @@
          null,
          "Benvegnûo into BrowserID!"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
-         "St'indirìsso email o pâ nêuvo, dónca provémmo a configorâlo."
+         "St'indirìsso email o pâ nêuvo, dónca configorémmolo"
       ],
       "Password": [
          null,
@@ -257,6 +110,10 @@
          null,
          "Paròlla segrétta ò nómme ùtente sbaliòu."
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         "Sciacàndo %s, t'ê d'acòrdio co-i <a %s>Tèrmini d'ûzo</a> do scîto e-a <a %s>Polìtica da Privacy</a>."
+      ],
       "next": [
          null,
          "pròscimo"
@@ -265,9 +122,9 @@
          null,
          "verìfica email"
       ],
-      "select email": [
+      "sign in": [
          null,
-         "seleçionn-a email"
+         "ìntra"
       ],
       "Cannot verify %s": [
          null,
@@ -291,24 +148,40 @@
       ],
       "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
          null,
-         "Se l'é 'n erô, bàsta che ti ignòri sta email e <a href=\"#\" class=\"cancel\" id=\"back\">t'adêuvi 'n'âtro indirìsso email</a>."
+         "Se l'é 'n erô, bàsta che ti ignòri sta email e <a href=\"#\" id=\"cancel\">t'adêuvi 'n'âtro indirìsso email</a>."
       ],
       "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          null,
-         "Se l'é 'n erô, bàsta che ti ignòri sta email e <a href=\"#\" class=\"cancel\" id=\"back\">t'adêuvi 'n'âtro indirìsso email</a>."
+         "Se l'é 'n erô, bàsta che ti ignòri sta email e <a href=\"#\" id=\"back\">t'adêuvi 'n'âtro indirìsso email</a>."
+      ],
+      "We are very sorry, the server is under extreme load!": [
+         null,
+         "Sémmo despiaxûi, o server o l'é bén bén indafaròu!"
+      ],
+      "We are very sorry, there has been an error!": [
+         null,
+         "Sémmo despiaxûi, gh'é stæto 'n'erô!"
+      ],
+      "Please reload the page and try again.": [
+         null,
+         "Pe favô recaregâ a pàgina e provâ ancón."
+      ],
+      "Please close this window and try again.": [
+         null,
+         "Pe favô særa o barcón e provâ ancón."
+      ],
+      "See more info": [
+         null,
+         "Pe savéine de ciù"
       ],
       "The site requested you sign in using": [
          null,
          "O scîto ol'à domandòu che quande t'ìntri t'ûzi"
       ],
-      "Reset Password": [
+      "reset password": [
          null,
          "Scancélla paròlla segrétta"
       ],
-      "Cancel": [
-         null,
-         "Anùlla"
-      ],
       "*%s* is not a valid email address!": [
          null,
          "*%s* o no l'é 'n'indirìsso email vàlido!"
@@ -317,10 +190,6 @@
          null,
          "Pe continoâ særa o barcón e inserìsci 'n nêuvo indirìsso email ch'o vàdde bén."
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
-         null,
-         "Sémmo despiaxûi, ma niâtri no poémmo comunicâ co-o BrowserID fintànto che ti ê scolegòu."
-      ],
       "This is not me...": [
          null,
          "Sto chi no són mîga mi..."
@@ -333,10 +202,6 @@
          null,
          "Ìntra de lóngo con sta email"
       ],
-      "sign in": [
-         null,
-         "ìntra"
-      ],
       "Address Verified!": [
          null,
          "Indirìsso verificòu!"
@@ -349,7 +214,7 @@
          null,
          "Pe confermâ a propietæ de st'indirìsso email ti dêvi acêde co-o teu fornitô da pòsta. Sto barcón saiâ indirisòu a"
       ],
-      "Verify": [
+      "verify": [
          null,
          "Verìfica"
       ],
@@ -357,13 +222,173 @@
          null,
          "Verìfica co-o fornitô da email"
       ],
-      "#~ \"We just sent an email to that address!  If you really want to send \"#~ \"another, wait a minute or two and try again.\"": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         "#~ \"Niâtri t'émmo mandòu 'na email a st'indirìsso! Se ti t'eu mandâne \"#~ \"'n'âtra, aspêta 'n menûto ò doî e prêuva tórna.\""
+         "#~ \"Pe fonçionâ bén o BrowserID o l'à bezéugno che ghe ségge a gestión di \"#~ \"cookie atîva in sciô navegatô. Atîvali e prêuva tórna\""
+      ],
+      "You are offline!": [
+         null,
+         "Ti ê scolegòu!"
+      ],
+      "Unfortunately, BrowserID cannot communicate while offline!": [
+         null,
+         "#~ \"Pe desfortùnn-a o BrowserID o no l'é in gràddo de comunicâ fintànto che \"#~ \"t'ê scolegòu.\""
+      ],
+      "select email": [
+         null,
+         "seleçionn-a email"
+      ],
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
+         null,
+         "#~ \"Sémmo despiaxûi, ma niâtri no poémmo comunicâ co-o BrowserID fintànto che \"#~ \"ti ê scolegòu.\""
+      ],
+      "Authenticating User": [
+         null,
+         "Aotenticaçión de l'ùtente"
+      ],
+      "Adding Address": [
+         null,
+         "Azónta de l'indirìsso"
+      ],
+      "Adding Primary Email Address to User": [
+         null,
+         "Azónta de l'indirìsso email primâio de l'ùtente."
+      ],
+      "Checking Address Info": [
+         null,
+         "Contròllo de informaçioìn in sce l'indirìsso"
+      ],
+      "Authenticating with Assertion": [
+         null,
+         "Aotenticaçión con l'aserçión"
       ],
-      "This email looks new, so let&apos;s get you set up.": [
+      "Cancelling User Account": [
+         null,
+         "Scancéllo l'account de l'ùtente"
+      ],
+      "Checking Authentication": [
+         null,
+         "Contròllo l'aotenticaçión"
+      ],
+      "Checking Script Version": [
+         null,
+         "Verìfica a versción do script"
+      ],
+      "Completing User Registration": [
+         null,
+         "Finìscio a registraçión de l'ùtente"
+      ],
+      "Checking if Cookies are Enabled": [
+         null,
+         "Contròlla se i cookie son atîvi"
+      ],
+      "Creating Account": [
+         null,
+         "Creaçión de l'account"
+      ],
+      "Getting Assertion": [
+         null,
+         "Riceçión de l'aserçión"
+      ],
+      "Checking Registration Token": [
+         null,
+         "Contròllo o token de registraçión"
+      ],
+      "Checking Email Address": [
+         null,
+         "Contròllo l'indirìsso email"
+      ],
+      "Checking Whether User is Authenticated with IdP": [
+         null,
+         "Contòllo se l'ùtente o l'é aotenticòu co-o IdP"
+      ],
+      "Logout Failed": [
          null,
-         "Sta email a pâ nêuva, coscì làscite registrâ."
+         "Disconesción falîa"
+      ],
+      "Authenticating with Identity Provider": [
+         null,
+         "Aotenticaçión con Identity Provider"
+      ],
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
+         null,
+         "#~ \"Niâtri émmo atrovòu in problêma inta comonicaçión co-o fornitô da teu \"#~ \"email, pe favô prêuva tórna.\""
+      ],
+      "Provisioning with Identity Provider": [
+         null,
+         "Provisioning con l'Identity Provider"
+      ],
+      "Provisioning Unsupported Identity Provider": [
+         null,
+         "Provisioning Identity Provider no soportòu."
+      ],
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
+         null,
+         "#~ \"Pe desfortùnn-a l'indirìsso email che ti me dæto o no peu fonçionâ da \"#~ \"l'Identity Provider primâio\""
+      ],
+      "Registration Failed": [
+         null,
+         "Registraçión no ariêscia"
+      ],
+      "Establishing Relay": [
+         null,
+         "Creaçión de relaçoìn"
+      ],
+      "Relay frame could not be found": [
+         null,
+         "No l'é poscìbile atrovâ o frame d'invîo"
+      ],
+      "Resetting Password": [
+         null,
+         "Reinpòsto a paròlla segrétta"
+      ],
+      "Remove Email Address from Account": [
+         null,
+         "Rimoçión de l'indirìsso email de l'account"
+      ],
+      "Setting Password": [
+         null,
+         "Inpostaçión da paròlla segrétta"
+      ],
+      "Signin Failed": [
+         null,
+         "Acésso no ariêscio"
+      ],
+      "Signup Failed": [
+         null,
+         "Registraçión no ariêscia"
+      ],
+      "Syncing Address": [
+         null,
+         "Sincronizaçión de l'indirìsso"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "Sincronizaçión de l'indirìsso email"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Sincronizaçión de ciâvi pe l'indirìsso"
+      ],
+      "Getting Token Info": [
+         null,
+         "Repìggio informaçioìn pe-o token"
+      ],
+      "Updating password": [
+         null,
+         "Agiórno a paròlla segrétta"
+      ],
+      "Verifying email address": [
+         null,
+         "Verìfico l'indirìsso email"
+      ],
+      "Cancel": [
+         null,
+         "Anùlla"
+      ],
+      "#~ \"We just sent an email to that address!  If you really want to send \"#~ \"another, wait a minute or two and try again.\"": [
+         null,
+         "#~ \"Niâtri t'émmo mandòu 'na email a st'indirìsso! Se ti t'eu mandâne \"#~ \"'n'âtra, aspêta 'n menûto ò doî e prêuva tórna.\""
       ],
       "#~ \"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,
diff --git a/resources/static/i18n/lij/messages.json b/resources/static/i18n/lij/messages.json
index 01533aad3..2a3c8381f 100644
--- a/resources/static/i18n/lij/messages.json
+++ b/resources/static/i18n/lij/messages.json
@@ -3,14 +3,15 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-02 10:11+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-02 17:21+0200",
          "Last-Translator": " Alessio <alessio.gastaldi@libero.it>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " lij",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
+         "Plural-Forms": " nplurals=2; plural=(n != 1);",
          "X-Generator": " Pootle 2.1.6"
       },
       "Complete Login to %s using BrowserID": [
@@ -25,9 +26,9 @@
          null,
          "S'é verificòu 'n'erô into conpletâ a registraçión."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         "Identificaçión conpletâ pe: "
+         "Identificaçión conpletâ pe:"
       ],
       "Email Verification": [
          null,
@@ -73,7 +74,7 @@
          null,
          "E paròlle segrétte no corispóndan."
       ],
-      "Finish": [
+      "finish": [
          null,
          "Fìn"
       ],
@@ -85,6 +86,14 @@
          null,
          "O teu nêuvo indirìsso o l'é stæto scistemòu e ti peu adêuviâlo pe acêde. Òua ti peu serâ sto barcón e tornâ a"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "O BrowserID o domànda i cookie"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "Pe favô særa o barcón, <a %s>abìlita i cookie</a> e prêuva tórna"
+      ],
       "Communicating with server": [
          null,
          "Comunicaçión co-o server"
@@ -97,9 +106,9 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         "BrowserID o l'è in mòddo segûo e velôce pe identificâse in sci scîti da ræ &mdash; <a target=\"_blank\" href=\"/about\">pe savéine de ciù</a>"
+         "BrowserID o l'è in mòddo segûo e velôce pe identificâse &mdash; <a target=\"_blank\" href=\"/about\">pe savéine de ciù</a>"
       ],
       "BrowserID: %s": [
          null,
@@ -125,9 +134,9 @@
          null,
          "Sciòrti"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         "Fæto da <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
+         "Fæto da <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
@@ -143,9 +152,9 @@
       ],
       "There was a problem with your signup link. Has this address already been registered?": [
          null,
-         "S'é verificòu un problêma co-o colegaménto pe l'iscriçión.  T'àivi za registròu st'indirìsso email?"
+         "S'é verificòu un problêma co-o colegaménto pe l'iscriçión. T'àivi za registròu st'indirìsso email?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "Erô inta conesción co-o server."
       ],
@@ -159,7 +168,7 @@
       ],
       "Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.": [
          null,
-         ""
+         "Gràçie de avéi verificòu o teu indirìsso email. Sta notìçia a t'é stæta spédia pe conpletâ a teu registraçión a %s."
       ],
       "Finish registration by clicking this link:": [
          null,
diff --git a/resources/static/i18n/lt/client.json b/resources/static/i18n/lt/client.json
index e7f6b0953..7ec31e111 100644
--- a/resources/static/i18n/lt/client.json
+++ b/resources/static/i18n/lt/client.json
@@ -3,359 +3,372 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
-         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-24 17:12+0200",
+         "Last-Translator": " Rimas <rq@akl.lt>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " lt",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
-         "X-Generator": " Translate Toolkit 1.9.0"
+         "Plural-Forms": " nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);",
+         "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
-         ""
+         "Atsiprašome, bet „BrowserID“ veikimui būtini slapukai"
       ],
-      "Adding Address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
          ""
       ],
-      "Adding Primary Email Address to User": [
+      "Communication Error": [
          null,
-         ""
+         "Ryšio klaida"
       ],
-      "Checking Address Info": [
+      "Finishing Sign In...": [
          null,
-         ""
+         "Prisijungimas užbaigiamas…"
       ],
-      "Authenticating with Assertion": [
+      "In just a moment you'll be signed into BrowserID.": [
          null,
-         ""
+         "Už kelių akimirkų būsite prijungti prie „BrowserID“."
       ],
-      "Cancelling User Account": [
+      "Please wait a few seconds while we sign you into the site.": [
          null,
-         ""
+         "Luktelėkite keletą sekundžių, kol būsite prijungti prie svetainės."
       ],
-      "Checking Authentication": [
+      "We are sorry, this request is taking a LOOONG time.": [
          null,
-         ""
+         "Atsiprašome, ši užklausa trunka gerooookai ilgiau nei turėtų."
       ],
-      "Checking Script Version": [
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
          null,
-         ""
+         "Šis pranešimas turėtų išnykti, įvykdžius užklausą (tikimės, jog netrukus). Jeigu manote, jog laukiate jau per ilgai, užverkite šį langą ir bandykite iš naujo."
       ],
-      "Completing User Registration": [
+      "Sign in using": [
          null,
-         ""
+         "Prisijungti naudojant"
       ],
-      "We are sorry, BrowserID requires cookies": [
+      "New email address": [
          null,
-         ""
+         "Naujas el. pašto adresas"
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
+      "This field must be an email address.": [
          null,
-         ""
+         "Šio lauko reikšmė turi būti el. pašto adresas."
       ],
-      "Checking if Cookies are Enabled": [
+      "The email field is required.": [
          null,
-         ""
+         "El. paštą nurodyti būtina."
       ],
-      "Creating Account": [
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
          null,
-         ""
+         "Šiuo adresu ką tik jau išsiuntėme laišką! Jeigu tikrai norite, kad išsiųstume dar vieną, luktelėkite porą minučių ir bandykite vėl."
       ],
-      "Getting Assertion": [
+      "That address is already added to your account!": [
          null,
-         ""
+         "Šis adresas jau pridėtas į Jūsų paskyrą!"
       ],
-      "Checking Registration Token": [
+      "add": [
          null,
-         ""
+         "pridÄ—ti"
       ],
-      "Checking Email Address": [
+      "cancel": [
          null,
-         ""
+         "atsisakyti"
       ],
-      "Checking Whether User is Authenticated with IdP": [
+      "Email": [
          null,
-         ""
+         "El. paštas"
       ],
-      "Logout Failed": [
+      "Enter your email address to sign in to <strong>%s</strong>": [
          null,
-         ""
+         "Įveskite savo el. pašto adresą, kad prisijungtumėte prie <strong>%s</strong>"
       ],
-      "You are offline!": [
+      "Welcome to BrowserID!": [
          null,
-         ""
+         "Sveiki! Čia – „BrowserID“!"
       ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
+      "This email looks new, so let's get you set up.": [
          null,
-         ""
+         "Šis el. pašto adresas mums atrodo naujas, tad pirmiausia sukonfigūruokime Jūsų paskyrą."
       ],
-      "Authenticating with Identity Provider": [
+      "Password": [
          null,
-         ""
+         "Slaptažodis"
       ],
-      "We had trouble communicating with your email provider, please try again!": [
+      "forgot your password?": [
          null,
-         ""
+         "Užmiršote slaptažodį?"
       ],
-      "Provisioning with Identity Provider": [
+      "The password field is required.": [
          null,
-         ""
+         "Slaptažodį įvesti būtina."
       ],
-      "Provisioning Unsupported Identity Provider": [
+      "The account cannot be logged in with this username and password.": [
          null,
-         ""
+         "Prisijungti prie paskyros su šiuo naudotojo vardu ir slaptažodžiu negalima."
       ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
          null,
          ""
       ],
-      "Registration Failed": [
+      "next": [
          null,
-         ""
+         "toliau"
       ],
-      "Establishing Relay": [
+      "verify email": [
          null,
-         ""
+         "patvirtinkite el. pašto adresą"
       ],
-      "Relay frame could not be found": [
+      "sign in": [
          null,
-         ""
+         "prisijungti"
       ],
-      "Resetting Password": [
+      "Cannot verify %s": [
          null,
-         ""
+         "Nepavyko patvirtinti %s"
       ],
-      "Remove Email Address from Account": [
+      "%s is a required address, but we cannot verify that you own this address.": [
          null,
-         ""
+         "Adresas %s yra būtinas, tačiau mums nepavyko patvirtinti, jog jis priklauso Jums."
       ],
-      "Setting Password": [
+      "Check your email!": [
          null,
-         ""
+         "Pasitikrinkite savo el. paštą!"
       ],
-      "Signin Failed": [
+      "We sent a confirmation email to <strong>%s</strong>": [
          null,
-         ""
+         "Adresu <strong>%s</strong> mes išsiuntėme patvirtinimo laišką."
       ],
-      "Signup Failed": [
+      "To finish signing in just click the verify link we sent to your email address.": [
          null,
-         ""
+         "Kad užbaigtumėte registraciją, tiesiog atverkite Jums el. paštu išsiųstą el. pašto patvirtinimo saitą."
       ],
-      "Syncing Address": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
          null,
-         ""
+         "Jeigu tai klaida, galite tiesiog nepaisyti išsiųsto laiško ir <a href=\"#\" id=\"cancel\">nutraukti registraciją</a>."
       ],
-      "Syncing Email Addresses": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          null,
-         ""
+         "Jeigu tai klaida, galite tiesiog nepaisyti išsiųsto laiško ir <a href=\"#\" id=\"cancel\">nurodyti kitą el. pašto adresą</a>."
       ],
-      "Sync Keys for Address": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         ""
+         "Apgailestaujame, serveris Å¡iuo metu perkrautas!"
       ],
-      "Getting Token Info": [
+      "We are very sorry, there has been an error!": [
          null,
-         ""
+         "Apgailestaujame, tačiau įvyko klaida!"
       ],
-      "Updating password": [
+      "Please reload the page and try again.": [
          null,
-         ""
+         "Norėdami bandyti dar kartą, įkelkite šį tinklalapį iš naujo."
       ],
-      "Verifying email address": [
+      "Please close this window and try again.": [
          null,
-         ""
+         "Norėdami bandyti dar kartą, užverkite šį langą."
       ],
-      "Communication Error": [
+      "See more info": [
          null,
-         ""
+         "IÅ¡samesnÄ— informacija"
       ],
-      "Finishing Sign In...": [
+      "The site requested you sign in using": [
          null,
-         ""
+         "Svetainė prašo prisijungti naudojant"
       ],
-      "In just a moment you'll be signed into BrowserID.": [
+      "reset password": [
          null,
-         ""
+         "perkurti slaptažodį"
       ],
-      "Please wait a few seconds while we sign you into the site.": [
+      "*%s* is not a valid email address!": [
          null,
-         ""
+         "*%s* nėra leistinas el. pašto adresas!"
       ],
-      "We are sorry, this request is taking a LOOONG time.": [
+      "To continue, please close the window and enter a valid address.": [
          null,
-         ""
+         "Jeigu norite tęsti, užverkite šį langą ir įveskite galiojantį el. pašto adresą."
       ],
-      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+      "This is not me...": [
          null,
-         ""
+         "Tai ne aš…"
       ],
-      "Sign in using": [
+      "Use a different email": [
          null,
-         ""
+         "Naudoti kitą el. pašto adresą"
       ],
-      "New email address": [
+      "Always sign in using this email": [
          null,
-         ""
+         "Visuomet prisijungti naudojantis šiuo el. pašto adresu"
       ],
-      "This field must be an email address.": [
+      "Address Verified!": [
          null,
-         ""
+         "Adresas patvirtintas!"
       ],
-      "The email field is required.": [
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
          null,
-         ""
+         "Jūsų tapatybė patvirtinta el. pašto teikėjo. Dabar pabandysime Jus prijungti."
       ],
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
          null,
-         ""
+         "Kad patvirtintumėte, jog šis adresas priklauso Jums, turėsite prisijungti prie savo el. pašto paslaugos teikėjo. Šis langas netrukus bus nukreiptas adresu"
       ],
-      "That address is already added to your account!": [
+      "verify": [
          null,
-         ""
+         "patvirtinti"
       ],
-      "add": [
+      "Verify With Email Provider": [
          null,
-         ""
+         "Patvirtinti per pašto paslaugos teikėją"
       ],
-      "cancel": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         ""
+         "#~ \"Kad „BrowserID“ veiktų, naršyklėje turi būti įgalinti slapukai. \"#~ \"Įgalinkite slapukus savo naršyklėje ir bandykite dar kartą.\""
       ],
-      "Email": [
+      "You are offline!": [
          null,
-         ""
+         "JÅ«s nesate prisijungÄ™ prie tinklo!"
       ],
-      "Enter your email address to sign in to <strong>%s</strong>": [
+      "Unfortunately, BrowserID cannot communicate while offline!": [
          null,
-         ""
+         "#~ \"Deja, „BrowserID“ tarnyba negali būti naudojama atsijungus nuo tinklo!\""
       ],
-      "Welcome to BrowserID!": [
+      "select email": [
          null,
-         ""
+         "išsirinkite el. pašto adresą"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
          null,
-         ""
+         "#~ \"Apgailestaujame, bet susisiekti su „BrowserID“, kol nesate prisijungę \"#~ \"prie tinklo, negalima.\""
       ],
-      "Password": [
+      "Authenticating User": [
          null,
-         ""
+         "Nustatoma naudotojo tapatybÄ—"
       ],
-      "forgot your password?": [
+      "Adding Address": [
          null,
-         ""
+         "Pridedamas adresas"
       ],
-      "The password field is required.": [
+      "Adding Primary Email Address to User": [
          null,
-         ""
+         "Pridedamas pagrindinis naudotojo el. pašto adresas"
       ],
-      "The account cannot be logged in with this username and password.": [
+      "Checking Address Info": [
          null,
-         ""
+         "Tikrinama adreso informacija"
       ],
-      "next": [
+      "Authenticating with Assertion": [
          null,
-         ""
+         "Su patvirtinimu nustatoma tapatybÄ—"
       ],
-      "verify email": [
+      "Cancelling User Account": [
          null,
-         ""
+         "Anuliuojama naudotojo paskyra"
       ],
-      "select email": [
+      "Checking Authentication": [
          null,
-         ""
+         "Tikrinamas tapatybÄ—s nustatymas"
       ],
-      "Cannot verify %s": [
+      "Checking Script Version": [
          null,
-         ""
+         "Tikrinama scenarijaus versija"
       ],
-      "%s is a required address, but we cannot verify that you own this address.": [
+      "Completing User Registration": [
          null,
-         ""
+         "Užbaigiama naudotojo registracija"
       ],
-      "Check your email!": [
+      "Checking if Cookies are Enabled": [
          null,
-         ""
+         "Tikrinama, ar įgalinti slapukai"
       ],
-      "We sent a confirmation email to <strong>%s</strong>": [
+      "Creating Account": [
          null,
-         ""
+         "Kuriama paskyra"
       ],
-      "To finish signing in just click the verify link we sent to your email address.": [
+      "Getting Assertion": [
          null,
-         ""
+         "Gaunamas patvirtinimas"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+      "Checking Registration Token": [
          null,
-         ""
+         "Tikrinamas registracijos prieigos raktas"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+      "Checking Email Address": [
          null,
-         ""
+         "Tikrinamas el. pašto adresas"
       ],
-      "The site requested you sign in using": [
+      "Checking Whether User is Authenticated with IdP": [
          null,
-         ""
+         "Tikrinama, ar naudotojo tapatybÄ— nustatyta per tapatybÄ—s teikÄ—jÄ…"
       ],
-      "Reset Password": [
+      "Logout Failed": [
          null,
-         ""
+         "Atsijungti nepavyko"
       ],
-      "Cancel": [
+      "Authenticating with Identity Provider": [
          null,
-         ""
+         "Nustatoma tapatybÄ— per tapatybÄ—s teikÄ—jÄ…"
       ],
-      "*%s* is not a valid email address!": [
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
          null,
-         ""
+         "#~ \"Susisiekiant su Jūsų el. pašto paslaugos teikėju, įvyko klaida, Bandykite \"#~ \"dar kartą!\""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
          null,
-         ""
+         "#~ \"Deja, pateiktas el. pašto adresas negali būti naudojamas kaip pagrindinis \"#~ \"tapatybės teikėjas\""
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "Registration Failed": [
          null,
-         ""
+         "Registracija nepavyko"
       ],
-      "This is not me...": [
+      "Resetting Password": [
          null,
-         ""
+         "Perkuriamas slaptažodis"
       ],
-      "Use a different email": [
+      "Remove Email Address from Account": [
          null,
-         ""
+         "Pašalinti el. pašto adresą iš paskyros"
       ],
-      "Always sign in using this email": [
+      "Setting Password": [
          null,
-         ""
+         "Nustatomas slaptažodis"
       ],
-      "sign in": [
+      "Signin Failed": [
          null,
-         ""
+         "Prisijungti nepavyko"
       ],
-      "Address Verified!": [
+      "Signup Failed": [
          null,
-         ""
+         "Užsiregistruoti nepavyko"
       ],
-      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+      "Syncing Address": [
          null,
-         ""
+         "Sinchronizuojamas adresas"
       ],
-      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+      "Syncing Email Addresses": [
          null,
-         ""
+         "Sinchronizuojami el. pašto adresai"
       ],
-      "Verify": [
+      "Sync Keys for Address": [
          null,
-         ""
+         "Sinchronizuoti adreso raktus"
       ],
-      "Verify With Email Provider": [
+      "Getting Token Info": [
          null,
-         ""
+         "Gaunama prieigos rakto informacija"
+      ],
+      "Updating password": [
+         null,
+         "Keičiamas slaptažodis"
+      ],
+      "Verifying email address": [
+         null,
+         "Patvirtinamas slaptažodis"
+      ],
+      "Cancel": [
+         null,
+         "Atsisakyti"
       ]
    }
 }
diff --git a/resources/static/i18n/lt/messages.json b/resources/static/i18n/lt/messages.json
index dddb7dce6..5671f967a 100644
--- a/resources/static/i18n/lt/messages.json
+++ b/resources/static/i18n/lt/messages.json
@@ -3,179 +3,188 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
-         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-24 14:30+0200",
+         "Last-Translator": " Rimas <rq@akl.lt>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " lt",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
-         "X-Generator": " Translate Toolkit 1.9.0"
+         "Plural-Forms": " nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);",
+         "X-Generator": " Pootle 2.1.6"
       },
       "Complete Login to %s using BrowserID": [
          null,
-         ""
+         "Užbaikite prisijungimą prie %s, naudodamiesi „BrowserID“"
       ],
       "Error encountered while attempting to confirm your address. Have you previously verified this address?": [
          null,
-         ""
+         "Bandant patvirtinti Jūsų el. pašto adresą, įvyko klaida. Ar šį adresą jau esate patvirtinę?"
       ],
       "Error encountered trying to complete registration.": [
          null,
-         ""
+         "Bandant užbaigti registraciją, įvyko klaida."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         ""
+         "Užbaigti prisijungimą prie: "
       ],
       "Email Verification": [
          null,
-         ""
+         "El. pašto adreso patvirtinimas"
       ],
       "Email Address": [
          null,
-         ""
+         "El. pašto adresas"
       ],
       "Your Email": [
          null,
-         ""
+         "Jūsų el. pašto adresas"
       ],
       "New Password": [
          null,
-         ""
+         "Naujasis slaptažodis"
       ],
       "Enter a Password": [
          null,
-         ""
+         "Įveskite slaptažodį"
       ],
       "Password is required.": [
          null,
-         ""
+         "Slaptažodį įvesti privaloma."
       ],
       "Password must be between 8 and 80 characters long.": [
          null,
-         ""
+         "Slaptažodis turi būti nuo 8 iki 80 simbolių ilgio."
       ],
       "Verify Password": [
          null,
-         ""
+         "Patvirtinkite slaptažodį"
       ],
       "Repeat Password": [
          null,
-         ""
+         "Pakartokite slaptažodį"
       ],
       "Verification password is required.": [
          null,
-         ""
+         "Slaptažodį patvirtinti būtina."
       ],
       "Passwords do not match.": [
          null,
-         ""
+         "Slaptažodžiai nesutampa."
       ],
-      "Finish": [
+      "finish": [
          null,
-         ""
+         "užbaigti"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
-         ""
+         "<strong class=\"email\">Jūsų adresas</strong> patvirtintas!"
       ],
       "Your new address is set up and you should now be signed in. You may now close this window and go back to": [
+         null,
+         "Jūsų naujasis adresas sukonfigūruotas ir dabar turėtumėte būti prisijungę. Dabar galite užverti šį langą ir grįžti į"
+      ],
+      "BrowserID requires cookies": [
+         null,
+         "„BrowserID“ pradžios tinklalapis"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
          ""
       ],
       "Communicating with server": [
          null,
-         ""
+         "Susisiekiama su serveriu"
       ],
       "Just a moment while we talk with the server.": [
          null,
-         ""
+         "LuktelÄ—kite, kol bus susisiekta su serveriu."
       ],
       "BrowserID": [
          null,
-         ""
+         "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         ""
+         "„BrowserID“ yra spartus ir saugus būdas prisijungti prie svetainių &mdash; <a target=\"_blank\" href=\"/about\">plačiau…</a>"
       ],
       "BrowserID: %s": [
          null,
-         ""
+         "BrowserID: %s"
       ],
       "BrowserID Home": [
          null,
-         ""
+         "„BrowserID“ pradžios tinklalapis"
       ],
       "How it works": [
          null,
-         ""
+         "Kaip tai veikia"
       ],
       "Developers": [
          null,
-         ""
+         "Programuotojams"
       ],
       "Sign In": [
          null,
-         ""
+         "Prisijungti"
       ],
       "Sign Out": [
          null,
-         ""
+         "Atsijungti"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         ""
+         "Sukurta <a href=\"%s\" target=\"_blank\">asmens tapatybės komandos</a> prie <a href=\"%s\" target=\"_blank\">„Mozilla Labs“</a> projekto"
       ],
       "Privacy": [
          null,
-         ""
+         "Privatumas"
       ],
       "TOS": [
          null,
-         ""
+         "Paslaugos teikimo nuostatai"
       ],
       "Need Help?": [
          null,
-         ""
+         "Reikia pagalbos?"
       ],
       "There was a problem with your signup link. Has this address already been registered?": [
          null,
-         ""
+         "Su Jūsų registracijos nuoroda iškilo problemų. Gal šis adresas jau buvo užregistruotas?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
-         ""
+         "Klaida susisiekiant su serveriu."
       ],
       "Last step!": [
          null,
-         ""
+         "Paskutinis žingsnis!"
       ],
       "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,
-         ""
+         "Dėkojame, kad naudojatės <strong>„BrowserID“</strong>. Dabar galite naudotis savo <strong>„BrowserID“</strong> paskyra <em>prisijungimui</em> ir <em>registracijai</em> pačiose įvairiausiose saityno svetainėse!"
       ],
       "Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.": [
          null,
-         ""
+         "Dėkojame, kad patvirtinote savo el. pašto adresą. Šis laiškas išsiųstas, kad galėtumėte užbaigti registraciją į %s."
       ],
       "Finish registration by clicking this link:": [
          null,
-         ""
+         "Užbaikite registraciją, spustelėdami šį saitą:"
       ],
       "If you are NOT trying to sign into this site, just ignore this email.": [
          null,
-         ""
+         "Jeigu Jūs NEBANDĖTE prisijungti prie šios svetainės, tiesiog ignoruokite šį laišką."
       ],
       "Thanks,": [
          null,
-         ""
+         "Ačiū,"
       ],
       "(A better way to sign in)": [
          null,
-         ""
+         "(Geresnis būdas registruotis)"
       ]
    }
 }
diff --git a/resources/static/i18n/ml/client.json b/resources/static/i18n/ml/client.json
index c1c6d606f..731e70c75 100644
--- a/resources/static/i18n/ml/client.json
+++ b/resources/static/i18n/ml/client.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
          "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
          "Language-Team": " LANGUAGE <LL@li.org>",
@@ -13,159 +13,11 @@
          "Content-Transfer-Encoding": " 8bit",
          "X-Generator": " Translate Toolkit 1.9.0"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
          ""
       ],
-      "Adding Address": [
-         null,
-         ""
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         ""
-      ],
-      "Checking Address Info": [
-         null,
-         ""
-      ],
-      "Authenticating with Assertion": [
-         null,
-         ""
-      ],
-      "Cancelling User Account": [
-         null,
-         ""
-      ],
-      "Checking Authentication": [
-         null,
-         ""
-      ],
-      "Checking Script Version": [
-         null,
-         ""
-      ],
-      "Completing User Registration": [
-         null,
-         ""
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         ""
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         ""
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         ""
-      ],
-      "Creating Account": [
-         null,
-         ""
-      ],
-      "Getting Assertion": [
-         null,
-         ""
-      ],
-      "Checking Registration Token": [
-         null,
-         ""
-      ],
-      "Checking Email Address": [
-         null,
-         ""
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         ""
-      ],
-      "Logout Failed": [
-         null,
-         ""
-      ],
-      "You are offline!": [
-         null,
-         ""
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         ""
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         ""
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         ""
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         ""
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         ""
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         ""
-      ],
-      "Registration Failed": [
-         null,
-         ""
-      ],
-      "Establishing Relay": [
-         null,
-         ""
-      ],
-      "Relay frame could not be found": [
-         null,
-         ""
-      ],
-      "Resetting Password": [
-         null,
-         ""
-      ],
-      "Remove Email Address from Account": [
-         null,
-         ""
-      ],
-      "Setting Password": [
-         null,
-         ""
-      ],
-      "Signin Failed": [
-         null,
-         ""
-      ],
-      "Signup Failed": [
-         null,
-         ""
-      ],
-      "Syncing Address": [
-         null,
-         ""
-      ],
-      "Syncing Email Addresses": [
-         null,
-         ""
-      ],
-      "Sync Keys for Address": [
-         null,
-         ""
-      ],
-      "Getting Token Info": [
-         null,
-         ""
-      ],
-      "Updating password": [
-         null,
-         ""
-      ],
-      "Verifying email address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
          ""
       ],
@@ -237,7 +89,7 @@
          null,
          ""
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
          ""
       ],
@@ -257,6 +109,10 @@
          null,
          ""
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         ""
+      ],
       "next": [
          null,
          ""
@@ -265,7 +121,7 @@
          null,
          ""
       ],
-      "select email": [
+      "sign in": [
          null,
          ""
       ],
@@ -297,43 +153,51 @@
          null,
          ""
       ],
-      "The site requested you sign in using": [
+      "We are very sorry, the server is under extreme load!": [
          null,
          ""
       ],
-      "Reset Password": [
+      "We are very sorry, there has been an error!": [
          null,
          ""
       ],
-      "Cancel": [
+      "Please reload the page and try again.": [
          null,
          ""
       ],
-      "*%s* is not a valid email address!": [
+      "Please close this window and try again.": [
          null,
          ""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "See more info": [
          null,
          ""
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "The site requested you sign in using": [
          null,
          ""
       ],
-      "This is not me...": [
+      "reset password": [
          null,
          ""
       ],
-      "Use a different email": [
+      "*%s* is not a valid email address!": [
          null,
          ""
       ],
-      "Always sign in using this email": [
+      "To continue, please close the window and enter a valid address.": [
          null,
          ""
       ],
-      "sign in": [
+      "This is not me...": [
+         null,
+         ""
+      ],
+      "Use a different email": [
+         null,
+         ""
+      ],
+      "Always sign in using this email": [
          null,
          ""
       ],
@@ -349,7 +213,7 @@
          null,
          ""
       ],
-      "Verify": [
+      "verify": [
          null,
          ""
       ],
diff --git a/resources/static/i18n/ml/messages.json b/resources/static/i18n/ml/messages.json
index bdf607e6b..14fddcfb4 100644
--- a/resources/static/i18n/ml/messages.json
+++ b/resources/static/i18n/ml/messages.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
          "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
          "Language-Team": " LANGUAGE <LL@li.org>",
@@ -25,7 +25,7 @@
          null,
          ""
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          ""
       ],
@@ -73,7 +73,7 @@
          null,
          ""
       ],
-      "Finish": [
+      "finish": [
          null,
          ""
       ],
@@ -85,6 +85,14 @@
          null,
          ""
       ],
+      "BrowserID requires cookies": [
+         null,
+         ""
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
       "Communicating with server": [
          null,
          ""
@@ -97,7 +105,7 @@
          null,
          ""
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
          ""
       ],
@@ -125,7 +133,7 @@
          null,
          ""
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
          ""
       ],
@@ -145,7 +153,7 @@
          null,
          ""
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          ""
       ],
diff --git a/resources/static/i18n/nl/client.json b/resources/static/i18n/nl/client.json
index 216aeed44..ce39422ec 100644
--- a/resources/static/i18n/nl/client.json
+++ b/resources/static/i18n/nl/client.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-04 11:34+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-03 17:23+0200",
          "Last-Translator": " Ton <tonnes.mb@gmail.com>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " nl",
@@ -14,357 +14,381 @@
          "Plural-Forms": " nplurals=2; plural=(n != 1);",
          "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
-         "Gebruiker verifiëren"
+         "BrowserID vereist cookies"
       ],
-      "Adding Address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "Adres toevoegen"
+         "Sluit dit venster, <a %s>schakel cookies in</a> en probeer het nogmaals"
       ],
-      "Adding Primary Email Address to User": [
+      "Communication Error": [
          null,
-         "Primair e-mailadres aan gebruiker toevoegen"
+         "Communicatiefout"
       ],
-      "Checking Address Info": [
+      "Finishing Sign In...": [
          null,
-         "Adresinformatie controleren"
+         "Aanmelden voltooien…"
       ],
-      "Authenticating with Assertion": [
+      "In just a moment you'll be signed into BrowserID.": [
          null,
-         "Verifiëren met bevestiging"
+         "Over enkele ogenblikken bent u bij BrowserID aangemeld."
       ],
-      "Cancelling User Account": [
+      "Please wait a few seconds while we sign you into the site.": [
          null,
-         "Gebruikersaccount annuleren"
+         "Wacht enkele seconden terwijl we u aanmelden bij de website."
       ],
-      "Checking Authentication": [
+      "We are sorry, this request is taking a LOOONG time.": [
          null,
-         "Verificatie controleren"
+         "Sorry, dit verzoek kost VEEEEL tijd."
       ],
-      "Checking Script Version": [
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
          null,
-         "Scriptversie controleren"
+         "Dit bericht zal verdwijnen zodra uw verzoek is voltooid (hopelijk snel). Als u te lang wacht, sluit dan dit venster en probeer het opnieuw."
       ],
-      "Completing User Registration": [
+      "Sign in using": [
          null,
-         "Gebruikersregistratie voltooien"
+         "Aanmelden met"
       ],
-      "We are sorry, BrowserID requires cookies": [
+      "New email address": [
          null,
-         "Sorry, BrowserID vereist cookies"
+         "Nieuw e-mailadres"
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
+      "This field must be an email address.": [
          null,
-         "Voor BrowserID moeten de cookies van uw browser zijn ingeschakeld en kunnen werken. Schakel de cookies van uw browser in en probeer het opnieuw"
+         "Dit veld moet een e-mailadres zijn."
       ],
-      "Checking if Cookies are Enabled": [
+      "The email field is required.": [
          null,
-         "Controleren of cookies zijn ingeschakeld"
+         "Het e-mailveld is verplicht."
       ],
-      "Creating Account": [
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
          null,
-         "Account aanmaken"
+         "We hebben zojuist een e-mailbericht naar dat adres gestuurd! Als u er echt nog een wilt sturen, wacht dan een paar minuten en probeer het opnieuw."
       ],
-      "Getting Assertion": [
+      "That address is already added to your account!": [
          null,
-         "Bevestiging verkrijgen"
+         "Dat adres is al aan uw account toegevoegd!"
       ],
-      "Checking Registration Token": [
+      "add": [
          null,
-         "Registratietoken controleren"
+         "toevoegen"
       ],
-      "Checking Email Address": [
+      "cancel": [
          null,
-         "E-mailadres controleren"
+         "annuleren"
       ],
-      "Checking Whether User is Authenticated with IdP": [
+      "Email": [
          null,
-         "Controleren of gebruiker is geverifieerd met IdP"
+         "E-mailadres"
       ],
-      "Logout Failed": [
+      "Enter your email address to sign in to <strong>%s</strong>": [
          null,
-         "Afmelden mislukt"
+         "Voer uw e-mailadres in om u aan te melden bij <strong>%s</strong>"
       ],
-      "You are offline!": [
+      "Welcome to BrowserID!": [
          null,
-         "U bent offline!"
+         "Welkom bij BrowserID!"
       ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
+      "This email looks new, so let's get you set up.": [
          null,
-         "Helaas kan BrowserID niet offline communiceren!"
+         "Dit e-mailadres lijkt nieuw, dus laten we de boel instellen."
       ],
-      "Authenticating with Identity Provider": [
+      "Password": [
          null,
-         "Verifiëren met identityprovider"
+         "Wachtwoord"
       ],
-      "We had trouble communicating with your email provider, please try again!": [
+      "forgot your password?": [
          null,
-         "Er was een probleem bij het communiceren met uw e-mailprovider, probeer het opnieuw!"
+         "wachtwoord vergeten?"
       ],
-      "Provisioning with Identity Provider": [
+      "The password field is required.": [
          null,
-         "Provisioning met identityprovider"
+         "Het wachtwoordveld is verplicht."
       ],
-      "Provisioning Unsupported Identity Provider": [
+      "The account cannot be logged in with this username and password.": [
          null,
-         "Provisioning met niet-ondersteunde identityprovider"
+         "De account kan met deze gebruikersnaam en dit wachtwoord niet worden aangemeld."
       ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
          null,
-         "Helaas kan het opgegeven e-mailadres niet als primaire identityprovider worden gebruikt"
+         "Door op %s te klikken bevestigt u dat u de <a %s>gebruiksvoorwaarden</a> en het <a %s>privacybeleid</a> van deze website accepteert."
       ],
-      "Registration Failed": [
+      "next": [
          null,
-         "Registratie mislukt"
+         "volgende"
       ],
-      "Establishing Relay": [
+      "verify email": [
          null,
-         "Relay opzetten"
+         "e-mailadres verifiëren"
       ],
-      "Relay frame could not be found": [
+      "sign in": [
          null,
-         "Relayframe is niet gevonden"
+         "aanmelden"
       ],
-      "Resetting Password": [
+      "Cannot verify %s": [
          null,
-         "Wachtwoord herinitialiseren"
+         "Kan %s niet verifiëren"
       ],
-      "Remove Email Address from Account": [
+      "%s is a required address, but we cannot verify that you own this address.": [
          null,
-         "E-mailadres van account verwijderen"
+         "%s is een verplicht adres, maar we kunnen niet verifiëren dat dit adres van u is."
       ],
-      "Setting Password": [
+      "Check your email!": [
          null,
-         "Wachtwoord instellen"
+         "Controleer uw e-mail!"
       ],
-      "Signin Failed": [
+      "We sent a confirmation email to <strong>%s</strong>": [
          null,
-         "Aanmelden mislukt"
+         "We hebben een bevestigings-e-mailbericht naar <strong>%s</strong> gestuurd"
       ],
-      "Signup Failed": [
+      "To finish signing in just click the verify link we sent to your email address.": [
          null,
-         "Registratie mislukt"
+         "Klik op de verificatiekoppeling die we naar uw e-mailadres hebben gestuurd om het aanmelden te voltooien."
       ],
-      "Syncing Address": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
          null,
-         "Adres synchroniseren"
+         "Als dit een vergissing is, negeer dan het verzonden e-mailbericht en <a href=\"#\" id=\"cancel\">annuleer</a>."
       ],
-      "Syncing Email Addresses": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          null,
-         "E-mailadres synchroniseren"
+         "Als dit een vergissing is, negeer dan het verzonden e-mailbericht en <a href=\"#\" id=\"back\">gebruik een ander e-mailadres</a>."
       ],
-      "Sync Keys for Address": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         "Sync-sleutels voor adres"
+         "Het spijt ons zeer, de server heeft het bijzonder druk!"
       ],
-      "Getting Token Info": [
+      "We are very sorry, there has been an error!": [
          null,
-         "Tokeninformatie verkrijgen"
+         "Het spijt ons zeer, er is een fout opgetreden!"
       ],
-      "Updating password": [
+      "Please reload the page and try again.": [
          null,
-         "Wachtwoord bijwerken"
+         "Laad de pagina opnieuw en probeer het nogmaals."
       ],
-      "Verifying email address": [
+      "Please close this window and try again.": [
          null,
-         "E-mailadres verifiëren"
+         "Sluit dit venster en probeer het nogmaals."
       ],
-      "Communication Error": [
+      "See more info": [
          null,
-         "Communicatiefout"
+         "Meer info bekijken"
       ],
-      "Finishing Sign In...": [
+      "The site requested you sign in using": [
          null,
-         "Aanmelden voltooien…"
+         "De website vroeg u zich aan te melden met"
       ],
-      "In just a moment you'll be signed into BrowserID.": [
+      "reset password": [
          null,
-         "Over enkele ogenblikken bent u bij BrowserID aangemeld."
+         "wachtwoord herinitialiseren"
       ],
-      "Please wait a few seconds while we sign you into the site.": [
+      "*%s* is not a valid email address!": [
          null,
-         "Wacht enkele seconden terwijl we u aanmelden bij de website."
+         "*%s* is geen geldig e-mailadres!"
       ],
-      "We are sorry, this request is taking a LOOONG time.": [
+      "To continue, please close the window and enter a valid address.": [
          null,
-         "Sorry, dit verzoek kost VEEEEL tijd."
+         "Sluit het venster en voer een geldig adres in om door te gaan."
       ],
-      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+      "This is not me...": [
          null,
-         "Dit bericht zal verdwijnen zodra uw verzoek is voltooid (hopelijk snel). Als u te lang wacht, sluit dan dit venster en probeer het opnieuw."
+         "Dit ben ik niet…"
       ],
-      "Sign in using": [
+      "Use a different email": [
          null,
-         "Aanmelden met"
+         "Gebruik een ander e-mailadres"
       ],
-      "New email address": [
+      "Always sign in using this email": [
          null,
-         "Nieuw e-mailadres"
+         "Altijd aanmelden met dit e-mailadres"
       ],
-      "This field must be an email address.": [
+      "Address Verified!": [
          null,
-         "Dit veld moet een e-mailadres zijn."
+         "Adres geverifieerd!"
       ],
-      "The email field is required.": [
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
          null,
-         "Het e-mailveld is verplicht."
+         "Uw identiteit is geverifieerd via uw e-mailprovider. We gaan u nu proberen aan te melden."
       ],
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
          null,
-         "We hebben zojuist een e-mail naar dat adres gestuurd! Als u er echt nog een wilt sturen, wacht dan een paar minuten en probeer het opnieuw."
+         "Om te verifiëren dat u de eigenaar van dit adres bent moet u zich aanmelden met uw e-mailprovider. Dit venster wordt doorgestuurd naar"
       ],
-      "That address is already added to your account!": [
+      "verify": [
          null,
-         "Dat adres is al aan uw account toegevoegd!"
+         "verifiëren"
       ],
-      "add": [
+      "Verify With Email Provider": [
          null,
-         "toevoegen"
+         "Verifiëren met e-mailprovider"
       ],
-      "cancel": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         "annuleren"
+         "#~ \"Voor BrowserID moeten cookies van uw browser zijn ingeschakeld en actief \"#~ \"zijn. Schakel cookies van uw browser in en probeer het opnieuw\""
       ],
-      "Email": [
+      "You are offline!": [
          null,
-         "E-mailadres"
+         "U bent offline!"
       ],
-      "Enter your email address to sign in to <strong>%s</strong>": [
+      "Unfortunately, BrowserID cannot communicate while offline!": [
          null,
-         "Voer uw e-mailadres in om u aan te melden bij <strong>%s</strong>"
+         "Helaas kan BrowserID niet offline communiceren!"
       ],
-      "Welcome to BrowserID!": [
+      "select email": [
          null,
-         "Welkom bij BrowserID!"
+         "e-mailadres selecteren"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
          null,
-         "Dit e-mailadres lijkt nieuw, dus laten we de boel gaan instellen."
+         "#~ \"Sorry, we kunnen niet met BrowserID communiceren terwijl u offline bent.\""
       ],
-      "Password": [
+      "Authenticating User": [
          null,
-         "Wachtwoord"
+         "Gebruiker verifiëren"
       ],
-      "forgot your password?": [
+      "Adding Address": [
          null,
-         "wachtwoord vergeten?"
+         "Adres toevoegen"
       ],
-      "The password field is required.": [
+      "Adding Primary Email Address to User": [
          null,
-         "Het wachtwoordveld is verplicht."
+         "Primair e-mailadres aan gebruiker toevoegen"
       ],
-      "The account cannot be logged in with this username and password.": [
+      "Checking Address Info": [
          null,
-         "De account kan met deze gebruikersnaam en dit wachtwoord niet worden aangemeld."
+         "Adresinformatie controleren"
       ],
-      "next": [
+      "Authenticating with Assertion": [
          null,
-         "volgende"
+         "Verifiëren met bevestiging"
       ],
-      "verify email": [
+      "Cancelling User Account": [
          null,
-         "e-mailadres verifiëren"
+         "Gebruikersaccount annuleren"
       ],
-      "select email": [
+      "Checking Authentication": [
          null,
-         "e-mailadres selecteren"
+         "Verificatie controleren"
       ],
-      "Cannot verify %s": [
+      "Checking Script Version": [
          null,
-         "Kan %s niet verifiëren"
+         "Scriptversie controleren"
       ],
-      "%s is a required address, but we cannot verify that you own this address.": [
+      "Completing User Registration": [
          null,
-         "%s is een verplicht adres, maar we kunnen niet verifiëren dat dit adres van u is."
+         "Gebruikersregistratie voltooien"
       ],
-      "Check your email!": [
+      "Checking if Cookies are Enabled": [
          null,
-         "Controleer uw e-mail!"
+         "Controleren of cookies zijn ingeschakeld"
       ],
-      "We sent a confirmation email to <strong>%s</strong>": [
+      "Creating Account": [
          null,
-         "We hebben een bevestigings-e-mail naar <strong>%s</strong> gestuurd"
+         "Account aanmaken"
       ],
-      "To finish signing in just click the verify link we sent to your email address.": [
+      "Getting Assertion": [
          null,
-         "Klik op de verificatiekoppeling die we naar uw e-mailadres hebben gestuurd om het aanmelden te voltooien."
+         "Bevestiging verkrijgen"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+      "Checking Registration Token": [
          null,
-         "Als dit een vergissing is, negeer dan het verzonden e-mailbericht en <a href=\"#\" id=\"cancel\">annuleer</a>."
+         "Registratietoken controleren"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+      "Checking Email Address": [
          null,
-         "Als dit een vergissing is, negeer dan het verzonden e-mailbericht en <a href=\"#\" id=\"back\">gebruik een ander e-mailadres</a>."
+         "E-mailadres controleren"
       ],
-      "The site requested you sign in using": [
+      "Checking Whether User is Authenticated with IdP": [
          null,
-         "De website vroeg u zich aan te melden met"
+         "Controleren of gebruiker is geverifieerd met IdP"
       ],
-      "Reset Password": [
+      "Logout Failed": [
          null,
-         "Wachtwoord herinitialiseren"
+         "Afmelden mislukt"
       ],
-      "Cancel": [
+      "Authenticating with Identity Provider": [
          null,
-         "Annuleren"
+         "Verifiëren met identityprovider"
       ],
-      "*%s* is not a valid email address!": [
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
          null,
-         "*%s* is geen geldig e-mailadres!"
+         "#~ \"Er was een probleem bij het communiceren met uw e-mailprovider, probeer \"#~ \"het opnieuw!\""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "Provisioning with Identity Provider": [
          null,
-         "Sluit het venster en voer een geldig adres in om door te gaan."
+         "Provisioning met identityprovider"
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "Provisioning Unsupported Identity Provider": [
          null,
-         "Sorry, we kunnen niet met BrowserID communiceren terwijl u offline bent."
+         "Provisioning met niet-ondersteunde identityprovider"
       ],
-      "This is not me...": [
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
          null,
-         "Dit ben ik niet…"
+         "#~ \"Helaas kan het opgegeven e-mailadres niet als primaire identityprovider \"#~ \"worden gebruikt\""
       ],
-      "Use a different email": [
+      "Registration Failed": [
          null,
-         "Gebruik een ander e-mailadres"
+         "Registratie mislukt"
       ],
-      "Always sign in using this email": [
+      "Establishing Relay": [
          null,
-         "Altijd aanmelden met dit e-mailadres"
+         "Relay opzetten"
       ],
-      "sign in": [
+      "Relay frame could not be found": [
          null,
-         "aanmelden"
+         "Relayframe is niet gevonden"
       ],
-      "Address Verified!": [
+      "Resetting Password": [
          null,
-         "Adres geverifieerd!"
+         "Wachtwoord herinitialiseren"
       ],
-      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+      "Remove Email Address from Account": [
          null,
-         "Uw identiteit is geverifieerd via uw e-mailprovider. We gaan u nu proberen aan te melden."
+         "E-mailadres van account verwijderen"
       ],
-      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+      "Setting Password": [
          null,
-         "Om te verifiëren dat u de eigenaar van dit adres bent moet u zich aanmelden met uw e-mailprovider. Dit venster wordt doorgestuurd naar"
+         "Wachtwoord instellen"
       ],
-      "Verify": [
+      "Signin Failed": [
          null,
-         "Verifiëren"
+         "Aanmelden mislukt"
       ],
-      "Verify With Email Provider": [
+      "Signup Failed": [
          null,
-         "Verifiëren met e-mailprovider"
+         "Registratie mislukt"
       ],
-      "#~ \"We just sent an email to that address!  If you really want to send \"#~ \"another, wait a minute or two and try again.\"": [
+      "Syncing Address": [
          null,
-         "#~ \"We hebben zojuist een e-mail naar dat adres gestuurd!  Als u er echt nog \"#~ \"een wilt sturen, wacht dan een minuut of twee en probeer het opnieuw.\""
+         "Adres synchroniseren"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "E-mailadres synchroniseren"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Sync-sleutels voor adres"
+      ],
+      "Getting Token Info": [
+         null,
+         "Tokeninformatie verkrijgen"
+      ],
+      "Updating password": [
+         null,
+         "Wachtwoord bijwerken"
       ],
-      "This email looks new, so let&apos;s get you set up.": [
+      "Verifying email address": [
+         null,
+         "E-mailadres verifiëren"
+      ],
+      "Cancel": [
          null,
-         "Dit e-mailadres lijkt nieuw, dus laten we de boel gaan instellen."
+         "Annuleren"
+      ],
+      "#~ \"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 hebben zojuist een e-mail naar dat adres gestuurd!  Als u er echt nog \"#~ \"een wilt sturen, wacht dan een minuut of twee en probeer het opnieuw.\""
       ],
       "#~ \"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,
diff --git a/resources/static/i18n/nl/messages.json b/resources/static/i18n/nl/messages.json
index 43aed3963..2194cff51 100644
--- a/resources/static/i18n/nl/messages.json
+++ b/resources/static/i18n/nl/messages.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-04 01:02+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-03 17:22+0200",
          "Last-Translator": " Ton <tonnes.mb@gmail.com>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " nl",
@@ -26,9 +26,9 @@
          null,
          "Er is een fout opgetreden bij het voltooien van de registratie."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         "Aanmelden beëindigen bij: "
+         "Aanmelden voltooien bij:"
       ],
       "Email Verification": [
          null,
@@ -40,7 +40,7 @@
       ],
       "Your Email": [
          null,
-         "Uw e-mail"
+         "Uw e-mailadres"
       ],
       "New Password": [
          null,
@@ -74,9 +74,9 @@
          null,
          "Wachtwoorden komen niet overeen."
       ],
-      "Finish": [
+      "finish": [
          null,
-         "Voltooien"
+         "voltooien"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
@@ -86,6 +86,14 @@
          null,
          "Uw nieuwe e-mailadres is ingesteld en u bent nu aangemeld. U kunt dit venster nu sluiten en teruggaan naar"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID vereist cookies"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "Sluit dit venster, <a %s>schakel cookies in</a> en probeer het nogmaals"
+      ],
       "Communicating with server": [
          null,
          "Communiceren met server"
@@ -98,9 +106,9 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         "BrowserID is de snelle en veilige manier van aanmelden &ndash; <a target=\"_blank\" href=\"/about\">Meer info</a>"
+         "BrowserID is de snelle en veilige manier van aanmelden &ndash; <a %s>meer info</a>"
       ],
       "BrowserID: %s": [
          null,
@@ -126,9 +134,9 @@
          null,
          "Afmelden"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         "Door het <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
+         "Door het <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
@@ -146,7 +154,7 @@
          null,
          "Er is een probleem met uw registratiekoppeling. Is dit adres al geregistreerd?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "Fout bij communicatie met server."
       ],
diff --git a/resources/static/i18n/pa/client.json b/resources/static/i18n/pa/client.json
new file mode 100644
index 000000000..4cb42d944
--- /dev/null
+++ b/resources/static/i18n/pa/client.json
@@ -0,0 +1,391 @@
+;var json_locale_data = {
+   "client": {
+      "": {
+         "Project-Id-Version": " PACKAGE VERSION",
+         "Report-Msgid-Bugs-To": " ",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-27 18:00+0200",
+         "Last-Translator": " A S <amanpreet.alam@gmail.com>",
+         "Language-Team": " LANGUAGE <LL@li.org>",
+         "Language": " pa",
+         "MIME-Version": " 1.0",
+         "Content-Type": " text/plain; charset=UTF-8",
+         "Content-Transfer-Encoding": " 8bit",
+         "Plural-Forms": " nplurals=2; plural=(n != 1) ;",
+         "X-Generator": " Pootle 2.1.6"
+      },
+      "BrowserID requires cookies": [
+         null,
+         "ਸਾਨੂੰ ਅਫਸੋਸ ਹੈ, ਪਰ BrowserID ਲਈ ਕੂਕੀਜ਼ ਚਾਹੀਦੇ ਹਨ"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
+      "Communication Error": [
+         null,
+         "ਕਮਿਊਨੀਕੇਸ਼ਨ ਗਲਤੀ"
+      ],
+      "Finishing Sign In...": [
+         null,
+         "ਸਾਇਨ ਇਨ ਨੂੰ ਪੂਰਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+      ],
+      "In just a moment you'll be signed into BrowserID.": [
+         null,
+         "ਕੁਝ ਕੁ ਪਲਾਂ ਵਿੱਚ ਤੁਹਾਨੂੰ BrowserID ਵਿੱਚ ਸਾਇਨ ਇਨ ਕੀਤਾ ਜਾਵੇਗਾ।"
+      ],
+      "Please wait a few seconds while we sign you into the site.": [
+         null,
+         "ਕੁਝ ਕੁ ਪਲਾਂ ਲਈ ਉਡੀਕੋ ਤਾਂ ਕਿ ਅਸੀਂ ਤੁਹਾਨੂੰ ਸਾਈਟ ਉੱਤੇ ਸਾਇਨ ਕਰ ਸਕੀਏ।"
+      ],
+      "We are sorry, this request is taking a LOOONG time.": [
+         null,
+         "ਸਾਨੂੰ ਅਫਸੋਸ ਹੈ ਪਰ ਇਹ ਮੰਗ ਬਹੁਤ ਲੰਮਾ ਸਮਾਂ ਲੈ ਰਹੀ ਹੈ।"
+      ],
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+         null,
+         "ਇਹ ਸੁਨੇਹਾ ਹੱਟ ਜਾਵੇਗਾ, ਜਦੋਂ ਮੰਗ ਪੂਰੀ ਹੋ ਗਈ (ਉਮੀਦ ਹੈ ਛੇਤੀ ਹੀ)। ਜੇ ਤੁਸੀਂ ਬਹੁਤ ਲੰਮਾ ਸਮਾਂ ਉਡੀਕ ਕੀਤੀ ਹੈ ਤਾਂ ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰਕੇ ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"
+      ],
+      "Sign in using": [
+         null,
+         "ਇਹ ਦੀ ਵਰਤੋਂ ਨਾਲ ਸਾਇਨ ਇਨ"
+      ],
+      "New email address": [
+         null,
+         "ਨਵਾਂ ਈਮੇਲ ਐਡਰੈਸ"
+      ],
+      "This field must be an email address.": [
+         null,
+         "ਇਹ ਖੇਤਰ ਇੱਕ ਈਮੇਲ ਐਡਰੈਸ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"
+      ],
+      "The email field is required.": [
+         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,
+         "ਅਸੀਂ ਹੁਣੇ ਹੀ ਉਸ ਐਡਰੈਸ ਉੱਤੇ ਇੱਕ ਈਮੇਲ ਭੇਜੀ ਹੈ! ਜੇ ਤੁਸੀਂ ਹੋਰ ਭੇਜਣੀ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਇੱਕ ਜਾਂ ਦੋ ਮਿੰਟ ਦੀ ਉਡੀਕ ਕਰੋ ਅਤੇ ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"
+      ],
+      "That address is already added to your account!": [
+         null,
+         "ਉਹ ਐਡਰੈਸ ਪਹਿਲਾਂ ਹੀ ਤੁਹਾਡੇ ਅਕਾਊਂਟ ਵਿੱਚ ਜੋੜਿਆ ਹੋਇਆ ਹੈ!"
+      ],
+      "add": [
+         null,
+         "ਸ਼ਾਮਲ"
+      ],
+      "cancel": [
+         null,
+         "ਰੱਦ ਕਰੋ"
+      ],
+      "Email": [
+         null,
+         "ਈਮੇਲ"
+      ],
+      "Enter your email address to sign in to <strong>%s</strong>": [
+         null,
+         "<strong>%s</strong> ਵਿੱਚ ਸਾਇਨ ਇਨ ਕਰਨ ਲਈ ਆਪਣਾ ਈਮੇਲ ਐਡਰੈਸ ਦਿਉ"
+      ],
+      "Welcome to BrowserID!": [
+         null,
+         "BrowserID ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ!"
+      ],
+      "This email looks new, so let's get you set up.": [
+         null,
+         "ਇਹ ਈਮੇਲ ਐਡਰੈਸ ਨਵਾਂ ਲੱਗਦਾ ਹੈ, ਇਸਕਰਕੇ ਤੁਹਾਡੇ ਲਈ ਸੈਟਅੱਪ ਕਰੀਏ।"
+      ],
+      "Password": [
+         null,
+         "ਪਾਸਵਰਡ"
+      ],
+      "forgot your password?": [
+         null,
+         "ਆਪਣਾ ਪਾਸਵਰਡ ਭੁੱਲ ਗਏ?"
+      ],
+      "The password field is required.": [
+         null,
+         "ਪਾਸਵਰਡ ਖੇਤਰ ਦੀ ਲੋੜ ਹੈ।"
+      ],
+      "The account cannot be logged in with this username and password.": [
+         null,
+         "ਇਸ ਯੂਜ਼ਰ ਨਾਂ ਅਤੇ ਪਾਸਵਰਡ ਨਾਲ ਅਕਾਊਂਟ ਲਾਗਇਨ ਨਹੀਂ ਕਰ ਸਕਦਾ ਹੈ।"
+      ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         ""
+      ],
+      "next": [
+         null,
+         "ਅੱਗੇ"
+      ],
+      "verify email": [
+         null,
+         "ਈਮੇਲ ਦੀ ਪੜਤਾਲ"
+      ],
+      "sign in": [
+         null,
+         "ਸਾਇਨ-ਇਨ"
+      ],
+      "Cannot verify %s": [
+         null,
+         "%s ਦੀ ਜਾਂਚ ਨਹੀਂ ਹੋ ਸਕਦੀ"
+      ],
+      "%s is a required address, but we cannot verify that you own this address.": [
+         null,
+         "%s ਇੱਕ ਚਾਹੀਦਾ ਐਡਰੈਸ ਹੈ, ਪਰ ਅਸੀਂ ਪੁਸ਼ਟੀ ਨਹੀਂ ਕਰ ਸਕਦੇ ਕਿ ਤੁਸੀਂ ਇਹ ਐਡਰੈਸ ਰੱਖਦੇ ਹੋ।"
+      ],
+      "Check your email!": [
+         null,
+         "ਤੁਹਾਡੀ ਈਮੇਲ ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਹੀ ਹੈ!"
+      ],
+      "We sent a confirmation email to <strong>%s</strong>": [
+         null,
+         "ਅਸੀਂ <strong>%s</strong> ਨੂੰ ਇੱਕ ਪੁਸ਼ਟੀ ਈਮੇਲ ਭੇਜੀ ਹੈ"
+      ],
+      "To finish signing in just click the verify link we sent to your email address.": [
+         null,
+         "ਸਾਇਨ ਇਨ ਕਰਨ ਨੂੰ ਪੂਰਾ ਕਰਨ ਲਈ ਸਾਡੇ ਵਲੋਂ ਤੁਹਾਡੇ ਈਮੇਲ ਐਡਰੈਸ ਉੱਤੇ ਭੇਜੇ ਲਿੰਕ ਉੱਤੇ ਕਲਿੱਕ ਕਰੋ।"
+      ],
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+         null,
+         "ਜੇ ਇਹ ਗਲਤੀ ਹੈ ਤਾਂ ਭੇਜੀ ਹੋਈ ਈਮੇਲ ਨੂਂ ਅਣਡਿੱਠਾ ਕਰ ਦਿਉ ਅਤੇ <a href=\"#\" id=\"cancel\">ਰੱਦ ਕਰੋ</a>।"
+      ],
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+         null,
+         "ਜੇ ਇਹ ਗਲਤੀ ਹੈ ਤਾਂ ਭੇਜੀ ਹੋਈ ਈਮੇਲ ਨੂਂ ਅਣਡਿੱਠਾ ਕਰ ਦਿਉ ਅਤੇ <a href=\"#\" id=\"back\">ਹੋਰ ਈਮੇਲ ਐਡਰੈੱਸ ਵਰਤੋਂ</a>।"
+      ],
+      "We are very sorry, the server is under extreme load!": [
+         null,
+         "ਸਾਨੂੰ ਅਫਸੋਸ ਹੈ, ਸਰਵਰ ਕੋਲ ਭਾਰੀ ਲੋਡ ਹੈ!"
+      ],
+      "We are very sorry, there has been an error!": [
+         null,
+         "ਸਾਨੂੰ ਅਫਸੋਸ ਹੈ, ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ!"
+      ],
+      "Please reload the page and try again.": [
+         null,
+         "ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰਨੀ ਲਈ, ਤੁਹਾਨੂੰ ਸਫ਼ਾ ਫੇਰ ਲੋਡ ਕਰਕੇ ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ।"
+      ],
+      "Please close this window and try again.": [
+         null,
+         "ਜਾਰੀ ਰੱਖਣ ਲਈ, ਤੁਹਾਨੂੰ ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰਕੇ ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ।"
+      ],
+      "See more info": [
+         null,
+         "ਹੋਰ ਜਾਣਕਾਰੀ ਵੇਖੋ"
+      ],
+      "The site requested you sign in using": [
+         null,
+         "ਸਾਇਟ ਨੇ ਤੁਹਾਨੂੰ ਸਾਇਨ ਇਨ ਕਰਨ ਦੀ ਮੰਗ ਕੀਤੀ ਹੈ, ਇਸ ਦੀ ਵਰਤੋਂ ਨਾਲ"
+      ],
+      "reset password": [
+         null,
+         "ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ"
+      ],
+      "*%s* is not a valid email address!": [
+         null,
+         "*%s* ਸਹੀਂ ਈਮੇਲ ਐਡਰੈਸ ਨਹੀਂ ਹੈ!"
+      ],
+      "To continue, please close the window and enter a valid address.": [
+         null,
+         "ਜਾਰੀ ਰੱਖਣ ਲਈ, ਵਿੰਡੋ ਬੰਦ ਕਰੋ ਅਤੇ ਠੀਕ ਈਮੇਲ ਐਡਰੈਸ ਦਿਉ ਜੀ।"
+      ],
+      "This is not me...": [
+         null,
+         "ਇਹ ਮੈਂ ਨਹੀਂ ਹਾਂ..."
+      ],
+      "Use a different email": [
+         null,
+         "ਵੱਖਰਾ ਈਮੇਲ ਵਰਤੋਂ"
+      ],
+      "Always sign in using this email": [
+         null,
+         "ਹਮੇਸ਼ਾ ਇਹ ਈਮੇਲ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਸਾਈਨ ਇਨ ਕਰੋ"
+      ],
+      "Address Verified!": [
+         null,
+         "ਐਡਰੈਸ ਜਾਂਚਿਆ!"
+      ],
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+         null,
+         "ਤੁਹਾਡੀ ਪਛਾਣ ਦੀ ਤੁਹਾਡੇ ਈਮੇਲ ਪਰੋਵਾਇਡਰ ਨਾਲ ਜਾਂਚ ਕੀਤੀ ਜਾ ਚੁੱਕੀ ਹੈ, ਅਸੀਂ ਹੁਣ ਤੁਹਾਨੂੰ ਸਾਇਨ ਇਨ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਾਂਗੇ।"
+      ],
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+         null,
+         "ਤੁਹਾਨੂੰ ਇਹ ਐਡਰੈਸ ਦੇ ਮਾਲਕ ਹੋਣ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਈਮੇਲ ਪਰੋਵਾਇਡਰ ਨਾਲ ਸਾਇਨ ਇਨ ਕਰਨਾ ਪਵੇਗਾ। ਇਹ ਵਿੰਡੋ ਮੁੜ-ਭੇਜੇਗੀ"
+      ],
+      "verify": [
+         null,
+         "ਜਾਂਚ"
+      ],
+      "Verify With Email Provider": [
+         null,
+         "ਈਮੇਲ ਪਰੋਵਾਇਡਰ ਨਾਲ ਜਾਂਚ"
+      ],
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
+         null,
+         "#~ \"BrowserID ਨੂੰ ਕੰਮ ਕਰਨ ਲਈ ਤੁਹਾਡੇ ਬਰਾਊਜ਼ਰ ਦੇ ਕੂਕੀਜ਼ ਚਾਲੂ ਹਾਲਤ 'ਚ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ। ਆਪਣੇ \"#~ \"ਬਰਾਊਜ਼ਰ ਦੇ ਕੂਕੀਜ਼ ਚਾਲੂ ਕਰਕੇ ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ।\""
+      ],
+      "You are offline!": [
+         null,
+         "ਤੁਸੀਂ ਆਫਲਾਈਨ ਹੋ!"
+      ],
+      "Unfortunately, BrowserID cannot communicate while offline!": [
+         null,
+         "ਅਫਸੋਸ, BrowserID ਆਫਲਾਈਨ ਦੇ ਦੌਰਾਨ ਕੰਮ ਕਰਨ ਨਹੀਂ ਸਕਦਾ ਹੈ!"
+      ],
+      "select email": [
+         null,
+         "ਈਮੇਲ ਚੁਣੋ"
+      ],
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
+         null,
+         "#~ \"ਸਾਨੂੰ ਅਫਸੋਸ ਹੈ, ਪਰ ਅਸੀਂ BrowserID ਨਾਲ ਸੰਪਰਕ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹਾਂ, ਜਦੋਂ ਤੁਸੀਂ ਆਫਲਾਈਨ ਹੋ।\""
+      ],
+      "Authenticating User": [
+         null,
+         "ਯੂਜ਼ਰ ਨੂੰ ਪਰਮਾਣਿਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "Adding Address": [
+         null,
+         "ਐਡਰੈਸ ਜੋੜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "Adding Primary Email Address to User": [
+         null,
+         "ਯੂਜ਼ਰ ਲਈ ਪ੍ਰਾਇਮਰੀ ਈਮੇਲ ਐਡਰੈਸ ਜੋੜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "Checking Address Info": [
+         null,
+         "ਐਡਰੈਸ ਜਾਣਕਾਰੀ ਚੈੱਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+      ],
+      "Authenticating with Assertion": [
+         null,
+         "ਅਸਿਰਟੇਸ਼ਨ ਨਾਲ ਪਰਮਾਣਿਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "Cancelling User Account": [
+         null,
+         "ਯੂਜ਼ਰ ਅਕਾਊਂਟ ਰੱਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "Checking Authentication": [
+         null,
+         "ਪਰਮਾਣਕਿਤਾ ਚੈੱਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+      ],
+      "Checking Script Version": [
+         null,
+         "ਸਕ੍ਰਿਪਟ ਵਰਜਨ ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "Completing User Registration": [
+         null,
+         "ਯੂਜ਼ਰ ਰਜਿਸਟੇਸ਼ਨ ਪੂਰੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+      ],
+      "Checking if Cookies are Enabled": [
+         null,
+         "ਚੈੱਕ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਕਿ ਕੀ ਕੂਕੀਜ਼ ਚਾਲੂ ਹਨ।"
+      ],
+      "Creating Account": [
+         null,
+         "ਅਕਾਊਂਟ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "Getting Assertion": [
+         null,
+         "ਅਸਰਟੇਸ਼ਨ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "Checking Registration Token": [
+         null,
+         "ਰਜਿਸਟੇਰਸ਼ਨ ਟੋਕਨ ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "Checking Email Address": [
+         null,
+         "ਈਮੇਲ ਐਡਰੈਸ ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "Checking Whether User is Authenticated with IdP": [
+         null,
+         "ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ ਕਿ ਕੀ ਯੂਜ਼ਰ IdP ਰਾਹੀਂ ਪਰਮਾਣਿਤ ਹੈ"
+      ],
+      "Logout Failed": [
+         null,
+         "ਲਾਗਆਉਟ ਫੇਲ੍ਹ ਹੋਇਆ"
+      ],
+      "Authenticating with Identity Provider": [
+         null,
+         "ਪਛਾਣ ਪਰੋਵਾਇਡਰ ਨਾਲ ਪਰਮਾਣਿਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
+         null,
+         "ਸਾਨੂੰ ਤੁਹਾਡੇ ਈਮੇਲ ਪਰੋਵਾਇਡਰ ਨਾਲ ਸੰਚਾਰ ਦੌਰਾਨ ਸਮੱਸਿਆ ਆਈ ਹੈ, ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ!"
+      ],
+      "Provisioning with Identity Provider": [
+         null,
+         "ਪਛਾਣ ਪਰੋਵਾਇਡਰ ਨਾਲ ਪਰਬੰਧ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "Provisioning Unsupported Identity Provider": [
+         null,
+         "ਗ਼ੈਰ-ਸਹਾਇਕ ਪਛਾਣ ਪਰੋਵਾਇਡਰ ਨਾਲ ਪਰਬੰਧ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
+         null,
+         "ਅਫਸੋਸ ਦਿੱਤਾ ਗਿਆ ਈਮੇਲ ਐਡਰੈਸ ਪ੍ਰਾਇਮਰੀ ਪਛਾਣ ਪਰੋਵਾਇਡਰ ਵਜੋਂ ਕੰਮ ਨਹੀਂ ਕਰ ਸਕਦਾ।"
+      ],
+      "Registration Failed": [
+         null,
+         "ਰਜਿਸਟੇਸ਼ਨ ਫੇਲ੍ਹ ਹੋਈ"
+      ],
+      "Establishing Relay": [
+         null,
+         "ਮੁੜ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "Relay frame could not be found": [
+         null,
+         "ਮੁੜ-ਸ਼ੁਰੂ ਕਰਨ ਫਰੇਮ ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਿਆ"
+      ],
+      "Resetting Password": [
+         null,
+         "ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "Remove Email Address from Account": [
+         null,
+         "ਅਕਾਊਂਟ ਤੋਂ ਈਮੇਲ ਐਡਰੈਸ ਹਟਾਉ"
+      ],
+      "Setting Password": [
+         null,
+         "ਪਾਸਵਰਡ ਸੈੱਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "Signin Failed": [
+         null,
+         "ਸਾਇਨ-ਇਨ ਫੇਲ੍ਹ ਹੈ"
+      ],
+      "Signup Failed": [
+         null,
+         "ਸਾਈਨ ਅੱਪ ਫੇਲ੍ਹ ਹੈ"
+      ],
+      "Syncing Address": [
+         null,
+         "ਐਡਰੈਸ ਸਿੰਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "ਈਮੇਲ ਐਡਰੈਸ ਸਿੰਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "ਐਡਰੈਸ ਲਈ ਸਿੰਕ ਕੁੰਜੀਆਂ"
+      ],
+      "Getting Token Info": [
+         null,
+         "ਟੋਕਨ ਜਾਣਕਾਰੀ ਲਈ ਜਾ ਰਹੀ ਹੈ"
+      ],
+      "Updating password": [
+         null,
+         "ਪਾਸਵਰਡ ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "Verifying email address": [
+         null,
+         "ਈਮੇਲ ਐਡਰੈੱਸ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+      ],
+      "Cancel": [
+         null,
+         "ਰੱਦ ਕਰੋ"
+      ]
+   }
+}
+;
diff --git a/resources/static/i18n/pa/messages.json b/resources/static/i18n/pa/messages.json
new file mode 100644
index 000000000..d2436591e
--- /dev/null
+++ b/resources/static/i18n/pa/messages.json
@@ -0,0 +1,191 @@
+;var json_locale_data = {
+   "messages": {
+      "": {
+         "Project-Id-Version": " PACKAGE VERSION",
+         "Report-Msgid-Bugs-To": " ",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-27 18:02+0200",
+         "Last-Translator": " A S <amanpreet.alam@gmail.com>",
+         "Language-Team": " LANGUAGE <LL@li.org>",
+         "Language": " pa",
+         "MIME-Version": " 1.0",
+         "Content-Type": " text/plain; charset=UTF-8",
+         "Content-Transfer-Encoding": " 8bit",
+         "Plural-Forms": " nplurals=2; plural=(n != 1) ;",
+         "X-Generator": " Pootle 2.1.6"
+      },
+      "Complete Login to %s using BrowserID": [
+         null,
+         "%s ਲਈ BrowserID ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਲਾਗਇਨ ਕਰਨਾ ਪੂਰਾ"
+      ],
+      "Error encountered while attempting to confirm your address. Have you previously verified this address?": [
+         null,
+         "ਤੁਹਾਡੇ ਐਡਰੈਸ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਹ ਐਡਰੈਸ ਦੀ ਪਹਿਲਾਂ ਵੀ ਜਾਂਚ ਕਰਵਾ ਚੁੱਕੇ ਹੋ?"
+      ],
+      "Error encountered trying to complete registration.": [
+         null,
+         "ਰਜਿਸਟਰੇਸ਼ਨ ਪੂਰੀ ਕਰਨ ਦੇ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
+      ],
+      "Finish signing into:": [
+         null,
+         "ਇਸ 'ਚ ਸਾਇਨ ਕਰਨਾ ਮੁਕੰਮਲ: "
+      ],
+      "Email Verification": [
+         null,
+         "ਈਮੇਲ ਜਾਂਚ"
+      ],
+      "Email Address": [
+         null,
+         "ਈਮੇਲ ਐਡਰੈੱਸ"
+      ],
+      "Your Email": [
+         null,
+         "ਤੁਹਾਡਾ ਈਮੇਲ"
+      ],
+      "New Password": [
+         null,
+         "ਨਵਾਂ ਪਾਸਵਰਡ"
+      ],
+      "Enter a Password": [
+         null,
+         "ਪਾਸਵਰਡ ਦਿਉ"
+      ],
+      "Password is required.": [
+         null,
+         "ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ।"
+      ],
+      "Password must be between 8 and 80 characters long.": [
+         null,
+         "ਪਾਸਵਰਡ 8 ਤੋਂ 80 ਅੱਖਰਾਂ ਵਿੱਚ ਵਿੱਚ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"
+      ],
+      "Verify Password": [
+         null,
+         "ਪਾਸਵਰਡ ਪੁਸ਼ਟੀ"
+      ],
+      "Repeat Password": [
+         null,
+         "ਪਾਸਵਰਡ ਪੁਸ਼ਟੀ"
+      ],
+      "Verification password is required.": [
+         null,
+         "ਪਾਸਵਰਡ ਜਾਂਚ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"
+      ],
+      "Passwords do not match.": [
+         null,
+         "ਪਾਸਵਰਡ ਮਿਲਦੇ ਨਹੀਂ ਹਨ।"
+      ],
+      "finish": [
+         null,
+         "ਮੁਕੰਮਲ"
+      ],
+      "<strong class=\"email\">Your address</strong> has been verified!": [
+         null,
+         "<strong class=\"email\">ਤੁਹਾਡੇ ਐਡਰੈਸ</strong> ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਚੁੱਕੀ ਹੈ!"
+      ],
+      "Your new address is set up and you should now be signed in. You may now close this window and go back to": [
+         null,
+         "ਤੁਹਾਡਾ ਨਵਾਂ ਐਡਰੈਸ ਸੈੱਟ ਕੀਤਾ ਜਾ ਚੁੱਕਾ ਹੈ ਅਤੇ ਹੁਣ ਤੁਸੀਂ ਸਾਇਨ ਇਨ ਕਰ ਸਕਦੇ ਹੋ। ਤੁਸੀਂ ਹੁਣ ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ ਅਤੇ ਪਿੱਛੇ ਜਾ ਸਕਦੇ ਹੋ"
+      ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID ਮੁੱਖ ਪੇਜ਼"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
+      "Communicating with server": [
+         null,
+         "ਸਰਵਰ ਨਾਲ ਸੰਪਰਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+      ],
+      "Just a moment while we talk with the server.": [
+         null,
+         "ਸਾਡੇ ਵਲੋਂ ਸਰਵਰ ਨਾਲ ਸੰਚਾਰ ਕਰਨ ਦੌਰਾਨ ਕੁਝ ਕੁ ਪਲ ਉਡੀਕੋ।"
+      ],
+      "BrowserID": [
+         null,
+         "BrowserID"
+      ],
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
+         null,
+         "BrowserID ਸਾਇਨ ਇਨ ਕਰਨ ਲਈ ਤੇਜ਼ ਅਤੇ ਸੁਰੱਖਿਅਤ ਢੰਗ ਹੈ &mdash; <a target=\"_blank\" href=\"/about\">ਹੋਰ ਜਾਣੋ</a>"
+      ],
+      "BrowserID: %s": [
+         null,
+         "BrowserID: %s"
+      ],
+      "BrowserID Home": [
+         null,
+         "BrowserID ਮੁੱਖ ਪੇਜ਼"
+      ],
+      "How it works": [
+         null,
+         "ਇਹ ਕਿਵੇਂ ਕੰਮ ਕਰਦਾ ਹੈ"
+      ],
+      "Developers": [
+         null,
+         "ਡਿਵੈਲਪਰ"
+      ],
+      "Sign In": [
+         null,
+         "ਸਾਇਨ ਇਨ"
+      ],
+      "Sign Out": [
+         null,
+         "ਸਾਈਨ-ਆਉਟ"
+      ],
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
+         null,
+         "<a href=\"%s\" target=\"_blank\">ਪਛਾਣ ਟੀਮ</a> @ <a href=\"%s\" target=\"_blank\">ਮੋਜ਼ੀਲਾ ਲੈਬ</a> ਵਲੋਂ"
+      ],
+      "Privacy": [
+         null,
+         "ਪਰਾਈਵੇਸੀ"
+      ],
+      "TOS": [
+         null,
+         "TOS"
+      ],
+      "Need Help?": [
+         null,
+         "ਮੱਦਦ ਚਾਹੀਦੀ ਹੈ?"
+      ],
+      "There was a problem with your signup link. Has this address already been registered?": [
+         null,
+         "ਤੁਹਾਡੇ ਸਾਇਨ ਅੱਪ ਲਿੰਕ ਨਾਲ ਇੱਕ ਸਮੱਸਿਆ ਸੀ। ਕੀ ਇਹ ਐਡਰੈਸ ਪਹਿਲਾਂ ਹੀ ਰਜਿਸਟਰ ਕੀਤਾ ਜਾ ਚੁੱਕਾ ਹੈ?"
+      ],
+      "Error communicating with server.": [
+         null,
+         "ਸਰਵਰ ਨਾਲ ਸੰਪਰਕ ਦੌਰਾਨ ਗਲਤੀ।"
+      ],
+      "Last step!": [
+         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!": [
+         null,
+         "<strong>BrowserID</strong> ਨਾਲ ਸਾਇਨ-ਅੱਪ ਕਰਨ ਲਈ ਤੁਹਾਡਾ ਧੰਨਵਾਦ। ਤੁਸੀਂ ਹੁਣ ਆਪਣੇ <strong>BrowserID</strong> ਅਕਾਊਂਟ ਵਿੱਚ <em>ਸਾਇਨ ਇਨ</em> ਜਾਂ <em>ਸਾਇਨ ਅੱਪ</em> ਕਰਕੇ ਵੈੱਬ ਉੱਤੇ ਸਭ ਵੈੱਬਸਾਇਟ ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਲਈ ਵਰਤ ਸਕਦੇ ਹੋ।"
+      ],
+      "Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.": [
+         null,
+         "ਆਪਣੇ ਈਮੇਲ ਐਡਰੈਸ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਧੰਨਵਾਦ। ਇਹ ਸੁਨੇਹੇ ਤੁਹਾਨੂੰ %s ਵਿੱਚ ਤੁਹਾਨੂੰ ਸਾਇਨ-ਇਨ ਪੂਰਾ ਕਰਨ ਲਈ ਭੇਜਿਆ ਗਿਆ ਹੈ।"
+      ],
+      "Finish registration by clicking this link:": [
+         null,
+         "ਇਹ ਲਿੰਕ ਉੱਤੇ ਕਲਿੱਕ ਕਰਕੇ ਰਜਿਸਟਰੇਸ਼ਨ ਪੂਰੀ ਕਰੋ:"
+      ],
+      "If you are NOT trying to sign into this site, just ignore this email.": [
+         null,
+         "ਜੇ ਤੁਸੀਂ ਇਹ ਸਾਇਟ ਉੱਤੇ ਸਾਇਨ ਇਨ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ *ਨਹੀਂ* ਕਰ ਰਹੇ ਹੋ ਤਾਂ ਇਹ ਈਮੇਲ ਅਣਡਿੱਠੀ ਕਰੋ।"
+      ],
+      "Thanks,": [
+         null,
+         "ਧੰਨਵਾਦ,"
+      ],
+      "(A better way to sign in)": [
+         null,
+         "(ਸਾਇਨ ਇਨ ਕਰਨ ਦਾ ਵਧੀਆ ਢੰਗ)"
+      ]
+   }
+}
+;
diff --git a/resources/static/i18n/pl/client.json b/resources/static/i18n/pl/client.json
index d3ce864fb..360dc66a1 100644
--- a/resources/static/i18n/pl/client.json
+++ b/resources/static/i18n/pl/client.json
@@ -3,9 +3,9 @@
       "": {
          "Project-Id-Version": " 1.0",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-01 03:21+0200",
-         "Last-Translator": " Leszek <leszekz@gmail.com>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-02 23:49+0100",
+         "Last-Translator": " Leszek Życzkowski <leszekz@gmail.com>",
          "Language-Team": " pl <leszekz@gmail.com>",
          "Language": " pl",
          "MIME-Version": " 1.0",
@@ -14,161 +14,13 @@
          "Plural-Forms": " nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);",
          "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
-         "Autoryzacja użytkownika"
+         "Do obsługi BrowserID wymagana jest akceptacja ciasteczek"
       ],
-      "Adding Address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "Dodawanie adresu"
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         "Dodawanie podstawowego adresu e-mail"
-      ],
-      "Checking Address Info": [
-         null,
-         "Sprawdzanie Informacji o adresie"
-      ],
-      "Authenticating with Assertion": [
-         null,
-         "Autoryzacja z potwierdzeniem"
-      ],
-      "Cancelling User Account": [
-         null,
-         "Usuwanie konta użytkownika"
-      ],
-      "Checking Authentication": [
-         null,
-         "Sprawdzanie autoryzacji"
-      ],
-      "Checking Script Version": [
-         null,
-         "Sprawdzanie wersji skryptu"
-      ],
-      "Completing User Registration": [
-         null,
-         "Kończenie rejestracji użytkownika"
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         "Przepraszamy, ale BrowserID wymaga ciasteczek"
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         "Do wykonywania operacji, BrowserID wymaga, aby w przeglądarce była włączona obsługa ciasteczek. Włącz w przeglądarce akceptowanie ciasteczek."
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         "Sprawdzanie obsługi ciasteczek"
-      ],
-      "Creating Account": [
-         null,
-         "Tworzenie konta"
-      ],
-      "Getting Assertion": [
-         null,
-         "Pobieranie potwierdzenia"
-      ],
-      "Checking Registration Token": [
-         null,
-         "Sprawdzanie tokena rejestracji"
-      ],
-      "Checking Email Address": [
-         null,
-         "Sprawdzanie adresu e-mail"
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         "Sprawdzanie, czy użytkownik jest autoryzowany za pomocą IdP"
-      ],
-      "Logout Failed": [
-         null,
-         "Wylogowanie się nie powiodło"
-      ],
-      "You are offline!": [
-         null,
-         "JesteÅ› offline!"
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         "Niestety BrowserID nie może zestawić połączenia, gdy jesteś offline!"
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         "Autoryzacja za pomocą modułu IdP"
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         "Wystąpił problem z połączeniem się z twoim dostawcą usługi pocztowej, ponów próbę!"
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         "Zabezpieczanie za pomocą modułu IdP"
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         "Zabezpieczanie nie obsługuje modułu IdP"
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         "Niestety, podany adres e-mail nie może służyć jako podstawowy moduł IdP"
-      ],
-      "Registration Failed": [
-         null,
-         "Rejestracja się nie powiodła"
-      ],
-      "Establishing Relay": [
-         null,
-         "Ustanawianie transmisji"
-      ],
-      "Relay frame could not be found": [
-         null,
-         "Nie znaleziono ramki transportu"
-      ],
-      "Resetting Password": [
-         null,
-         "Resetowanie hasła"
-      ],
-      "Remove Email Address from Account": [
-         null,
-         "Usuń adres e-mail z konta"
-      ],
-      "Setting Password": [
-         null,
-         "Ustanawianie hasła"
-      ],
-      "Signin Failed": [
-         null,
-         "Logowanie się nie powiodło"
-      ],
-      "Signup Failed": [
-         null,
-         "Wylogowanie się nie powiodło"
-      ],
-      "Syncing Address": [
-         null,
-         "Synchronizowanie adresu"
-      ],
-      "Syncing Email Addresses": [
-         null,
-         "Synchronizowanie adresów e-mail"
-      ],
-      "Sync Keys for Address": [
-         null,
-         "Synchronizowanie kluczy dla adresu"
-      ],
-      "Getting Token Info": [
-         null,
-         "Pobieranie informacji tokena"
-      ],
-      "Updating password": [
-         null,
-         "Aktualizacja hasła"
-      ],
-      "Verifying email address": [
-         null,
-         "Weryfikowanie adresu e-mail"
+         "Zamknij to okno, <a %s>włącz akceptację ciasteczek</a> i ponów próbę"
       ],
       "Communication Error": [
          null,
@@ -180,7 +32,7 @@
       ],
       "In just a moment you'll be signed into BrowserID.": [
          null,
-         "Za chwilÄ™ nastÄ…pi rejestracja w BrowserID."
+         "Za chwilÄ™ zalogujesz siÄ™ w BrowserID."
       ],
       "Please wait a few seconds while we sign you into the site.": [
          null,
@@ -196,7 +48,7 @@
       ],
       "Sign in using": [
          null,
-         "Znak jest już używany"
+         "Zaloguj się używając"
       ],
       "New email address": [
          null,
@@ -212,7 +64,7 @@
       ],
       "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
          null,
-         "Na ten adres została już wysłana wiadomość! jeśli chcesz wysłać inny, odoczekaj chwilę i ponów próbę."
+         "Na ten adres została już wysłana wiadomość! Jeśli chcesz wysłać inny, odczekaj chwilę i ponów próbę."
       ],
       "That address is already added to your account!": [
          null,
@@ -238,7 +90,7 @@
          null,
          "Witamy w BrowserID!"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
          "Ten adres e-mail wygląda na nowy, więc można dokonać konfiguracji."
       ],
@@ -258,6 +110,10 @@
          null,
          "Nie można zalogować się do konta, używając tej nazwy użytkownika i hasła."
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         "Klikając %s akceptujesz <a %s>regulamin korzystania z serwisu</a> i <a %s>zasady ochrony prywatności</a>."
+      ],
       "next": [
          null,
          "dalej"
@@ -266,17 +122,17 @@
          null,
          "weryfikuj adres e-mail"
       ],
-      "select email": [
+      "sign in": [
          null,
-         "zaznacz adres e-mail"
+         "zaloguj siÄ™"
       ],
       "Cannot verify %s": [
          null,
-         ""
+         "Nie można zweryfikować %s"
       ],
       "%s is a required address, but we cannot verify that you own this address.": [
          null,
-         ""
+         "Adres %s jest konieczny, ale nie można potwierdzić, że należy on do ciebie."
       ],
       "Check your email!": [
          null,
@@ -292,23 +148,39 @@
       ],
       "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
          null,
-         "Jeśli jest to pomyłka, zignoruj wiadomość i <a href=\"#\" class=\"cancel\" id=\"back\">użyj innego adresu e-mail</a>."
+         "Jeśli jest to pomyłka, zignoruj wiadomość i <a href=\"#\" id=\"cancel\">użyj innego adresu e-mail</a>."
       ],
       "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          null,
-         "Jeśli jest to pomyłka, zignoruj wiadomość i <a href=\"#\" class=\"cancel\" id=\"back\">użyj innego adresu e-mail</a>."
+         "Jeśli jest to pomyłka, zignoruj wiadomość i <a href=\"#\" id=\"back\">użyj innego adresu e-mail</a>."
       ],
-      "The site requested you sign in using": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         "Witryna wymaga zalogowania za pomocÄ…"
+         "Przepraszamy, ale serwer jest bardzo przeciążony!"
+      ],
+      "We are very sorry, there has been an error!": [
+         null,
+         "Przepraszamy bardzo, wystąpił błąd!"
       ],
-      "Reset Password": [
+      "Please reload the page and try again.": [
          null,
-         "Resetuj hasło"
+         "Odśwież stronę i spróbuj jeszcze raz."
       ],
-      "Cancel": [
+      "Please close this window and try again.": [
          null,
-         "Anuluj"
+         "Zamknij to okno i spróbuj jeszcze raz."
+      ],
+      "See more info": [
+         null,
+         "Zobacz więcej informacji"
+      ],
+      "The site requested you sign in using": [
+         null,
+         "Witryna wymaga zalogowania za pomocÄ…"
+      ],
+      "reset password": [
+         null,
+         "resetuj hasło"
       ],
       "*%s* is not a valid email address!": [
          null,
@@ -318,10 +190,6 @@
          null,
          "Aby kontynuować, zamknij okno i podaj prawidłowy adres e-mail."
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
-         null,
-         "Przepraszamy, ale nie możesz połączyć się z BrowserID, gdy jesteś offline."
-      ],
       "This is not me...": [
          null,
          "To nie ja…"
@@ -334,10 +202,6 @@
          null,
          "Loguj się, używając zawsze tego adresu e-mail"
       ],
-      "sign in": [
-         null,
-         "zaloguj siÄ™"
-      ],
       "Address Verified!": [
          null,
          "Adres e-mail został zweryfikowany!"
@@ -350,29 +214,13 @@
          null,
          "Aby sprawdzić, czy ten adres e-mail należy do ciebie, musisz się zalogować u swojego dostawcy usługi pocztowej. To okno zostanie przekierowane do"
       ],
-      "Verify": [
+      "verify": [
          null,
-         "Sprawdź"
+         "weryfikuj"
       ],
       "Verify With Email Provider": [
          null,
          "Sprawdź za pośrednictwem dostarczyciela usługi pocztowej"
-      ],
-      "#~ \"We just sent an email to that address!  If you really want to send \"#~ \"another, wait a minute or two and try again.\"": [
-         null,
-         "#~ \"Na ten adres została wysłana wiadomość! Jeśli chcesz wysłać inny, \"#~ \"odczekaj chwilę i i spróbuj ponownie.\""
-      ],
-      "This email looks new, so let&apos;s get you set up.": [
-         null,
-         "Ten e-mail wygląda na nowy, więc przejdźmy do konfiguracji."
-      ],
-      "#~ \"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,
-         "#~ \"Aby sprawdzić, czy adres <strong id='primary_email'>%s</strong> należy do \"#~ \"ciebie, musisz się zalogować u swojego dostawcy usługi pocztowej. To okno \"#~ \"zostanie przekierowane do\""
-      ],
-      "translated text": [
-         null,
-         "tekst przetłumaczony"
       ]
    }
 }
diff --git a/resources/static/i18n/pl/messages.json b/resources/static/i18n/pl/messages.json
index 8f3a2ac6f..a3308674e 100644
--- a/resources/static/i18n/pl/messages.json
+++ b/resources/static/i18n/pl/messages.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " 1.0",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-01-30 03:01+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-02 23:46+0100",
          "Last-Translator": " Leszek Życzkowski <leszekz@gmail.com>",
          "Language-Team": " pl <leszekz@gmail.com>",
          "Language": " pl",
@@ -26,7 +26,7 @@
          null,
          "Podczas kończenia procesu rejestracji wystąpił błąd."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          "Zakończ rejestrację do: "
       ],
@@ -74,9 +74,9 @@
          null,
          "Hasła są niezgodne."
       ],
-      "Finish": [
+      "finish": [
          null,
-         "Zakończ"
+         "zakończ"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
@@ -86,6 +86,14 @@
          null,
          "Nowy adres został określony i rejestracja została dokonana. Możesz teraz zamknąć to okno i powrócić do"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "Do działania BrowserID wymagane jest akceptowanie ciasteczek"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "Zamknij to okno, <a %s>włącz akceptowanie ciasteczek</a> i ponów próbę"
+      ],
       "Communicating with server": [
          null,
          "Łączenie z serwerem"
@@ -98,9 +106,9 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         "BrowserID ijest szybką i bezpieczną metodą logowania &ndash; <a target=\"_blank\" href=\"/about\">dowiedz się więcej</a>"
+         "BrowserID jest szybką i bezpieczną metodą logowania &ndash; <a %s>dowiedz się więcej</a>"
       ],
       "BrowserID: %s": [
          null,
@@ -126,9 +134,9 @@
          null,
          "Wyloguj siÄ™"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         "Przez <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
+         "Przez <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
@@ -146,7 +154,7 @@
          null,
          "Wystąpił problem z twoim odnośnikiem potwierdzającym rejestrację. Czy ten adres e-mail był już zarejestrowany?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "Nie można skontaktować się z serwerem."
       ],
@@ -160,7 +168,7 @@
       ],
       "Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.": [
          null,
-         ""
+         "Dziękujemy za dokonanie weryfikacji swojego adresu e-mail. Ta wiadomość jest wysyłana do ciebie, aby zakończyć proces logowania do %s."
       ],
       "Finish registration by clicking this link:": [
          null,
@@ -177,10 +185,6 @@
       "(A better way to sign in)": [
          null,
          "(Lepsza metoda logowania)"
-      ],
-      "Browser ID": [
-         null,
-         "Browser ID"
       ]
    }
 }
diff --git a/resources/static/i18n/pt/client.json b/resources/static/i18n/pt/client.json
index b20074275..72bbf7c02 100644
--- a/resources/static/i18n/pt/client.json
+++ b/resources/static/i18n/pt/client.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
          "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
          "Language-Team": " LANGUAGE <LL@li.org>",
@@ -12,159 +12,11 @@
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
          ""
       ],
-      "Adding Address": [
-         null,
-         ""
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         ""
-      ],
-      "Checking Address Info": [
-         null,
-         ""
-      ],
-      "Authenticating with Assertion": [
-         null,
-         ""
-      ],
-      "Cancelling User Account": [
-         null,
-         ""
-      ],
-      "Checking Authentication": [
-         null,
-         ""
-      ],
-      "Checking Script Version": [
-         null,
-         ""
-      ],
-      "Completing User Registration": [
-         null,
-         ""
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         ""
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         ""
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         ""
-      ],
-      "Creating Account": [
-         null,
-         ""
-      ],
-      "Getting Assertion": [
-         null,
-         ""
-      ],
-      "Checking Registration Token": [
-         null,
-         ""
-      ],
-      "Checking Email Address": [
-         null,
-         ""
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         ""
-      ],
-      "Logout Failed": [
-         null,
-         ""
-      ],
-      "You are offline!": [
-         null,
-         ""
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         ""
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         ""
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         ""
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         ""
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         ""
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         ""
-      ],
-      "Registration Failed": [
-         null,
-         ""
-      ],
-      "Establishing Relay": [
-         null,
-         ""
-      ],
-      "Relay frame could not be found": [
-         null,
-         ""
-      ],
-      "Resetting Password": [
-         null,
-         ""
-      ],
-      "Remove Email Address from Account": [
-         null,
-         ""
-      ],
-      "Setting Password": [
-         null,
-         ""
-      ],
-      "Signin Failed": [
-         null,
-         ""
-      ],
-      "Signup Failed": [
-         null,
-         ""
-      ],
-      "Syncing Address": [
-         null,
-         ""
-      ],
-      "Syncing Email Addresses": [
-         null,
-         ""
-      ],
-      "Sync Keys for Address": [
-         null,
-         ""
-      ],
-      "Getting Token Info": [
-         null,
-         ""
-      ],
-      "Updating password": [
-         null,
-         ""
-      ],
-      "Verifying email address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
          ""
       ],
@@ -236,7 +88,7 @@
          null,
          ""
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
          ""
       ],
@@ -256,6 +108,10 @@
          null,
          ""
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         ""
+      ],
       "next": [
          null,
          ""
@@ -264,7 +120,7 @@
          null,
          ""
       ],
-      "select email": [
+      "sign in": [
          null,
          ""
       ],
@@ -296,43 +152,51 @@
          null,
          ""
       ],
-      "The site requested you sign in using": [
+      "We are very sorry, the server is under extreme load!": [
          null,
          ""
       ],
-      "Reset Password": [
+      "We are very sorry, there has been an error!": [
          null,
          ""
       ],
-      "Cancel": [
+      "Please reload the page and try again.": [
          null,
          ""
       ],
-      "*%s* is not a valid email address!": [
+      "Please close this window and try again.": [
          null,
          ""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "See more info": [
          null,
          ""
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "The site requested you sign in using": [
          null,
          ""
       ],
-      "This is not me...": [
+      "reset password": [
          null,
          ""
       ],
-      "Use a different email": [
+      "*%s* is not a valid email address!": [
          null,
          ""
       ],
-      "Always sign in using this email": [
+      "To continue, please close the window and enter a valid address.": [
          null,
          ""
       ],
-      "sign in": [
+      "This is not me...": [
+         null,
+         ""
+      ],
+      "Use a different email": [
+         null,
+         ""
+      ],
+      "Always sign in using this email": [
          null,
          ""
       ],
@@ -348,7 +212,7 @@
          null,
          ""
       ],
-      "Verify": [
+      "verify": [
          null,
          ""
       ],
diff --git a/resources/static/i18n/pt/messages.json b/resources/static/i18n/pt/messages.json
index 14ebc83b7..ec790afc1 100644
--- a/resources/static/i18n/pt/messages.json
+++ b/resources/static/i18n/pt/messages.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
          "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
          "Language-Team": " LANGUAGE <LL@li.org>",
@@ -24,7 +24,7 @@
          null,
          ""
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          ""
       ],
@@ -72,7 +72,7 @@
          null,
          ""
       ],
-      "Finish": [
+      "finish": [
          null,
          ""
       ],
@@ -84,6 +84,14 @@
          null,
          ""
       ],
+      "BrowserID requires cookies": [
+         null,
+         ""
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
       "Communicating with server": [
          null,
          ""
@@ -96,7 +104,7 @@
          null,
          ""
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
          ""
       ],
@@ -124,7 +132,7 @@
          null,
          ""
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
          ""
       ],
@@ -144,7 +152,7 @@
          null,
          ""
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          ""
       ],
diff --git a/resources/static/i18n/pt_BR/client.json b/resources/static/i18n/pt_BR/client.json
index b20074275..f9d8baba2 100644
--- a/resources/static/i18n/pt_BR/client.json
+++ b/resources/static/i18n/pt_BR/client.json
@@ -3,358 +3,352 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
-         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-21 16:01+0200",
+         "Last-Translator": " Reuben <reuben.morais@gmail.com>",
          "Language-Team": " LANGUAGE <LL@li.org>",
-         "Language": " ",
+         "Language": " pt_BR",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
-         "Content-Transfer-Encoding": " 8bit"
+         "Content-Transfer-Encoding": " 8bit",
+         "Plural-Forms": " nplurals=2; plural=(n > 1);",
+         "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
-         ""
-      ],
-      "Adding Address": [
-         null,
-         ""
+         "Habilite os cookies"
       ],
-      "Adding Primary Email Address to User": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
          ""
       ],
-      "Checking Address Info": [
-         null,
-         ""
-      ],
-      "Authenticating with Assertion": [
+      "Communication Error": [
          null,
-         ""
+         "Falha na comunicação"
       ],
-      "Cancelling User Account": [
+      "Finishing Sign In...": [
          null,
-         ""
+         "Conectando..."
       ],
-      "Checking Authentication": [
+      "In just a moment you'll be signed into BrowserID.": [
          null,
-         ""
+         "Em segundos você estará conectado a sua conta BrowserID."
       ],
-      "Checking Script Version": [
+      "Please wait a few seconds while we sign you into the site.": [
          null,
-         ""
+         "Aguarde um momento enquanto o conectamos ao site."
       ],
-      "Completing User Registration": [
+      "We are sorry, this request is taking a LOOONG time.": [
          null,
-         ""
+         "Desculpe-nos, esta operação está demorando muito."
       ],
-      "We are sorry, BrowserID requires cookies": [
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
          null,
-         ""
+         "Essa mensagem desaparecerá quando a operação estiver concluída. Se estiver demorando demais, feche essa janela e tente novamente."
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
+      "Sign in using": [
          null,
-         ""
+         "Acesse utilizando"
       ],
-      "Checking if Cookies are Enabled": [
+      "New email address": [
          null,
-         ""
+         "Novo endereço de e-mail"
       ],
-      "Creating Account": [
+      "This field must be an email address.": [
          null,
-         ""
+         "Este campo precisa ser um endereço de e-mail."
       ],
-      "Getting Assertion": [
+      "The email field is required.": [
          null,
-         ""
+         "O campo de e-mail é necessário."
       ],
-      "Checking Registration Token": [
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
          null,
-         ""
+         "Nós já enviamos um e-mail para este endereço! Se você deseja que seja enviado outro, aguarde alguns minutos e tente novamente."
       ],
-      "Checking Email Address": [
+      "That address is already added to your account!": [
          null,
-         ""
+         "Este endereço já está adicionado a sua conta!"
       ],
-      "Checking Whether User is Authenticated with IdP": [
+      "add": [
          null,
-         ""
+         "adicionar"
       ],
-      "Logout Failed": [
+      "cancel": [
          null,
-         ""
+         "cancelar"
       ],
-      "You are offline!": [
+      "Email": [
          null,
-         ""
+         "E-mail"
       ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
+      "Enter your email address to sign in to <strong>%s</strong>": [
          null,
-         ""
+         "Digite seu endereço de e-mail para entrar em <strong>%s</strong>"
       ],
-      "Authenticating with Identity Provider": [
+      "Welcome to BrowserID!": [
          null,
-         ""
+         "Bem-vindo ao BrowserID!"
       ],
-      "We had trouble communicating with your email provider, please try again!": [
+      "This email looks new, so let's get you set up.": [
          null,
-         ""
+         "Este parece ser um novo e-mail, vamos te ajudar a configurá-lo."
       ],
-      "Provisioning with Identity Provider": [
+      "Password": [
          null,
-         ""
+         "Senha"
       ],
-      "Provisioning Unsupported Identity Provider": [
+      "forgot your password?": [
          null,
-         ""
+         "esqueceu sua senha?"
       ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
+      "The password field is required.": [
          null,
-         ""
+         "O campo senha é necessário."
       ],
-      "Registration Failed": [
+      "The account cannot be logged in with this username and password.": [
          null,
-         ""
+         "Este conta não pode ser acessada com este usuário e senha."
       ],
-      "Establishing Relay": [
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
          null,
          ""
       ],
-      "Relay frame could not be found": [
+      "next": [
          null,
-         ""
+         "próximo"
       ],
-      "Resetting Password": [
+      "verify email": [
          null,
-         ""
+         "verificar e-mail"
       ],
-      "Remove Email Address from Account": [
+      "sign in": [
          null,
-         ""
+         "entrar"
       ],
-      "Setting Password": [
+      "Cannot verify %s": [
          null,
-         ""
+         "Não foi possível verificar %s"
       ],
-      "Signin Failed": [
+      "%s is a required address, but we cannot verify that you own this address.": [
          null,
-         ""
+         "%s é um endereço necessário, mas não foi possível verificar se o mesmo pertence a você."
       ],
-      "Signup Failed": [
+      "Check your email!": [
          null,
-         ""
+         "Confira seu e-mail!"
       ],
-      "Syncing Address": [
+      "We sent a confirmation email to <strong>%s</strong>": [
          null,
-         ""
+         "Nós enviamos um e-mail de confirmação para <strong>%s</strong>"
       ],
-      "Syncing Email Addresses": [
+      "To finish signing in just click the verify link we sent to your email address.": [
          null,
-         ""
+         "Para completar seu cadastro clique no link de verificação que enviamos para seu e-mail."
       ],
-      "Sync Keys for Address": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
          null,
-         ""
+         "Se foi um engano, ignore o email enviado e <a href=\"#\" id=\"cancel\">cancele</a> a operação."
       ],
-      "Getting Token Info": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          null,
-         ""
+         "Se foi um engano, ignore o e-mail enviado e <a href=\"#\" id=\"back\">use outro</a>."
       ],
-      "Updating password": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         ""
+         "Desculpe, o servidor está sobrecarregado!"
       ],
-      "Verifying email address": [
+      "We are very sorry, there has been an error!": [
          null,
-         ""
+         "Desculpe, houve um erro!"
       ],
-      "Communication Error": [
+      "Please reload the page and try again.": [
          null,
-         ""
+         "Recarregue esta página e tente novamente."
       ],
-      "Finishing Sign In...": [
+      "Please close this window and try again.": [
          null,
-         ""
+         "Feche essa janela e tente novamente."
       ],
-      "In just a moment you'll be signed into BrowserID.": [
+      "See more info": [
          null,
-         ""
+         "Mais informações"
       ],
-      "Please wait a few seconds while we sign you into the site.": [
+      "The site requested you sign in using": [
          null,
-         ""
+         "Este site solicitou que você conecte-se utilizando"
       ],
-      "We are sorry, this request is taking a LOOONG time.": [
+      "reset password": [
          null,
-         ""
+         "criar uma nova senha"
       ],
-      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+      "*%s* is not a valid email address!": [
          null,
-         ""
+         "*%s* não é um e-mail válido!"
       ],
-      "Sign in using": [
+      "To continue, please close the window and enter a valid address.": [
          null,
-         ""
+         "Para continuar, por favor feche esta janela e digite um e-mail válido."
       ],
-      "New email address": [
+      "This is not me...": [
          null,
-         ""
+         "Este não sou eu..."
       ],
-      "This field must be an email address.": [
+      "Use a different email": [
          null,
-         ""
+         "Usar um e-mail diferente"
       ],
-      "The email field is required.": [
+      "Always sign in using this email": [
          null,
-         ""
+         "Sempre utilizar este e-mail para conectar"
       ],
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
+      "Address Verified!": [
          null,
-         ""
+         "Endereço verificado!"
       ],
-      "That address is already added to your account!": [
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
          null,
-         ""
+         "Sua identidade foi confirmada pelo seu servidor de e-mail, vamos tentar conectar você agora."
       ],
-      "add": [
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
          null,
-         ""
+         "Você precisa se conectar ao seu provedor de e-mail para verificar este endereço. Esta janela será redirecionada para"
       ],
-      "cancel": [
+      "verify": [
          null,
-         ""
+         "verificar"
       ],
-      "Email": [
+      "Verify With Email Provider": [
          null,
-         ""
+         "Verifique com o seu provedor de e-mail"
       ],
-      "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,
-         ""
+         "#~ \"É preciso habilitar cookies em seu navegador para usar o BrowserID. Por \"#~ \"favor habilite esta função e tente novamente\""
       ],
-      "Welcome to BrowserID!": [
+      "You are offline!": [
          null,
-         ""
+         "Você está desconectado!"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "Unfortunately, BrowserID cannot communicate while offline!": [
          null,
-         ""
+         "#~ \"Infelizmente o BrowserID não pode funcionar se você não está conectado à \"#~ \"Internet!\""
       ],
-      "Password": [
+      "select email": [
          null,
-         ""
+         "selecione o e-mail"
       ],
-      "forgot your password?": [
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
          null,
-         ""
+         "#~ \"Desculpe-nos, mas não conseguimos conectar ao BrowserID sem uma conexão \"#~ \"com a Internet.\""
       ],
-      "The password field is required.": [
+      "Adding Address": [
          null,
-         ""
+         "Adicionando Endereço"
       ],
-      "The account cannot be logged in with this username and password.": [
+      "Adding Primary Email Address to User": [
          null,
-         ""
+         "Adicionando um e-mail principal para o usuário"
       ],
-      "next": [
+      "Checking Address Info": [
          null,
-         ""
+         "Checando informações do endereço"
       ],
-      "verify email": [
+      "Cancelling User Account": [
          null,
-         ""
+         "Cancelando conta do usuário"
       ],
-      "select email": [
+      "Checking Authentication": [
          null,
-         ""
+         "Checando autenticação"
       ],
-      "Cannot verify %s": [
+      "Checking Script Version": [
          null,
-         ""
+         "Checando a versão do script"
       ],
-      "%s is a required address, but we cannot verify that you own this address.": [
+      "Completing User Registration": [
          null,
-         ""
+         "Concluindo o registro de usuário"
       ],
-      "Check your email!": [
+      "Checking if Cookies are Enabled": [
          null,
-         ""
+         "Checando se cookies estão habilidados"
       ],
-      "We sent a confirmation email to <strong>%s</strong>": [
+      "Creating Account": [
          null,
-         ""
+         "Criando conta"
       ],
-      "To finish signing in just click the verify link we sent to your email address.": [
+      "Checking Registration Token": [
          null,
-         ""
+         "Checando o código de registro"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+      "Checking Email Address": [
          null,
-         ""
+         "Checando seu endereço de e-mail"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+      "Logout Failed": [
          null,
-         ""
+         "Não foi possível desconectar"
       ],
-      "The site requested you sign in using": [
+      "Authenticating with Identity Provider": [
          null,
-         ""
+         "Autenticando com o Provedor de Identidades"
       ],
-      "Reset Password": [
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
          null,
-         ""
+         "#~ \"Tivemos um problema ao conectar com o seu provedor de e-mail. Por favor, \"#~ \"tente novamente!\""
       ],
-      "Cancel": [
+      "Provisioning with Identity Provider": [
          null,
-         ""
+         "Conversando com o Provedor de Identidades"
       ],
-      "*%s* is not a valid email address!": [
+      "Provisioning Unsupported Identity Provider": [
          null,
-         ""
+         "Conversando com Provedor de Identidades desconhecido"
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
          null,
-         ""
+         "#~ \"Infelizmente o e-mail inserido não pode ser utilizado como um \"#~ \"Identificador Primário de Identidade\""
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "Registration Failed": [
          null,
-         ""
+         "Não foi possível concluir o cadastro."
       ],
-      "This is not me...": [
+      "Remove Email Address from Account": [
          null,
-         ""
+         "Removendo o endereço de e-mail desta conta"
       ],
-      "Use a different email": [
+      "Setting Password": [
          null,
-         ""
+         "Criando uma senha"
       ],
-      "Always sign in using this email": [
+      "Signin Failed": [
          null,
-         ""
+         "Não foi possível conectar"
       ],
-      "sign in": [
+      "Signup Failed": [
          null,
-         ""
+         "Não foi possível concluir o cadastro"
       ],
-      "Address Verified!": [
+      "Syncing Email Addresses": [
          null,
-         ""
+         "Sincronizando endereços de e-mail"
       ],
-      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+      "Sync Keys for Address": [
          null,
-         ""
+         "Chaves de sincronização do endereço"
       ],
-      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+      "Getting Token Info": [
          null,
-         ""
+         "Recebendo informações do código de registro"
       ],
-      "Verify": [
+      "Updating password": [
          null,
-         ""
+         "Atualizando senha"
       ],
-      "Verify With Email Provider": [
+      "Verifying email address": [
          null,
-         ""
+         "Verificando endereço de e-mail"
       ]
    }
 }
diff --git a/resources/static/i18n/pt_BR/messages.json b/resources/static/i18n/pt_BR/messages.json
index 14ebc83b7..e24c12367 100644
--- a/resources/static/i18n/pt_BR/messages.json
+++ b/resources/static/i18n/pt_BR/messages.json
@@ -3,178 +3,188 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
-         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-12 18:48+0200",
+         "Last-Translator": " Reuben <reuben.morais@gmail.com>",
          "Language-Team": " LANGUAGE <LL@li.org>",
-         "Language": " ",
+         "Language": " pt_BR",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
-         "Content-Transfer-Encoding": " 8bit"
+         "Content-Transfer-Encoding": " 8bit",
+         "Plural-Forms": " nplurals=2; plural=(n > 1);",
+         "X-Generator": " Pootle 2.1.6"
       },
       "Complete Login to %s using BrowserID": [
          null,
-         ""
+         "Conclua o acesso em %s usando o BrowserID"
       ],
       "Error encountered while attempting to confirm your address. Have you previously verified this address?": [
          null,
-         ""
+         "Erro encontrado ao tentar confirmar seu endereço. Você já verificou este endereço?"
       ],
       "Error encountered trying to complete registration.": [
          null,
-         ""
+         "Erro encontrado ao concluir o cadastro."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         ""
+         "Conclua o acesso a:"
       ],
       "Email Verification": [
          null,
-         ""
+         "Verificação de e-mail"
       ],
       "Email Address": [
          null,
-         ""
+         "Endereço de e-mail"
       ],
       "Your Email": [
          null,
-         ""
+         "Seu e-mail"
       ],
       "New Password": [
          null,
-         ""
+         "Nova senha"
       ],
       "Enter a Password": [
          null,
-         ""
+         "Digite uma senha"
       ],
       "Password is required.": [
          null,
-         ""
+         "A senha é necessária."
       ],
       "Password must be between 8 and 80 characters long.": [
          null,
-         ""
+         "A senha deve ter entre 8 e 80 caracteres."
       ],
       "Verify Password": [
          null,
-         ""
+         "Verifique a senha"
       ],
       "Repeat Password": [
          null,
-         ""
+         "Repita a senha"
       ],
       "Verification password is required.": [
          null,
-         ""
+         "Verificação da senha é necessária."
       ],
       "Passwords do not match.": [
          null,
-         ""
+         "As senhas não coincidem."
       ],
-      "Finish": [
+      "finish": [
          null,
-         ""
+         "finalizar"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
-         ""
+         "<strong class=\"email\">Seu endereço</strong> foi verificado!"
       ],
       "Your new address is set up and you should now be signed in. You may now close this window and go back to": [
          null,
-         ""
+         "Seu novo endereço está configurado e você está conectado. Agora você pode fechar esta janela e voltar para"
+      ],
+      "BrowserID requires cookies": [
+         null,
+         "Habilite cookies para usar o BrowserID"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "Por favor, feche esta janela, <a %s>habilite os cookies</a> e tente novamente"
       ],
       "Communicating with server": [
          null,
-         ""
+         "Comunicando com o servidor"
       ],
       "Just a moment while we talk with the server.": [
          null,
-         ""
+         "Aguarde um momento enquanto conversamos com o servidor."
       ],
       "BrowserID": [
          null,
-         ""
+         "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         ""
+         "BrowserID é o modo mais rápido e seguro de se conectar a &mdash; <a %s>aprenda mais</a>"
       ],
       "BrowserID: %s": [
          null,
-         ""
+         "BrowserID: %s"
       ],
       "BrowserID Home": [
          null,
-         ""
+         "Home"
       ],
       "How it works": [
          null,
-         ""
+         "Como funciona"
       ],
       "Developers": [
          null,
-         ""
+         "Desenvolvedores"
       ],
       "Sign In": [
          null,
-         ""
+         "Entrar"
       ],
       "Sign Out": [
          null,
-         ""
+         "Sair"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         ""
+         "By <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
-         ""
+         "Privacidade"
       ],
       "TOS": [
          null,
-         ""
+         "Termos de Serviço"
       ],
       "Need Help?": [
          null,
-         ""
+         "Precisa de ajuda?"
       ],
       "There was a problem with your signup link. Has this address already been registered?": [
          null,
-         ""
+         "Houve um problema com seu link de cadastro. Esse e-mail já está cadastrado?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
-         ""
+         "Erro ao comunicar com o servidor."
       ],
       "Last step!": [
          null,
-         ""
+         "Último passo!"
       ],
       "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,
-         ""
+         "Obrigado por se cadastrar no <strong>BrowserID</strong>. Você agora pode usar a sua conta <strong>BrowserID</strong> para <em>Entrar</em> ou <em>Registrar-se</em> em websites por toda a rede!"
       ],
       "Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.": [
          null,
-         ""
+         "Obrigado por verificar seu endereço de e-mail. Esta mensagem está sendo enviada a você para concluir o acesso em %s."
       ],
       "Finish registration by clicking this link:": [
          null,
-         ""
+         "Conclua o cadastro clicando neste link:"
       ],
       "If you are NOT trying to sign into this site, just ignore this email.": [
          null,
-         ""
+         "Se você NÃO está tentando se cadastrar neste site, apenas ignore este e-mail."
       ],
       "Thanks,": [
          null,
-         ""
+         "Obrigado,"
       ],
       "(A better way to sign in)": [
          null,
-         ""
+         "(Um modo melhor de logar-se)"
       ]
    }
 }
diff --git a/resources/static/i18n/rm/client.json b/resources/static/i18n/rm/client.json
index 368a12f41..30ea508bf 100644
--- a/resources/static/i18n/rm/client.json
+++ b/resources/static/i18n/rm/client.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-03 18:04+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-27 23:38+0200",
          "Last-Translator": " Gion-Andri <gion-andri@gmx.ch>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " rm",
@@ -14,162 +14,14 @@
          "Plural-Forms": " nplurals=2; plural=(n != 1) ;",
          "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
-         null,
-         "Autentifitgar l'utilisader"
-      ],
-      "Adding Address": [
-         null,
-         "Agiuntar ina adressa"
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         "Agiuntar ina adressa dad e-mail principala a l'utilisader"
-      ],
-      "Checking Address Info": [
-         null,
-         "Controlla da las infurmaziuns d'adressa"
-      ],
-      "Authenticating with Assertion": [
-         null,
-         ""
-      ],
-      "Cancelling User Account": [
-         null,
-         "Il conto d'utilisader vegn allontanà"
-      ],
-      "Checking Authentication": [
-         null,
-         "Controllar l'autentificaziun"
-      ],
-      "Checking Script Version": [
-         null,
-         "Controllar la versiun dal script"
-      ],
-      "Completing User Registration": [
-         null,
-         "Cumpletar la registraziun da l'utilisader"
-      ],
-      "We are sorry, BrowserID requires cookies": [
+      "BrowserID requires cookies": [
          null,
          "Perstgisa, ma BrowserID utilisescha cookies"
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         "Per che BrowserID funcziunescha correctamain èsi necessari che l'utilisaziun da cookies è activada en tes navigatur. Activescha p. pl. ils cookies ed emprova danovamain."
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         "Controllar sche cookies èn activads"
-      ],
-      "Creating Account": [
-         null,
-         "Crear in conto"
-      ],
-      "Getting Assertion": [
-         null,
-         ""
-      ],
-      "Checking Registration Token": [
-         null,
-         "Controllar il token da registraziun"
-      ],
-      "Checking Email Address": [
-         null,
-         "Controllar l'adressa dad e-mail"
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         ""
-      ],
-      "Logout Failed": [
-         null,
-         "Errur cun partir"
-      ],
-      "You are offline!": [
-         null,
-         "Ti es offline!"
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         "Deplorabalamin na po BroswerID betg communitgar sche ti es en il modus offline."
-      ],
-      "Authenticating with Identity Provider": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
          ""
       ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         ""
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         ""
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         ""
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         ""
-      ],
-      "Registration Failed": [
-         null,
-         "Errur durant la registraziun"
-      ],
-      "Establishing Relay": [
-         null,
-         ""
-      ],
-      "Relay frame could not be found": [
-         null,
-         ""
-      ],
-      "Resetting Password": [
-         null,
-         "Redefinir il pled-clav"
-      ],
-      "Remove Email Address from Account": [
-         null,
-         "Allontanar l'adressa dad e-mail dal conto"
-      ],
-      "Setting Password": [
-         null,
-         "Definir il pled-clav"
-      ],
-      "Signin Failed": [
-         null,
-         "Errur cun s'annunziar"
-      ],
-      "Signup Failed": [
-         null,
-         "Errur cun registrar"
-      ],
-      "Syncing Address": [
-         null,
-         "Sincronisar l'adressa"
-      ],
-      "Syncing Email Addresses": [
-         null,
-         "Sincronisar las adressas dad e-mail"
-      ],
-      "Sync Keys for Address": [
-         null,
-         ""
-      ],
-      "Getting Token Info": [
-         null,
-         ""
-      ],
-      "Updating password": [
-         null,
-         "Actualisar il pled-clav"
-      ],
-      "Verifying email address": [
-         null,
-         "Verifitgar l'adressa dad e-mail"
-      ],
       "Communication Error": [
          null,
          "Errur da communicaziun"
@@ -184,7 +36,7 @@
       ],
       "Please wait a few seconds while we sign you into the site.": [
          null,
-         "Spetga in per secundas enfin nus t'annunziain tar la paigna."
+         "Spetga in per secundas enfin nus t'annunziain tar la pagina."
       ],
       "We are sorry, this request is taking a LOOONG time.": [
          null,
@@ -238,7 +90,7 @@
          null,
          "Bainvegni tar BrowserID!"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
          "Questa adressa dad e-mail para nova, lain registrar ella."
       ],
@@ -252,12 +104,16 @@
       ],
       "The password field is required.": [
          null,
-         "Il champ da pled-clav è necessri."
+         "Il champ da pled-clav è necessari."
       ],
       "The account cannot be logged in with this username and password.": [
          null,
          "Ti na pos betg t'annunziar tar quest conto cun quest num d'utilisader e quest pled-clav."
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         ""
+      ],
       "next": [
          null,
          "enavant"
@@ -266,9 +122,9 @@
          null,
          "verifitgar l'adressa dad e-mail"
       ],
-      "select email": [
+      "sign in": [
          null,
-         "tscherner l'adressa dad e-mail"
+         "s'annunziar"
       ],
       "Cannot verify %s": [
          null,
@@ -298,29 +154,41 @@
          null,
          "Sch'i sa tracta d'in sbagl, ignorescha l'e-mail tramess ed <a href=\"#\" id=\"back\">utilisescha ina autra adressa d'e-mail</a>."
       ],
+      "We are very sorry, the server is under extreme load!": [
+         null,
+         "Perstgisa, noss servers èn surchargiads!"
+      ],
+      "We are very sorry, there has been an error!": [
+         null,
+         "Perstgisa, ma ina errur è capitada!"
+      ],
+      "Please reload the page and try again.": [
+         null,
+         "Per cuntinuar stos ti rechargiar la pagina ed empruvar danovamain."
+      ],
+      "Please close this window and try again.": [
+         null,
+         "Per cuntinuar, serra p.pl. la fanestra ed emprova danovamain."
+      ],
+      "See more info": [
+         null,
+         "Mussar dapli infurmaziuns"
+      ],
       "The site requested you sign in using": [
          null,
          "La pagina dumonda che ti t'annunzias cun"
       ],
-      "Reset Password": [
+      "reset password": [
          null,
          "Redefinir il pled-clav"
       ],
-      "Cancel": [
-         null,
-         "Interrumper"
-      ],
       "*%s* is not a valid email address!": [
          null,
          "*%s* n'è betg ina adressa dad e-mail valida!"
       ],
       "To continue, please close the window and enter a valid address.": [
          null,
-         "Per continuar, serra p.pl. la fanestra ed endatescha ina adressa valida."
-      ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
-         null,
-         "Perstgisa, ma nus na pudain betg communitgar cun BrowserID durant che ti es offline."
+         "Per cuntinuar, serra p.pl. la fanestra ed endatescha ina adressa valida."
       ],
       "This is not me...": [
          null,
@@ -334,23 +202,19 @@
          null,
          "Adina s'annunziar cun questa adressa dad e-mail"
       ],
-      "sign in": [
-         null,
-         "s'annunziar"
-      ],
       "Address Verified!": [
          null,
          "Verifitgà l'adressa."
       ],
       "Your identity has been verified with your email provider, we will now try to sign you in.": [
          null,
-         ""
+         "Tia identitad è vegnida verifitgada cun tes provider dad e-mail. Nus empruvain ussa dad annunziar tai."
       ],
       "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
          null,
-         ""
+         "Ti stos s'annunziar tar tes provider dad e-mail per verifitgar che ti possedas questa adressa. Questa fanestra vegn renviada a"
       ],
-      "Verify": [
+      "verify": [
          null,
          "Verifitgar"
       ],
@@ -358,13 +222,125 @@
          null,
          "Verifitgar cun il provider dad e-mails"
       ],
-      "#~ \"We just sent an email to that address!  If you really want to send \"#~ \"another, wait a minute or two and try again.\"": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         "#~ \"Nus avain gist tramess in e-mail a questa adressa. Sche ti vuls propi \"#~ \"trametter anc in, spetga ina minuta u duas ed emprova danovamain.\""
+         "#~ \"Per che BrowserID funcziunescha correctamain èsi necessari che cookies èn \"#~ \"activads en tes navigatur. Activescha p.pl. ils cookies ed emprova \"#~ \"danovamain.\""
       ],
-      "This email looks new, so let&apos;s get you set up.": [
+      "You are offline!": [
          null,
-         "Questa adressa dad e-mail para nova, lain registrar ella."
+         "Ti es offline!"
+      ],
+      "Unfortunately, BrowserID cannot communicate while offline!": [
+         null,
+         "#~ \"Deplorablamain na po BrowserID betg communitgar sche ti es en il modus \"#~ \"offline.\""
+      ],
+      "select email": [
+         null,
+         "tscherner l'adressa dad e-mail"
+      ],
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
+         null,
+         "#~ \"Perstgisa, ma nus na pudain betg communitgar cun BrowserID durant che ti \"#~ \"es offline.\""
+      ],
+      "Authenticating User": [
+         null,
+         "Autentifitgar l'utilisader"
+      ],
+      "Adding Address": [
+         null,
+         "Agiuntar ina adressa"
+      ],
+      "Adding Primary Email Address to User": [
+         null,
+         "Agiuntar ina adressa dad e-mail principala a l'utilisader"
+      ],
+      "Checking Address Info": [
+         null,
+         "Controlla da las infurmaziuns d'adressa"
+      ],
+      "Cancelling User Account": [
+         null,
+         "Il conto d'utilisader vegn allontanà"
+      ],
+      "Checking Authentication": [
+         null,
+         "Controllar l'autentificaziun"
+      ],
+      "Checking Script Version": [
+         null,
+         "Controllar la versiun dal script"
+      ],
+      "Completing User Registration": [
+         null,
+         "Cumpletar la registraziun da l'utilisader"
+      ],
+      "Checking if Cookies are Enabled": [
+         null,
+         "Controllar sche cookies èn activads"
+      ],
+      "Creating Account": [
+         null,
+         "Crear in conto"
+      ],
+      "Checking Registration Token": [
+         null,
+         "Controllar il token da registraziun"
+      ],
+      "Checking Email Address": [
+         null,
+         "Controllar l'adressa dad e-mail"
+      ],
+      "Logout Failed": [
+         null,
+         "Errur cun partir"
+      ],
+      "Registration Failed": [
+         null,
+         "Errur durant la registraziun"
+      ],
+      "Resetting Password": [
+         null,
+         "Redefinir il pled-clav"
+      ],
+      "Remove Email Address from Account": [
+         null,
+         "Allontanar l'adressa dad e-mail dal conto"
+      ],
+      "Setting Password": [
+         null,
+         "Definir il pled-clav"
+      ],
+      "Signin Failed": [
+         null,
+         "Errur cun s'annunziar"
+      ],
+      "Signup Failed": [
+         null,
+         "Errur cun registrar"
+      ],
+      "Syncing Address": [
+         null,
+         "Sincronisar l'adressa"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "Sincronisar las adressas dad e-mail"
+      ],
+      "Updating password": [
+         null,
+         "Actualisar il pled-clav"
+      ],
+      "Verifying email address": [
+         null,
+         "Verifitgar l'adressa dad e-mail"
+      ],
+      "Cancel": [
+         null,
+         "Interrumper"
+      ],
+      "#~ \"We just sent an email to that address!  If you really want to send \"#~ \"another, wait a minute or two and try again.\"": [
+         null,
+         "#~ \"Nus avain gist tramess in e-mail a questa adressa. Sche ti vuls propi \"#~ \"trametter anc in, spetga ina minuta u duas ed emprova danovamain.\""
       ],
       "translated text": [
          null,
diff --git a/resources/static/i18n/rm/messages.json b/resources/static/i18n/rm/messages.json
index 479a6f5aa..12534f67c 100644
--- a/resources/static/i18n/rm/messages.json
+++ b/resources/static/i18n/rm/messages.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-03 18:18+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-27 23:41+0200",
          "Last-Translator": " Gion-Andri <gion-andri@gmx.ch>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " rm",
@@ -26,7 +26,7 @@
          null,
          "Ina errur è cumparida durant l'emprova da terminar la registraziun."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          "Terminar da s'annunziar tar: "
       ],
@@ -36,7 +36,7 @@
       ],
       "Email Address": [
          null,
-         "Adresa dad e-mail"
+         "Adressa dad e-mail"
       ],
       "Your Email": [
          null,
@@ -74,7 +74,7 @@
          null,
          "Ils pleds-clav na correspundan betg."
       ],
-      "Finish": [
+      "finish": [
          null,
          "Terminar"
       ],
@@ -86,9 +86,17 @@
          null,
          "Tia nova adressa è registrada e ti duessas ussa esser t'annunzià. Ti pos ussa serrar questa fanestra e returnar a "
       ],
+      "BrowserID requires cookies": [
+         null,
+         "Partenza da BrowserID"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
       "Communicating with server": [
          null,
-         "Communicar cun il server"
+         "Communitgar cun il server"
       ],
       "Just a moment while we talk with the server.": [
          null,
@@ -98,7 +106,7 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
          "BrowserID è la via sperta e segira per s'annunziar &mdash; <a target=\"_blank\" href=\"/about\">ulteriuras infurmaziuns</a>"
       ],
@@ -112,7 +120,7 @@
       ],
       "How it works": [
          null,
-         "Co ch'ei funcziunescha"
+         "Co ch'i funcziunescha"
       ],
       "Developers": [
          null,
@@ -126,7 +134,7 @@
          null,
          "Partir"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
          "Dal <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
       ],
@@ -146,7 +154,7 @@
          null,
          "Ina errur è cumparida cun tes link da s'annunziar. È questa adressa gia vegnida registrada?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "Errur durant communitgar cun il server."
       ],
@@ -176,7 +184,7 @@
       ],
       "(A better way to sign in)": [
          null,
-         "(Ina megliera via per s'annunziar)"
+         "(Ina meglra via per s'annunziar)"
       ],
       "Browser ID": [
          null,
diff --git a/resources/static/i18n/ro/client.json b/resources/static/i18n/ro/client.json
index e2537b8e0..7fbd1f6f0 100644
--- a/resources/static/i18n/ro/client.json
+++ b/resources/static/i18n/ro/client.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " browserid.org",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " 2012-02-02 07:26-0800",
          "Last-Translator": " Alexandru Szasz <alexxed@gmail.com>",
          "Language-Team": " Romanian <LL@li.org>",
@@ -14,159 +14,11 @@
          "X-Generator": " Narro 2.0 on http://tradu.softwareliber.ro",
          "Plural-Forms": "  nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;"
       },
-      "Authenticating User": [
-         null,
-         "Autentificare utilizator"
-      ],
-      "Adding Address": [
-         null,
-         "Adăugare adresă"
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         "Se adaugă adresa principală de email pentru utilizator"
-      ],
-      "Checking Address Info": [
-         null,
-         "Se verifică informații despre adresă"
-      ],
-      "Authenticating with Assertion": [
-         null,
-         "Autentificare cu aserțiune"
-      ],
-      "Cancelling User Account": [
-         null,
-         "Anulare cont de utilizator"
-      ],
-      "Checking Authentication": [
-         null,
-         "Se verifică autentificarea"
-      ],
-      "Checking Script Version": [
-         null,
-         "Se verifică versiunea scriptului"
-      ],
-      "Completing User Registration": [
-         null,
-         "Se finalizează înregistrarea utilizatorului"
-      ],
-      "We are sorry, BrowserID requires cookies": [
+      "BrowserID requires cookies": [
          null,
          "Ne pare rău, BrowserID are nevoie de cookie-uri"
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         ""
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         "Se verifică dacă cookie-urile sunt activate"
-      ],
-      "Creating Account": [
-         null,
-         "Se creează contul"
-      ],
-      "Getting Assertion": [
-         null,
-         "Se obține aserțiunea"
-      ],
-      "Checking Registration Token": [
-         null,
-         ""
-      ],
-      "Checking Email Address": [
-         null,
-         "Se verifică adresa de email"
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         ""
-      ],
-      "Logout Failed": [
-         null,
-         "Deconectare eșuată"
-      ],
-      "You are offline!": [
-         null,
-         "Sunteți deconectat!"
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         "Din păcate, BrowserID nu poate comunica când sunteți deconectat de la internet!"
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         ""
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         ""
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         ""
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         ""
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         ""
-      ],
-      "Registration Failed": [
-         null,
-         ""
-      ],
-      "Establishing Relay": [
-         null,
-         ""
-      ],
-      "Relay frame could not be found": [
-         null,
-         ""
-      ],
-      "Resetting Password": [
-         null,
-         ""
-      ],
-      "Remove Email Address from Account": [
-         null,
-         ""
-      ],
-      "Setting Password": [
-         null,
-         ""
-      ],
-      "Signin Failed": [
-         null,
-         ""
-      ],
-      "Signup Failed": [
-         null,
-         ""
-      ],
-      "Syncing Address": [
-         null,
-         ""
-      ],
-      "Syncing Email Addresses": [
-         null,
-         ""
-      ],
-      "Sync Keys for Address": [
-         null,
-         ""
-      ],
-      "Getting Token Info": [
-         null,
-         ""
-      ],
-      "Updating password": [
-         null,
-         ""
-      ],
-      "Verifying email address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
          ""
       ],
@@ -238,9 +90,9 @@
          null,
          "Bun venit la BrowserID!"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
-         ""
+         "Adresa de email pare nouă, așa că haideți să continuăm."
       ],
       "Password": [
          null,
@@ -258,6 +110,10 @@
          null,
          "Nu puteți intra în cont cu utilizatorul și parola aceasta."
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         ""
+      ],
       "next": [
          null,
          "înainte"
@@ -266,9 +122,9 @@
          null,
          "verificare email"
       ],
-      "select email": [
+      "sign in": [
          null,
-         "alegere email"
+         "autentificare"
       ],
       "Cannot verify %s": [
          null,
@@ -298,18 +154,34 @@
          null,
          ""
       ],
+      "We are very sorry, the server is under extreme load!": [
+         null,
+         ""
+      ],
+      "We are very sorry, there has been an error!": [
+         null,
+         ""
+      ],
+      "Please reload the page and try again.": [
+         null,
+         ""
+      ],
+      "Please close this window and try again.": [
+         null,
+         "Pentru a continua, vă rugăm închideți fereastra și introduceți o adresă validă de email."
+      ],
+      "See more info": [
+         null,
+         ""
+      ],
       "The site requested you sign in using": [
          null,
          "Saitul a cerut să vă autentificați folosind"
       ],
-      "Reset Password": [
+      "reset password": [
          null,
          "Resetează parola"
       ],
-      "Cancel": [
-         null,
-         "Anulează"
-      ],
       "*%s* is not a valid email address!": [
          null,
          "*%s* nu este o adresă validă de email!"
@@ -318,10 +190,6 @@
          null,
          "Pentru a continua, vă rugăm închideți fereastra și introduceți o adresă validă de email."
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
-         null,
-         "Ne pare rău, dar nu putem comunica cu BrowserID în timp ce sunteți deconectat de la internet."
-      ],
       "This is not me...": [
          null,
          "Nu sunt eu..."
@@ -334,10 +202,6 @@
          null,
          "Autentificați-vă folosind întotdeauna această adresă"
       ],
-      "sign in": [
-         null,
-         "autentificare"
-      ],
       "Address Verified!": [
          null,
          ""
@@ -350,7 +214,7 @@
          null,
          ""
       ],
-      "Verify": [
+      "verify": [
          null,
          "Verificare"
       ],
@@ -358,13 +222,85 @@
          null,
          "Verificare cu furnizorul de email"
       ],
-      "#~ \"We just sent an email to that address!  If you really want to send \"#~ \"another, wait a minute or two and try again.\"": [
+      "You are offline!": [
          null,
-         "#~ \"Tocmai v-am trimis un email la această adresă! Dacă chiar doriți să vă \"#~ \"trimitem altul, așteptați un minut sau două și încercați din nou.\""
+         "Sunteți deconectat!"
       ],
-      "This email looks new, so let&apos;s get you set up.": [
+      "Unfortunately, BrowserID cannot communicate while offline!": [
          null,
-         "Adresa de email pare nouă, așa că haideți să continuăm."
+         "#~ \"Din păcate, BrowserID nu poate comunica când sunteți deconectat de la \"#~ \"internet!\""
+      ],
+      "select email": [
+         null,
+         "alegere email"
+      ],
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
+         null,
+         "#~ \"Ne pare rău, dar nu putem comunica cu BrowserID în timp ce sunteți \"#~ \"deconectat de la internet.\""
+      ],
+      "Authenticating User": [
+         null,
+         "Autentificare utilizator"
+      ],
+      "Adding Address": [
+         null,
+         "Adăugare adresă"
+      ],
+      "Adding Primary Email Address to User": [
+         null,
+         "Se adaugă adresa principală de email pentru utilizator"
+      ],
+      "Checking Address Info": [
+         null,
+         "Se verifică informații despre adresă"
+      ],
+      "Authenticating with Assertion": [
+         null,
+         "Autentificare cu aserțiune"
+      ],
+      "Cancelling User Account": [
+         null,
+         "Anulare cont de utilizator"
+      ],
+      "Checking Authentication": [
+         null,
+         "Se verifică autentificarea"
+      ],
+      "Checking Script Version": [
+         null,
+         "Se verifică versiunea scriptului"
+      ],
+      "Completing User Registration": [
+         null,
+         "Se finalizează înregistrarea utilizatorului"
+      ],
+      "Checking if Cookies are Enabled": [
+         null,
+         "Se verifică dacă cookie-urile sunt activate"
+      ],
+      "Creating Account": [
+         null,
+         "Se creează contul"
+      ],
+      "Getting Assertion": [
+         null,
+         "Se obține aserțiunea"
+      ],
+      "Checking Email Address": [
+         null,
+         "Se verifică adresa de email"
+      ],
+      "Logout Failed": [
+         null,
+         "Deconectare eșuată"
+      ],
+      "Cancel": [
+         null,
+         "Anulează"
+      ],
+      "#~ \"We just sent an email to that address!  If you really want to send \"#~ \"another, wait a minute or two and try again.\"": [
+         null,
+         "#~ \"Tocmai v-am trimis un email la această adresă! Dacă chiar doriți să vă \"#~ \"trimitem altul, așteptați un minut sau două și încercați din nou.\""
       ],
       "translated text": [
          null,
diff --git a/resources/static/i18n/ro/messages.json b/resources/static/i18n/ro/messages.json
index 68f82950d..82f86a1ba 100644
--- a/resources/static/i18n/ro/messages.json
+++ b/resources/static/i18n/ro/messages.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " browserid.org",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " 2012-02-02 07:26-0800",
          "Last-Translator": " Alexandru Szasz <alexxed@gmail.com>",
          "Language-Team": " Romanian <LL@li.org>",
@@ -26,7 +26,7 @@
          null,
          "A intervenit o eroare în timp ce se încerca finalizarea înregistrării."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          "Se încheie procesul de autentificare pe: "
       ],
@@ -74,7 +74,7 @@
          null,
          "Parolele nu se potrivesc."
       ],
-      "Finish": [
+      "finish": [
          null,
          "Finalizează"
       ],
@@ -86,6 +86,14 @@
          null,
          "Noua dumneavoastră adresa e setată și acum ar trebui să fiți autentificat(ă). Puteți să închideți această fereastră și să vă întoarceți la"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID - pagina de start"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
       "Communicating with server": [
          null,
          "Comunicare cu serverul"
@@ -98,7 +106,7 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
          "BrowserID este un mod rapid și sigur de autentificare &mdash; <a target=\"_blank\" href=\"/about\">aflați mai multe</a>"
       ],
@@ -126,7 +134,7 @@
          null,
          "Ieșire"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
          ""
       ],
@@ -146,7 +154,7 @@
          null,
          "A intervenit o problemă cu legătura de înregistrare. S-ar putea ca adresa aceasta să mai fi fost înregistrată."
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "Eroare la comunicarea cu serverul."
       ],
diff --git a/resources/static/i18n/ru/client.json b/resources/static/i18n/ru/client.json
index fb897567d..37d007775 100644
--- a/resources/static/i18n/ru/client.json
+++ b/resources/static/i18n/ru/client.json
@@ -3,367 +3,392 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-01-31 12:11+0400",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-03 20:10+0300",
          "Last-Translator": " Alexander Slovesnik <unghost@mozilla-russia.org>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " ru",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
-         "X-Generator": " Translate Toolkit 1.9.0"
+         "Plural-Forms": " nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);",
+         "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
-         "Аутентификация пользователя"
+         "Для работы BrowserID требуются куки"
       ],
-      "Adding Address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "Добавление адреса"
+         "Пожалуйста, закройте это окно, <a %s>включите куки</a> и попробуйте снова"
       ],
-      "Adding Primary Email Address to User": [
+      "Communication Error": [
          null,
-         "Добавление первичного адреса эл. почты для пользователя"
+         "Ошибка связи"
       ],
-      "Checking Address Info": [
+      "Finishing Sign In...": [
          null,
-         "Проверка информации об адресе"
+         "Закончить вход..."
       ],
-      "Authenticating with Assertion": [
+      "In just a moment you'll be signed into BrowserID.": [
          null,
-         ""
+         "Всего через мгновение вы войдёте в BrowserID."
       ],
-      "Cancelling User Account": [
+      "Please wait a few seconds while we sign you into the site.": [
          null,
-         "Отмена учётной записи пользователя"
+         "Подождите несколько секунд, пока мы будем регистрировать вас на сайте."
       ],
-      "Checking Authentication": [
+      "We are sorry, this request is taking a LOOONG time.": [
          null,
-         "Проверка аутентификации"
+         "Извините, но этот запрос происходит СЛИШКОМ долго."
       ],
-      "Checking Script Version": [
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
          null,
-         "Проверка версии скрипта"
+         "Это сообщение пропадёт, как только завершится запрос (надеемся скоро).  Если ожидание затянется, закройте это окно и попробуйте снова."
       ],
-      "Completing User Registration": [
+      "Sign in using": [
          null,
-         "Завершение регистрации пользователя"
+         "Войти, используя"
       ],
-      "We are sorry, BrowserID requires cookies": [
+      "New email address": [
          null,
-         "Извините, но для BrowserID нужны куки"
+         "Новый адрес эл. почты"
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
+      "This field must be an email address.": [
          null,
-         "Для работы BrowserID необходимо, чтобы в вашем браузере были включены куки. Пожалуйста, включите в вашем браузере куки и попробуйте снова"
+         "Это поле должно быть адресом эл. почты."
       ],
-      "Checking if Cookies are Enabled": [
+      "The email field is required.": [
          null,
-         "Проверка, включены ли куки"
+         "Заполните поле адреса эл. почты."
       ],
-      "Creating Account": [
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
          null,
-         "Создание учётной записи"
+         "Мы только что послали письмо на этот адрес! Если вы действительно хотите послать ещё одно, подождите минуту или две и попробуйте снова."
       ],
-      "Getting Assertion": [
+      "That address is already added to your account!": [
          null,
-         ""
+         "Этот адрес уже добавлен в вашу учётную запись!"
       ],
-      "Checking Registration Token": [
+      "add": [
          null,
-         "Проверка токена регистрации"
+         "добавить"
       ],
-      "Checking Email Address": [
+      "cancel": [
          null,
-         "Проверка адреса эл. почты"
+         "отмена"
       ],
-      "Checking Whether User is Authenticated with IdP": [
+      "Email": [
          null,
-         "Проверка, аутентифицирован ли пользователь с помощью IdP"
+         "Адрес эл. почты"
       ],
-      "Logout Failed": [
+      "Enter your email address to sign in to <strong>%s</strong>": [
          null,
-         "Выход не удался"
+         "Введите ваш адрес эл. почты, чтобы войти на <strong>%s</strong>"
       ],
-      "You are offline!": [
+      "Welcome to BrowserID!": [
          null,
-         "Вы не подключены к сети!"
+         "Добро пожаловать в BrowserID!"
       ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
+      "This email looks new, so let's get you set up.": [
          null,
-         "К сожалению, BrowserID не может установить связь без подключения к сети!"
+         "Этот адрес эл. почты выглядит новым, так что давайте вам его настроим."
       ],
-      "Authenticating with Identity Provider": [
+      "Password": [
          null,
-         "Аутентификация с провайдером идентификации"
+         "Пароль"
       ],
-      "We had trouble communicating with your email provider, please try again!": [
+      "forgot your password?": [
          null,
-         "При попытке связи с вашим провайдером эл. почты возникли проблемы, пожалуйста попробуйте ещё раз!"
+         "забыли свой пароль?"
       ],
-      "Provisioning with Identity Provider": [
+      "The password field is required.": [
          null,
-         "Инициализация с помощью провайдера аутентификации"
+         "Заполните поле пароля."
       ],
-      "Provisioning Unsupported Identity Provider": [
+      "The account cannot be logged in with this username and password.": [
          null,
-         "Инициализация с помощью неподдерживаемого провайдера аутентификации"
+         "В эту учётную запись нельзя войти с помощью логина и пароля."
       ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
          null,
-         "К сожалению, предоставленный адрес эл. почты не может выступать в роли Первичного Провайдера Идентификации"
+         "Нажав %s, вы подтверждаете, что вы принимаете <a %s>Условия использования</a> и <a %s>Политику приватности</a> этого сайта."
       ],
-      "Registration Failed": [
+      "next": [
          null,
-         "Регистрация не удалась"
+         "далее"
       ],
-      "Establishing Relay": [
+      "verify email": [
          null,
-         "Установка релея"
+         "подтвердить адрес эл. почты"
       ],
-      "Relay frame could not be found": [
+      "sign in": [
          null,
-         "Не удалось найти фрейм релея"
+         "войти"
       ],
-      "Resetting Password": [
+      "Cannot verify %s": [
          null,
-         "Сброс пароля"
+         "Не удалось подтвердить %s"
       ],
-      "Remove Email Address from Account": [
+      "%s is a required address, but we cannot verify that you own this address.": [
          null,
-         "Удалить адрес эл. почты из учётной записи"
+         "%s является необходимым адресом, но мы не можем подтвердить, что вы владеете этим адресом."
       ],
-      "Setting Password": [
+      "Check your email!": [
          null,
-         "Установка пароля"
+         "Проверьте вашу эл. почту!"
       ],
-      "Signin Failed": [
+      "We sent a confirmation email to <strong>%s</strong>": [
          null,
-         "Вход не удался"
+         "Мы послали письмо для подтверждения на <strong>%s</strong>"
       ],
-      "Signup Failed": [
+      "To finish signing in just click the verify link we sent to your email address.": [
          null,
-         "Заведение не удалось"
+         "Для завершения входа просто нажмите на ссылку для подтверждения, посланную на ваш адрес эл. почты."
       ],
-      "Syncing Address": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
          null,
-         "Синхронизация адреса"
+         "Если это ошибка, просто проигнорируйте отправленное письмо и <a href=\"#\" id=\"cancel\">используйте другой адрес эл. почты</a>."
       ],
-      "Syncing Email Addresses": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          null,
-         "Синхронизация адресов эл. почты"
+         "Если это ошибка, просто проигнорируйте отправленное письмо и <a href=\"#\" id=\"back\">используйте другой адрес эл. почты</a>."
       ],
-      "Sync Keys for Address": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         "Синхронизация ключей для адреса"
+         "Нам очень жаль, но сервер сильно перегружен!"
       ],
-      "Getting Token Info": [
+      "We are very sorry, there has been an error!": [
          null,
-         "Получение информации о токене"
+         "Нам очень жаль, но произошла ошибка!"
       ],
-      "Updating password": [
+      "Please reload the page and try again.": [
          null,
-         "Обновление пароля"
+         "Пожалуйста, обновите эту страницу и попробуйте снова. "
       ],
-      "Verifying email address": [
+      "Please close this window and try again.": [
          null,
-         "Проверка адреса эл. почты"
+         "Пожалуйста, закройте это окно и попробуйте снова. "
       ],
-      "Communication Error": [
+      "See more info": [
          null,
-         "Ошибка связи"
+         "Подробнее"
       ],
-      "Finishing Sign In...": [
+      "The site requested you sign in using": [
          null,
-         "Закончить вход..."
+         "Сайт попросил, чтобы вы вошли, используя"
       ],
-      "In just a moment you'll be signed into BrowserID.": [
+      "reset password": [
          null,
-         "Всего через мгновение вы войдёте в BrowserID."
+         "сбросить пароль"
       ],
-      "Please wait a few seconds while we sign you into the site.": [
+      "*%s* is not a valid email address!": [
          null,
-         "Подождите несколько секунд, пока мы будем регистрировать вас на сайте."
+         "*%s* не является корректным адресом эл. почты!"
       ],
-      "We are sorry, this request is taking a LOOONG time.": [
+      "To continue, please close the window and enter a valid address.": [
          null,
-         "Извините, но этот запрос происходит СЛИШКОМ долго."
+         "Чтобы продолжить, пожалуйста закройте окно и введите корректный адрес."
       ],
-      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+      "This is not me...": [
          null,
-         "Это сообщение пропадёт, как только завершится запрос (надеемся скоро).  Если ожидание затянется, закройте это окно и попробуйте снова."
+         "Это не я..."
       ],
-      "Sign in using": [
+      "Use a different email": [
          null,
-         "Войдите, используя"
+         "Использовать другой адрес эл. почты"
       ],
-      "New email address": [
+      "Always sign in using this email": [
          null,
-         "Новый адрес эл. почты"
+         "Всегда входить, используя этот адрес эл. почты"
       ],
-      "This field must be an email address.": [
+      "Address Verified!": [
          null,
-         "Это поле должно быть адресом эл. почты."
+         "Адрес подтверждён!"
       ],
-      "The email field is required.": [
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
          null,
-         "Требуется поле адреса эл. почты."
+         "Ваша личность была удостоверена вашим провайдером эл. почты, теперь мы попытаемся вас зарегистрировать."
       ],
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
          null,
-         "Мы только что послали письмо на этот адрес! Если вы действительно хотите послать ещё одно, подождите минуту или две и попробуйте снова."
+         "Для подтверждения владения этим адресом вы должны войти с помощью вашего провайдера эл. почты. Это окно будет перенаправлено на"
       ],
-      "That address is already added to your account!": [
+      "verify": [
          null,
-         "Этот адрес уже добавлен в вашу учётную запись!"
+         "подтвердить"
       ],
-      "add": [
+      "Verify With Email Provider": [
          null,
-         "добавить"
+         "Подтвердить с провайдером эл. почты"
       ],
-      "cancel": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         "отмена"
+         "#~ \"Для работы BrowserID необходимо, чтобы в вашем браузере были включены \"#~ \"куки. Пожалуйста, включите в вашем браузере куки и попробуйте снова\""
       ],
-      "Email": [
+      "You are offline!": [
          null,
-         "Адрес эл. почты"
+         "Вы не подключены к сети!"
       ],
-      "Enter your email address to sign in to <strong>%s</strong>": [
+      "Unfortunately, BrowserID cannot communicate while offline!": [
          null,
-         "Введите ваш адрес эл. почты, чтобы войти на <strong>%s</strong>"
+         "#~ \"К сожалению, BrowserID не может установить связь без подключения к сети!\""
       ],
-      "Welcome to BrowserID!": [
+      "select email": [
          null,
-         "Добро пожаловать в BrowserID!"
+         "выбрать адрес эл. почты"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
          null,
-         "Этот адрес эл. почты выглядит новым, так что давайте его настроим."
+         "#~ \"Извините, но мы не можем связаться с BrowserID, если вы не подключены к \"#~ \"сети.\""
       ],
-      "Password": [
+      "Authenticating User": [
          null,
-         "Пароль"
+         "Аутентификация пользователя"
       ],
-      "forgot your password?": [
+      "Adding Address": [
          null,
-         "забыли свой пароль?"
+         "Добавление адреса"
       ],
-      "The password field is required.": [
+      "Adding Primary Email Address to User": [
          null,
-         "Требуется поле пароля."
+         "Добавление первичного адреса эл. почты для пользователя"
       ],
-      "The account cannot be logged in with this username and password.": [
+      "Checking Address Info": [
          null,
-         "В эту учётную запись нельзя войти с помощью логина и пароля."
+         "Проверка информации об адресе"
       ],
-      "next": [
+      "Authenticating with Assertion": [
          null,
-         "далее"
+         "Аутентификация с помощью утверждения"
       ],
-      "verify email": [
+      "Cancelling User Account": [
          null,
-         "подтвердить адрес эл. почты"
+         "Отмена учётной записи пользователя"
       ],
-      "select email": [
+      "Checking Authentication": [
          null,
-         "выбрать адрес эл. почты"
+         "Проверка аутентификации"
       ],
-      "Cannot verify %s": [
+      "Checking Script Version": [
          null,
-         ""
+         "Проверка версии скрипта"
       ],
-      "%s is a required address, but we cannot verify that you own this address.": [
+      "Completing User Registration": [
          null,
-         ""
+         "Завершение регистрации пользователя"
       ],
-      "Check your email!": [
+      "Checking if Cookies are Enabled": [
          null,
-         "Проверьте вашу эл. почту!"
+         "Проверка, включены ли куки"
       ],
-      "We sent a confirmation email to <strong>%s</strong>": [
+      "Creating Account": [
          null,
-         "Мы послали письмо для подтверждения на <strong>%s</strong>"
+         "Создание учётной записи"
       ],
-      "To finish signing in just click the verify link we sent to your email address.": [
+      "Getting Assertion": [
          null,
-         "Для завершения входа просто нажмите на ссылку для подтверждения, посланную на ваш адрес эл. почты."
+         "Получение утверждения"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+      "Checking Registration Token": [
          null,
-         "Если это ошибка, просто проигнорируйте отправленное письмо и <a href=\"#\" class=\"cancel\" id=\"back\">используйте другой адрес эл. почты</a>."
+         "Проверка токена регистрации"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+      "Checking Email Address": [
          null,
-         "Если это ошибка, просто проигнорируйте отправленное письмо и <a href=\"#\" class=\"cancel\" id=\"back\">используйте другой адрес эл. почты</a>."
+         "Проверка адреса эл. почты"
       ],
-      "The site requested you sign in using": [
+      "Checking Whether User is Authenticated with IdP": [
          null,
-         "Сайт попросил, чтобы вы вошли, используя"
+         "Проверка, аутентифицирован ли пользователь с помощью IdP"
       ],
-      "Reset Password": [
+      "Logout Failed": [
          null,
-         "Сбросить пароль"
+         "Выход не удался"
       ],
-      "Cancel": [
+      "Authenticating with Identity Provider": [
          null,
-         "Отмена"
+         "Аутентификация с провайдером идентификации"
       ],
-      "*%s* is not a valid email address!": [
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
          null,
-         "*%s* не является корректным адресом эл. почты!"
+         "#~ \"При попытке связи с вашим провайдером эл. почты возникли проблемы, \"#~ \"пожалуйста попробуйте ещё раз!\""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "Provisioning with Identity Provider": [
          null,
-         "Чтобы продолжить, пожалуйста закройте окно и введите корректный адрес."
+         "Инициализация с помощью провайдера аутентификации"
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "Provisioning Unsupported Identity Provider": [
          null,
-         "Извините, но мы не можем связаться с BrowserID, если вы не подключены к сети."
+         "Инициализация с помощью неподдерживаемого провайдера аутентификации"
       ],
-      "This is not me...": [
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
          null,
-         "Это не я..."
+         "#~ \"К сожалению, предоставленный адрес эл. почты не может выступать в роли \"#~ \"Первичного Провайдера Идентификации\""
       ],
-      "Use a different email": [
+      "Registration Failed": [
          null,
-         "Использовать другой адрес эл. почты"
+         "Регистрация не удалась"
       ],
-      "Always sign in using this email": [
+      "Establishing Relay": [
          null,
-         "Всегда входить, используя этот адрес эл. почты"
+         "Установка релея"
       ],
-      "sign in": [
+      "Relay frame could not be found": [
          null,
-         "войти"
+         "Не удалось найти фрейм релея"
       ],
-      "Address Verified!": [
+      "Resetting Password": [
          null,
-         "Адрес подтверждён!"
+         "Сброс пароля"
       ],
-      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+      "Remove Email Address from Account": [
          null,
-         "Ваша личность была удостоверена вашим провайдером эл. почты, теперь мы попытаемся вас зарегистрировать."
+         "Удалить адрес эл. почты из учётной записи"
       ],
-      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+      "Setting Password": [
          null,
-         "Чтобы проверить, что вы владеете этим адресом, вы должны войти с помощью вашего провайдера.  Это окно будет перенаправлено на"
+         "Установка пароля"
       ],
-      "Verify": [
+      "Signin Failed": [
          null,
-         "Подтвердить"
+         "Вход не удался"
       ],
-      "Verify With Email Provider": [
+      "Signup Failed": [
          null,
-         "Подтвердить с провайдером эл. почты"
+         "Заведение не удалось"
       ],
-      "#~ \"We just sent an email to that address!  If you really want to send \"#~ \"another, wait a minute or two and try again.\"": [
+      "Syncing Address": [
          null,
-         "#~ \"Мы только что послали письмо на этот адрес!  Если вы действительно хотите \"#~ \"послать ещё одно, подождите минуту или две и попробуйте снова.\""
+         "Синхронизация адреса"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "Синхронизация адресов эл. почты"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Синхронизация ключей для адреса"
+      ],
+      "Getting Token Info": [
+         null,
+         "Получение информации о токене"
       ],
-      "This email looks new, so let&apos;s get you set up.": [
+      "Updating password": [
+         null,
+         "Обновление пароля"
+      ],
+      "Verifying email address": [
          null,
-         "Этот адрес эл. почты выглядит новым, так что давайте его настроим."
+         "Проверка адреса эл. почты"
+      ],
+      "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.\"": [
+         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,
diff --git a/resources/static/i18n/ru/messages.json b/resources/static/i18n/ru/messages.json
index 460cf4e9c..9e2ba8155 100644
--- a/resources/static/i18n/ru/messages.json
+++ b/resources/static/i18n/ru/messages.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-01-31 12:15+0400",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-03 20:18+0300",
          "Last-Translator": " Alexander Slovesnik <unghost@mozilla-russia.org>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " ru",
@@ -25,9 +25,9 @@
          null,
          "При попытке завершения регистрации произошла ошибка."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         "Завершите вход в: "
+         "Завершите вход в:"
       ],
       "Email Verification": [
          null,
@@ -73,9 +73,9 @@
          null,
          "Пароли не совпадают."
       ],
-      "Finish": [
+      "finish": [
          null,
-         "Закончить"
+         "закончить"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
@@ -85,6 +85,14 @@
          null,
          "Ваш новый адрес настроен и вы сейчас должны быть зарегистрированы. Теперь вы можете закрыть это окно и вернуться в"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "Для работы BrowserID требуются куки"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "Пожалуйста, закройте это окно, <a %s>включите куки</a> и попробуйте снова"
+      ],
       "Communicating with server": [
          null,
          "Соединение с сервером"
@@ -97,9 +105,9 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         "BrowserID &mdash; это быстрый и безопасный способ регистрации &mdash; <a target=\"_blank\" href=\"/about\">подробнее</a>"
+         "BrowserID &mdash; это быстрый и безопасный способ регистрации &mdash; <a %s>подробнее</a>"
       ],
       "BrowserID: %s": [
          null,
@@ -125,9 +133,9 @@
          null,
          "Выйти"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         "От <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
+         "От <a %s>Identity Team</a> из <a %s>Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
@@ -143,9 +151,9 @@
       ],
       "There was a problem with your signup link. Has this address already been registered?": [
          null,
-         "С вашей ссылкой для заведения возникли проблемы.  Этот адрес уже был зарегистрирован?"
+         "С вашей ссылкой для регистрации возникли проблемы.  Этот адрес уже был зарегистрирован?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "Ошибка при попытке соединения с сервером."
       ],
@@ -155,11 +163,11 @@
       ],
       "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,
-         "Спасибо за то, что начали использовать <strong>BrowserID</strong>. Теперь вы можете использовать вашу учётную запись <strong>BrowserID</strong> для <em>Входа</em> или <em>Выхода</em> на веб-сайтах по всему миру!"
+         "Спасибо за то, что начали использовать <strong>BrowserID</strong>. Теперь вы можете использовать вашу учётную запись <strong>BrowserID</strong> для <em>Регистрации</em> или <em>Входа</em> на веб-сайты по всему миру!"
       ],
       "Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.": [
          null,
-         ""
+         "Спасибо за подтверждение вашего адреса эл. почты. Это сообщение было послано вам, чтобы вы смогли завершить регистрацию на %s."
       ],
       "Finish registration by clicking this link:": [
          null,
diff --git a/resources/static/i18n/sk/client.json b/resources/static/i18n/sk/client.json
index dc0aa1359..7402e51e6 100644
--- a/resources/static/i18n/sk/client.json
+++ b/resources/static/i18n/sk/client.json
@@ -3,359 +3,388 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
-         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-10 21:38+0200",
+         "Last-Translator": " Branislav <sektormaster@atlas.sk>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " sk",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
-         "X-Generator": " Translate Toolkit 1.9.0"
+         "Plural-Forms": " nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;",
+         "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
-         ""
+         "BrowserID vyžaduje cookies"
       ],
-      "Adding Address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         ""
+         "Zatvorte okno, <a %s>povoľte cookies</a> a skúste to znova."
       ],
-      "Adding Primary Email Address to User": [
+      "Communication Error": [
          null,
-         ""
+         "Chyba pri komunikácií"
       ],
-      "Checking Address Info": [
+      "Finishing Sign In...": [
          null,
-         ""
+         "Prebieha dokončovanie prihlasovania"
       ],
-      "Authenticating with Assertion": [
+      "In just a moment you'll be signed into BrowserID.": [
          null,
-         ""
+         "Za chvíľku budete prihlásený k BrowserID."
       ],
-      "Cancelling User Account": [
+      "Please wait a few seconds while we sign you into the site.": [
          null,
-         ""
+         "Počkajte prosím pár sekúnd, prebieha prihlásenie do siete."
       ],
-      "Checking Authentication": [
+      "We are sorry, this request is taking a LOOONG time.": [
          null,
-         ""
+         "Ospravedlňujeme sa, táto požiadavka čaká už moc DLHO."
       ],
-      "Checking Script Version": [
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
          null,
-         ""
+         "Táto správa zmizne okamžite, ako bude požiadavka ukončená (dúfame že skoro). Ak čakáte moc dlho, zavrite toto okno a skúste to znova."
       ],
-      "Completing User Registration": [
+      "Sign in using": [
          null,
-         ""
+         "Prihlásenie pomocou"
       ],
-      "We are sorry, BrowserID requires cookies": [
+      "New email address": [
          null,
-         ""
+         "Nová e-mailová adresa"
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
+      "This field must be an email address.": [
          null,
-         ""
+         "Táto položka musí obsahovať e-mailovú adresu."
       ],
-      "Checking if Cookies are Enabled": [
+      "The email field is required.": [
          null,
-         ""
+         "E-mail je vyžadovaná položka."
       ],
-      "Creating Account": [
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
          null,
-         ""
+         "Práve sme na vašu adresu odoslali e-mail! Ak naozaj chcete odoslať ďalší, počkajte jednu alebo dve minúty a skúste to znova."
       ],
-      "Getting Assertion": [
+      "That address is already added to your account!": [
          null,
-         ""
+         "Táto adresa už bola k vášmu účtu pridelená!"
       ],
-      "Checking Registration Token": [
+      "add": [
          null,
-         ""
+         "pridať"
       ],
-      "Checking Email Address": [
+      "cancel": [
          null,
-         ""
+         "zrušiť"
       ],
-      "Checking Whether User is Authenticated with IdP": [
+      "Email": [
          null,
-         ""
+         "E-mail"
       ],
-      "Logout Failed": [
+      "Enter your email address to sign in to <strong>%s</strong>": [
          null,
-         ""
+         "Zadajte svoju e-mailovú adresu a prihláste sa k <strong>%s</strong>"
       ],
-      "You are offline!": [
+      "Welcome to BrowserID!": [
          null,
-         ""
+         "Víta vás BrowserID!"
       ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
+      "This email looks new, so let's get you set up.": [
          null,
-         ""
+         "E-mail vyzerá byť nový. Vykonajte jeho nastavenie."
       ],
-      "Authenticating with Identity Provider": [
+      "Password": [
          null,
-         ""
+         "Heslo"
       ],
-      "We had trouble communicating with your email provider, please try again!": [
+      "forgot your password?": [
          null,
-         ""
+         "zabudli ste heslo?"
       ],
-      "Provisioning with Identity Provider": [
+      "The password field is required.": [
          null,
-         ""
+         "Položka s heslom je povinná."
       ],
-      "Provisioning Unsupported Identity Provider": [
+      "The account cannot be logged in with this username and password.": [
          null,
-         ""
+         "K účtu sa nemôžete prihlásiť s týmto používateľským menom a heslom."
       ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
          null,
-         ""
+         "Kliknutím na %s potvrdzujete, že súhlasíte s <a %s>pravidlami používania</a> a <a %s>zásadami pre súkromie</a> na webe."
       ],
-      "Registration Failed": [
+      "next": [
          null,
-         ""
+         "ďalej"
       ],
-      "Establishing Relay": [
+      "verify email": [
          null,
-         ""
+         "overenie e-mailu"
       ],
-      "Relay frame could not be found": [
+      "sign in": [
          null,
-         ""
+         "prihlásenie"
       ],
-      "Resetting Password": [
+      "Cannot verify %s": [
          null,
-         ""
+         "Nemožno overiť %s"
       ],
-      "Remove Email Address from Account": [
+      "%s is a required address, but we cannot verify that you own this address.": [
          null,
-         ""
+         "%s je požadovaná adresa, ale nemôžeme overiť či je to naozaj vaša adresa."
       ],
-      "Setting Password": [
+      "Check your email!": [
          null,
-         ""
+         "Skontrolujte si svoj e-mail"
       ],
-      "Signin Failed": [
+      "We sent a confirmation email to <strong>%s</strong>": [
          null,
-         ""
+         "Poslali sme vám overovací e-mail na adresu <strong>%s</strong>."
       ],
-      "Signup Failed": [
+      "To finish signing in just click the verify link we sent to your email address.": [
          null,
-         ""
+         "Pre dokončenie overovania jednoducho kliknite na odkaz, ktorý sme zaslali na vašu e-mailovú adresu."
       ],
-      "Syncing Address": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
          null,
-         ""
+         "Ak je to omyl, jednoducho zaslaný e-mail ignorujte a <a href=\"#\" id=\"back\">zrušte ho</a>."
       ],
-      "Syncing Email Addresses": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          null,
-         ""
+         "Ak je to omyl, jednoducho zaslaný e-mail ignorujte a <a href=\"#\" id=\"back\">použite inú e-mailovou adresu</a>."
       ],
-      "Sync Keys for Address": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         ""
+         "Ospravedlňujeme sa, ale server je momentálne preťažený!"
       ],
-      "Getting Token Info": [
+      "We are very sorry, there has been an error!": [
          null,
-         ""
+         "Ospravedlňujeme sa, ale nastala chyba!"
       ],
-      "Updating password": [
+      "Please reload the page and try again.": [
          null,
-         ""
+         "Obnovte túto stránku a skúste to znova."
       ],
-      "Verifying email address": [
+      "Please close this window and try again.": [
          null,
-         ""
+         "Zatvorte prosím okno a skúste to znova."
       ],
-      "Communication Error": [
+      "See more info": [
          null,
-         ""
+         "Zobraziť viac informácií"
       ],
-      "Finishing Sign In...": [
+      "The site requested you sign in using": [
          null,
-         ""
+         "Stránka, ku ktorej sa chcete prihlásiť používa"
       ],
-      "In just a moment you'll be signed into BrowserID.": [
+      "reset password": [
          null,
-         ""
+         "obnovenie hesla"
       ],
-      "Please wait a few seconds while we sign you into the site.": [
+      "*%s* is not a valid email address!": [
          null,
-         ""
+         "*%s* nie je platnou e-mailovou adresou!"
       ],
-      "We are sorry, this request is taking a LOOONG time.": [
+      "To continue, please close the window and enter a valid address.": [
          null,
-         ""
+         "Pre pokračovanie prosím zatvorte okno a zadajte platnú e-mailovú adresu."
       ],
-      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+      "This is not me...": [
          null,
-         ""
+         "Toto nie som ja..."
       ],
-      "Sign in using": [
+      "Use a different email": [
          null,
-         ""
+         "Použiť iný e-mail"
       ],
-      "New email address": [
+      "Always sign in using this email": [
          null,
-         ""
+         "Vždy sa prihlasovať pomocou tohto e-mailu"
       ],
-      "This field must be an email address.": [
+      "Address Verified!": [
          null,
-         ""
+         "Adresa bola overená!"
       ],
-      "The email field is required.": [
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
          null,
-         ""
+         "Vaše identita bola overená pomocou poskytovateľa pošty. Teraz vás skúsime prihlásiť."
       ],
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
          null,
-         ""
+         "Teraz musíme skontrolovať, či je vybraná e-mailová adresa naozaj vaša. Toto okno bude presmerované na"
       ],
-      "That address is already added to your account!": [
+      "verify": [
          null,
-         ""
+         "overenie"
       ],
-      "add": [
+      "Verify With Email Provider": [
          null,
-         ""
+         "Overenie pomocou poskytovateľa pošty"
       ],
-      "cancel": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         ""
+         "#~ \"Pre správne fungovanie BrowserID je nutné mať v prehliadači povolené \"#~ \"cookies. Povoľte prosím vo vašom prehliadači cookies a skúste to znova\""
       ],
-      "Email": [
+      "You are offline!": [
          null,
-         ""
+         "Teraz ste offline!"
       ],
-      "Enter your email address to sign in to <strong>%s</strong>": [
+      "Unfortunately, BrowserID cannot communicate while offline!": [
          null,
-         ""
+         "BrowserID nemôže komunikovať, ak ste offline!"
       ],
-      "Welcome to BrowserID!": [
+      "select email": [
          null,
-         ""
+         "výber e-mailu"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
          null,
-         ""
+         "#~ \"Ospravedlňujeme sa, ale BrowserID nemôže komunikovať, ak ste v režime \"#~ \"offline. \""
       ],
-      "Password": [
+      "Authenticating User": [
          null,
-         ""
+         "Overenie používateľa"
       ],
-      "forgot your password?": [
+      "Adding Address": [
          null,
-         ""
+         "Pridávanie adresy"
       ],
-      "The password field is required.": [
+      "Adding Primary Email Address to User": [
          null,
-         ""
+         "Pridávanie primárnej e-mailovej adresy k používateľovi"
       ],
-      "The account cannot be logged in with this username and password.": [
+      "Checking Address Info": [
          null,
-         ""
+         "Kontrola informácií o adrese"
       ],
-      "next": [
+      "Authenticating with Assertion": [
          null,
-         ""
+         "Overovanie s potvrdením"
       ],
-      "verify email": [
+      "Cancelling User Account": [
          null,
-         ""
+         "Rušenie používateľského účtu"
       ],
-      "select email": [
+      "Checking Authentication": [
          null,
-         ""
+         "Kontrola overenia"
       ],
-      "Cannot verify %s": [
+      "Checking Script Version": [
          null,
-         ""
+         "Kontrola verzie skriptu"
       ],
-      "%s is a required address, but we cannot verify that you own this address.": [
+      "Completing User Registration": [
          null,
-         ""
+         "Dokončovanie registrácie používateľa"
       ],
-      "Check your email!": [
+      "Checking if Cookies are Enabled": [
          null,
-         ""
+         "Kontrola, či sú v povolené cookies"
       ],
-      "We sent a confirmation email to <strong>%s</strong>": [
+      "Creating Account": [
          null,
-         ""
+         "Vytváranie účtu"
       ],
-      "To finish signing in just click the verify link we sent to your email address.": [
+      "Getting Assertion": [
          null,
-         ""
+         "Získanie potvrdenia"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+      "Checking Registration Token": [
          null,
-         ""
+         "Kontrola registračného tokenu"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+      "Checking Email Address": [
          null,
-         ""
+         "Kontrola e-mailovej adresy"
       ],
-      "The site requested you sign in using": [
+      "Checking Whether User is Authenticated with IdP": [
          null,
-         ""
+         "Kontrola, či je používateľ overený pomocou IdP"
       ],
-      "Reset Password": [
+      "Logout Failed": [
          null,
-         ""
+         "Odhlásenie zlyhalo"
       ],
-      "Cancel": [
+      "Authenticating with Identity Provider": [
          null,
-         ""
+         "Overenie pomocou poskytovateľa identity"
       ],
-      "*%s* is not a valid email address!": [
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
          null,
-         ""
+         "#~ \"Nastal problém pri komunikácií s poskytovateľom vašej pošty. Vyskúšajte \"#~ \"to prosím znovu!\""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "Provisioning with Identity Provider": [
          null,
-         ""
+         "Zavedenie poskytovateľa identity"
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "Provisioning Unsupported Identity Provider": [
          null,
-         ""
+         "Zavedenie nepodporovaného poskytovateľa identity"
       ],
-      "This is not me...": [
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
          null,
-         ""
+         "#~ \"Zadaná e-mailová adresa nemôže bohužiaľ slúžiť ako primárny poskytovateľ \"#~ \"identity\""
       ],
-      "Use a different email": [
+      "Registration Failed": [
          null,
-         ""
+         "Registrácia zlyhala"
       ],
-      "Always sign in using this email": [
+      "Establishing Relay": [
          null,
-         ""
+         "Zahájenie prenosu"
       ],
-      "sign in": [
+      "Relay frame could not be found": [
          null,
-         ""
+         "Rámec prenosu sa nepodarilo nájsť"
       ],
-      "Address Verified!": [
+      "Resetting Password": [
          null,
-         ""
+         "Obnova hesla"
       ],
-      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+      "Remove Email Address from Account": [
          null,
-         ""
+         "Odstránenie e-mailovej adresy z účtu"
       ],
-      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+      "Setting Password": [
          null,
-         ""
+         "Nastavenie hesla"
       ],
-      "Verify": [
+      "Signin Failed": [
          null,
-         ""
+         "Prihlásenie zlyhalo"
       ],
-      "Verify With Email Provider": [
+      "Signup Failed": [
+         null,
+         "Odhlásenie zlyhalo"
+      ],
+      "Syncing Address": [
+         null,
+         "Synchronizácia adresy"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "Synchronizácia e-mailových adries"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Synchronizácia kľúčov adresy"
+      ],
+      "Getting Token Info": [
+         null,
+         "Získanie informácie o tokene"
+      ],
+      "Updating password": [
+         null,
+         "Aktualizácia hesla"
+      ],
+      "Verifying email address": [
+         null,
+         "Overenie e-mailovej adresy"
+      ],
+      "Cancel": [
          null,
-         ""
+         "Zrušiť"
       ]
    }
 }
diff --git a/resources/static/i18n/sk/messages.json b/resources/static/i18n/sk/messages.json
index e327f3962..7fbadb792 100644
--- a/resources/static/i18n/sk/messages.json
+++ b/resources/static/i18n/sk/messages.json
@@ -3,179 +3,188 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
-         "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-10 23:35+0200",
+         "Last-Translator": " Branislav <sektormaster@atlas.sk>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " sk",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
-         "X-Generator": " Translate Toolkit 1.9.0"
+         "Plural-Forms": " nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;",
+         "X-Generator": " Pootle 2.1.6"
       },
       "Complete Login to %s using BrowserID": [
          null,
-         ""
+         "Dokončenie prihlásenia k %s pomocou BrowserID"
       ],
       "Error encountered while attempting to confirm your address. Have you previously verified this address?": [
          null,
-         ""
+         "Pri pokuse o dokončenie registrácie nastala chyba. Neoverovali ste túto adresu už niekedy?"
       ],
       "Error encountered trying to complete registration.": [
          null,
-         ""
+         "Pri pokuse o dokončenie registrácie nastala chyba."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         ""
+         "Dokončenie prihlásenia k:"
       ],
       "Email Verification": [
          null,
-         ""
+         "Overenie e-mailovej adresy"
       ],
       "Email Address": [
          null,
-         ""
+         "E-mailová adresa"
       ],
       "Your Email": [
          null,
-         ""
+         "Váš e-mail"
       ],
       "New Password": [
          null,
-         ""
+         "Nové heslo"
       ],
       "Enter a Password": [
          null,
-         ""
+         "Zadajte heslo"
       ],
       "Password is required.": [
          null,
-         ""
+         "Heslo je požadované."
       ],
       "Password must be between 8 and 80 characters long.": [
          null,
-         ""
+         "Dĺžka hesla musí byť v rozsahu 8 až 80 znakov."
       ],
       "Verify Password": [
          null,
-         ""
+         "Overenie hesla"
       ],
       "Repeat Password": [
          null,
-         ""
+         "Znovu heslo"
       ],
       "Verification password is required.": [
          null,
-         ""
+         "Overenie hesla je vyžadované."
       ],
       "Passwords do not match.": [
          null,
-         ""
+         "Heslá sa nezhodujú."
       ],
-      "Finish": [
+      "finish": [
          null,
-         ""
+         "dokončiť"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
-         ""
+         "<strong class=\"email\">Vaša adresa</strong> bola overená!"
       ],
       "Your new address is set up and you should now be signed in. You may now close this window and go back to": [
          null,
-         ""
+         "Nová adresa je nastavená a vy sa teraz môžete prihlásiť. Môžete toto okno zavrieť a prejsť späť na"
+      ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID vyžaduje cookies"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "Zatvorte prosím toto okno, <a %s>povoľte cookies</a> a skúste to znova."
       ],
       "Communicating with server": [
          null,
-         ""
+         "Prebieha komunikácia so serverom"
       ],
       "Just a moment while we talk with the server.": [
          null,
-         ""
+         "Počkajte chvíľku. Prebieha komunikácia so serverom."
       ],
       "BrowserID": [
          null,
-         ""
+         "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         ""
+         "BrowserID je rýchly a bezpečný spôsob prihlasovania &mdash; <a %s>získať viac informácií</a>"
       ],
       "BrowserID: %s": [
          null,
-         ""
+         "BrowserID: %s"
       ],
       "BrowserID Home": [
          null,
-         ""
+         "Domovská stránka BrowserID"
       ],
       "How it works": [
          null,
-         ""
+         "Ako to funguje"
       ],
       "Developers": [
          null,
-         ""
+         "Vývojári"
       ],
       "Sign In": [
          null,
-         ""
+         "Prihlásenie"
       ],
       "Sign Out": [
          null,
-         ""
+         "Odhlásenie"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         ""
+         "Od <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
-         ""
+         "Zásady ochrany súkromia"
       ],
       "TOS": [
          null,
-         ""
+         "TOS"
       ],
       "Need Help?": [
          null,
-         ""
+         "Potrebujete pomoc? "
       ],
       "There was a problem with your signup link. Has this address already been registered?": [
          null,
-         ""
+         "Problém s prihlasovacím odkazom. Nebola táto adresa už zaregistrovaná?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
-         ""
+         "Chyba pri komunikácií so serverom."
       ],
       "Last step!": [
          null,
-         ""
+         "Posledný krok!"
       ],
       "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,
-         ""
+         "Ďakujeme za prihlásenie k <strong>BrowserID</strong>. Teraz môžete použiť svoj účet <strong>BrowserID</strong> k <em>Prihláseniu</em> alebo <em>Odhláseniu</em> na webových stránkach po celom svete!"
       ],
       "Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.": [
          null,
-         ""
+         "Ďakujeme za overenie vašej e-mailovej adresy. Táto správa je vám zaslaná z dôvodu dokončenia prihlásenia k %s."
       ],
       "Finish registration by clicking this link:": [
          null,
-         ""
+         "Pre dokončenie registrácie kliknite na nasledujúci odkaz:"
       ],
       "If you are NOT trying to sign into this site, just ignore this email.": [
          null,
-         ""
+         "Ak ste sa nepokúšali prihlásiť na uvedenú stránku, jednoducho tento e-mail ignorujte."
       ],
       "Thanks,": [
          null,
-         ""
+         "ÄŽakujeme,"
       ],
       "(A better way to sign in)": [
          null,
-         ""
+         "(Lepší spôsob prihlasovania)"
       ]
    }
 }
diff --git a/resources/static/i18n/sl/client.json b/resources/static/i18n/sl/client.json
index d53b71233..f5fe0b6dd 100644
--- a/resources/static/i18n/sl/client.json
+++ b/resources/static/i18n/sl/client.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-03 17:21+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-02 16:58+0200",
          "Last-Translator": " Matjaž <m@owca.info>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " sl",
@@ -14,161 +14,13 @@
          "Plural-Forms": " nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);",
          "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
-         null,
-         "Preverjanje pristnosti uporabnika"
-      ],
-      "Adding Address": [
-         null,
-         "Dodajanje naslova"
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         "Dodajanje glavnega e-poštnega naslova uporabniku"
-      ],
-      "Checking Address Info": [
-         null,
-         "Preverjanje podatkov o naslovu"
-      ],
-      "Authenticating with Assertion": [
-         null,
-         "Preverjanje pristnosti z izjavo"
-      ],
-      "Cancelling User Account": [
-         null,
-         "Preklic uporabniškega računa"
-      ],
-      "Checking Authentication": [
+      "BrowserID requires cookies": [
          null,
-         "Preverjanje pristnosti"
+         "BrowserID potrebuje piškote"
       ],
-      "Checking Script Version": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "Preverjanje različice skripta"
-      ],
-      "Completing User Registration": [
-         null,
-         "Dokončevanje registracije uporabnika"
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         "Opravičujemo se, toda BrowserID potrebuje piškote"
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         "BrowserID za delovanje potrebuje piškote vašega brskalnika.  Omogočite piškote v vašem brskalniku in poskusite znova"
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         "Preverjanje, ali so piškoti omogočeni"
-      ],
-      "Creating Account": [
-         null,
-         "Ustvarjanje računa"
-      ],
-      "Getting Assertion": [
-         null,
-         "Pridobivanje izjave"
-      ],
-      "Checking Registration Token": [
-         null,
-         "Preverjanje žetona za registracijo"
-      ],
-      "Checking Email Address": [
-         null,
-         "Preverjanje e-poštnega naslova"
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         "Preverjanje pristnosti uporabnika pri ponudniku identitete"
-      ],
-      "Logout Failed": [
-         null,
-         "Odjava ni uspela"
-      ],
-      "You are offline!": [
-         null,
-         "Nimate povezave!"
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         "BrowserID na žalost ne deluje, ko nimate povezave!"
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         "Preverjanje pristnosti pri ponudniku identitete"
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         "Pogovor z vašim ponudnikom e-pošte ni uspel. Poskusite znova!"
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         "Omogočanje uporabe pri ponudniku identitete"
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         "Omogočanje uporabe pri nepodprtem ponudniku identitete"
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         "Žal navedeni e-poštni naslov ne more služiti kot glavni ponudnik identitete"
-      ],
-      "Registration Failed": [
-         null,
-         "Registracija ni uspela"
-      ],
-      "Establishing Relay": [
-         null,
-         "Vzpostavljanje posrednika"
-      ],
-      "Relay frame could not be found": [
-         null,
-         "Bloka za posredovanje ni bilo mogoče najti"
-      ],
-      "Resetting Password": [
-         null,
-         "Ponastavljanje gesla"
-      ],
-      "Remove Email Address from Account": [
-         null,
-         "Odstrani e-poštni naslov iz računa"
-      ],
-      "Setting Password": [
-         null,
-         "Nastavljanje gesla"
-      ],
-      "Signin Failed": [
-         null,
-         "Prijava ni uspela"
-      ],
-      "Signup Failed": [
-         null,
-         "Registracija ni uspela"
-      ],
-      "Syncing Address": [
-         null,
-         "Usklajevanje naslova"
-      ],
-      "Syncing Email Addresses": [
-         null,
-         "Usklajevanje e-poštnih naslovov"
-      ],
-      "Sync Keys for Address": [
-         null,
-         "Uskladi ključe naslova"
-      ],
-      "Getting Token Info": [
-         null,
-         "Pridobivanje podatkov žetona"
-      ],
-      "Updating password": [
-         null,
-         "Posodabljanje gesla"
-      ],
-      "Verifying email address": [
-         null,
-         "Potrjevanje e-poštnega naslova"
+         "Prosimo vas, da zaprete okno, <a %s>omogočite piškote</a> in poskusite znova"
       ],
       "Communication Error": [
          null,
@@ -238,7 +90,7 @@
          null,
          "Pozdravljeni v BrowserID!"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
          "Ta e-poštni naslov je nov, zato ga moramo najprej nastaviti."
       ],
@@ -258,6 +110,10 @@
          null,
          "Računa s tem uporabniškim imenom in geslom ni mogoče prijaviti."
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         "S klikom na %s boste potrdili, da sprejemate <a %s>pogoje uporabe</a> in <a %s>politiko zasebnosti</a>."
+      ],
       "next": [
          null,
          "naprej"
@@ -266,9 +122,9 @@
          null,
          "potrdi naslov"
       ],
-      "select email": [
+      "sign in": [
          null,
-         "izberi naslov"
+         "prijava"
       ],
       "Cannot verify %s": [
          null,
@@ -298,17 +154,33 @@
          null,
          "Če gre za napako, prezrite poslano sporočilo in <a href=\"#\" id=\"back\">uporabite drug e-poštni naslov</a>."
       ],
-      "The site requested you sign in using": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         "Stran zahteva, da se prijavite kot"
+         "Opravičujemo se, toda strežnik je pod veliko obremenitvijo!"
       ],
-      "Reset Password": [
+      "We are very sorry, there has been an error!": [
          null,
-         "Ponastavi geslo"
+         "Opravičujemo se, toda prišlo je do napake!"
       ],
-      "Cancel": [
+      "Please reload the page and try again.": [
          null,
-         "Prekliči"
+         "Ponovno naložite stran in poskusite znova."
+      ],
+      "Please close this window and try again.": [
+         null,
+         "Za ponovni poskus boste morali zapreti to okno."
+      ],
+      "See more info": [
+         null,
+         "Več o tem"
+      ],
+      "The site requested you sign in using": [
+         null,
+         "Stran zahteva, da se prijavite kot"
+      ],
+      "reset password": [
+         null,
+         "ponastavi geslo"
       ],
       "*%s* is not a valid email address!": [
          null,
@@ -318,10 +190,6 @@
          null,
          "Za nadaljevanje zaprite okno in vnesite veljaven naslov."
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
-         null,
-         "Opravičujemo se, toda BrowserID ne deluje, ko nimate povezave."
-      ],
       "This is not me...": [
          null,
          "To nisem jaz..."
@@ -334,10 +202,6 @@
          null,
          "Vedno se prijavi s tem e-poštnim naslovom"
       ],
-      "sign in": [
-         null,
-         "prijava"
-      ],
       "Address Verified!": [
          null,
          "Naslov potrjen!"
@@ -350,21 +214,181 @@
          null,
          "Za potrditev lastništva tega naslova, se morate prijaviti pri svojem ponudniku. To okno bo preusmerjeno na"
       ],
-      "Verify": [
+      "verify": [
          null,
-         "Potrdi"
+         "potrdi"
       ],
       "Verify With Email Provider": [
          null,
          "Potrdi s ponudnikom e-pošte"
       ],
-      "#~ \"We just sent an email to that address!  If you really want to send \"#~ \"another, wait a minute or two and try again.\"": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         "#~ \"Pravkar smo poslali e-poštno sporočilo na ta naslov!  Če res želite \"#~ \"poslati še enega, počakajte minuto ali dve in poskusite znova.\""
+         "#~ \"BrowserID za delovanje potrebuje piškote vašega brskalnika. Omogočite \"#~ \"piškote v vašem brskalniku in poskusite znova\""
       ],
-      "This email looks new, so let&apos;s get you set up.": [
+      "You are offline!": [
          null,
-         "Ta e-poštni naslov je nov, zato ga moramo najprej nastaviti."
+         "Nimate povezave!"
+      ],
+      "Unfortunately, BrowserID cannot communicate while offline!": [
+         null,
+         "BrowserID na žalost ne deluje, ko nimate povezave!"
+      ],
+      "select email": [
+         null,
+         "izberi naslov"
+      ],
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
+         null,
+         "Opravičujemo se, toda BrowserID ne deluje, ko nimate povezave."
+      ],
+      "Authenticating User": [
+         null,
+         "Preverjanje pristnosti uporabnika"
+      ],
+      "Adding Address": [
+         null,
+         "Dodajanje naslova"
+      ],
+      "Adding Primary Email Address to User": [
+         null,
+         "Dodajanje glavnega e-poštnega naslova uporabniku"
+      ],
+      "Checking Address Info": [
+         null,
+         "Preverjanje podatkov o naslovu"
+      ],
+      "Authenticating with Assertion": [
+         null,
+         "Preverjanje pristnosti s trditvijo"
+      ],
+      "Cancelling User Account": [
+         null,
+         "Preklic uporabniškega računa"
+      ],
+      "Checking Authentication": [
+         null,
+         "Preverjanje pristnosti"
+      ],
+      "Checking Script Version": [
+         null,
+         "Preverjanje različice skripta"
+      ],
+      "Completing User Registration": [
+         null,
+         "Dokončevanje registracije uporabnika"
+      ],
+      "Checking if Cookies are Enabled": [
+         null,
+         "Preverjanje, ali so piškoti omogočeni"
+      ],
+      "Creating Account": [
+         null,
+         "Ustvarjanje računa"
+      ],
+      "Getting Assertion": [
+         null,
+         "Pridobivanje trditve"
+      ],
+      "Checking Registration Token": [
+         null,
+         "Preverjanje žetona za registracijo"
+      ],
+      "Checking Email Address": [
+         null,
+         "Preverjanje e-poštnega naslova"
+      ],
+      "Checking Whether User is Authenticated with IdP": [
+         null,
+         "Preverjanje pristnosti uporabnika pri ponudniku identitete"
+      ],
+      "Logout Failed": [
+         null,
+         "Odjava ni uspela"
+      ],
+      "Authenticating with Identity Provider": [
+         null,
+         "Preverjanje pristnosti pri ponudniku identitete"
+      ],
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
+         null,
+         "Pogovor z vašim ponudnikom e-pošte ni uspel. Poskusite znova!"
+      ],
+      "Provisioning with Identity Provider": [
+         null,
+         "Omogočanje uporabe pri ponudniku identitete"
+      ],
+      "Provisioning Unsupported Identity Provider": [
+         null,
+         "Omogočanje uporabe pri nepodprtem ponudniku identitete"
+      ],
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
+         null,
+         "#~ \"Žal navedeni e-poštni naslov ne more služiti kot glavni ponudnik \"#~ \"identitete\""
+      ],
+      "Registration Failed": [
+         null,
+         "Registracija ni uspela"
+      ],
+      "Establishing Relay": [
+         null,
+         "Vzpostavljanje posrednika"
+      ],
+      "Relay frame could not be found": [
+         null,
+         "Bloka za posredovanje ni bilo mogoče najti"
+      ],
+      "Resetting Password": [
+         null,
+         "Ponastavljanje gesla"
+      ],
+      "Remove Email Address from Account": [
+         null,
+         "Odstrani e-poštni naslov iz računa"
+      ],
+      "Setting Password": [
+         null,
+         "Nastavljanje gesla"
+      ],
+      "Signin Failed": [
+         null,
+         "Prijava ni uspela"
+      ],
+      "Signup Failed": [
+         null,
+         "Registracija ni uspela"
+      ],
+      "Syncing Address": [
+         null,
+         "Usklajevanje naslova"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "Usklajevanje e-poštnih naslovov"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Uskladi ključe naslova"
+      ],
+      "Getting Token Info": [
+         null,
+         "Pridobivanje podatkov žetona"
+      ],
+      "Updating password": [
+         null,
+         "Posodabljanje gesla"
+      ],
+      "Verifying email address": [
+         null,
+         "Potrjevanje e-poštnega naslova"
+      ],
+      "Cancel": [
+         null,
+         "Prekliči"
+      ],
+      "#~ \"We just sent an email to that address!  If you really want to send \"#~ \"another, wait a minute or two and try again.\"": [
+         null,
+         "#~ \"Pravkar smo poslali e-poštno sporočilo na ta naslov!  Če res želite \"#~ \"poslati še enega, počakajte minuto ali dve in poskusite znova.\""
       ],
       "#~ \"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,
diff --git a/resources/static/i18n/sl/messages.json b/resources/static/i18n/sl/messages.json
index c6258ff0d..24becd3ce 100644
--- a/resources/static/i18n/sl/messages.json
+++ b/resources/static/i18n/sl/messages.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-03 15:32+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-02 16:55+0200",
          "Last-Translator": " Matjaž <m@owca.info>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " sl",
@@ -26,9 +26,9 @@
          null,
          "Med poskusom registracije je prišlo do napake."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         "Dokončevanje prijave na: "
+         "Dokončevanje prijave na:"
       ],
       "Email Verification": [
          null,
@@ -74,9 +74,9 @@
          null,
          "Gesli se ne ujemata."
       ],
-      "Finish": [
+      "finish": [
          null,
-         "Končaj"
+         "končaj"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
@@ -86,6 +86,14 @@
          null,
          "Vaš novi naslov je nastavljen in morali bi biti prijavljeni. Lahko zaprete to okno in se vrnete na"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID potrebuje piškote"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "Prosimo vas, da zaprete okno, <a %s>omogočite piškote</a> in poskusite znova"
+      ],
       "Communicating with server": [
          null,
          "Pogovor s strežnikom"
@@ -98,9 +106,9 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         "BrowserID omogoča hitro in varno prijavo &mdash; <a target=\"_blank\" href=\"/about\">več o tem</a>"
+         "BrowserID omogoča hitro in varno prijavo &mdash; <a %s>več o tem</a>"
       ],
       "BrowserID: %s": [
          null,
@@ -126,9 +134,9 @@
          null,
          "Odjava"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         "Avtorji: <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
+         "Avtorji: <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
@@ -146,7 +154,7 @@
          null,
          "Prišlo je do napake pri vaši povezavi za registracijo. Ali je bil ta naslov že kdaj registriran?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "Napaka pri pogovoru s strežnikom."
       ],
diff --git a/resources/static/i18n/son/client.json b/resources/static/i18n/son/client.json
index 29632035e..36052c1fb 100644
--- a/resources/static/i18n/son/client.json
+++ b/resources/static/i18n/son/client.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
          "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
          "Language-Team": " LANGUAGE <LL@li.org>",
@@ -13,159 +13,11 @@
          "Content-Transfer-Encoding": " 8bit",
          "X-Generator": " Translate Toolkit 1.9.0"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
          ""
       ],
-      "Adding Address": [
-         null,
-         ""
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         ""
-      ],
-      "Checking Address Info": [
-         null,
-         ""
-      ],
-      "Authenticating with Assertion": [
-         null,
-         ""
-      ],
-      "Cancelling User Account": [
-         null,
-         ""
-      ],
-      "Checking Authentication": [
-         null,
-         ""
-      ],
-      "Checking Script Version": [
-         null,
-         ""
-      ],
-      "Completing User Registration": [
-         null,
-         ""
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         ""
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         ""
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         ""
-      ],
-      "Creating Account": [
-         null,
-         ""
-      ],
-      "Getting Assertion": [
-         null,
-         ""
-      ],
-      "Checking Registration Token": [
-         null,
-         ""
-      ],
-      "Checking Email Address": [
-         null,
-         ""
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         ""
-      ],
-      "Logout Failed": [
-         null,
-         ""
-      ],
-      "You are offline!": [
-         null,
-         ""
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         ""
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         ""
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         ""
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         ""
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         ""
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         ""
-      ],
-      "Registration Failed": [
-         null,
-         ""
-      ],
-      "Establishing Relay": [
-         null,
-         ""
-      ],
-      "Relay frame could not be found": [
-         null,
-         ""
-      ],
-      "Resetting Password": [
-         null,
-         ""
-      ],
-      "Remove Email Address from Account": [
-         null,
-         ""
-      ],
-      "Setting Password": [
-         null,
-         ""
-      ],
-      "Signin Failed": [
-         null,
-         ""
-      ],
-      "Signup Failed": [
-         null,
-         ""
-      ],
-      "Syncing Address": [
-         null,
-         ""
-      ],
-      "Syncing Email Addresses": [
-         null,
-         ""
-      ],
-      "Sync Keys for Address": [
-         null,
-         ""
-      ],
-      "Getting Token Info": [
-         null,
-         ""
-      ],
-      "Updating password": [
-         null,
-         ""
-      ],
-      "Verifying email address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
          ""
       ],
@@ -237,7 +89,7 @@
          null,
          ""
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
          ""
       ],
@@ -257,6 +109,10 @@
          null,
          ""
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         ""
+      ],
       "next": [
          null,
          ""
@@ -265,7 +121,7 @@
          null,
          ""
       ],
-      "select email": [
+      "sign in": [
          null,
          ""
       ],
@@ -297,43 +153,51 @@
          null,
          ""
       ],
-      "The site requested you sign in using": [
+      "We are very sorry, the server is under extreme load!": [
          null,
          ""
       ],
-      "Reset Password": [
+      "We are very sorry, there has been an error!": [
          null,
          ""
       ],
-      "Cancel": [
+      "Please reload the page and try again.": [
          null,
          ""
       ],
-      "*%s* is not a valid email address!": [
+      "Please close this window and try again.": [
          null,
          ""
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "See more info": [
          null,
          ""
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "The site requested you sign in using": [
          null,
          ""
       ],
-      "This is not me...": [
+      "reset password": [
          null,
          ""
       ],
-      "Use a different email": [
+      "*%s* is not a valid email address!": [
          null,
          ""
       ],
-      "Always sign in using this email": [
+      "To continue, please close the window and enter a valid address.": [
          null,
          ""
       ],
-      "sign in": [
+      "This is not me...": [
+         null,
+         ""
+      ],
+      "Use a different email": [
+         null,
+         ""
+      ],
+      "Always sign in using this email": [
          null,
          ""
       ],
@@ -349,7 +213,7 @@
          null,
          ""
       ],
-      "Verify": [
+      "verify": [
          null,
          ""
       ],
diff --git a/resources/static/i18n/son/messages.json b/resources/static/i18n/son/messages.json
index ea1bfc9a1..60b8ef8eb 100644
--- a/resources/static/i18n/son/messages.json
+++ b/resources/static/i18n/son/messages.json
@@ -3,7 +3,7 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
          "PO-Revision-Date": " YEAR-MO-DA HO:MI+ZONE",
          "Last-Translator": " FULL NAME <EMAIL@ADDRESS>",
          "Language-Team": " LANGUAGE <LL@li.org>",
@@ -25,7 +25,7 @@
          null,
          ""
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          ""
       ],
@@ -73,7 +73,7 @@
          null,
          ""
       ],
-      "Finish": [
+      "finish": [
          null,
          ""
       ],
@@ -85,6 +85,14 @@
          null,
          ""
       ],
+      "BrowserID requires cookies": [
+         null,
+         ""
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
       "Communicating with server": [
          null,
          ""
@@ -97,7 +105,7 @@
          null,
          ""
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
          ""
       ],
@@ -125,7 +133,7 @@
          null,
          ""
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
          ""
       ],
@@ -145,7 +153,7 @@
          null,
          ""
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          ""
       ],
diff --git a/resources/static/i18n/sq/client.json b/resources/static/i18n/sq/client.json
index 34a7aadc7..be08895c4 100644
--- a/resources/static/i18n/sq/client.json
+++ b/resources/static/i18n/sq/client.json
@@ -3,9 +3,9 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-03 13:54+0200",
-         "Last-Translator": " Besnik <besnik@programeshqip.org>",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-23 02:26+0200",
+         "Last-Translator": " Besnik Bleta <besnik@programeshqip.org>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " sq",
          "MIME-Version": " 1.0",
@@ -14,162 +14,14 @@
          "Plural-Forms": " nplurals=2; plural=(n != 1);",
          "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
-         null,
-         "Po Kryhet Mirëfilltësimi i Përdoruesit"
-      ],
-      "Adding Address": [
-         null,
-         "Po Shtohet Adresa"
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         "Po Shtohet Te Përdoruesi Adresa Email Parësore"
-      ],
-      "Checking Address Info": [
-         null,
-         "Po Kontrollohen Të Dhëna Adrese"
-      ],
-      "Authenticating with Assertion": [
-         null,
-         ""
-      ],
-      "Cancelling User Account": [
-         null,
-         "Po Anulohet Llogaria e Përdoruesit"
-      ],
-      "Checking Authentication": [
-         null,
-         "Po Kontrollohet Mirëfilltësimi"
-      ],
-      "Checking Script Version": [
-         null,
-         "Po Kontrollohet Versioni i Programit"
-      ],
-      "Completing User Registration": [
-         null,
-         "Po Plotësohet Regjistrimi i Përdoruesit"
-      ],
-      "We are sorry, BrowserID requires cookies": [
+      "BrowserID requires cookies": [
          null,
          "Na ndjeni, BrowserID lyp \"cookies\""
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         "BrowserID lyp që &quot;cookie&quot;-t te shfletuesi juaj të jenë në gjendje të funksionojnë.  Ju lutem, aktivizoni &quot;cookie&quot;-t te shfletuesi juaj dhe riprovoni"
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         "Po Kontrollohet Nëse Cookie-t Janë të Aktivizuara"
-      ],
-      "Creating Account": [
-         null,
-         "Po krijohet Llogaria"
-      ],
-      "Getting Assertion": [
-         null,
-         ""
-      ],
-      "Checking Registration Token": [
-         null,
-         ""
-      ],
-      "Checking Email Address": [
-         null,
-         "Po Kontrollohet Adresa Email"
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         "Po Kontrollohet Nëse Përdoruesi është Mirëfilltësuar me IdP"
-      ],
-      "Logout Failed": [
-         null,
-         "Dalja Dështoi"
-      ],
-      "You are offline!": [
-         null,
-         "Jeni \"offline\"!"
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         "Për fat të keq, BrowserID nuk mund të komunikojë po nuk qetë të lidhur!"
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         "Po Mirëfilltësohet me Mundësuesin e Identitetit"
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         "Patëm probleme në komunikimin me mundësuesin tuaj të email-it, ju lutem, riprovoni!"
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         ""
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         ""
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         "Për fat të keq, adresa email e dhënë nuk mund të funksionojë si Mundësues Parësor Identiteti"
-      ],
-      "Registration Failed": [
-         null,
-         "Regjistrimi Dështoi"
-      ],
-      "Establishing Relay": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
          ""
       ],
-      "Relay frame could not be found": [
-         null,
-         ""
-      ],
-      "Resetting Password": [
-         null,
-         "Po Ricaktohet Fjalëkalimi"
-      ],
-      "Remove Email Address from Account": [
-         null,
-         "Hiqe Adresën Email Prej Llogarisë"
-      ],
-      "Setting Password": [
-         null,
-         "Po Caktohet Fjalëkalimi"
-      ],
-      "Signin Failed": [
-         null,
-         "Hyrja Dështoi"
-      ],
-      "Signup Failed": [
-         null,
-         "Regjistrimi Dështoi"
-      ],
-      "Syncing Address": [
-         null,
-         "Po Njëkohësohet Adresa"
-      ],
-      "Syncing Email Addresses": [
-         null,
-         "Po Njëkohësohen Adresat Email"
-      ],
-      "Sync Keys for Address": [
-         null,
-         "Njëkohëso Kyça për Adresën"
-      ],
-      "Getting Token Info": [
-         null,
-         ""
-      ],
-      "Updating password": [
-         null,
-         "Po përditësohet fjalëkalimi"
-      ],
-      "Verifying email address": [
-         null,
-         "Po verifikohet adresa email"
-      ],
       "Communication Error": [
          null,
          "Gabim Ndërlidhjeje"
@@ -238,7 +90,7 @@
          null,
          "Mirë se vini te BrowserID!"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
          "Ky email duket i ri, ndaj le t&quot;ju shërbejmë."
       ],
@@ -258,6 +110,10 @@
          null,
          "Te llogaria nuk hyhet dot me këtë emër përdoruesi dhe fjalëkalim."
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         ""
+      ],
       "next": [
          null,
          "pasuesi"
@@ -266,9 +122,9 @@
          null,
          "verifikoni email-in"
       ],
-      "select email": [
+      "sign in": [
          null,
-         "përzgjidhni email"
+         "hyni"
       ],
       "Cannot verify %s": [
          null,
@@ -298,17 +154,33 @@
          null,
          "Nëse bëhet fjalë për gabim, thjesht shpërfilleni email-ine dërguar dhe <a href=\"#\" id=\"back\">përdorni një tjetër adresë email</a>."
       ],
-      "The site requested you sign in using": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         "Site-i kërkoi që të hyni duke përdorur"
+         "Na vjen shumë keq, shërbyesi gjendet nën ngarkesë të skajshme!"
       ],
-      "Reset Password": [
+      "We are very sorry, there has been an error!": [
          null,
-         "Ricaktoni Fjalëkalimin"
+         "Na vjen shumë keq, pati një gabim!"
       ],
-      "Cancel": [
+      "Please reload the page and try again.": [
          null,
-         "Anuloje"
+         "Që të riprovoni, lypset të ringarkoni faqen dhe të riprovoni."
+      ],
+      "Please close this window and try again.": [
+         null,
+         "Që të riprovoni, lypset ta mbyllni këtë dritare dhe të riprovoni."
+      ],
+      "See more info": [
+         null,
+         "Shihni më tepër të dhëna"
+      ],
+      "The site requested you sign in using": [
+         null,
+         "Site-i kërkoi që të hyni duke përdorur"
+      ],
+      "reset password": [
+         null,
+         "ricaktoni fjalëkalimin"
       ],
       "*%s* is not a valid email address!": [
          null,
@@ -318,10 +190,6 @@
          null,
          "Që të vazhdohet, ju lutem, mbylleni dritaren dhe jepni si adresë të vlefshme."
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
-         null,
-         "Na ndjeni, por nuk mund të lidhemi me BrowserID sa kohë që nuk jeni i lidhur."
-      ],
       "This is not me...": [
          null,
          "Ky nuk jam unë..."
@@ -334,10 +202,6 @@
          null,
          "Hyni gjithmonë duke përdorur këtë email"
       ],
-      "sign in": [
-         null,
-         "hyni"
-      ],
       "Address Verified!": [
          null,
          "Adresa u Verifikua!"
@@ -350,13 +214,169 @@
          null,
          "Që të verifikohet pronësia e kësaj adrese, duhet të hyni me të dhënat nga mundësuesi juaj i email-i. Kjo dritare do t'ju ridrejtojë tek"
       ],
-      "Verify": [
+      "verify": [
          null,
-         "Verifikoje"
+         "verifikoje"
       ],
       "Verify With Email Provider": [
          null,
          "Verifikoje me Mundësuesin e Email-it"
+      ],
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
+         null,
+         "#~ \"BrowserID lyp që &quot;cookie&quot;-t te shfletuesi juaj të jenë në \"#~ \"gjendje të funksionojnë.  Ju lutem, aktivizoni &quot;cookie&quot;-t te \"#~ \"shfletuesi juaj dhe riprovoni\""
+      ],
+      "You are offline!": [
+         null,
+         "Jeni \"offline\"!"
+      ],
+      "Unfortunately, BrowserID cannot communicate while offline!": [
+         null,
+         "#~ \"Për fat të keq, BrowserID nuk mund të komunikojë po nuk qetë të lidhur!\""
+      ],
+      "select email": [
+         null,
+         "përzgjidhni email"
+      ],
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
+         null,
+         "#~ \"Na ndjeni, por nuk mund të lidhemi me BrowserID sa kohë që nuk jeni i \"#~ \"lidhur.\""
+      ],
+      "Authenticating User": [
+         null,
+         "Po Kryhet Mirëfilltësimi i Përdoruesit"
+      ],
+      "Adding Address": [
+         null,
+         "Po Shtohet Adresa"
+      ],
+      "Adding Primary Email Address to User": [
+         null,
+         "Po Shtohet Te Përdoruesi Adresa Email Parësore"
+      ],
+      "Checking Address Info": [
+         null,
+         "Po Kontrollohen Të Dhëna Adrese"
+      ],
+      "Authenticating with Assertion": [
+         null,
+         "Mirëfilltësim me Pohim"
+      ],
+      "Cancelling User Account": [
+         null,
+         "Po Anulohet Llogaria e Përdoruesit"
+      ],
+      "Checking Authentication": [
+         null,
+         "Po Kontrollohet Mirëfilltësimi"
+      ],
+      "Checking Script Version": [
+         null,
+         "Po Kontrollohet Versioni i Programit"
+      ],
+      "Completing User Registration": [
+         null,
+         "Po Plotësohet Regjistrimi i Përdoruesit"
+      ],
+      "Checking if Cookies are Enabled": [
+         null,
+         "Po Kontrollohet Nëse Cookie-t Janë të Aktivizuara"
+      ],
+      "Creating Account": [
+         null,
+         "Po krijohet Llogaria"
+      ],
+      "Getting Assertion": [
+         null,
+         "Po Merret Pohimi"
+      ],
+      "Checking Registration Token": [
+         null,
+         "Po Kontrollohet Token-i i Regjistrimit"
+      ],
+      "Checking Email Address": [
+         null,
+         "Po Kontrollohet Adresa Email"
+      ],
+      "Checking Whether User is Authenticated with IdP": [
+         null,
+         "Po Kontrollohet Nëse Përdoruesi është Mirëfilltësuar me IdP"
+      ],
+      "Logout Failed": [
+         null,
+         "Dalja Dështoi"
+      ],
+      "Authenticating with Identity Provider": [
+         null,
+         "Po Mirëfilltësohet me Mundësuesin e Identitetit"
+      ],
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
+         null,
+         "#~ \"Patëm probleme në komunikimin me mundësuesin tuaj të email-it, ju lutem, \"#~ \"riprovoni!\""
+      ],
+      "Provisioning with Identity Provider": [
+         null,
+         "Po bëhet me Mundësuesin e Identitetit"
+      ],
+      "Provisioning Unsupported Identity Provider": [
+         null,
+         "Po bëhet nga Mundësues i Pambuluar Identiteti"
+      ],
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
+         null,
+         "#~ \"Për fat të keq, adresa email e dhënë nuk mund të funksionojë si Mundësues \"#~ \"Parësor Identiteti\""
+      ],
+      "Registration Failed": [
+         null,
+         "Regjistrimi Dështoi"
+      ],
+      "Resetting Password": [
+         null,
+         "Po Ricaktohet Fjalëkalimi"
+      ],
+      "Remove Email Address from Account": [
+         null,
+         "Hiqe Adresën Email Prej Llogarisë"
+      ],
+      "Setting Password": [
+         null,
+         "Po Caktohet Fjalëkalimi"
+      ],
+      "Signin Failed": [
+         null,
+         "Hyrja Dështoi"
+      ],
+      "Signup Failed": [
+         null,
+         "Regjistrimi Dështoi"
+      ],
+      "Syncing Address": [
+         null,
+         "Po Njëkohësohet Adresa"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "Po Njëkohësohen Adresat Email"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Njëkohëso Kyça për Adresën"
+      ],
+      "Getting Token Info": [
+         null,
+         "Po Merren të Dhëna Token-i"
+      ],
+      "Updating password": [
+         null,
+         "Po përditësohet fjalëkalimi"
+      ],
+      "Verifying email address": [
+         null,
+         "Po verifikohet adresa email"
+      ],
+      "Cancel": [
+         null,
+         "Anuloje"
       ]
    }
 }
diff --git a/resources/static/i18n/sq/messages.json b/resources/static/i18n/sq/messages.json
index d16309321..fd503c8ed 100644
--- a/resources/static/i18n/sq/messages.json
+++ b/resources/static/i18n/sq/messages.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-03 13:54+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-23 02:28+0200",
          "Last-Translator": " Besnik <besnik@programeshqip.org>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " sq",
@@ -26,7 +26,7 @@
          null,
          "U has në një gabim ndërkohë që provohej të plotësohej regjistrimi."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          "Përfundoni me hyrjen te:"
       ],
@@ -74,9 +74,9 @@
          null,
          "Fjalëkalimet nuk përputhen."
       ],
-      "Finish": [
+      "finish": [
          null,
-         "Përfundoje"
+         "përfundoje"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
@@ -86,6 +86,14 @@
          null,
          "Adresa juaj e re është rregulluar dhe do të duhej që tani të bënit hyrjen me të. Tani mund ta mbyllni këtë dritare dhe të ktheheni te"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "Faqja Hyrëse e BrowserID-së"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
       "Communicating with server": [
          null,
          "Po komunikohet me shërbyesin"
@@ -98,7 +106,7 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
          "BrowserID është një mënyrë e sigurt dhe e shpejtë për të hyrë në llogaritë tuaja në &quot;site&quot;-e &mdash; <a target=\"_blank\" href=\"/about\">mësoni më tepër rretj tij</a>"
       ],
@@ -126,7 +134,7 @@
          null,
          "Dilni"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
          "Nga <a href=\"%s\" target=\"_blank\">Ekipi i Identitetit</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
       ],
@@ -146,7 +154,7 @@
          null,
          "Pati një problem me lidhjen tuaj të regjistrimit. Mos është e regjistruar një kjo adresë?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "Gabim gjatë komunikimit me shërbyesin."
       ],
diff --git a/resources/static/i18n/sr/client.json b/resources/static/i18n/sr/client.json
index 8311934d4..fcce9c5c8 100644
--- a/resources/static/i18n/sr/client.json
+++ b/resources/static/i18n/sr/client.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-01-28 04:14+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-27 21:39+0200",
          "Last-Translator": " Milos <mdinic@mozilla.com>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " sr",
@@ -14,357 +14,381 @@
          "Plural-Forms": " nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);",
          "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
+      "BrowserID requires cookies": [
          null,
-         "Аутентификација корисника"
+         "Жао нам је, али BrowserID захтева омогућене колачиће у Вашем прегледачу"
       ],
-      "Adding Address": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "Додавање адресе"
+         ""
       ],
-      "Adding Primary Email Address to User": [
+      "Communication Error": [
          null,
-         "Додавање примарне адресе ел. поште кориснику"
+         "Грешка у комуникацији"
       ],
-      "Checking Address Info": [
+      "Finishing Sign In...": [
          null,
-         "Проверавање адресе"
+         "Завршавам пријављивање..."
       ],
-      "Authenticating with Assertion": [
+      "In just a moment you'll be signed into BrowserID.": [
          null,
-         ""
+         "Ускоро ћете бити пријављени на BrowserID."
       ],
-      "Cancelling User Account": [
+      "Please wait a few seconds while we sign you into the site.": [
          null,
-         "Отказивање Вашег налога"
+         "Молимо сачекајте неколико секунди док Вас пријавимо на сајт."
       ],
-      "Checking Authentication": [
+      "We are sorry, this request is taking a LOOONG time.": [
          null,
-         "Провера аутентификације"
+         "Жао нам је, овај захтев траје предуго."
       ],
-      "Checking Script Version": [
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
          null,
-         "Провера верзије скрипте"
+         "Ова порука ће нестати када се захтев изврши(надамо се ускоро). Ако предуго чекате, затворите овај прозор и пробајте поново."
       ],
-      "Completing User Registration": [
+      "Sign in using": [
          null,
-         "Завршница регистрације налога"
+         "Пријавите се користећи"
       ],
-      "We are sorry, BrowserID requires cookies": [
+      "New email address": [
          null,
-         "Жао нам је, али BrowserID захтева омогућене колачиће у Вашем прегледачу"
+         "Нова адреса ел. поште"
       ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
+      "This field must be an email address.": [
          null,
-         "BrowserID захтева омогућене колачиће у Вашем прегледачу како би могао да ради.  Молимо омогућите колачиће и покушајте поново."
+         "У ово поље мора бити унета адреса ел. поште."
       ],
-      "Checking if Cookies are Enabled": [
+      "The email field is required.": [
          null,
-         "Проверавам да ли су колачићи омогућени"
+         "Поље за адресу ел. поште је обавезно."
       ],
-      "Creating Account": [
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
          null,
-         "Правим налог"
+         "Управо смо послали поруку на ту адресу ел. поште! Ако заиста желите да пошаљемо још једну, сачекајте неколико минута и пробајте поново."
       ],
-      "Getting Assertion": [
+      "That address is already added to your account!": [
          null,
-         ""
+         "Та адреса је већ повезана са Вашим налогом!"
       ],
-      "Checking Registration Token": [
+      "add": [
          null,
-         "Провера симбола регистрације"
+         "додај"
       ],
-      "Checking Email Address": [
+      "cancel": [
          null,
-         "Провера адресе ел. поште"
+         "откажи"
       ],
-      "Checking Whether User is Authenticated with IdP": [
+      "Email": [
          null,
-         "Проверавам да ли је корисник пријављен на IdP"
+         "Адреса ел. поште"
       ],
-      "Logout Failed": [
+      "Enter your email address to sign in to <strong>%s</strong>": [
          null,
-         "Одјава неуспела"
+         "Унесите своју адресу ел. поште да бисте се пријавили на <strong>%s</strong>"
       ],
-      "You are offline!": [
+      "Welcome to BrowserID!": [
          null,
-         "Нисте повезани на интернет!"
+         "Добродошли на BrowserID!"
       ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
+      "This email looks new, so let's get you set up.": [
          null,
-         "На жалост, BrowserID не може да комуницира када сте ван мреже!"
+         "Ова адреса ел. поште изгледа као нова, па хајмо да покренемо ствари."
       ],
-      "Authenticating with Identity Provider": [
+      "Password": [
          null,
-         ""
+         "Лозинка"
       ],
-      "We had trouble communicating with your email provider, please try again!": [
+      "forgot your password?": [
          null,
-         "Дошло је до грешке у комуникацији са пружаоцем услуга ел. поште код кога сте пријављени. Молимо пробајте поново."
+         "заборавили сте лозинку?"
       ],
-      "Provisioning with Identity Provider": [
+      "The password field is required.": [
          null,
-         ""
+         "Поље за унос лозинке је обавезно."
       ],
-      "Provisioning Unsupported Identity Provider": [
+      "The account cannot be logged in with this username and password.": [
+         null,
+         "Не можете се пријавити под датим корисничким именом и лозинком."
+      ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
          null,
          ""
       ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
+      "next": [
          null,
-         "На жалост, дата адреса ел. поштене може бити примарни пружаоц идентитета на мрежи"
+         "следеће"
       ],
-      "Registration Failed": [
+      "verify email": [
          null,
-         "Регистрација није успела"
+         "потврдите адресу ел. поште"
       ],
-      "Establishing Relay": [
+      "sign in": [
          null,
-         ""
+         "пријавите се"
       ],
-      "Relay frame could not be found": [
+      "Cannot verify %s": [
          null,
-         ""
+         "Не могу потврдити %s"
       ],
-      "Resetting Password": [
+      "%s is a required address, but we cannot verify that you own this address.": [
          null,
-         "Обнављање лозинке"
+         "%s је адреса ел. поште која је обавезна, али нисмо могли потврдити да је она у Вашем власништву."
       ],
-      "Remove Email Address from Account": [
+      "Check your email!": [
          null,
-         "Уклоните адресу ел. поште са овог налога"
+         "Проверите своју ел. пошту!"
       ],
-      "Setting Password": [
+      "We sent a confirmation email to <strong>%s</strong>": [
          null,
-         "Постављање лозинке"
+         "Послали смо ел. поруку са потврдом на <strong>%s</strong>"
       ],
-      "Signin Failed": [
+      "To finish signing in just click the verify link we sent to your email address.": [
          null,
-         "Пријава није успела"
+         "Да бисте завршили пријављивање, само кликните на везу коју смо Вам послали у електронској поруци."
       ],
-      "Signup Failed": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
          null,
-         "Регистрација није успела"
+         "Уколико је ово грешка, молимо игноришите послату поруку и <a href=\"#\" id=\"cancel\">користите нову адресу ел.поште</a>."
       ],
-      "Syncing Address": [
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
          null,
-         "Синхронизујем адресу"
+         "Уколико је ово грешка, молимо игноришите послату поруку и <a href=\"#\" id=\"back\">користите нову адресу ел.поште</a>."
       ],
-      "Syncing Email Addresses": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         "Синхронизујем адресе ел. поште"
+         "Жао нам је, наш сервер је преоптерећен."
       ],
-      "Sync Keys for Address": [
+      "We are very sorry, there has been an error!": [
          null,
-         "Синхронизуј кључеве адреса"
+         "Жао нам је, дошло је до грешке."
       ],
-      "Getting Token Info": [
+      "Please reload the page and try again.": [
          null,
-         "Добављам информације о симболу"
+         "Да бисте поновили, учитајте страницу и покушајте поново."
       ],
-      "Updating password": [
+      "Please close this window and try again.": [
          null,
-         "Ажурирање лозинке"
+         "Да бисте наставили, молимо зазворите прозор и покушајте поново."
       ],
-      "Verifying email address": [
+      "See more info": [
          null,
-         "Потрврђивање адресе ел. поште"
+         "Погледајте више информација."
       ],
-      "Communication Error": [
+      "The site requested you sign in using": [
          null,
-         "Грешка у комуникацији"
+         "Сајт захтева да се пријавите користећи"
       ],
-      "Finishing Sign In...": [
+      "reset password": [
          null,
-         "Завршавам пријављивање..."
+         "Обновите лозинку"
       ],
-      "In just a moment you'll be signed into BrowserID.": [
+      "*%s* is not a valid email address!": [
          null,
-         "Ускоро ћете бити пријављени на BrowserID."
+         "*%s* није исправна адреса ел. поште!"
       ],
-      "Please wait a few seconds while we sign you into the site.": [
+      "To continue, please close the window and enter a valid address.": [
          null,
-         "Молимо сачекајте неколико секунди док Вас пријавимо на сајт."
+         "Да бисте наставили, молимо зазворите прозор и унесите исправну адресу."
       ],
-      "We are sorry, this request is taking a LOOONG time.": [
+      "This is not me...": [
          null,
-         "Жао нам је, овај захтев траје предуго."
+         "Ово нисам ја..."
       ],
-      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+      "Use a different email": [
          null,
-         "Ова порука ће нестати када се захтев изврши(надамо се ускоро). Ако предуго чекате, затворите овај прозор и пробајте поново."
+         "Користи другу адресу ел. поште"
       ],
-      "Sign in using": [
+      "Always sign in using this email": [
          null,
-         "Пријавите се користећи"
+         "Увек ме пријави користећи ову адресу ел. поште"
       ],
-      "New email address": [
+      "Address Verified!": [
          null,
-         "Нова адреса ел. поште"
+         "Адреса потврђена!"
       ],
-      "This field must be an email address.": [
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
          null,
-         "У ово поље мора бити унета адреса ел. поште."
+         "Ваш идентитет је потврђен са пруђаоцем услуга Ваше ел. поште. Сада ћемо покушати пријаву."
       ],
-      "The email field is required.": [
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
          null,
-         "Поље за адресу ел. поште је обавезно."
+         "Да бисте доказали да је ово Ваша адреса, морате се пријавити преко свог пружаоца услуга.  Овај прозор ће Вас одвести на"
       ],
-      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
+      "verify": [
          null,
-         ""
+         "Потврди"
       ],
-      "That address is already added to your account!": [
+      "Verify With Email Provider": [
          null,
-         "Та адреса је већ повезана са Вашим налогом!"
+         "Потврди преко пружаоца услуга ел. поште"
       ],
-      "add": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         "додај"
+         "#~ \"BrowserID захтева омогућене колачиће у Вашем прегледачу како би могао да \"#~ \"ради.  Молимо омогућите колачиће и покушајте поново.\""
       ],
-      "cancel": [
+      "You are offline!": [
          null,
-         "откажи"
+         "Нисте повезани на интернет!"
       ],
-      "Email": [
+      "Unfortunately, BrowserID cannot communicate while offline!": [
          null,
-         "Адреса ел. поште"
+         "На жалост, BrowserID не може да комуницира када сте ван мреже!"
       ],
-      "Enter your email address to sign in to <strong>%s</strong>": [
+      "select email": [
          null,
-         "Унесите своју адресу ел. поште да бисте се пријавили на <strong>%s</strong>"
+         "одаберите адресу ел. поште"
       ],
-      "Welcome to BrowserID!": [
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
          null,
-         "Добродошли на BrowserID!"
+         "#~ \"Жао нам је, али не можемо комуницирати са BrowserID сервисом ако нисте \"#~ \"повезани на Интернет.\""
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "Authenticating User": [
          null,
-         ""
+         "Аутентификација корисника"
       ],
-      "Password": [
+      "Adding Address": [
          null,
-         "Лозинка"
+         "Додавање адресе"
       ],
-      "forgot your password?": [
+      "Adding Primary Email Address to User": [
          null,
-         "заборавили сте лозинку?"
+         "Додавање примарне адресе ел. поште кориснику"
       ],
-      "The password field is required.": [
+      "Checking Address Info": [
          null,
-         "Поље за унос лозинке је обавезно."
+         "Проверавање адресе"
       ],
-      "The account cannot be logged in with this username and password.": [
+      "Authenticating with Assertion": [
          null,
-         "Не можете се пријавити под датим корисничким именом и лозинком."
+         "Добављање потврде"
       ],
-      "next": [
+      "Cancelling User Account": [
          null,
-         "следеће"
+         "Отказивање Вашег налога"
       ],
-      "verify email": [
+      "Checking Authentication": [
          null,
-         "потврдите адресу ел. поште"
+         "Провера аутентификације"
       ],
-      "select email": [
+      "Checking Script Version": [
          null,
-         "одаберите адресу ел. поште"
+         "Провера верзије скрипте"
       ],
-      "Cannot verify %s": [
+      "Completing User Registration": [
          null,
-         ""
+         "Завршница регистрације налога"
       ],
-      "%s is a required address, but we cannot verify that you own this address.": [
+      "Checking if Cookies are Enabled": [
          null,
-         ""
+         "Проверавам да ли су колачићи омогућени"
       ],
-      "Check your email!": [
+      "Creating Account": [
          null,
-         "Проверите своју ел. пошту!"
+         "Правим налог"
       ],
-      "We sent a confirmation email to <strong>%s</strong>": [
+      "Getting Assertion": [
          null,
-         "Послали смо ел. поруку са потврдом на <strong>%s</strong>"
+         "Добављање потврде"
       ],
-      "To finish signing in just click the verify link we sent to your email address.": [
+      "Checking Registration Token": [
          null,
-         "Да бисте завршили пријављивање, само кликните на везу коју смо Вам послали у електронској поруци."
+         "Провера симбола регистрације"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+      "Checking Email Address": [
          null,
-         "Уколико је ово грешка, молимо игноришите послату поруку и <a href=\"#\" class=\"cancel\" id=\"back\">користите нову адресу ел.поште</a>."
+         "Провера адресе ел. поште"
       ],
-      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+      "Checking Whether User is Authenticated with IdP": [
          null,
-         "Уколико је ово грешка, молимо игноришите послату поруку и <a href=\"#\" class=\"cancel\" id=\"back\">користите нову адресу ел.поште</a>."
+         "Проверавам да ли је корисник пријављен на IdP"
       ],
-      "The site requested you sign in using": [
+      "Logout Failed": [
          null,
-         "Сајт захтева да се пријавите користећи"
+         "Одјава неуспела"
       ],
-      "Reset Password": [
+      "Authenticating with Identity Provider": [
          null,
-         "Обновите лозинку"
+         "Аутентификација са пружаоцем услуге индентитета"
       ],
-      "Cancel": [
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
          null,
-         "Откажи"
+         "#~ \"Дошло је до грешке у комуникацији са пружаоцем услуга ел. поште код кога \"#~ \"сте пријављени. Молимо пробајте поново.\""
       ],
-      "*%s* is not a valid email address!": [
+      "Provisioning with Identity Provider": [
          null,
-         "*%s* није исправна адреса ел. поште!"
+         "Оспособљавање пружаоца услуга идентитета"
       ],
-      "To continue, please close the window and enter a valid address.": [
+      "Provisioning Unsupported Identity Provider": [
          null,
-         "Да бисте наставили, молимо зазворите прозор и унесите исправну адресу."
+         "Оспособљавање пружаоца услуга идентитета који није подржан"
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
          null,
-         "Жао нам је, али не можемо комуницирати са BrowserID сервисом ако нисте повезани на Интернет."
+         "#~ \"На жалост, дата адреса ел. поштене може бити примарни пружаоц идентитета \"#~ \"на мрежи\""
       ],
-      "This is not me...": [
+      "Registration Failed": [
          null,
-         "Ово није за мене..."
+         "Регистрација није успела"
       ],
-      "Use a different email": [
+      "Establishing Relay": [
          null,
-         "Користи другу адресу ел. поште"
+         "Повезивање са посредником"
       ],
-      "Always sign in using this email": [
+      "Relay frame could not be found": [
          null,
-         "Увек ме пријави користећи ову адресу ел. поште"
+         "Посреднички сервер није нађен"
       ],
-      "sign in": [
+      "Resetting Password": [
          null,
-         "пријавите се"
+         "Обнављање лозинке"
       ],
-      "Address Verified!": [
+      "Remove Email Address from Account": [
          null,
-         "Адреса потврђена!"
+         "Уклоните адресу ел. поште са овог налога"
       ],
-      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+      "Setting Password": [
          null,
-         "Ваш идентитет је потврђен са пруђаоцем услуга Ваше ел. поште. Сада ћемо покушати пријаву."
+         "Постављање лозинке"
       ],
-      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+      "Signin Failed": [
          null,
-         "Да бисте доказали да је ово Ваша адреса, морате се пријавити преко свог пружаоца услуга.  Овај прозор ће Вас одвести на"
+         "Пријава није успела"
       ],
-      "Verify": [
+      "Signup Failed": [
          null,
-         "Потврди"
+         "Регистрација није успела"
       ],
-      "Verify With Email Provider": [
+      "Syncing 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.\"": [
+      "Syncing Email Addresses": [
          null,
-         "#~ \"Управо смо послали поруку на ту адресу ел. поште!  Ако заиста желите да \"#~ \"пошаљемо још једну, сачекајте неколико минута и пробајте поново.\""
+         "Синхронизујем адресе ел. поште"
       ],
-      "This email looks new, so let&apos;s get you set up.": [
+      "Sync Keys for Address": [
          null,
-         "#~ \"Ова адреса ел. поште изгледа као нова, па хајмо да покренемо ствари.\""
+         "Синхронизуј кључеве адреса"
+      ],
+      "Getting Token Info": [
+         null,
+         "Добављам информације о симболу"
+      ],
+      "Updating password": [
+         null,
+         "Ажурирање лозинке"
+      ],
+      "Verifying email address": [
+         null,
+         "Потрврђивање адресе ел. поште"
+      ],
+      "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.\"": [
+         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,
diff --git a/resources/static/i18n/sr/messages.json b/resources/static/i18n/sr/messages.json
index 0c3b08cd6..ef789b1f3 100644
--- a/resources/static/i18n/sr/messages.json
+++ b/resources/static/i18n/sr/messages.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-01-28 04:28+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-02-27 21:38+0200",
          "Last-Translator": " Milos <mdinic@mozilla.com>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " sr",
@@ -26,7 +26,7 @@
          null,
          "Дошло је до грешке приликом покушаја да се заврши регистрација."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          "Завршите пријављивање на: "
       ],
@@ -74,7 +74,7 @@
          null,
          "Лозинке нису исте."
       ],
-      "Finish": [
+      "finish": [
          null,
          "Заврши"
       ],
@@ -86,6 +86,14 @@
          null,
          "Ваша нова адреса је подешена и сада бисте требали бити у могућности да се пријавите. Сада можете затворити овај прозор и отићи поново на"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID почетак"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
       "Communicating with server": [
          null,
          "Комуницирам са сервером"
@@ -98,7 +106,7 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
          "BrowserID је брз и сигуран начин да се пријавите &mdash; <a target=\"_blank\" href=\"/about\">сазнајте више</a>"
       ],
@@ -126,7 +134,7 @@
          null,
          "Одјавите се"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
          "Од <a href=\"%s\" target=\"_blank\">’Идентитет’ тима</a> при <a href=\"%s\" target=\"_blank\">Мозила лабораторији</a>"
       ],
@@ -146,7 +154,7 @@
          null,
          "Постоји проблем са Вашом везом за регистрацију.  Да ли је ова адреса ел. поште већ регистрована?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "Грешка при комуникацији са сервером."
       ],
@@ -160,7 +168,7 @@
       ],
       "Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.": [
          null,
-         ""
+         "Хвала што се потврдили своју адресу ел. поште. Ова порука Вам је послата да бисте потврдили пријављивање на сајт: %s."
       ],
       "Finish registration by clicking this link:": [
          null,
diff --git a/resources/static/i18n/sv/client.json b/resources/static/i18n/sv/client.json
index 3fa5bbdfc..a970f0b99 100644
--- a/resources/static/i18n/sv/client.json
+++ b/resources/static/i18n/sv/client.json
@@ -1,173 +1,25 @@
 ;var json_locale_data = {
    "client": {
       "": {
-         "Project-Id-Version": " PACKAGE VERSION",
+         "Project-Id-Version": " BrowserID 1",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-05 13:59+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-03 15:29+0100",
          "Last-Translator": " Hans Wallanger <hasse@jasajudeju.se>",
          "Language-Team": " Swedish",
          "Language": " sv",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
-         "X-Generator": " Translate Toolkit 1.9.0"
+         "Plural-Forms": " nplurals=2; plural=(n != 1);"
       },
-      "Authenticating User": [
-         null,
-         "Autentiserar användaren"
-      ],
-      "Adding Address": [
-         null,
-         "Lägger till adress"
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         "Lägger till en primär e-postadress till användaren"
-      ],
-      "Checking Address Info": [
-         null,
-         "Kontrollerar adressuppgifter"
-      ],
-      "Authenticating with Assertion": [
-         null,
-         "Autentiserar med påstående"
-      ],
-      "Cancelling User Account": [
+      "BrowserID requires cookies": [
          null,
-         "Återkallar användarkonto"
-      ],
-      "Checking Authentication": [
-         null,
-         "Kontrollerar autentisering"
+         "BrowserID använder kakor"
       ],
-      "Checking Script Version": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "Kontrollerar skriptversion"
-      ],
-      "Completing User Registration": [
-         null,
-         "Slutför användarregistrering"
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         "Tyvärr, det krävs kakor för BrowserID"
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         "För att BrowserID ska fungera måste kakor i webbläsaren användas. Tillåt kakor i webbläsaren och försök igen"
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         "Kontrollerar om kakor är aktiverade"
-      ],
-      "Creating Account": [
-         null,
-         "Skapar konto"
-      ],
-      "Getting Assertion": [
-         null,
-         "Tar emot påstående"
-      ],
-      "Checking Registration Token": [
-         null,
-         "Kontrollerar registreringstoken"
-      ],
-      "Checking Email Address": [
-         null,
-         "Kontrollerar e-postadress"
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         "Kontrollerar om användaren är autentiserad med IdP"
-      ],
-      "Logout Failed": [
-         null,
-         "Utloggning misslyckades"
-      ],
-      "You are offline!": [
-         null,
-         "Du är nedkopplad!"
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         "Tyvärr kan inte BrowserID kommunicera när du är nedkopplad!"
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         "Autentiserar med identitetsleverantör"
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         "Vi kunde inte kommunicera med din e-postleverantör, försök igen!"
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         "Förbereder med identitetsleverantören"
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         "Förbereder ej stödd identitetsleverantör"
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         "Tyvärr kan inte e-postadressen användas som en primär identitetsleverantör"
-      ],
-      "Registration Failed": [
-         null,
-         "Registreringen misslyckades"
-      ],
-      "Establishing Relay": [
-         null,
-         "Etablerar vidaresändning"
-      ],
-      "Relay frame could not be found": [
-         null,
-         "Vidaresändningsramen kunde inte hittas"
-      ],
-      "Resetting Password": [
-         null,
-         "Återställer lösenord"
-      ],
-      "Remove Email Address from Account": [
-         null,
-         "Ta bort e-postadress från kontot"
-      ],
-      "Setting Password": [
-         null,
-         "Ställer in lösenord"
-      ],
-      "Signin Failed": [
-         null,
-         "Inloggningen misslyckades"
-      ],
-      "Signup Failed": [
-         null,
-         "Anmälan misslyckades"
-      ],
-      "Syncing Address": [
-         null,
-         "Synkar adress"
-      ],
-      "Syncing Email Addresses": [
-         null,
-         "Synkar e-postadresser"
-      ],
-      "Sync Keys for Address": [
-         null,
-         "Synkar nycklar för adress"
-      ],
-      "Getting Token Info": [
-         null,
-         "Hämtar tokeninformation"
-      ],
-      "Updating password": [
-         null,
-         "Uppdaterar lösenord"
-      ],
-      "Verifying email address": [
-         null,
-         "Verifierar e-postadress"
+         "Stäng det här fönstret, <a %s>aktivera kakor</a> och försök igen"
       ],
       "Communication Error": [
          null,
@@ -237,7 +89,7 @@
          null,
          "Välkommen till BrowserID!"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
          "Den här e-postadressen verkar ny så den kan du använda."
       ],
@@ -257,6 +109,10 @@
          null,
          "Du kan inte logga in kontot med det här användarnamnet och lösenordet."
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         "Genom att klicka på %s godkänner du webbplatsens <a %s>användarvillkor</a> och <a %s>sekretesspolicy</a>."
+      ],
       "next": [
          null,
          "nästa"
@@ -265,9 +121,9 @@
          null,
          "verifiera e-postadress"
       ],
-      "select email": [
+      "sign in": [
          null,
-         "välj e-postadress"
+         "logga in"
       ],
       "Cannot verify %s": [
          null,
@@ -297,17 +153,33 @@
          null,
          "Om det här är ett misstag, ignorera det skickade mejlet och <a href=\"#\" id=\"back\">använd en annan e-postadress</a>."
       ],
-      "The site requested you sign in using": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         "Webbplatsen vill att du loggar in med"
+         "Vi är ledsna, men servern är under hård belastning!"
       ],
-      "Reset Password": [
+      "We are very sorry, there has been an error!": [
          null,
-         "Återställ lösenord"
+         "Vi är ledsna, men ett fel har uppstått"
       ],
-      "Cancel": [
+      "Please reload the page and try again.": [
          null,
-         "Avbryt"
+         "Uppdatera sidan för att försöka igen."
+      ],
+      "Please close this window and try again.": [
+         null,
+         "Stäng fönstret och försök igen."
+      ],
+      "See more info": [
+         null,
+         "Se mer info"
+      ],
+      "The site requested you sign in using": [
+         null,
+         "Webbplatsen vill att du loggar in med"
+      ],
+      "reset password": [
+         null,
+         "återställ lösenord"
       ],
       "*%s* is not a valid email address!": [
          null,
@@ -317,10 +189,6 @@
          null,
          "Stäng fönstret och ange en giltig e-postadress för att fortsätta."
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
-         null,
-         "Tyvärr kan vi inte kommunicera med BrowserID när du nedkopplad."
-      ],
       "This is not me...": [
          null,
          "Det där är inte jag …"
@@ -333,10 +201,6 @@
          null,
          "Logga alltid in med denna e-postadress"
       ],
-      "sign in": [
-         null,
-         "logga in"
-      ],
       "Address Verified!": [
          null,
          "Adressen är verifierad!"
@@ -349,13 +213,177 @@
          null,
          "För att verifiera att du äger den här adressen måste du logga in till din e-postleverantör. Det här fönstret kommer att dirigeras om till"
       ],
-      "Verify": [
+      "verify": [
          null,
-         "Verifiera"
+         "verifiera"
       ],
       "Verify With Email Provider": [
          null,
          "Verifiera med e-postleverantören"
+      ],
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
+         null,
+         "#~ \"För att BrowserID ska fungera måste kakor i webbläsaren användas. Tillåt \"#~ \"kakor i webbläsaren och försök igen\""
+      ],
+      "You are offline!": [
+         null,
+         "Du är nedkopplad!"
+      ],
+      "Unfortunately, BrowserID cannot communicate while offline!": [
+         null,
+         "Tyvärr kan inte BrowserID kommunicera när du är nedkopplad!"
+      ],
+      "select email": [
+         null,
+         "välj e-postadress"
+      ],
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
+         null,
+         "Tyvärr kan vi inte kommunicera med BrowserID när du nedkopplad."
+      ],
+      "Authenticating User": [
+         null,
+         "Autentiserar användaren"
+      ],
+      "Adding Address": [
+         null,
+         "Lägger till adress"
+      ],
+      "Adding Primary Email Address to User": [
+         null,
+         "Lägger till en primär e-postadress till användaren"
+      ],
+      "Checking Address Info": [
+         null,
+         "Kontrollerar adressuppgifter"
+      ],
+      "Authenticating with Assertion": [
+         null,
+         "Autentiserar med påstående"
+      ],
+      "Cancelling User Account": [
+         null,
+         "Återkallar användarkonto"
+      ],
+      "Checking Authentication": [
+         null,
+         "Kontrollerar autentisering"
+      ],
+      "Checking Script Version": [
+         null,
+         "Kontrollerar skriptversion"
+      ],
+      "Completing User Registration": [
+         null,
+         "Slutför användarregistrering"
+      ],
+      "Checking if Cookies are Enabled": [
+         null,
+         "Kontrollerar om kakor är aktiverade"
+      ],
+      "Creating Account": [
+         null,
+         "Skapar konto"
+      ],
+      "Getting Assertion": [
+         null,
+         "Tar emot påstående"
+      ],
+      "Checking Registration Token": [
+         null,
+         "Kontrollerar registreringstoken"
+      ],
+      "Checking Email Address": [
+         null,
+         "Kontrollerar e-postadress"
+      ],
+      "Checking Whether User is Authenticated with IdP": [
+         null,
+         "Kontrollerar om användaren är autentiserad med IdP"
+      ],
+      "Logout Failed": [
+         null,
+         "Utloggning misslyckades"
+      ],
+      "Authenticating with Identity Provider": [
+         null,
+         "Autentiserar med identitetsleverantör"
+      ],
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
+         null,
+         "Vi kunde inte kommunicera med din e-postleverantör, försök igen!"
+      ],
+      "Provisioning with Identity Provider": [
+         null,
+         "Förbereder med identitetsleverantören"
+      ],
+      "Provisioning Unsupported Identity Provider": [
+         null,
+         "Förbereder ej stödd identitetsleverantör"
+      ],
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
+         null,
+         "#~ \"Tyvärr kan inte e-postadressen användas som en primär identitetsleverantör\""
+      ],
+      "Registration Failed": [
+         null,
+         "Registreringen misslyckades"
+      ],
+      "Establishing Relay": [
+         null,
+         "Etablerar vidaresändning"
+      ],
+      "Relay frame could not be found": [
+         null,
+         "Vidaresändningsramen kunde inte hittas"
+      ],
+      "Resetting Password": [
+         null,
+         "Återställer lösenord"
+      ],
+      "Remove Email Address from Account": [
+         null,
+         "Ta bort e-postadress från kontot"
+      ],
+      "Setting Password": [
+         null,
+         "Ställer in lösenord"
+      ],
+      "Signin Failed": [
+         null,
+         "Inloggningen misslyckades"
+      ],
+      "Signup Failed": [
+         null,
+         "Anmälan misslyckades"
+      ],
+      "Syncing Address": [
+         null,
+         "Synkar adress"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "Synkar e-postadresser"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Synkar nycklar för adress"
+      ],
+      "Getting Token Info": [
+         null,
+         "Hämtar tokeninformation"
+      ],
+      "Updating password": [
+         null,
+         "Uppdaterar lösenord"
+      ],
+      "Verifying email address": [
+         null,
+         "Verifierar e-postadress"
+      ],
+      "Cancel": [
+         null,
+         "Avbryt"
       ]
    }
 }
diff --git a/resources/static/i18n/sv/messages.json b/resources/static/i18n/sv/messages.json
index 0bfc2b62c..e5f6dbef2 100644
--- a/resources/static/i18n/sv/messages.json
+++ b/resources/static/i18n/sv/messages.json
@@ -1,17 +1,18 @@
 ;var json_locale_data = {
    "messages": {
       "": {
-         "Project-Id-Version": " PACKAGE VERSION",
+         "Project-Id-Version": " BrowserID 1",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-05 14:59+0100",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-03 15:30+0100",
          "Last-Translator": " Hans Wallanger <hasse@jasajudeju.se>",
          "Language-Team": " Swedish",
          "Language": " sv",
          "MIME-Version": " 1.0",
          "Content-Type": " text/plain; charset=UTF-8",
          "Content-Transfer-Encoding": " 8bit",
-         "X-Generator": " Translate Toolkit 1.9.0"
+         "X-Generator": " Translate Toolkit 1.9.0",
+         "X-Poedit-Language": " Swedish"
       },
       "Complete Login to %s using BrowserID": [
          null,
@@ -25,7 +26,7 @@
          null,
          "Ett fel uppstod vid slutförandet av registreringen."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          "Slutför inloggning till:"
       ],
@@ -73,9 +74,9 @@
          null,
          "Det är olika lösenord."
       ],
-      "Finish": [
+      "finish": [
          null,
-         "Slutför"
+         "slutför"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
@@ -85,6 +86,14 @@
          null,
          "Din nya adress är klar och du bör nu vara inloggad. Du kan nu stänga det här fönstret och återvända till"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID använder kakor"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "Stäng fönstret, <a %s>aktivera kakor</a> och försök igen"
+      ],
       "Communicating with server": [
          null,
          "Kommunicerar med servern"
@@ -97,9 +106,9 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         "BrowserID är det snabba och säkra sättet att logga in &mdash; <a target=\"_blank\" href=\"/about\">läs mer</a>"
+         "BrowserID är det snabba och säkra sättet att logga in &mdash; <a %s>läs mer</a>"
       ],
       "BrowserID: %s": [
          null,
@@ -125,9 +134,9 @@
          null,
          "Logga ut"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         "Av <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
+         "Av <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
@@ -145,7 +154,7 @@
          null,
          "Det uppstod ett problem med din anmälningslänk. Är den här adressen redan registrerad?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "Ett fel uppstod vid kommunikation med servern."
       ],
diff --git a/resources/static/i18n/tr/client.json b/resources/static/i18n/tr/client.json
index c0b85ec50..9a1de288a 100644
--- a/resources/static/i18n/tr/client.json
+++ b/resources/static/i18n/tr/client.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-06 15:48+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-02 17:28+0200",
          "Last-Translator": " Selim <selim@sum.lu>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " tr",
@@ -14,161 +14,13 @@
          "Plural-Forms": " nplurals=1; plural=0;",
          "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
-         null,
-         "Kullanıcı doğrulanıyor"
-      ],
-      "Adding Address": [
-         null,
-         "Adres ekleniyor"
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         "Kullanıcıya birincil e-posta adresi ekleniyor"
-      ],
-      "Checking Address Info": [
-         null,
-         "Adres bilgisi denetleniyor"
-      ],
-      "Authenticating with Assertion": [
-         null,
-         "DoÄŸrulama teyit ediliyor"
-      ],
-      "Cancelling User Account": [
-         null,
-         "Kullanıcı hesabı iptal ediliyor"
-      ],
-      "Checking Authentication": [
-         null,
-         "DoÄŸrulama denetleniyor"
-      ],
-      "Checking Script Version": [
-         null,
-         "Betik sürümü denetleniyor"
-      ],
-      "Completing User Registration": [
-         null,
-         "Kullanıcı kaydı tamamlanıyor"
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         "Üzgünüz, BrowserID için çerez kullanımı şarttır"
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         "BrowserID'nin çalışması için tarayıcınızda çerezleri etkinleştirmeniz gerekir. Lütfen çerezleri etkinleştirip tekrar deneyin"
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         "Çerezlerin etkin olup olmadığı denetleniyor"
-      ],
-      "Creating Account": [
-         null,
-         "Hesap açılıyor"
-      ],
-      "Getting Assertion": [
-         null,
-         "Tasdik alınıyor"
-      ],
-      "Checking Registration Token": [
-         null,
-         "Kayıt jetonu denetleniyor"
-      ],
-      "Checking Email Address": [
-         null,
-         "E-posta adresi denetleniyor"
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         "Kullanıcının IdP ile doğrulanıp doğrulanmadığı denetleniyor"
-      ],
-      "Logout Failed": [
-         null,
-         "Çıkış başarısız oldu"
-      ],
-      "You are offline!": [
-         null,
-         "Çevrim dışısınız!"
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         "Ne yazık ki çevrim dışıyken BrowserID ile iletişim kurulamaz."
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         "Kimlik Sağlayıcısı ile doğrulanıyor"
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         "E-posta sağlayıcınıza erişemedik. Lütfen tekrar deneyin!"
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         "Kimlik Sağlayıcısından provizyon alınıyor"
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         "Desteklenmeyen Kimlik Sağlayıcısından provizyon alınıyor"
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         "Belirtilen e-posta adresi ne yazık ki Birincil Kimlik Sağlayıcı olarak görev yapamaz"
-      ],
-      "Registration Failed": [
-         null,
-         "Kayıt başarısız oldu"
-      ],
-      "Establishing Relay": [
-         null,
-         "Röle kuruluyor"
-      ],
-      "Relay frame could not be found": [
-         null,
-         "Röle çerçevesi bulunamadı"
-      ],
-      "Resetting Password": [
-         null,
-         "Parola sıfırlanıyor"
-      ],
-      "Remove Email Address from Account": [
-         null,
-         "E-posta adresini hesaptan kaldır"
-      ],
-      "Setting Password": [
-         null,
-         "Parola ayarlanıyor"
-      ],
-      "Signin Failed": [
-         null,
-         "Oturum açma başarısız oldu"
-      ],
-      "Signup Failed": [
-         null,
-         "Kayıt başarısız oldu"
-      ],
-      "Syncing Address": [
+      "BrowserID requires cookies": [
          null,
-         "Adres eÅŸitleniyor"
+         "BrowserID için çerez kullanımı şarttır"
       ],
-      "Syncing Email Addresses": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "E-posta adresleri eÅŸitleniyor"
-      ],
-      "Sync Keys for Address": [
-         null,
-         "Adres anahtarlarını eşitle"
-      ],
-      "Getting Token Info": [
-         null,
-         "Jeton bilgisi alınıyor"
-      ],
-      "Updating password": [
-         null,
-         "Parola güncelleniyor"
-      ],
-      "Verifying email address": [
-         null,
-         "E-posta adresi güncelleniyor"
+         "Lütfen bu pencereyi kapatın, <a %s>çerezleri etkinleştirin</a> ve tekrar deneyin"
       ],
       "Communication Error": [
          null,
@@ -238,7 +90,7 @@
          null,
          "BrowserID'ye hoÅŸ geldiniz!"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
          "Bu e-posta yeni görünüyor. Kuruluma geçelim."
       ],
@@ -258,6 +110,10 @@
          null,
          "Bu kullanıcı adı ve parola ile hesaba giriş yapılamadı."
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         "%s düğmesine tıklayarak, bu sitenin <a %s>Kullanım Koşullarını</a> ve <a %s>Gizlilik İlkelerini</a> kabul etmiş olursunuz."
+      ],
       "next": [
          null,
          "ileri"
@@ -266,9 +122,9 @@
          null,
          "e-postayı doğrulayın"
       ],
-      "select email": [
+      "sign in": [
          null,
-         "e-posta seçin"
+         "oturum aç"
       ],
       "Cannot verify %s": [
          null,
@@ -298,17 +154,33 @@
          null,
          "Bunun bir hata olduğunu düşünüyorsanız, gönderilen e-postayı görmezden gelin ve <a href=\"#\" id=\"back\">başka bir e-posta adresi kullanın</a>."
       ],
-      "The site requested you sign in using": [
+      "We are very sorry, the server is under extreme load!": [
          null,
-         "Site, şunu kullanarak oturum açmanızı istedi"
+         "Üzgünüz, sunucu aşırı yük altında!"
       ],
-      "Reset Password": [
+      "We are very sorry, there has been an error!": [
          null,
-         "Parolayı sıfırla"
+         "Üzgünüz, bir hata oluştu!"
       ],
-      "Cancel": [
+      "Please reload the page and try again.": [
          null,
-         "Vazgeç"
+         "Lütfen sayfayı tazeleyip yeniden deneyin."
+      ],
+      "Please close this window and try again.": [
+         null,
+         "Lütfen bu pencereyi kapatıp tekrar deneyin."
+      ],
+      "See more info": [
+         null,
+         "Daha fazla bilgi al"
+      ],
+      "The site requested you sign in using": [
+         null,
+         "Site, şunu kullanarak oturum açmanızı istedi"
+      ],
+      "reset password": [
+         null,
+         "parolayı sıfırla"
       ],
       "*%s* is not a valid email address!": [
          null,
@@ -318,10 +190,6 @@
          null,
          "Devam etmek için lütfen pencereyi kapatın ve geçerli bir adres girin."
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
-         null,
-         "Üzgünüz, çevrim dışı olduğunuzda BrowserID ile iletişim kurulması mümkün değildir."
-      ],
       "This is not me...": [
          null,
          "Bu ben deÄŸilim..."
@@ -334,10 +202,6 @@
          null,
          "Her zaman bu e-posta adresiyle oturum aç"
       ],
-      "sign in": [
-         null,
-         "oturum aç"
-      ],
       "Address Verified!": [
          null,
          "Adres doğrulandı!"
@@ -350,13 +214,177 @@
          null,
          "Bu adresin sahipliği doğrulamak için e-posta sağlayıcınızla oturum açmalısınız. Bu pencere şuray yönlendirilecek:"
       ],
-      "Verify": [
+      "verify": [
          null,
-         "DoÄŸrula"
+         "doÄŸrula"
       ],
       "Verify With Email Provider": [
          null,
          "E-posta sağlayıcısı ile doğrula"
+      ],
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
+         null,
+         "#~ \"BrowserID'nin çalışması için tarayıcınızda çerezleri etkinleştirmeniz \"#~ \"gerekir. Lütfen çerezleri etkinleştirip tekrar deneyin\""
+      ],
+      "You are offline!": [
+         null,
+         "Çevrim dışısınız!"
+      ],
+      "Unfortunately, BrowserID cannot communicate while offline!": [
+         null,
+         "Ne yazık ki çevrim dışıyken BrowserID ile iletişim kurulamaz."
+      ],
+      "select email": [
+         null,
+         "e-posta seçin"
+      ],
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
+         null,
+         "#~ \"Üzgünüz, çevrim dışı olduğunuzda BrowserID ile iletişim kurulması mümkün \"#~ \"değildir.\""
+      ],
+      "Authenticating User": [
+         null,
+         "Kullanıcı doğrulanıyor"
+      ],
+      "Adding Address": [
+         null,
+         "Adres ekleniyor"
+      ],
+      "Adding Primary Email Address to User": [
+         null,
+         "Kullanıcıya birincil e-posta adresi ekleniyor"
+      ],
+      "Checking Address Info": [
+         null,
+         "Adres bilgisi denetleniyor"
+      ],
+      "Authenticating with Assertion": [
+         null,
+         "DoÄŸrulama teyit ediliyor"
+      ],
+      "Cancelling User Account": [
+         null,
+         "Kullanıcı hesabı iptal ediliyor"
+      ],
+      "Checking Authentication": [
+         null,
+         "DoÄŸrulama denetleniyor"
+      ],
+      "Checking Script Version": [
+         null,
+         "Betik sürümü denetleniyor"
+      ],
+      "Completing User Registration": [
+         null,
+         "Kullanıcı kaydı tamamlanıyor"
+      ],
+      "Checking if Cookies are Enabled": [
+         null,
+         "Çerezlerin etkin olup olmadığı denetleniyor"
+      ],
+      "Creating Account": [
+         null,
+         "Hesap açılıyor"
+      ],
+      "Getting Assertion": [
+         null,
+         "Tasdik alınıyor"
+      ],
+      "Checking Registration Token": [
+         null,
+         "Kayıt jetonu denetleniyor"
+      ],
+      "Checking Email Address": [
+         null,
+         "E-posta adresi denetleniyor"
+      ],
+      "Checking Whether User is Authenticated with IdP": [
+         null,
+         "Kullanıcının IdP ile doğrulanıp doğrulanmadığı denetleniyor"
+      ],
+      "Logout Failed": [
+         null,
+         "Çıkış başarısız oldu"
+      ],
+      "Authenticating with Identity Provider": [
+         null,
+         "Kimlik Sağlayıcısı ile doğrulanıyor"
+      ],
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
+         null,
+         "E-posta sağlayıcınıza erişemedik. Lütfen tekrar deneyin!"
+      ],
+      "Provisioning with Identity Provider": [
+         null,
+         "Kimlik Sağlayıcısından provizyon alınıyor"
+      ],
+      "Provisioning Unsupported Identity Provider": [
+         null,
+         "Desteklenmeyen Kimlik Sağlayıcısından provizyon alınıyor"
+      ],
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
+         null,
+         "#~ \"Belirtilen e-posta adresi ne yazık ki Birincil Kimlik Sağlayıcı olarak \"#~ \"görev yapamaz\""
+      ],
+      "Registration Failed": [
+         null,
+         "Kayıt başarısız oldu"
+      ],
+      "Establishing Relay": [
+         null,
+         "Röle kuruluyor"
+      ],
+      "Relay frame could not be found": [
+         null,
+         "Röle çerçevesi bulunamadı"
+      ],
+      "Resetting Password": [
+         null,
+         "Parola sıfırlanıyor"
+      ],
+      "Remove Email Address from Account": [
+         null,
+         "E-posta adresini hesaptan kaldır"
+      ],
+      "Setting Password": [
+         null,
+         "Parola ayarlanıyor"
+      ],
+      "Signin Failed": [
+         null,
+         "Oturum açma başarısız oldu"
+      ],
+      "Signup Failed": [
+         null,
+         "Kayıt başarısız oldu"
+      ],
+      "Syncing Address": [
+         null,
+         "Adres eÅŸitleniyor"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "E-posta adresleri eÅŸitleniyor"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "Adres anahtarlarını eşitle"
+      ],
+      "Getting Token Info": [
+         null,
+         "Jeton bilgisi alınıyor"
+      ],
+      "Updating password": [
+         null,
+         "Parola güncelleniyor"
+      ],
+      "Verifying email address": [
+         null,
+         "E-posta adresi güncelleniyor"
+      ],
+      "Cancel": [
+         null,
+         "Vazgeç"
       ]
    }
 }
diff --git a/resources/static/i18n/tr/messages.json b/resources/static/i18n/tr/messages.json
index 219938fb4..2023cabe0 100644
--- a/resources/static/i18n/tr/messages.json
+++ b/resources/static/i18n/tr/messages.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-06 15:59+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-02 17:30+0200",
          "Last-Translator": " Selim <selim@sum.lu>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " tr",
@@ -26,7 +26,7 @@
          null,
          "Kayıt tamamlanmaya çalışılırken hata oluştu."
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          "Oturum açmayı tamamla: "
       ],
@@ -74,9 +74,9 @@
          null,
          "Parolalar eÅŸleÅŸmiyor."
       ],
-      "Finish": [
+      "finish": [
          null,
-         "Bitir"
+         "bitir"
       ],
       "<strong class=\"email\">Your address</strong> has been verified!": [
          null,
@@ -86,6 +86,14 @@
          null,
          "Yeni adresiniz kuruldu ve oturumunuz açıldı. Artık bu pencereyi kapatıp şuraya dönebilirsiniz:"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID çerez kullanımını gerektirir"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "Lütfen bu pencereyi kapatın, <a %s>çerezleri etkinleştirin</a> ve tekrar deneyin"
+      ],
       "Communicating with server": [
          null,
          "Sunucuya bağlanılıyor"
@@ -98,9 +106,9 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         "BrowserID, oturum açmanın hızlı ve güvenli yoludur. <a target=\"_blank\" href=\"/about\">daha fazla bilgi alın</a>"
+         "BrowserID, oturum açmanın hızlı ve güvenli yoludur. <a %s>daha fazla bilgi alın</a>"
       ],
       "BrowserID: %s": [
          null,
@@ -126,9 +134,9 @@
          null,
          "Oturumu kapat"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         "GeliÅŸtiren: <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
+         "GeliÅŸtiren: <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>"
       ],
       "Privacy": [
          null,
@@ -146,7 +154,7 @@
          null,
          "Kayıt bağlantınızda bir sorun var. Bu adres zaten kayıtlı olabilir mi?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "Sunucuya bağlantıda sorun oluştu."
       ],
diff --git a/resources/static/i18n/uk/client.json b/resources/static/i18n/uk/client.json
new file mode 100644
index 000000000..891b32e90
--- /dev/null
+++ b/resources/static/i18n/uk/client.json
@@ -0,0 +1,245 @@
+;var json_locale_data = {
+   "client": {
+      "": {
+         "Project-Id-Version": " PACKAGE VERSION",
+         "Report-Msgid-Bugs-To": " ",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "Last-Translator": " Tim Babych <tim.babych@gmail.com>",
+         "Language-Team": " Ukrainian",
+         "Language": " uk",
+         "MIME-Version": " 1.0",
+         "Content-Type": " text/plain; charset=UTF-8",
+         "Content-Transfer-Encoding": " 8bit",
+         "Plural-Forms": " nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+      },
+      "BrowserID requires cookies": [
+         null,
+         "Перепрошуємо, але BrowserID потребує кук"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
+      "Communication Error": [
+         null,
+         "Помилка зв’язку"
+      ],
+      "Finishing Sign In...": [
+         null,
+         "Завершуємо вхід…"
+      ],
+      "In just a moment you'll be signed into BrowserID.": [
+         null,
+         "За хвильку ви увійдете у BrowserID"
+      ],
+      "Please wait a few seconds while we sign you into the site.": [
+         null,
+         "Заждіть пару секунд, поки ми реєструємо вас на сайті."
+      ],
+      "We are sorry, this request is taking a LOOONG time.": [
+         null,
+         "Перепрошуємо, щось цей запит йде ДООООВГО."
+      ],
+      "This message will go away when the request completes (hopefully soon). If you wait too long, close this window and try again.": [
+         null,
+         "Це повідомлення зникне коли запит завершиться (сподіваємось, скоро). Якщо ви чекаєте занадто довго, закрийте це вікно і спробуйте ще раз."
+      ],
+      "Sign in using": [
+         null,
+         "Увійти, використовуючи"
+      ],
+      "New email address": [
+         null,
+         "Нову email-адресу"
+      ],
+      "This field must be an email address.": [
+         null,
+         "Це поле має бути email-адресою."
+      ],
+      "The email field is required.": [
+         null,
+         "Заповніть поле email."
+      ],
+      "We just sent an email to that address! If you really want to send another, wait a minute or two and try again.": [
+         null,
+         "Ми щойно послати на цю адресу листа! Якщо ви дійсно хочете послати ще одного, заждіть хвилинку-другу і спробуйте ще раз."
+      ],
+      "That address is already added to your account!": [
+         null,
+         "Ця адреса вже додана до вашого профілю!"
+      ],
+      "add": [
+         null,
+         "додати"
+      ],
+      "cancel": [
+         null,
+         "скасувати"
+      ],
+      "Email": [
+         null,
+         "Email"
+      ],
+      "Enter your email address to sign in to <strong>%s</strong>": [
+         null,
+         "Введіть ваш email щоб зайти на <strong>%s</strong>"
+      ],
+      "Welcome to BrowserID!": [
+         null,
+         "Ласкаво просимо до BrowserID!"
+      ],
+      "This email looks new, so let's get you set up.": [
+         null,
+         "Схоже, це новий email, тож давайте його налаштуємо."
+      ],
+      "Password": [
+         null,
+         "Пароль"
+      ],
+      "forgot your password?": [
+         null,
+         "забули ваш пароль?"
+      ],
+      "The password field is required.": [
+         null,
+         "Заповніть поле пароля."
+      ],
+      "The account cannot be logged in with this username and password.": [
+         null,
+         "В цей профіль неможливо увійти з цим логіном та паролем."
+      ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         ""
+      ],
+      "next": [
+         null,
+         "далі"
+      ],
+      "verify email": [
+         null,
+         "перевірити email"
+      ],
+      "sign in": [
+         null,
+         "увійти"
+      ],
+      "Cannot verify %s": [
+         null,
+         "Не вийшло перевірити %s"
+      ],
+      "%s is a required address, but we cannot verify that you own this address.": [
+         null,
+         "%s є необхідною адресою, але ми не можемо перевірити що вона належить вам."
+      ],
+      "Check your email!": [
+         null,
+         "Перевірте вашу пошту!"
+      ],
+      "We sent a confirmation email to <strong>%s</strong>": [
+         null,
+         "Ми послати листа з підтвердженням на <strong>%s</strong>"
+      ],
+      "To finish signing in just click the verify link we sent to your email address.": [
+         null,
+         "Щоб завершити просто клацніть по лінку підтвердження, котрий ми послали на вашу email-адресу."
+      ],
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"cancel\">cancel</a>.": [
+         null,
+         "Якщо це помилка, просто ігноруйте посланого листа і <a href=\"#\" id=\"cancel\">скасуйте</a>."
+      ],
+      "If this is a mistake, just ignore the sent email and <a href=\"#\" id=\"back\">use another email address</a>.": [
+         null,
+         "Якщо це помилка, просто ігноруйте посланого листа і <a href=\"#\" id=\"cancel\">скористайтесь іншим email’ом</a>."
+      ],
+      "We are very sorry, the server is under extreme load!": [
+         null,
+         "Нам дуже шкода — сервер сильно перевантажено!"
+      ],
+      "We are very sorry, there has been an error!": [
+         null,
+         "Нам дуже шкода — сталася помилка!"
+      ],
+      "Please reload the page and try again.": [
+         null,
+         "Щоб повторити, вам доведеться перегрузити сторінку і спробувати ще раз."
+      ],
+      "Please close this window and try again.": [
+         null,
+         "Щоб повторити, вам доведеться закрити це вікно і спробувати ще раз."
+      ],
+      "See more info": [
+         null,
+         "Докладніше"
+      ],
+      "The site requested you sign in using": [
+         null,
+         "Сайт вимкає щоб ви увійшли з допомогою"
+      ],
+      "reset password": [
+         null,
+         "скинути пароль"
+      ],
+      "*%s* is not a valid email address!": [
+         null,
+         "*%s* не є дійсною emai-адресою!"
+      ],
+      "To continue, please close the window and enter a valid address.": [
+         null,
+         "Щоб продовжити, закрийте це вікно і введіть дійсну адресу."
+      ],
+      "This is not me...": [
+         null,
+         "Це не я…"
+      ],
+      "Use a different email": [
+         null,
+         "Використати інший email"
+      ],
+      "Always sign in using this email": [
+         null,
+         "Завжди входити використовуючи цей email"
+      ],
+      "Address Verified!": [
+         null,
+         "Адресу підтверджено!"
+      ],
+      "Your identity has been verified with your email provider, we will now try to sign you in.": [
+         null,
+         "Ваша ідентичність була підтверджена вашим email-провайдером, тож ми зараз спробуємо вас зареєструвати."
+      ],
+      "You must sign in with your email provider to verify ownership of this address. This window will be redirected to": [
+         null,
+         "Ви мусите зайти з допомогою вашого email-провайдера щоб підтвердити володіння цією адресою. Це вікно буде перенаправлене на"
+      ],
+      "verify": [
+         null,
+         "підтвердити"
+      ],
+      "Verify With Email Provider": [
+         null,
+         "Підтвердити email-провайдером"
+      ],
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
+         null,
+         "#~ \"Для роботи BrowserID потрібно щоб у вашому браузері куки були увімкнені. \"#~ \"Увімкніть їх та спробуйте ще раз\""
+      ],
+      "You are offline!": [
+         null,
+         "Ви не підключені до мережі!"
+      ],
+      "Unfortunately, BrowserID cannot communicate while offline!": [
+         null,
+         "На жаль, BrowserID не працює поза мережею!"
+      ],
+      "select email": [
+         null,
+         "вибрати email"
+      ],
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
+         null,
+         "#~ \"Перепрошуємо, але ми не можемо зв’язатись з BrowserID поки ви поза \"#~ \"мережею.\""
+      ]
+   }
+}
+;
diff --git a/resources/static/i18n/uk/messages.json b/resources/static/i18n/uk/messages.json
new file mode 100644
index 000000000..17e743a5c
--- /dev/null
+++ b/resources/static/i18n/uk/messages.json
@@ -0,0 +1,189 @@
+;var json_locale_data = {
+   "messages": {
+      "": {
+         "Project-Id-Version": " PACKAGE VERSION",
+         "Report-Msgid-Bugs-To": " ",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "Last-Translator": " Tim Babych <tim.babych@gmail.com>",
+         "Language-Team": " Ukrainian",
+         "Language": " uk",
+         "MIME-Version": " 1.0",
+         "Content-Type": " text/plain; charset=UTF-8",
+         "Content-Transfer-Encoding": " 8bit",
+         "Plural-Forms": " nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+      },
+      "Complete Login to %s using BrowserID": [
+         null,
+         "Завершіть вхід до %s з допомогою BrowserID"
+      ],
+      "Error encountered while attempting to confirm your address. Have you previously verified this address?": [
+         null,
+         "Під час спроби підтвердити вашу адресу сталась помилка. Ви раніше підтверджували цю адресу?"
+      ],
+      "Error encountered trying to complete registration.": [
+         null,
+         "Під час спроби завершити реєстрацію сталась помилка."
+      ],
+      "Finish signing into:": [
+         null,
+         "Завершіть вхід до: "
+      ],
+      "Email Verification": [
+         null,
+         "Підтвердження email"
+      ],
+      "Email Address": [
+         null,
+         "Адреса email"
+      ],
+      "Your Email": [
+         null,
+         "Ваш email"
+      ],
+      "New Password": [
+         null,
+         "Новий пароль"
+      ],
+      "Enter a Password": [
+         null,
+         "Введіть пароль"
+      ],
+      "Password is required.": [
+         null,
+         "Потрібний пароль"
+      ],
+      "Password must be between 8 and 80 characters long.": [
+         null,
+         "Пароль має бути від 8 до 80 символів завдовшки."
+      ],
+      "Verify Password": [
+         null,
+         "Підтвердіть пароль"
+      ],
+      "Repeat Password": [
+         null,
+         "Повторіть пароль"
+      ],
+      "Verification password is required.": [
+         null,
+         "Потрібне підтвердження пароля."
+      ],
+      "Passwords do not match.": [
+         null,
+         "Паролі не збігаються."
+      ],
+      "finish": [
+         null,
+         "завершити"
+      ],
+      "<strong class=\"email\">Your address</strong> has been verified!": [
+         null,
+         "<strong class=\"email\">Вашу адресу</strong> було підтверджено!"
+      ],
+      "Your new address is set up and you should now be signed in. You may now close this window and go back to": [
+         null,
+         "Ваша нова адреса налаштована і ви маєте бути вже зареєстроовані. Ви можете закрити це вікно і повернутись до"
+      ],
+      "BrowserID requires cookies": [
+         null,
+         "Домівка BrowserID"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         ""
+      ],
+      "Communicating with server": [
+         null,
+         "Зв’язок з сервером"
+      ],
+      "Just a moment while we talk with the server.": [
+         null,
+         "Заждіть хвильку, поки ми говоримо з сервером."
+      ],
+      "BrowserID": [
+         null,
+         "BrowserID"
+      ],
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
+         null,
+         "BrowserID &mdash; це швидкий та безпечний спросіб реєстрації &mdash; <a target=\"_blank\" href=\"/about\">докладніше</a>"
+      ],
+      "BrowserID: %s": [
+         null,
+         "BrowserID: %s"
+      ],
+      "BrowserID Home": [
+         null,
+         "Домівка BrowserID"
+      ],
+      "How it works": [
+         null,
+         "Як воно працює"
+      ],
+      "Developers": [
+         null,
+         "Розробникам"
+      ],
+      "Sign In": [
+         null,
+         "Увійти"
+      ],
+      "Sign Out": [
+         null,
+         "Вийти"
+      ],
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
+         null,
+         "Від <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>"
+      ],
+      "Privacy": [
+         null,
+         "Приватність"
+      ],
+      "TOS": [
+         null,
+         "TOS"
+      ],
+      "Need Help?": [
+         null,
+         "Помогти?"
+      ],
+      "There was a problem with your signup link. Has this address already been registered?": [
+         null,
+         "З вашим реєстраційним лінком негаразд. Може, ця адреса вже зареєстрована?"
+      ],
+      "Error communicating with server.": [
+         null,
+         "Помилка зв’язку з сервером."
+      ],
+      "Last step!": [
+         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!": [
+         null,
+         "Дякуємо, що зареєструвались у <strong>BrowserID</strong>. Тепер ви можете використовувати ваш профіль <strong>BrowserID</strong> щоб <em>Входити</em> чи <em>Реєструватись</em> на сайтах по всій мережі!"
+      ],
+      "Thanks for verifying your email address. This message is being sent to you to complete your sign-in to %s.": [
+         null,
+         "Дякуємо за підтвердження вашої email-адреси. Цей лист було послано вам щоб завершити ваш вхід до  %s."
+      ],
+      "Finish registration by clicking this link:": [
+         null,
+         "Завершіть реєстрацію клацнувши по цьому лінку:"
+      ],
+      "If you are NOT trying to sign into this site, just ignore this email.": [
+         null,
+         "Якщо ви НЕ намагаєтесь увійти на цей сайт, просто ігноруйте цей лист."
+      ],
+      "Thanks,": [
+         null,
+         "Дякуємо,"
+      ],
+      "(A better way to sign in)": [
+         null,
+         "(Кращий спосіб реєстрації)"
+      ]
+   }
+}
+;
diff --git a/resources/static/i18n/zh_CN/client.json b/resources/static/i18n/zh_CN/client.json
index 92d21f27d..377f10f7a 100644
--- a/resources/static/i18n/zh_CN/client.json
+++ b/resources/static/i18n/zh_CN/client.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-03 15:39+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-03 23:07+0200",
          "Last-Translator": " Shaohua <shaohua.wen@gmail.com>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " zh_CN",
@@ -14,161 +14,13 @@
          "Plural-Forms": " nplurals=1; plural=0;",
          "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
-         null,
-         "正在验证用户"
-      ],
-      "Adding Address": [
-         null,
-         "正在添加地址"
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         "正在为用户添加主要电子邮件地址"
-      ],
-      "Checking Address Info": [
-         null,
-         "正在检查电子邮件地址信息"
-      ],
-      "Authenticating with Assertion": [
-         null,
-         "正在使用猜测的结果验证"
-      ],
-      "Cancelling User Account": [
-         null,
-         "正在取消用户帐号"
-      ],
-      "Checking Authentication": [
-         null,
-         "正在检查授权"
-      ],
-      "Checking Script Version": [
-         null,
-         "正在检查脚本版本"
-      ],
-      "Completing User Registration": [
-         null,
-         "正在完成用户注册"
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         "抱歉,必须启用 Cookie 才能使用 BrowserID"
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         "您必须启用 Cookie 才能使用 BrowserID。请启用您浏览器的 cookie 并重试。"
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         "正在检查 Cookie 是否已启用"
-      ],
-      "Creating Account": [
-         null,
-         "正在创建帐号"
-      ],
-      "Getting Assertion": [
-         null,
-         "正在猜测"
-      ],
-      "Checking Registration Token": [
-         null,
-         "正在检查注册令牌(Token)"
-      ],
-      "Checking Email Address": [
-         null,
-         "正在检查电子邮件地址"
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         "正在检查用户是否已完成服务商验证"
-      ],
-      "Logout Failed": [
-         null,
-         "登出失败"
-      ],
-      "You are offline!": [
-         null,
-         "您已离线!"
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         "不幸的是,BrowserID 无法在离线时使用!"
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         "正在向身份提供者验证"
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         "我们遇到问题,无法向您的电子邮件提供商进行验证,请重试!"
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         "正在供开通识别身份"
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         "正在开通不支持的识别身份"
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         "非常不行,您提供的电子邮件地址无法当作主要识别身份"
-      ],
-      "Registration Failed": [
-         null,
-         "注册失败"
-      ],
-      "Establishing Relay": [
-         null,
-         "正在准备转发"
-      ],
-      "Relay frame could not be found": [
-         null,
-         "无法找到转发框架"
-      ],
-      "Resetting Password": [
+      "BrowserID requires cookies": [
          null,
-         "正在重置密码"
+         "BrowserID 必须启用 Cookie 才能使用"
       ],
-      "Remove Email Address from Account": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "从帐号中移除电子邮件地址"
-      ],
-      "Setting Password": [
-         null,
-         "正在设置密码"
-      ],
-      "Signin Failed": [
-         null,
-         "登录失败"
-      ],
-      "Signup Failed": [
-         null,
-         "注册失败"
-      ],
-      "Syncing Address": [
-         null,
-         "正在同步电子邮件地址"
-      ],
-      "Syncing Email Addresses": [
-         null,
-         "正在同步电子邮件地址"
-      ],
-      "Sync Keys for Address": [
-         null,
-         "同步电子邮件地址密钥"
-      ],
-      "Getting Token Info": [
-         null,
-         "正在获取令牌(Token)信息"
-      ],
-      "Updating password": [
-         null,
-         "正在更新密码"
-      ],
-      "Verifying email address": [
-         null,
-         "正在确认电子邮件地址"
+         "请关闭此窗口,然后<a %s>开启 cookie 功能</a> 并再试一次"
       ],
       "Communication Error": [
          null,
@@ -238,9 +90,9 @@
          null,
          "欢迎使用 BrowserID!"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
-         "此电子邮件地址为新建,让我们来进行初始设置吧。"
+         "此电子邮件地址看来是新建的,让我们带您来进行初始设置吧。"
       ],
       "Password": [
          null,
@@ -258,6 +110,10 @@
          null,
          "无法使用该用户名和密码登录"
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         "点下 %s 就代表您接受这个网站的 <a %s>使用条款</a>以及<a %s>隐私权保护政策</a>。"
+      ],
       "next": [
          null,
          "下一步"
@@ -266,9 +122,9 @@
          null,
          "验证电子邮件"
       ],
-      "select email": [
+      "sign in": [
          null,
-         "选择电子邮件"
+         "登录"
       ],
       "Cannot verify %s": [
          null,
@@ -298,18 +154,34 @@
          null,
          "如果这是个错误,请忽略这封信并 <a href=\"#\" id=\"back\">使用其他电子邮件地址</a>。"
       ],
+      "We are very sorry, the server is under extreme load!": [
+         null,
+         "很抱歉,服务器目前负载过重!"
+      ],
+      "We are very sorry, there has been an error!": [
+         null,
+         "抱歉,出错了!"
+      ],
+      "Please reload the page and try again.": [
+         null,
+         "请重新载入页面并再试一次。"
+      ],
+      "Please close this window and try again.": [
+         null,
+         "请关闭窗口并重试。"
+      ],
+      "See more info": [
+         null,
+         "查看更多信息"
+      ],
       "The site requested you sign in using": [
          null,
          "网站要求您登录后使用"
       ],
-      "Reset Password": [
+      "reset password": [
          null,
          "重置密码"
       ],
-      "Cancel": [
-         null,
-         "取消"
-      ],
       "*%s* is not a valid email address!": [
          null,
          "*%s* 是无效的电子邮件地址!"
@@ -318,10 +190,6 @@
          null,
          "请关闭窗口并输入有效的电子邮件地址以继续。"
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
-         null,
-         "抱歉,我们无法在您离线时与 BrowserID 服务器通讯。"
-      ],
       "This is not me...": [
          null,
          "这不是我…"
@@ -334,10 +202,6 @@
          null,
          "总是使用此电子邮件地址登录"
       ],
-      "sign in": [
-         null,
-         "登录"
-      ],
       "Address Verified!": [
          null,
          "已验证电子邮件地址!"
@@ -350,13 +214,177 @@
          null,
          "为了要验证您是真的拥有此电子邮件地址,您必须先回到这个信箱服务并登录。本窗口将被重定向至"
       ],
-      "Verify": [
+      "verify": [
          null,
          "验证"
       ],
       "Verify With Email Provider": [
          null,
          "通过电子邮件验证"
+      ],
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
+         null,
+         "#~ \"您必须启用 Cookie 才能使用 BrowserID。请启用您浏览器的 cookie 并重试。\""
+      ],
+      "You are offline!": [
+         null,
+         "您已离线!"
+      ],
+      "Unfortunately, BrowserID cannot communicate while offline!": [
+         null,
+         "不幸的是,BrowserID 无法在离线时使用!"
+      ],
+      "select email": [
+         null,
+         "选择电子邮件"
+      ],
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
+         null,
+         "抱歉,我们无法在您离线时与 BrowserID 服务器通讯。"
+      ],
+      "Authenticating User": [
+         null,
+         "正在验证用户"
+      ],
+      "Adding Address": [
+         null,
+         "正在添加地址"
+      ],
+      "Adding Primary Email Address to User": [
+         null,
+         "正在为用户添加主要电子邮件地址"
+      ],
+      "Checking Address Info": [
+         null,
+         "正在检查电子邮件地址信息"
+      ],
+      "Authenticating with Assertion": [
+         null,
+         "正在使用猜测的结果验证"
+      ],
+      "Cancelling User Account": [
+         null,
+         "正在取消用户帐号"
+      ],
+      "Checking Authentication": [
+         null,
+         "正在检查授权"
+      ],
+      "Checking Script Version": [
+         null,
+         "正在检查脚本版本"
+      ],
+      "Completing User Registration": [
+         null,
+         "正在完成用户注册"
+      ],
+      "Checking if Cookies are Enabled": [
+         null,
+         "正在检查 Cookie 是否已启用"
+      ],
+      "Creating Account": [
+         null,
+         "正在创建帐号"
+      ],
+      "Getting Assertion": [
+         null,
+         "正在猜测"
+      ],
+      "Checking Registration Token": [
+         null,
+         "正在检查注册令牌(Token)"
+      ],
+      "Checking Email Address": [
+         null,
+         "正在检查电子邮件地址"
+      ],
+      "Checking Whether User is Authenticated with IdP": [
+         null,
+         "正在检查用户是否已完成服务商验证"
+      ],
+      "Logout Failed": [
+         null,
+         "登出失败"
+      ],
+      "Authenticating with Identity Provider": [
+         null,
+         "正在向身份提供者验证"
+      ],
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
+         null,
+         "我们遇到问题,无法向您的电子邮件提供商进行验证,请重试!"
+      ],
+      "Provisioning with Identity Provider": [
+         null,
+         "正在供开通识别身份"
+      ],
+      "Provisioning Unsupported Identity Provider": [
+         null,
+         "正在开通不支持的识别身份"
+      ],
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
+         null,
+         "非常不行,您提供的电子邮件地址无法当作主要识别身份"
+      ],
+      "Registration Failed": [
+         null,
+         "注册失败"
+      ],
+      "Establishing Relay": [
+         null,
+         "正在准备转发"
+      ],
+      "Relay frame could not be found": [
+         null,
+         "无法找到转发框架"
+      ],
+      "Resetting Password": [
+         null,
+         "正在重置密码"
+      ],
+      "Remove Email Address from Account": [
+         null,
+         "从帐号中移除电子邮件地址"
+      ],
+      "Setting Password": [
+         null,
+         "正在设置密码"
+      ],
+      "Signin Failed": [
+         null,
+         "登录失败"
+      ],
+      "Signup Failed": [
+         null,
+         "注册失败"
+      ],
+      "Syncing Address": [
+         null,
+         "正在同步电子邮件地址"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "正在同步电子邮件地址"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "同步电子邮件地址密钥"
+      ],
+      "Getting Token Info": [
+         null,
+         "正在获取令牌(Token)信息"
+      ],
+      "Updating password": [
+         null,
+         "正在更新密码"
+      ],
+      "Verifying email address": [
+         null,
+         "正在确认电子邮件地址"
+      ],
+      "Cancel": [
+         null,
+         "取消"
       ]
    }
 }
diff --git a/resources/static/i18n/zh_CN/messages.json b/resources/static/i18n/zh_CN/messages.json
index 3115cc89d..051b73af5 100644
--- a/resources/static/i18n/zh_CN/messages.json
+++ b/resources/static/i18n/zh_CN/messages.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-04 06:05+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-03 23:09+0200",
          "Last-Translator": " Shaohua <shaohua.wen@gmail.com>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " zh_CN",
@@ -26,7 +26,7 @@
          null,
          "尝试完成注册时发生错误。"
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
          "完成登录至:"
       ],
@@ -74,7 +74,7 @@
          null,
          "输入的密码不相同。"
       ],
-      "Finish": [
+      "finish": [
          null,
          "完成"
       ],
@@ -86,6 +86,14 @@
          null,
          "您的新电子邮件地址已经设置完成,现在应该也已经登录了。您现在可以关闭此窗口并回到"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID 需要 cookie 功能"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "请关闭此窗口然后<a %s>开启 cookie </a> 并再试一次"
+      ],
       "Communicating with server": [
          null,
          "正在与服务器通讯"
@@ -98,9 +106,9 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         "BrowserID 是种更快、更安全的登录网站的方式 &mdash; <a target=\"_blank\" href=\"/about\">了解更多信息</a>"
+         "BrowserID 是种更快、更安全的登录网站的方式 &mdash; <a %s>了解更多信息</a>"
       ],
       "BrowserID: %s": [
          null,
@@ -126,9 +134,9 @@
          null,
          "登出"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         "由 <a href=\"%s\" target=\"_blank\">Mozilla Labs</a> 的 <a href=\"%s\" target=\"_blank\">Identity Team</a> 打造"
+         "由 <a %s>Mozilla Labs</a> 的 <a %s>Identity Team</a> 打造"
       ],
       "Privacy": [
          null,
@@ -146,7 +154,7 @@
          null,
          "您的注册链接有问题。这个电子邮件地址已注册过了吗?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "与服务器通讯时发生错误。"
       ],
diff --git a/resources/static/i18n/zh_TW/client.json b/resources/static/i18n/zh_TW/client.json
index 8ba4b1563..40bf26e02 100644
--- a/resources/static/i18n/zh_TW/client.json
+++ b/resources/static/i18n/zh_TW/client.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-03 13:34+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-02 17:19+0200",
          "Last-Translator": " Peter <petercpg@mail.moztw.org>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " zh_TW",
@@ -14,161 +14,13 @@
          "Plural-Forms": " nplurals=1; plural=0;",
          "X-Generator": " Pootle 2.1.6"
       },
-      "Authenticating User": [
-         null,
-         "正在驗證使用者"
-      ],
-      "Adding Address": [
-         null,
-         "新增電子郵件地址"
-      ],
-      "Adding Primary Email Address to User": [
-         null,
-         "正在為使用者新增主要電子郵件地址"
-      ],
-      "Checking Address Info": [
-         null,
-         "正在檢查電子郵件地址資訊"
-      ],
-      "Authenticating with Assertion": [
-         null,
-         "正在使用猜測的結果驗證"
-      ],
-      "Cancelling User Account": [
-         null,
-         "正在取消使用者帳號"
-      ],
-      "Checking Authentication": [
-         null,
-         "正在檢查授權"
-      ],
-      "Checking Script Version": [
-         null,
-         "正在檢查指令碼版本"
-      ],
-      "Completing User Registration": [
-         null,
-         "正在完成使用者註冊"
-      ],
-      "We are sorry, BrowserID requires cookies": [
-         null,
-         "很抱歉,必須要開啟 Cookie 功能才能使用 BrowserID"
-      ],
-      "BrowserID requires your browser's cookies to be enabled to operate.  Please enable your browser's cookies and try again": [
-         null,
-         "您必須開啟瀏覽器的 cookie 功能才能使用 BrowserID 。請打開您瀏覽器的 cookie 並再試一次"
-      ],
-      "Checking if Cookies are Enabled": [
-         null,
-         "正在檢查 Cookie 功能是否已開啟"
-      ],
-      "Creating Account": [
-         null,
-         "正在建立帳號"
-      ],
-      "Getting Assertion": [
-         null,
-         "正在猜測"
-      ],
-      "Checking Registration Token": [
-         null,
-         "正在檢查註冊令牌 (Token)"
-      ],
-      "Checking Email Address": [
-         null,
-         "正在檢查電子郵件地址"
-      ],
-      "Checking Whether User is Authenticated with IdP": [
-         null,
-         "正在檢查使用者是否已完成服務供應商驗證"
-      ],
-      "Logout Failed": [
+      "BrowserID requires cookies": [
          null,
-         "登出失敗"
+         "BrowserID 需要 Cookie 功能才能使用"
       ],
-      "You are offline!": [
+      "Please close this window, <a %s>enable cookies</a> and try again": [
          null,
-         "您不在線上!"
-      ],
-      "Unfortunately, BrowserID cannot communicate while offline!": [
-         null,
-         "很可惜地,BrowserID 無法於離線時使用!"
-      ],
-      "Authenticating with Identity Provider": [
-         null,
-         "正在向服務提供者驗證"
-      ],
-      "We had trouble communicating with your email provider, please try again!": [
-         null,
-         "我們遇到問題,無法向您的電子郵件服務提供者進行驗證,請重試!"
-      ],
-      "Provisioning with Identity Provider": [
-         null,
-         "正在開通識別身分"
-      ],
-      "Provisioning Unsupported Identity Provider": [
-         null,
-         "正在開通不支援的識別身分"
-      ],
-      "Unfortunately, the email address provided cannot act as a Primary Identity Provider": [
-         null,
-         "很可惜地,您所指定的電子郵件地址無法當作主要識別身分"
-      ],
-      "Registration Failed": [
-         null,
-         "註冊失敗"
-      ],
-      "Establishing Relay": [
-         null,
-         "正在準備轉發"
-      ],
-      "Relay frame could not be found": [
-         null,
-         "找不到轉發框架"
-      ],
-      "Resetting Password": [
-         null,
-         "正在重設密碼"
-      ],
-      "Remove Email Address from Account": [
-         null,
-         "自帳號當中移除電子郵件地址"
-      ],
-      "Setting Password": [
-         null,
-         "正在設定密碼"
-      ],
-      "Signin Failed": [
-         null,
-         "登入失敗"
-      ],
-      "Signup Failed": [
-         null,
-         "註冊失敗"
-      ],
-      "Syncing Address": [
-         null,
-         "正在同步電子郵件地址"
-      ],
-      "Syncing Email Addresses": [
-         null,
-         "正在同步電子郵件地址"
-      ],
-      "Sync Keys for Address": [
-         null,
-         "同步電子郵件地址的金鑰"
-      ],
-      "Getting Token Info": [
-         null,
-         "正在取得令牌 (Token) 資訊"
-      ],
-      "Updating password": [
-         null,
-         "正在更新密碼"
-      ],
-      "Verifying email address": [
-         null,
-         "正在確認電子郵件地址"
+         "請關閉此視窗然後 <a %s>開啟 Cookie 功能</a> 並再試一次"
       ],
       "Communication Error": [
          null,
@@ -238,9 +90,9 @@
          null,
          "歡迎使用 BrowserID!"
       ],
-      "This email looks new, so let&#39;s get you set up.": [
+      "This email looks new, so let's get you set up.": [
          null,
-         "這個電子郵件地址看來沒有設定過,讓我們帶您來設定帳號吧。"
+         "這個電子郵件地址看來是新的,讓我們帶您來設定帳號吧。"
       ],
       "Password": [
          null,
@@ -258,6 +110,10 @@
          null,
          "無法使用此使用者名稱與密碼登入帳號"
       ],
+      "By clicking %s, you confirm that you accept this site's <a %s>Terms of Use</a> and <a %s>Privacy Policy</a>.": [
+         null,
+         "點下 %s 就代表您接受這個網站的 <a %s>使用條款</a> 與 <a %s>隱私權保護政策</a>。"
+      ],
       "next": [
          null,
          "下一步"
@@ -266,9 +122,9 @@
          null,
          "驗證電子郵件地址"
       ],
-      "select email": [
+      "sign in": [
          null,
-         "選擇電子郵件信箱"
+         "登入"
       ],
       "Cannot verify %s": [
          null,
@@ -298,18 +154,34 @@
          null,
          "若這是個錯誤,請忽略這封信並 <a href=\"#\" id=\"back\">使用其他電子郵件地址</a>。"
       ],
+      "We are very sorry, the server is under extreme load!": [
+         null,
+         "很抱歉,伺服器目前負載過重!"
+      ],
+      "We are very sorry, there has been an error!": [
+         null,
+         "抱歉,發生錯誤了!"
+      ],
+      "Please reload the page and try again.": [
+         null,
+         "請重新載入頁面並再試一次。"
+      ],
+      "Please close this window and try again.": [
+         null,
+         "請關閉此視窗並再試一次。"
+      ],
+      "See more info": [
+         null,
+         "檢視更多資訊"
+      ],
       "The site requested you sign in using": [
          null,
          "網站要求您使用"
       ],
-      "Reset Password": [
+      "reset password": [
          null,
          "重設密碼"
       ],
-      "Cancel": [
-         null,
-         "取消"
-      ],
       "*%s* is not a valid email address!": [
          null,
          "「%s」是無效的電子郵件地址!"
@@ -318,10 +190,6 @@
          null,
          "請關閉視窗並輸入有效的電子郵件地址以繼續。"
       ],
-      "We are sorry, but we cannot communicate with BrowserID while you are offline.": [
-         null,
-         "很抱歉,我們無法在您離線的時候跟 BrowserID 通訊。"
-      ],
       "This is not me...": [
          null,
          "這不是我..."
@@ -334,10 +202,6 @@
          null,
          "總是使用此電子郵件地址登入"
       ],
-      "sign in": [
-         null,
-         "登入"
-      ],
       "Address Verified!": [
          null,
          "已驗證電子郵件地址!"
@@ -350,7 +214,7 @@
          null,
          "為了要驗證您真的擁有這個電子郵件地址,您必須先回到這個信箱服務並登入。這個畫面即將會轉址到"
       ],
-      "Verify": [
+      "verify": [
          null,
          "é©—è­‰"
       ],
@@ -358,13 +222,173 @@
          null,
          "透過電子郵件供應商驗證"
       ],
-      "#~ \"We just sent an email to that address!  If you really want to send \"#~ \"another, wait a minute or two and try again.\"": [
+      "#~ \"BrowserID requires your browser's cookies to be enabled to operate. \"#~ \"Please enable your browser's cookies and try again\"": [
          null,
-         "#~ \"我們剛寄出電子郵件到那個地址!若您真的想要再寄一封,請等幾分鐘後再試一次。\""
+         "#~ \"您必須開啟瀏覽器的 cookie 功能才能使用 BrowserID 。請打開您瀏覽器的 \"#~ \"cookie 並再試一次\""
+      ],
+      "You are offline!": [
+         null,
+         "您不在線上!"
+      ],
+      "Unfortunately, BrowserID cannot communicate while offline!": [
+         null,
+         "很可惜地,BrowserID 無法於離線時使用!"
+      ],
+      "select email": [
+         null,
+         "選擇電子郵件信箱"
+      ],
+      "#~ \"We are sorry, but we cannot communicate with BrowserID while you are \"#~ \"offline.\"": [
+         null,
+         "很抱歉,我們無法在您離線的時候跟 BrowserID 通訊。"
+      ],
+      "Authenticating User": [
+         null,
+         "正在驗證使用者"
+      ],
+      "Adding Address": [
+         null,
+         "新增電子郵件地址"
+      ],
+      "Adding Primary Email Address to User": [
+         null,
+         "正在為使用者新增主要電子郵件地址"
+      ],
+      "Checking Address Info": [
+         null,
+         "正在檢查電子郵件地址資訊"
+      ],
+      "Authenticating with Assertion": [
+         null,
+         "正在使用猜測的結果驗證"
+      ],
+      "Cancelling User Account": [
+         null,
+         "正在取消使用者帳號"
+      ],
+      "Checking Authentication": [
+         null,
+         "正在檢查授權"
+      ],
+      "Checking Script Version": [
+         null,
+         "正在檢查指令碼版本"
+      ],
+      "Completing User Registration": [
+         null,
+         "正在完成使用者註冊"
+      ],
+      "Checking if Cookies are Enabled": [
+         null,
+         "正在檢查 Cookie 功能是否已開啟"
       ],
-      "This email looks new, so let&apos;s get you set up.": [
+      "Creating Account": [
+         null,
+         "正在建立帳號"
+      ],
+      "Getting Assertion": [
+         null,
+         "正在猜測"
+      ],
+      "Checking Registration Token": [
+         null,
+         "正在檢查註冊令牌 (Token)"
+      ],
+      "Checking Email Address": [
+         null,
+         "正在檢查電子郵件地址"
+      ],
+      "Checking Whether User is Authenticated with IdP": [
+         null,
+         "正在檢查使用者是否已完成服務供應商驗證"
+      ],
+      "Logout Failed": [
          null,
-         "看來沒有註冊過這個電子郵件地址,讓我們帶您來設定帳號吧。"
+         "登出失敗"
+      ],
+      "Authenticating with Identity Provider": [
+         null,
+         "正在向服務提供者驗證"
+      ],
+      "#~ \"We had trouble communicating with your email provider, please try again!\"": [
+         null,
+         "我們遇到問題,無法向您的電子郵件服務提供者進行驗證,請重試!"
+      ],
+      "Provisioning with Identity Provider": [
+         null,
+         "正在開通識別身分"
+      ],
+      "Provisioning Unsupported Identity Provider": [
+         null,
+         "正在開通不支援的識別身分"
+      ],
+      "#~ \"Unfortunately, the email address provided cannot act as a Primary \"#~ \"Identity Provider\"": [
+         null,
+         "很可惜地,您所指定的電子郵件地址無法當作主要識別身分"
+      ],
+      "Registration Failed": [
+         null,
+         "註冊失敗"
+      ],
+      "Establishing Relay": [
+         null,
+         "正在準備轉發"
+      ],
+      "Relay frame could not be found": [
+         null,
+         "找不到轉發框架"
+      ],
+      "Resetting Password": [
+         null,
+         "正在重設密碼"
+      ],
+      "Remove Email Address from Account": [
+         null,
+         "自帳號當中移除電子郵件地址"
+      ],
+      "Setting Password": [
+         null,
+         "正在設定密碼"
+      ],
+      "Signin Failed": [
+         null,
+         "登入失敗"
+      ],
+      "Signup Failed": [
+         null,
+         "註冊失敗"
+      ],
+      "Syncing Address": [
+         null,
+         "正在同步電子郵件地址"
+      ],
+      "Syncing Email Addresses": [
+         null,
+         "正在同步電子郵件地址"
+      ],
+      "Sync Keys for Address": [
+         null,
+         "同步電子郵件地址的金鑰"
+      ],
+      "Getting Token Info": [
+         null,
+         "正在取得令牌 (Token) 資訊"
+      ],
+      "Updating password": [
+         null,
+         "正在更新密碼"
+      ],
+      "Verifying email address": [
+         null,
+         "正在確認電子郵件地址"
+      ],
+      "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.\"": [
+         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,
diff --git a/resources/static/i18n/zh_TW/messages.json b/resources/static/i18n/zh_TW/messages.json
index c4af42267..4b46b4979 100644
--- a/resources/static/i18n/zh_TW/messages.json
+++ b/resources/static/i18n/zh_TW/messages.json
@@ -3,8 +3,8 @@
       "": {
          "Project-Id-Version": " PACKAGE VERSION",
          "Report-Msgid-Bugs-To": " ",
-         "POT-Creation-Date": " 2012-02-03 11:43+0100",
-         "PO-Revision-Date": " 2012-02-03 13:36+0200",
+         "POT-Creation-Date": " 2012-03-02 15:24+0100",
+         "PO-Revision-Date": " 2012-03-02 17:20+0200",
          "Last-Translator": " Peter <petercpg@mail.moztw.org>",
          "Language-Team": " LANGUAGE <LL@li.org>",
          "Language": " zh_TW",
@@ -26,9 +26,9 @@
          null,
          "嘗試完成註冊時發生錯誤。"
       ],
-      "Finish signing into: ": [
+      "Finish signing into:": [
          null,
-         "完成登入至: "
+         "正完成登入至:"
       ],
       "Email Verification": [
          null,
@@ -74,7 +74,7 @@
          null,
          "輸入的密碼不相同。"
       ],
-      "Finish": [
+      "finish": [
          null,
          "完成"
       ],
@@ -86,6 +86,14 @@
          null,
          "您新的電子郵件地址已經設定完成,現在應該也已經登入了。您現在可以關閉此視窗並回到"
       ],
+      "BrowserID requires cookies": [
+         null,
+         "BrowserID 需要 cookie 功能"
+      ],
+      "Please close this window, <a %s>enable cookies</a> and try again": [
+         null,
+         "請關閉此視窗然後 <a %s>開啟 Cookie 功能</a> 並再試一次"
+      ],
       "Communicating with server": [
          null,
          "正在與伺服器通訊"
@@ -98,9 +106,9 @@
          null,
          "BrowserID"
       ],
-      "BrowserID is the fast and secure way to sign in &mdash; <a target=\"_blank\" href=\"/about\">learn more</a>": [
+      "BrowserID is the fast and secure way to sign in &mdash; <a %s>learn more</a>": [
          null,
-         "BrowserID 是個能讓您更快、更安全地登入網站的方式 &mdash; <a target=\"_blank\" href=\"/about\">了解更多資訊</a>"
+         "BrowserID 是個能讓您更快、更安全地登入網站的方式 &mdash; <a %s>了解更多資訊</a>"
       ],
       "BrowserID: %s": [
          null,
@@ -126,9 +134,9 @@
          null,
          "登出"
       ],
-      "By the <a href=\"%s\" target=\"_blank\">Identity Team</a> @ <a href=\"%s\" target=\"_blank\">Mozilla Labs</a>": [
+      "By the <a %s>Identity Team</a> @ <a %s>Mozilla Labs</a>": [
          null,
-         "由 <a href=\"%s\" target=\"_blank\">Mozilla Labs</a> 的 <a href=\"%s\" target=\"_blank\">Identity Team</a> 打造"
+         "由 <a %s>Mozilla Labs</a> 的 <a %s>Identity Team</a> 打造"
       ],
       "Privacy": [
          null,
@@ -146,7 +154,7 @@
          null,
          "您的註冊鏈結有點問題。這個電子郵件地址註冊過了嗎?"
       ],
-      "Error comunicating with server.": [
+      "Error communicating with server.": [
          null,
          "與伺服器通訊時發生錯誤。"
       ],
-- 
GitLab