updated locales from 99translations

removed fr-informal
german is at 100%
swedish is at 100%, thanks Hexagon
french is at 100%, thanks ed0h
russian is at almost 90%, thanks rapmon

22 files changed, 1536 insertions, 782 deletions

diff --git a/config/locales/devise/devise.ar.yml b/config/locales/devise/devise.ar.yml
index 922333521..1bd7ab484 100644
--- a/config/locales/devise/devise.ar.yml
+++ b/config/locales/devise/devise.ar.yml
@@ -2,39 +2,81 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-ar:
-  errors:
-    messages:
-      not_found: "لم يتم العثور على"
-      already_confirmed: "وقد أكد بالفعل"
-      not_locked: "لم يكن مغلق"
 
-  devise:
-    failure:
-      unauthenticated: ".تحتاج إلى تسجيل الدخول أو قم بالتسجيل قبل الشروع في الاستمرار"
-      unconfirmed: ".لديك لتأكيد الحساب الخاص بك قبل المتابعة"
-      locked: ".مؤمن حسابك"
+ar: 
+  devise: 
+    confirmations: 
+      confirmed: ".وأكد حسابك بنجاح. وقعت الآن دخولك"
+      send_instructions: ".سوف تتلقى رسالة بريد إلكتروني مع تعليمات حول كيفية تأكيد الحساب الخاص بك في بضع دقائق"
+    failure: 
+      inactive: ".ولم يتم تفعيل حسابك بعد"
       invalid: ".بريد إلكتروني غير صالح أو كلمة المرور"
       invalid_token: ".المصادقة غير صالح الرمز المميز"
+      locked: ".مؤمن حسابك"
       timeout: ".انتهت الدورة الخاصة بك ، الرجاء تسجيل الدخول مرة أخرى للمتابعة"
-      inactive: ".ولم يتم تفعيل حسابك بعد"
-    sessions:
-      signed_in: ".وقعت في بنجاح"
-      signed_out: ".بتسجيل الخروج بنجاح"
-    passwords:
+      unauthenticated: ".تحتاج إلى تسجيل الدخول أو قم بالتسجيل قبل الشروع في الاستمرار"
+      unconfirmed: ".لديك لتأكيد الحساب الخاص بك قبل المتابعة"
+    invitations: 
+      invitation_token_invalid: "The invitation token provided is not valid!"
+      send_instructions: "Your invitation has been sent."
+      updated: "Your password was set successfully. You are now signed in."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Confirm my account"
+        subject: "Confirmation instructions"
+        you_can_confirm: "You can confirm your account through the link below:"
+      hello: "Hello %{email}!"
+      invitation: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "A friend wants you to join Diaspora!"
+      inviters: 
+        accept_at: ", at %{url}, you can accept it through the link below."
+        has_invited_you: "%{name} has invited you to join Diaspora"
+        have_invited_you: "%{names} have invited you to join Diaspora"
+      reset_password_instructions: 
+        change: "Change my password"
+        ignore: "If you didn't request this, please ignore this email."
+        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
+        subject: "Reset password instructions"
+        wont_change: "Your password won't change until you access the link above and create a new one."
+      unlock_instructions: 
+        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        click_to_unlock: "Click the link below to unlock your account:"
+        subject: "Unlock Instructions"
+        unlock: "Unlock my account"
+      welcome: "Welcome %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Forgot your password?"
+        send_password_instructions: "Send me reset password instructions"
       send_instructions: ".سوف تتلقى رسالة بريد إلكتروني مع تعليمات حول كيفية إعادة تعيين كلمة السر الخاصة بك في بضع دقائق"
       updated: ".تم تغيير كلمة السر الخاصة بك بنجاح. وقعت الآن دخولك"
-    confirmations:
-      send_instructions: ".سوف تتلقى رسالة بريد إلكتروني مع تعليمات حول كيفية تأكيد الحساب الخاص بك في بضع دقائق"
-      confirmed: ".وأكد حسابك بنجاح. وقعت الآن دخولك"
-    registrations:
+    registrations: 
+      destroyed: ".وداعا! تم إلغاء حسابك بنجاح. ونأمل أن نراكم مرة أخرى قريبا"
       signed_up: ".لقد قمت بتسجيل بنجاح. إذا مكن، وجهت رسالة تأكيد إلى البريد الإلكتروني الخاص بك"
       updated: ".قمت بتحديث حسابك بنجاح"
-      destroyed: ".وداعا! تم إلغاء حسابك بنجاح. ونأمل أن نراكم مرة أخرى قريبا"
-    unlocks:
+    sessions: 
+      new: 
+        have_a_problem: "Have a problem? Find an answer here"
+        login: Login
+        password: Password
+        remember_me: "Remember me"
+        sign_in: "Sign in"
+        username: Username
+      signed_in: ".وقعت في بنجاح"
+      signed_out: ".بتسجيل الخروج بنجاح"
+    shared: 
+      links: 
+        forgot_your_password: "Forgot your password?"
+        sign_in: "Sign in"
+        sign_up: "Sign up"
+    unlocks: 
       send_instructions: ".سوف تتلقى رسالة بريد إلكتروني مع تعليمات حول كيفية فتح حساب في بضع دقائق"
       unlocked: ".كان حسابك مقفلة بنجاح. وقعت الآن دخولك"
-    mailer:
-      confirmation_instructions: "تأكيد تعليمات"
-      reset_password_instructions: "تعليمات إعادة تعيين كلمة المرور"
-      unlock_instructions: "فتح التعليمات"
+  errors: 
+    messages: 
+      already_confirmed: "وقد أكد بالفعل"
+      not_found: "لم يتم العثور على"
+      not_locked: "لم يكن مغلق"
diff --git a/config/locales/devise/devise.cs.yml b/config/locales/devise/devise.cs.yml
index ec0e298b4..22572511c 100644
--- a/config/locales/devise/devise.cs.yml
+++ b/config/locales/devise/devise.cs.yml
@@ -2,39 +2,81 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-cs:
-  errors:
-    messages:
-      not_found: "nenalezeno"
+
+cs: 
+  devise: 
+    confirmations: 
+      confirmed: "Váš účet byl uspěšně potvrzen. Nyní jste přihlášeni."
+      send_instructions: "Během několika minut obdržíte email s instrukcemi k potvrzení vašeho účtu."
+    failure: 
+      inactive: "Váš účet ještě nebyl aktivován."
+      invalid: "Neplatný email nebo heslo."
+      invalid_token: "Neplatný autentizační token."
+      locked: "Váš účet je uzamčen."
+      timeout: "Vaše sezení vypršelo, pro pokračování se prosím přihlašte znovu."
+      unauthenticated: "Pro pokračování se musíte přihlásit nebo si vytvořit účet."
+      unconfirmed: "Před pokračováním musíte potvrdit svůj účet."
+    invitations: 
+      invitation_token_invalid: "The invitation token provided is not valid!"
+      send_instructions: "Your invitation has been sent."
+      updated: "Your password was set successfully. You are now signed in."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Confirm my account"
+        subject: "Confirmation instructions"
+        you_can_confirm: "You can confirm your account through the link below:"
+      hello: "Hello %{email}!"
+      invitation: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "A friend wants you to join Diaspora!"
+      inviters: 
+        accept_at: ", at %{url}, you can accept it through the link below."
+        has_invited_you: "%{name} has invited you to join Diaspora"
+        have_invited_you: "%{names} have invited you to join Diaspora"
+      reset_password_instructions: 
+        change: "Change my password"
+        ignore: "If you didn't request this, please ignore this email."
+        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
+        subject: "Reset password instructions"
+        wont_change: "Your password won't change until you access the link above and create a new one."
+      unlock_instructions: 
+        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        click_to_unlock: "Click the link below to unlock your account:"
+        subject: "Unlock Instructions"
+        unlock: "Unlock my account"
+      welcome: "Welcome %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Forgot your password?"
+        send_password_instructions: "Send me reset password instructions"
+      send_instructions: "Běhěm několika minut obdržíte email s instrukcemi k resetnutí hesla."
+      updated: "Vaše heslo bylo úspěšně změněno. Nyní jste přihlášeni"
+    registrations: 
+      destroyed: "Sbohem! Váš účet byl úspěšně zrušen. Brzy naviděnou."
+      signed_up: "Úspěšně jste vytvořili účet. Pokud je tak server nastaven, byl vám zaslán potvrzovací email."
+      updated: "Úspěšně jste upravili svůj účet."
+    sessions: 
+      new: 
+        have_a_problem: "Have a problem? Find an answer here"
+        login: Login
+        password: Password
+        remember_me: "Remember me"
+        sign_in: "Sign in"
+        username: Username
+      signed_in: "Přihlášení proběhlo úspěšně."
+      signed_out: "Odhlášení proběhlo úspěšně."
+    shared: 
+      links: 
+        forgot_your_password: "Forgot your password?"
+        sign_in: "Sign in"
+        sign_up: "Sign up"
+    unlocks: 
+      send_instructions: "Během několika minut obdržíte email s instrukcemi k odemknutí vašeho účtu."
+      unlocked: "Váš účet byl úspěšně odemknut. Nyní jste přihlášeni."
+  errors: 
+    messages: 
       already_confirmed: "již bylo potvrzeno"
+      not_found: nenalezeno
       not_locked: "nebylo zamčeno"
-
-  devise:
-    failure:
-      unauthenticated: 'Pro pokračování se musíte přihlásit nebo si vytvořit účet.'
-      unconfirmed: 'Před pokračováním musíte potvrdit svůj účet.'
-      locked: 'Váš účet je uzamčen.'
-      invalid: 'Neplatný email nebo heslo.'
-      invalid_token: 'Neplatný autentizační token.'
-      timeout: 'Vaše sezení vypršelo, pro pokračování se prosím přihlašte znovu.'
-      inactive: 'Váš účet ještě nebyl aktivován.'
-    sessions:
-      signed_in: 'Přihlášení proběhlo úspěšně.'
-      signed_out: 'Odhlášení proběhlo úspěšně.'
-    passwords:
-      send_instructions: 'Běhěm několika minut obdržíte email s instrukcemi k resetnutí hesla.'
-      updated: 'Vaše heslo bylo úspěšně změněno. Nyní jste přihlášeni'
-    confirmations:
-      send_instructions: 'Během několika minut obdržíte email s instrukcemi k potvrzení vašeho účtu.'
-      confirmed: 'Váš účet byl uspěšně potvrzen. Nyní jste přihlášeni.'
-    registrations:
-      signed_up: 'Úspěšně jste vytvořili účet. Pokud je tak server nastaven, byl vám zaslán potvrzovací email.'
-      updated: 'Úspěšně jste upravili svůj účet.'
-      destroyed: 'Sbohem! Váš účet byl úspěšně zrušen. Brzy naviděnou.'
-    unlocks:
-      send_instructions: 'Během několika minut obdržíte email s instrukcemi k odemknutí vašeho účtu.'
-      unlocked: 'Váš účet byl úspěšně odemknut. Nyní jste přihlášeni.'
-    mailer:
-      confirmation_instructions: 'Instrukce k potvrzení'
-      reset_password_instructions: 'Instrukce k resetnutí hesla'
-      unlock_instructions: 'Instrukce k odemčení'
diff --git a/config/locales/devise/devise.cy.yml b/config/locales/devise/devise.cy.yml
index 54704978b..14c0caae0 100644
--- a/config/locales/devise/devise.cy.yml
+++ b/config/locales/devise/devise.cy.yml
@@ -2,40 +2,81 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-cy:
-  errors:
-    messages:
-       not_found: "ni chanfuwyd"
-       already_confirmed: "cadarnhawyd eisioes"
-       not_locked: "heb ei gloi"
 
-  devise:
-    failure:
-      unauthenticated: "Mae angen i chi arwyddo i mewn neu ymuno cyn parhau."
-      unconfirmed: "Rhaid i chi gadarnhau eich cyfrif cyn parhau."
-      locked: "Mae eich cyfrif wedi'i gloi."
+cy: 
+  devise: 
+    confirmations: 
+      confirmed: "Cadarnhawyd eich cyfrif yn llwyddiannus. Rydych chi wedi arwyddo i fewn."
+      send_instructions: "Byddwch yn derbyn e-bost â chyfarwyddiadau ar sut i gadarnhau eich cyfrif mewn ychydig funudau."
+    failure: 
+      inactive: "Nid yw eich cyfrif wedi'i actifadu."
       invalid: "E-bost neu gyfrinair annilys."
       invalid_token: "Tocyn dilysu annilys."
+      locked: "Mae eich cyfrif wedi'i gloi."
       timeout: "Mae eich sesiwn wedi dod i ben, arwyddwch i mewn eto i barhau."
-      inactive: "Nid yw eich cyfrif wedi'i actifadu."
-    sessions:
-      signed_in: "Arwyddwyd i fewn yn llwyddiannus."
-      signed_out: "Arwyddwyd allan yn llwyddiannus."
-    passwords:
+      unauthenticated: "Mae angen i chi arwyddo i mewn neu ymuno cyn parhau."
+      unconfirmed: "Rhaid i chi gadarnhau eich cyfrif cyn parhau."
+    invitations: 
+      invitation_token_invalid: "The invitation token provided is not valid!"
+      send_instructions: "Your invitation has been sent."
+      updated: "Your password was set successfully. You are now signed in."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Confirm my account"
+        subject: "Confirmation instructions"
+        you_can_confirm: "You can confirm your account through the link below:"
+      hello: "Hello %{email}!"
+      invitation: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "A friend wants you to join Diaspora!"
+      inviters: 
+        accept_at: ", at %{url}, you can accept it through the link below."
+        has_invited_you: "%{name} has invited you to join Diaspora"
+        have_invited_you: "%{names} have invited you to join Diaspora"
+      reset_password_instructions: 
+        change: "Change my password"
+        ignore: "If you didn't request this, please ignore this email."
+        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
+        subject: "Reset password instructions"
+        wont_change: "Your password won't change until you access the link above and create a new one."
+      unlock_instructions: 
+        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        click_to_unlock: "Click the link below to unlock your account:"
+        subject: "Unlock Instructions"
+        unlock: "Unlock my account"
+      welcome: "Welcome %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Forgot your password?"
+        send_password_instructions: "Send me reset password instructions"
       send_instructions: "Byddwch yn derbyn e-bost â chyfarwyddiadau ar sut i gadarnhau eich cyfrif mewn ychydig funudau."
       updated: "Newidiwyd eich cyfrinair yn llwyddiannus. Rydych chi wedi arwyddo i fewn."
-    confirmations:
-      send_instructions: "Byddwch yn derbyn e-bost â chyfarwyddiadau ar sut i gadarnhau eich cyfrif mewn ychydig funudau."
-      confirmed: "Cadarnhawyd eich cyfrif yn llwyddiannus. Rydych chi wedi arwyddo i fewn."
-    registrations:
+    registrations: 
+      destroyed: "Hwyl fawr! Canslwyd eich cyfrif yn llwyddiannus. Rydym yn gobeithio gweld chi eto yn fuan."
       signed_up: "Rydych chi wedi arwyddo i fyny yn llwyddiannus. Anfonwyd cadarnhad at eich e-bost os yw wedi'i alluogi."
       updated: "Diweddarwyd eich cyfrif yn llwyddiannus."
-      destroyed: "Hwyl fawr! Canslwyd eich cyfrif yn llwyddiannus. Rydym yn gobeithio gweld chi eto yn fuan."
-    unlocks:
+    sessions: 
+      new: 
+        have_a_problem: "Have a problem? Find an answer here"
+        login: Login
+        password: Password
+        remember_me: "Remember me"
+        sign_in: "Sign in"
+        username: Username
+      signed_in: "Arwyddwyd i fewn yn llwyddiannus."
+      signed_out: "Arwyddwyd allan yn llwyddiannus."
+    shared: 
+      links: 
+        forgot_your_password: "Forgot your password?"
+        sign_in: "Sign in"
+        sign_up: "Sign up"
+    unlocks: 
       send_instructions: "Byddwch yn derbyn e-bost gyda cyfarwyddiadau ar sut i agor eich cyfrif mewn ychydig funudau."
       unlocked: "Datglowyd eich cyfrif yn llwyddiannus. Rydych chi wedi arwyddo i fewn."
-    mailer:
-      confirmation_instructions: "Cyfarwyddiadau cadarnhad."
-      reset_password_instructions: "Ailosod cyfarwyddiadau cyfrinair"
-      unlock_instructions: "Cyfarwyddiadau Datgloi"
-
+  errors: 
+    messages: 
+      already_confirmed: "cadarnhawyd eisioes"
+      not_found: "ni chanfuwyd"
+      not_locked: "heb ei gloi"
diff --git a/config/locales/devise/devise.da.yml b/config/locales/devise/devise.da.yml
new file mode 100644
index 000000000..d40f9b3c1
--- /dev/null
+++ b/config/locales/devise/devise.da.yml
@@ -0,0 +1,82 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+da: 
+  devise: 
+    confirmations: 
+      confirmed: "Your account was successfully confirmed. You are now signed in."
+      send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
+    failure: 
+      inactive: "Your account was not activated yet."
+      invalid: "Invalid email or password."
+      invalid_token: "Invalid authentication token."
+      locked: "Your account is locked."
+      timeout: "Your session expired, please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your account before continuing."
+    invitations: 
+      invitation_token_invalid: "The invitation token provided is not valid!"
+      send_instructions: "Your invitation has been sent."
+      updated: "Your password was set successfully. You are now signed in."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Confirm my account"
+        subject: "Confirmation instructions"
+        you_can_confirm: "You can confirm your account through the link below:"
+      hello: "Hello %{email}!"
+      invitation: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
+      inviters: 
+        accept_at: ", at %{url}, you can accept it through the link below."
+        has_invited_you: "%{name} has invited you to join Diaspora"
+        have_invited_you: "%{names} have invited you to join Diaspora"
+      reset_password_instructions: 
+        change: "Change my password"
+        ignore: "If you didn't request this, please ignore this email."
+        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
+        subject: "Reset password instructions"
+        wont_change: "Your password won't change until you access the link above and create a new one."
+      unlock_instructions: 
+        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        click_to_unlock: "Click the link below to unlock your account:"
+        subject: "Unlock Instructions"
+        unlock: "Unlock my account"
+      welcome: "Welcome %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Forgot your password?"
+        send_password_instructions: "Send me reset password instructions"
+      send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
+      updated: "Your password was changed successfully. You are now signed in."
+    registrations: 
+      destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
+      signed_up: "You have signed up successfully. If enabled, a confirmation was sent to your e-mail."
+      updated: "You updated your account successfully."
+    sessions: 
+      new: 
+        have_a_problem: "Have a problem? Find an answer here"
+        login: Login
+        password: Password
+        remember_me: "Remember me"
+        sign_in: "Sign in"
+        username: Username
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+    shared: 
+      links: 
+        forgot_your_password: "Forgot your password?"
+        sign_in: "Sign in"
+        sign_up: "Sign up"
+    unlocks: 
+      send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
+      unlocked: "Your account was successfully unlocked. You are now signed in."
+  errors: 
+    messages: 
+      already_confirmed: "was already confirmed"
+      not_found: "ikke fundet"
+      not_locked: "was not locked"
diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
index ebbb2baa1..b160cdf03 100644
--- a/config/locales/devise/devise.de.yml
+++ b/config/locales/devise/devise.de.yml
@@ -2,58 +2,81 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-de:
-  errors:
-    messages:
-      not_found: "nicht gefunden"
-      already_confirmed: "wurde bereits bestätigt"
-      not_locked: "war nicht gesperrt"
 
-  devise:
-    failure:
-      unauthenticated: "Du musst dich anmelden oder registrieren um fortzufahren."
-      unconfirmed: "Du musst dein Konto bestätigen um fortzufahren."
-      locked: "Dein Konto ist gesperrt."
+de: 
+  devise: 
+    confirmations: 
+      confirmed: "Dein Konto wurde erfolgreich bestätigt. Du bist nun angemeldet."
+      send_instructions: "Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto bestätigst."
+    failure: 
+      inactive: "Dein Konto wurde noch nicht aktiviert."
       invalid: "Ungültige E-Mail-Adresse oder Passwort."
       invalid_token: "Ungültiger Authentifizierungstoken."
+      locked: "Dein Konto ist gesperrt."
       timeout: "Deine Sitzung ist abgelaufen, bitte melde dich erneut an um fortzufahren."
-      inactive: "Dein Konto wurde noch nicht aktiviert."
-    sessions:
-      new:
-        login: 'Login'
-        username: 'Benutzername'
-        password: 'Passwort'
-        sign_in: 'Anmelden'
-      signed_in: "Erfolgreich angemeldet."
-      signed_out: "Erfolgreich abgemeldet."
-    passwords:
+      unauthenticated: "Du musst dich anmelden oder registrieren um fortzufahren."
+      unconfirmed: "Du musst dein Konto bestätigen um fortzufahren."
+    invitations: 
+      invitation_token_invalid: "Das Einladungstoken ist ungültig!"
+      send_instructions: "Deine Einladung wurde versandt."
+      updated: "Dein Passwort wurde erfolgreich gesetzt. Du bist nun angemeldet."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Mein Konto bestätigen"
+        subject: "Instruktionen zur Bestätigung"
+        you_can_confirm: "Du kannst dein Konto über den nachfolgenden Link bestätigen:"
+      hello: "Hallo %{email}!"
+      invitation: 
+        accept: "Einladung annehmen"
+        ignore: "Wenn du die Einladung nicht annehmen willst, dann ignoriere diese E-Mail."
+        no_account_till: "Dein Konto wird nicht erstellt bis du dich über den Link registriert."
+        subject: "Du bist zu Diaspora einladen worden!"
+      inviters: 
+        accept_at: "%{url} teilzunehmen, du kannst die Einladung durch den Link unten annehmen."
+        has_invited_you: "%{name} hat dich eingeladen an Diaspora auf"
+        have_invited_you: "%{names} haben dich eingeladen an Diaspora auf"
+      reset_password_instructions: 
+        change: "Mein Passwort ändern"
+        ignore: "Wenn du dies nicht angefordert hast, ignoriere bitte diese E-Mail."
+        someone_requested: "Jemand hat einen Link angefordert um dein Passwort zu ändern und du kannst das durch den Link unten tun."
+        subject: "Instruktionen zum Zurücksetzen des Passworts"
+        wont_change: "Dein Passwort bleibt unverändert bis du es über den Link änderst."
+      unlock_instructions: 
+        account_locked: "Dein Konto wurde gesperrt weil zu oft versucht wurde sich anzumelden."
+        click_to_unlock: "Klicken um Konto zu entsperren:"
+        subject: "Instruktionen zum Entsperren"
+        unlock: "Mein Konto entsperren"
+      welcome: "Willkommen %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Passwort vergessen?"
+        send_password_instructions: "Sende mir Instruktionen zum Passwort zurücksetzen"
       send_instructions: "Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Passwort zurücksetzt."
       updated: "Dein Passwort wurde erfolgreich geändert. Du bist nun angemeldet."
-    confirmations:
-      send_instructions: "Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto bestätigst."
-      confirmed: "Dein Konto wurde erfolgreich bestätigt. Du bist nun angemeldet."
-    registrations:
+    registrations: 
+      destroyed: "Tschüss! Dein Konto wurde erfolgreich gekündigt. Wir hoffen dich bald wiederzusehen."
       signed_up: "Du hast dich erfolgreich registriert. Sofern aktiviert, wurde dir eine Bestätigung per E-Mail gesendet."
       updated: "Dein Konto wurde aktualisiert."
-      destroyed: "Tschüss! Dein Konto wurde erfolgreich gekündigt. Wir hoffen dich bald wiederzusehen."
-    unlocks:
+    sessions: 
+      new: 
+        have_a_problem: "Du hast ein Problem? Finde eine Antwort hier (Englisch)"
+        login: Login
+        password: Passwort
+        remember_me: "Angemeldet bleiben"
+        sign_in: Anmelden
+        username: Benutzername
+      signed_in: Angemeldet.
+      signed_out: Abgemeldet.
+    shared: 
+      links: 
+        forgot_your_password: "Passwort vergessen?"
+        sign_in: Anmelden
+        sign_up: Registrieren
+    unlocks: 
       send_instructions: "Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto entsperren kannst."
       unlocked: "Dein Konto wurde erfolgreich entsperrt. Du bist nun angemeldet."
-    invitations:
-      send_instructions: 'Deine Einladung wurde versandt.'
-      invitation_token_invalid: 'Das Einladungstoken ist ungültig!' #FIXME: translate token?
-      updated: 'Dein Passwort wurde erfolgreich gesetzt. Du bist nun angemeldet.'
-    mailer:
-      confirmation_instructions:
-        subject: "Instruktionen zur Bestätigung"
-      reset_password_instructions:
-        subject: "Instruktionen zum Zurücksetzen des Passworts"
-      unlock_instructions:
-        subject: "Instruktionen zum Entsperren"
-      invitation:
-        subject: 'Ein Freund möchte dich bei Diaspora einladen!'
-    shared:
-      links:
-        sign_in: 'Anmelden'
-        sign_up: 'Registrieren'
-        forgot_your_password: 'Passwort vergessen?'
+  errors: 
+    messages: 
+      already_confirmed: "wurde bereits bestätigt"
+      not_found: "nicht gefunden"
+      not_locked: "war nicht gesperrt"
diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml
index 06002aa63..35668941b 100644
--- a/config/locales/devise/devise.es.yml
+++ b/config/locales/devise/devise.es.yml
@@ -1,42 +1,82 @@
-es:
-  errors:
-    messages:
-      not_found: 'no encontrado'
-      already_confirmed: 'ya ha sido confirmada'
-      not_locked: 'no está bloqueada'
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
 
-  devise:
-    failure:
-      unauthenticated: 'Necesitas acceder a tu cuenta o registrarte antes de continuar.'
-      unconfirmed: 'Necesitas confirmar tu cuenta antes de continuar.'
-      locked: 'Tu cuenta esta bloqueada.'
-      invalid: 'Contraseña o Email incorrecto.'
-      invalid_token: 'Token de autenticación incorrecto.'
-      timeout: 'Tu sesión ha expirado, por favor accede de nuevo para continuar.'
-      inactive: 'Tu cuenta no ha sido activada.'
-    sessions:
-      signed_in: 'Has ingresado correctamente.'
-      signed_out: 'Has salido correctamente.'
-    passwords:
-      send_instructions: 'Recibirás un email con instrucciones para cambiar tu contraseña en pocos minutos.'
-      updated: 'Tu contraseña ha sido modificada. Ya has accedido a tu cuenta.'
-    confirmations:
-      send_instructions: 'Recibirás un email con instrucciones para confirmar tu cuenta en pocos minutos.'
-      confirmed: 'Tu cuenta ha sido confirmada. Ya has accedido a tu cuenta.'
-    registrations:
-      signed_up: 'Te has registrado correctamente. Si está disponible, te habremos enviado un email de confirmación.'
-      updated: 'Has actualizado tu cuenta correctamente.'
-      destroyed: '!Adiós! Tu cuenta ha sido cancelada. Esperamos verte pronto.'
-    unlocks:
-      send_instructions: 'Recibirás un email con instrucciones para desbloquear tu cuenta en pocos minutos.'
-      unlocked: 'Tu cuenta ha sido desbloqueada. Ya has accedido a tu cuenta.'
-    oauth_callbacks:
-      success: 'Has sido autorizado satisfactoriamente de la cuenta %{kind}.'
-      failure: 'No has sido autorizado en la cuenta %{kind} porque "%{reason}".'
-    mailer:
-      confirmation_instructions:
-        subject: 'Instrucciones de confirmación'
-      reset_password_instructions:
-        subject: 'Instrucciones para cambiar tu contraseña'
-      unlock_instructions:
-        subject: 'Instrucciones para desbloquear tu cuenta'
\ No newline at end of file
+
+es: 
+  devise: 
+    confirmations: 
+      confirmed: "Tu cuenta ha sido confirmada. Ya has accedido a tu cuenta."
+      send_instructions: "Recibirás un email con instrucciones para confirmar tu cuenta en pocos minutos."
+    failure: 
+      inactive: "Tu cuenta no ha sido activada."
+      invalid: "Contraseña o Email incorrecto."
+      invalid_token: "Token de autenticación incorrecto."
+      locked: "Tu cuenta esta bloqueada."
+      timeout: "Tu sesión ha expirado, por favor accede de nuevo para continuar."
+      unauthenticated: "Necesitas acceder a tu cuenta o registrarte antes de continuar."
+      unconfirmed: "Necesitas confirmar tu cuenta antes de continuar."
+    invitations: 
+      invitation_token_invalid: "The invitation token provided is not valid!"
+      send_instructions: "Your invitation has been sent."
+      updated: "Your password was set successfully. You are now signed in."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Confirm my account"
+        subject: "Instrucciones de confirmación"
+        you_can_confirm: "You can confirm your account through the link below:"
+      hello: "Hello %{email}!"
+      invitation: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "A friend wants you to join Diaspora!"
+      inviters: 
+        accept_at: ", at %{url}, you can accept it through the link below."
+        has_invited_you: "%{name} has invited you to join Diaspora"
+        have_invited_you: "%{names} have invited you to join Diaspora"
+      reset_password_instructions: 
+        change: "Change my password"
+        ignore: "If you didn't request this, please ignore this email."
+        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
+        subject: "Instrucciones para cambiar tu contraseña"
+        wont_change: "Your password won't change until you access the link above and create a new one."
+      unlock_instructions: 
+        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        click_to_unlock: "Click the link below to unlock your account:"
+        subject: "Instrucciones para desbloquear tu cuenta"
+        unlock: "Unlock my account"
+      welcome: "Welcome %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Forgot your password?"
+        send_password_instructions: "Send me reset password instructions"
+      send_instructions: "Recibirás un email con instrucciones para cambiar tu contraseña en pocos minutos."
+      updated: "Tu contraseña ha sido modificada. Ya has accedido a tu cuenta."
+    registrations: 
+      destroyed: "!Adiós! Tu cuenta ha sido cancelada. Esperamos verte pronto."
+      signed_up: "Te has registrado correctamente. Si está disponible, te habremos enviado un email de confirmación."
+      updated: "Has actualizado tu cuenta correctamente."
+    sessions: 
+      new: 
+        have_a_problem: "Have a problem? Find an answer here"
+        login: Login
+        password: Password
+        remember_me: "Remember me"
+        sign_in: "Sign in"
+        username: Username
+      signed_in: "Has ingresado correctamente."
+      signed_out: "Has salido correctamente."
+    shared: 
+      links: 
+        forgot_your_password: "Forgot your password?"
+        sign_in: "Sign in"
+        sign_up: "Sign up"
+    unlocks: 
+      send_instructions: "Recibirás un email con instrucciones para desbloquear tu cuenta en pocos minutos."
+      unlocked: "Tu cuenta ha sido desbloqueada. Ya has accedido a tu cuenta."
+  errors: 
+    messages: 
+      already_confirmed: "ya ha sido confirmada"
+      not_found: "no encontrado"
+      not_locked: "no está bloqueada"
diff --git a/config/locales/devise/devise.fi.yml b/config/locales/devise/devise.fi.yml
index 5f122172f..7852886ce 100644
--- a/config/locales/devise/devise.fi.yml
+++ b/config/locales/devise/devise.fi.yml
@@ -1,41 +1,82 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
-#   Translator: jarkko moilanen, jm60697@gmail.com
 
-fi:
-  errors:
-    messages:
-      not_found: "ei löytynyt"
+
+fi: 
+  devise: 
+    confirmations: 
+      confirmed: "Käyttäjätilisi luonti on vahvistettu. Olet nyt kirjautunut sisään."
+      send_instructions: "Saat hetken päästä sähköpostiisi ohjeet siitä miten vahvistat käyttäjätilisi luonnin."
+    failure: 
+      inactive: "Käyttätiliäsi ei ole vielä vahvistettu."
+      invalid: "Väärä sähköpostiosoite tai salasana."
+      invalid_token: "Viallinen todennus."
+      locked: "Käyttäjätilisi on lukittu."
+      timeout: "Istunto on vanhentunut, kirjaudu uudelleen."
+      unauthenticated: "Kirjaudu tai rekisteröidy ennen kuin voit jatkaa."
+      unconfirmed: "Sinun täytyy vahvistaa käyttäjätilisi ennen kuin voit jatkaa"
+    invitations: 
+      invitation_token_invalid: "The invitation token provided is not valid!"
+      send_instructions: "Your invitation has been sent."
+      updated: "Your password was set successfully. You are now signed in."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Confirm my account"
+        subject: "Confirmation instructions"
+        you_can_confirm: "You can confirm your account through the link below:"
+      hello: "Hello %{email}!"
+      invitation: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "A friend wants you to join Diaspora!"
+      inviters: 
+        accept_at: ", at %{url}, you can accept it through the link below."
+        has_invited_you: "%{name} has invited you to join Diaspora"
+        have_invited_you: "%{names} have invited you to join Diaspora"
+      reset_password_instructions: 
+        change: "Change my password"
+        ignore: "If you didn't request this, please ignore this email."
+        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
+        subject: "Reset password instructions"
+        wont_change: "Your password won't change until you access the link above and create a new one."
+      unlock_instructions: 
+        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        click_to_unlock: "Click the link below to unlock your account:"
+        subject: "Unlock Instructions"
+        unlock: "Unlock my account"
+      welcome: "Welcome %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Forgot your password?"
+        send_password_instructions: "Send me reset password instructions"
+      send_instructions: "Saat hetken päästä sähköpostiisi ohjeet siitä miten määrität salasanasi uudelleen."
+      updated: "Salasanasi on vaihdettu. Olet nyt kirjautunut sisään."
+    registrations: 
+      destroyed: "Näkemiin! Käyttäjätilisi on poistettu. Toivottavasti näemme sinut pian uudelleen."
+      signed_up: "Käyttäjätilin luominen onnistui. Mahdollinen vahvistuspyyntö on lähetetty sähköpostiisi."
+      updated: "Käyttäjätilisi on päivitetty."
+    sessions: 
+      new: 
+        have_a_problem: "Have a problem? Find an answer here"
+        login: Login
+        password: Password
+        remember_me: "Remember me"
+        sign_in: "Sign in"
+        username: Username
+      signed_in: "Sisäänkirjautuminen onnistui."
+      signed_out: "Uloskirjautuminen onnistui."
+    shared: 
+      links: 
+        forgot_your_password: "Forgot your password?"
+        sign_in: "Sign in"
+        sign_up: "Sign up"
+    unlocks: 
+      send_instructions: "Saat muutaman minuutin kuluttua sähköpostiisi ohjeet siitä miten avaat lukituksen."
+      unlocked: "Käyttäjätilisi lukitus on avattu. Olet nyt kirjautunut sisään."
+  errors: 
+    messages: 
       already_confirmed: "oli jo varmistettu"
+      not_found: "ei löytynyt"
       not_locked: "ei ollut lukittu"
-
-  devise:
-    failure:
-      unauthenticated: 'Kirjaudu tai rekisteröidy ennen kuin voit jatkaa.'
-      unconfirmed: 'Sinun täytyy vahvistaa käyttäjätilisi ennen kuin voit jatkaa'
-      locked: 'Käyttäjätilisi on lukittu.'
-      invalid: 'Väärä sähköpostiosoite tai salasana.'
-      invalid_token: 'Viallinen todennus.'
-      timeout: 'Istunto on vanhentunut, kirjaudu uudelleen.'
-      inactive: 'Käyttätiliäsi ei ole vielä vahvistettu.'
-    sessions:
-      signed_in: 'Sisäänkirjautuminen onnistui.'
-      signed_out: 'Uloskirjautuminen onnistui.'
-    passwords:
-      send_instructions: 'Saat hetken päästä sähköpostiisi ohjeet siitä miten määrität salasanasi uudelleen.'
-      updated: 'Salasanasi on vaihdettu. Olet nyt kirjautunut sisään.'
-    confirmations:
-      send_instructions: 'Saat hetken päästä sähköpostiisi ohjeet siitä miten vahvistat käyttäjätilisi luonnin.'
-      confirmed: 'Käyttäjätilisi luonti on vahvistettu. Olet nyt kirjautunut sisään.'
-    registrations:
-      signed_up: 'Käyttäjätilin luominen onnistui. Mahdollinen vahvistuspyyntö on lähetetty sähköpostiisi.'
-      updated: 'Käyttäjätilisi on päivitetty.'
-      destroyed: 'Näkemiin! Käyttäjätilisi on poistettu. Toivottavasti näemme sinut pian uudelleen.'
-    unlocks:
-      send_instructions: 'Saat muutaman minuutin kuluttua sähköpostiisi ohjeet siitä miten avaat lukituksen.'
-      unlocked: 'Käyttäjätilisi lukitus on avattu. Olet nyt kirjautunut sisään.'
-    mailer:
-      confirmation_instructions: 'Ohjeet vahvistamiseen/todentamiseen'
-      reset_password_instructions: 'Ohjeet salananan uudelleenmäärittämiseksi'
-      unlock_instructions: 'Ohjeet lukituksen poistamiseksi'
diff --git a/config/locales/devise/devise.fr-informal.yml b/config/locales/devise/devise.fr-informal.yml
deleted file mode 100644
index 1c97771c0..000000000
--- a/config/locales/devise/devise.fr-informal.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-fr-informal:
-  errors:
-    messages:
-      not_found: "introuvable"
-      already_confirmed: "a déjà été confirmé"
-      not_locked: "n’a pas été verrouillé"
-
-  devise:
-    failure:
-      unauthenticated: 'Tu dois te connecter ou t’inscrire avant de continuer.'
-      unconfirmed: 'Tu dois confirmer ton compte avant de continuer.'
-      locked: 'Ton compte est verrouillé.'
-      invalid: 'Adresse e-mail ou mot de passe invalide.'
-      invalid_token: 'Jeton d’authentification invalide.'
-      timeout: 'Ta session a expiré, merci de te connecter de nouveau afin de continuer.'
-      inactive: 'Ton compte n’a pas encore été activé.'
-    sessions:
-      signed_in: 'Connecté avec succès.'
-      signed_out: 'Déconnecté avec succès.'
-    passwords:
-      send_instructions: 'Tu vas recevoir dans quelques minutes un e-mail contenant les instructions pour réinitialiser ton mot de passe.'
-      updated: 'Ton mot de passe a été modifié avec succès. Tu es à présent connecté.'
-    confirmations:
-      send_instructions: 'Tu vas recevoir dans quelques minutes un e-mail contenant les instructions pour confirmer ton compte.'
-      confirmed: 'Ton compte a été confirmé avec succès. Tu es à présent connecté.'
-    registrations:
-      signed_up: 'Tu t’es inscrit avec succès. Si cette dernière est activée, une confirmation a été envoyée sur ton adresse e-mail.'
-      updated: 'Tu as mis à jour ton compte avec succès.'
-      destroyed: 'Au revoir ! Ton compte a été résilié avec succès. Nous espérons te revoir très bientôt.'
-    unlocks:
-      send_instructions: 'Tu vas recevoir dans quelques minutes un e-mail contenant les instructions pour déverrouiller ton compte.'
-      unlocked: 'Ton compte a été déverrouillé avec succès. Tu es à présent connecté.'
-    invitations:
-      send_instructions: 'Ton invitation a été envoyée.'
-      invitation_token_invalid: 'Le jeton d’invitation fourni n’est pas valide !'
-      updated: 'Ton mot de passe a été réglé avec succès. Tu es à présent connecté.'
-    mailer:
-      confirmation_instructions:
-        subject: 'Instructions de confirmation'
-      reset_password_instructions:
-        subject: 'Instructions de réinitialisation du mot de passe'
-      unlock_instructions:
-        subject: 'Instructions de déverrouillage'
-      invitation:
-        subject: 'Un ami souhaite que tu rejoignes Diaspora !'
-
diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index fc9ecf42c..b41617f4d 100644
--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -1,60 +1,82 @@
-fr:
-  errors:
-    messages:
-      not_found: "introuvable"
-      already_confirmed: "a déjà été confirmé"
-      not_locked: "n’a pas été verrouillé"
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
 
-  devise:
-    failure:
-      unauthenticated: 'Vous devez vous connecter ou vous inscrire avant de continuer.'
-      unconfirmed: 'Vous devez confirmer votre compte avant de continuer.'
-      locked: 'Votre compte est verrouillé.'
-      invalid: 'Adresse e-mail ou mot de passe invalide.'
-      invalid_token: 'Jeton d’authentification invalide.'
-      timeout: 'Votre session a expiré, veuillez vous connecter de nouveau afin de continuer.'
-      inactive: 'Votre compte n’a pas encore été activé.'
-    sessions:
-      new:
-        login: 'Se connecter'
-        username: "Nom d'utilisateur"
-        password: 'Mot de passe'
-        sign_in: 'Connexion'
-        have_a_problem: "Un problème ? Trouvez une réponse ici"
-      signed_in: 'Connecté avec succès.'
-      signed_out: 'Déconnecté avec succès.'
-    passwords:
-      send_instructions: 'Vous allez recevoir dans quelques minutes un e-mail contenant les instructions pour réinitialiser votre mot de passe.'
-      updated: 'Votre mot de passe a été modifié avec succès. Vous êtes à présent connecté.'
-      new:
+
+fr: 
+  devise: 
+    confirmations: 
+      confirmed: "Votre compte a été confirmé avec succès. Vous êtes à présent connecté."
+      send_instructions: "Vous allez recevoir dans quelques minutes un e-mail contenant les instructions pour confirmer votre compte."
+    failure: 
+      inactive: "Votre compte n’a pas encore été activé."
+      invalid: "Adresse e-mail ou mot de passe invalide."
+      invalid_token: "Jeton d’authentification invalide."
+      locked: "Votre compte est verrouillé."
+      timeout: "Votre session a expiré, veuillez vous connecter de nouveau afin de continuer."
+      unauthenticated: "Vous devez vous connecter ou vous inscrire avant de continuer."
+      unconfirmed: "Vous devez confirmer votre compte avant de continuer."
+    invitations: 
+      invitation_token_invalid: "Le jeton d’invitation fourni n’est pas valide !"
+      send_instructions: "Votre invitation a été envoyée."
+      updated: "Votre mot de passe a été réglé avec succès. Vous êtes à présent connecté."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Confirmer mon compte"
+        subject: "Instructions de confirmation"
+        you_can_confirm: "Vous pouvez confirmer votre compte à travers le lien ci-dessous :"
+      hello: "Bonjour %{email} !"
+      invitation: 
+        accept: "Accepter l'invitation"
+        ignore: "Si vous ne souhaitez pas accepter l'invitation, merci d'ignorer cet e-mail."
+        no_account_till: "Votre compte ne sera pas créé avant que vous ne vous inscriviez en accédant au lien ci-dessus"
+        subject: "Vous avez été invité à rejoindre Diaspora !"
+      inviters: 
+        accept_at: ", sur %{url}, vous pouvez accepter à travers le lien ci-dessous."
+        has_invited_you: "%{name} vous a invité à rejoindre Diaspora"
+        have_invited_you: "%{names} vous ont invité à rejoindre Diaspora"
+      reset_password_instructions: 
+        change: "Changer mon mot de passe"
+        ignore: "Si vous n'avez pas demandé cela, merci d'ignorer cet e-mail."
+        someone_requested: "Quelqu'un a demandé un lien pour changer votre mot de passe, vous pouvez effectuer cela à travers le lien ci-dessous."
+        subject: "Instructions de réinitialisation du mot de passe"
+        wont_change: "Votre mot de passe ne changera pas avant que vous n'en créiez un nouveau en accédant au lien ci-dessus. "
+      unlock_instructions: 
+        account_locked: "Votre compte a été bloqué à cause d'un nombre excessif de tentatives infructueuses de connexion"
+        click_to_unlock: "Cliquez sur le lien ci-dessous pour débloquer votre compte :"
+        subject: "Instructions de déverrouillage"
+        unlock: "Débloquer mon compte"
+      welcome: "Bienvenue %{email} !"
+    passwords: 
+      new: 
         forgot_password: "Mot de passe oublié ?"
         send_password_instructions: "Envoyez-moi les instructions de réinitialisation de mot de passe"
-    confirmations:
-      send_instructions: 'Vous allez recevoir dans quelques minutes un e-mail contenant les instructions pour confirmer votre compte.'
-      confirmed: 'Votre compte a été confirmé avec succès. Vous êtes à présent connecté.'
-    registrations:
-      signed_up: 'Vous vous êtes inscrit avec succès. Si cette dernière est activée, une confirmation a été envoyée sur votre adresse e-mail.'
-      updated: 'Vous avez mis à jour votre compte avec succès.'
-      destroyed: 'Au revoir ! Votre compte a été résilié avec succès. Nous espérons vous revoir très bientôt.'
-    unlocks:
-      send_instructions: 'Vous allez recevoir dans quelques minutes un e-mail contenant les instructions pour déverrouiller votre compte.'
-      unlocked: 'Votre compte a été déverrouillé avec succès. Vous êtes à présent connecté.'
-    invitations:
-      send_instructions: 'Votre invitation a été envoyée.'
-      invitation_token_invalid: 'Le jeton d’invitation fourni n’est pas valide !'
-      updated: 'Votre mot de passe a été réglé avec succès. Vous êtes à présent connecté.'
-    mailer:
-      confirmation_instructions:
-        subject: 'Instructions de confirmation'
-      reset_password_instructions:
-        subject: 'Instructions de réinitialisation du mot de passe'
-      unlock_instructions:
-        subject: 'Instructions de déverrouillage'
-      invitation:
-        subject: 'Un ami souhaite que vous rejoigniez Diaspora !'
-    shared:
-      links:
-        sign_in: 'Connexion'
-        sign_up: 'Inscription'
-        forgot_your_password: 'Mot de passe oublié ?'
-
+      send_instructions: "Vous allez recevoir dans quelques minutes un e-mail contenant les instructions pour réinitialiser votre mot de passe."
+      updated: "Votre mot de passe a été modifié avec succès. Vous êtes à présent connecté."
+    registrations: 
+      destroyed: "Au revoir ! Votre compte a été résilié avec succès. Nous espérons vous revoir très bientôt."
+      signed_up: "Vous vous êtes inscrit avec succès. Si cette dernière est activée, une confirmation a été envoyée sur votre adresse e-mail."
+      updated: "Vous avez mis à jour votre compte avec succès."
+    sessions: 
+      new: 
+        have_a_problem: "Un problème ? Trouvez une réponse ici"
+        login: "Se connecter"
+        password: "Mot de passe"
+        remember_me: "Se souvenir de moi"
+        sign_in: Connexion
+        username: "Nom d'utilisateur"
+      signed_in: "Connecté avec succès."
+      signed_out: "Déconnecté avec succès."
+    shared: 
+      links: 
+        forgot_your_password: "Mot de passe oublié ?"
+        sign_in: Connexion
+        sign_up: Inscription
+    unlocks: 
+      send_instructions: "Vous allez recevoir dans quelques minutes un e-mail contenant les instructions pour déverrouiller votre compte."
+      unlocked: "Votre compte a été déverrouillé avec succès. Vous êtes à présent connecté."
+  errors: 
+    messages: 
+      already_confirmed: "a déjà été confirmé"
+      not_found: introuvable
+      not_locked: "n’a pas été verrouillé"
diff --git a/config/locales/devise/devise.he.yml b/config/locales/devise/devise.he.yml
index 806ac3a32..465898cac 100644
--- a/config/locales/devise/devise.he.yml
+++ b/config/locales/devise/devise.he.yml
@@ -1,41 +1,82 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
-#   Translated to Hebrew by Yaron Shahrabani <sh.yaron@gmail.com>, 2010.
 
-he:
-  errors:
-    messages:
-      not_found: "לא נמצא"
-      already_confirmed: "כבר אושר"
-      not_locked: "לא ננעל"
 
-  devise:
-    failure:
-      unauthenticated: "עליך להיכנס או להירשם לפני המשך הפעילות."
-      unconfirmed: "עליך לאמת את חשבונך לפי המשך הפעילות."
-      locked: "חשבונך נעול."
+he: 
+  devise: 
+    confirmations: 
+      confirmed: "חשבונך אומת בהצלחה. נכנסת כעת."
+      send_instructions: "בעוד מספר דקות תתקבל לתיבת הדוא״ל שלך הודעה עם הנחיות כיצד לאמת את חשבונך."
+    failure: 
+      inactive: "חשבונך לא הופעל עדיין."
       invalid: "הססמה או הדוא״ל שגויים."
       invalid_token: "אסימון האימות שגוי."
+      locked: "חשבונך נעול."
       timeout: "ההפעלה שלך פגה, נא להיכנס שוב כדי להמשיך."
-      inactive: "חשבונך לא הופעל עדיין."
-    sessions:
-      signed_in: "נכנסת בהצלחה."
-      signed_out: "יצאת בהצלחה."
-    passwords:
+      unauthenticated: "עליך להיכנס או להירשם לפני המשך הפעילות."
+      unconfirmed: "עליך לאמת את חשבונך לפי המשך הפעילות."
+    invitations: 
+      invitation_token_invalid: "The invitation token provided is not valid!"
+      send_instructions: "Your invitation has been sent."
+      updated: "Your password was set successfully. You are now signed in."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Confirm my account"
+        subject: "Confirmation instructions"
+        you_can_confirm: "You can confirm your account through the link below:"
+      hello: "Hello %{email}!"
+      invitation: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "A friend wants you to join Diaspora!"
+      inviters: 
+        accept_at: ", at %{url}, you can accept it through the link below."
+        has_invited_you: "%{name} has invited you to join Diaspora"
+        have_invited_you: "%{names} have invited you to join Diaspora"
+      reset_password_instructions: 
+        change: "Change my password"
+        ignore: "If you didn't request this, please ignore this email."
+        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
+        subject: "Reset password instructions"
+        wont_change: "Your password won't change until you access the link above and create a new one."
+      unlock_instructions: 
+        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        click_to_unlock: "Click the link below to unlock your account:"
+        subject: "Unlock Instructions"
+        unlock: "Unlock my account"
+      welcome: "Welcome %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Forgot your password?"
+        send_password_instructions: "Send me reset password instructions"
       send_instructions: "בעוד מספר דקות תתקבל לתיבת הדוא״ל שלך הודעה עם הנחיות כיצד לאפס את ססמתך."
       updated: "ססמתך הוחלפה בהצלחה. נכנסת כעת."
-    confirmations:
-      send_instructions: "בעוד מספר דקות תתקבל לתיבת הדוא״ל שלך הודעה עם הנחיות כיצד לאמת את חשבונך."
-      confirmed: "חשבונך אומת בהצלחה. נכנסת כעת."
-    registrations:
+    registrations: 
+      destroyed: "להתראות! חשבונך בוטל בהצלחה. מקווים לראותך שוב בקרוב."
       signed_up: "נרשמת בהצלחה. הודעת אימות תישלח אליך לדוא״ל במידה שהוגדרה."
       updated: "חשבונך עודכן בהצלחה."
-      destroyed: "להתראות! חשבונך בוטל בהצלחה. מקווים לראותך שוב בקרוב."
-    unlocks:
+    sessions: 
+      new: 
+        have_a_problem: "Have a problem? Find an answer here"
+        login: Login
+        password: Password
+        remember_me: "Remember me"
+        sign_in: "Sign in"
+        username: Username
+      signed_in: "נכנסת בהצלחה."
+      signed_out: "יצאת בהצלחה."
+    shared: 
+      links: 
+        forgot_your_password: "Forgot your password?"
+        sign_in: "Sign in"
+        sign_up: "Sign up"
+    unlocks: 
       send_instructions: "בעוד מספר דקות תתקבל לתיבת הודא״ל שלך הודעה עם הנחיות כיצד לשחרר את חשבונך."
       unlocked: "חשבונך שוחרר בהצלחה. נכנסת כעת."
-    mailer:
-      confirmation_instructions: "הנחיות לאימות"
-      reset_password_instructions: "הנחיות לאיפוס הססמה"
-      unlock_instructions: "הנחיות לשחרור"
+  errors: 
+    messages: 
+      already_confirmed: "כבר אושר"
+      not_found: "לא נמצא"
+      not_locked: "לא ננעל"
diff --git a/config/locales/devise/devise.id.yml b/config/locales/devise/devise.id.yml
index 744fd7eaf..3f23e1326 100644
--- a/config/locales/devise/devise.id.yml
+++ b/config/locales/devise/devise.id.yml
@@ -1,43 +1,82 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
-#
-#   Indonesian Localization.
-#
 
-id:
-  errors:
-    messages:
-      not_found: "tidak ditemukan"
-      already_confirmed: "sudah dikonfirmasi"
-      not_locked: "tidak terkunci"
 
-  devise:
-    failure:
-      unauthenticated: "Anda harus masuk atau mendaftar sebelum melanjutkan."
-      unconfirmed: "Anda harus mengkonfirmasi akun Anda sebelum melanjutkan."
-      locked: "Akun anda terkunci."
+id: 
+  devise: 
+    confirmations: 
+      confirmed: "Akun Anda telah berhasil dikonfirmasi. Anda sekarang masuk."
+      send_instructions: "Anda akan menerima email berisi instruksi bagaimana mengkonfirmasi akun Anda dalam beberapa menit."
+    failure: 
+      inactive: "Akun anda belum diaktifkan."
       invalid: "Email atau password tidak valid."
       invalid_token: "Token otentikasi tidak valid."
+      locked: "Akun anda terkunci."
       timeout: "Sesi anda telah berakhir, silahkan masuk lagi untuk melanjutkan."
-      inactive: "Akun anda belum diaktifkan."
-    sessions:
-      signed_in: "Berhasil masuk."
-      signed_out: "Berhasil keluar."
-    passwords:
+      unauthenticated: "Anda harus masuk atau mendaftar sebelum melanjutkan."
+      unconfirmed: "Anda harus mengkonfirmasi akun Anda sebelum melanjutkan."
+    invitations: 
+      invitation_token_invalid: "The invitation token provided is not valid!"
+      send_instructions: "Your invitation has been sent."
+      updated: "Your password was set successfully. You are now signed in."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Confirm my account"
+        subject: "Confirmation instructions"
+        you_can_confirm: "You can confirm your account through the link below:"
+      hello: "Hello %{email}!"
+      invitation: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "A friend wants you to join Diaspora!"
+      inviters: 
+        accept_at: ", at %{url}, you can accept it through the link below."
+        has_invited_you: "%{name} has invited you to join Diaspora"
+        have_invited_you: "%{names} have invited you to join Diaspora"
+      reset_password_instructions: 
+        change: "Change my password"
+        ignore: "If you didn't request this, please ignore this email."
+        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
+        subject: "Reset password instructions"
+        wont_change: "Your password won't change until you access the link above and create a new one."
+      unlock_instructions: 
+        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        click_to_unlock: "Click the link below to unlock your account:"
+        subject: "Unlock Instructions"
+        unlock: "Unlock my account"
+      welcome: "Welcome %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Forgot your password?"
+        send_password_instructions: "Send me reset password instructions"
       send_instructions: "Anda akan menerima email berisi petunjuk cara me-reset password Anda dalam beberapa menit."
       updated: "Password Anda telah berhasil diubah. Anda sekarang masuk."
-    confirmations:
-      send_instructions: "Anda akan menerima email berisi instruksi bagaimana mengkonfirmasi akun Anda dalam beberapa menit."
-      confirmed: "Akun Anda telah berhasil dikonfirmasi. Anda sekarang masuk."
-    registrations:
+    registrations: 
+      destroyed: "Bye! Akun Anda telah berhasil dibatalkan. Kami berharap dapat melihat Anda lagi."
       signed_up: "Anda telah berhasil mendaftar. Jika diaktifkan, konfirmasi dikirim ke e-mail Anda."
       updated: "Anda berhasil memperbarui akun anda."
-      destroyed: "Bye! Akun Anda telah berhasil dibatalkan. Kami berharap dapat melihat Anda lagi."
-    unlocks:
+    sessions: 
+      new: 
+        have_a_problem: "Have a problem? Find an answer here"
+        login: Login
+        password: Password
+        remember_me: "Remember me"
+        sign_in: "Sign in"
+        username: Username
+      signed_in: "Berhasil masuk."
+      signed_out: "Berhasil keluar."
+    shared: 
+      links: 
+        forgot_your_password: "Forgot your password?"
+        sign_in: "Sign in"
+        sign_up: "Sign up"
+    unlocks: 
       send_instructions: "Anda akan menerima email berisi instruksi bagaimana membuka akun Anda dalam beberapa menit."
       unlocked: "Akun Anda telah berhasil dibuka. Anda sekarang masuk."
-    mailer:
-      confirmation_instructions: "Instruksi konfirmasi"
-      reset_password_instructions: "Instruksi me-reset password"
-      unlock_instructions: "Instruksi membuka"
+  errors: 
+    messages: 
+      already_confirmed: "sudah dikonfirmasi"
+      not_found: "tidak ditemukan"
+      not_locked: "tidak terkunci"
diff --git a/config/locales/devise/devise.it.yml b/config/locales/devise/devise.it.yml
index bd40e97a7..607f931f4 100644
--- a/config/locales/devise/devise.it.yml
+++ b/config/locales/devise/devise.it.yml
@@ -2,39 +2,81 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-it:
-  errors:
-    messages:
-      not_found: "non trovato"
-      already_confirmed: "è già stato confermato"
-      not_locked: "non era bloccato"
 
-  devise:
-    failure:
-      unauthenticated: "Devi effettuare l'accesso o registrarti prima di continuare."
-      unconfirmed: "Devi confermare il tuo account prima di continuare."
-      locked: "Il tuo account è bloccato."
+it: 
+  devise: 
+    confirmations: 
+      confirmed: "Il tuo account è stato confermato con successo. Hai appena effettuato l'accesso."
+      send_instructions: "Tra pochi minuti riceverai una email per confermare il tuo account."
+    failure: 
+      inactive: "Il tuo account non è ancora stato attivato."
       invalid: "Email o password errati."
       invalid_token: "Token di autenticazione errato."
+      locked: "Il tuo account è bloccato."
       timeout: "La tua sessione è scaduta, effettua di nuovo l'accesso per continuare."
-      inactive: "Il tuo account non è ancora stato attivato."
-    sessions:
-      signed_in: "Accesso effettuato con successo."
-      signed_out: "Disconnessione effettuata con successo."
-    passwords:
+      unauthenticated: "Devi effettuare l'accesso o registrarti prima di continuare."
+      unconfirmed: "Devi confermare il tuo account prima di continuare."
+    invitations: 
+      invitation_token_invalid: "Il codice d'invito che hai fornito non è valido!"
+      send_instructions: "Il tuo invito è stato inoltrato."
+      updated: "La tua password è stata impostata correttamente. Hai effettuato l'accesso."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Confirm my account"
+        subject: "Istruzioni di conferma"
+        you_can_confirm: "You can confirm your account through the link below:"
+      hello: "Hello %{email}!"
+      invitation: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "Un amico vuole che ti registri su Diaspora!"
+      inviters: 
+        accept_at: ", at %{url}, you can accept it through the link below."
+        has_invited_you: "%{name} has invited you to join Diaspora"
+        have_invited_you: "%{names} have invited you to join Diaspora"
+      reset_password_instructions: 
+        change: "Change my password"
+        ignore: "If you didn't request this, please ignore this email."
+        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
+        subject: "Istruzioni per reimpostare la password"
+        wont_change: "Your password won't change until you access the link above and create a new one."
+      unlock_instructions: 
+        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        click_to_unlock: "Click the link below to unlock your account:"
+        subject: "Istruzioni di sblocco"
+        unlock: "Unlock my account"
+      welcome: "Welcome %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Hai dimenticato la password?"
+        send_password_instructions: "Inviami le istruzioni per reimpostare la password."
       send_instructions: "Tra pochi minuti riceverai una email con le istruzioni su come cambiare la tua password."
       updated: "La tua password è stata modificata. Hai appena effettuato l'accesso."
-    confirmations:
-      send_instructions: "Tra pochi minuti riceverai una email per confermare il tuo account."
-      confirmed: "Il tuo account è stato confermato con successo. Hai appena effettuato l'accesso."
-    registrations:
+    registrations: 
+      destroyed: "Ciao! Il tuo account è stato rimosso. Speriamo che tu torni a trovarci presto."
       signed_up: "Ti sei iscritto. Se il servizio è disponibile, riceverai una conferma via email."
       updated: "Hai aggiornato il tuo account."
-      destroyed: "Ciao! Il tuo account è stato rimosso. Speriamo che tu torni a trovarci presto."
-    unlocks:
+    sessions: 
+      new: 
+        have_a_problem: "Hai qualche dubbio? Trova qui la risposta"
+        login: "Effettua l'accesso"
+        password: Password
+        remember_me: "Remember me"
+        sign_in: Registrati
+        username: "Nome utente"
+      signed_in: "Accesso effettuato con successo."
+      signed_out: "Disconnessione effettuata con successo."
+    shared: 
+      links: 
+        forgot_your_password: "Hai dimenticato la password?"
+        sign_in: Accedi
+        sign_up: Registrati
+    unlocks: 
       send_instructions: "Tra pochi minuti riceverai una mail con le istruzioni su come sbloccare il tuo account."
       unlocked: "Il tuo account è stato sbloccato. Hai appena effettuato l'accesso."
-    mailer:
-      confirmation_instructions: "Istruzioni sulla conferma"
-      reset_password_instructions: "Istruzioni su come cambiare la password"
-      unlock_instructions: "Istruzioni su come sbloccare l'account"
+  errors: 
+    messages: 
+      already_confirmed: "è già stato confermato"
+      not_found: "non trovato"
+      not_locked: "non era bloccato"
diff --git a/config/locales/devise/devise.lt.yml b/config/locales/devise/devise.lt.yml
index 9544bfd37..5d869dbc8 100644
--- a/config/locales/devise/devise.lt.yml
+++ b/config/locales/devise/devise.lt.yml
@@ -2,39 +2,81 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-lt:
-  errors:
-    messages:
-      not_found: "nerasta"
+
+lt: 
+  devise: 
+    confirmations: 
+      confirmed: "Paskyra patvirtinta. Prisijungėte."
+      send_instructions: "Netrukus gausite el. laišką su nurodymais paskyros patvirtinimui."
+    failure: 
+      inactive: "Paskyra dar neaktyvuota."
+      invalid: "Neteisingas el. pašto adresas arba slaptažodis."
+      invalid_token: "Neteisingas prisijungimo raktas."
+      locked: "Jūsų paskyra yra užrakinta."
+      timeout: "Sesija baigėsi. Norint tęsti, reikia prisijungti iš naujo."
+      unauthenticated: "Norint tęsti, reikia prisijungti arba susikurti paskyrą."
+      unconfirmed: "Norint prisijungti, reikia patvirtinti savo paskyrą."
+    invitations: 
+      invitation_token_invalid: "The invitation token provided is not valid!"
+      send_instructions: "Your invitation has been sent."
+      updated: "Your password was set successfully. You are now signed in."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Confirm my account"
+        subject: "Confirmation instructions"
+        you_can_confirm: "You can confirm your account through the link below:"
+      hello: "Hello %{email}!"
+      invitation: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "A friend wants you to join Diaspora!"
+      inviters: 
+        accept_at: ", at %{url}, you can accept it through the link below."
+        has_invited_you: "%{name} has invited you to join Diaspora"
+        have_invited_you: "%{names} have invited you to join Diaspora"
+      reset_password_instructions: 
+        change: "Change my password"
+        ignore: "If you didn't request this, please ignore this email."
+        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
+        subject: "Reset password instructions"
+        wont_change: "Your password won't change until you access the link above and create a new one."
+      unlock_instructions: 
+        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        click_to_unlock: "Click the link below to unlock your account:"
+        subject: "Unlock Instructions"
+        unlock: "Unlock my account"
+      welcome: "Welcome %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Forgot your password?"
+        send_password_instructions: "Send me reset password instructions"
+      send_instructions: "Netrukus gausite el. laišką su nurodymais slaptažodžiui atstatyti."
+      updated: "Slaptažodis pakeistas sėkmingai. Jūs esate prisijungęs."
+    registrations: 
+      destroyed: "Paskyra sėkmingai atšaukta. Iki pasimatymo!"
+      signed_up: "Prisijungta sėkmingai. Jei nustatyta, patvirtinimas išsiųstas į jūsų el. paštą."
+      updated: "Paskyra atnaujinta sėkmingai."
+    sessions: 
+      new: 
+        have_a_problem: "Have a problem? Find an answer here"
+        login: Login
+        password: Password
+        remember_me: "Remember me"
+        sign_in: "Sign in"
+        username: Username
+      signed_in: "Sėkmingai prisijungta."
+      signed_out: "Sėkmingai atsijungta."
+    shared: 
+      links: 
+        forgot_your_password: "Forgot your password?"
+        sign_in: "Sign in"
+        sign_up: "Sign up"
+    unlocks: 
+      send_instructions: "Netrukus gausite el. laišką su nurodymais paskyros atrakinimui."
+      unlocked: "Paskyra atrakinta. Prisijungėte."
+  errors: 
+    messages: 
       already_confirmed: "jau patvirtinta"
+      not_found: nerasta
       not_locked: "nebuvo užrakinta"
-
-  devise:
-    failure:
-      unauthenticated: 'Norint tęsti, reikia prisijungti arba susikurti paskyrą.'
-      unconfirmed: 'Norint prisijungti, reikia patvirtinti savo paskyrą.'
-      locked: 'Jūsų paskyra yra užrakinta.'
-      invalid: 'Neteisingas el. pašto adresas arba slaptažodis.'
-      invalid_token: 'Neteisingas prisijungimo raktas.'
-      timeout: 'Sesija baigėsi. Norint tęsti, reikia prisijungti iš naujo.'
-      inactive: 'Paskyra dar neaktyvuota.'
-    sessions:
-      signed_in: 'Sėkmingai prisijungta.'
-      signed_out: 'Sėkmingai atsijungta.'
-    passwords:
-      send_instructions: 'Netrukus gausite el. laišką su nurodymais slaptažodžiui atstatyti.'
-      updated: 'Slaptažodis pakeistas sėkmingai. Jūs esate prisijungęs.'
-    confirmations:
-      send_instructions: 'Netrukus gausite el. laišką su nurodymais paskyros patvirtinimui.'
-      confirmed: 'Paskyra patvirtinta. Prisijungėte.'
-    registrations:
-      signed_up: 'Prisijungta sėkmingai. Jei nustatyta, patvirtinimas išsiųstas į jūsų el. paštą.'
-      updated: 'Paskyra atnaujinta sėkmingai.'
-      destroyed: 'Paskyra sėkmingai atšaukta. Iki pasimatymo!'
-    unlocks:
-      send_instructions: 'Netrukus gausite el. laišką su nurodymais paskyros atrakinimui.'
-      unlocked: 'Paskyra atrakinta. Prisijungėte.'
-    mailer:
-      confirmation_instructions: 'Nurodymai patvirtinimui'
-      reset_password_instructions: 'Nurodymai slaptažodžio atstatymui'
-      unlock_instructions: 'Nurodymai paskyros atrakinimui'
diff --git a/config/locales/devise/devise.nb.yml b/config/locales/devise/devise.nb.yml
index fdcff9a94..c7d68d708 100644
--- a/config/locales/devise/devise.nb.yml
+++ b/config/locales/devise/devise.nb.yml
@@ -2,39 +2,81 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-nb:
-  errors:
-    messages:
-      not_found: "ble ikke funnet"
-      already_confirmed: "er allerede bekrefta"
-      not_locked: "er ikke låst"
 
-  devise:
-    failure:
-      unauthenticated: "Du må logge inn eller lage en bruker før du kan fortsette."
-      unconfirmed: "Du må bekrefte brukeren din før du kan fortsette."
-      locked: "Brukeren din er låst."
+nb: 
+  devise: 
+    confirmations: 
+      confirmed: "Brukeren din er nå bekrefta, og du er logga inn."
+      send_instructions: "Du vil få en e-post med instrukser om hvordan du bekrefter brukeren din om kort tid."
+    failure: 
+      inactive: "Brukeren din er ikke aktivert ennå."
       invalid: "Ugyldig e-postadresse eller passord."
       invalid_token: "Ugyldig authentication token."
+      locked: "Brukeren din er låst."
       timeout: "Økta har løpt ut, logg inn igjen for å fortsette."
-      inactive: "Brukeren din er ikke aktivert ennå."
-    sessions:
-      signed_in: "Innlogginga var vellykka."
-      signed_out: "Utlogginga var vellykka."
-    passwords:
+      unauthenticated: "Du må logge inn eller lage en bruker før du kan fortsette."
+      unconfirmed: "Du må bekrefte brukeren din før du kan fortsette."
+    invitations: 
+      invitation_token_invalid: "The invitation token provided is not valid!"
+      send_instructions: "Your invitation has been sent."
+      updated: "Your password was set successfully. You are now signed in."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Confirm my account"
+        subject: "Confirmation instructions"
+        you_can_confirm: "You can confirm your account through the link below:"
+      hello: "Hello %{email}!"
+      invitation: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "A friend wants you to join Diaspora!"
+      inviters: 
+        accept_at: ", at %{url}, you can accept it through the link below."
+        has_invited_you: "%{name} has invited you to join Diaspora"
+        have_invited_you: "%{names} have invited you to join Diaspora"
+      reset_password_instructions: 
+        change: "Change my password"
+        ignore: "If you didn't request this, please ignore this email."
+        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
+        subject: "Reset password instructions"
+        wont_change: "Your password won't change until you access the link above and create a new one."
+      unlock_instructions: 
+        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        click_to_unlock: "Click the link below to unlock your account:"
+        subject: "Unlock Instructions"
+        unlock: "Unlock my account"
+      welcome: "Welcome %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Forgot your password?"
+        send_password_instructions: "Send me reset password instructions"
       send_instructions: "Du vil få en e-post med instrukser om hvordan du tilbakestiller passordet ditt om kort tid."
       updated: "Passordet ditt er nå endra, og du har logga inn."
-    confirmations:
-      send_instructions: "Du vil få en e-post med instrukser om hvordan du bekrefter brukeren din om kort tid."
-      confirmed: "Brukeren din er nå bekrefta, og du er logga inn."
-    registrations:
+    registrations: 
+      destroyed: "Ha det! Brukeren din er nå sagt opp. Vi håper å se deg igjen snart."
       signed_up: "Du har nå laga en bruker. Hvis du valgte å få en e-post med bekreftelse på dette, er den nå sendt."
       updated: "Du har oppdatert brukeren din."
-      destroyed: "Ha det! Brukeren din er nå sagt opp. Vi håper å se deg igjen snart."
-    unlocks:
+    sessions: 
+      new: 
+        have_a_problem: "Have a problem? Find an answer here"
+        login: Login
+        password: Password
+        remember_me: "Remember me"
+        sign_in: "Sign in"
+        username: Username
+      signed_in: "Innlogginga var vellykka."
+      signed_out: "Utlogginga var vellykka."
+    shared: 
+      links: 
+        forgot_your_password: "Forgot your password?"
+        sign_in: "Sign in"
+        sign_up: "Sign up"
+    unlocks: 
       send_instructions: "Du vil få en e-post med instrukser om hvordan du låser opp brukeren din om kort tid."
       unlocked: "Brukeren din er nå låst opp, og du er logga in."
-    mailer:
-      confirmation_instructions: "Instrukser for bekreftelse"
-      reset_password_instructions: "Instrukser for tilbakestilling av passord"
-      unlock_instructions: "Instrukser for å låse opp"
+  errors: 
+    messages: 
+      already_confirmed: "er allerede bekrefta"
+      not_found: "ble ikke funnet"
+      not_locked: "er ikke låst"
diff --git a/config/locales/devise/devise.nl.yml b/config/locales/devise/devise.nl.yml
index 70a3c98da..2ba5cbd2b 100644
--- a/config/locales/devise/devise.nl.yml
+++ b/config/locales/devise/devise.nl.yml
@@ -2,39 +2,81 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-nl:
-  errors:
-    messages:
-      not_found: "niet gevonden"
-      already_confirmed: "is al geactiveerd"
-      not_locked: "is niet geblokeerd"
 
-  devise:
-    failure:
-      unauthenticated: "Log in of registeer om verder te gaan."
-      unconfirmed: "Activeer je account om verder te gaan."
-      locked: "Je account is geblokkeerd."
+nl: 
+  devise: 
+    confirmations: 
+      confirmed: "Je account is geactiveerd. Je bent nu ingelogd."
+      send_instructions: "Je ontvangt een email met instructies om je account te activeren."
+    failure: 
+      inactive: "Je account is nog niet geactiveerd."
       invalid: "Ongelding emailadres of wachtwoord."
       invalid_token: "Ongeldige authenticatie token."
+      locked: "Je account is geblokkeerd."
       timeout: "Je sessie is verlopen, log opnieuw in om verder te gaan."
-      inactive: "Je account is nog niet geactiveerd."
-    sessions:
-      signed_in: "Je bent succesvol ingelogd."
-      signed_out: "Je bent succesvol uitgelogd."
-    passwords:
+      unauthenticated: "Log in of registeer om verder te gaan."
+      unconfirmed: "Activeer je account om verder te gaan."
+    invitations: 
+      invitation_token_invalid: "The invitation token provided is not valid!"
+      send_instructions: "Your invitation has been sent."
+      updated: "Your password was set successfully. You are now signed in."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Confirm my account"
+        subject: "Confirmation instructions"
+        you_can_confirm: "You can confirm your account through the link below:"
+      hello: "Hello %{email}!"
+      invitation: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "A friend wants you to join Diaspora!"
+      inviters: 
+        accept_at: ", at %{url}, you can accept it through the link below."
+        has_invited_you: "%{name} has invited you to join Diaspora"
+        have_invited_you: "%{names} have invited you to join Diaspora"
+      reset_password_instructions: 
+        change: "Change my password"
+        ignore: "If you didn't request this, please ignore this email."
+        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
+        subject: "Reset password instructions"
+        wont_change: "Your password won't change until you access the link above and create a new one."
+      unlock_instructions: 
+        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        click_to_unlock: "Click the link below to unlock your account:"
+        subject: "Unlock Instructions"
+        unlock: "Unlock my account"
+      welcome: "Welcome %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Forgot your password?"
+        send_password_instructions: "Send me reset password instructions"
       send_instructions: "Je ontvangt een email met instructies om je wachtwoord te resetten."
       updated: "Je wachtwoord is veranderd. Je bent nu ingelogd."
-    confirmations:
-      send_instructions: "Je ontvangt een email met instructies om je account te activeren."
-      confirmed: "Je account is geactiveerd. Je bent nu ingelogd."
-    registrations:
+    registrations: 
+      destroyed: "Tot ziens! Je account is succesvol verwijderd. We hopen je snel terug te zien."
       signed_up: "Je bent succesvol registreerd. Wanneer activeerd, ontvang je een bevestigingsmail."
       updated: "Je account is succelvol geupdated."
-      destroyed: "Tot ziens! Je account is succesvol verwijderd. We hopen je snel terug te zien."
-    unlocks:
+    sessions: 
+      new: 
+        have_a_problem: "Have a problem? Find an answer here"
+        login: Login
+        password: Password
+        remember_me: "Remember me"
+        sign_in: "Sign in"
+        username: Username
+      signed_in: "Je bent succesvol ingelogd."
+      signed_out: "Je bent succesvol uitgelogd."
+    shared: 
+      links: 
+        forgot_your_password: "Forgot your password?"
+        sign_in: "Sign in"
+        sign_up: "Sign up"
+    unlocks: 
       send_instructions: "Je ontvangt een email met instructies om je account te deblokkeren."
       unlocked: "Je account is succelvol gedeblokkeerd. Je bent nu ingelogd."
-    mailer:
-      confirmation_instructions: "Instructies om je account te activeren"
-      reset_password_instructions: "Instructies om je wachtwoord te resetten"
-      unlock_instructions: "Instructies om je account te deblokkeren"
\ No newline at end of file
+  errors: 
+    messages: 
+      already_confirmed: "is al geactiveerd"
+      not_found: "niet gevonden"
+      not_locked: "is niet geblokeerd"
diff --git a/config/locales/devise/devise.pl.yml b/config/locales/devise/devise.pl.yml
index b2f6d5846..093c8c50c 100644
--- a/config/locales/devise/devise.pl.yml
+++ b/config/locales/devise/devise.pl.yml
@@ -1,72 +1,82 @@
-# Znaki przystankowe mogą być do kitu.
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
 
-pl:
-  errors:
-    messages:
-      not_found: "nie znaleziono"
-      already_confirmed: "potwierdzono wcześniej"
-      not_locked: "nie był zablokowany"
 
-  devise:
-    failure:
-      unauthenticated: 'By kontynuować musisz się zalogować lub zarejestrować.'
-      unconfirmed: 'Musisz aktywować swoje konto.'
-      locked: 'Twoje konto jest zablokowane.'
-      invalid: 'Nieprawidłowy adres email lub hasło.'
-      invalid_token: 'Nieprawidłowy kod identyfikacyjny.'
-      timeout: 'Twoja sesja wygasła, zaloguj się ponownie by kontynuować.'
-      inactive: 'Twoje konto nie zostało jeszcze aktywowane.'
-    sessions:
-      new:
-        login: 'Login'
-        username: 'Nazwa użytkownika'
-        password: 'Hasło'
-        sign_in: 'Zaloguj się'
-        have_a_problem: "Jakiś kłopot? Znajdź odpowiedź tu"
-        remember_me: "Zapamiętaj sesję"
-      signed_in: 'Zalogowano pomyślnie.'
-      signed_out: 'Wylogowano.'
-    passwords:
-      send_instructions: 'W ciągu kilku minut otrzymasz maila zawierającego instrukcjie dotyczące zresetowania hasła.'
-      updated: 'Twoje hasło zostało zmienione, zostałeś zalogowany.'
-    confirmations:
-      send_instructions: 'W ciągu kilku minut otrzymasz maila zawierającego instrukcje dotyczące aktywacji konta.'
-      confirmed: 'Twoje konto zostało aktywowane, zostałeś zalogowany.'
-    registrations:
-      signed_up: 'Zostałeś zarejestrowany. Jeśli aktywowano odpowiednią opcję, wyślemy do Ciebie email potwierdzający rejestrację.'
-      updated: 'Pomyślnie zaktualizowano informacje o Twoim koncie.'
-      destroyed: 'Żegnaj! Twoje konto zostało usunięte.'
-    unlocks:
-      send_instructions: 'W ciągu kilku minut otrzymasz email z instrukcjami odblokowania konta.'
-      unlocked: 'Twoje konto zostało odblokowane, jesteś zalogowany.'
-    mailer:    
-      welcome: "Witaj %{email}!"
-      hello: "Cześć %{email}!"
-      confirmation_instructions:
-        subject: 'Instrukcje aktywacji'
-        you_can_confirm: "Możesz aktywować swoje konto klikając na poniższy link:"
+pl: 
+  devise: 
+    confirmations: 
+      confirmed: "Twoje konto zostało aktywowane, zostałeś zalogowany."
+      send_instructions: "W ciągu kilku minut otrzymasz maila zawierającego instrukcje dotyczące aktywacji konta."
+    failure: 
+      inactive: "Twoje konto nie zostało jeszcze aktywowane."
+      invalid: "Nieprawidłowy adres email lub hasło."
+      invalid_token: "Nieprawidłowy kod identyfikacyjny."
+      locked: "Twoje konto jest zablokowane."
+      timeout: "Twoja sesja wygasła, zaloguj się ponownie by kontynuować."
+      unauthenticated: "By kontynuować musisz się zalogować lub zarejestrować."
+      unconfirmed: "Musisz aktywować swoje konto."
+    invitations: 
+      invitation_token_invalid: "The invitation token provided is not valid!"
+      send_instructions: "Your invitation has been sent."
+      updated: "Your password was set successfully. You are now signed in."
+    mailer: 
+      confirmation_instructions: 
         confirm: "Aktywuj moje konto"
-      reset_password_instructions:
-        subject: 'Instrukcje zmiany hasła'
-        someone_requested: "Odebraliśmy zgłoszenie zmiany hasła, jeśli chcesz to zrobić kliknij na poniższy link:"
+        subject: "Instrukcje aktywacji"
+        you_can_confirm: "Możesz aktywować swoje konto klikając na poniższy link:"
+      hello: "Cześć %{email}!"
+      invitation: 
+        accept: "Zaakceptuj zaproszenie"
+        ignore: "Jeśli nie chcesz zaakceptować zaproszenia, zignoruj ten email."
+        no_account_till: "Twoje konto nie zostanie założone dopuki nie klikniesz na link powyżej i nie zarejestrujesz sie. shared: links: sign_in: 'Zaloguj się' sign_up: 'Zarejestruj się' forgot_your_password: 'Nie pamiętasz hasła?' "
+        subject: "Masz zaproszenie do Diaspory!"
+      inviters: 
+        accept_at: ", at %{url}, you can accept it through the link below."
+        has_invited_you: "%{name} has invited you to join Diaspora"
+        have_invited_you: "%{names} have invited you to join Diaspora"
+      reset_password_instructions: 
         change: "Zmień moje hasło"
-        wont_change: "Twoje hasło zostanie zmienione dopiero gdy klikniesz na link i podasz nowe hasło."
         ignore: "Jeśli nie chcesz zresetować hasła, zignoruj ten email."
-      unlock_instructions:
-        subject: 'Instrukcje odblokowania'
+        someone_requested: "Odebraliśmy zgłoszenie zmiany hasła, jeśli chcesz to zrobić kliknij na poniższy link:"
+        subject: "Instrukcje zmiany hasła"
+        wont_change: "Twoje hasło zostanie zmienione dopiero gdy klikniesz na link i podasz nowe hasło."
+      unlock_instructions: 
         account_locked: "Twoje konto zostało zablokowane, ponieważ przekroczono limit nieudanych logowań."
         click_to_unlock: "Kliknij na poniższy link, aby odblokować konto:"
+        subject: "Instrukcje odblokowania"
         unlock: "Odblokuj moje konto"
-      invitation:
-        subject: "Masz zaproszenie do Diaspory!"
-        has_invited_you: "%{name} zaprosił(a) Cię do Diaspory!"
-        have_invited_you: "%{names} zaprosili Cie do Diaspory"
-        accept_at: ", at %{url}, możesz zaakceptować zaproszenie klikając na poniższy link:"
-        accept: "Zaakceptuj zaproszenie"
-        ignore: "Jeśli nie chcesz zaakceptować zaproszenia, zignoruj ten email."
-        no_account_till: "Twoje konto nie zostanie założone dopuki nie klikniesz na link powyżej i nie zarejestrujesz sie.
-    shared:
-      links:
-        sign_in: 'Zaloguj się'
-        sign_up: 'Zarejestruj się'
-        forgot_your_password: 'Nie pamiętasz hasła?'
+      welcome: "Witaj %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Forgot your password?"
+        send_password_instructions: "Send me reset password instructions"
+      send_instructions: "W ciągu kilku minut otrzymasz maila zawierającego instrukcjie dotyczące zresetowania hasła."
+      updated: "Twoje hasło zostało zmienione, zostałeś zalogowany."
+    registrations: 
+      destroyed: "Żegnaj! Twoje konto zostało usunięte."
+      signed_up: "Zostałeś zarejestrowany. Jeśli aktywowano odpowiednią opcję, wyślemy do Ciebie email potwierdzający rejestrację."
+      updated: "Pomyślnie zaktualizowano informacje o Twoim koncie."
+    sessions: 
+      new: 
+        have_a_problem: "Jakiś kłopot? Znajdź odpowiedź tu"
+        login: Login
+        password: Hasło
+        remember_me: "Zapamiętaj sesję"
+        sign_in: "Zaloguj się"
+        username: "Nazwa użytkownika"
+      signed_in: "Zalogowano pomyślnie."
+      signed_out: Wylogowano.
+    shared: 
+      links: 
+        forgot_your_password: "Forgot your password?"
+        sign_in: "Sign in"
+        sign_up: "Sign up"
+    unlocks: 
+      send_instructions: "W ciągu kilku minut otrzymasz email z instrukcjami odblokowania konta."
+      unlocked: "Twoje konto zostało odblokowane, jesteś zalogowany."
+  errors: 
+    messages: 
+      already_confirmed: "potwierdzono wcześniej"
+      not_found: "nie znaleziono"
+      not_locked: "nie był zablokowany"
diff --git a/config/locales/devise/devise.pt-BR.yml b/config/locales/devise/devise.pt-BR.yml
index f7251fc6f..34c219982 100644
--- a/config/locales/devise/devise.pt-BR.yml
+++ b/config/locales/devise/devise.pt-BR.yml
@@ -2,39 +2,81 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-pt-BR:
-  errors:
-    messages:
-      not_found: "não encontrado"
+
+pt-BR: 
+  devise: 
+    confirmations: 
+      confirmed: "Sua conta foi confirmada com sucesso. Você já pode continuar navegando."
+      send_instructions: "Você receberá um email em alguns minutos com as instruções sobre como confirmar a sua conta."
+    failure: 
+      inactive: "Sua conta ainda não foi ativada."
+      invalid: "E-mail ou senha inválida."
+      invalid_token: "Token de autenticação inválida."
+      locked: "Sua conta está bloqueada."
+      timeout: "Sua sessão expirou, por favor logue-se novamente para continuar."
+      unauthenticated: "Você precisa fazer login ou se cadastrar antes de continuar."
+      unconfirmed: "Você tem que confirmar a sua conta antes de continuar."
+    invitations: 
+      invitation_token_invalid: "The invitation token provided is not valid!"
+      send_instructions: "Your invitation has been sent."
+      updated: "Your password was set successfully. You are now signed in."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Confirm my account"
+        subject: "Confirmation instructions"
+        you_can_confirm: "You can confirm your account through the link below:"
+      hello: "Hello %{email}!"
+      invitation: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "A friend wants you to join Diaspora!"
+      inviters: 
+        accept_at: ", at %{url}, you can accept it through the link below."
+        has_invited_you: "%{name} has invited you to join Diaspora"
+        have_invited_you: "%{names} have invited you to join Diaspora"
+      reset_password_instructions: 
+        change: "Change my password"
+        ignore: "If you didn't request this, please ignore this email."
+        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
+        subject: "Reset password instructions"
+        wont_change: "Your password won't change until you access the link above and create a new one."
+      unlock_instructions: 
+        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        click_to_unlock: "Click the link below to unlock your account:"
+        subject: "Unlock Instructions"
+        unlock: "Unlock my account"
+      welcome: "Welcome %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Forgot your password?"
+        send_password_instructions: "Send me reset password instructions"
+      send_instructions: "Você receberá um email com instruções sobre como redefinir sua senha em alguns minutos."
+      updated: "Sua senha foi alterada com sucesso."
+    registrations: 
+      destroyed: "Sua conta foi cancelada com sucesso. Esperamos vê-lo novamente em breve."
+      signed_up: "Você se inscreveu com êxito. Se habilitado, a confirmação foi enviada para seu e-mail."
+      updated: "Você atualizou a sua conta com sucesso."
+    sessions: 
+      new: 
+        have_a_problem: "Have a problem? Find an answer here"
+        login: Login
+        password: Password
+        remember_me: "Remember me"
+        sign_in: "Sign in"
+        username: Username
+      signed_in: "Você entrou com sucesso."
+      signed_out: "Você saiu com sucesso."
+    shared: 
+      links: 
+        forgot_your_password: "Forgot your password?"
+        sign_in: "Sign in"
+        sign_up: "Sign up"
+    unlocks: 
+      send_instructions: "Você receberá um email em alguns minutos com as instruções sobre como desbloquear a sua conta."
+      unlocked: "Sua conta foi desbloqueada com sucesso. Você já pode continuar navegando."
+  errors: 
+    messages: 
       already_confirmed: "já foi confirmado"
+      not_found: "não encontrado"
       not_locked: "não foi bloqueado"
-
-  devise:
-    failure:
-      unauthenticated: 'Você precisa fazer login ou se cadastrar antes de continuar.'
-      unconfirmed: 'Você tem que confirmar a sua conta antes de continuar.'
-      locked: 'Sua conta está bloqueada.'
-      invalid: 'E-mail ou senha inválida.'
-      invalid_token: 'Token de autenticação inválida.'
-      timeout: 'Sua sessão expirou, por favor logue-se novamente para continuar.'
-      inactive: 'Sua conta ainda não foi ativada.'
-    sessions:
-      signed_in: 'Você entrou com sucesso.'
-      signed_out: 'Você saiu com sucesso.'
-    passwords:
-      send_instructions: 'Você receberá um email com instruções sobre como redefinir sua senha em alguns minutos.'
-      updated: 'Sua senha foi alterada com sucesso.'
-    confirmations:
-      send_instructions: 'Você receberá um email em alguns minutos com as instruções sobre como confirmar a sua conta.'
-      confirmed: 'Sua conta foi confirmada com sucesso. Você já pode continuar navegando.'
-    registrations:
-      signed_up: 'Você se inscreveu com êxito. Se habilitado, a confirmação foi enviada para seu e-mail.'
-      updated: 'Você atualizou a sua conta com sucesso.'
-      destroyed: 'Sua conta foi cancelada com sucesso. Esperamos vê-lo novamente em breve.'
-    unlocks:
-      send_instructions: 'Você receberá um email em alguns minutos com as instruções sobre como desbloquear a sua conta.'
-      unlocked: 'Sua conta foi desbloqueada com sucesso. Você já pode continuar navegando.'
-    mailer:
-      confirmation_instructions: 'Instruções para confirmarção'
-      reset_password_instructions: 'Instruções para redefinir a senha'
-      unlock_instructions: 'Instruções para o desbloqueio'
diff --git a/config/locales/devise/devise.pt-PT.yml b/config/locales/devise/devise.pt-PT.yml
index 6bb679bfd..aad35e911 100644
--- a/config/locales/devise/devise.pt-PT.yml
+++ b/config/locales/devise/devise.pt-PT.yml
@@ -2,39 +2,81 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-pt-PT:
-  errors:
-    messages:
-      not_found: "não foi encontrado"
+
+pt-PT: 
+  devise: 
+    confirmations: 
+      confirmed: "A sua conta foi confirmada com sucesso. Está on-line."
+      send_instructions: "Vai receber um email com instruções sobre como confirmar a sua conta dentro de alguns minutos."
+    failure: 
+      inactive: "A sua conta ainda não foi activada."
+      invalid: "Endereço de correio ou senha inválida."
+      invalid_token: "Token de autenticação inválido."
+      locked: "A sua conta foi bloqueada."
+      timeout: "A sua sessão expirou, por favor faça login novamente para continuar."
+      unauthenticated: "Faça login ou registre-se antes de continuar."
+      unconfirmed: "Confirme a sua conta antes de continuar."
+    invitations: 
+      invitation_token_invalid: "The invitation token provided is not valid!"
+      send_instructions: "Your invitation has been sent."
+      updated: "Your password was set successfully. You are now signed in."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Confirm my account"
+        subject: "Confirmation instructions"
+        you_can_confirm: "You can confirm your account through the link below:"
+      hello: "Hello %{email}!"
+      invitation: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "A friend wants you to join Diaspora!"
+      inviters: 
+        accept_at: ", at %{url}, you can accept it through the link below."
+        has_invited_you: "%{name} has invited you to join Diaspora"
+        have_invited_you: "%{names} have invited you to join Diaspora"
+      reset_password_instructions: 
+        change: "Change my password"
+        ignore: "If you didn't request this, please ignore this email."
+        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
+        subject: "Reset password instructions"
+        wont_change: "Your password won't change until you access the link above and create a new one."
+      unlock_instructions: 
+        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        click_to_unlock: "Click the link below to unlock your account:"
+        subject: "Unlock Instructions"
+        unlock: "Unlock my account"
+      welcome: "Welcome %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Forgot your password?"
+        send_password_instructions: "Send me reset password instructions"
+      send_instructions: "Vai receber um email com instruções sobre como alterar a sua senha dentro de alguns minutos."
+      updated: "A sua senha foi alterada com sucesso. Está on-line."
+    registrations: 
+      destroyed: "Adeus! A sua conta foi cancelada com sucesso. Esperamos vê-lo de novo brevemente."
+      signed_up: "Registou-se com sucesso. Se ligado, a confirmação foi enviada para o seu email."
+      updated: "Actualizou a sua conta com sucesso."
+    sessions: 
+      new: 
+        have_a_problem: "Have a problem? Find an answer here"
+        login: Login
+        password: Password
+        remember_me: "Remember me"
+        sign_in: "Sign in"
+        username: Username
+      signed_in: "Login com sucesso."
+      signed_out: "Logout com sucesso."
+    shared: 
+      links: 
+        forgot_your_password: "Forgot your password?"
+        sign_in: "Sign in"
+        sign_up: "Sign up"
+    unlocks: 
+      send_instructions: "Vai receber uma mensagem sobre como desbloquear a sua conta dentro de alguns minutos."
+      unlocked: "A sua conta foi desbloqueada com sucesso. Está on-line."
+  errors: 
+    messages: 
       already_confirmed: "já foi confirmado"
+      not_found: "não foi encontrado"
       not_locked: "não foi bloqueado"
-
-  devise:
-    failure:
-      unauthenticated: 'Faça login ou registre-se antes de continuar.'
-      unconfirmed: 'Confirme a sua conta antes de continuar.'
-      locked: 'A sua conta foi bloqueada.'
-      invalid: 'Endereço de correio ou senha inválida.'
-      invalid_token: 'Token de autenticação inválido.'
-      timeout: 'A sua sessão expirou, por favor faça login novamente para continuar.'
-      inactive: 'A sua conta ainda não foi activada.'
-    sessions:
-      signed_in: 'Login com sucesso.'
-      signed_out: 'Logout com sucesso.'
-    passwords:
-      send_instructions: 'Vai receber um email com instruções sobre como alterar a sua senha dentro de alguns minutos.'
-      updated: 'A sua senha foi alterada com sucesso. Está on-line.'
-    confirmations:
-      send_instructions: 'Vai receber um email com instruções sobre como confirmar a sua conta dentro de alguns minutos.'
-      confirmed: 'A sua conta foi confirmada com sucesso. Está on-line.'
-    registrations:
-      signed_up: 'Registou-se com sucesso. Se ligado, a confirmação foi enviada para o seu email.'
-      updated: 'Actualizou a sua conta com sucesso.'
-      destroyed: 'Adeus! A sua conta foi cancelada com sucesso. Esperamos vê-lo de novo brevemente.'
-    unlocks:
-      send_instructions: 'Vai receber uma mensagem sobre como desbloquear a sua conta dentro de alguns minutos.'
-      unlocked: 'A sua conta foi desbloqueada com sucesso. Está on-line.'
-    mailer:
-      confirmation_instructions: 'Instruções de confirmação'
-      reset_password_instructions: 'Instruções para alterar a sua senha'
-      unlock_instructions: 'Instruções para desbloquear'
diff --git a/config/locales/devise/devise.ro.yml b/config/locales/devise/devise.ro.yml
index a61b4e742..4fa33d9ba 100644
--- a/config/locales/devise/devise.ro.yml
+++ b/config/locales/devise/devise.ro.yml
@@ -2,39 +2,81 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-ro:
-  errors:
-    messages:
-      not_found: "inexistent"
+
+ro: 
+  devise: 
+    confirmations: 
+      confirmed: "Contul dvs. a fost confirmat cu succes. Sunteți acum autentificat(ă)."
+      send_instructions: "În scurt timp veți primi un email cu instrucțiuni pentru confirmarea contului."
+    failure: 
+      inactive: "Contul dvs. încă nu a fost activat."
+      invalid: "Email sau parolă incorectă."
+      invalid_token: "Cheie de autentificare invalidă."
+      locked: "Contul dvs. este blocat."
+      timeout: "Sesiunea dvs. a expirat, autentificați-vă din nou pentru a continua."
+      unauthenticated: "Pentru a continuna, înregistrați-vă."
+      unconfirmed: "Pentru a continua, confirmați contul dvs."
+    invitations: 
+      invitation_token_invalid: "The invitation token provided is not valid!"
+      send_instructions: "Your invitation has been sent."
+      updated: "Your password was set successfully. You are now signed in."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Confirm my account"
+        subject: "Confirmation instructions"
+        you_can_confirm: "You can confirm your account through the link below:"
+      hello: "Hello %{email}!"
+      invitation: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "A friend wants you to join Diaspora!"
+      inviters: 
+        accept_at: ", at %{url}, you can accept it through the link below."
+        has_invited_you: "%{name} has invited you to join Diaspora"
+        have_invited_you: "%{names} have invited you to join Diaspora"
+      reset_password_instructions: 
+        change: "Change my password"
+        ignore: "If you didn't request this, please ignore this email."
+        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
+        subject: "Reset password instructions"
+        wont_change: "Your password won't change until you access the link above and create a new one."
+      unlock_instructions: 
+        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        click_to_unlock: "Click the link below to unlock your account:"
+        subject: "Unlock Instructions"
+        unlock: "Unlock my account"
+      welcome: "Welcome %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Forgot your password?"
+        send_password_instructions: "Send me reset password instructions"
+      send_instructions: "În scurt timp veți primi un email cu instrucțiuni pentru resetarea parolei."
+      updated: "Parolă schimbată cu success. Sunteți acum autentificat(ă)."
+    registrations: 
+      destroyed: "Pa! Contul dvs. a fost dezactivat cu succes. Sperăm să vă revedem în curând."
+      signed_up: "Sunteți autentificat(ă). Dacă este cazul, un mesaj de confirmare a fost trimis pe email-ul dvs."
+      updated: "Cont actualizat cu succes."
+    sessions: 
+      new: 
+        have_a_problem: "Have a problem? Find an answer here"
+        login: Login
+        password: Password
+        remember_me: "Remember me"
+        sign_in: "Sign in"
+        username: Username
+      signed_in: "Autentificare cu succes."
+      signed_out: "Deconectare cu succes."
+    shared: 
+      links: 
+        forgot_your_password: "Forgot your password?"
+        sign_in: "Sign in"
+        sign_up: "Sign up"
+    unlocks: 
+      send_instructions: "În scurt timp veți primi un email cu instrucțiuni pentru deblocarea contului."
+      unlocked: "Cont deblocat cu succes. Sunteți acum autentificat(ă)."
+  errors: 
+    messages: 
       already_confirmed: "a fost deja confirmat"
+      not_found: inexistent
       not_locked: "nu a fost blocat"
-
-  devise:
-    failure:
-      unauthenticated: 'Pentru a continuna, înregistrați-vă.'
-      unconfirmed: 'Pentru a continua, confirmați contul dvs.'
-      locked: 'Contul dvs. este blocat.'
-      invalid: 'Email sau parolă incorectă.'
-      invalid_token: 'Cheie de autentificare invalidă.'
-      timeout: 'Sesiunea dvs. a expirat, autentificați-vă din nou pentru a continua.'
-      inactive: 'Contul dvs. încă nu a fost activat.'
-    sessions:
-      signed_in: 'Autentificare cu succes.'
-      signed_out: 'Deconectare cu succes.'
-    passwords:
-      send_instructions: 'În scurt timp veți primi un email cu instrucțiuni pentru resetarea parolei.'
-      updated: 'Parolă schimbată cu success. Sunteți acum autentificat(ă).'
-    confirmations:
-      send_instructions: 'În scurt timp veți primi un email cu instrucțiuni pentru confirmarea contului.'
-      confirmed: 'Contul dvs. a fost confirmat cu succes. Sunteți acum autentificat(ă).'
-    registrations:
-      signed_up: 'Sunteți autentificat(ă). Dacă este cazul, un mesaj de confirmare a fost trimis pe email-ul dvs.'
-      updated: 'Cont actualizat cu succes.'
-      destroyed: 'Pa! Contul dvs. a fost dezactivat cu succes. Sperăm să vă revedem în curând.'
-    unlocks:
-      send_instructions: 'În scurt timp veți primi un email cu instrucțiuni pentru deblocarea contului.'
-      unlocked: 'Cont deblocat cu succes. Sunteți acum autentificat(ă).'
-    mailer:
-      confirmation_instructions: 'Instrucțiuni pentru confirmarea contului.'
-      reset_password_instructions: 'Instrucțiuni pentru resetarea parolei.'
-      unlock_instructions: 'Instrucțiuni pentru deblocare contului.'
diff --git a/config/locales/devise/devise.ru.yml b/config/locales/devise/devise.ru.yml
index 8283e97a1..e842992a1 100644
--- a/config/locales/devise/devise.ru.yml
+++ b/config/locales/devise/devise.ru.yml
@@ -2,39 +2,81 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-ru:
-  errors:
-    messages:
-      not_found: "не найден(о)"
-      already_confirmed: "уже подтвержден(о)"
-      not_locked: "не заблокирован(о)"
 
-  devise:
-    failure:
-      unauthenticated: 'Вам нужно войти либо зарегистрироваться, чтобы продолжить.'
-      unconfirmed: 'Вам нужно подтвердить вашу учётную запись, чтобы продолжить.'
-      locked: 'Ваша учётная запись заблокирована.'
-      invalid: 'Неверный e-mail или пароль.'
-      invalid_token: 'Неверный ключ аутентификации.'
-      timeout: 'Срок вашего сеанса истёк, пожалуйста, войдите в систему снова.'
-      inactive: 'Ваша учётная запись ещё не активирована.'
-    sessions:
-      signed_in: 'Вход в систему выполнен успешно.'
-      signed_out: 'Выход из системы выполнен успешно.'
-    passwords:
-      send_instructions: 'Вы получите e-mail с указаниями по сбросу пароля в течение нескольких минут.'
-      updated: 'Ваш пароль был изменён. Вы вошли в систему.'
-    confirmations:
-      send_instructions: 'Вы получите e-mail с указаниями по подтверждению учётной записи в течение нескольких минут.'
-      confirmed: 'Ваша учётная запись была подтверждена. Вы вошли в систему.'
-    registrations:
-      signed_up: 'Регистрация выполнена успешно. В зависимости от настроек, вам может прийти e-mail с подтверждением.'
-      updated: 'Обновление вашей учётной записи выполнено успешно.'
-      destroyed: 'До свидания! Ваша учётная запись была удалена. Надеемся, что вскоре вас увидим снова.'
-    unlocks:
-      send_instructions: 'Вы получите e-mail с указаниями по разблокированию учётной записи в течение нескольких минут.'
-      unlocked: 'Ваша учётная запись была разблокирована. Вы вошли в систему.'
-    mailer:
-      confirmation_instructions: 'Подтверждение учётной записи'
-      reset_password_instructions: 'Сброс пароля'
-      unlock_instructions: 'Разблокирование учётной записи'
+ru: 
+  devise: 
+    confirmations: 
+      confirmed: "Ваша учётная запись подтверждена. Добро пожаловать."
+      send_instructions: "Вы получите email с указаниями по подтверждению учётной записи в течение нескольких минут."
+    failure: 
+      inactive: "Ваша учётная запись не активирована."
+      invalid: "Неверный логин или пароль."
+      invalid_token: "Недопустимый символ."
+      locked: "Ваша учётная запись заблокирована."
+      timeout: "Срок вашего сеанса истёк, пожалуйста повторите процедуру представления в системе вновь."
+      unauthenticated: "Вам необходимо представиться или зарегистрироваться для продолжения."
+      unconfirmed: "Вам необходимо подтвердить свою учётную запись для продолжения."
+    invitations: 
+      invitation_token_invalid: "Код приглошения введён не правильно!"
+      send_instructions: "Ваше приглошение отправленно."
+      updated: "Пароль установлен. Добро пожаловать."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Подтвердить мой аккаунт"
+        subject: "Инструкция для подтверждения"
+        you_can_confirm: "Вы можете подтвердить ваш аккаунт перейдя по ссылке: "
+      hello: "Привет %{email}!"
+      invitation: 
+        accept: "Принять приглашение"
+        ignore: "Если вы не хотите принимать приглашение, пожалуйста, проигнорируйте это письмо."
+        no_account_till: "Ваш аккаунт не будет  пока вы не перейдёте по ссылке и не зарегистрируетесь."
+        subject: "Вас пригласили присоединиться к Диаспоре! "
+      inviters: 
+        accept_at: "вы можете принять его, перейдя по ссылке %{url}"
+        has_invited_you: "%{name} приглашает вас присоединиться к Диаспоре"
+        have_invited_you: "%{names} пригласил(а) вас присоединиться к Диаспоре"
+      reset_password_instructions: 
+        change: "Сменить пароль"
+        ignore: "Если вы не запрашивали этого, пожалуйста, проигнорируйте это письмо."
+        someone_requested: "Кто то создал запрос смены вашего пароля, и вы можете сделать это перейдя по ссылке ниже."
+        subject: "Инструкция по сбросу пароля"
+        wont_change: "Ваш пароль не изменится, пока вы не перейдёте по ссылке и не создадите новый."
+      unlock_instructions: 
+        account_locked: "Ваша учетная запись была заблокирована из-за чрезмерного количества неудачных попыток входа."
+        click_to_unlock: "Нажмите на ссылку, чтобы разблокировать учётную запись:"
+        subject: "Инструкции по разблокированию"
+        unlock: "Разблокировать мою учётную запись"
+      welcome: "Добро пожаловать %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Забыли пароль?"
+        send_password_instructions: "Отправить мне инструкции по сбросу пароля"
+      send_instructions: "Вы получите email с инструкцией по сбросу пароля в течении нескольких минут."
+      updated: "Ваш пароль изменён."
+    registrations: 
+      destroyed: "До свиданья! Ваша учётная запись удалена. Мы будем рады видеть вас вновь."
+      signed_up: "Регистрация учётной записи завершена. Вам отправлен email с дальнейшими указаниями."
+      updated: "Информация о вашей учётной запись обновлена."
+    sessions: 
+      new: 
+        have_a_problem: "Столкнулись с проблемой? Попробуйте найти ответ здесь"
+        login: "E-mail или логин"
+        password: Пароль
+        remember_me: "Запомнить меня"
+        sign_in: Войти
+        username: "Имя пользователя"
+      signed_in: Вошли.
+      signed_out: Вышли.
+    shared: 
+      links: 
+        forgot_your_password: "Забыли пароль?"
+        sign_in: Войти
+        sign_up: Регистрация
+    unlocks: 
+      send_instructions: "Вы получите email с указаниями по разблокированнию учётной записи в течение нескольких минут."
+      unlocked: "Ваша учётная запись разблокированна. С возвращением."
+  errors: 
+    messages: 
+      already_confirmed: "уже подтверждена"
+      not_found: "не найдено"
+      not_locked: "не заблокирована"
diff --git a/config/locales/devise/devise.sv.yml b/config/locales/devise/devise.sv.yml
index eeabea803..9dc6f4877 100644
--- a/config/locales/devise/devise.sv.yml
+++ b/config/locales/devise/devise.sv.yml
@@ -1,83 +1,82 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
-#
-#   See config/locales/diaspora/sv.yml for Swedish Diaspora terms.
 
-sv:
-  errors:
-    messages:
-      not_found: "kan ej hitta"
-      already_confirmed: "är redan bekräftad"
-      not_locked: "var ej låst"
 
-  devise:
-    failure:
-      unauthenticated: 'Du måste logga in innan du kan fortsätta.'
-      unconfirmed: 'Du måste verifiera ditt konto innan du kan fortsätta.'
-      locked: 'Ditt konto är låst.'
-      invalid: 'Felaktigt användarnamn eller lösenord.'
-      invalid_token: 'Ogiltig identifiering.'
-      timeout: 'Din session är avslutad, var vänlig logga in igen.'
-      inactive: 'Ditt konto är inte aktiverat.'
-    sessions:
-      new:
-        login: 'Logga in'
-        username: 'Användarnamn'
-        password: 'Lösenord'
-        sign_in: 'Logga in'
-        have_a_problem: "Har du problem att komma in? Klicka här"
-        remember_me: "Kom ihåg mig"
-      signed_in: 'Inloggning ok.'
-      signed_out: 'Utloggning ok.'
-    passwords:
-      send_instructions: 'Du kommer att få ett ebrev med instruktioner för att återställa lösenordet inom några minuter.'
-      updated: 'Ditt lösenord har ändrats och du är inloggad.'
-      new:
-        forgot_password: "Glömt ditt lösenord?"
-        send_password_instructions: "Skicka mig information om hur jag återställer lösenordet"
-    confirmations:
-      send_instructions: 'Du kommer att få ett ebrev med instruktioner för att verifiera ditt konto inom några minuter.'
-      confirmed: 'Ditt konto har verifierats och du är inloggad.'
-    registrations:
-      signed_up: 'Du har skapat ett konto. Beroende på inställningar kan ett ebrev ha skickats till dig.'
-      updated: 'Ditt konto har uppdateras.'
-      destroyed: 'Ditt konto är avslutat. Välkommen åter!'
-    unlocks:
-      send_instructions: 'Du kommer att få ett mail med instruktioner för att låsa upp ditt konto inom några minuter.'
-      unlocked: 'Ditt konto har är nu upplåst och du är inloggad'
-    invitations:
-      send_instructions: 'Din inbjudan är nu skickad.'
-      invitation_token_invalid: 'Denna inbjudan är ej giltig!'
-      updated: 'Ditt lösenord är nu inställt och du är inloggad.'
-    mailer:
-      welcome: "Välkommen %{email}!"
-      hello: "Hej %{email}!"
-      confirmation_instructions:
-        subject: 'Instruktioner för att aktivera ditt konto'
-        you_can_confirm: "Klicka på länken nedan för att aktivera ditt konto:"
+sv: 
+  devise: 
+    confirmations: 
+      confirmed: "Ditt konto har verifierats och du är inloggad."
+      send_instructions: "Du kommer att få ett ebrev med instruktioner för att verifiera ditt konto inom några minuter."
+    failure: 
+      inactive: "Ditt konto är inte aktiverat."
+      invalid: "Felaktigt användarnamn eller lösenord."
+      invalid_token: "Ogiltig identifiering."
+      locked: "Ditt konto är låst."
+      timeout: "Din session är avslutad, var vänlig logga in igen."
+      unauthenticated: "Du måste logga in innan du kan fortsätta."
+      unconfirmed: "Du måste verifiera ditt konto innan du kan fortsätta."
+    invitations: 
+      invitation_token_invalid: "Denna inbjudan är ej giltig!"
+      send_instructions: "Din inbjudan är nu skickad."
+      updated: "Ditt lösenord är nu inställt och du är inloggad."
+    mailer: 
+      confirmation_instructions: 
         confirm: "Aktivera mitt konto"
-      reset_password_instructions:
-        subject: 'Instruktioner för att återställa lösenordet'
-        someone_requested: "Du har efterfrågat en länk för att återställa ditt lösenord. För att fullfölja det, klicka på länken neda."
+        subject: "Instruktioner för att aktivera ditt konto"
+        you_can_confirm: "Klicka på länken nedan för att aktivera ditt konto:"
+      hello: "Hej %{email}!"
+      invitation: 
+        accept: "Acceptera inbjudan"
+        ignore: "Om du inte vill gå med i Diaspora kan du ignorera detta mail."
+        no_account_till: "Ditt konto kommer inte skapas förrän du klickat på knappen ovan och skapat ett nytt konto."
+        subject: "Du har blivit inbjuden till Diaspora!"
+      inviters: 
+        accept_at: ", du kan acceptera din inbjudan på %{url}."
+        has_invited_you: "%{name} vill att du ska gå med i Diaspora"
+        have_invited_you: "%{names} vill att du ska gå med i Diaspora"
+      reset_password_instructions: 
         change: "Återställ mitt lösenord"
-        wont_change: "Dit lösenord kommer inte ändras förrän du klickat på länken och ändrat det."
         ignore: "Om det inte är du som vill byta lösenord så kan du ignorera det här mailet."
-      unlock_instructions:
-        subject: 'Instruktioner för upplåsning'
+        someone_requested: "Du har efterfrågat en länk för att återställa ditt lösenord. För att fullfölja det, klicka på länken neda."
+        subject: "Instruktioner för att återställa lösenordet"
+        wont_change: "Dit lösenord kommer inte ändras förrän du klickat på länken och ändrat det."
+      unlock_instructions: 
         account_locked: "Ditt konto har låsts eftersom du eller någon annan har angett fel lösenord för många gånger."
         click_to_unlock: "Klicka på länken nedan för att låsa upp ditt konto:"
+        subject: "Instruktioner för upplåsning"
         unlock: "Lås upp mitt konto"
-      invitation:
-        subject: 'En vän vill att du ska gå med i Diaspora!'
-        has_invited_you: "%{name} har bjudit in dig till Diaspora"
-        have_invited_you: "%{names} har bjudit in dig till Diaspora"
-        accept_at: ", gå till %{url} för att acceptera din inbjudan."
-        accept: "Acceptera inbjudan"
-        ignore: "Om du inte vill gå med i Diaspora kan du ignorera detta mail."
-        no_account_till: "Ditt konto kommer inte skapas förrän du klickat på knappen ovan och skapat ett nytt konto."
-    shared:
-      links:
-        sign_in: 'Logga in'
-        sign_up: 'Registrera dig'
-        forgot_your_password: 'Glömt ditt lösenord?'
+      welcome: "Välkommen %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Glömt ditt lösenord?"
+        send_password_instructions: "Skicka mig information om hur jag återställer lösenordet"
+      send_instructions: "Du kommer att få ett ebrev med instruktioner för att återställa lösenordet inom några minuter."
+      updated: "Ditt lösenord har ändrats och du är inloggad."
+    registrations: 
+      destroyed: "Ditt konto är avslutat. Välkommen åter!"
+      signed_up: "Du har skapat ett konto. Beroende på inställningar kan ett ebrev ha skickats till dig."
+      updated: "Ditt konto har uppdateras."
+    sessions: 
+      new: 
+        have_a_problem: "Har du problem att komma in? Klicka här"
+        login: "Logga in"
+        password: Lösenord
+        remember_me: "Kom ihåg mig"
+        sign_in: "Logga in"
+        username: Användarnamn
+      signed_in: "Inloggning ok."
+      signed_out: "Utloggning ok."
+    shared: 
+      links: 
+        forgot_your_password: "Glömt ditt lösenord?"
+        sign_in: "Logga in"
+        sign_up: "Registrera dig"
+    unlocks: 
+      send_instructions: "Du kommer att få ett mail med instruktioner för att låsa upp ditt konto inom några minuter."
+      unlocked: "Ditt konto har är nu upplåst och du är inloggad"
+  errors: 
+    messages: 
+      already_confirmed: "är redan bekräftad"
+      not_found: "kan ej hitta"
+      not_locked: "var ej låst"
diff --git a/config/locales/devise/devise.tr.yml b/config/locales/devise/devise.tr.yml
index b3623e5d0..d737eb118 100644
--- a/config/locales/devise/devise.tr.yml
+++ b/config/locales/devise/devise.tr.yml
@@ -2,39 +2,81 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-tr:
-  errors:
-    messages:
-      not_found: "bulunmadi"
-      already_confirmed: "zaten doğrulandı"
-      not_locked: "kilitlenmedi"
 
-  devise:
-    failure:
-      unauthenticated: "Devam etmeden once bir hesap açtırmalı veya hesabınızla giriş yapmalısınız."
-      unconfirmed: "Hesabınızı doğrulamalısınız devam etmeden once."
-      locked: "Hesabınız kilitlenmiştir."
-      invalid: "Yanlış email veya şifre."
-      invalid_token: "Yanlış authentikasyon tılsımı."
-      timeout: "Zamanınız sona erdi, lütfen tekrar giriş yapın devam etmek için."
+tr: 
+  devise: 
+    confirmations: 
+      confirmed: "Hesabınız dogrulanmıstır. Şu anda giriş yapmış oluyorsunuz."
+      send_instructions: "Kısa bir süre içersinde hesabınızı nasıl dogruluycaginiza dair bir email alicaksiniz."
+    failure: 
       inactive: "Hesabınız aktive edilmemiştir daha."
-    sessions:
-      signed_in: "Başarıyla giriş yaptınız."
-      signed_out: "Başarıyla çıkıs yaptınız."
-    passwords:
+      invalid: "Yanlış email veya şifre."
+      invalid_token: "Yanlış doğrulama kodu."
+      locked: "Hesabınız kilitlenmiştir."
+      timeout: "Zamanınız sona erdi, devam etmek için lütfen tekrar giriş yapın."
+      unauthenticated: "Devam etmeden once bir hesap açtırmalı veya hesabınızla giriş yapmalısınız."
+      unconfirmed: " Devam etmeden once hesabınızı doğrulamalısınız."
+    invitations: 
+      invitation_token_invalid: "Davet kodu doğrulanamadı!"
+      send_instructions: "Davetiniz gönderildi."
+      updated: "Şifreniz başarıyla oluşturuldu. Şu anda bağlısınız."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Hesabımı doğrula"
+        subject: "Doğrulama talimatları"
+        you_can_confirm: "Hesabınızı aşağıdaki bağlantı ile doğrulayabilirsiniz:"
+      hello: "Merhaba %{email}!"
+      invitation: 
+        accept: "Daveti kabul et"
+        ignore: "Eğer daveti kabul etmek istemiyorsanız bu e-postayı dikkate almayın."
+        no_account_till: "Hesabınız yukarıdaki bağlantıya tıklayıp üye olmadan oluşturulmayacaktır."
+        subject: "Bir arkadaşınız sizin Diaspora'ya katılmanızı istiyor!"
+      inviters: 
+        accept_at: ", at %{url}, you can accept it through the link below."
+        has_invited_you: "%{name} has invited you to join Diaspora"
+        have_invited_you: "%{names} have invited you to join Diaspora"
+      reset_password_instructions: 
+        change: "Şifremi değiştir"
+        ignore: "Eğer talepte bulunmadıysanız, bu e-postayı dikkate almayın."
+        someone_requested: "Şifre değiştirme talebi aldık, şifrenizi değiştirmek için aşağıdaki bağlantıya tıklayın."
+        subject: "Şifre yenileme talimatları"
+        wont_change: "Şifreniz yukarıdaki bağlantıya tıklayıp yeni bir şifre oluşturana kadar değişmeyecektir."
+      unlock_instructions: 
+        account_locked: "Hesabınız çok fazla yanlış giriş olduğu için kilitlendi."
+        click_to_unlock: "Hesabınızı açmak için aşağıdaki linke tıklayın:"
+        subject: "Talimatları Aç"
+        unlock: "Hesabımı Aç"
+      welcome: "Merhaba %{email}!"
+    passwords: 
+      new: 
+        forgot_password: "Şifrenizi mi unuttunuz?"
+        send_password_instructions: "Şifre yenileme talimatları gönder"
       send_instructions: "Kisa bir süre içersinde şifrenizi nasıl yeniliyceğinizi açıklıyan bir email alıcaksınız."
       updated: "Şifreniz değistirilmiştir. Şu anda giriş yapmış oluyorsunuz."
-    confirmations:
-      send_instructions: "Kısa bir süre içersinde hesabınızı nasıl dogruluycaginiza dair bir email alicaksiniz."
-      confirmed: "Hesabınız dogrulanmıstır. Şu anda giriş yapmış oluyorsunuz."
-    registrations:
-      signed_up: "Basarıyla kayıt yaptınız. Dogrulama emaili size gonderilmistir."
-      updated: "Heabinizi başarili olarak yenilediniz."
+    registrations: 
       destroyed: "Hoşçakal! Hesabiniz yok edildi. Umuyoruz sizi tekrar gorüceğiz yakınlarda."
-    unlocks:
+      signed_up: "Basarıyla kayıt yaptınız. Dogrulama emaili size gonderilmistir."
+      updated: "Hesabinizi başarili bir şekilde yenilediniz."
+    sessions: 
+      new: 
+        have_a_problem: "Sorun mu yaşıyorsunuz ? Çözüm aramak için"
+        login: Giriş
+        password: Şifre
+        remember_me: "Beni Hatırla"
+        sign_in: Giriş
+        username: "Kullanıcı Adı"
+      signed_in: "Başarıyla giriş yaptınız."
+      signed_out: "Başarıyla çıkıs yaptınız."
+    shared: 
+      links: 
+        forgot_your_password: "Şifrenizi mi unuttunuz?"
+        sign_in: "Giriş Yap"
+        sign_up: "Üye Ol"
+    unlocks: 
       send_instructions: "Kisa bir süre içersinde hesabınızı nasıl kilit altinda çikarabiliceginize dair bir email alıcaksınız."
       unlocked: "Heabiniz kilit altindan çıkartılmıstır. Şu anda giriş yapmıs oluyorsunuz"
-    mailer:
-      confirmation_instructions: "Doğrulama talimatları"
-      reset_password_instructions: "Yeni şifre kurma talimatları"
-      unlock_instructions: "Kilit altından çıkarma talimatları"
+  errors: 
+    messages: 
+      already_confirmed: "zaten doğrulandı"
+      not_found: bulunmadi
+      not_locked: kilitlenmedi