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

45 files changed, 9243 insertions, 4444 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
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 6e9d7700e..0ca1d2b4e 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -2,205 +2,354 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-# Sample localization file for Arabic.
 
-ar:
-  hello: "مرحبا"
-  application:
-      helper:
-          unknown_person: "شخص غير معروف"
-          new_requests: "طلبات جديدة"
-  dashboards:
-      helper:
-          home: "الرئيسية"
-  error_messages:
-      helper:
-          invalid_fields: "مدخلات غير صحيحة"
-          correct_the_following_errors_and_try_again: ".صحح الأخطاء التالية وحاول مرة أخرى"
-  people:
-      helper:
-           results_for: "%{params} نتائج "
-           people_on_pod_are_aware_of: "الناس في جراب على علم "
-  layouts:
-      application:
-          edit_profile: "تعديل الملف الشخصي"
-          logout: "خروج"
-  shared:
-      aspect_nav:
-          all_aspects: "جميع الجوانب"
-          manage: "نجح"
-          manage_your_aspects: "إدارة جوانب الخاص"
-      sub_header:
-          all_aspects: "جميع الجوانب"
-          manage_aspects: "إدارة الجوانب"
-      publisher:
-          share: "مشاركة"
-      aspect_friends:
-          add_friends: "أضف أصدقاء"
-  albums:
-      album:
-          you: "أنت"
-      new_album:
-          create: "جديد"
-          add_a_new_album: "أضف ألبوم جديد"
-      show:
-          edit_album: "تعديل الألبوم"
-          albums: "البومات"
-          updated: "تحديث"
-          by: "بواسطة"
-      edit:
-          editing: "تحرير"
-          updated: "محدث"
-          are_you_sure: "هل أنت متأكد؟"
-          delete_album: "حذف ألبوم"
-          cancel: "إلغاء"
-      index:
-          home: "الرئيسية"
-          new_album: "ألبوم جديد"
-      create:
-          success: " .%{name} لقد قمت بإنشاء ألبوم بإسم"
-      update:
-          success: ".بنجاح %{name} تم تحرير ألبوم"
-          failure: ".%{name} فشلت في تحرير ألبوم"
-      destroy:
-          success: ".%{name} تم حذف ألبوم"
-      helper:
-          friends_albums: "ألبومات الأصدقاء"
-          your_albums: "البوماتك"
-  aspects:
-      index:
-          photos: "صور"
-      show:
-          photos: "صور"
-      manage:
-          add_a_new_aspect: "أضف جانبا جديدا"
-          add_a_new_friend:  "إضافة صديق جديد"
-          show: "عرض"
-          update_aspects: "تحديث الجوانب"
-          requests: "طلبات"
-          ignore_remove: "تجاهل/إزالة"
-      new_aspect:
-          add_a_new_aspect: "أضف جانبا جديدا"
-          create: "جديد"
-      create:
-          success: ".من الذي يمكنه مشاهدة مظهرك الجديد Diaspora انقر على علامة الزائد على الجانب الأيسر لتقول ل"
-          failure: ".فشل إنشاء الجانب"
-      destroy:
-          success: ".بنجاح %{name} تم إزالة"
-      update:
-          success: ".بنجاح %{name} تم تعديل"
-      move_friends:
-          failure: ".%{real_name} فشل تحرير آسبكت لصدي"
-          success: ".جوانب الموضوع بنجاح"
-      move_friend:
-          failure: "%{inspect} لم تنجح"
-          success: ".تم إضافة صديقك بنجاح"
-      helper:
-          remove: "حذف"
-          aspect_not_empty: "الجانب ليس فارغ"
-  users:
-      edit:
-          editing_profile: "تحرير الملف الشخصي"
-      profile:
-          cancel: "إلغاء"
-          update_profile: "تحديث الملف الشخصي"
-          home: "منزل"
-          diaspora_username: "اسم المستخدم DIASPORA"
-          info: "معلومات"
-          picture: "صورة"
-          editing_profile: "تحرير الملف الشخصي"
-          albums: "البومات"
-          you_dont_have_any_photos: "ليس لديك أي صور! انتقل إلى"
-          page_to_upload_some:  ".صفحة تحميل بعض"
-  comments:
-      comment:
-          ago: "منذ"
-      new_comment:
-          comment: "تعليق"
-  photos:
-      show:
-          prev: "السابق"
-          full_size: "الحجم اﻷصلي"
-          next: "القادم"
-          edit_photo: "تحرير الصورة"
-          delete_photo: "حذف الصورة"
-          are_you_sure: "هل أنت متأكد؟"
-          comments: "تعليقات"
-      edit:
-          editing: "تحرير"
-          are_you_sure: "هل أنت متأكد؟"
-          delete_photo: "حذف الصورة"
-      photo:
-          show_comments: "عرض التعليقات"
-          posted_a_new_photo_to: "أضفت صورة جديدة ل"
-      new:
-          new_photo: "صورة جديدة"
-          back_to_list: "عودة إلى القائمة"
-          post_it: "!ألصقها"
-      create:
-          runtime_error: "فشل تحميل الصور. هل ربطت حزام الأمان؟"
-          integrity_error: "فشل تحميل الصور. هل ملفك صورة؟"
-          type_error: "فشل تحميل الصور. هل أنت متأكد أنك أضفت صورة؟"
-      update:
-          notice: "تم تحديث الصورة بنجاح"
-          error:  "فشل تحرير الصورة."
-      destroy:
-          notice: "تم حذف الصورة"
-  registrations:
-      new:
-          sign_up: "التسجيل"
-      create:
-          success: "!Diaspora سجل في"
-  status_messages:
-      new_status_message:
-          tell_me_something_good: "قل لي شيئا جيداً"
-          oh_yeah: "!يا سلااام"
-      status_message:
-          show_comments: "عرض التعليقات"
-          delete: "حذف"
-          are_you_sure: "هل أنت متأكد؟"
-      show:
-          status_message: "الحالة"
-          comments: "تعليقات"
-          are_you_sure: "هل أنت متأكد؟"
-          destroy: "إزالة"
-          view_all: "عرض الكل"
-          message: "رسالة"
-          owner: "مالك"
-      helper:
-          no_message_to_display: "لا يوجد رسالة لعرضها"
-  people:
-      person:
-          add_friend: "أضف صديق"
-          pending_request: "طلبات معلقة"
-      index:
-          add_friend: "أضف صديق"
-          real_name: "الاسم الحقيقي"
-          diaspora_handle: "اسمك المستعار diaspora"
-          thats_you: "!هذا أنت"
-          friend_request_pending: "طلبات صداقة معلقة"
-          you_have_a_friend_request_from_this_person: "لديك طلب صداقة من هذا الشخص"
-      new:
-          new_person: "شخص جديد"
-          back_to_list: "عودة إلى القائمة"
-      show:
-          last_seen: "%{how_long_ago} :آخر مشاهدة"
-          friends_since: "%{how_long_ago} :صديق منذ"
-          save: "حفظ"
-          are_you_sure: "هل أنت متأكد؟"
-          remove_friend: "إزالة صديق"
-  requests:
-      new_request:
-          add_a_new_friend_to: "إضافة صديق جديد إلى"
-          enter_a_diaspora_username: ":Diaspora أدخل اسم مستخدم"
-          your_diaspora_username_is: "%{diaspora_handle} :هو Diaspora اسم المستخدم الخاص"
-          friends_username: "اسم مستخدم الصديق"
-      destroy:
-          success: ".أنتم الآن أصدقاء"
-          error: "!الرجاء اختيار جانب"
-          ignore: ". تجاهل طلب الصداقة"
-      create:
-          error: "!في هذا البريد الإلكتروني diaspora لم يتم العثور على بذور"
-          already_friends: "!من قبل %{destination_url} أنت صديق مع"
-          success: ".%{destination_url} تم إرسال طلب صداقة ل"
-          horribly_wrong: ".فيه بلوى كبيرة حصلت"
+ar: 
+  _photos: photos
+  _services: Services
+  account: Account
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "is already taken"
+        user: 
+          attributes: 
+            email: 
+              taken: "is already taken"
+            person: 
+              invalid: "is invalid"
+            username: 
+              taken: "is already taken"
+  ago: ago
+  application: 
+    helper: 
+      unknown_person: "شخص غير معروف"
+      youtube_title: 
+        unknown: "Unknown Video Title"
+  are_you_sure: "Are you sure?"
+  aspects: 
+    add_to_aspect: 
+      failure: "Failed to add friend to aspect."
+      success: "Successfully added friend to aspect."
+    create: 
+      failure: ".فشل إنشاء الجانب"
+      success: ".من الذي يمكنه مشاهدة مظهرك الجديد Diaspora انقر على علامة الزائد على الجانب الأيسر لتقول ل"
+    destroy: 
+      success: ".بنجاح %{name} تم إزالة"
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "الجانب ليس فارغ"
+      remove: حذف
+    manage: 
+      add_a_new_aspect: "أضف جانبا جديدا"
+      add_a_new_contact: "Add a new contact"
+      drag_to_add: "Drag to add people"
+      manage_aspects: "Manage aspects"
+      no_requests: "No new requests"
+      requests: طلبات
+    move_contact: 
+      error: "Error moving contact: %{inspect}"
+      failure: "didn't work %{inspect}"
+      success: "Person moved to new aspect"
+    new_aspect: 
+      create: جديد
+      name: Name
+    no_contacts_message: 
+      add_contact: "Add a contact"
+      add_contact_to: "Add someone to %{aspect_name}"
+      invite: "Invite someone to join Diaspora!"
+      nobody: "We know you know people — bring them to Diaspora!"
+      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+    no_posts_message: 
+      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+    remove_from_aspect: 
+      failure: "Failed to remove person from aspect"
+      success: "Successfully removed person from aspect"
+    update: 
+      success: ".بنجاح %{name} تم تعديل"
+  back: Back
+  cancel: Cancel
+  comments: 
+    new_comment: 
+      comment: تعليق
+      commenting: Commenting...
+  dashboards: 
+    helper: 
+      home: Home
+  delete: Delete
+  email: Email
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: ".صحح الأخطاء التالية وحاول مرة أخرى"
+      invalid_fields: "مدخلات غير صحيحة"
+  fill_me_out: "Fill me out"
+  home: 
+    show: 
+      already_account: "already have an account?"
+      login_here: "log in here"
+      share_what_you_want: "Share what you want, with who you want."
+  invitations: 
+    check_token: 
+      not_found: "Invitation token not found"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "You already invited this person."
+      no_more: "You have no more invitations."
+      sent: "Your invitation has been sent."
+    new: 
+      if_they_accept_info: "if they accept, they will be added to the aspect you invited them"
+      invite_someone_to_join: "Invite someone to join Diaspora!"
+      message: "Message:"
+      send_an_invitation: "Send an invitation"
+      send_invitation: "Send invitation"
+      to: To
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: "account settings"
+      blog: blog
+      developers: developers
+      edit_profile: "edit profile"
+      login: login
+      logout: logout
+      view_profile: "view profile"
+  notifier: 
+    diaspora: "the diaspora email robot"
+    hello: "Hello %{name}!"
+    love: "love,"
+    new_request: 
+      just_sent_you: "just sent you a friend request on Diaspora*"
+      sign_in: "sign in here"
+      subject: "new Diaspora* friend request from %{from}"
+      try_it_out: "You should really think about checking it out."
+    request_accepted: 
+      accepted: "has accepted your friend request. They are now in your"
+      aspect: aspect.
+      subject: "%{name} has accepted your friend request on Diaspora*"
+  ok: OK
+  or: or
+  password: Password
+  password_confirmation: "Password confirmation"
+  people: 
+    edit: 
+      allow_search: "Allow for people to search for you"
+      first_name: "First name"
+      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      last_name: "Last name"
+      update_profile: "Update Profile"
+      your_bio: "Your bio"
+      your_birthday: "Your birthday"
+      your_gender: "Your gender"
+      your_name: "Your name"
+      your_photo: "Your photo"
+      your_profile: "Your profile"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: " results for %{params}"
+    index: 
+      results_for: "search results for"
+    person: 
+      add_contact: "add contact"
+      already_connected: "Already connected"
+      pending_request: "طلبات معلقة"
+      thats_you: "thats you!"
+    profile_photo_upload: 
+      or_select_one: "or select one from your already existing"
+    profile_sidebar: 
+      bio: bio
+      born: born
+      edit_my_profile: "Edit my profile"
+      gender: gender
+      in_aspects: "in aspects"
+      last_seen: "last seen: %{how_long_ago}"
+      remove_contact: "remove contact"
+    show: 
+      already_requested: "You have already sent a request to %{name}."
+      does_not_exist: "Person does not exist!"
+      no_posts: "no posts to display!"
+      not_connected: "You are not connected with this person"
+      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+    update: 
+      failed: "Failed to update profile"
+      updated: "Profile updated"
+  photos: 
+    create: 
+      integrity_error: "فشل تحميل الصور. هل ملفك صورة؟"
+      runtime_error: "فشل تحميل الصور. هل ربطت حزام الأمان؟"
+      type_error: "فشل تحميل الصور. هل أنت متأكد أنك أضفت صورة؟"
+    destroy: 
+      notice: "تم حذف الصورة"
+    edit: 
+      editing: تحرير
+    new: 
+      back_to_list: "عودة إلى القائمة"
+      new_photo: "صورة جديدة"
+      post_it: "!ألصقها"
+    new_photo: 
+      drop: "Drop photos here to upload"
+      empty: "{file} is empty, please select files again without it."
+      failed: Failed
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      upload: "Upload a photo"
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      add_a_description: "Add a description"
+      delete_photo: "حذف الصورة"
+      edit_photo: "تحرير الصورة"
+      full_size: "الحجم اﻷصلي"
+      make_profile_photo: "make profile photo"
+      next: القادم
+      prev: السابق
+      update_photo: "Update Photo"
+    update: 
+      error: "فشل تحرير الصورة."
+      notice: "تم تحديث الصورة بنجاح"
+  profile: Profile
+  registrations: 
+    closed: "Signups are closed on this Diaspora pod."
+    create: 
+      success: "!Diaspora سجل في"
+    edit: 
+      cancel_my_account: "Cancel my account"
+      edit: "Edit %{name}"
+      leave_blank: "(leave blank if you don't want to change it)"
+      password_to_confirm: "(we need your current password to confirm your changes)"
+      unhappy: Unhappy?
+      update: Update
+    new: 
+      sign_up: التسجيل
+      sign_up_for_diaspora: "Sign up for Diaspora"
+  requests: 
+    create: 
+      sending: Sending...
+      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      tried: "we tried our best to send a message to %{account}"
+    destroy: 
+      error: "!الرجاء اختيار جانب"
+      ignore: ". تجاهل طلب الصداقة"
+      success: ".أنتم الآن أصدقاء"
+    manage_aspect_contacts: 
+      contact_username: "Contact's username"
+      create_request: "Create request"
+      enter_a_diaspora_username: "Enter a Diaspora username:"
+      existing: "Existing contacts"
+      know_email: "Know their email address? You should invite them"
+      manage_within: "Manage contacts within"
+      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+  search: Search
+  services: 
+    create: 
+      success: "Authentication successful."
+    destroy: 
+      success: "Successfully destroyed authentication."
+    index: 
+      connect_to_facebook: "Connect to facebook"
+      connect_to_twitter: "Connect to twitter"
+      disconnect: disconnect
+      logged_in_as: "logged in as"
+      really_disconnect: "disconnect %{service}?"
+  settings: Settings
+  shared: 
+    aspect_contacts: 
+      add_contacts: "add contacts"
+      add_to: "add to %{aspect}"
+      everyone: Everyone
+      manage: "manage %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "add a new aspect"
+      everyone: Everyone
+      manage: نجح
+      manage_your_aspects: "إدارة جوانب الخاص"
+    author_info: 
+      all: all
+      status_messages: "status messages"
+      view_profile: "View profile"
+      viewing: viewing
+    contact_list: 
+      add_to: "Add %{name} to %{aspect}"
+      remove_from: "Remove %{name} from %{aspect}"
+      search_contacts: "Search contacts"
+    invitations: 
+      invitations_left: "(%{count} left)"
+      invite_someone: "Invite someone"
+      invites: Invites
+    notification: 
+      new: "New %{type} from %{from}"
+    public_explain: 
+      logged_in: "logged in to %{service}"
+      manage: "manage connected services"
+      outside: "Public messages will be available for others outside of Diaspora to see."
+      title: "You are about to post a public message!"
+    publisher: 
+      all: all
+      make_public: "make public"
+      post_a_message_to: "Post a message to %{aspect}"
+      posting: Posting...
+      share: مشاركة
+      share_with: "Share with %{aspect}"
+      share_with_all: "Share with all aspects"
+    reshare: 
+      reshare: Reshare
+    stream_element: 
+      show_comments: "show comments"
+  status_messages: 
+    helper: 
+      no_message_to_display: "لا يوجد رسالة لعرضها"
+    new_status_message: 
+      oh_yeah: "!يا سلااام"
+      tell_me_something_good: "قل لي شيئا جيداً"
+    show: 
+      destroy: إزالة
+  the_world: "the world"
+  username: Username
+  users: 
+    destroy: "Account successfully closed."
+    edit: 
+      change_language: "Change Language"
+      change_password: "Change Password"
+      close_account: "Close Account"
+      download_photos: "download my photos"
+      download_xml: "download my xml"
+      export_data: "Export Data"
+      invite_contacts: "Invite contacts"
+      new_password: "New Password"
+    getting_started: 
+      connect_services: "Connect your services"
+      define_aspects: "Define your aspects"
+      edit_profile: "Edit your profile"
+      save_and_continue: "Save and continue"
+      signup_steps: "Complete your sign-up by doing these things:"
+      skip: "skip getting started"
+      step_1: 
+        your_profile: "Your Profile"
+      step_2: 
+        add: Add
+        aspect_name: "Aspect name"
+        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+        your_aspects: "Your aspects"
+      step_3: 
+        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
+        your_services: "Your services"
+      step_4: 
+        change_profile: "You can change your profile any time by clicking"
+        connect_disconnect: "You can connect/disconnect your services any time by clicking"
+        continue: "Continue on to your everyone page, an overview of all of your aspects."
+        finish: Finish
+        manage_aspects: "You can manage your aspects any time by clicking the"
+        ready_to_share: "You're now ready to start sharing with "
+        set_up: "You're all set up, %{name}!"
+        tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+        user_menu: "in your user menu (top right)."
+      welcome: "Welcome to Diaspora!"
+    public: 
+      does_not_exist: "User %{username} does not exist!"
+    update: 
+      language_changed: "Language Changed"
+      language_not_changed: "Language Change Failed"
+      password_changed: "Password Changed"
+      password_not_changed: "Password Change Failed"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 9512645e3..77f51d86c 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -2,218 +2,354 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-# Sample localization file for Lithuanian. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
-cs:
-  hello: "Dobrý Den"
-  application:
-      helper:
-          unknown_person: "neznámá osoba"
-          new_requests: "nové žádosti"
-  dashboards:
-      helper:
-          home: "domů"
-  datetime:
-      distance_in_words:
-          less_than_x_seconds: "méně než %{count} sekund"
-          half_a_minute: "půl minuty"
-          less_than_x_minutes: "méně než %{count} minut"
-          x_minutes: "%{count} minuty"
-          about_x_hours: "zhruba %{count} hodin"
-          x_days: "%{count} dní"
-          about_x_months: "zhruba %{count} měsíců"
-          x_months: "%{count} měsíců"
-          about_x_years: "zhruba %{count} let"
-          over_x_years: "přez %{count} let"
-          almost_x_years: "skoro %{count} let"
-  error_messages:
-      helper:
-          invalid_fields: "Neplatná pole"
-          correct_the_following_errors_and_try_again: "Opravte následující chyby a zkuste to znovu."
-  people:
-      helper:
-           results_for: " vysledky vyhledávání %{params}"
-           people_on_pod_are_aware_of: " people on pod are aware of"
-  layouts:
-      application:
-          edit_profile: "upravit profil"
-          logout: "odhlásit se"
-  shared:
-      aspect_nav:
-          all_aspects: "Všechny aspekty"
-          manage: "Spravovat"
-          manage_your_aspects: "Spravovat vaše aspekty"
-      sub_header:
-          all_aspects: "Všechny aspekty"
-          manage_aspects: "Spravovat aspekty"
-      publisher:
-          share: "Sdělit"
-      aspect_friends:
-          add_friends: "přidat přátele"
-  albums:
-      album:
-          you: "vy"
-      new_album:
-          create: "vytvořit"
-          add_a_new_album: "Přidat nové album"
-      show:
-          edit_album: "Upravit album"
-          albums: "alba"
-          updated: "aktualizované"
-          by: "uživatelem"
-      edit:
-          editing: "Upravuje se"
-          updated: "aktualizováno"
-          are_you_sure: "Jste si jisti?"
-          delete_album: "Smazat Album"
-          cancel: "Zrušit"
-      index:
-          home: "doma"
-          new_album: "Nové Album"
-      create:
-          success: "Vytvořili jste nové album nazvané %{name}."
-      update:
-          success: "Album %{name} úspěšně upraveno."
-          failure: "Nepodařilo se upravit album %{name}."
-      destroy:
-          success: "Album %{name} smazáno."
-      helper:
-          friends_albums: "Alba přátel"
-          your_albums: "Vaše Alba"
-  aspects:
-      index:
-          photos: "fotografie"
-      show:
-          photos: "fotografie"
-      manage:
-          add_a_new_aspect: "Přidat aspekt"
-          add_a_new_friend:  "Přidat nového přítele"
-          show: "Show"
-          update_aspects: "Aktualizovat aspekty"
-          requests: "Žádosti"
-          ignore_remove: "Ignorovat/Odebrat"
-      new_aspect:
-          add_a_new_aspect: "Přidat nový aspekt"
-          create: "Vytvořit"
-      create:
-          success: "Řekněte Diaspoře kdo může vidět váš nový aspekt kliknutím na plus na levé straně."
-      destroy:
-          success: "%{name} byl úspěšně odebrán."
-      update:
-          success: "Váš aspekt, %{name}, byl úspěšně upraven."
-      move_friends:
-          failure: "Úprava aspektu přítelem %{real_name} selhala."
-          success: "Aspekty úspěšně upraveny."
-      move_friend:
-          failure: "nepodařilo se %{inspect}"
-          success: "Nyní svému příteli ukazujete jiný ze svých aspektů."
-      helper:
-          remove: "odebrat"
-          aspect_not_empty: "Aspekt není prázdný"
-  users:
-      edit:
-          editing_profile: "Upravit profil"
-      profile:
-          cancel: "Zrušit"
-          update_profile: "Aktualizovat profil"
-          home: "Domů"
-          diaspora_username: "UŽIVATELSKÉ JMÉNO V DIASPOŘE"
-          info: "Info"
-          picture: "Obrázek"
-          editing_profile: "Upravit profil"
-          albums: "Alba"
-          you_dont_have_any_photos: "Nemáte žádné fotky.   Jděte na stránku"
-          page_to_upload_some:  "a nějaké nahrajte."
-  comments:
-      comment:
-          ago: "nazpět"
-      new_comment:
-          comment: "Komentář"
-  photos:
-      show:
-          prev: "předchozí"
-          full_size: "plná velkost"
-          next: "další"
-          edit_photo: "Upravit fotku"
-          delete_photo: "Smazat fotku"
-          are_you_sure: "Jste si jisti?"
-          comments: "komentáře"
-      edit:
-          editing: "Uprait"
-          are_you_sure: "Jste si jisti?"
-          delete_photo: "Smazat fotku"
-      photo:
-          show_comments: "zobrazit komentáře"
-          posted_a_new_photo_to: "poslal novou fotku do"
-      new:
-          new_photo: "Nová fotka"
-          back_to_list: "Zpět na seznam"
-          post_it: "poslat!"
-      create:
-          runtime_error: "Poslání fotky selhalo.  Jste si jisti, že máte zapnuté pásy?"
-          integrity_error: "Poslání fotky selhalo.  Jste si jisti že to byl obrázek?"
-          type_error: "Poslání fotky selhalo.  Jste si jisti zě byl přidán obrázek?"
-      update:
-          notice: "Fotka úspěšně aktualizována."
-          error:  "Nepodařilo se upravit fotku."
-      destroy:
-          notice: "Fotka smazána."
-  registrations:
-      new:
-          sign_up: "Zapsat se"
-      create:
-          success: "Připojili jste se k Diaspoře!"
-  status_messages:
-      new_status_message:
-          tell_me_something_good: "pověz mi něco dobrého"
-          oh_yeah: "ó ano!"
-      status_message:
-          show_comments: "zobrazit komentáře"
-          delete: "Smazat"
-          are_you_sure: "Jste si jisti?"
-      show:
-          status_message: "Zpráva o stavu"
-          comments: "komentáře"
-          are_you_sure: "Jste si jisti?"
-          destroy: "Zničit"
-          view_all: "Zobrazit Vše"
-          message: "Zpráva"
-          owner: "Vlastník"
-      helper:
-          no_message_to_display: "Není k zobrazení žádná zpráva."
-  people:
-      person:
-          add_friend: "přidat přítele"
-          pending_request: "nevyřízené žádosti"
-      index:
-          add_friend: "přidat přítele"
-          real_name: "pravé jméno"
-          diaspora_handle: "adresa v diaspoře"
-          thats_you: "to jste vy!"
-          friend_request_pending: "nevyřízená žádost o přátelství"
-          you_have_a_friend_request_from_this_person: "od této osoby máte žádost o přátelství"
-      new:
-          new_person: "Nová Osoba"
-          back_to_list: "Zpět na Seznam"
-      show:
-          last_seen: "naposledy viděni: %{how_long_ago}"
-          friends_since: "přáteli od: %{how_long_ago}"
-          save: "save"
-          are_you_sure: "Jste si jisti?"
-          remove_friend: "odebrat přítele"
-  requests:
-      new_request:
-          add_a_new_friend_to: "Pridat nového přítele do"
-          enter_a_diaspora_username: "Vložte uživatelské jméno v diaspoře:"
-          your_diaspora_username_is: "Vaše uživatelské jméno v diaspoře je: %{diaspora_handle}"
-          friends_username: "Uživatelské jméno přítele"
-      destroy:
-          success: "Nyní jste přáteli."
-          error: "Prosím vyberte aspekt!"
-          ignore: "Ignorovat žádost o přátelství."
-      create:
-          error: "Semínko diaspory s touto adresou nenalezeno!"
-          already_friends: "S %{destination_url} už jste přáteli!"
-          success: "byla poslána žádost o přátelství na %{destination_url}"
-          horribly_wrong: "Něco se ošklivě pokazilo."
+cs: 
+  _photos: photos
+  _services: Services
+  account: Account
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "is already taken"
+        user: 
+          attributes: 
+            email: 
+              taken: "is already taken"
+            person: 
+              invalid: "is invalid"
+            username: 
+              taken: "is already taken"
+  ago: ago
+  application: 
+    helper: 
+      unknown_person: "neznámá osoba"
+      youtube_title: 
+        unknown: "Unknown Video Title"
+  are_you_sure: "Are you sure?"
+  aspects: 
+    add_to_aspect: 
+      failure: "Failed to add friend to aspect."
+      success: "Successfully added friend to aspect."
+    create: 
+      failure: "Aspect creation failed."
+      success: "Řekněte Diaspoře kdo může vidět váš nový aspekt kliknutím na plus na levé straně."
+    destroy: 
+      success: "%{name} byl úspěšně odebrán."
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "Aspekt není prázdný"
+      remove: odebrat
+    manage: 
+      add_a_new_aspect: "Přidat aspekt"
+      add_a_new_contact: "Add a new contact"
+      drag_to_add: "Drag to add people"
+      manage_aspects: "Manage aspects"
+      no_requests: "No new requests"
+      requests: Žádosti
+    move_contact: 
+      error: "Error moving contact: %{inspect}"
+      failure: "didn't work %{inspect}"
+      success: "Person moved to new aspect"
+    new_aspect: 
+      create: Vytvořit
+      name: Name
+    no_contacts_message: 
+      add_contact: "Add a contact"
+      add_contact_to: "Add someone to %{aspect_name}"
+      invite: "Invite someone to join Diaspora!"
+      nobody: "We know you know people — bring them to Diaspora!"
+      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+    no_posts_message: 
+      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+    remove_from_aspect: 
+      failure: "Failed to remove person from aspect"
+      success: "Successfully removed person from aspect"
+    update: 
+      success: "Váš aspekt, %{name}, byl úspěšně upraven."
+  back: Back
+  cancel: Cancel
+  comments: 
+    new_comment: 
+      comment: Komentář
+      commenting: Commenting...
+  dashboards: 
+    helper: 
+      home: Home
+  delete: Delete
+  email: Email
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Opravte následující chyby a zkuste to znovu."
+      invalid_fields: "Neplatná pole"
+  fill_me_out: "Fill me out"
+  home: 
+    show: 
+      already_account: "already have an account?"
+      login_here: "log in here"
+      share_what_you_want: "Share what you want, with who you want."
+  invitations: 
+    check_token: 
+      not_found: "Invitation token not found"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "You already invited this person."
+      no_more: "You have no more invitations."
+      sent: "Your invitation has been sent."
+    new: 
+      if_they_accept_info: "if they accept, they will be added to the aspect you invited them"
+      invite_someone_to_join: "Invite someone to join Diaspora!"
+      message: "Message:"
+      send_an_invitation: "Send an invitation"
+      send_invitation: "Send invitation"
+      to: To
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: "account settings"
+      blog: blog
+      developers: developers
+      edit_profile: "edit profile"
+      login: login
+      logout: logout
+      view_profile: "view profile"
+  notifier: 
+    diaspora: "the diaspora email robot"
+    hello: "Hello %{name}!"
+    love: "love,"
+    new_request: 
+      just_sent_you: "just sent you a friend request on Diaspora*"
+      sign_in: "sign in here"
+      subject: "new Diaspora* friend request from %{from}"
+      try_it_out: "You should really think about checking it out."
+    request_accepted: 
+      accepted: "has accepted your friend request. They are now in your"
+      aspect: aspect.
+      subject: "%{name} has accepted your friend request on Diaspora*"
+  ok: OK
+  or: or
+  password: Password
+  password_confirmation: "Password confirmation"
+  people: 
+    edit: 
+      allow_search: "Allow for people to search for you"
+      first_name: "First name"
+      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      last_name: "Last name"
+      update_profile: "Update Profile"
+      your_bio: "Your bio"
+      your_birthday: "Your birthday"
+      your_gender: "Your gender"
+      your_name: "Your name"
+      your_photo: "Your photo"
+      your_profile: "Your profile"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: " results for %{params}"
+    index: 
+      results_for: "search results for"
+    person: 
+      add_contact: "add contact"
+      already_connected: "Already connected"
+      pending_request: "nevyřízené žádosti"
+      thats_you: "thats you!"
+    profile_photo_upload: 
+      or_select_one: "or select one from your already existing"
+    profile_sidebar: 
+      bio: bio
+      born: born
+      edit_my_profile: "Edit my profile"
+      gender: gender
+      in_aspects: "in aspects"
+      last_seen: "last seen: %{how_long_ago}"
+      remove_contact: "remove contact"
+    show: 
+      already_requested: "You have already sent a request to %{name}."
+      does_not_exist: "Person does not exist!"
+      no_posts: "no posts to display!"
+      not_connected: "You are not connected with this person"
+      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+    update: 
+      failed: "Failed to update profile"
+      updated: "Profile updated"
+  photos: 
+    create: 
+      integrity_error: "Poslání fotky selhalo.  Jste si jisti že to byl obrázek?"
+      runtime_error: "Poslání fotky selhalo.  Jste si jisti, že máte zapnuté pásy?"
+      type_error: "Poslání fotky selhalo.  Jste si jisti zě byl přidán obrázek?"
+    destroy: 
+      notice: "Fotka smazána."
+    edit: 
+      editing: Uprait
+    new: 
+      back_to_list: "Zpět na seznam"
+      new_photo: "Nová fotka"
+      post_it: poslat!
+    new_photo: 
+      drop: "Drop photos here to upload"
+      empty: "{file} is empty, please select files again without it."
+      failed: Failed
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      upload: "Upload a photo"
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      add_a_description: "Add a description"
+      delete_photo: "Smazat fotku"
+      edit_photo: "Upravit fotku"
+      full_size: "plná velkost"
+      make_profile_photo: "make profile photo"
+      next: další
+      prev: předchozí
+      update_photo: "Update Photo"
+    update: 
+      error: "Nepodařilo se upravit fotku."
+      notice: "Fotka úspěšně aktualizována."
+  profile: Profile
+  registrations: 
+    closed: "Signups are closed on this Diaspora pod."
+    create: 
+      success: "Připojili jste se k Diaspoře!"
+    edit: 
+      cancel_my_account: "Cancel my account"
+      edit: "Edit %{name}"
+      leave_blank: "(leave blank if you don't want to change it)"
+      password_to_confirm: "(we need your current password to confirm your changes)"
+      unhappy: Unhappy?
+      update: Update
+    new: 
+      sign_up: "Zapsat se"
+      sign_up_for_diaspora: "Sign up for Diaspora"
+  requests: 
+    create: 
+      sending: Sending...
+      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      tried: "we tried our best to send a message to %{account}"
+    destroy: 
+      error: "Prosím vyberte aspekt!"
+      ignore: "Ignorovat žádost o přátelství."
+      success: "Nyní jste přáteli."
+    manage_aspect_contacts: 
+      contact_username: "Contact's username"
+      create_request: "Create request"
+      enter_a_diaspora_username: "Enter a Diaspora username:"
+      existing: "Existing contacts"
+      know_email: "Know their email address? You should invite them"
+      manage_within: "Manage contacts within"
+      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+  search: Search
+  services: 
+    create: 
+      success: "Authentication successful."
+    destroy: 
+      success: "Successfully destroyed authentication."
+    index: 
+      connect_to_facebook: "Connect to facebook"
+      connect_to_twitter: "Connect to twitter"
+      disconnect: disconnect
+      logged_in_as: "logged in as"
+      really_disconnect: "disconnect %{service}?"
+  settings: Settings
+  shared: 
+    aspect_contacts: 
+      add_contacts: "add contacts"
+      add_to: "add to %{aspect}"
+      everyone: Everyone
+      manage: "manage %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "add a new aspect"
+      everyone: Everyone
+      manage: Spravovat
+      manage_your_aspects: "Spravovat vaše aspekty"
+    author_info: 
+      all: all
+      status_messages: "status messages"
+      view_profile: "View profile"
+      viewing: viewing
+    contact_list: 
+      add_to: "Add %{name} to %{aspect}"
+      remove_from: "Remove %{name} from %{aspect}"
+      search_contacts: "Search contacts"
+    invitations: 
+      invitations_left: "(%{count} left)"
+      invite_someone: "Invite someone"
+      invites: Invites
+    notification: 
+      new: "New %{type} from %{from}"
+    public_explain: 
+      logged_in: "logged in to %{service}"
+      manage: "manage connected services"
+      outside: "Public messages will be available for others outside of Diaspora to see."
+      title: "You are about to post a public message!"
+    publisher: 
+      all: all
+      make_public: "make public"
+      post_a_message_to: "Post a message to %{aspect}"
+      posting: Posting...
+      share: Sdělit
+      share_with: "Share with %{aspect}"
+      share_with_all: "Share with all aspects"
+    reshare: 
+      reshare: Reshare
+    stream_element: 
+      show_comments: "show comments"
+  status_messages: 
+    helper: 
+      no_message_to_display: "Není k zobrazení žádná zpráva."
+    new_status_message: 
+      oh_yeah: "ó ano!"
+      tell_me_something_good: "pověz mi něco dobrého"
+    show: 
+      destroy: Zničit
+  the_world: "the world"
+  username: Username
+  users: 
+    destroy: "Account successfully closed."
+    edit: 
+      change_language: "Change Language"
+      change_password: "Change Password"
+      close_account: "Close Account"
+      download_photos: "download my photos"
+      download_xml: "download my xml"
+      export_data: "Export Data"
+      invite_contacts: "Invite contacts"
+      new_password: "New Password"
+    getting_started: 
+      connect_services: "Connect your services"
+      define_aspects: "Define your aspects"
+      edit_profile: "Edit your profile"
+      save_and_continue: "Save and continue"
+      signup_steps: "Complete your sign-up by doing these things:"
+      skip: "skip getting started"
+      step_1: 
+        your_profile: "Your Profile"
+      step_2: 
+        add: Add
+        aspect_name: "Aspect name"
+        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+        your_aspects: "Your aspects"
+      step_3: 
+        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
+        your_services: "Your services"
+      step_4: 
+        change_profile: "You can change your profile any time by clicking"
+        connect_disconnect: "You can connect/disconnect your services any time by clicking"
+        continue: "Continue on to your everyone page, an overview of all of your aspects."
+        finish: Finish
+        manage_aspects: "You can manage your aspects any time by clicking the"
+        ready_to_share: "You're now ready to start sharing with "
+        set_up: "You're all set up, %{name}!"
+        tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+        user_menu: "in your user menu (top right)."
+      welcome: "Welcome to Diaspora!"
+    public: 
+      does_not_exist: "User %{username} does not exist!"
+    update: 
+      language_changed: "Language Changed"
+      language_not_changed: "Language Change Failed"
+      password_changed: "Password Changed"
+      password_not_changed: "Password Change Failed"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 49343d246..540d92f84 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -2,143 +2,354 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
-cy:
-  hello: "Helo byd"
-  layouts:
-      application:
-          edit_profile: "golygu proffil"
-          logout: "arwyddo allan"
-  shared:
-      aspect_nav:
-          all_aspects: "Pob agwedd"
-          manage: "Rheoli"
-          manage_your_aspects: "Rheoli eich agweddau"
-      sub_header:
-          all_aspects: "Pob agwedd"
-          manage_aspects: "Rheloi agweddau"
-      publisher:
-          share: "Rhannu"
-      aspect_friends:
-          add_friends: "ychwanegu ffrindiau"
-  albums:
-      album:
-          you: "chi"
-      new_album:
-          create: "creu"
-          add_a_new_album: "Ychwanegu albwm newydd"
-      show:
-          edit_album: "Golygu Albwm"
-          albums: "albymau"
-          updated: "diweddarwyd"
-          by: "gan"
-      edit:
-          editing: "Wrthi'n golygu"
-          updated: "diweddarwyd"
-          are_you_sure: "Ydych chi'n sicr?"
-          delete_album: "Dileu Albwm"
-          cancel: "Cancel"
-      index:
-          home: "adref"
-          new_album: "Albwm Newydd"
-      create:
-          success: "Chi wedi creu albwm a'i enwi'n %{name}."
-      update:
-          success: "Mae albwm %{name} wedi'i olygu yn llwyddiannus."
-          failure: "Wedi methu golygu albwm %{name}."
-      destroy:
-          success: "Wedi dileu albwm %{name}."
-  aspects:
-      index:
-          photos: "lluniau"
-      show:
-          photos: "lluniau"
-      manage:
-          add_a_new_aspect: "Ychwanegwch agwedd"
-          add_a_new_friend:  "Ychwanegwch ffrind newydd"
-          show: "Dangos"
-          update_aspects: "Diweddaru Agweddau"
-          requests: "Ceisiadau"
-          ignore_remove: "Anwybyddu/Tynnu"
-      new_aspect:
-          add_a_new_aspect: "Ychwanegwch agwedd newydd"
-          create: "Creu"
-      create:
-          success:"Cliciwch ar y plus ar y chwith i ddweud wrth Diaspora pwy all weld eich agwedd newydd."
-  users:
-      edit:
-          editing_profile: "Golygu proffil"
-      profile:
-          cancel: "Cancel"
-          update_profile: "Diweddaru Proffil"
-          home: "Adref"
-          diaspora_username: "FFUGENW DIASPORA"
-          info: "Gwybodaeth"
-          picture: "Llun"
-          editing_profile: "Golygu proffil"
-          albums: "Albymau"
-          you_dont_have_any_photos: "Does gennych chi ddim lluniau!  Ewch i'r"
-          page_to_upload_some:  "dudalen i uwchlwytho rhai."
-  comments:
-      comment:
-          ago: "yn ol"
-      new_comment:
-          comment: "Sylw"
-  photos:
-      show:
-          prev: "blaenorol"
-          full_size: "maint llawn"
-          next: "neasf"
-          edit_photo: "Golygu Llun"
-          delete_photo: "Dileu Llun"
-          are_you_sure: "Ydych chi'n sicr?"
-          comments: "sylwadau"
-      edit:
-          editing: "Golygu"
-          are_you_sure: "Ydych chi'n sicr?"
-          delete_photo: "Dileu Llun"
-      photo:
-          show_comments: "dangos sylwadau"
-          posted_a_new_photo_to: "postiwyd llun newydd i"
-      new:
-          new_photo: "Llun Newydd"
-          back_to_list: "Nol i'r Rhestr"
-          post_it: "postiwch e!"
-  registrations:
-      new:
-          sign_up: "Cofrestrwch"
-  status_messages:
-      new_status_message:
-          tell_me_something_good: "Dwi eisiau clywed rhwbeth da"
-          oh_yeah: "oh yeah!"
-      status_message:
-          show_comments: "dangos sylwadau"
-          delete: "Dileu"
-          are_you_sure: "Ydych chi'n sicr?"
-      show:
-          status_message: "Neges Statws"
-          comments: "sylwadau"
-          are_you_sure: "Ydych chi'n sicr?"
-          destroy: "Dinistrio"
-          view_all: "Gweld Pob Un"
-          message: "Neges"
-          owner: "Perchennog"
-  people:
-      index:
-          add_friend: "ychwanegu ffrind"
-          real_name: "enw llawn"
-          diaspora_handle: "bachyn diaspora"
-          thats_you: "dyna chi!"
-          friend_request_pending: "cais ffrind dan ystyriaeth"
-          you_have_a_friend_request_from_this_person: "mae'r person yma eisiau bod yn ffrind i chi"
-      new:
-          new_person: "Person Newydd"
-          back_to_list: "Nol i'r Rhestr"
-      show:
-          last_seen: "gwelwyd diwethaf: %{how_long_ago}"
-          friends_since: "yn ffrindiau ers: %{how_long_ago}"
-          save: "arbed"
-          are_you_sure: "Ydych chi'n sicr?"
-          remove_friend: "dileu ffrind"
+cy: 
+  _photos: photos
+  _services: Services
+  account: Account
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "is already taken"
+        user: 
+          attributes: 
+            email: 
+              taken: "is already taken"
+            person: 
+              invalid: "is invalid"
+            username: 
+              taken: "is already taken"
+  ago: ago
+  application: 
+    helper: 
+      unknown_person: "unknown person"
+      youtube_title: 
+        unknown: "Unknown Video Title"
+  are_you_sure: "Are you sure?"
+  aspects: 
+    add_to_aspect: 
+      failure: "Failed to add friend to aspect."
+      success: "Successfully added friend to aspect."
+    create: 
+      failure: "Aspect creation failed."
+      success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
+    destroy: 
+      success: "%{name} was successfully removed."
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "Aspect not empty"
+      remove: remove
+    manage: 
+      add_a_new_aspect: "Ychwanegwch agwedd"
+      add_a_new_contact: "Add a new contact"
+      drag_to_add: "Drag to add people"
+      manage_aspects: "Manage aspects"
+      no_requests: "No new requests"
+      requests: Ceisiadau
+    move_contact: 
+      error: "Error moving contact: %{inspect}"
+      failure: "didn't work %{inspect}"
+      success: "Person moved to new aspect"
+    new_aspect: 
+      create: Creu
+      name: Name
+    no_contacts_message: 
+      add_contact: "Add a contact"
+      add_contact_to: "Add someone to %{aspect_name}"
+      invite: "Invite someone to join Diaspora!"
+      nobody: "We know you know people — bring them to Diaspora!"
+      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+    no_posts_message: 
+      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+    remove_from_aspect: 
+      failure: "Failed to remove person from aspect"
+      success: "Successfully removed person from aspect"
+    update: 
+      success: "Your aspect, %{name}, has been successfully edited."
+  back: Back
+  cancel: Cancel
+  comments: 
+    new_comment: 
+      comment: Sylw
+      commenting: Commenting...
+  dashboards: 
+    helper: 
+      home: Home
+  delete: Delete
+  email: Email
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Correct the following errors and try again."
+      invalid_fields: "Invalid Fields"
+  fill_me_out: "Fill me out"
+  home: 
+    show: 
+      already_account: "already have an account?"
+      login_here: "log in here"
+      share_what_you_want: "Share what you want, with who you want."
+  invitations: 
+    check_token: 
+      not_found: "Invitation token not found"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "You already invited this person."
+      no_more: "You have no more invitations."
+      sent: "Your invitation has been sent."
+    new: 
+      if_they_accept_info: "if they accept, they will be added to the aspect you invited them"
+      invite_someone_to_join: "Invite someone to join Diaspora!"
+      message: "Message:"
+      send_an_invitation: "Send an invitation"
+      send_invitation: "Send invitation"
+      to: To
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: "account settings"
+      blog: blog
+      developers: developers
+      edit_profile: "edit profile"
+      login: login
+      logout: logout
+      view_profile: "view profile"
+  notifier: 
+    diaspora: "the diaspora email robot"
+    hello: "Hello %{name}!"
+    love: "love,"
+    new_request: 
+      just_sent_you: "just sent you a friend request on Diaspora*"
+      sign_in: "sign in here"
+      subject: "new Diaspora* friend request from %{from}"
+      try_it_out: "You should really think about checking it out."
+    request_accepted: 
+      accepted: "has accepted your friend request. They are now in your"
+      aspect: aspect.
+      subject: "%{name} has accepted your friend request on Diaspora*"
+  ok: OK
+  or: or
+  password: Password
+  password_confirmation: "Password confirmation"
+  people: 
+    edit: 
+      allow_search: "Allow for people to search for you"
+      first_name: "First name"
+      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      last_name: "Last name"
+      update_profile: "Update Profile"
+      your_bio: "Your bio"
+      your_birthday: "Your birthday"
+      your_gender: "Your gender"
+      your_name: "Your name"
+      your_photo: "Your photo"
+      your_profile: "Your profile"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: " results for %{params}"
+    index: 
+      results_for: "search results for"
+    person: 
+      add_contact: "add contact"
+      already_connected: "Already connected"
+      pending_request: "pending request"
+      thats_you: "thats you!"
+    profile_photo_upload: 
+      or_select_one: "or select one from your already existing"
+    profile_sidebar: 
+      bio: bio
+      born: born
+      edit_my_profile: "Edit my profile"
+      gender: gender
+      in_aspects: "in aspects"
+      last_seen: "last seen: %{how_long_ago}"
+      remove_contact: "remove contact"
+    show: 
+      already_requested: "You have already sent a request to %{name}."
+      does_not_exist: "Person does not exist!"
+      no_posts: "no posts to display!"
+      not_connected: "You are not connected with this person"
+      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+    update: 
+      failed: "Failed to update profile"
+      updated: "Profile updated"
+  photos: 
+    create: 
+      integrity_error: "Photo upload failed.  Are you sure that was an image?"
+      runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
+      type_error: "Photo upload failed.  Are you sure an image was added?"
+    destroy: 
+      notice: "Photo deleted."
+    edit: 
+      editing: Golygu
+    new: 
+      back_to_list: "Nol i'r Rhestr"
+      new_photo: "Llun Newydd"
+      post_it: "postiwch e!"
+    new_photo: 
+      drop: "Drop photos here to upload"
+      empty: "{file} is empty, please select files again without it."
+      failed: Failed
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      upload: "Upload a photo"
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      add_a_description: "Add a description"
+      delete_photo: "Dileu Llun"
+      edit_photo: "Golygu Llun"
+      full_size: "maint llawn"
+      make_profile_photo: "make profile photo"
+      next: neasf
+      prev: blaenorol
+      update_photo: "Update Photo"
+    update: 
+      error: "Failed to edit photo."
+      notice: "Photo successfully updated."
+  profile: Profile
+  registrations: 
+    closed: "Signups are closed on this Diaspora pod."
+    create: 
+      success: "You've joined Diaspora!"
+    edit: 
+      cancel_my_account: "Cancel my account"
+      edit: "Edit %{name}"
+      leave_blank: "(leave blank if you don't want to change it)"
+      password_to_confirm: "(we need your current password to confirm your changes)"
+      unhappy: Unhappy?
+      update: Update
+    new: 
+      sign_up: Cofrestrwch
+      sign_up_for_diaspora: "Sign up for Diaspora"
+  requests: 
+    create: 
+      sending: Sending...
+      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      tried: "we tried our best to send a message to %{account}"
+    destroy: 
+      error: "Please select an aspect!"
+      ignore: "Ignored friend request."
+      success: "You are now friends."
+    manage_aspect_contacts: 
+      contact_username: "Contact's username"
+      create_request: "Create request"
+      enter_a_diaspora_username: "Enter a Diaspora username:"
+      existing: "Existing contacts"
+      know_email: "Know their email address? You should invite them"
+      manage_within: "Manage contacts within"
+      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+  search: Search
+  services: 
+    create: 
+      success: "Authentication successful."
+    destroy: 
+      success: "Successfully destroyed authentication."
+    index: 
+      connect_to_facebook: "Connect to facebook"
+      connect_to_twitter: "Connect to twitter"
+      disconnect: disconnect
+      logged_in_as: "logged in as"
+      really_disconnect: "disconnect %{service}?"
+  settings: Settings
+  shared: 
+    aspect_contacts: 
+      add_contacts: "add contacts"
+      add_to: "add to %{aspect}"
+      everyone: Everyone
+      manage: "manage %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "add a new aspect"
+      everyone: Everyone
+      manage: Rheoli
+      manage_your_aspects: "Rheoli eich agweddau"
+    author_info: 
+      all: all
+      status_messages: "status messages"
+      view_profile: "View profile"
+      viewing: viewing
+    contact_list: 
+      add_to: "Add %{name} to %{aspect}"
+      remove_from: "Remove %{name} from %{aspect}"
+      search_contacts: "Search contacts"
+    invitations: 
+      invitations_left: "(%{count} left)"
+      invite_someone: "Invite someone"
+      invites: Invites
+    notification: 
+      new: "New %{type} from %{from}"
+    public_explain: 
+      logged_in: "logged in to %{service}"
+      manage: "manage connected services"
+      outside: "Public messages will be available for others outside of Diaspora to see."
+      title: "You are about to post a public message!"
+    publisher: 
+      all: all
+      make_public: "make public"
+      post_a_message_to: "Post a message to %{aspect}"
+      posting: Posting...
+      share: Rhannu
+      share_with: "Share with %{aspect}"
+      share_with_all: "Share with all aspects"
+    reshare: 
+      reshare: Reshare
+    stream_element: 
+      show_comments: "show comments"
+  status_messages: 
+    helper: 
+      no_message_to_display: "No message to display."
+    new_status_message: 
+      oh_yeah: "oh yeah!"
+      tell_me_something_good: "Dwi eisiau clywed rhwbeth da"
+    show: 
+      destroy: Dinistrio
+  the_world: "the world"
+  username: Username
+  users: 
+    destroy: "Account successfully closed."
+    edit: 
+      change_language: "Change Language"
+      change_password: "Change Password"
+      close_account: "Close Account"
+      download_photos: "download my photos"
+      download_xml: "download my xml"
+      export_data: "Export Data"
+      invite_contacts: "Invite contacts"
+      new_password: "New Password"
+    getting_started: 
+      connect_services: "Connect your services"
+      define_aspects: "Define your aspects"
+      edit_profile: "Edit your profile"
+      save_and_continue: "Save and continue"
+      signup_steps: "Complete your sign-up by doing these things:"
+      skip: "skip getting started"
+      step_1: 
+        your_profile: "Your Profile"
+      step_2: 
+        add: Add
+        aspect_name: "Aspect name"
+        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+        your_aspects: "Your aspects"
+      step_3: 
+        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
+        your_services: "Your services"
+      step_4: 
+        change_profile: "You can change your profile any time by clicking"
+        connect_disconnect: "You can connect/disconnect your services any time by clicking"
+        continue: "Continue on to your everyone page, an overview of all of your aspects."
+        finish: Finish
+        manage_aspects: "You can manage your aspects any time by clicking the"
+        ready_to_share: "You're now ready to start sharing with "
+        set_up: "You're all set up, %{name}!"
+        tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+        user_menu: "in your user menu (top right)."
+      welcome: "Welcome to Diaspora!"
+    public: 
+      does_not_exist: "User %{username} does not exist!"
+    update: 
+      language_changed: "Language Changed"
+      language_not_changed: "Language Change Failed"
+      password_changed: "Password Changed"
+      password_not_changed: "Password Change Failed"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
new file mode 100644
index 000000000..ca7a213c9
--- /dev/null
+++ b/config/locales/diaspora/da.yml
@@ -0,0 +1,355 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+da: 
+  _photos: foto
+  _services: Services
+  account: Account
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "is already taken"
+        user: 
+          attributes: 
+            email: 
+              taken: "is already taken"
+            person: 
+              invalid: "is invalid"
+            username: 
+              taken: "is already taken"
+  ago: ago
+  application: 
+    helper: 
+      unknown_person: "unknown person"
+      youtube_title: 
+        unknown: "Unknown Video Title"
+  are_you_sure: "Are you sure?"
+  aspects: 
+    add_to_aspect: 
+      failure: "Failed to add contact to aspect."
+      success: "Successfully added contact to aspect."
+    create: 
+      failure: "Aspect creation failed."
+      success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
+    destroy: 
+      success: "%{name} was successfully removed."
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "Aspect not empty"
+      remove: remove
+    manage: 
+      add_a_new_aspect: "Add a new aspect"
+      add_a_new_contact: "Add a new contact"
+      drag_to_add: "Drag to add people"
+      manage_aspects: "Manage aspects"
+      no_requests: "No new requests"
+      requests: Requests
+    move_contact: 
+      error: "Error moving contact: %{inspect}"
+      failure: "didn't work %{inspect}"
+      success: "Person moved to new aspect"
+    new_aspect: 
+      create: Create
+      name: Name
+    no_contacts_message: 
+      add_contact: "Add a contact"
+      add_contact_to: "Add someone to %{aspect_name}"
+      invite: "Invite someone to join Diaspora!"
+      nobody: "We know you know people — bring them to Diaspora!"
+      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+    no_posts_message: 
+      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+    remove_from_aspect: 
+      failure: "Failed to remove person from aspect"
+      success: "Successfully removed person from aspect"
+    update: 
+      success: "Your aspect, %{name}, has been successfully edited."
+  back: Back
+  cancel: Cancel
+  comments: 
+    new_comment: 
+      comment: Comment
+      commenting: Commenting...
+  dashboards: 
+    helper: 
+      home: Home
+  delete: Delete
+  email: Email
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Correct the following errors and try again."
+      invalid_fields: "Invalid Fields"
+  fill_me_out: "Fill me out"
+  home: 
+    show: 
+      already_account: "already have an account?"
+      login_here: "log in here"
+      share_what_you_want: "Share what you want, with who you want."
+  invitations: 
+    check_token: 
+      not_found: "Invitation token not found"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "You already invited this person."
+      no_more: "You have no more invitations."
+      sent: "Your invitation has been sent."
+    new: 
+      if_they_accept_info: "if they accept, they will be added to the aspect you invited them"
+      invite_someone_to_join: "Invite someone to join Diaspora!"
+      message: "Message:"
+      send_an_invitation: "Send an invitation"
+      send_invitation: "Send invitation"
+      to: To
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: "account settings"
+      blog: blog
+      developers: developers
+      edit_profile: "edit profile"
+      login: login
+      logout: logout
+      view_profile: "view profile"
+  notifier: 
+    diaspora: "the diaspora email robot"
+    hello: "Hello %{name}!"
+    love: "love,"
+    new_request: 
+      just_sent_you: "just sent you a contact request on Diaspora*"
+      sign_in: "sign in here"
+      subject: "new Diaspora* contact request from %{from}"
+      try_it_out: "You should really think about checking it out."
+    request_accepted: 
+      accepted: "has accepted your contact request. They are now in your"
+      aspect: aspect.
+      subject: "%{name} has accepted your contact request on Diaspora*"
+  ok: OK
+  or: or
+  password: Password
+  password_confirmation: "Password confirmation"
+  people: 
+    edit: 
+      allow_search: "Allow for people to search for you"
+      first_name: "First name"
+      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      last_name: "Last name"
+      update_profile: "Update Profile"
+      your_bio: "Your bio"
+      your_birthday: "Your birthday"
+      your_gender: "Your gender"
+      your_name: "Your name"
+      your_photo: "Your photo"
+      your_profile: "Your profile"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: " results for %{params}"
+    index: 
+      results_for: "search results for"
+    person: 
+      add_contact: "add contact"
+      already_connected: "Already connected"
+      pending_request: "pending request"
+      thats_you: "thats you!"
+    profile_photo_upload: 
+      or_select_one: "or select one from your already existing"
+    profile_sidebar: 
+      bio: bio
+      born: born
+      edit_my_profile: "Edit my profile"
+      gender: gender
+      in_aspects: "in aspects"
+      last_seen: "last seen: %{how_long_ago}"
+      remove_contact: "remove contact"
+    show: 
+      already_requested: "You have already sent a request to %{name}."
+      does_not_exist: "Person does not exist!"
+      no_posts: "no posts to display!"
+      not_connected: "You are not connected with this person"
+      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+    update: 
+      failed: "Failed to update profile"
+      updated: "Profile updated"
+  photos: 
+    create: 
+      integrity_error: "Photo upload failed.  Are you sure that was an image?"
+      runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
+      type_error: "Photo upload failed.  Are you sure an image was added?"
+    destroy: 
+      notice: "Photo deleted."
+    edit: 
+      editing: Editing
+    new: 
+      back_to_list: "Back to List"
+      new_photo: "New Photo"
+      post_it: "post it!"
+    new_photo: 
+      drop: "Drop photos here to upload"
+      empty: "{file} is empty, please select files again without it."
+      failed: Failed
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      upload: "Upload a photo"
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      add_a_description: "Add a description"
+      delete_photo: "Delete Photo"
+      edit_photo: "Edit Photo"
+      full_size: "full size"
+      make_profile_photo: "make profile photo"
+      next: next
+      prev: prev
+      update_photo: "Update Photo"
+    update: 
+      error: "Failed to edit photo."
+      notice: "Photo successfully updated."
+  profile: Profile
+  registrations: 
+    closed: "Signups are closed on this Diaspora pod."
+    create: 
+      success: "You've joined Diaspora!"
+    edit: 
+      cancel_my_account: "Cancel my account"
+      edit: "Edit %{name}"
+      leave_blank: "(leave blank if you don't want to change it)"
+      password_to_confirm: "(we need your current password to confirm your changes)"
+      unhappy: Unhappy?
+      update: Update
+    new: 
+      sign_up: "Sign up"
+      sign_up_for_diaspora: "Sign up for Diaspora"
+  requests: 
+    create: 
+      sending: Sending...
+      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      tried: "we tried our best to send a message to %{account}"
+    destroy: 
+      error: "Please select an aspect!"
+      ignore: "Ignored contact request."
+      success: "You are now friends."
+    manage_aspect_contacts: 
+      contact_username: "Contact's username"
+      create_request: "Create request"
+      enter_a_diaspora_username: "Enter a Diaspora username:"
+      existing: "Existing contacts"
+      know_email: "Know their email address? You should invite them"
+      manage_within: "Manage contacts within"
+      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+  search: Search
+  services: 
+    create: 
+      success: "Authentication successful."
+    destroy: 
+      success: "Successfully destroyed authentication."
+    index: 
+      connect_to_facebook: "Connect to facebook"
+      connect_to_twitter: "Connect to twitter"
+      disconnect: disconnect
+      logged_in_as: "logged in as"
+      really_disconnect: "disconnect %{service}?"
+  settings: Settings
+  shared: 
+    aspect_contacts: 
+      add_contacts: "add contacts"
+      add_to: "add to %{aspect}"
+      everyone: Everyone
+      manage: "manage %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "add a new aspect"
+      everyone: Everyone
+      manage: Manage
+      manage_your_aspects: "Manage your Aspects"
+    author_info: 
+      all: all
+      status_messages: "status messages"
+      view_profile: "View profile"
+      viewing: viewing
+    contact_list: 
+      add_to: "Add %{name} to %{aspect}"
+      remove_from: "Remove %{name} from %{aspect}"
+      search_contacts: "Search contacts"
+    invitations: 
+      invitations_left: "(%{count} left)"
+      invite_someone: "Invite someone"
+      invites: Invites
+    notification: 
+      new: "New %{type} from %{from}"
+    public_explain: 
+      logged_in: "logged in to %{service}"
+      manage: "manage connected services"
+      outside: "Public messages will be available for others outside of Diaspora to see."
+      title: "You are about to post a public message!"
+    publisher: 
+      all: all
+      make_public: "make public"
+      post_a_message_to: "Post a message to %{aspect}"
+      posting: Posting...
+      share: Share
+      share_with: "Share with %{aspect}"
+      share_with_all: "Share with all aspects"
+    reshare: 
+      reshare: Reshare
+    stream_element: 
+      show_comments: "show comments"
+  status_messages: 
+    helper: 
+      no_message_to_display: "No message to display."
+    new_status_message: 
+      oh_yeah: "oh yeah!"
+      tell_me_something_good: "tell me something good"
+    show: 
+      destroy: Destroy
+  the_world: "the world"
+  username: Username
+  users: 
+    destroy: "Account successfully closed."
+    edit: 
+      change_language: "Change Language"
+      change_password: "Change Password"
+      close_account: "Close Account"
+      download_photos: "download my photos"
+      download_xml: "download my xml"
+      export_data: "Export Data"
+      invite_contacts: "Invite contacts"
+      new_password: "New Password"
+    getting_started: 
+      connect_services: "Connect your services"
+      define_aspects: "Define your aspects"
+      edit_profile: "Edit your profile"
+      save_and_continue: "Save and continue"
+      signup_steps: "Complete your sign-up by doing these things:"
+      skip: "skip getting started"
+      step_1: 
+        your_profile: "Your Profile"
+      step_2: 
+        add: Add
+        aspect_name: "Aspect name"
+        description: "Tell Diaspora what different aspects of you are seen by different contacts.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+        your_aspects: "Your aspects"
+      step_3: 
+        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
+        your_services: "Your services"
+      step_4: 
+        change_profile: "You can change your profile any time by clicking"
+        connect_disconnect: "You can connect/disconnect your services any time by clicking"
+        continue: "Continue on to your everyone page, an overview of all of your aspects."
+        finish: Finish
+        manage_aspects: "You can manage your aspects any time by clicking the"
+        ready_to_share: "You're now ready to start sharing with "
+        set_up: "You're all set up, %{name}!"
+        tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+        user_menu: "in your user menu (top right)."
+      welcome: "Welcome to Diaspora!"
+    public: 
+      does_not_exist: "User %{username} does not exist!"
+    update: 
+      language_changed: "Language Changed"
+      language_not_changed: "Language Change Failed"
+      password_changed: "Password Changed"
+      password_not_changed: "Password Change Failed"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 132f566ab..afdddc534 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -2,289 +2,354 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-#   Localization file for German
 
-de:
-  settings: "Einstellungen"
-  profile: "Profil"
-  account: "Konto"
-  services: "Dienste"
-  cancel: "Abbrechen"
-  delete: "Löschen"  
-  or: "oder"
-  by: "von"
-  ago: "her"
-  username: "Benutzername"
-  email: "E-Mail"
-  home: "Start"
-  password: "Passwort"
-  password_confirmation: "Passwort bestätigen"
+de: 
+  _photos: Fotos
+  _services: Dienste
+  account: Konto
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "ist bereits benutzt"
+        user: 
+          attributes: 
+            email: 
+              taken: "ist bereits benutzt"
+            person: 
+              invalid: "ist ungültig"
+            username: 
+              taken: "ist bereits benutzt"
+  ago: her
+  application: 
+    helper: 
+      unknown_person: "unbekannte Person"
+      youtube_title: 
+        unknown: "Unbekannter Video Titel"
   are_you_sure: "Bist du sicher?"
-  
-  activemodel:
-      errors:
-          models:
-              user:
-                  attributes:
-                      person:
-                          invalid: "ist ungültig"
-                      username:
-                          taken: "ist bereits benutzt"
-                      email:
-                          taken: "ist bereits benutzt"
-              person:
-                  attributes:
-                      diaspora_handle:
-                          taken: "ist bereits benutzt"
-  hello: "Hallo Welt"
-  application:
-      helper:
-          unknown_person: "unbekannte Person"
-          new_requests: "neue Anfragen"
-  error_messages:
-      helper:
-          invalid_fields: "Ungültige Felder"
-          correct_the_following_errors_and_try_again: "Korrigiere die folgenden Fehler und versuche es erneut."
-  people: #FIXME: seems unused
-      helper:
-           results_for: " Ergebnisse für %{params}"
-           people_on_pod_are_aware_of: " Leute auf dem Pod sind aufmerksam auf"
-  layouts:
-      application:
-          view_profile: "Profil anzeigen"
-          edit_profile: "Profil bearbeiten"
-          account_settings: "Konto Einstellungen"
-          search: "Suche"
-          logout: "Abmelden"
-  shared:
-      aspect_nav:
-          all_aspects: "Alle Aspekte"
-          manage: "Verwalten"
-          manage_your_aspects: "Deine Aspekte verwalten"
-      sub_header:
-          all_aspects: "Alle Aspekte"
-          manage_aspects: "Aspekte verwalten"
-      publisher:
-          share: "Teilen"
-          post_a_message_to: "Sende eine Nachricht an %{aspect}"
-          make_public: "öffentlich machen"
-      aspect_friends:
-          add_friends: "Freunde hinzufügen"
-          photos: "Fotos"
-      invitations:
-          invites: 'Einladungen'
-          invite_a_friend: 'Freund einladen'
-          invitations_left: '(%{count} übrig)'
-      reshare:
-          reshare: 'Erneut senden an'
-      author_info:
-          view_profile: 'View profile'
-  albums:
-      album:
-          you: "Du"
-      new_album:
-          create: "Hinzufügen"
-          add_a_new_album: "Album hinzufügen"
-      show:
-          edit_album: "Album bearbeiten"
-          albums: "Alben"
-          updated: "aktualisiert"
-      edit:
-          album_name: "Name des Albums"
-          editing: "Bearbeiten"
-          updated: "aktualisiert"
-          update_album: "Album aktualisieren"
-          delete_album: "Album löschen"
-      index:
-          new_album: "Neues Album"
-      create:
-          success: "Du hast das Album %{name} erstellt."
-      update:
-          success: "Album %{name} erfolgreich bearbeitet."
-          failure: "Bearbeiten des Album %{name} fehlgeschlagen."
-      destroy:
-          success: "Album %{name} gelöscht."
-      helper:
-          friends_albums: "Alben von Freunden"
-          your_albums: "Deine Alben"
-  aspects:
-      no_friends_message:
-          nobody: "Wir wissen du hast Freunde, hole sie an Bord!"
-          nobody_in_aspect: "Dein Aspekt %{aspect_name} ist leer."
-          add_friend: "Freund hinzufügen"
-          add_friend_to: "Jemanden zum Aspekt %{aspect_name} hinzufügen"
-          invite: "Jemanden zu Diaspora einladen!"
-      no_posts_message:
-          start_talking:  "Niemand hat bisher etwas gesagt. Beginne die Konversation!"
-      manage:
-          add_a_new_aspect: "Neuen Aspekt hinzufügen"
-          add_a_new_friend:  "Neuen Freund hinzufügen"
-          show: "Zeigen"
-          update_aspects: "Aspekte aktualisieren"
-          requests: "Anfragen"
-          ignore_remove: "Ignorieren/Entfernen"
-      new_aspect:
-          add_a_new_aspect: "Neuen Aspekt hinzufügen"
-          name: "Name"
-          create: "Erstellen"
-      create:
-          success: "Klicke auf das Plus auf der linken Seite um Diaspora zu sagen wer deinen neuen Aspekt sehen kann."
-          failure: "Erstellen des Aspekt fehlgeschlagen."
-      destroy:
-          success: "%{name} wurde erfolgreich entfernt."
-      update:
-          success: "Dein Aspekt %{name} wurde erfolgreich bearbeitet."
-      move_friend:
-          failure: "hat nicht funktioniert %{inspect}"
-          success: "Person zu neuem Aspekt verschoben"
-      add_to_aspect:
-          failure: "Hinzufügen des Freundes zum Aspekt fehlgeschlagen."
-          success: "Freund erfolgreich zum Aspekt hinzugefügt."
-      helper:
-          remove: "entfernen"
-          aspect_not_empty: "Aspekt ist nicht leer"
-  users:
-      edit:
-          editing_profile: "Profil bearbeiten"
-          invite_friends: "Feunde einladen"
-          export_data: "Konto exportieren"
-          close_account: "Konto schließen"
-          change_language: "Sprache ändern"
-          change_password: "Passwort ändern"
-          new_password: "Neues Passwort"
-      destroy: "Konto erfolgreich geschlossen."
-      getting_started:
-          signup_steps: "Vervollständige deine Registrierung indem du folgende Dinge tust:"
-          'step_1':
-              albums: "Alben"
-              you_dont_have_any_photos: "Du hast keine Fotos! Gehe zur"
-              page_to_upload_some:  "Seite um welche hochzuladen."
-  comments:
-      new_comment:
-          comment: "Kommentieren"
-  photos:
-      show:
-          prev: "zurück"
-          full_size: "volle Größe"
-          next: "weiter"
-          edit_photo: "Foto bearbeiten"
-          delete_photo: "Foto löschen"
-          comments: "Kommentare"
-      edit:
-          editing: "Bearbeiten"
-          delete_photo: "Foto löschen"
-      photo:
-          show_comments: "Kommentare zeigen"
-          posted_a_new_photo_to: "Hinzugefügt:"
-      new:
-          new_photo: "Neues Foto"
-          back_to_list: "Zurück zu Liste"
-          post_it: "Poste es!"
-      create:
-          runtime_error: "Der Server wollte das Foto nicht bearbeiten, bist du darauf zu sehen?"
-          integrity_error: "Hochladen des Fotos fehlgeschlagen. Bist du sicher das es ein Foto war?"
-          type_error: "Hochladen des Foto fehlgeschlagen. Du solltest hier nur FOTOS hochladen..."
-      update:
-          notice: "Foto erfolgreich aktualisiert."
-          error:  "Bearbeiten des Fotos fehlgeschlagen."
-      destroy:
-          notice: "Foto gelöscht."
-  registrations:
-      new:
-          sign_up: "Registrieren"
-          sign_up_for_diaspora: "Ein Diaspora Konto anlegen"
-          upload_existing_account: "Ein existierendes Konto hochladen"
-          upload: "Hochladen"
-      create:
-          success: "Willkommen bei Diaspora!"
-  invitations:
-      create:
-          sent: 'Deine Einladung wurde verschickt.'
-          no_more: 'Du hast keine Einladungen mehr.'
-          already_sent: 'Du hast diese Person bereits eingeladen.'
-          already_friends: 'Du bist bereits mit dieser Person befreundet'
-          invitation_token_invalid: 'Das Einladungstoken ist ungültig!'
-          updated: 'Dein Passwort wurde erfolgreich gespeichert. Du bist jetzt angemeldet.'
-      new:
-          invite_someone_to_join: 'Lade jemanden zu Diaspora ein!'
-          if_they_accept_info: 'Wenn sie akzeptieren findest du sie im Aspekt in den du sie eingeladen hast'
-          to: 'An'
-          message: 'Nachricht:'
-          send_an_invitation: 'Eine Einladung senden'
-          send_invitation: 'Einladung senden'
-
-  status_messages:
-      new_status_message: #FIXME: seems unused
-          tell_me_something_good: "Was gibt es neues?"
-          oh_yeah: "oh yeah!"
-      status_message:
-          show_comments: "Kommentare zeigen"
-      show:
-          status_message: "Status Nachricht"
-          comments: "Kommentare"
-          destroy: "Zerstören"
-          view_all: "Alle zeigen"
-          message: "Nachricht"
-          owner: "Besitzer"
-      helper:
-          no_message_to_display: "Keine Nachricht zum anzeigen."
-  people:
-      person:
-          add_friend: "Freund hinzufügen"
-          pending_request: "Ausstehende Anfrage"
-      index:
-          add_friend: "Freund hinzufügen"
-          real_name: "Realer Name"
-          diaspora_handle: "Diaspora Adresse"
-          thats_you: "Das bist du!"
-          friend_request_pending: "Ausstehende Freundes-Anfrage"
-          you_have_a_friend_request_from_this_person: "Du hast eine Freundes-Anfrage von dieser Person"
-      new:
-          new_person: "Neue Person"
-          back_to_list: "Zurück zur Liste"
-      show:
-          last_seen: "Zuletzt gesehen vor: %{how_long_ago}" #FIXME: appends ago
-          friends_since: "Freunde seit: %{how_long_ago}"
-          save: "speichern"
-          remove_friend: "Freund entfernen"
-          no_posts: "Keine Posts zum anzeigen!"
-          add_friend: "Freund hinzufügen"
-          edit_my_profile: "Mein Profil bearbeiten"
-      edit:
-          info_available_to: "Diese Infos werden für alle verfügbar sein mit denen du bei Diaspora verbunden bist."
-          your_profile: "Dein Profil"
-          your_name: "Dein Name"
-          first_name: "Vorname"
-          last_name: "Nachname"
-          your_gender: "Dein Geschlecht"
-          your_birthday: "Dein Geburtstag"
-          your_bio: "Deine Info"
-          fill_me_out: "Füll mich aus"
-          your_photo: "Dein Foto"
-          update_profile: "Profil aktualisieren"
-          diaspora_username: "DIASPORA ADRESSE"
-          info: "Info"
-          picture: "Bild"
-          editing_profile: "Profil bearbeiten"
-          albums: "Alben"
-          you_dont_have_any_photos: "Du hast keine Fotos! Gehe zur"
-          page_to_upload_some:  "Seite um welche hochzuladen."
-  requests:
-      new_request:
-          add_a_new_friend_to: "Neuen Freund hinzufügen zu"
-          enter_a_diaspora_username: "Gib eine Diaspora Adresse ein:"
-          your_diaspora_username_is: "Deine Diaspora Adresse ist: %{diaspora_handle}"
-          friends_username: "Diaspora Addresse deines Freundes"
-          create_request: "Anfrage erstellen"
-      destroy:
-          success: "Ihr seit jetzt Freunde."
-          error: "Bitte wähle einen Aspekt!"
-          ignore: "Freundes-Anfrage ignoriert."
-      create:
-          error: "Keinen Diaspora Seed mit dieser E-Mail gefunden!" #FIXME: wtf?
-          invalid_identity: "Diese Diaspora Adresse ist nicht richtig formatiert"
-          error_server: "Problem mit dem anderen Server. Vielleicht existiert er nicht?"
-          yourself: "Du kannst dich nicht mit dir selbst befreunden!"
-          already_friends: "Du bist bereits mit %{destination_url} befreundet!"
-          success: "Eine Freundes-Anfrage wurde an %{destination_url} geschickt."
-          horribly_wrong: "Irgendwas ist furchtbar schief gelaufen."
+  aspects: 
+    add_to_aspect: 
+      failure: "Hinzufügen des Kontaktes zum Aspekt fehlgeschlagen."
+      success: "Kontakt erfolgreich zum Aspekt hinzugefügt."
+    create: 
+      failure: "Erstellen des Aspekt fehlgeschlagen."
+      success: "Klicke auf das Plus auf der linken Seite um Diaspora zu sagen wer deinen neuen Aspekt sehen kann."
+    destroy: 
+      success: "%{name} wurde erfolgreich entfernt."
+    helper: 
+      are_you_sure: "Bist du sicher das du diesen Aspekt löschen möchtest?"
+      aspect_not_empty: "Aspekt ist nicht leer"
+      remove: entfernen
+    manage: 
+      add_a_new_aspect: "Neuen Aspekt hinzufügen"
+      add_a_new_contact: "Neuen Kontakt hinzufügen"
+      drag_to_add: "Leute hierher ziehen um sie hinzuzufügen"
+      manage_aspects: "Aspkete verwalten"
+      no_requests: "Keine Anfragen"
+      requests: Anfragen
+    move_contact: 
+      error: "Fehler beim verschieben des Kontaktes: %{inspect}"
+      failure: "hat nicht geklappt: %{inspect}"
+      success: "Person in neuen Aspekt verschoben"
+    new_aspect: 
+      create: Erstellen
+      name: Name
+    no_contacts_message: 
+      add_contact: "Einen Kontakt hinzufügen"
+      add_contact_to: "Jemanden zu %{aspect_name} hinzufügen"
+      invite: "Jemanden einladen an Diaspora teilzunehmen!"
+      nobody: "Du kennst bestimmt jemanden — hole ihn zu Diaspora!"
+      nobody_in_aspect: "Dein Aspekt %{aspect_name} ist leer."
+    no_posts_message: 
+      start_talking: "Niemand hat bisher etwas gesagt. Beginne die Konversation!"
+    remove_from_aspect: 
+      failure: "Person konnte nicht aus dem Aspekt entfernt werden"
+      success: "Person erfolgreich aus dem Aspekt entfernt"
+    update: 
+      success: "Dein Aspekt %{name} wurde erfolgreich bearbeitet."
+  back: Zurück
+  cancel: Abbrechen
+  comments: 
+    new_comment: 
+      comment: Kommentieren
+      commenting: Kommentieren...
+  dashboards: 
+    helper: 
+      home: Start
+  delete: Löschen
+  email: E-Mail
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Korrigiere die folgenden Fehler und versuche es erneut."
+      invalid_fields: "Ungültige Felder"
+  fill_me_out: "Füll mich aus"
+  home: 
+    show: 
+      already_account: "bereits registriert?"
+      login_here: "hier anmelden"
+      share_what_you_want: "Teile was du willst, mit wem du willst."
+  invitations: 
+    check_token: 
+      not_found: "Einladungstoken nicht gefunden"
+    create: 
+      already_contacts: "Du bist bereits mit dieser Person verbunden"
+      already_sent: "Du hast diese Person bereits eingeladen."
+      no_more: "Du hast keine Einladungen mehr."
+      sent: "Deine Einladung wurde verschickt."
+    new: 
+      if_they_accept_info: "Wenn sie akzeptieren findest du sie im Aspekt in den du sie eingeladen hast"
+      invite_someone_to_join: "Lade jemanden zu Diaspora ein!"
+      message: "Nachricht:"
+      send_an_invitation: "Eine Einladung senden"
+      send_invitation: "Einladung senden"
+      to: An
+  layouts: 
+    application: 
+      powered_by: "BETRIEBEN DURCH DIASPORA*"
+    header: 
+      account_settings: "Konto bearbeiten"
+      blog: Blog
+      developers: Entwickler
+      edit_profile: "Profil bearbeiten"
+      login: Anmelden
+      logout: Abmelden
+      view_profile: "Profil zeigen"
+  notifier: 
+    diaspora: "dein Diaspora-E-Mail-Roboter"
+    hello: "Hallo %{name}!"
+    love: "Es grüßt dich,"
+    new_request: 
+      just_sent_you: "hat dir gerade eine Kontakt-Anfrage auf Diaspora geschickt"
+      sign_in: "melde dich hier an"
+      subject: "Neue Diaspora Kontakt-Anfrage von %{from}"
+      try_it_out: "Du solltest wirklich darüber nachdenken es auszuprobieren.\n"
+    request_accepted: 
+      accepted: "hat deine Kontakt-Anfrage akzeptiert. Sie sind nun in deiner"
+      aspect: Aspekt.
+      subject: "%{name} hat deine Kontakt-Anfrage auf Diaspora akzeptiert"
+  ok: Ok
+  or: oder
+  password: Passwort
+  password_confirmation: "Passwort bestätigen"
+  people: 
+    edit: 
+      allow_search: "Erlaube anderen nach dir zu suchen"
+      first_name: Vorname
+      info_available_to: "Diese Infos werden für alle verfügbar sein mit denen du bei Diaspora verbunden bist."
+      last_name: Nachname
+      update_profile: "Profil aktualisieren"
+      your_bio: "Deine Info"
+      your_birthday: "Dein Geburtstag"
+      your_gender: "Dein Geschlecht"
+      your_name: "Dein Name"
+      your_photo: "Dein Foto"
+      your_profile: "Dein Profil"
+    helper: 
+      people_on_pod_are_aware_of: "Leute auf dem Pod wissen von"
+      results_for: "Ergebnisse für %{params}"
+    index: 
+      results_for: "Suchergebnisse für"
+    person: 
+      add_contact: "Kontakt hinzufügen"
+      already_connected: "Bereits verbunden"
+      pending_request: "Ausstehende Anfrage"
+      thats_you: "Das bist du!"
+    profile_photo_upload: 
+      or_select_one: "oder wähle eins von deinen existierenden"
+    profile_sidebar: 
+      bio: Info
+      born: Geboren
+      edit_my_profile: "Profil bearbeiten"
+      gender: Geschlecht
+      in_aspects: "in Aspekten"
+      last_seen: "Zuletzt gesehen: %{how_long_ago}"
+      remove_contact: "Kontakt entfernen"
+    show: 
+      already_requested: "Du hast bereits eine Anfrage an %{name} geschickt."
+      does_not_exist: "Person existiert nicht!"
+      no_posts: "Keine Posts zum anzeigen!"
+      not_connected: "Du bist nicht mit dieser Person verbunden"
+      request_people: "Wenn du möchtest kannst du ihn/sie fragen sich zu einem von deinen Aspekten hinzuzufügen."
+    update: 
+      failed: "Ändern des Profils fehlgeschlagen"
+      updated: "Profil aktualisiert"
+  photos: 
+    create: 
+      integrity_error: "Hochladen des Fotos fehlgeschlagen. Bist du sicher das es ein Foto war?"
+      runtime_error: "Der Server wollte das Foto nicht bearbeiten, bist du darauf zu sehen?"
+      type_error: "Hochladen des Foto fehlgeschlagen. Du solltest hier nur FOTOS hochladen..."
+    destroy: 
+      notice: "Foto gelöscht."
+    edit: 
+      editing: Bearbeiten
+    new: 
+      back_to_list: "Zurück zu Liste"
+      new_photo: "Neues Foto"
+      post_it: "Poste es!"
+    new_photo: 
+      drop: "Ziehe Fotos hierher um sie hochzuladen"
+      empty: "{file} ist leer, bitte wähle die Dateien erneut ohne sie."
+      failed: fehlgeschlagen
+      invalid_ext: "{file} hat keine gültige Erweiterung. Nur {extensions} sind erlaubt."
+      size_error: "{file} ist zu groß. Die maximale Dateigröße ist {sizeLimit}."
+      upload: "Ein Foto hochladen"
+    photo: 
+      view_all: "zeige alle Fotos von %{name}"
+    show: 
+      add_a_description: "Füge eine Beschreibung hinzu"
+      delete_photo: "Foto löschen"
+      edit_photo: "Foto bearbeiten"
+      full_size: "volle Größe"
+      make_profile_photo: "Zum Profilbild machen"
+      next: weiter
+      prev: zurück
+      update_photo: "Foto aktualisieren"
+    update: 
+      error: "Bearbeiten des Fotos fehlgeschlagen."
+      notice: "Foto erfolgreich aktualisiert."
+  profile: Profil
+  registrations: 
+    closed: "Registrierungen sind auf diesem Server geschlossen."
+    create: 
+      success: "Willkommen bei Diaspora!"
+    edit: 
+      cancel_my_account: "Mein Konto schließen"
+      edit: "%{name} bearbeiten"
+      leave_blank: "(lasse es leer wenn du es nicht ändern willst)"
+      password_to_confirm: "(wir brauchen dein aktuelles Passwort um deine Änderungen zu bestätigen)"
+      unhappy: Unglücklich?
+      update: Aktualisieren
+    new: 
+      sign_up: Registrieren
+      sign_up_for_diaspora: "Ein Diaspora Konto anlegen"
+  requests: 
+    create: 
+      sending: "Am senden..."
+      sent: "Du möchtest mit %{name} teilen. Sie sollten es beim nächsten anmelden bei Diaspora sehen."
+      tried: "Wir haben unser Bestes versucht eine Nachricht an %{account} zu senden"
+    destroy: 
+      error: "Bitte wähle einen Aspekt!"
+      ignore: "Anfrage des Kontaktes ignoriert."
+      success: "Ihr seit jetzt verbunden."
+    manage_aspect_contacts: 
+      contact_username: "Diaspora Addresse des Kontaktes"
+      create_request: "Anfrage erstellen"
+      enter_a_diaspora_username: "Gib eine Diaspora Addresse ein:"
+      existing: "Existierende Kontakte"
+      know_email: "Du kennst ihre E-Mail Addresse? Du solltest sie einladen"
+      manage_within: "Kontakte verwalten in"
+      your_diaspora_username_is: "Deine Diaspora Adresse ist: %{diaspora_handle}"
+  search: Suche
+  services: 
+    create: 
+      success: "Authentifizierung erfolgreich."
+    destroy: 
+      success: "Erfolgreich Authentifizierung zerstört."
+    index: 
+      connect_to_facebook: "Mit Facebook verbinden"
+      connect_to_twitter: "Mit Twitter verbinden"
+      disconnect: "Verbindung entfernen"
+      logged_in_as: "angemeldet als"
+      really_disconnect: "Verbindung mit %{service} entfernen?"
+  settings: Einstellungen
+  shared: 
+    aspect_contacts: 
+      add_contacts: "Kontakte hinzufügen"
+      add_to: "Zu %{aspect} hinzufügen"
+      everyone: Alle
+      manage: "Verwalte %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "Neuen Aspekt hinzufügen"
+      everyone: Alle
+      manage: Verwalten
+      manage_your_aspects: "Deine Aspekte verwalten"
+    author_info: 
+      all: alles
+      status_messages: "Status Nachrichten"
+      view_profile: "Profil anzeigen"
+      viewing: "du siehst"
+    contact_list: 
+      add_to: "%{name} zu %{aspect} hinzufügen"
+      remove_from: "%{name} aus %{aspect} entfernen"
+      search_contacts: "Kontakte durchsuchen"
+    invitations: 
+      invitations_left: "(%{count} übrig)"
+      invite_someone: "Jemanden einladen"
+      invites: Einladungen
+    notification: 
+      new: "Neue %{type} von %{from}"
+    public_explain: 
+      logged_in: "In %{service} eingeloggt"
+      manage: "Dienste verwalten"
+      outside: "Öffentliche Nachrichten werden für andere ausserhalb Diaspora zu sehen sein."
+      title: "Du bist dabei eine öffentliche Nachricht zu senden!"
+    publisher: 
+      all: alle
+      make_public: "öffentlich machen"
+      post_a_message_to: "Sende eine Nachricht an %{aspect}"
+      posting: Senden...
+      share: Teilen
+      share_with: "Mit %{aspect} teilen"
+      share_with_all: "Mit allen Aspekten teilen"
+    reshare: 
+      reshare: "Erneut senden an"
+    stream_element: 
+      show_comments: "Zeige Kommentare"
+  status_messages: 
+    helper: 
+      no_message_to_display: "Keine Nachricht zum anzeigen."
+    new_status_message: 
+      oh_yeah: "oh yeah!"
+      tell_me_something_good: "Was gibt es neues?"
+    show: 
+      destroy: Zerstören
+  the_world: "die Welt"
+  username: Benutzername
+  users: 
+    destroy: "Konto erfolgreich geschlossen."
+    edit: 
+      change_language: "Sprache ändern"
+      change_password: "Passwort ändern"
+      close_account: "Konto schließen"
+      download_photos: "Meine Fotos herunterladen"
+      download_xml: "Mein XML herunterladen"
+      export_data: "Konto exportieren"
+      invite_contacts: "Kontakte einladen"
+      new_password: "Neues Passwort"
+    getting_started: 
+      connect_services: "Mit Diensten verbinden"
+      define_aspects: "Erstelle deine Aspekte"
+      edit_profile: "Bearbeite dein Profil"
+      save_and_continue: "Speichern und weiter"
+      signup_steps: "Vervollständige deine Registrierung indem du folgende Dinge tust:"
+      skip: "Erste Schritte überspringen"
+      step_1: 
+        your_profile: "Dein Profil"
+      step_2: 
+        add: Hinzufügen
+        aspect_name: "Name des Aspekts"
+        description: "Sage Diaspora welche verschiedene Aspekte von dir von verschiedenen Kontakten gesehen werden sollen. Du kannst diese später verawalten in dem du auf Verwalten oben rechts klickst. Deine Aspekte sind nur für dich und nicht für andere sichtbar."
+        your_aspects: "Deine Aspekte"
+      step_3: 
+        description: "Verbinde deine existierenden sozialen Netzwerke mit deinem Diaspora Konto. Du wirst öffentliche Nachrichten durch deinen Alle Aspekt schicken können wenn du dort \"öffentlich machen\" auswählst."
+        your_services: "Deine Dienste"
+      step_4: 
+        change_profile: "Du kannst dein Profil jederzeit ändern indem du auf"
+        connect_disconnect: "Du kannst dich jederzeit mit deinen Diensten verbinden/trennen indem du auf"
+        continue: "Fahre fort um auf deine \"Alle\" Seite zu kommen, eine Übersicht über alle deiner Aspekte."
+        finish: Fertigstellen
+        manage_aspects: "Du kannst jederzeit deine Aspekte verwalten indem du auf"
+        ready_to_share: "Du bist nun bereit zum teilen mit"
+        set_up: "Du bist nun bereit %{name}!"
+        tab_also_added: "klickst. Deine Kontakte können auch auf der entsprechenden Seite hinzugefügt werden."
+        user_menu: "in deinem Benutzer-Menü klickst (oben rechts)."
+      welcome: "Willkommen bei Diaspora!"
+    public: 
+      does_not_exist: "Benutzer %{username} existiert nicht!"
+    update: 
+      language_changed: "Sprache geändert"
+      language_not_changed: "Ändern der Sprache fehlgeschlagen"
+      password_changed: "Passwort geändert"
+      password_not_changed: "Ändern des Passworts fehlgeschlagen"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
new file mode 100644
index 000000000..5da4552a4
--- /dev/null
+++ b/config/locales/diaspora/el.yml
@@ -0,0 +1,355 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+el: 
+  _photos: Φωτογραφίες
+  _services: Υπηρεσίες
+  account: Λογαριασμός
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "χρησιμοποιείται ήδη"
+        user: 
+          attributes: 
+            email: 
+              taken: "χρησιμοποιείται ήδη"
+            person: 
+              invalid: "δεν είναι έγκυρο"
+            username: 
+              taken: "χρησιμοποιείται ήδη"
+  ago: πριν
+  application: 
+    helper: 
+      unknown_person: "άγνωστο άτομο"
+      youtube_title: 
+        unknown: "Unknown Video Title"
+  are_you_sure: "Είσαι σίγουρος/ή;"
+  aspects: 
+    add_to_aspect: 
+      failure: "Αποτυχία προσθήκης φίλου στην πτυχή."
+      success: "Επιτυχής προσθήκη φίλου στην πτυχή."
+    create: 
+      failure: "Η δημιουργία της πτυχής απέτυχε."
+      success: "Κάντε κλικ στο συν, στην αριστερή πλευρά για να ενημερώσετε το Diaspora ποίοι μπορούν να δουν τη νέα πτυχή σας."
+    destroy: 
+      success: "%{name} αφαιρέθηκε επιτυχώς."
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "Η πτυχή δεν είναι άδεια"
+      remove: αφαίρεση
+    manage: 
+      add_a_new_aspect: "Προσθέστε μια νέα πτυχή"
+      add_a_new_contact: "Add a new contact"
+      drag_to_add: "Drag to add people"
+      manage_aspects: "Manage aspects"
+      no_requests: "No new requests"
+      requests: Requests
+    move_contact: 
+      error: "Error moving contact: %{inspect}"
+      failure: "didn't work %{inspect}"
+      success: "Person moved to new aspect"
+    new_aspect: 
+      create: Create
+      name: Name
+    no_contacts_message: 
+      add_contact: "Add a contact"
+      add_contact_to: "Add someone to %{aspect_name}"
+      invite: "Invite someone to join Diaspora!"
+      nobody: "We know you know people — bring them to Diaspora!"
+      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+    no_posts_message: 
+      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+    remove_from_aspect: 
+      failure: "Failed to remove person from aspect"
+      success: "Successfully removed person from aspect"
+    update: 
+      success: "Η πτυχή σας,% {name}, έχει επεξεργαστεί επιτυχώς."
+  back: Back
+  cancel: Ακύρωση
+  comments: 
+    new_comment: 
+      comment: Σχόλιο
+      commenting: Commenting...
+  dashboards: 
+    helper: 
+      home: Home
+  delete: Διαγραφή
+  email: Email
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Διορθώστε τα ακόλουθα σφάλματα και προσπαθήστε ξανά."
+      invalid_fields: "Άκυρα Πεδία"
+  fill_me_out: "Fill me out"
+  home: 
+    show: 
+      already_account: "already have an account?"
+      login_here: "log in here"
+      share_what_you_want: "Share what you want, with who you want."
+  invitations: 
+    check_token: 
+      not_found: "Το σύμβολο της πρόσκλησης δεν βρέθηκε"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "Έχετε ήδη προσκαλέσει αυτό το πρόσωπο."
+      no_more: "Δεν έχετε άλλες προσκλήσεις."
+      sent: "Η πρόσκλησή σας έχει σταλεί."
+    new: 
+      if_they_accept_info: "αν αποδεχθούν, θα προστεθούν στην πτυχή που τους καλέσατε"
+      invite_someone_to_join: "Προσκαλέστε κάποιον να ενταχθεί στο Diaspora!"
+      message: "Μήνυμα:"
+      send_an_invitation: "Send an invitation"
+      send_invitation: "Send invitation"
+      to: To
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: "account settings"
+      blog: blog
+      developers: developers
+      edit_profile: "edit profile"
+      login: login
+      logout: logout
+      view_profile: "view profile"
+  notifier: 
+    diaspora: "the diaspora email robot"
+    hello: "Hello %{name}!"
+    love: "love,"
+    new_request: 
+      just_sent_you: "just sent you a friend request on Diaspora*"
+      sign_in: "sign in here"
+      subject: "new Diaspora* friend request from %{from}"
+      try_it_out: "You should really think about checking it out."
+    request_accepted: 
+      accepted: "has accepted your friend request. They are now in your"
+      aspect: aspect.
+      subject: "%{name} has accepted your friend request on Diaspora*"
+  ok: OK
+  or: or
+  password: Password
+  password_confirmation: "Password confirmation"
+  people: 
+    edit: 
+      allow_search: "Allow for people to search for you"
+      first_name: "First name"
+      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      last_name: "Last name"
+      update_profile: "Ενημέρωση Προφίλ"
+      your_bio: Βιογραφικό
+      your_birthday: "Τα γενέθλιά σας"
+      your_gender: "Το φύλο σας"
+      your_name: "Το όνομά σας"
+      your_photo: "Η φωτογραφία σας"
+      your_profile: "Το προφίλ σας"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: " results for %{params}"
+    index: 
+      results_for: "αποτελέσματα αναζήτησης για"
+    person: 
+      add_contact: "add contact"
+      already_connected: "Already connected"
+      pending_request: "pending request"
+      thats_you: "thats you!"
+    profile_photo_upload: 
+      or_select_one: "or select one from your already existing"
+    profile_sidebar: 
+      bio: bio
+      born: born
+      edit_my_profile: "Edit my profile"
+      gender: gender
+      in_aspects: "in aspects"
+      last_seen: "last seen: %{how_long_ago}"
+      remove_contact: "remove contact"
+    show: 
+      already_requested: "You have already sent a request to %{name}."
+      does_not_exist: "Person does not exist!"
+      no_posts: "no posts to display!"
+      not_connected: "You are not connected with this person"
+      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+    update: 
+      failed: "Failed to update profile"
+      updated: "Profile updated"
+  photos: 
+    create: 
+      integrity_error: "Photo upload failed.  Are you sure that was an image?"
+      runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
+      type_error: "Η μεταφόρτωση της φωτογραφίας απέτυχε. Είστε σίγουροι ότι προστέθηκε μια εικόνα;"
+    destroy: 
+      notice: "Η φωτογραφία διαγράφηκε."
+    edit: 
+      editing: Επεξεργασία
+    new: 
+      back_to_list: "Επιστροφή στη Λίστα"
+      new_photo: "Νέα φωτογραφία"
+      post_it: "δημοσίευσέ το!"
+    new_photo: 
+      drop: "Drop photos here to upload"
+      empty: "{file} is empty, please select files again without it."
+      failed: Failed
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      upload: "Upload a photo"
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      add_a_description: "Προσθέστε μια περιγραφή"
+      delete_photo: "Διαγραφή Φωτογραφίας"
+      edit_photo: "Επεξεργασία Φωτογραφίας"
+      full_size: "πλήρες μέγεθος"
+      make_profile_photo: "ορισμός ως φωτογραφία προφίλ"
+      next: επόμενο
+      prev: προηγ
+      update_photo: "Ενημέρωση Φωτογραφίας"
+    update: 
+      error: "Αποτυχία επεξεργασίας φωτογραφίας."
+      notice: "Η φωτογραφία ενημερώθηκε επιτυχώς."
+  profile: Προφίλ
+  registrations: 
+    closed: "Signups are closed on this Diaspora pod."
+    create: 
+      success: "Γίνατε μέλος στο Diaspora!"
+    edit: 
+      cancel_my_account: "Cancel my account"
+      edit: "Edit %{name}"
+      leave_blank: "(leave blank if you don't want to change it)"
+      password_to_confirm: "(we need your current password to confirm your changes)"
+      unhappy: Unhappy?
+      update: Update
+    new: 
+      sign_up: Εγγραφείτε
+      sign_up_for_diaspora: "Εγγραφείτε στο Diaspora"
+  requests: 
+    create: 
+      sending: Sending...
+      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      tried: "βάλαμε τα δυνατά μας για να στείλουμε ένα μήνυμα στο %{account}"
+    destroy: 
+      error: "Παρακαλώ επιλέξτε μια πτυχή!"
+      ignore: "Αγνοήθηκε αίτηση φίλου."
+      success: "Είστε πλέον φίλοι."
+    manage_aspect_contacts: 
+      contact_username: "Contact's username"
+      create_request: "Create request"
+      enter_a_diaspora_username: "Enter a Diaspora username:"
+      existing: "Existing contacts"
+      know_email: "Know their email address? You should invite them"
+      manage_within: "Manage contacts within"
+      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+  search: Search
+  services: 
+    create: 
+      success: "Επιτυχής έλεγχος ταυτότητας."
+    destroy: 
+      success: "Επιτυχής καταστροφή ταυτότητας."
+    index: 
+      connect_to_facebook: "Connect to facebook"
+      connect_to_twitter: "Connect to twitter"
+      disconnect: disconnect
+      logged_in_as: "logged in as"
+      really_disconnect: "disconnect %{service}?"
+  settings: Ρυθμίσεις
+  shared: 
+    aspect_contacts: 
+      add_contacts: "add contacts"
+      add_to: "add to %{aspect}"
+      everyone: Everyone
+      manage: "manage %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "προσθέστε μια νέα πτυχή"
+      everyone: Όλοι
+      manage: Διαχείριση
+      manage_your_aspects: "Διαχειριστείτε τις πτυχές σας"
+    author_info: 
+      all: all
+      status_messages: "status messages"
+      view_profile: "Προβολή προφίλ"
+      viewing: viewing
+    contact_list: 
+      add_to: "Add %{name} to %{aspect}"
+      remove_from: "Remove %{name} from %{aspect}"
+      search_contacts: "Search contacts"
+    invitations: 
+      invitations_left: "(%{count} απομένουν)"
+      invite_someone: "Invite someone"
+      invites: Προσκλήσεις
+    notification: 
+      new: "New %{type} from %{from}"
+    public_explain: 
+      logged_in: "συνδεδεμένοι στο %{service}"
+      manage: "συνδεδεμένοι στο %{service}"
+      outside: "Public messages will be available for others outside of Diaspora to see."
+      title: "You are about to post a public message!"
+    publisher: 
+      all: all
+      make_public: "make public"
+      post_a_message_to: "Post a message to %{aspect}"
+      posting: Posting...
+      share: Share
+      share_with: "Share with %{aspect}"
+      share_with_all: "Share with all aspects"
+    reshare: 
+      reshare: Reshare
+    stream_element: 
+      show_comments: "show comments"
+  status_messages: 
+    helper: 
+      no_message_to_display: "No message to display."
+    new_status_message: 
+      oh_yeah: "oh yeah!"
+      tell_me_something_good: "tell me something good"
+    show: 
+      destroy: Destroy
+  the_world: "the world"
+  username: "Όνομα Χρήστη"
+  users: 
+    destroy: "Ο λογαριασμός έκλεισε με επιτυχία."
+    edit: 
+      change_language: "Αλλαγή Γλώσσας"
+      change_password: "Αλλαγή κωδικού πρόσβασης"
+      close_account: "Κλείσιμο Λογαριασμού"
+      download_photos: "κατέβασε τις φωτογραφίες μου"
+      download_xml: "κατέβασε το xml μου"
+      export_data: "Εξαγωγή Δεδομένων"
+      invite_contacts: "Invite contacts"
+      new_password: "Νέος κωδικός πρόσβασης"
+    getting_started: 
+      connect_services: "Συνδέστε τις υπηρεσίες σας"
+      define_aspects: "Ορίστε τις πτυχές σας"
+      edit_profile: "Επεξεργασία του προφίλ σας"
+      save_and_continue: "Save and continue"
+      signup_steps: "Ολοκληρώστε την εγγραφή σας κάνοντας τα ακόλουθα πράγματα:"
+      skip: "skip getting started"
+      step_1: 
+        your_profile: "Your Profile"
+      step_2: 
+        add: Add
+        aspect_name: "Aspect name"
+        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+        your_aspects: "Your aspects"
+      step_3: 
+        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
+        your_services: "Your services"
+      step_4: 
+        change_profile: "You can change your profile any time by clicking"
+        connect_disconnect: "You can connect/disconnect your services any time by clicking"
+        continue: "Continue on to your everyone page, an overview of all of your aspects."
+        finish: Finish
+        manage_aspects: "You can manage your aspects any time by clicking the"
+        ready_to_share: "You're now ready to start sharing with "
+        set_up: "You're all set up, %{name}!"
+        tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+        user_menu: "in your user menu (top right)."
+      welcome: "Welcome to Diaspora!"
+    public: 
+      does_not_exist: "User %{username} does not exist!"
+    update: 
+      language_changed: "Language Changed"
+      language_not_changed: "Language Change Failed"
+      password_changed: "Password Changed"
+      password_not_changed: "Password Change Failed"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 4e3ea63b4..bcc099ad5 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -2,203 +2,354 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
-es:
-  hello: "Hola mundo"
-  application:
-      helper:
-          unknown_person: "persona desconocida"
-          new_requests: "nuevas peticiones"
-  dashboards:
-      helper:
-          home: "home"
-  error_messages:
-      helper:
-          invalid_fields: "Campos Invalidos"
-          correct_the_following_errors_and_try_again: "Corrija los siguentes errores e intente de nuevo."
-  people:
-      helper:
-           results_for: " resultados para %{params}"
-           people_on_pod_are_aware_of: " personas en pod estan al tanto de"
-  layouts:
-      application:
-          edit_profile: "editar perfil"
-          logout: "cerrar sesión"
-  shared:
-      aspect_nav:
-          all_aspects: "Todos los Aspectos"
-          manage: "Manejar"
-          manage_your_aspects: "Maneja tus Aspectos"
-      sub_header:
-          all_aspects: "Todos los Aspectos"
-          manage_aspects: "Manejar Aspectos"
-      publisher:
-          share: "Compartir"
-      aspect_friends:
-          add_friends: "Añade amigos"
-  albums:
-      album:
-          you: "usted"
-      new_album:
-          create: "crear"
-          add_a_new_album: "Añade un nuevo álbum"
-      show:
-          edit_album: "Editar Álbum"
-          albums: "álbumes"
-          updated: "actualizado"
-          by: "por"
-      edit:
-          editing: "Editando"
-          updated: "actualizado"
-          are_you_sure: "¿Está seguro?"
-          delete_album: "Eliminar Álbum"
-          cancel: "Cancelar"
-      index:
-          home: "home"
-          new_album: "Nuevo Álbum"
-      create:
-          success: "Has creado el álbum llamado %{name}."
-      update:
-          success: "El álbum %{name} fue editado exitosamente."
-          failure: "Fallo al editar el álbum %{name}."
-      destroy:
-          success: "El álbum %{name} fue eliminado."
-      helper:
-          friends_albums: "Álbumes de amigos"
-          your_albums: "Tus Álbumes"
-  aspects:
-      index:
-          photos: "fotos"
-      show:
-          photos: "fotos"
-      manage:
-          add_a_new_aspect: "Añadir un nuevo aspecto"
-          add_a_new_friend:  "Añadir un nuevo amigo"
-          show: "Mostrar"
-          update_aspects: "Actualizar Aspectos"
-          requests: "Peticiones"
-          ignore_remove: "Ignorar/Remover"
-      new_aspect:
-          add_a_new_aspect: "Añadir un nuevo aspecto"
-          create: "Crear"
-      create:
-          success:"Pulsa el signo de mas a la izquierda para escojer quien puede ver su nuevo aspecto."
-          failure: "La creación del Aspecto falló."
-      destroy:
-          success: "%{name} fue eliminado exitosamente."
-      update:
-          success: "Su aspecto, %{name}, fue editado exitosamente."
-      move_friends:
-          failure: "Fallo el editar aspecto para el amigo %{real_name}."
-          success: "Aspectos editados exitosamente."
-      move_friend:
-          error: "no funcionó %{inspect}"
-          notice: "Ahora estas mostrando a tu amigo un aspecto diferente de ti."
-      helper:
-          remove: "eliminar"
-          aspect_not_empty: "Aspecto no vacio"
-  users:
-      edit:
-          editing_profile: "Editando perfil"
-      profile:
-          cancel: "Cancelar"
-          update_profile: "Actualizar Perfil"
-          home: "Home"
-          diaspora_username: "NOMBRE DE USUARIO DE DIASPORA"
-          info: "Info"
-          picture: "Foto"
-          editing_profile: "Editando perfil"
-          albums: "Álbums"
-          you_dont_have_any_photos: "No tienes ninguna foto!  ve a la pagina"
-          page_to_upload_some:  "para subir algunas"
-  comments:
-      comment:
-          ago: "atras"
-      new_comment:
-          comment: "Comentario"
-  photos:
-      show:
-          prev: "prev"
-          full_size: "tamaño completo"
-          next: "prox"
-          edit_photo: "Editar Foto"
-          delete_photo: "Eliminar Foto"
-          are_you_sure: "¿Está seguro?"
-          comments: "comentarios"
-      edit:
-          editing: "Editando"
-          are_you_sure: "¿Está seguro?"
-          delete_photo: "Eliminar Foto"
-      photo:
-          show_comments: "mostrar comentarios"
-          posted_a_new_photo_to: "a puesto una nueva foto en"
-      new:
-          new_photo: "Nueva Foto"
-          back_to_list: "Volver a la lista"
-          post_it: "post it!"
-      create:
-          runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
-          integrity_error: "Falló carga de la foto.  ¿Está seguro de que era una imagen?"
-          type_error: "Falló carga de la foto.  ¿Está seguro de que una imagen fue añadida?"
-      update:
-          notice: "Foto actualizada satisfactoriamente."
-          error:  "Falló la edición de la foto."
-      destroy:
-          notice: "Foto eliminada."
-  registrations:
-      new:
-          sign_up: "Regístrate"
-      create:
-          success: "Se ha unido a Diaspora!"
-  status_messages:
-      new_status_message:
-          tell_me_something_good: "dime algo bueno"
-          oh_yeah: "oh yeah!"
-      status_message:
-          show_comments: "mostrar comentarios"
-          delete: "Eliminar"
-          are_you_sure: "Esta seguro?"
-      show:
-          status_message: "Mensaje de status"
-          comments: "comentarios"
-          are_you_sure: "¿Está seguro?"
-          destroy: "Borrar"
-          view_all: "Ver Todos"
-          message: "Mensaje"
-          owner: "Dueño"
-      helper:
-          no_message_to_display: "No hay mensajes que mostrar."
-  people:
-      person:
-          add_friend: "añadir amigo"
-          pending_request: "petición pendiente"
-      index:
-          add_friend: "añadir amigo"
-          real_name: "nombre real"
-          diaspora_handle: "usuario en diaspora"
-          thats_you: "ese eres tu!"
-          friend_request_pending: "petición de amistad pendiente"
-          you_have_a_friend_request_from_this_person: "tienes una petición de amistad de esta persona"
-      show:
-          last_seen: "ultima vez visto: %{how_long_ago}"
-          friends_since: "amigos desde: %{how_long_ago}"
-          save: "guardar"
-          are_you_sure: "¿Está seguro?"
-          remove_friend: "eliminar amigo"
-  requests:
-      new_request:
-          add_a_new_friend_to: "Añade un nuevo amigo a "
-          enter_a_diaspora_username: "Escribe el usuario de Diaspora:"
-          your_diaspora_username_is: "Tu usuario de Diaspora es: %{diaspora_handle}"
-          friends_username: "Nombre de usuario de amigo"
-      destroy:
-          success: "Ahora son amigos."
-          error: "Seleccione un aspecto!"
-          ignore: "Ignorar peticion de amistad"
-      create:
-          error: "No diaspora seed found with this email!"
-          already_friends: "Ya eres amigo de %{destination_url}!"
-          success: "Una peticion de amistad se envio a %{destination_url}."
-          horribly_wrong: "Algo horriblemente incorrecto ha sucedido"
+es: 
+  _photos: photos
+  _services: Services
+  account: Account
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "is already taken"
+        user: 
+          attributes: 
+            email: 
+              taken: "is already taken"
+            person: 
+              invalid: "is invalid"
+            username: 
+              taken: "is already taken"
+  ago: ago
+  application: 
+    helper: 
+      unknown_person: "persona desconocida"
+      youtube_title: 
+        unknown: "Unknown Video Title"
+  are_you_sure: "Esta seguro?"
+  aspects: 
+    add_to_aspect: 
+      failure: "No se ha podido agregar un amigo a un aspecto."
+      success: "Se ha agregado correctamente su amigo a un aspecto."
+    create: 
+      failure: "Aspect creation failed."
+      success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
+    destroy: 
+      success: "%{name} fue eliminado exitosamente."
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "Aspecto no vacio"
+      remove: eliminar
+    manage: 
+      add_a_new_aspect: "Añadir un nuevo aspecto"
+      add_a_new_contact: "Add a new contact"
+      drag_to_add: "Drag to add people"
+      manage_aspects: "Gestionar aspectos"
+      no_requests: "No hay nuevas peticiones"
+      requests: Peticiones
+    move_contact: 
+      error: "Error moving contact: %{inspect}"
+      failure: "didn't work %{inspect}"
+      success: "Person moved to new aspect"
+    new_aspect: 
+      create: Crear
+      name: Name
+    no_contacts_message: 
+      add_contact: "Add a contact"
+      add_contact_to: "Add someone to %{aspect_name}"
+      invite: "Invite someone to join Diaspora!"
+      nobody: "We know you know people — bring them to Diaspora!"
+      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+    no_posts_message: 
+      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+    remove_from_aspect: 
+      failure: "Failed to remove person from aspect"
+      success: "Successfully removed person from aspect"
+    update: 
+      success: "Su aspecto, %{name}, fue editado exitosamente."
+  back: Back
+  cancel: Cancel
+  comments: 
+    new_comment: 
+      comment: Comentario
+      commenting: Commenting...
+  dashboards: 
+    helper: 
+      home: Home
+  delete: Delete
+  email: Email
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Corrija los siguentes errores e intente de nuevo."
+      invalid_fields: "Campos Invalidos"
+  fill_me_out: "Fill me out"
+  home: 
+    show: 
+      already_account: "already have an account?"
+      login_here: "log in here"
+      share_what_you_want: "Share what you want, with who you want."
+  invitations: 
+    check_token: 
+      not_found: "Invitation token not found"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "You already invited this person."
+      no_more: "You have no more invitations."
+      sent: "Your invitation has been sent."
+    new: 
+      if_they_accept_info: "if they accept, they will be added to the aspect you invited them"
+      invite_someone_to_join: "Invite someone to join Diaspora!"
+      message: "Message:"
+      send_an_invitation: "Send an invitation"
+      send_invitation: "Send invitation"
+      to: To
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: "account settings"
+      blog: blog
+      developers: developers
+      edit_profile: "edit profile"
+      login: login
+      logout: logout
+      view_profile: "view profile"
+  notifier: 
+    diaspora: "the diaspora email robot"
+    hello: "Hello %{name}!"
+    love: "love,"
+    new_request: 
+      just_sent_you: "just sent you a friend request on Diaspora*"
+      sign_in: "sign in here"
+      subject: "new Diaspora* friend request from %{from}"
+      try_it_out: "You should really think about checking it out."
+    request_accepted: 
+      accepted: "has accepted your friend request. They are now in your"
+      aspect: aspect.
+      subject: "%{name} has accepted your friend request on Diaspora*"
+  ok: OK
+  or: or
+  password: Password
+  password_confirmation: "Password confirmation"
+  people: 
+    edit: 
+      allow_search: "Allow for people to search for you"
+      first_name: "First name"
+      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      last_name: "Last name"
+      update_profile: "Update Profile"
+      your_bio: "Your bio"
+      your_birthday: "Your birthday"
+      your_gender: "Your gender"
+      your_name: "Your name"
+      your_photo: "Your photo"
+      your_profile: "Your profile"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: " results for %{params}"
+    index: 
+      results_for: "search results for"
+    person: 
+      add_contact: "add contact"
+      already_connected: "Already connected"
+      pending_request: "petición pendiente"
+      thats_you: "thats you!"
+    profile_photo_upload: 
+      or_select_one: "or select one from your already existing"
+    profile_sidebar: 
+      bio: bio
+      born: born
+      edit_my_profile: "Edit my profile"
+      gender: gender
+      in_aspects: "in aspects"
+      last_seen: "last seen: %{how_long_ago}"
+      remove_contact: "remove contact"
+    show: 
+      already_requested: "You have already sent a request to %{name}."
+      does_not_exist: "Person does not exist!"
+      no_posts: "no posts to display!"
+      not_connected: "You are not connected with this person"
+      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+    update: 
+      failed: "Failed to update profile"
+      updated: "Profile updated"
+  photos: 
+    create: 
+      integrity_error: "Falló carga de la foto.  ¿Está seguro de que era una imagen?"
+      runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
+      type_error: "Falló carga de la foto.  ¿Está seguro de que una imagen fue añadida?"
+    destroy: 
+      notice: "Foto eliminada."
+    edit: 
+      editing: Editando
+    new: 
+      back_to_list: "Volver a la lista"
+      new_photo: "Nueva Foto"
+      post_it: "post it!"
+    new_photo: 
+      drop: "Drop photos here to upload"
+      empty: "{file} is empty, please select files again without it."
+      failed: Failed
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      upload: "Upload a photo"
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      add_a_description: "Add a description"
+      delete_photo: "Eliminar Foto"
+      edit_photo: "Editar Foto"
+      full_size: "tamaño completo"
+      make_profile_photo: "make profile photo"
+      next: prox
+      prev: prev
+      update_photo: "Update Photo"
+    update: 
+      error: "Falló la edición de la foto."
+      notice: "Foto actualizada satisfactoriamente."
+  profile: Profile
+  registrations: 
+    closed: "Signups are closed on this Diaspora pod."
+    create: 
+      success: "Se ha unido a Diaspora!"
+    edit: 
+      cancel_my_account: "Cancel my account"
+      edit: "Edit %{name}"
+      leave_blank: "(leave blank if you don't want to change it)"
+      password_to_confirm: "(we need your current password to confirm your changes)"
+      unhappy: Unhappy?
+      update: Update
+    new: 
+      sign_up: Regístrate
+      sign_up_for_diaspora: "Registrate en Diaspora"
+  requests: 
+    create: 
+      sending: Sending...
+      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      tried: "we tried our best to send a message to %{account}"
+    destroy: 
+      error: "Seleccione un aspecto!"
+      ignore: "Ignorar peticion de amistad"
+      success: "Ahora son amigos."
+    manage_aspect_contacts: 
+      contact_username: "Contact's username"
+      create_request: "Create request"
+      enter_a_diaspora_username: "Enter a Diaspora username:"
+      existing: "Existing contacts"
+      know_email: "Know their email address? You should invite them"
+      manage_within: "Manage contacts within"
+      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+  search: Search
+  services: 
+    create: 
+      success: "Authentication successful."
+    destroy: 
+      success: "Successfully destroyed authentication."
+    index: 
+      connect_to_facebook: "Connect to facebook"
+      connect_to_twitter: "Connect to twitter"
+      disconnect: disconnect
+      logged_in_as: "logged in as"
+      really_disconnect: "disconnect %{service}?"
+  settings: Settings
+  shared: 
+    aspect_contacts: 
+      add_contacts: "add contacts"
+      add_to: "add to %{aspect}"
+      everyone: Everyone
+      manage: "manage %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "add a new aspect"
+      everyone: Everyone
+      manage: Gestionar
+      manage_your_aspects: "Gestiona tus Aspectos"
+    author_info: 
+      all: all
+      status_messages: "status messages"
+      view_profile: "Ver perfil"
+      viewing: viewing
+    contact_list: 
+      add_to: "Add %{name} to %{aspect}"
+      remove_from: "Remove %{name} from %{aspect}"
+      search_contacts: "Search contacts"
+    invitations: 
+      invitations_left: "(quedan %{count})"
+      invite_someone: "Invite someone"
+      invites: Invitaciones
+    notification: 
+      new: "New %{type} from %{from}"
+    public_explain: 
+      logged_in: "logged in to %{service}"
+      manage: "manage connected services"
+      outside: "Public messages will be available for others outside of Diaspora to see."
+      title: "You are about to post a public message!"
+    publisher: 
+      all: all
+      make_public: "make public"
+      post_a_message_to: "Post a message to %{aspect}"
+      posting: Posting...
+      share: Compartir
+      share_with: "Share with %{aspect}"
+      share_with_all: "Share with all aspects"
+    reshare: 
+      reshare: Reshare
+    stream_element: 
+      show_comments: "show comments"
+  status_messages: 
+    helper: 
+      no_message_to_display: "No hay mensajes que mostrar."
+    new_status_message: 
+      oh_yeah: "oh yeah!"
+      tell_me_something_good: "dime algo bueno"
+    show: 
+      destroy: Borrar
+  the_world: "the world"
+  username: Username
+  users: 
+    destroy: "Account successfully closed."
+    edit: 
+      change_language: "Change Language"
+      change_password: "Change Password"
+      close_account: "Close Account"
+      download_photos: "download my photos"
+      download_xml: "download my xml"
+      export_data: "Export Data"
+      invite_contacts: "Invite contacts"
+      new_password: "New Password"
+    getting_started: 
+      connect_services: "Connect your services"
+      define_aspects: "Define your aspects"
+      edit_profile: "Edit your profile"
+      save_and_continue: "Save and continue"
+      signup_steps: "Complete your sign-up by doing these things:"
+      skip: "skip getting started"
+      step_1: 
+        your_profile: "Your Profile"
+      step_2: 
+        add: Add
+        aspect_name: "Aspect name"
+        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+        your_aspects: "Your aspects"
+      step_3: 
+        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
+        your_services: "Your services"
+      step_4: 
+        change_profile: "You can change your profile any time by clicking"
+        connect_disconnect: "You can connect/disconnect your services any time by clicking"
+        continue: "Continue on to your everyone page, an overview of all of your aspects."
+        finish: Finish
+        manage_aspects: "You can manage your aspects any time by clicking the"
+        ready_to_share: "You're now ready to start sharing with "
+        set_up: "You're all set up, %{name}!"
+        tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+        user_menu: "in your user menu (top right)."
+      welcome: "Welcome to Diaspora!"
+    public: 
+      does_not_exist: "User %{username} does not exist!"
+    update: 
+      language_changed: "Language Changed"
+      language_not_changed: "Language Change Failed"
+      password_changed: "Contraseña cambiada"
+      password_not_changed: "Cambio de contraseña fallido"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 88e06e580..757200123 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -1,10 +1,355 @@
 #   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
 
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
-fi:
-  hello: "Terve, maailma"
+fi: 
+  _photos: photos
+  _services: Services
+  account: Account
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "is already taken"
+        user: 
+          attributes: 
+            email: 
+              taken: "is already taken"
+            person: 
+              invalid: "is invalid"
+            username: 
+              taken: "is already taken"
+  ago: ago
+  application: 
+    helper: 
+      unknown_person: "unknown person"
+      youtube_title: 
+        unknown: "Unknown Video Title"
+  are_you_sure: "Are you sure?"
+  aspects: 
+    add_to_aspect: 
+      failure: "Failed to add friend to aspect."
+      success: "Successfully added friend to aspect."
+    create: 
+      failure: "Aspect creation failed."
+      success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
+    destroy: 
+      success: "%{name} was successfully removed."
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "Aspect not empty"
+      remove: remove
+    manage: 
+      add_a_new_aspect: "Add a new aspect"
+      add_a_new_contact: "Add a new contact"
+      drag_to_add: "Drag to add people"
+      manage_aspects: "Manage aspects"
+      no_requests: "No new requests"
+      requests: Requests
+    move_contact: 
+      error: "Error moving contact: %{inspect}"
+      failure: "didn't work %{inspect}"
+      success: "Person moved to new aspect"
+    new_aspect: 
+      create: Create
+      name: Name
+    no_contacts_message: 
+      add_contact: "Add a contact"
+      add_contact_to: "Add someone to %{aspect_name}"
+      invite: "Invite someone to join Diaspora!"
+      nobody: "We know you know people — bring them to Diaspora!"
+      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+    no_posts_message: 
+      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+    remove_from_aspect: 
+      failure: "Failed to remove person from aspect"
+      success: "Successfully removed person from aspect"
+    update: 
+      success: "Your aspect, %{name}, has been successfully edited."
+  back: Back
+  cancel: Cancel
+  comments: 
+    new_comment: 
+      comment: Comment
+      commenting: Commenting...
+  dashboards: 
+    helper: 
+      home: Home
+  delete: Delete
+  email: Email
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Correct the following errors and try again."
+      invalid_fields: "Invalid Fields"
+  fill_me_out: "Fill me out"
+  home: 
+    show: 
+      already_account: "already have an account?"
+      login_here: "log in here"
+      share_what_you_want: "Share what you want, with who you want."
+  invitations: 
+    check_token: 
+      not_found: "Invitation token not found"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "You already invited this person."
+      no_more: "You have no more invitations."
+      sent: "Your invitation has been sent."
+    new: 
+      if_they_accept_info: "if they accept, they will be added to the aspect you invited them"
+      invite_someone_to_join: "Invite someone to join Diaspora!"
+      message: "Message:"
+      send_an_invitation: "Send an invitation"
+      send_invitation: "Send invitation"
+      to: To
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: "account settings"
+      blog: blog
+      developers: developers
+      edit_profile: "edit profile"
+      login: login
+      logout: logout
+      view_profile: "view profile"
+  notifier: 
+    diaspora: "the diaspora email robot"
+    hello: "Hello %{name}!"
+    love: "love,"
+    new_request: 
+      just_sent_you: "just sent you a friend request on Diaspora*"
+      sign_in: "sign in here"
+      subject: "new Diaspora* friend request from %{from}"
+      try_it_out: "You should really think about checking it out."
+    request_accepted: 
+      accepted: "has accepted your friend request. They are now in your"
+      aspect: aspect.
+      subject: "%{name} has accepted your friend request on Diaspora*"
+  ok: OK
+  or: or
+  password: Password
+  password_confirmation: "Password confirmation"
+  people: 
+    edit: 
+      allow_search: "Allow for people to search for you"
+      first_name: "First name"
+      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      last_name: "Last name"
+      update_profile: "Update Profile"
+      your_bio: "Your bio"
+      your_birthday: "Your birthday"
+      your_gender: "Your gender"
+      your_name: "Your name"
+      your_photo: "Your photo"
+      your_profile: "Your profile"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: " results for %{params}"
+    index: 
+      results_for: "search results for"
+    person: 
+      add_contact: "add contact"
+      already_connected: "Already connected"
+      pending_request: "pending request"
+      thats_you: "thats you!"
+    profile_photo_upload: 
+      or_select_one: "or select one from your already existing"
+    profile_sidebar: 
+      bio: bio
+      born: born
+      edit_my_profile: "Edit my profile"
+      gender: gender
+      in_aspects: "in aspects"
+      last_seen: "last seen: %{how_long_ago}"
+      remove_contact: "remove contact"
+    show: 
+      already_requested: "You have already sent a request to %{name}."
+      does_not_exist: "Person does not exist!"
+      no_posts: "no posts to display!"
+      not_connected: "You are not connected with this person"
+      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+    update: 
+      failed: "Failed to update profile"
+      updated: "Profile updated"
+  photos: 
+    create: 
+      integrity_error: "Photo upload failed.  Are you sure that was an image?"
+      runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
+      type_error: "Photo upload failed.  Are you sure an image was added?"
+    destroy: 
+      notice: "Photo deleted."
+    edit: 
+      editing: Editing
+    new: 
+      back_to_list: "Back to List"
+      new_photo: "New Photo"
+      post_it: "post it!"
+    new_photo: 
+      drop: "Drop photos here to upload"
+      empty: "{file} is empty, please select files again without it."
+      failed: Failed
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      upload: "Upload a photo"
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      add_a_description: "Add a description"
+      delete_photo: "Delete Photo"
+      edit_photo: "Edit Photo"
+      full_size: "full size"
+      make_profile_photo: "make profile photo"
+      next: next
+      prev: prev
+      update_photo: "Update Photo"
+    update: 
+      error: "Failed to edit photo."
+      notice: "Photo successfully updated."
+  profile: Profile
+  registrations: 
+    closed: "Signups are closed on this Diaspora pod."
+    create: 
+      success: "You've joined Diaspora!"
+    edit: 
+      cancel_my_account: "Cancel my account"
+      edit: "Edit %{name}"
+      leave_blank: "(leave blank if you don't want to change it)"
+      password_to_confirm: "(we need your current password to confirm your changes)"
+      unhappy: Unhappy?
+      update: Update
+    new: 
+      sign_up: "Sign up"
+      sign_up_for_diaspora: "Sign up for Diaspora"
+  requests: 
+    create: 
+      sending: Sending...
+      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      tried: "we tried our best to send a message to %{account}"
+    destroy: 
+      error: "Please select an aspect!"
+      ignore: "Ignored friend request."
+      success: "You are now friends."
+    manage_aspect_contacts: 
+      contact_username: "Contact's username"
+      create_request: "Create request"
+      enter_a_diaspora_username: "Enter a Diaspora username:"
+      existing: "Existing contacts"
+      know_email: "Know their email address? You should invite them"
+      manage_within: "Manage contacts within"
+      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+  search: Search
+  services: 
+    create: 
+      success: "Authentication successful."
+    destroy: 
+      success: "Successfully destroyed authentication."
+    index: 
+      connect_to_facebook: "Connect to facebook"
+      connect_to_twitter: "Connect to twitter"
+      disconnect: disconnect
+      logged_in_as: "logged in as"
+      really_disconnect: "disconnect %{service}?"
+  settings: Settings
+  shared: 
+    aspect_contacts: 
+      add_contacts: "add contacts"
+      add_to: "add to %{aspect}"
+      everyone: Everyone
+      manage: "manage %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "add a new aspect"
+      everyone: Everyone
+      manage: Manage
+      manage_your_aspects: "Manage your Aspects"
+    author_info: 
+      all: all
+      status_messages: "status messages"
+      view_profile: "View profile"
+      viewing: viewing
+    contact_list: 
+      add_to: "Add %{name} to %{aspect}"
+      remove_from: "Remove %{name} from %{aspect}"
+      search_contacts: "Search contacts"
+    invitations: 
+      invitations_left: "(%{count} left)"
+      invite_someone: "Invite someone"
+      invites: Invites
+    notification: 
+      new: "New %{type} from %{from}"
+    public_explain: 
+      logged_in: "logged in to %{service}"
+      manage: "manage connected services"
+      outside: "Public messages will be available for others outside of Diaspora to see."
+      title: "You are about to post a public message!"
+    publisher: 
+      all: all
+      make_public: "make public"
+      post_a_message_to: "Post a message to %{aspect}"
+      posting: Posting...
+      share: Share
+      share_with: "Share with %{aspect}"
+      share_with_all: "Share with all aspects"
+    reshare: 
+      reshare: Reshare
+    stream_element: 
+      show_comments: "show comments"
+  status_messages: 
+    helper: 
+      no_message_to_display: "No message to display."
+    new_status_message: 
+      oh_yeah: "oh yeah!"
+      tell_me_something_good: "tell me something good"
+    show: 
+      destroy: Destroy
+  the_world: "the world"
+  username: Username
+  users: 
+    destroy: "Account successfully closed."
+    edit: 
+      change_language: "Change Language"
+      change_password: "Change Password"
+      close_account: "Close Account"
+      download_photos: "download my photos"
+      download_xml: "download my xml"
+      export_data: "Export Data"
+      invite_contacts: "Invite contacts"
+      new_password: "New Password"
+    getting_started: 
+      connect_services: "Connect your services"
+      define_aspects: "Define your aspects"
+      edit_profile: "Edit your profile"
+      save_and_continue: "Save and continue"
+      signup_steps: "Complete your sign-up by doing these things:"
+      skip: "skip getting started"
+      step_1: 
+        your_profile: "Your Profile"
+      step_2: 
+        add: Add
+        aspect_name: "Aspect name"
+        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+        your_aspects: "Your aspects"
+      step_3: 
+        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
+        your_services: "Your services"
+      step_4: 
+        change_profile: "You can change your profile any time by clicking"
+        connect_disconnect: "You can connect/disconnect your services any time by clicking"
+        continue: "Continue on to your everyone page, an overview of all of your aspects."
+        finish: Finish
+        manage_aspects: "You can manage your aspects any time by clicking the"
+        ready_to_share: "You're now ready to start sharing with "
+        set_up: "You're all set up, %{name}!"
+        tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+        user_menu: "in your user menu (top right)."
+      welcome: "Welcome to Diaspora!"
+    public: 
+      does_not_exist: "User %{username} does not exist!"
+    update: 
+      language_changed: "Language Changed"
+      language_not_changed: "Language Change Failed"
+      password_changed: "Password Changed"
+      password_not_changed: "Password Change Failed"
diff --git a/config/locales/diaspora/fr-informal.yml b/config/locales/diaspora/fr-informal.yml
deleted file mode 100644
index 42267d796..000000000
--- a/config/locales/diaspora/fr-informal.yml
+++ /dev/null
@@ -1,238 +0,0 @@
-#   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
-# Localization file for French (Informal Honorifics). Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
-fr-informal:
-  activemodel:
-      errors:
-          models:
-              user:
-                  attributes:
-                      username:
-                          taken: "est déjà pris"
-                      email:
-                          taken: "est déjà pris"
-  hello: "Bonjour tout le monde"
-  application:
-      helper:
-          unknown_person: "personne inconnue"
-          new_requests: "nouvelles requêtes"
-  dashboards:
-      helper:
-          home: "accueil"
-  error_messages:
-      helper:
-          invalid_fields: "Champs invalides"
-          correct_the_following_errors_and_try_again: "Corrige les erreurs suivantes, puis réessaie."
-  people:
-      helper:
-           results_for: " résultats concernant %{params}"
-           people_on_pod_are_aware_of: " personnes agissant comme des automates sont au courant"
-  layouts:
-      application:
-          edit_profile: "éditer le profil"
-          logout: "déconnexion"
-  shared:
-      aspect_nav:
-          all_aspects: "Tous les aspects"
-          manage: "Gérer"
-          manage_your_aspects: "Gérer tes aspects"
-      sub_header:
-          all_aspects: "Tous les aspects"
-          manage_aspects: "Gérer les aspects"
-      publisher:
-          share: "Partager"
-      aspect_friends:
-          add_friends: "ajouter des amis"
-          photos: "photos"
-  albums:
-      album:
-          you: "toi"
-      new_album:
-          create: "créer"
-          add_a_new_album: "Ajouter un nouvel album"
-      show:
-          edit_album: "Éditer l’album"
-          albums: "albums"
-          updated: "mis à jour"
-          by: "par"
-      edit:
-          editing: "Édition"
-          updated: "mis à jour"
-          are_you_sure: "Es-tu sûr(e) ?"
-          delete_album: "Supprimer l’album"
-          cancel: "Annuler"
-      index:
-          home: "accueil"
-          new_album: "Nouvel album"
-      create:
-          success: "Tu as créé un album nommé %{name}."
-      update:
-          success: "L’album %{name} a été édité avec succès."
-          failure: "L’édition de l’album %{name} a échoué."
-      destroy:
-          success: "L’album %{name} a été supprimé."
-      helper:
-          friends_albums: "Albums d’amis"
-          your_albums: "Tes albums"
-  aspects:
-      no_friends_message:
-          nobody: "Tu as forcément des amis, n’hésite pas à les ramener sur Diaspora !"
-          nobody_in_aspect: "Ton aspect '%{aspect_name}' est vide."
-          add_friend: "Ajouter un ami"
-          add_friend_to: "Ajouter quelqu’un à %{aspect_name}"
-          invite: "Inviter quelqu’un à rejoindre Diaspora !"
-      no_posts_message:
-          start_talking:  "Personne n’a encore rien dit.  Commence dès à présent la conversation !"
-      manage:
-          add_a_new_aspect: "Ajouter un nouvel aspect"
-          add_a_new_friend:  "Ajouter un nouvel ami"
-          show: "Afficher"
-          update_aspects: "Mettre à jour les aspects"
-          requests: "Requêtes"
-          ignore_remove: "Ignorer/Supprimer"
-      new_aspect:
-          add_a_new_aspect: "Ajouter un nouvel aspect"
-          create: "Créer"
-      create:
-          success: "Clique sur le symbole plus situé sur le côté gauche afin que Diaspora détermine qui peut voir ton nouvel aspect."
-          failure: "La création de l’aspect a échoué."
-      destroy:
-          success: "%{name} a été supprimé avec succès."
-      update:
-          success: "Ton aspect, %{name}, a été édité avec succès."
-      move_friend:
-          failure: "ne fonctionne pas %{inspect}"
-          success: "Personne déplacée vers le nouvel aspect"
-      add_to_aspect:
-          failure: "L’ajout de l’ami vers l’aspect a échoué."
-          success: "Tu as ajouté l’ami à l’aspect avec succès."
-      helper:
-          remove: "supprimer"
-          aspect_not_empty: "L’aspect n’est pas vide"
-  users:
-      edit:
-          editing_profile: "Édition du profil"
-      profile:
-          cancel: "Annuler"
-          update_profile: "Mettre à jour le profil"
-          home: "Accueil"
-          diaspora_username: "NOM D’UTILISATEUR DIASPORA"
-          info: "Informations"
-          picture: "Image"
-          editing_profile: "Édition du profil"
-          albums: "Albums"
-          you_dont_have_any_photos: "Tu n’as aucune photo !  Rends-toi sur la page"
-          page_to_upload_some:  "afin d’en transférer quelques-unes."
-          or: "ou"
-      destroy: "Compte clôturé avec succès."
-  comments:
-      comment:
-          ago: "il y a"
-      new_comment:
-          comment: "Commentaire"
-  photos:
-      show:
-          prev: "précédent"
-          full_size: "taille réelle"
-          next: "suivant"
-          edit_photo: "Éditer la photo"
-          delete_photo: "Supprimer la photo"
-          are_you_sure: "Es-tu sûr(e) ?"
-          comments: "commentaires"
-      edit:
-          editing: "Édition"
-          are_you_sure: "Es-tu sûr(e) ?"
-          delete_photo: "Supprimer la photo"
-      photo:
-          show_comments: "afficher les commentaires"
-          posted_a_new_photo_to: "a publié une nouvelle photo dans"
-          delete: "Supprimer"
-          are_you_sure: "Es-tu sûr(e) ?"
-      new:
-          new_photo: "Nouvelle photo"
-          back_to_list: "Retourner à la liste"
-          post_it: "la publier !"
-      create:
-          runtime_error: "Le transfert de la photo a échoué.  Es-tu sûr(e) que ta ceinture de sécurité est bien attachée ?"
-          integrity_error: "Le transfert de la photo a échoué.  Es-tu sûr(e) que c’était bien une image ?"
-          type_error: "Le transfert de la photo a échoué.  Es-tu sûr(e) que l’image a bien été ajoutée ?"
-      update:
-          notice: "La photo a été mise à jour avec succès."
-          error:  "L’édition de la photo a échoué."
-      destroy:
-          notice: "La photo a été supprimée."
-  registrations:
-      new:
-          sign_up: "Inscription"
-      create:
-          success: "Tu as rejoint Diaspora !"
-  invitations:
-      create:
-          sent: 'Ton invitation a été envoyée.'
-          no_more: 'Tu n’as plus d’invitation.'
-          already_sent: 'Tu as déjà invité cette personne.'
-          already_friends: 'Tu es déjà ami avec cette personne'
-          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é.'
-
-  status_messages:
-      new_status_message:
-          tell_me_something_good: "dis-moi quelque chose de bien"
-          oh_yeah: "oh ouais !"
-      status_message:
-          show_comments: "afficher les commentaires"
-          delete: "Supprimer"
-          are_you_sure: "Es-tu sûr(e) ?"
-      show:
-          status_message: "Message d’état"
-          comments: "commentaires"
-          are_you_sure: "Es-tu sûr(e) ?"
-          destroy: "Détruire"
-          view_all: "Tout afficher"
-          message: "Message"
-          owner: "Propriétaire"
-      helper:
-          no_message_to_display: "Aucun message à afficher."
-  people:
-      person:
-          add_friend: "ajouter en ami"
-          pending_request: "requête en attente"
-      index:
-          add_friend: "ajouter un ami"
-          real_name: "nom réel"
-          diaspora_handle: "maniement de Diaspora"
-          thats_you: "c’est toi !"
-          friend_request_pending: "Requête d’ami en attente"
-          you_have_a_friend_request_from_this_person: "tu as une requête d’ami de la part de cette personne"
-      new:
-          new_person: "Nouvelle personne"
-          back_to_list: "Retourner à la liste"
-      show:
-          last_seen: "dernière connexion : %{how_long_ago}"
-          friends_since: "amis depuis : %{how_long_ago}"
-          save: "sauver"
-          are_you_sure: "Es-tu sûr(e) ?"
-          remove_friend: "supprimer de mes amis"
-          no_posts: "aucun message à afficher !"
-  requests:
-      new_request:
-          add_a_new_friend_to: "Ajouter un nouvel ami à"
-          enter_a_diaspora_username: "Saisis un nom d’utilisateur Diaspora :"
-          your_diaspora_username_is: "Ton nom d’utilisateur Diaspora est : %{diaspora_handle}"
-          friends_username: "Nom d’utilisateur de l’ami"
-      destroy:
-          success: "Vous êtes à présent amis."
-          error: "Merci de sélectionner un aspect !"
-          ignore: "Requête d’ami ignorée."
-      create:
-          error: "Aucun résultat Diaspora n’a été trouvé avec cette adresse e-mail !"
-          invalid_identity: "Cette identité n’est pas proprement formatée"
-          error_server: "Un problème est survenu avec l’autre serveur. Il n’existe peut-être pas ?"
-          yourself: "Tu ne peux pas être ami avec toi-même !"
-          already_friends: "Tu es déjà ami avec %{destination_url}!"
-          success: "Une requête d’ami a été envoyée à %{destination_url}."
-          horribly_wrong: "Quelque chose d’horrible s’est produit."
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index a585b5471..232198ae5 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -2,324 +2,354 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-# Localization file for French (Formal Honorifics). Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
-fr:
-
-  settings: "Options"
-  profile: "Profil"
-  account: "Compte"
-  _services: "Services"
-  _photos: "photos"
-  stream: "flux"
-  ok: "OK"
-  cancel: "Annuler"
-  delete: "Supprimer"
-  or: "ou"
-  by: "par"
+fr: 
+  _photos: photos
+  _services: Services
+  account: Compte
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "est déjà pris"
+        user: 
+          attributes: 
+            email: 
+              taken: "est déjà pris"
+            person: 
+              invalid: "est invalide"
+            username: 
+              taken: "est déjà pris"
   ago: "plus tôt"
-  username: "Nom d'utilisateur"
-  email: "E-mail"
-  home: "Accueil"
+  application: 
+    helper: 
+      unknown_person: "personne inconnue"
+      youtube_title: 
+        unknown: "Titre de vidéo inconnu"
+  are_you_sure: "Êtes-vous sûr(e) ?"
+  aspects: 
+    add_to_aspect: 
+      failure: "L’ajout du contact à l’aspect a échoué."
+      success: "Vous avez ajouté le contact à l’aspect avec succès."
+    create: 
+      failure: "La création de l’aspect a échoué."
+      success: "Cliquez sur le symbole plus situé sur le côté gauche afin que Diaspora détermine qui peut voir votre nouvel aspect."
+    destroy: 
+      success: "%{name} a été supprimé avec succès."
+    helper: 
+      are_you_sure: "Êtes-vous sûr(e) de vouloir supprimer cet aspect ?"
+      aspect_not_empty: "L’aspect n’est pas vide"
+      remove: supprimer
+    manage: 
+      add_a_new_aspect: "Ajouter un nouvel aspect"
+      add_a_new_contact: "Ajouter un nouveau contact"
+      drag_to_add: "Faîtes glisser pour ajouter des personnes"
+      manage_aspects: "Gérer les aspects"
+      no_requests: "Pas de nouvelle requête"
+      requests: Requêtes
+    move_contact: 
+      error: "Erreur lors du déplacement du contact : %{inspect}"
+      failure: "ne fonctionne pas %{inspect}"
+      success: "Personne déplacée vers le nouvel aspect"
+    new_aspect: 
+      create: Créer
+      name: Nom
+    no_contacts_message: 
+      add_contact: "Ajouter un contact"
+      add_contact_to: "Ajouter quelqu'un à %{aspect_name}"
+      invite: "Inviter quelqu'un à rejoindre Diaspora !"
+      nobody: "Nous savons que vous connaissez des gens — amenez les sur Diaspora !"
+      nobody_in_aspect: "Votre aspect '%{aspect_name}' est vide."
+    no_posts_message: 
+      start_talking: "Personne n’a encore rien dit.  Commencez dès à présent la conversation !"
+    remove_from_aspect: 
+      failure: "Impossible de supprimer la personne de l'aspect"
+      success: "Personne supprimée de l'aspect avec succès"
+    update: 
+      success: "Votre aspect, %{name}, a été édité avec succès."
+  back: Retour
+  cancel: Annuler
+  comments: 
+    new_comment: 
+      comment: Commentaire
+      commenting: "Commentaire en cours d'envoi..."
+  dashboards: 
+    helper: 
+      home: Accueil
+  delete: Supprimer
+  email: E-mail
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Corrigez les erreurs suivantes, puis réessayez."
+      invalid_fields: "Champs invalides"
+  fill_me_out: Remplissez-moi
+  home: 
+    show: 
+      already_account: "vous avez déjà un compte?"
+      login_here: "connectez-vous ici"
+      share_what_you_want: "Partagez ce que vous voulez, avec qui vous voulez."
+  invitations: 
+    check_token: 
+      not_found: "Jeton d'authentification introuvable"
+    create: 
+      already_contacts: "Vous êtes déjà connecté avec cette personne"
+      already_sent: "Vous avez déjà invité cette personne."
+      no_more: "Vous n’avez plus d’invitation."
+      sent: "Votre invitation a été envoyée."
+    new: 
+      if_they_accept_info: "s'ils acceptent, ils seront ajoutés à l'aspect auquel vous les avez invités"
+      invite_someone_to_join: "Inviter quelqu'un à rejoindre Diaspora !"
+      message: "Message :"
+      send_an_invitation: "Envoyer une invitation"
+      send_invitation: "Envoyer l'invitation"
+      to: À
+  layouts: 
+    application: 
+      powered_by: "PROPULSÉ PAR DIASPORA*"
+    header: 
+      account_settings: "options du compte"
+      blog: blog
+      developers: développeurs
+      edit_profile: "éditer le profil"
+      login: connexion
+      logout: "se déconnecter"
+      view_profile: "voir le profil"
+  notifier: 
+    diaspora: "le robot de messagerie e-mail de diaspora"
+    hello: "Bonjour %{name} !"
+    love: "affectueusement,"
+    new_request: 
+      just_sent_you: "vient juste de vous envoyez une requête de contact sur Diaspora*"
+      sign_in: "connectez-vous ici"
+      subject: "nouvelle requête de contact Diaspora* de %{from}"
+      try_it_out: "Vous devriez vraiment envisager de l'essayer."
+    request_accepted: 
+      accepted: "a accepté votre requête de contact. Ils sont maintenant dans votre"
+      aspect: aspect.
+      subject: "%{name} a accepté votre requête de contact sur Diaspora*"
+  ok: OK
+  or: ou
   password: "Mot de passe"
   password_confirmation: "Confirmation du mot de passe"
-  are_you_sure: "Êtes-vous sûr(e) ?"
-
-  activemodel:
-      errors:
-          models:
-              user:
-                  attributes:
-                      person:
-                          invalid: "est invalide"
-                      username:
-                          taken: "est déjà pris"
-                      email:
-                          taken: "est déjà pris"
-              person:
-                  attributes:
-                      diaspora_handle:
-                          taken: "est déjà pris"
-  hello: "Bonjour tout le monde"
-  application:
-      helper:
-          unknown_person: "personne inconnue"
-          new_requests: "nouvelles requêtes"
-  error_messages:
-      helper:
-          invalid_fields: "Champs invalides"
-          correct_the_following_errors_and_try_again: "Corrigez les erreurs suivantes, puis réessayez."
-  people:
-      helper:
-           results_for: " résultats concernant %{params}"
-           people_on_pod_are_aware_of: " personnes sur le pod sont au courant"
-  layouts:
-      application:
-          view_profile: "voir le profil"
-          edit_profile: "éditer le profil"
-          account_settings: "options du compte"
-          search: "Rechercher"
-          logout: "déconnexion"
-  shared:
-      stream_element:
-          show_comments: "voir les commentaires"
-          the_world: "le monde"
-      aspect_nav:
-          all_aspects: "Tous les aspects"
-          manage: "Gérer"
-          manage_your_aspects: "Gérer vos aspects"
-          everyone: "Tout le monde"
-          add_a_new_aspect: "ajouter un nouvel aspect"
-      sub_header:
-          all_aspects: "Tous les aspects"
-          manage_aspects: "Gérer les aspects"
-      publisher:
-          share: "Partager"
-          post_a_message_to: "Poster un message à %{aspect}"
-          make_public: "rendre public"
-          share_with_all: "Partager avec tous les aspects"
-          share_with: "Partager avec %{aspect}"
-          create: "Créer"
-          all: "tous"
-      aspect_friends:
-          add_friends: "ajouter des amis"
-          everyone: "Tout le monde"
-          add_to: "ajouter à %{aspect}"
-      invitations:
-          invites: 'Invitations'
-          invite_a_friend: 'Inviter un ami'
-          invitations_left: '(%{count} restant(s))'
-      reshare:
-          reshare: 'Repartager'
-      author_info:
-          view_profile: 'Voir le profil'
-      add_friend_dropdown:
-          add_to: "ajouter à %{aspect}"
-      public_explain:
-          title: "Vous êtes sur le point d'envoyer un message public !"
-          outside: "Les messages publics pourront être vus par d'autres en dehors de Diaspora."
-          logged_in: "connecté à %{service}"
-          manage: "gérer les services connectés"
-  aspects:
-      no_friends_message:
-          nobody: "Vous avez forcément des amis, n’hésitez pas à les ramener sur Diaspora !"
-          nobody_in_aspect: "Votre aspect '%{aspect_name}' est vide."
-          add_friend: "Ajouter un ami"
-          add_friend_to: "Ajouter quelqu’un à %{aspect_name}"
-          invite: "Inviter quelqu’un à rejoindre Diaspora !"
-      no_posts_message:
-          start_talking:  "Personne n’a encore rien dit.  Commencez dès à présent la conversation !"
-      manage:
-          add_a_new_aspect: "Ajouter un nouvel aspect"
-          add_a_new_friend:  "Ajouter un nouvel ami"
-          show: "Afficher"
-          update_aspects: "Mettre à jour les aspects"
-          requests: "Requêtes"
-          ignore_remove: "Ignorer/Supprimer"
-          no_requests: "Pas de nouvelle requête"
-          remove_from_aspect: "Supprimer de l'aspect"
-          manage_aspects: "Gérer les aspects"
-          drag_to_remove: "Faîtes glisser pour enlever cette personne de l'aspect"
-          drag_to-add: "Faîtes glisser pour ajouter des personnes"
-      new_aspect:
-          add_a_new_aspect: "Ajouter un nouvel aspect"
-          name: "Nom"
-          create: "Créer"
-      create:
-          success: "Cliquez sur le symbole plus situé sur le côté gauche afin que Diaspora détermine qui peut voir votre nouvel aspect."
-          failure: "La création de l’aspect a échoué."
-      destroy:
-          success: "%{name} a été supprimé avec succès."
-      update:
-          success: "Votre aspect, %{name}, a été édité avec succès."
-      move_friend:
-          failure: "ne fonctionne pas %{inspect}"
-          success: "Personne déplacée vers le nouvel aspect"
-      add_to_aspect:
-          failure: "L’ajout de l’ami à l’aspect a échoué."
-          success: "Vous avez ajouté l’ami à l’aspect avec succès."
-      helper:
-          remove: "supprimer"
-          aspect_not_empty: "L’aspect n’est pas vide"
-  users:
-      edit:
-          editing_profile: "Édition du profil"
-          invite_friends: "Inviter des amis"
-          export_data: "Exporter des données"
-          close_account: "Clôre le compte"
-          change_language: "Changer la langue"
-          change_password: "Changer le mot de passe"
-          new_password: "Nouveau mot de passe"
-          download_xml: "télécharger mon xml"
-          download_photos: "télécharger mes photos"
-      destroy: "Compte clôturé avec succès."
-      getting_started:
-          signup_steps: "Complétez votre inscription en effectuant ceci :"
-          'step_1':
-              you_dont_have_any_photos: "Vous n'avez aucune photos !  Rendez-vous sur la page"
-              page_to_upload_some:  "afin d'en transférer quelques-unes."
-              fill_me_out: "Remplissez-moi"
-          edit_profile: "Éditez votre profil"
-          define_aspects: "Définissez vos aspects"
-          connect_services: "Connectez vos services"
-      update:
-          password_changed: "Mot de passe mis à jour"
-          password_not_changed: "Échec de la mise à jour du mot de passe"
-          language_changed: "Langue mise à jour"
-          language_not_changed: "Échec lors de la mise à jour de la langue"
-      public:
-          does_not_exist: "L'utilisateur %{username} n'existe pas !"
-  comments:
-      new_comment:
-          comment: "Commentaire"
-  photos:
-      show:
-          prev: "précédent"
-          full_size: "taille réelle"
-          next: "suivant"
-          edit_photo: "Éditer la photo"
-          delete_photo: "Supprimer la photo"
-          comments: "commentaires"
-          add_a_description: "Ajouter une description"
-          uploads: "téléchargements"
-          make_profile_photo: "en faire la photo de profil"
-          update_photo: "Mettre à jour la photo"
-      edit:
-          editing: "Édition"
-          delete_photo: "Supprimer la photo"
-      photo:
-          posted_a_new_photo_to: "a publié une nouvelle photo dans"
-          posted_a_photo: "a publié une nouvelle photo"
-      new:
-          new_photo: "Nouvelle photo"
-          back_to_list: "Retourner à la liste"
-          post_it: "la publier !"
-      create:
-          runtime_error: "Le transfert de la photo a échoué.  Êtes-vous sûr(e) que votre ceinture de sécurité est bien attachée ?"
-          integrity_error: "Le transfert de la photo a échoué.  Êtes-vous sûr(e) que c’était bien une image ?"
-          type_error: "Le transfert de la photo a échoué.  Êtes-vous sûr(e) que l’image a bien été ajoutée ?"
-      update:
-          notice: "La photo a été mise à jour avec succès."
-          error:  "L’édition de la photo a échoué."
-      destroy:
-          notice: "La photo a été supprimée."
-  registrations:
-      new:
-          sign_up: "Inscription"
-          sign_up_for_diaspora: "Inscription à Diaspora"
-          upload_existing_account: "Télécharger un compte Diaspora existant"
-          upload: "Télécharger"
-      create:
-          success: "Vous avez rejoint Diaspora !"
-  invitations:
-      create:
-          sent: 'Votre invitation a été envoyée.'
-          no_more: 'Vous n’avez plus d’invitation.'
-          already_sent: 'Vous avez déjà invité cette personne.'
-          already_friends: 'Vous êtes déjà ami avec cette personne'
-          invitation_token_invalid: 'Le jeton d’invitation fourni n’est pas valide !'
-          updated: 'Votre mot de passe a été mis à jour avec succès. Vous êtes à présent connecté.'
-      new:
-          invite_someone_to_join: "Inviter quelqu'un à rejoindre Diaspora !"
-          if_they_accept_info: "s'ils acceptent, ils seront ajoutés à l'aspect auquel vous les avez invités"
-          to: 'À'
-          message: 'Message :'
-          send_an_invitation: 'Envoyer une invitation'
-          send_invitation: "Envoyer l'invitation"
-      check_token:
-          not_found: "Jeton d'authentification introuvable"
-  status_messages:
-      new_status_message:
-          tell_me_something_good: "dites-moi quelque chose de bien"
-          oh_yeah: "oh ouais !"
-      show:
-          status_message: "Message d’état"
-          comments: "commentaires"
-          destroy: "Détruire"
-          view_all: "Tout afficher"
-          message: "Message"
-          owner: "Propriétaire"
-      helper:
-          no_message_to_display: "Aucun message à afficher."
-  people:
-      person:
-          add_friend: "ajouter en ami"
-          pending_request: "requête en attente"
-          already_friends: "Déjà amis"
-          thats_you: "c'est vous !"
-      index:
-          add_friend: "ajouter un ami"
-          real_name: "nom réel"
-          diaspora_handle: "maniement de Diaspora"
-          thats_you: "c’est vous !"
-          friend_request_pending: "Requête d’ami en attente"
-          you_have_a_friend_request_from_this_person: "vous avez une requête d’ami de la part de cette personne"
-          results_for: "résultats de la recherche pour"
-      new:
-          new_person: "Nouvelle personne"
-          back_to_list: "Retourner à la liste"
-      show:
-          save: "sauver"
-          no_posts: "aucun message à afficher !"
-          add_friend: "ajouter un ami"
-          not_friends: "Vous n'êtes actuellement pas ami avec %{name}"
-          request_people: "Si vous le voulez, vous pouvez demander à le/la placer dans vos aspects."
-          already_requested: "Vous avez déjà envoyé une requête à %{name}."
-          does_not_exist: "Cette personne n'existe pas !"
-      edit:
-          info_available_to: "Cette info sera consultable par toutes les personnes avec qui vous êtes connecté sur Diaspora."
-          your_profile: "Votre profil"
-          your_name: "Votre nom"
-          first_name: "Votre prénom"
-          last_name: "Votre nom de famille"
-          your_gender: "Votre sexe"
-          your_birthday: "Votre anniversaire"
-          your_bio: "Votre bio"
-          fill_me_out: "Remplissez-moi"
-          your_photo: "Votre photo"
-          update_profile: "Mettre à jour le profil"
-          diaspora_username: "NOM D'UTILISATEUR DIASPORA"
-          info: "Info"
-          picture: "Image"
-          editing_profile: "Edition du profil"
-          you_dont_have_any_photos: "Vous n'avez aucune photo ! Rendez-vous sur la page"
-          page_to_upload_some:  "afin d'en transférer quelques-unes."
-          search: "Rechercher"
-          allow_search: "Autoriser des personnes à vous rechercher"
-      profile_photo_upload:
-          or_select_one: "ou sélectionnez-en une dans celles déjà existantes"
-      update:
-          updated: "Profil mis à jour"
-          failed: "La mise à jour du profil a échoué"
-      profile_sidebar:
-          remove_friend: "supprimer de mes amis"
-          edit_my_profile: "Éditer mon profil"
-          last_seen: "dernière connexion : %{how_long_ago}"
-          friends_since: "amis depuis : %{how_long_ago}"
-  requests:
-      new_request:
-          add_a_new_friend_to: "Ajouter un nouvel ami à"
-          enter_a_diaspora_username: "Saisissez un nom d’utilisateur Diaspora :"
-          your_diaspora_username_is: "Votre nom d’utilisateur Diaspora est : %{diaspora_handle}"
-          friends_username: "Nom d’utilisateur de l’ami"
-          create_request: "Créer une requête"
-      destroy:
-          success: "Vous êtes à présent amis."
-          error: "Veuillez sélectionner un aspect !"
-          ignore: "Requête d’ami ignorée."
-      create:
-          error: "Aucun résultat Diaspora n’a été trouvé avec cette adresse e-mail !"
-          invalid_identity: "Cette identité n’est pas proprement formatée"
-          error_server: "Un problème est survenu avec l’autre serveur. Il n’existe peut-être pas ?"
-          yourself: "Vous ne pouvez pas être ami avec vous-même !"
-          already_friends: "Vous êtes déjà ami avec %{destination_url}!"
-          success: "Une requête d’ami a été envoyée à %{destination_url}."
-          horribly_wrong: "Quelque chose d’horrible s’est produit."
-          tried: "nous avons fait de notre mieux pour envoyer un message à %{account}"
-  services:
-      index:
-          settings: "Options"
-          profile: "Profil"
-          account: "Compte"
-          services: "Services"
+  people: 
+    edit: 
+      allow_search: "Autoriser des personnes à vous rechercher"
+      first_name: "Votre prénom"
+      info_available_to: "Cette info sera consultable par toutes les personnes avec qui vous êtes connecté sur Diaspora."
+      last_name: "Votre nom de famille"
+      update_profile: "Mettre à jour le profil"
+      your_bio: "Votre bio"
+      your_birthday: "Votre anniversaire"
+      your_gender: "Votre sexe"
+      your_name: "Votre nom"
+      your_photo: "Votre photo"
+      your_profile: "Votre profil"
+    helper: 
+      people_on_pod_are_aware_of: " les personnes sur le pod sont au courant de"
+      results_for: " résultats pour %{params}"
+    index: 
+      results_for: "résultats de la recherche pour"
+    person: 
+      add_contact: "ajouter un contact"
+      already_connected: "Déjà connecté"
+      pending_request: "requête en attente"
+      thats_you: "c'est vous !"
+    profile_photo_upload: 
+      or_select_one: "ou sélectionnez-en une dans celles déjà existantes"
+    profile_sidebar: 
+      bio: bio
+      born: né(e)
+      edit_my_profile: "Éditer mon profil"
+      gender: sexe
+      in_aspects: "dans les aspects"
+      last_seen: "dernière connexion : %{how_long_ago}"
+      remove_contact: "supprimer le contact"
+    show: 
+      already_requested: "Vous avez déjà envoyé une requête à %{name}."
+      does_not_exist: "Cette personne n'existe pas !"
+      no_posts: "aucun message à afficher !"
+      not_connected: "Vous n'êtes pas connecté à cet personne"
+      request_people: "Si vous le voulez, vous pouvez demander à le/la placer dans vos aspects."
+    update: 
+      failed: "La mise à jour du profil a échoué"
+      updated: "Profil mis à jour"
+  photos: 
+    create: 
+      integrity_error: "Le transfert de la photo a échoué.  Êtes-vous sûr(e) que c’était bien une image ?"
+      runtime_error: "Le transfert de la photo a échoué.  Êtes-vous sûr(e) que votre ceinture de sécurité est bien attachée ?"
+      type_error: "Le transfert de la photo a échoué.  Êtes-vous sûr(e) que l’image a bien été ajoutée ?"
+    destroy: 
+      notice: "La photo a été supprimée."
+    edit: 
+      editing: Édition
+    new: 
+      back_to_list: "Retourner à la liste"
+      new_photo: "Nouvelle photo"
+      post_it: "la publier !"
+    new_photo: 
+      drop: "Faîtes glisser des photos ici pour les télécharger"
+      empty: "{file} est vide, merci de sélectionner de nouveau des fichiers sans celui-ci."
+      failed: Échec
+      invalid_ext: "{file} a une extension invalide. Seules {extensions} sont autorisées."
+      size_error: "{file} est trop grand, la taille maximum pour un fichier est {sizeLimit}."
+      upload: "Télécharger une photo"
+    photo: 
+      view_all: "voir toute les photos de %{name}"
+    show: 
+      add_a_description: "Ajouter une description"
+      delete_photo: "Supprimer la photo"
+      edit_photo: "Éditer la photo"
+      full_size: "taille réelle"
+      make_profile_photo: "en faire la photo de profil"
+      next: suivant
+      prev: précédent
+      update_photo: "Mettre à jour la photo"
+    update: 
+      error: "L’édition de la photo a échoué."
+      notice: "La photo a été mise à jour avec succès."
+  profile: Profil
+  registrations: 
+    closed: "Les inscriptions sont fermées sur ce pod Diaspora."
+    create: 
+      success: "Vous avez rejoint Diaspora !"
+    edit: 
+      cancel_my_account: "Clôre mon compte"
+      edit: "Éditer %{name}"
+      leave_blank: "(laissez blanc si vous ne souhaitez pas le changer)"
+      password_to_confirm: "(nous avons besoin de votre mot de passe actuel pour confirmer vos changements)"
+      unhappy: "Insatisfait ?"
+      update: "Mettre à jour"
+    new: 
+      sign_up: Inscription
+      sign_up_for_diaspora: "Inscription à Diaspora"
+  requests: 
+    create: 
+      sending: "En cours d'envoi..."
+      sent: "Vous avez demandé le partage avec %{name}.  Ils devraient le voir la prochaine fois qu'ils se connecteront à Diaspora."
+      tried: "nous avons fait de notre mieux pour envoyer un message à %{account}"
+    destroy: 
+      error: "Veuillez sélectionner un aspect !"
+      ignore: "Requête de contact ignorée."
+      success: "Vous êtes à présent amis."
+    manage_aspect_contacts: 
+      contact_username: "Nom d'utilisateur du contact"
+      create_request: "Créer une requête"
+      enter_a_diaspora_username: "Entrez un nom d'utilisateur Diaspora :"
+      existing: "Contacts existants"
+      know_email: "Vous connaissez leurs adresses e-mail ? Vous devriez les inviter"
+      manage_within: "Gérer les contacts de"
+      your_diaspora_username_is: "Votre nom Diaspora est : %{diaspora_handle}"
+  search: Rechercher
+  services: 
+    create: 
+      success: "Authentification réussie."
+    destroy: 
+      success: "Authentification clôturée avec succès."
+    index: 
+      connect_to_facebook: "Connecter à facebook"
+      connect_to_twitter: "Connecter à twitter"
+      disconnect: déconnecter
+      logged_in_as: "connecté en tant que"
+      really_disconnect: "déconnecter %{service} ?"
+  settings: Options
+  shared: 
+    aspect_contacts: 
+      add_contacts: "ajouter des contacts"
+      add_to: "ajouter à %{aspect}"
+      everyone: "Tout le monde"
+      manage: "gérer %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "ajouter un nouvel aspect"
+      everyone: "Tout le monde"
+      manage: Gérer
+      manage_your_aspects: "Gérer vos aspects"
+    author_info: 
+      all: tout
+      status_messages: "messages de statut"
+      view_profile: "Voir le profil"
+      viewing: aperçu
+    contact_list: 
+      add_to: "Ajouter %{name} à %{aspect}"
+      remove_from: "Enlever %{name} de %{aspect}"
+      search_contacts: "Rechercher des contacts"
+    invitations: 
+      invitations_left: "(%{count} restant(s))"
+      invite_someone: "Inviter quelqu'un"
+      invites: Invitations
+    notification: 
+      new: "Nouveau/nouvelle %{type} de %{from}"
+    public_explain: 
+      logged_in: "connecté à %{service}"
+      manage: "gérer les services connectés"
+      outside: "Les messages publics pourront être vus par d'autres en dehors de Diaspora."
+      title: "Vous êtes sur le point d'envoyer un message public !"
+    publisher: 
+      all: tous
+      make_public: "rendre public"
+      post_a_message_to: "Poster un message à %{aspect}"
+      posting: "Post en cours d'envoi..."
+      share: Partager
+      share_with: "Partager avec %{aspect}"
+      share_with_all: "Partager avec tous les aspects"
+    reshare: 
+      reshare: Repartager
+    stream_element: 
+      show_comments: "voir les commentaires"
+  status_messages: 
+    helper: 
+      no_message_to_display: "Aucun message à afficher."
+    new_status_message: 
+      oh_yeah: "oh ouais !"
+      tell_me_something_good: "dites-moi quelque chose de bien"
+    show: 
+      destroy: Détruire
+  the_world: "le monde"
+  username: "Nom d'utilisateur"
+  users: 
+    destroy: "Compte clôturé avec succès."
+    edit: 
+      change_language: "Changer la langue"
+      change_password: "Changer le mot de passe"
+      close_account: "Clôre le compte"
+      download_photos: "télécharger mes photos"
+      download_xml: "télécharger mon xml"
+      export_data: "Exporter des données"
+      invite_contacts: "Inviter des contacts"
+      new_password: "Nouveau mot de passe"
+    getting_started: 
+      connect_services: "Connectez vos services"
+      define_aspects: "Définissez vos aspects"
+      edit_profile: "Éditez votre profil"
+      save_and_continue: "Enregistrer et continuer"
+      signup_steps: "Complétez votre inscription en effectuant ceci :"
+      skip: "passer la présentation"
+      step_1: 
+        your_profile: "Votre profil"
+      step_2: 
+        add: Ajouter
+        aspect_name: "Nom de l'aspect"
+        description: "Signalez à Diaspora quels différents aspects sont vus par différents contacts. Vous pouvez gérer ceux-ci en cliquant sur l'onglet \"gérer\" en haut à droite. Vos aspects vous sont spécifiques, et invisibles pour les autres."
+        your_aspects: "Vos aspects"
+      step_3: 
+        description: "Connectez vos réseaux sociaux existants à votre compte Diaspora. Vous pourrez poster publiquement dans votre onglet \"Tous\" en sélectionnant \"public\"."
+        your_services: "Vos services"
+      step_4: 
+        change_profile: "Vous pouvez changer votre profil à tout moment en cliquant sur"
+        connect_disconnect: "Vous pouvez connecter/déconnecter vos services à tout moment en cliquant sur"
+        continue: "Continuer sur votre onglet 'Tout le monde', un aperçu de tous vos aspects."
+        finish: Terminer
+        manage_aspects: "Vous pouvez gérer vos aspects à tout moment en cliquant sur le"
+        ready_to_share: "Vous êtes maintenant prêt à partager avec "
+        set_up: "Vous êtes entièrement configuré, %{name}!"
+        tab_also_added: "onglet.  Vos contacts peuvent également être ajoutés lorsque vous êtes sur la page d'un aspect particulier."
+        user_menu: "dans votre menu utilisateur (en haut à droite)."
+      welcome: "Bienvenue sur Diaspora !"
+    public: 
+      does_not_exist: "L'utilisateur %{username} n'existe pas !"
+    update: 
+      language_changed: "Langue mise à jour"
+      language_not_changed: "Échec lors de la mise à jour de la langue"
+      password_changed: "Mot de passe mis à jour"
+      password_not_changed: "Échec de la mise à jour du mot de passe"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 5bf276163..d32ee32f3 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -1,208 +1,355 @@
 #   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.
 
 
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
-he:
-  hello: "שלום עולם"
-  application:
-      helper:
-          unknown_person: "אדם לא ידוע"
-          new_requests: "בקשות חדשות"
-  dashboards:
-      helper:
-          home: "בית"
-  error_messages:
-      helper:
-          invalid_fields: "שדות שגויים"
-          correct_the_following_errors_and_try_again: "יש לתקן את השגיאות הבאות ולנסות שוב."
-  people:
-      helper:
-           results_for: " תוצאות עבור %{params}"
-           people_on_pod_are_aware_of: " אנשים בפוד מודעים לכך"
-  layouts:
-      application:
-          edit_profile: "עריכת הפרופיל"
-          logout: "יציאה"
-  shared:
-      aspect_nav:
-          all_aspects: "כל ההיבטים"
-          manage: "ניהול"
-          manage_your_aspects: "ניהול ההיבטים שלך"
-      sub_header:
-          all_aspects: "כל ההיבטים"
-          manage_aspects: "ניהול ההיבטים"
-      publisher:
-          share: "שיתוף"
-      aspect_friends:
-          add_friends: "הוספת חברים"
-  albums:
-      album:
-          you: "את/ה"
-      new_album:
-          create: "יצירה"
-          add_a_new_album: "הוספת אלבום חדש"
-      show:
-          edit_album: "עריכת אלבום"
-          albums: "אלבומים"
-          updated: "תאריך העדכון"
-          by: "על ידי"
-      edit:
-          editing: "עריכה"
-          updated: "תאריך העדכון"
-          are_you_sure: "בבטחה?"
-          delete_album: "מחיקת אלבום"
-          cancel: "ביטול"
-      index:
-          home: "בית"
-          new_album: "אלבום חדש"
-      create:
-          success: "יצרת אלבום בשם %{name}."
-      update:
-          success: "האלבום %{name} נערך בהצלחה."
-          failure: "אירע כשל בעריכת האלבום %{name}."
-      destroy:
-          success: "האלבום %{name} נמחק."
-      helper:
-          friends_albums: "אלבומים של חברים"
-          your_albums: "האלבומים שלך"
-  aspects:
-      index:
-          photos: "תמונות"
-      show:
-          photos: "תמונות"
-      manage:
-          add_a_new_aspect: "הוספת היבט חדש"
-          add_a_new_friend:  "הוספת חבר חדש"
-          show: "הצגה"
-          update_aspects: "עדכון ההיבטים"
-          requests: "בקשות"
-          ignore_remove: "התעלמות/הסרה"
-      new_aspect:
-          add_a_new_aspect: "הוספת היבט חדש"
-          create: "יציאה"
-      create:
-          success: "יש ללחוץ על סמל הפלוס שמימין כדי לומר לדיאספורה מי יכול לצפות בהיבט החדש שלך."
-      destroy:
-          success: "%{name} הוסר בהצלחה."
-      update:
-          success: "ההיבט שלך, %{name}, נערך בהצלחה."
-      move_friends:
-          failure: "עריכת ההיבט נכשלה עבור החבר %{real_name}."
-          success: "ההיבטים נערכו בהצלחה."
-      move_friend:
-          failure: "לא עבד %{inspect}"
-          success: "כעת יופיע בפני החברים שלך היבט אחר שלך."
-      helper:
-          remove: "הסרה"
-          aspect_not_empty: "ההיבט אינו ריק"
-  users:
-      edit:
-          editing_profile: "עריכת הפרופיל"
-      profile:
-          cancel: "ביטול"
-          update_profile: "עדכון הפרופיל"
-          home: "בית"
-          diaspora_username: "שם המשתמש בדיאספורה"
-          info: "פרטים"
-          picture: "תמונה"
-          editing_profile: "עריכת הפרופיל"
-          albums: "אלבומים"
-          you_dont_have_any_photos: "אין לך תמונות!  באפשרותך לגשת לעמוד"
-          page_to_upload_some:  "כדי להעלות כמה."
-  comments:
-      comment:
-          ago: "לפני"
-      new_comment:
-          comment: "הערה"
-  photos:
-      show:
-          prev: "הקודמת"
-          full_size: "גודל מלא"
-          next: "הבאה"
-          edit_photo: "עריכת תמונה"
-          delete_photo: "מחיקת תמונה"
-          are_you_sure: "בבטחה?"
-          comments: "הערות"
-      edit:
-          editing: "עריכה"
-          are_you_sure: "בבטחה?"
-          delete_photo: "מחיקת תמונה"
-      photo:
-          show_comments: "הצגת הערות"
-          posted_a_new_photo_to: "פורסמה תמונה חדשה באלבום"
-      new:
-          new_photo: "תמונה חדשה"
-          back_to_list: "חזרה לרשימה"
-          post_it: "פרסום!"
-      create:
-          runtime_error: "העלאת התמונה נכשלה.  הידקת את החגורה?"
-          integrity_error: "העלאת התמונה נכשלה.  האם זו באמת הייתה תמונה?"
-          type_error: "העלאת התמונה נכשלה.  האם באמת נוספה תמונה?"
-      update:
-          notice: "התמונה עודכנה בהצלחה."
-          error:  "אירע כשל בעריכת התמונה."
-      destroy:
-          notice: "התמונה נמחקה."
-  registrations:
-      new:
-          sign_up: "הרשמה"
-      create:
-          success: "הצטרפת לדיאספורה!"
-  status_messages:
-      new_status_message:
-          tell_me_something_good: "בא לי לשמוע סיפור נחמד"
-          oh_yeah: "אחלה!"
-      status_message:
-          show_comments: "הצגת הערות"
-          delete: "מחיקה"
-          are_you_sure: "בבטחה?"
-      show:
-          status_message: "הודעת מצב"
-          comments: "הערות"
-          are_you_sure: "בבטחה?"
-          destroy: "הריסה"
-          view_all: "צפייה בכול"
-          message: "הודעה"
-          owner: "בעלים"
-      helper:
-          no_message_to_display: "אין הודעה להצגה."
-  people:
-      person:
-          add_friend: "הוספת חבר"
-          pending_request: "בקשה ממתינה"
-      index:
-          add_friend: "הוספת חבר"
-          real_name: "שם אמתי"
-          diaspora_handle: "כינוי בדיאספורה"
-          thats_you: "מדובר בך!"
-          friend_request_pending: "בקשת החברות ממתינה"
-          you_have_a_friend_request_from_this_person: "יש לך בקשת חברות מאדם זה"
-      new:
-          new_person: "אדם חדש"
-          back_to_list: "חזרה לרשימה"
-      show:
-          last_seen: "פעילות אחרונה: %{how_long_ago}"
-          friends_since: "חברים מאז: %{how_long_ago}"
-          save: "שמירה"
-          are_you_sure: "בבטחה?"
-          remove_friend: "הסרת חבר"
-  requests:
-      new_request:
-          add_a_new_friend_to: "הוספת חבר חדש אל"
-          enter_a_diaspora_username: "נא להזין שם משתמש בדיאספורה:"
-          your_diaspora_username_is: "שם המשתמש שלך בדיאספורה הוא: %{diaspora_handle}"
-          friends_username: "שם המשתמש של החבר"
-      destroy:
-          success: "אתם חברים כעת."
-          error: "נא לבחור בהיבט!"
-          ignore: "בקשות חברות מהן התעלמת."
-      create:
-          error: "לא נמצא זרע של דיאספורה בכתובת דוא״ל זו!"
-          already_friends: "את/ה ו%{destination_url} כבר חברים!"
-          success: "בקשת חברות נשלחה אל %{destination_url}."
-          horribly_wrong: "משהו השתבש לגמרי."
+he: 
+  _photos: photos
+  _services: Services
+  account: Account
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "is already taken"
+        user: 
+          attributes: 
+            email: 
+              taken: "is already taken"
+            person: 
+              invalid: "is invalid"
+            username: 
+              taken: "is already taken"
+  ago: ago
+  application: 
+    helper: 
+      unknown_person: "אדם לא ידוע"
+      youtube_title: 
+        unknown: "Unknown Video Title"
+  are_you_sure: "Are you sure?"
+  aspects: 
+    add_to_aspect: 
+      failure: "Failed to add friend to aspect."
+      success: "Successfully added friend to aspect."
+    create: 
+      failure: "Aspect creation failed."
+      success: "יש ללחוץ על סמל הפלוס שמימין כדי לומר לדיאספורה מי יכול לצפות בהיבט החדש שלך."
+    destroy: 
+      success: "%{name} הוסר בהצלחה."
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "ההיבט אינו ריק"
+      remove: הסרה
+    manage: 
+      add_a_new_aspect: "הוספת היבט חדש"
+      add_a_new_contact: "Add a new contact"
+      drag_to_add: "Drag to add people"
+      manage_aspects: "Manage aspects"
+      no_requests: "No new requests"
+      requests: בקשות
+    move_contact: 
+      error: "Error moving contact: %{inspect}"
+      failure: "didn't work %{inspect}"
+      success: "Person moved to new aspect"
+    new_aspect: 
+      create: יציאה
+      name: Name
+    no_contacts_message: 
+      add_contact: "Add a contact"
+      add_contact_to: "Add someone to %{aspect_name}"
+      invite: "Invite someone to join Diaspora!"
+      nobody: "We know you know people — bring them to Diaspora!"
+      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+    no_posts_message: 
+      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+    remove_from_aspect: 
+      failure: "Failed to remove person from aspect"
+      success: "Successfully removed person from aspect"
+    update: 
+      success: "ההיבט שלך, %{name}, נערך בהצלחה."
+  back: Back
+  cancel: Cancel
+  comments: 
+    new_comment: 
+      comment: הערה
+      commenting: Commenting...
+  dashboards: 
+    helper: 
+      home: Home
+  delete: Delete
+  email: Email
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "יש לתקן את השגיאות הבאות ולנסות שוב."
+      invalid_fields: "שדות שגויים"
+  fill_me_out: "Fill me out"
+  home: 
+    show: 
+      already_account: "already have an account?"
+      login_here: "log in here"
+      share_what_you_want: "Share what you want, with who you want."
+  invitations: 
+    check_token: 
+      not_found: "Invitation token not found"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "You already invited this person."
+      no_more: "You have no more invitations."
+      sent: "Your invitation has been sent."
+    new: 
+      if_they_accept_info: "if they accept, they will be added to the aspect you invited them"
+      invite_someone_to_join: "Invite someone to join Diaspora!"
+      message: "Message:"
+      send_an_invitation: "Send an invitation"
+      send_invitation: "Send invitation"
+      to: To
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: "account settings"
+      blog: blog
+      developers: developers
+      edit_profile: "edit profile"
+      login: login
+      logout: logout
+      view_profile: "view profile"
+  notifier: 
+    diaspora: "the diaspora email robot"
+    hello: "Hello %{name}!"
+    love: "love,"
+    new_request: 
+      just_sent_you: "just sent you a friend request on Diaspora*"
+      sign_in: "sign in here"
+      subject: "new Diaspora* friend request from %{from}"
+      try_it_out: "You should really think about checking it out."
+    request_accepted: 
+      accepted: "has accepted your friend request. They are now in your"
+      aspect: aspect.
+      subject: "%{name} has accepted your friend request on Diaspora*"
+  ok: OK
+  or: or
+  password: Password
+  password_confirmation: "Password confirmation"
+  people: 
+    edit: 
+      allow_search: "Allow for people to search for you"
+      first_name: "First name"
+      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      last_name: "Last name"
+      update_profile: "Update Profile"
+      your_bio: "Your bio"
+      your_birthday: "Your birthday"
+      your_gender: "Your gender"
+      your_name: "Your name"
+      your_photo: "Your photo"
+      your_profile: "Your profile"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: " results for %{params}"
+    index: 
+      results_for: "search results for"
+    person: 
+      add_contact: "add contact"
+      already_connected: "Already connected"
+      pending_request: "בקשה ממתינה"
+      thats_you: "thats you!"
+    profile_photo_upload: 
+      or_select_one: "or select one from your already existing"
+    profile_sidebar: 
+      bio: bio
+      born: born
+      edit_my_profile: "Edit my profile"
+      gender: gender
+      in_aspects: "in aspects"
+      last_seen: "last seen: %{how_long_ago}"
+      remove_contact: "remove contact"
+    show: 
+      already_requested: "You have already sent a request to %{name}."
+      does_not_exist: "Person does not exist!"
+      no_posts: "no posts to display!"
+      not_connected: "You are not connected with this person"
+      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+    update: 
+      failed: "Failed to update profile"
+      updated: "Profile updated"
+  photos: 
+    create: 
+      integrity_error: "העלאת התמונה נכשלה.  האם זו באמת הייתה תמונה?"
+      runtime_error: "העלאת התמונה נכשלה.  הידקת את החגורה?"
+      type_error: "העלאת התמונה נכשלה.  האם באמת נוספה תמונה?"
+    destroy: 
+      notice: "התמונה נמחקה."
+    edit: 
+      editing: עריכה
+    new: 
+      back_to_list: "חזרה לרשימה"
+      new_photo: "תמונה חדשה"
+      post_it: פרסום!
+    new_photo: 
+      drop: "Drop photos here to upload"
+      empty: "{file} is empty, please select files again without it."
+      failed: Failed
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      upload: "Upload a photo"
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      add_a_description: "Add a description"
+      delete_photo: "מחיקת תמונה"
+      edit_photo: "עריכת תמונה"
+      full_size: "גודל מלא"
+      make_profile_photo: "make profile photo"
+      next: הבאה
+      prev: הקודמת
+      update_photo: "Update Photo"
+    update: 
+      error: "אירע כשל בעריכת התמונה."
+      notice: "התמונה עודכנה בהצלחה."
+  profile: Profile
+  registrations: 
+    closed: "Signups are closed on this Diaspora pod."
+    create: 
+      success: "הצטרפת לדיאספורה!"
+    edit: 
+      cancel_my_account: "Cancel my account"
+      edit: "Edit %{name}"
+      leave_blank: "(leave blank if you don't want to change it)"
+      password_to_confirm: "(we need your current password to confirm your changes)"
+      unhappy: Unhappy?
+      update: Update
+    new: 
+      sign_up: הרשמה
+      sign_up_for_diaspora: "Sign up for Diaspora"
+  requests: 
+    create: 
+      sending: Sending...
+      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      tried: "we tried our best to send a message to %{account}"
+    destroy: 
+      error: "נא לבחור בהיבט!"
+      ignore: "בקשות חברות מהן התעלמת."
+      success: "אתם חברים כעת."
+    manage_aspect_contacts: 
+      contact_username: "Contact's username"
+      create_request: "Create request"
+      enter_a_diaspora_username: "Enter a Diaspora username:"
+      existing: "Existing contacts"
+      know_email: "Know their email address? You should invite them"
+      manage_within: "Manage contacts within"
+      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+  search: Search
+  services: 
+    create: 
+      success: "Authentication successful."
+    destroy: 
+      success: "Successfully destroyed authentication."
+    index: 
+      connect_to_facebook: "Connect to facebook"
+      connect_to_twitter: "Connect to twitter"
+      disconnect: disconnect
+      logged_in_as: "logged in as"
+      really_disconnect: "disconnect %{service}?"
+  settings: Settings
+  shared: 
+    aspect_contacts: 
+      add_contacts: "add contacts"
+      add_to: "add to %{aspect}"
+      everyone: Everyone
+      manage: "manage %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "add a new aspect"
+      everyone: Everyone
+      manage: ניהול
+      manage_your_aspects: "ניהול ההיבטים שלך"
+    author_info: 
+      all: all
+      status_messages: "status messages"
+      view_profile: "View profile"
+      viewing: viewing
+    contact_list: 
+      add_to: "Add %{name} to %{aspect}"
+      remove_from: "Remove %{name} from %{aspect}"
+      search_contacts: "Search contacts"
+    invitations: 
+      invitations_left: "(%{count} left)"
+      invite_someone: "Invite someone"
+      invites: Invites
+    notification: 
+      new: "New %{type} from %{from}"
+    public_explain: 
+      logged_in: "logged in to %{service}"
+      manage: "manage connected services"
+      outside: "Public messages will be available for others outside of Diaspora to see."
+      title: "You are about to post a public message!"
+    publisher: 
+      all: all
+      make_public: "make public"
+      post_a_message_to: "Post a message to %{aspect}"
+      posting: Posting...
+      share: שיתוף
+      share_with: "Share with %{aspect}"
+      share_with_all: "Share with all aspects"
+    reshare: 
+      reshare: Reshare
+    stream_element: 
+      show_comments: "show comments"
+  status_messages: 
+    helper: 
+      no_message_to_display: "אין הודעה להצגה."
+    new_status_message: 
+      oh_yeah: אחלה!
+      tell_me_something_good: "בא לי לשמוע סיפור נחמד"
+    show: 
+      destroy: הריסה
+  the_world: "the world"
+  username: Username
+  users: 
+    destroy: "Account successfully closed."
+    edit: 
+      change_language: "Change Language"
+      change_password: "Change Password"
+      close_account: "Close Account"
+      download_photos: "download my photos"
+      download_xml: "download my xml"
+      export_data: "Export Data"
+      invite_contacts: "Invite contacts"
+      new_password: "New Password"
+    getting_started: 
+      connect_services: "Connect your services"
+      define_aspects: "Define your aspects"
+      edit_profile: "Edit your profile"
+      save_and_continue: "Save and continue"
+      signup_steps: "Complete your sign-up by doing these things:"
+      skip: "skip getting started"
+      step_1: 
+        your_profile: "Your Profile"
+      step_2: 
+        add: Add
+        aspect_name: "Aspect name"
+        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+        your_aspects: "Your aspects"
+      step_3: 
+        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
+        your_services: "Your services"
+      step_4: 
+        change_profile: "You can change your profile any time by clicking"
+        connect_disconnect: "You can connect/disconnect your services any time by clicking"
+        continue: "Continue on to your everyone page, an overview of all of your aspects."
+        finish: Finish
+        manage_aspects: "You can manage your aspects any time by clicking the"
+        ready_to_share: "You're now ready to start sharing with "
+        set_up: "You're all set up, %{name}!"
+        tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+        user_menu: "in your user menu (top right)."
+      welcome: "Welcome to Diaspora!"
+    public: 
+      does_not_exist: "User %{username} does not exist!"
+    update: 
+      language_changed: "Language Changed"
+      language_not_changed: "Language Change Failed"
+      password_changed: "Password Changed"
+      password_not_changed: "Password Change Failed"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index c844250d6..e06afc7f2 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -1,208 +1,355 @@
 #   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.
 
-# Localization file for Indonesian.
 
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
-id:
-  hello: "Apa kabar dunia"
-  application:
-      helper:
-          unknown_person: "orang tak dikenal"
-          new_requests: "permintaan baru"
-  dashboards:
-      helper:
-          home: "beranda"
-  error_messages:
-      helper:
-          invalid_fields: "Field tidak valid"
-          correct_the_following_errors_and_try_again: "Perbaiki kesalahan berikut dan coba lagi."
-  people:
-      helper:
-           results_for: " hasil untuk %{params}"
-           people_on_pod_are_aware_of: " people on pod are aware of"
-  layouts:
-      application:
-          edit_profile: "ubah profil"
-          logout: "keluar"
-  shared:
-      aspect_nav:
-          all_aspects: "Seluruh Aspek"
-          manage: "Kelola"
-          manage_your_aspects: "Kelola Aspek anda"
-      sub_header:
-          all_aspects: "Seluruh Aspek"
-          manage_aspects: "Kelola Aspek"
-      publisher:
-          share: "Bagikan"
-      aspect_friends:
-          add_friends: "tambah teman"
-  albums:
-      album:
-          you: "anda"
-      new_album:
-          create: "Ciptakan"
-          add_a_new_album: "Tambah album baru"
-      show: 
-          edit_album: "Ubah Album"
-          albums: "album"
-          updated: "diperbarui"
-          by: "oleh"
-      edit:
-          editing: "Diubah"
-          updated: "diperbarui"
-          are_you_sure: "Apakah anda yakin?"
-          delete_album: "Hapus Album"
-          cancel: "Batal"
-      index:
-          home: "beranda"
-          new_album: "Album Baru"
-      create:
-          success: "Anda telah membuat sebuah album dengan nama %{name}."
-      update:
-          success: "Album %{name} berhasil diubah."
-          failure: "Gagal mengubah album %{name}."
-      destroy:
-          success: "Album %{name} dihapus."
-      helper:
-          friends_albums: "Album Teman"
-          your_albums: "Album Anda"
-  aspects:
-      index:
-          photos: "Foto"
-      show:
-          photos: "foto"
-      manage:
-          add_a_new_aspect: "Tambah aspek baru"
-          add_a_new_friend:  "Tambah teman baru"
-          show: "Tampilkan"
-          update_aspects: "Perbarui Aspek"
-          requests: "Permintaan"
-          ignore_remove: "Abaikan/Hapus"
-      new_aspect:
-          add_a_new_aspect: "Tambah aspek baru"
-          create: "Ciptakan"
-      create:
-          success: "Klik pada tanda plus di sisi kiri untuk memberitahu Diaspora siapa yang dapat melihat aspek baru Anda."
-          failure: "Aspek gagal dibuat."
-      destroy:
-          success: "%{name} berhasil dihapus."
-      update:
-          success: "Aspek anda, %{name}, telah berhasil diubah."
-      move_friends:
-          failure: "Gagal mengubah aspek untuk teman %{real_name}."
-          success: "Aspek berhasil diubah."
-      move_friend:
-          failure: "tidak dapat %{inspect}"
-          success: "Anda sekarang menunjukkan teman Anda aspek yang berbeda dari diri Anda sendiri."
-      helper:
-          remove: "hapus"
-          aspect_not_empty: "Aspek tidak kosong"
-  users:
-      edit:
-          editing_profile: "Mengubah profil"
-      profile:
-          cancel: "Batal"
-          update_profile: "Perbarui Profil"
-          home: "Beranda"
-          diaspora_username: "USERNAME DIASPORA"
-          info: "Info"
-          picture: "Foto"
-          editing_profile: "Mengubah profil"
-          albums: "Album"
-          you_dont_have_any_photos: "Anda tidak memiliki satupun foto!  Kunjungi halaman"
-          page_to_upload_some:  "untuk meng-unggah beberapa foto."
-  comments:
-      comment:
-          ago: "yang lalu"
-      new_comment:
-          comment: "Komentar"
-  photos:
-      show:
-          prev: "sebelumnya"
-          full_size: "ukuran penuh"
-          next: "berikutnya"
-          edit_photo: "Ubah Foto"
-          delete_photo: "Hapus Foto"
-          are_you_sure: "Apakah anda yakin?"
-          comments: "komentar"
-      edit:
-          editing: "Mengubah"
-          are_you_sure: "Apakah anda yakin?"
-          delete_photo: "Hapus Foto"
-      photo:
-          show_comments: "tampilkan komentar"
-          posted_a_new_photo_to: "kirim sebuah foto ke"
-      new:
-          new_photo: "Foto Baru"
-          back_to_list: "Kembali ke Daftar"
-          post_it: "posting!"
-      create:
-          runtime_error: "Foto gagal diunggah.  Apakah Anda yakin sabuk pengaman Anda telah dikencangkan?"
-          integrity_error: "Foto gagal diunggah.  Apakah Anda yakin itu gambar?"
-          type_error: "Foto gagal diunggah.  Apakah Anda yakin gambar telah ditambahkan?"
-      update:
-          notice: "Foto berhasil diperbarui."
-          error:  "Gagal mengubah foto."
-      destroy:
-          notice: "Foto dihapus."
-  registrations:
-      new:
-          sign_up: "Daftar"
-      create:
-          success: "Anda telah bergabung dengan Diaspora!"
-  status_messages:
-      new_status_message:
-          tell_me_something_good: "katakan padaku sesuatu yang baik"
-          oh_yeah: "oh yeah!"
-      status_message:
-          show_comments: "tampilkan komentar"
-          delete: "Hapus"
-          are_you_sure: "Apakah anda yakin?"
-      show:
-          status_message: "Status Pesan"
-          comments: "komentar"
-          are_you_sure: "Apakah anda yakin?"
-          destroy: "Hapus"
-          view_all: "Tampilkan Seluruhnya"
-          message: "Pesan"
-          owner: "Pemilik"
-      helper:
-          no_message_to_display: "Tidak ada pesan yang dapat ditampilkan."
-  people:
-      person:
-          add_friend: "tambah teman"
-          pending_request: "permintaan tertunda"
-      index:
-          add_friend: "tambah teman"
-          real_name: "nama asli"
-          diaspora_handle: "diaspora handle"
-          thats_you: "itu anda!"
-          friend_request_pending: "permintaan pertemanan tertunda"
-          you_have_a_friend_request_from_this_person: "anda memiliki permintaan pertemanan dari orang ini"
-      new:
-          new_person: "Orang Baru"
-          back_to_list: "Kembali ke Daftar"
-      show:
-          last_seen: "terakhir terlihat: %{how_long_ago}"
-          friends_since: "teman sejak: %{how_long_ago}"
-          save: "simpan"
-          are_you_sure: "Apakah anda yakin?"
-          remove_friend: "hapus teman"
-  requests:
-      new_request:
-          add_a_new_friend_to: "Tambah teman baru ke"
-          enter_a_diaspora_username: "Masukkan Username Diaspora:"
-          your_diaspora_username_is: "Username Diaspora anda adalah: %{diaspora_handle}"
-          friends_username: "Username teman"
-      destroy:
-          success: "Anda sekarang berteman."
-          error: "Silahkan pilih sebuah aspek!"
-          ignore: "Permintaan pertemanan yang diabaikan."
-      create:
-          error: "Tidak ada benih diaspora ditemukan dengan email ini!"
-          already_friends: "Anda sudah berteman dengan %{destination_url}!"
-          success: "Sebuah permintaan pertemanan telah terkirim ke %{destination_url}."
-          horribly_wrong: "Ada sesuatu mengerikan yang salah."
+id: 
+  _photos: photos
+  _services: Services
+  account: Account
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "is already taken"
+        user: 
+          attributes: 
+            email: 
+              taken: "is already taken"
+            person: 
+              invalid: "is invalid"
+            username: 
+              taken: "is already taken"
+  ago: ago
+  application: 
+    helper: 
+      unknown_person: "orang tak dikenal"
+      youtube_title: 
+        unknown: "Unknown Video Title"
+  are_you_sure: "Are you sure?"
+  aspects: 
+    add_to_aspect: 
+      failure: "Failed to add friend to aspect."
+      success: "Successfully added friend to aspect."
+    create: 
+      failure: "Aspek gagal dibuat."
+      success: "Klik pada tanda plus di sisi kiri untuk memberitahu Diaspora siapa yang dapat melihat aspek baru Anda."
+    destroy: 
+      success: "%{name} berhasil dihapus."
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "Aspek tidak kosong"
+      remove: hapus
+    manage: 
+      add_a_new_aspect: "Tambah aspek baru"
+      add_a_new_contact: "Add a new contact"
+      drag_to_add: "Drag to add people"
+      manage_aspects: "Manage aspects"
+      no_requests: "No new requests"
+      requests: Permintaan
+    move_contact: 
+      error: "Error moving contact: %{inspect}"
+      failure: "didn't work %{inspect}"
+      success: "Person moved to new aspect"
+    new_aspect: 
+      create: Ciptakan
+      name: Name
+    no_contacts_message: 
+      add_contact: "Add a contact"
+      add_contact_to: "Add someone to %{aspect_name}"
+      invite: "Invite someone to join Diaspora!"
+      nobody: "We know you know people — bring them to Diaspora!"
+      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+    no_posts_message: 
+      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+    remove_from_aspect: 
+      failure: "Failed to remove person from aspect"
+      success: "Successfully removed person from aspect"
+    update: 
+      success: "Aspek anda, %{name}, telah berhasil diubah."
+  back: Back
+  cancel: Cancel
+  comments: 
+    new_comment: 
+      comment: Komentar
+      commenting: Commenting...
+  dashboards: 
+    helper: 
+      home: Home
+  delete: Delete
+  email: Email
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Perbaiki kesalahan berikut dan coba lagi."
+      invalid_fields: "Field tidak valid"
+  fill_me_out: "Fill me out"
+  home: 
+    show: 
+      already_account: "already have an account?"
+      login_here: "log in here"
+      share_what_you_want: "Share what you want, with who you want."
+  invitations: 
+    check_token: 
+      not_found: "Invitation token not found"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "You already invited this person."
+      no_more: "You have no more invitations."
+      sent: "Your invitation has been sent."
+    new: 
+      if_they_accept_info: "if they accept, they will be added to the aspect you invited them"
+      invite_someone_to_join: "Invite someone to join Diaspora!"
+      message: "Message:"
+      send_an_invitation: "Send an invitation"
+      send_invitation: "Send invitation"
+      to: To
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: "account settings"
+      blog: blog
+      developers: developers
+      edit_profile: "edit profile"
+      login: login
+      logout: logout
+      view_profile: "view profile"
+  notifier: 
+    diaspora: "the diaspora email robot"
+    hello: "Hello %{name}!"
+    love: "love,"
+    new_request: 
+      just_sent_you: "just sent you a friend request on Diaspora*"
+      sign_in: "sign in here"
+      subject: "new Diaspora* friend request from %{from}"
+      try_it_out: "You should really think about checking it out."
+    request_accepted: 
+      accepted: "has accepted your friend request. They are now in your"
+      aspect: aspect.
+      subject: "%{name} has accepted your friend request on Diaspora*"
+  ok: OK
+  or: or
+  password: Password
+  password_confirmation: "Password confirmation"
+  people: 
+    edit: 
+      allow_search: "Allow for people to search for you"
+      first_name: "First name"
+      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      last_name: "Last name"
+      update_profile: "Update Profile"
+      your_bio: "Your bio"
+      your_birthday: "Your birthday"
+      your_gender: "Your gender"
+      your_name: "Your name"
+      your_photo: "Your photo"
+      your_profile: "Your profile"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: " results for %{params}"
+    index: 
+      results_for: "search results for"
+    person: 
+      add_contact: "add contact"
+      already_connected: "Already connected"
+      pending_request: "permintaan tertunda"
+      thats_you: "thats you!"
+    profile_photo_upload: 
+      or_select_one: "or select one from your already existing"
+    profile_sidebar: 
+      bio: bio
+      born: born
+      edit_my_profile: "Edit my profile"
+      gender: gender
+      in_aspects: "in aspects"
+      last_seen: "last seen: %{how_long_ago}"
+      remove_contact: "remove contact"
+    show: 
+      already_requested: "You have already sent a request to %{name}."
+      does_not_exist: "Person does not exist!"
+      no_posts: "no posts to display!"
+      not_connected: "You are not connected with this person"
+      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+    update: 
+      failed: "Failed to update profile"
+      updated: "Profile updated"
+  photos: 
+    create: 
+      integrity_error: "Foto gagal diunggah.  Apakah Anda yakin itu gambar?"
+      runtime_error: "Foto gagal diunggah.  Apakah Anda yakin sabuk pengaman Anda telah dikencangkan?"
+      type_error: "Foto gagal diunggah.  Apakah Anda yakin gambar telah ditambahkan?"
+    destroy: 
+      notice: "Foto dihapus."
+    edit: 
+      editing: Mengubah
+    new: 
+      back_to_list: "Kembali ke Daftar"
+      new_photo: "Foto Baru"
+      post_it: posting!
+    new_photo: 
+      drop: "Drop photos here to upload"
+      empty: "{file} is empty, please select files again without it."
+      failed: Failed
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      upload: "Upload a photo"
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      add_a_description: "Add a description"
+      delete_photo: "Hapus Foto"
+      edit_photo: "Ubah Foto"
+      full_size: "ukuran penuh"
+      make_profile_photo: "make profile photo"
+      next: berikutnya
+      prev: sebelumnya
+      update_photo: "Update Photo"
+    update: 
+      error: "Gagal mengubah foto."
+      notice: "Foto berhasil diperbarui."
+  profile: Profile
+  registrations: 
+    closed: "Signups are closed on this Diaspora pod."
+    create: 
+      success: "Anda telah bergabung dengan Diaspora!"
+    edit: 
+      cancel_my_account: "Cancel my account"
+      edit: "Edit %{name}"
+      leave_blank: "(leave blank if you don't want to change it)"
+      password_to_confirm: "(we need your current password to confirm your changes)"
+      unhappy: Unhappy?
+      update: Update
+    new: 
+      sign_up: Daftar
+      sign_up_for_diaspora: "Sign up for Diaspora"
+  requests: 
+    create: 
+      sending: Sending...
+      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      tried: "we tried our best to send a message to %{account}"
+    destroy: 
+      error: "Silahkan pilih sebuah aspek!"
+      ignore: "Permintaan pertemanan yang diabaikan."
+      success: "Anda sekarang berteman."
+    manage_aspect_contacts: 
+      contact_username: "Contact's username"
+      create_request: "Create request"
+      enter_a_diaspora_username: "Enter a Diaspora username:"
+      existing: "Existing contacts"
+      know_email: "Know their email address? You should invite them"
+      manage_within: "Manage contacts within"
+      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+  search: Search
+  services: 
+    create: 
+      success: "Authentication successful."
+    destroy: 
+      success: "Successfully destroyed authentication."
+    index: 
+      connect_to_facebook: "Connect to facebook"
+      connect_to_twitter: "Connect to twitter"
+      disconnect: disconnect
+      logged_in_as: "logged in as"
+      really_disconnect: "disconnect %{service}?"
+  settings: Settings
+  shared: 
+    aspect_contacts: 
+      add_contacts: "add contacts"
+      add_to: "add to %{aspect}"
+      everyone: Everyone
+      manage: "manage %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "add a new aspect"
+      everyone: Everyone
+      manage: Kelola
+      manage_your_aspects: "Kelola Aspek anda"
+    author_info: 
+      all: all
+      status_messages: "status messages"
+      view_profile: "View profile"
+      viewing: viewing
+    contact_list: 
+      add_to: "Add %{name} to %{aspect}"
+      remove_from: "Remove %{name} from %{aspect}"
+      search_contacts: "Search contacts"
+    invitations: 
+      invitations_left: "(%{count} left)"
+      invite_someone: "Invite someone"
+      invites: Invites
+    notification: 
+      new: "New %{type} from %{from}"
+    public_explain: 
+      logged_in: "logged in to %{service}"
+      manage: "manage connected services"
+      outside: "Public messages will be available for others outside of Diaspora to see."
+      title: "You are about to post a public message!"
+    publisher: 
+      all: all
+      make_public: "make public"
+      post_a_message_to: "Post a message to %{aspect}"
+      posting: Posting...
+      share: Bagikan
+      share_with: "Share with %{aspect}"
+      share_with_all: "Share with all aspects"
+    reshare: 
+      reshare: Reshare
+    stream_element: 
+      show_comments: "show comments"
+  status_messages: 
+    helper: 
+      no_message_to_display: "Tidak ada pesan yang dapat ditampilkan."
+    new_status_message: 
+      oh_yeah: "oh yeah!"
+      tell_me_something_good: "katakan padaku sesuatu yang baik"
+    show: 
+      destroy: Hapus
+  the_world: "the world"
+  username: Username
+  users: 
+    destroy: "Account successfully closed."
+    edit: 
+      change_language: "Change Language"
+      change_password: "Change Password"
+      close_account: "Close Account"
+      download_photos: "download my photos"
+      download_xml: "download my xml"
+      export_data: "Export Data"
+      invite_contacts: "Invite contacts"
+      new_password: "New Password"
+    getting_started: 
+      connect_services: "Connect your services"
+      define_aspects: "Define your aspects"
+      edit_profile: "Edit your profile"
+      save_and_continue: "Save and continue"
+      signup_steps: "Complete your sign-up by doing these things:"
+      skip: "skip getting started"
+      step_1: 
+        your_profile: "Your Profile"
+      step_2: 
+        add: Add
+        aspect_name: "Aspect name"
+        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+        your_aspects: "Your aspects"
+      step_3: 
+        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
+        your_services: "Your services"
+      step_4: 
+        change_profile: "You can change your profile any time by clicking"
+        connect_disconnect: "You can connect/disconnect your services any time by clicking"
+        continue: "Continue on to your everyone page, an overview of all of your aspects."
+        finish: Finish
+        manage_aspects: "You can manage your aspects any time by clicking the"
+        ready_to_share: "You're now ready to start sharing with "
+        set_up: "You're all set up, %{name}!"
+        tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+        user_menu: "in your user menu (top right)."
+      welcome: "Welcome to Diaspora!"
+    public: 
+      does_not_exist: "User %{username} does not exist!"
+    update: 
+      language_changed: "Language Changed"
+      language_not_changed: "Language Change Failed"
+      password_changed: "Password Changed"
+      password_not_changed: "Password Change Failed"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 4c934420d..9d283a749 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -2,206 +2,354 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-# Sample localization file for Italian. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
-it:
-  hello: "Ciao mondo"
-  application:
-      helper:
-          unknown_person: "persona sconosciuta"
-          new_requests: "nuove richieste"
-  dashboards:
-      helper:
-          home: "home"
-  error_messages:
-      helper:
-          invalid_fields: "Campi non validi"
-          correct_the_following_errors_and_try_again: "Correggi i seguenti errori e riprova."
-  people:
-      helper:
-           results_for: " risultati per %{params}"
-           people_on_pod_are_aware_of: " persone su pod sono consapevoli di"
-  layouts:
-      application:
-          edit_profile: "modifica profilo"
-          logout: "disconnetti"
-  shared:
-      aspect_nav:
-          all_aspects: "Tutti gli Aspetti"
-          manage: "Gestisci"
-          manage_your_aspects: "Gestisci i tuoi Aspetti"
-      sub_header:
-          all_aspects: "Tutti gli Aspetti"
-          manage_aspects: "Gestisci Aspetti"
-      publisher:
-          share: "Condividi"
-      aspect_friends:
-          add_friends: "aggiungi amici"
-  albums:
-      album:
-          you: "tu"
-      new_album:
-          create: "crea"
-          add_a_new_album: "Aggiungi un nuovo album"
-      show:
-          edit_album: "Modifica album"
-          albums: "album"
-          updated: "aggiornato"
-          by: "da"
-      edit:
-          editing: "Modifica"
-          updated: "aggiornato"
-          are_you_sure: "Sei sicuro?"
-          delete_album: "Elimina album"
-          cancel: "Annulla"
-      index:
-          home: "home"
-          new_album: "Nuovo album"
-      create:
-          success: "Hai creato un album chiamato %{name}."
-      update:
-          success: "L'album %{name} è stato modificato."
-          failure: "Modifica dell'album %{name} fallita."
-      destroy:
-          success: "L'album %{name} è stato eliminato."
-      helper:
-          friends_albums: "Album degli amici"
-          your_albums: "I tuoi album"
-  aspects:
-      index:
-          photos: "foto"
-      show:
-          photos: "foto"
-      manage:
-          add_a_new_aspect: "Aggiungi un nuovo aspetto"
-          add_a_new_friend:  "Aggiungi un nuovo amico"
-          show: "Mostra"
-          update_aspects: "Aggiorna Aspetti"
-          requests: "Richieste"
-          ignore_remove: "Ignora/Rimuovi"
-      new_aspect:
-          add_a_new_aspect: "Aggiungi un nuovo aspetto"
-          create: "Crea"
-      create:
-          success: "Clicca sul segno più nella parte sinistra per dire a Diaspora chi può vedere il tuo nuovo aspetto."
-          failure: "Creazione dell'aspetto fallita."
-      destroy:
-          success: "%{name} è stato rimosso con successo."
-      update:
-          success: "Il tuo aspetto, %{name}, è stato modificato con successo."
-      move_friends:
-          failure: "Modifica dell'aspetto fallita per l'amico %{real_name}."
-          success: "Aspetti modificati con successo."
-      move_friend:
-          failure: "non ha funzionato %{inspect}"
-          success: "Adesso stai mostrando al tuo amico un aspetto differente di te stesso."
-      helper:
-          remove: "rimuovi"
-          aspect_not_empty: "Aspetto non vuoto"
-  users:
-      edit:
-          editing_profile: "Modifica del profilo"
-      profile:
-          cancel: "Annulla"
-          update_profile: "Aggiorna profilo"
-          home: "Home"
-          diaspora_username: "NOME UTENTE DIASPORA"
-          info: "Info"
-          picture: "Immagine"
-          editing_profile: "Modifica del profilo"
-          albums: "Album"
-          you_dont_have_any_photos: "Non hai nessuna foto! Vai alla pagina"
-          page_to_upload_some:  "per caricarne qualcuna."
-  comments:
-      comment:
-          ago: "fa"
-      new_comment:
-          comment: "Commento"
-  photos:
-      show:
-          prev: "indietro"
-          full_size: "dimensione intera"
-          next: "avanti"
-          edit_photo: "Modifica foto"
-          delete_photo: "Elimina foto"
-          are_you_sure: "Sei sicuro?"
-          comments: "commenti"
-      edit:
-          editing: "Modifica"
-          are_you_sure: "Sei sicuro?"
-          delete_photo: "Elimina foto"
-      photo:
-          show_comments: "mostra commenti"
-          posted_a_new_photo_to: "ha caricato una nuova foto in"
-      new:
-          new_photo: "Nuova foto"
-          back_to_list: "Torna all'elenco"
-          post_it: "inseriscila!"
-      create:
-          runtime_error: "Caricamento della foto fallito. Hai allacciato le cinture?"
-          integrity_error: "Caricamento della foto fallito. Sei sicuro che era un'immagine?"
-          type_error: "Caricamento della foto fallito. Sei sicuro di aver aggiunto un'immagine?"
-      update:
-          notice: "Foto aggiornata con successo."
-          error:  "Modifica della foto fallita."
-      destroy:
-          notice: "Foto eliminata."
-  registrations:
-      new:
-          sign_up: "Iscriviti"
-      create:
-          success: "Ti sei unito a Diaspora!"
-  status_messages:
-      new_status_message:
-          tell_me_something_good: "dimmi qualcosa di buono"
-          oh_yeah: "oh si!"
-      status_message:
-          show_comments: "mostra commenti"
-          delete: "Elimina"
-          are_you_sure: "Sei sicuro?"
-      show:
-          status_message: "Messaggio di stato"
-          comments: "commenti"
-          are_you_sure: "Sei sicuro?"
-          destroy: "Distruggi"
-          view_all: "Vedi tutto"
-          message: "Messaggio"
-          owner: "Proprietario"
-      helper:
-          no_message_to_display: "Nessun messaggio da visualizzare."
-  people:
-      person:
-          add_friend: "aggiungi amico"
-          pending_request: "richiesta in sospeso"
-      index:
-          add_friend: "aggiungi amico"
-          real_name: "nome reale"
-          diaspora_handle: "diaspora handle"
-          thats_you: "sei tu!"
-          friend_request_pending: "richiesta d'amicizia in sospeso"
-          you_have_a_friend_request_from_this_person: "hai una richiesta d'amicizia da questa persona"
-      new:
-          new_person: "Nuova persona"
-          back_to_list: "Torna all'elenco"
-      show:
-          last_seen: "ultima visualizzazione: %{how_long_ago}"
-          friends_since: "amici da: %{how_long_ago}"
-          save: "salva"
-          are_you_sure: "Sei sicuro?"
-          remove_friend: "rimuovi amico"
-  requests:
-      new_request:
-          add_a_new_friend_to: "Aggiungi un amico a"
-          enter_a_diaspora_username: "Inserisci un nome utente Diaspora:"
-          your_diaspora_username_is: "Il tuo nome utente Diaspora è: %{diaspora_handle}"
-          friends_username: "nome utente dell'amico"
-      destroy:
-          success: "Adesso siete amici."
-          error: "Seleziona un aspetto!"
-          ignore: "Ignora richiesta di amicizia."
-      create:
-          error: "Nessun seed Diaspora trovato con questa email!"
-          already_friends: "Sei già amico con %{destination_url}!"
-          success: "Una richiesta di amicizia è stata inviata a %{destination_url}."
-          horribly_wrong: "Qualcosa è andato orribilmente storto."
+it: 
+  _photos: photos
+  _services: Services
+  account: Account
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "is already taken"
+        user: 
+          attributes: 
+            email: 
+              taken: "is already taken"
+            person: 
+              invalid: "is invalid"
+            username: 
+              taken: "is already taken"
+  ago: ago
+  application: 
+    helper: 
+      unknown_person: "persona sconosciuta"
+      youtube_title: 
+        unknown: "Unknown Video Title"
+  are_you_sure: "Are you sure?"
+  aspects: 
+    add_to_aspect: 
+      failure: "Failed to add contact to aspect."
+      success: "Successfully added contact to aspect."
+    create: 
+      failure: "Creazione dell'aspetto fallita."
+      success: "Clicca sul segno più nella parte sinistra per dire a Diaspora chi può vedere il tuo nuovo aspetto."
+    destroy: 
+      success: "%{name} è stato rimosso con successo."
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "Aspetto non vuoto"
+      remove: rimuovi
+    manage: 
+      add_a_new_aspect: "Aggiungi un nuovo aspetto"
+      add_a_new_contact: "Add a new contact"
+      drag_to_add: "Drag to add people"
+      manage_aspects: "Manage aspects"
+      no_requests: "No new requests"
+      requests: Richieste
+    move_contact: 
+      error: "Error moving contact: %{inspect}"
+      failure: "didn't work %{inspect}"
+      success: "Person moved to new aspect"
+    new_aspect: 
+      create: Crea
+      name: Name
+    no_contacts_message: 
+      add_contact: "Add a contact"
+      add_contact_to: "Add someone to %{aspect_name}"
+      invite: "Invite someone to join Diaspora!"
+      nobody: "We know you know people — bring them to Diaspora!"
+      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+    no_posts_message: 
+      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+    remove_from_aspect: 
+      failure: "Failed to remove person from aspect"
+      success: "Successfully removed person from aspect"
+    update: 
+      success: "Il tuo aspetto, %{name}, è stato modificato con successo."
+  back: Back
+  cancel: Cancel
+  comments: 
+    new_comment: 
+      comment: Commento
+      commenting: Commenting...
+  dashboards: 
+    helper: 
+      home: home
+  delete: Delete
+  email: Email
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Correggi i seguenti errori e riprova."
+      invalid_fields: "Campi non validi"
+  fill_me_out: "Fill me out"
+  home: 
+    show: 
+      already_account: "already have an account?"
+      login_here: "log in here"
+      share_what_you_want: "Share what you want, with who you want."
+  invitations: 
+    check_token: 
+      not_found: "Invitation token not found"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "You already invited this person."
+      no_more: "You have no more invitations."
+      sent: "Your invitation has been sent."
+    new: 
+      if_they_accept_info: "if they accept, they will be added to the aspect you invited them"
+      invite_someone_to_join: "Invite someone to join Diaspora!"
+      message: "Message:"
+      send_an_invitation: "Send an invitation"
+      send_invitation: "Send invitation"
+      to: To
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: "account settings"
+      blog: blog
+      developers: developers
+      edit_profile: "edit profile"
+      login: login
+      logout: logout
+      view_profile: "view profile"
+  notifier: 
+    diaspora: "the diaspora email robot"
+    hello: "Hello %{name}!"
+    love: "love,"
+    new_request: 
+      just_sent_you: "just sent you a contact request on Diaspora*"
+      sign_in: "sign in here"
+      subject: "new Diaspora* contact request from %{from}"
+      try_it_out: "You should really think about checking it out."
+    request_accepted: 
+      accepted: "has accepted your contact request. They are now in your"
+      aspect: aspect.
+      subject: "%{name} has accepted your contact request on Diaspora*"
+  ok: OK
+  or: or
+  password: Password
+  password_confirmation: "Password confirmation"
+  people: 
+    edit: 
+      allow_search: "Allow for people to search for you"
+      first_name: "First name"
+      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      last_name: "Last name"
+      update_profile: "Update Profile"
+      your_bio: "Your bio"
+      your_birthday: "Your birthday"
+      your_gender: "Your gender"
+      your_name: "Your name"
+      your_photo: "Your photo"
+      your_profile: "Your profile"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: " results for %{params}"
+    index: 
+      results_for: "search results for"
+    person: 
+      add_contact: "add contact"
+      already_connected: "Already connected"
+      pending_request: "richiesta in sospeso"
+      thats_you: "thats you!"
+    profile_photo_upload: 
+      or_select_one: "or select one from your already existing"
+    profile_sidebar: 
+      bio: bio
+      born: born
+      edit_my_profile: "Edit my profile"
+      gender: gender
+      in_aspects: "in aspects"
+      last_seen: "last seen: %{how_long_ago}"
+      remove_contact: "remove contact"
+    show: 
+      already_requested: "You have already sent a request to %{name}."
+      does_not_exist: "Person does not exist!"
+      no_posts: "no posts to display!"
+      not_connected: "You are not connected with this person"
+      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+    update: 
+      failed: "Failed to update profile"
+      updated: "Profile updated"
+  photos: 
+    create: 
+      integrity_error: "Caricamento della foto fallito. Sei sicuro che era un'immagine?"
+      runtime_error: "Caricamento della foto fallito. Hai allacciato le cinture?"
+      type_error: "Caricamento della foto fallito. Sei sicuro di aver aggiunto un'immagine?"
+    destroy: 
+      notice: "Foto eliminata."
+    edit: 
+      editing: Modifica
+    new: 
+      back_to_list: "Torna all'elenco"
+      new_photo: "Nuova foto"
+      post_it: inseriscila!
+    new_photo: 
+      drop: "Drop photos here to upload"
+      empty: "{file} is empty, please select files again without it."
+      failed: Failed
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      upload: "Upload a photo"
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      add_a_description: "Add a description"
+      delete_photo: "Elimina foto"
+      edit_photo: "Modifica foto"
+      full_size: "dimensione intera"
+      make_profile_photo: "make profile photo"
+      next: avanti
+      prev: indietro
+      update_photo: "Update Photo"
+    update: 
+      error: "Modifica della foto fallita."
+      notice: "Foto aggiornata con successo."
+  profile: Profile
+  registrations: 
+    closed: "Signups are closed on this Diaspora pod."
+    create: 
+      success: "Ti sei unito a Diaspora!"
+    edit: 
+      cancel_my_account: "Cancel my account"
+      edit: "Edit %{name}"
+      leave_blank: "(leave blank if you don't want to change it)"
+      password_to_confirm: "(we need your current password to confirm your changes)"
+      unhappy: Unhappy?
+      update: Update
+    new: 
+      sign_up: Iscriviti
+      sign_up_for_diaspora: "Sign up for Diaspora"
+  requests: 
+    create: 
+      sending: Sending...
+      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      tried: "we tried our best to send a message to %{account}"
+    destroy: 
+      error: "Seleziona un aspetto!"
+      ignore: "Ignora richiesta di amicizia."
+      success: "Adesso siete amici."
+    manage_aspect_contacts: 
+      contact_username: "Contact's username"
+      create_request: "Create request"
+      enter_a_diaspora_username: "Enter a Diaspora username:"
+      existing: "Existing contacts"
+      know_email: "Know their email address? You should invite them"
+      manage_within: "Manage contacts within"
+      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+  search: Search
+  services: 
+    create: 
+      success: "Authentication successful."
+    destroy: 
+      success: "Successfully destroyed authentication."
+    index: 
+      connect_to_facebook: "Connect to facebook"
+      connect_to_twitter: "Connect to twitter"
+      disconnect: disconnect
+      logged_in_as: "logged in as"
+      really_disconnect: "disconnect %{service}?"
+  settings: Settings
+  shared: 
+    aspect_contacts: 
+      add_contacts: "add contacts"
+      add_to: "add to %{aspect}"
+      everyone: Everyone
+      manage: "manage %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "add a new aspect"
+      everyone: Everyone
+      manage: Gestisci
+      manage_your_aspects: "Gestisci i tuoi Aspetti"
+    author_info: 
+      all: all
+      status_messages: "status messages"
+      view_profile: "View profile"
+      viewing: viewing
+    contact_list: 
+      add_to: "Add %{name} to %{aspect}"
+      remove_from: "Remove %{name} from %{aspect}"
+      search_contacts: "Search contacts"
+    invitations: 
+      invitations_left: "(%{count} left)"
+      invite_someone: "Invite someone"
+      invites: Invites
+    notification: 
+      new: "New %{type} from %{from}"
+    public_explain: 
+      logged_in: "logged in to %{service}"
+      manage: "manage connected services"
+      outside: "Public messages will be available for others outside of Diaspora to see."
+      title: "You are about to post a public message!"
+    publisher: 
+      all: all
+      make_public: "make public"
+      post_a_message_to: "Post a message to %{aspect}"
+      posting: Posting...
+      share: Condividi
+      share_with: "Share with %{aspect}"
+      share_with_all: "Share with all aspects"
+    reshare: 
+      reshare: Reshare
+    stream_element: 
+      show_comments: "show comments"
+  status_messages: 
+    helper: 
+      no_message_to_display: "Nessun messaggio da visualizzare."
+    new_status_message: 
+      oh_yeah: "oh si!"
+      tell_me_something_good: "dimmi qualcosa di buono"
+    show: 
+      destroy: Distruggi
+  the_world: "the world"
+  username: Username
+  users: 
+    destroy: "Account successfully closed."
+    edit: 
+      change_language: "Change Language"
+      change_password: "Change Password"
+      close_account: "Close Account"
+      download_photos: "download my photos"
+      download_xml: "download my xml"
+      export_data: "Export Data"
+      invite_contacts: "Invite contacts"
+      new_password: "New Password"
+    getting_started: 
+      connect_services: "Connect your services"
+      define_aspects: "Define your aspects"
+      edit_profile: "Edit your profile"
+      save_and_continue: "Save and continue"
+      signup_steps: "Complete your sign-up by doing these things:"
+      skip: "skip getting started"
+      step_1: 
+        your_profile: "Your Profile"
+      step_2: 
+        add: Add
+        aspect_name: "Aspect name"
+        description: "Tell Diaspora what different aspects of you are seen by different contacts.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+        your_aspects: "Your aspects"
+      step_3: 
+        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
+        your_services: "Your services"
+      step_4: 
+        change_profile: "You can change your profile any time by clicking"
+        connect_disconnect: "You can connect/disconnect your services any time by clicking"
+        continue: "Continue on to your everyone page, an overview of all of your aspects."
+        finish: Finish
+        manage_aspects: "You can manage your aspects any time by clicking the"
+        ready_to_share: "You're now ready to start sharing with "
+        set_up: "You're all set up, %{name}!"
+        tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+        user_menu: "in your user menu (top right)."
+      welcome: "Welcome to Diaspora!"
+    public: 
+      does_not_exist: "User %{username} does not exist!"
+    update: 
+      language_changed: "Language Changed"
+      language_not_changed: "Language Change Failed"
+      password_changed: "Password Changed"
+      password_not_changed: "Password Change Failed"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 417ebb37e..42d307471 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -2,8 +2,354 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-# Sample localization file for Lithuanian. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
-lt:
-  hello: "Sveikas pasauli"
+lt: 
+  _photos: photos
+  _services: Services
+  account: Account
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "is already taken"
+        user: 
+          attributes: 
+            email: 
+              taken: "is already taken"
+            person: 
+              invalid: "is invalid"
+            username: 
+              taken: "is already taken"
+  ago: ago
+  application: 
+    helper: 
+      unknown_person: "unknown person"
+      youtube_title: 
+        unknown: "Unknown Video Title"
+  are_you_sure: "Are you sure?"
+  aspects: 
+    add_to_aspect: 
+      failure: "Failed to add friend to aspect."
+      success: "Successfully added friend to aspect."
+    create: 
+      failure: "Aspect creation failed."
+      success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
+    destroy: 
+      success: "%{name} was successfully removed."
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "Aspect not empty"
+      remove: remove
+    manage: 
+      add_a_new_aspect: "Add a new aspect"
+      add_a_new_contact: "Add a new contact"
+      drag_to_add: "Drag to add people"
+      manage_aspects: "Manage aspects"
+      no_requests: "No new requests"
+      requests: Requests
+    move_contact: 
+      error: "Error moving contact: %{inspect}"
+      failure: "didn't work %{inspect}"
+      success: "Person moved to new aspect"
+    new_aspect: 
+      create: Create
+      name: Name
+    no_contacts_message: 
+      add_contact: "Add a contact"
+      add_contact_to: "Add someone to %{aspect_name}"
+      invite: "Invite someone to join Diaspora!"
+      nobody: "We know you know people — bring them to Diaspora!"
+      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+    no_posts_message: 
+      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+    remove_from_aspect: 
+      failure: "Failed to remove person from aspect"
+      success: "Successfully removed person from aspect"
+    update: 
+      success: "Your aspect, %{name}, has been successfully edited."
+  back: Back
+  cancel: Cancel
+  comments: 
+    new_comment: 
+      comment: Comment
+      commenting: Commenting...
+  dashboards: 
+    helper: 
+      home: Home
+  delete: Delete
+  email: Email
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Correct the following errors and try again."
+      invalid_fields: "Invalid Fields"
+  fill_me_out: "Fill me out"
+  home: 
+    show: 
+      already_account: "already have an account?"
+      login_here: "log in here"
+      share_what_you_want: "Share what you want, with who you want."
+  invitations: 
+    check_token: 
+      not_found: "Invitation token not found"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "You already invited this person."
+      no_more: "You have no more invitations."
+      sent: "Your invitation has been sent."
+    new: 
+      if_they_accept_info: "if they accept, they will be added to the aspect you invited them"
+      invite_someone_to_join: "Invite someone to join Diaspora!"
+      message: "Message:"
+      send_an_invitation: "Send an invitation"
+      send_invitation: "Send invitation"
+      to: To
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: "account settings"
+      blog: blog
+      developers: developers
+      edit_profile: "edit profile"
+      login: login
+      logout: logout
+      view_profile: "view profile"
+  notifier: 
+    diaspora: "the diaspora email robot"
+    hello: "Hello %{name}!"
+    love: "love,"
+    new_request: 
+      just_sent_you: "just sent you a friend request on Diaspora*"
+      sign_in: "sign in here"
+      subject: "new Diaspora* friend request from %{from}"
+      try_it_out: "You should really think about checking it out."
+    request_accepted: 
+      accepted: "has accepted your friend request. They are now in your"
+      aspect: aspect.
+      subject: "%{name} has accepted your friend request on Diaspora*"
+  ok: OK
+  or: or
+  password: Password
+  password_confirmation: "Password confirmation"
+  people: 
+    edit: 
+      allow_search: "Allow for people to search for you"
+      first_name: "First name"
+      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      last_name: "Last name"
+      update_profile: "Update Profile"
+      your_bio: "Your bio"
+      your_birthday: "Your birthday"
+      your_gender: "Your gender"
+      your_name: "Your name"
+      your_photo: "Your photo"
+      your_profile: "Your profile"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: " results for %{params}"
+    index: 
+      results_for: "search results for"
+    person: 
+      add_contact: "add contact"
+      already_connected: "Already connected"
+      pending_request: "pending request"
+      thats_you: "thats you!"
+    profile_photo_upload: 
+      or_select_one: "or select one from your already existing"
+    profile_sidebar: 
+      bio: bio
+      born: born
+      edit_my_profile: "Edit my profile"
+      gender: gender
+      in_aspects: "in aspects"
+      last_seen: "last seen: %{how_long_ago}"
+      remove_contact: "remove contact"
+    show: 
+      already_requested: "You have already sent a request to %{name}."
+      does_not_exist: "Person does not exist!"
+      no_posts: "no posts to display!"
+      not_connected: "You are not connected with this person"
+      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+    update: 
+      failed: "Failed to update profile"
+      updated: "Profile updated"
+  photos: 
+    create: 
+      integrity_error: "Photo upload failed.  Are you sure that was an image?"
+      runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
+      type_error: "Photo upload failed.  Are you sure an image was added?"
+    destroy: 
+      notice: "Photo deleted."
+    edit: 
+      editing: Editing
+    new: 
+      back_to_list: "Back to List"
+      new_photo: "New Photo"
+      post_it: "post it!"
+    new_photo: 
+      drop: "Drop photos here to upload"
+      empty: "{file} is empty, please select files again without it."
+      failed: Failed
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      upload: "Upload a photo"
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      add_a_description: "Add a description"
+      delete_photo: "Delete Photo"
+      edit_photo: "Edit Photo"
+      full_size: "full size"
+      make_profile_photo: "make profile photo"
+      next: next
+      prev: prev
+      update_photo: "Update Photo"
+    update: 
+      error: "Failed to edit photo."
+      notice: "Photo successfully updated."
+  profile: Profile
+  registrations: 
+    closed: "Signups are closed on this Diaspora pod."
+    create: 
+      success: "You've joined Diaspora!"
+    edit: 
+      cancel_my_account: "Cancel my account"
+      edit: "Edit %{name}"
+      leave_blank: "(leave blank if you don't want to change it)"
+      password_to_confirm: "(we need your current password to confirm your changes)"
+      unhappy: Unhappy?
+      update: Update
+    new: 
+      sign_up: "Sign up"
+      sign_up_for_diaspora: "Sign up for Diaspora"
+  requests: 
+    create: 
+      sending: Sending...
+      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      tried: "we tried our best to send a message to %{account}"
+    destroy: 
+      error: "Please select an aspect!"
+      ignore: "Ignored friend request."
+      success: "You are now friends."
+    manage_aspect_contacts: 
+      contact_username: "Contact's username"
+      create_request: "Create request"
+      enter_a_diaspora_username: "Enter a Diaspora username:"
+      existing: "Existing contacts"
+      know_email: "Know their email address? You should invite them"
+      manage_within: "Manage contacts within"
+      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+  search: Search
+  services: 
+    create: 
+      success: "Authentication successful."
+    destroy: 
+      success: "Successfully destroyed authentication."
+    index: 
+      connect_to_facebook: "Connect to facebook"
+      connect_to_twitter: "Connect to twitter"
+      disconnect: disconnect
+      logged_in_as: "logged in as"
+      really_disconnect: "disconnect %{service}?"
+  settings: Settings
+  shared: 
+    aspect_contacts: 
+      add_contacts: "add contacts"
+      add_to: "add to %{aspect}"
+      everyone: Everyone
+      manage: "manage %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "add a new aspect"
+      everyone: Everyone
+      manage: Manage
+      manage_your_aspects: "Manage your Aspects"
+    author_info: 
+      all: all
+      status_messages: "status messages"
+      view_profile: "View profile"
+      viewing: viewing
+    contact_list: 
+      add_to: "Add %{name} to %{aspect}"
+      remove_from: "Remove %{name} from %{aspect}"
+      search_contacts: "Search contacts"
+    invitations: 
+      invitations_left: "(%{count} left)"
+      invite_someone: "Invite someone"
+      invites: Invites
+    notification: 
+      new: "New %{type} from %{from}"
+    public_explain: 
+      logged_in: "logged in to %{service}"
+      manage: "manage connected services"
+      outside: "Public messages will be available for others outside of Diaspora to see."
+      title: "You are about to post a public message!"
+    publisher: 
+      all: all
+      make_public: "make public"
+      post_a_message_to: "Post a message to %{aspect}"
+      posting: Posting...
+      share: Share
+      share_with: "Share with %{aspect}"
+      share_with_all: "Share with all aspects"
+    reshare: 
+      reshare: Reshare
+    stream_element: 
+      show_comments: "show comments"
+  status_messages: 
+    helper: 
+      no_message_to_display: "No message to display."
+    new_status_message: 
+      oh_yeah: "oh yeah!"
+      tell_me_something_good: "tell me something good"
+    show: 
+      destroy: Destroy
+  the_world: "the world"
+  username: Username
+  users: 
+    destroy: "Account successfully closed."
+    edit: 
+      change_language: "Change Language"
+      change_password: "Change Password"
+      close_account: "Close Account"
+      download_photos: "download my photos"
+      download_xml: "download my xml"
+      export_data: "Export Data"
+      invite_contacts: "Invite contacts"
+      new_password: "New Password"
+    getting_started: 
+      connect_services: "Connect your services"
+      define_aspects: "Define your aspects"
+      edit_profile: "Edit your profile"
+      save_and_continue: "Save and continue"
+      signup_steps: "Complete your sign-up by doing these things:"
+      skip: "skip getting started"
+      step_1: 
+        your_profile: "Your Profile"
+      step_2: 
+        add: Add
+        aspect_name: "Aspect name"
+        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+        your_aspects: "Your aspects"
+      step_3: 
+        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
+        your_services: "Your services"
+      step_4: 
+        change_profile: "You can change your profile any time by clicking"
+        connect_disconnect: "You can connect/disconnect your services any time by clicking"
+        continue: "Continue on to your everyone page, an overview of all of your aspects."
+        finish: Finish
+        manage_aspects: "You can manage your aspects any time by clicking the"
+        ready_to_share: "You're now ready to start sharing with "
+        set_up: "You're all set up, %{name}!"
+        tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+        user_menu: "in your user menu (top right)."
+      welcome: "Welcome to Diaspora!"
+    public: 
+      does_not_exist: "User %{username} does not exist!"
+    update: 
+      language_changed: "Language Changed"
+      language_not_changed: "Language Change Failed"
+      password_changed: "Password Changed"
+      password_not_changed: "Password Change Failed"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 79c603471..9eab6692f 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -2,206 +2,354 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
-nb:
-  hello: "Hallo, verden!"
-  application:
-      helper:
-          unknown_person: "ukjent person"
-          new_requests: "nye forespørsler"
-  dashboards:
-      helper:
-          home: "hjem"
-  error_messages:
-      helper:
-          invalid_fields: "Ugyldige felter"
-          correct_the_following_errors_and_try_again: "Rett opp de følgende feilene og prøv igjen."
-  people:
-      helper:
-           results_for: " resultater for %{params}"
-           people_on_pod_are_aware_of: " folk i belgen er oppmerksomme på"
-  layouts:
-      application:
-          edit_profile: "endre profil"
-          logout: "logg ut"
-  shared:
-      aspect_nav:
-          all_aspects: "Alle aspekter"
-          manage: "Organisere"
-          manage_your_aspects: "Organiser aspektene dine"
-      sub_header:
-          all_aspects: "Alle aspekter"
-          manage_aspects: "Organiser aspekter"
-      publisher:
-          share: "Del"
-      aspect_friends:
-          add_friends: "legg til venner"
-  albums:
-      album:
-          you: "deg"
-      new_album:
-          create: "Opprett"
-          add_a_new_album: "Legg til et nytt album"
-      show:
-          edit_album: "Endre album"
-          albums: "album"
-          updated: "oppdatert"
-          by: "av"
-      edit:
-          editing: "Redigerer"
-          updated: "oppdatert"
-          are_you_sure: "Er du sikker?"
-          delete_album: "Slett album"
-          cancel: "Avbryt"
-      index:
-          home: "hjem"
-          new_album: "Nytt album"
-      create:
-          success: "Du har oppretta albumet %{name}."
-      update:
-          success: "Albumet %{name} er endra."
-          failure: "Greide ikke å endre albumet %{name}."
-      destroy:
-          success: "Albumet %{name} er sletta."
-      helper:
-          friends_albums: "Venners album"
-          your_albums: "Dine album"
-  aspects:
-      index:
-          photos: "bilder"
-      show:
-          photos: "bilder"
-      manage:
-          add_a_new_aspect: "Legg til et nytt aspekt"
-          add_a_new_friend:  "Legg til en ny venn"
-          show: "Vis"
-          update_aspects: "Oppdater aspekter"
-          requests: "Forespørsler"
-          ignore_remove: "Ignorer/fjern"
-      new_aspect:
-          add_a_new_aspect: "Legg til et nytt aspekt"
-          create: "Opprett"
-      create:
-          success: "Klikk på plusstegnet på venstre side for å fortelle Diaspora hvem som kan se det nye aspektet ditt."
-          failure: "Greide ikke å opprette aspektet." 
-      destroy:
-          success: "%{name} har blitt fjerna."
-      update:
-          success: "Aspektet ditt, %{name}, har blitt endra."
-      move_friends:
-          failure: "Greide ikke å endre aspektet for vennen %{real_name}."
-          success: "Aspektene har blitt endra."
-      move_friend:
-          failure: "virka ikke %{inspect}"
-          success: "Vennen din ser nå et annet aspekt av deg."
-      helper:
-          remove: "fjern"
-          aspect_not_empty: "Aspektet er ikke tomt"
-  users:
-      edit:
-          editing_profile: "Redigerer profil"
-      profile:
-          cancel: "Avbryt"
-          update_profile: "Oppdater profil"
-          home: "Hjem"
-          diaspora_username: "DIASPORA-BRUKERNAVN"
-          info: "Informasjon"
-          picture: "Bilde"
-          editing_profile: "Redigerer profil"
-          albums: "Album"
-          you_dont_have_any_photos: "Du har ikke noen bilder! Gå til"
-          page_to_upload_some:  "for å laste opp noen."
-  comments:
-      comment:
-          ago: "sia"
-      new_comment:
-          comment: "Kommenter"
-  photos:
-      show:
-          prev: "forrige"
-          full_size: "full størrelse"
-          next: "neste"
-          edit_photo: "Rediger bilde"
-          delete_photo: "Slett bilde"
-          are_you_sure: "Er du sikker?"
-          comments: "kommentarer"
-      edit:
-          editing: "Redigerer"
-          are_you_sure: "Er du sikker?"
-          delete_photo: "Slett bilde"
-      photo:
-          show_comments: "vis kommentarer"
-          posted_a_new_photo_to: "la til ett nytt bilde i"
-      new:
-          new_photo: "Nytt bilde"
-          back_to_list: "Tilbake til lista"
-          post_it: "legg ut!"
-      create:
-          runtime_error: "Greide ikke å laste opp bildet. Er du sikker på at setebeltet er festa?"
-          integrity_error: "Greide ikke å laste opp bildet. Er du sikker på at det var et bilde?"
-          type_error: "Greide ikke å laste opp bildet. Er du sikker på at et bilde ble lagt til?"
-      update:
-          notice: "Bildet er oppdatert."
-          error:  "Greide ikke å endre bildet."
-      destroy:
-          notice: "Bildet er sletta."
-  registrations:
-      new:
-          sign_up: "Registrer deg"
-      create:
-          success: "Du er nå med i Diaspora!"
-  status_messages:
-      new_status_message:
-          tell_me_something_good: "Fortell noe tøft"
-          oh_yeah: "Ja da!"
-      status_message:
-          show_comments: "vis kommentarer"
-          delete: "Slett"
-          are_you_sure: "Er du sikker?"
-      show:
-          status_message: "Statusmelding"
-          comments: "kommentarer"
-          are_you_sure: "Er du sikker?"
-          destroy: "Utslett"
-          view_all: "Vis alle"
-          message: "Melding"
-          owner: "Eier"
-      helper:
-          no_message_to_display: "Ingen melding å vise."
-  people:
-      person:
-          add_friend: "legg til venn"
-          pending_request: "venter på svar"
-      index:
-          add_friend: "legg til venn"
-          real_name: "ekte navn"
-          diaspora_handle: "diaspora-bruker"
-          thats_you: "det er deg!"
-          friend_request_pending: "ubesvart venneforespørsel"
-          you_have_a_friend_request_from_this_person: "du har en venneforespørsel fra denne personen"
-      new:
-          new_person: "Ny person"
-          back_to_list: "Tilbake til lista"
-      show:
-          last_seen: "sist sett: %{how_long_ago}"
-          friends_since: "venner sia: %{how_long_ago}"
-          save: "lagre"
-          are_you_sure: "Er du sikker?"
-          remove_friend: "fjern venn"
-  requests:
-      new_request:
-          add_a_new_friend_to: "Legg til en ny venn i"
-          enter_a_diaspora_username: "Skriv en Diaspora-bruker:"
-          your_diaspora_username_is: "Din Diaspora-bruker er: %{diaspora_handle}"
-          friends_username: "Brukeren til vennen"
-      destroy:
-          success: "Dere er nå venner."
-          error: "Velg et aspekt først!"
-          ignore: "Ignorerte venneforespørsel"
-      create:
-          error: "Fant ingen diasporabruker med denne e-posten!"
-          already_friends: "Du er allerede venn med %{destination_url}!"
-          success: "Du sendte en venneforespørsel til %{destination_url}."
-          horribly_wrong: "Noe gikk forferdelig galt."
+nb: 
+  _photos: photos
+  _services: Services
+  account: Account
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "is already taken"
+        user: 
+          attributes: 
+            email: 
+              taken: "is already taken"
+            person: 
+              invalid: "is invalid"
+            username: 
+              taken: "is already taken"
+  ago: ago
+  application: 
+    helper: 
+      unknown_person: "ukjent person"
+      youtube_title: 
+        unknown: "Unknown Video Title"
+  are_you_sure: "Are you sure?"
+  aspects: 
+    add_to_aspect: 
+      failure: "Failed to add friend to aspect."
+      success: "Successfully added friend to aspect."
+    create: 
+      failure: "Greide ikke å opprette aspektet."
+      success: "Klikk på plusstegnet på venstre side for å fortelle Diaspora hvem som kan se det nye aspektet ditt."
+    destroy: 
+      success: "%{name} har blitt fjerna."
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "Aspektet er ikke tomt"
+      remove: fjern
+    manage: 
+      add_a_new_aspect: "Legg til et nytt aspekt"
+      add_a_new_contact: "Add a new contact"
+      drag_to_add: "Drag to add people"
+      manage_aspects: "Manage aspects"
+      no_requests: "No new requests"
+      requests: Forespørsler
+    move_contact: 
+      error: "Error moving contact: %{inspect}"
+      failure: "didn't work %{inspect}"
+      success: "Person moved to new aspect"
+    new_aspect: 
+      create: Opprett
+      name: Name
+    no_contacts_message: 
+      add_contact: "Add a contact"
+      add_contact_to: "Add someone to %{aspect_name}"
+      invite: "Invite someone to join Diaspora!"
+      nobody: "We know you know people — bring them to Diaspora!"
+      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+    no_posts_message: 
+      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+    remove_from_aspect: 
+      failure: "Failed to remove person from aspect"
+      success: "Successfully removed person from aspect"
+    update: 
+      success: "Aspektet ditt, %{name}, har blitt endra."
+  back: Back
+  cancel: Cancel
+  comments: 
+    new_comment: 
+      comment: Kommenter
+      commenting: Commenting...
+  dashboards: 
+    helper: 
+      home: Home
+  delete: Delete
+  email: Email
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Rett opp de følgende feilene og prøv igjen."
+      invalid_fields: "Ugyldige felter"
+  fill_me_out: "Fill me out"
+  home: 
+    show: 
+      already_account: "already have an account?"
+      login_here: "log in here"
+      share_what_you_want: "Share what you want, with who you want."
+  invitations: 
+    check_token: 
+      not_found: "Invitation token not found"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "You already invited this person."
+      no_more: "You have no more invitations."
+      sent: "Your invitation has been sent."
+    new: 
+      if_they_accept_info: "if they accept, they will be added to the aspect you invited them"
+      invite_someone_to_join: "Invite someone to join Diaspora!"
+      message: "Message:"
+      send_an_invitation: "Send an invitation"
+      send_invitation: "Send invitation"
+      to: To
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: "account settings"
+      blog: blog
+      developers: developers
+      edit_profile: "edit profile"
+      login: login
+      logout: logout
+      view_profile: "view profile"
+  notifier: 
+    diaspora: "the diaspora email robot"
+    hello: "Hello %{name}!"
+    love: "love,"
+    new_request: 
+      just_sent_you: "just sent you a friend request on Diaspora*"
+      sign_in: "sign in here"
+      subject: "new Diaspora* friend request from %{from}"
+      try_it_out: "You should really think about checking it out."
+    request_accepted: 
+      accepted: "has accepted your friend request. They are now in your"
+      aspect: aspect.
+      subject: "%{name} has accepted your friend request on Diaspora*"
+  ok: OK
+  or: or
+  password: Password
+  password_confirmation: "Password confirmation"
+  people: 
+    edit: 
+      allow_search: "Allow for people to search for you"
+      first_name: "First name"
+      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      last_name: "Last name"
+      update_profile: "Update Profile"
+      your_bio: "Your bio"
+      your_birthday: "Your birthday"
+      your_gender: "Your gender"
+      your_name: "Your name"
+      your_photo: "Your photo"
+      your_profile: "Your profile"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: " results for %{params}"
+    index: 
+      results_for: "search results for"
+    person: 
+      add_contact: "add contact"
+      already_connected: "Already connected"
+      pending_request: "venter på svar"
+      thats_you: "thats you!"
+    profile_photo_upload: 
+      or_select_one: "or select one from your already existing"
+    profile_sidebar: 
+      bio: bio
+      born: born
+      edit_my_profile: "Edit my profile"
+      gender: gender
+      in_aspects: "in aspects"
+      last_seen: "last seen: %{how_long_ago}"
+      remove_contact: "remove contact"
+    show: 
+      already_requested: "You have already sent a request to %{name}."
+      does_not_exist: "Person does not exist!"
+      no_posts: "no posts to display!"
+      not_connected: "You are not connected with this person"
+      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+    update: 
+      failed: "Failed to update profile"
+      updated: "Profile updated"
+  photos: 
+    create: 
+      integrity_error: "Greide ikke å laste opp bildet. Er du sikker på at det var et bilde?"
+      runtime_error: "Greide ikke å laste opp bildet. Er du sikker på at setebeltet er festa?"
+      type_error: "Greide ikke å laste opp bildet. Er du sikker på at et bilde ble lagt til?"
+    destroy: 
+      notice: "Bildet er sletta."
+    edit: 
+      editing: Redigerer
+    new: 
+      back_to_list: "Tilbake til lista"
+      new_photo: "Nytt bilde"
+      post_it: "legg ut!"
+    new_photo: 
+      drop: "Drop photos here to upload"
+      empty: "{file} is empty, please select files again without it."
+      failed: Failed
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      upload: "Upload a photo"
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      add_a_description: "Add a description"
+      delete_photo: "Slett bilde"
+      edit_photo: "Rediger bilde"
+      full_size: "full størrelse"
+      make_profile_photo: "make profile photo"
+      next: neste
+      prev: forrige
+      update_photo: "Update Photo"
+    update: 
+      error: "Greide ikke å endre bildet."
+      notice: "Bildet er oppdatert."
+  profile: Profile
+  registrations: 
+    closed: "Signups are closed on this Diaspora pod."
+    create: 
+      success: "Du er nå med i Diaspora!"
+    edit: 
+      cancel_my_account: "Cancel my account"
+      edit: "Edit %{name}"
+      leave_blank: "(leave blank if you don't want to change it)"
+      password_to_confirm: "(we need your current password to confirm your changes)"
+      unhappy: Unhappy?
+      update: Update
+    new: 
+      sign_up: "Registrer deg"
+      sign_up_for_diaspora: "Sign up for Diaspora"
+  requests: 
+    create: 
+      sending: Sending...
+      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      tried: "we tried our best to send a message to %{account}"
+    destroy: 
+      error: "Velg et aspekt først!"
+      ignore: "Ignorerte venneforespørsel"
+      success: "Dere er nå venner."
+    manage_aspect_contacts: 
+      contact_username: "Contact's username"
+      create_request: "Create request"
+      enter_a_diaspora_username: "Enter a Diaspora username:"
+      existing: "Existing contacts"
+      know_email: "Know their email address? You should invite them"
+      manage_within: "Manage contacts within"
+      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+  search: Search
+  services: 
+    create: 
+      success: "Authentication successful."
+    destroy: 
+      success: "Successfully destroyed authentication."
+    index: 
+      connect_to_facebook: "Connect to facebook"
+      connect_to_twitter: "Connect to twitter"
+      disconnect: disconnect
+      logged_in_as: "logged in as"
+      really_disconnect: "disconnect %{service}?"
+  settings: Settings
+  shared: 
+    aspect_contacts: 
+      add_contacts: "add contacts"
+      add_to: "add to %{aspect}"
+      everyone: Everyone
+      manage: "manage %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "add a new aspect"
+      everyone: Everyone
+      manage: Organisere
+      manage_your_aspects: "Organiser aspektene dine"
+    author_info: 
+      all: all
+      status_messages: "status messages"
+      view_profile: "View profile"
+      viewing: viewing
+    contact_list: 
+      add_to: "Add %{name} to %{aspect}"
+      remove_from: "Remove %{name} from %{aspect}"
+      search_contacts: "Search contacts"
+    invitations: 
+      invitations_left: "(%{count} left)"
+      invite_someone: "Invite someone"
+      invites: Invites
+    notification: 
+      new: "New %{type} from %{from}"
+    public_explain: 
+      logged_in: "logged in to %{service}"
+      manage: "manage connected services"
+      outside: "Public messages will be available for others outside of Diaspora to see."
+      title: "You are about to post a public message!"
+    publisher: 
+      all: all
+      make_public: "make public"
+      post_a_message_to: "Post a message to %{aspect}"
+      posting: Posting...
+      share: Del
+      share_with: "Share with %{aspect}"
+      share_with_all: "Share with all aspects"
+    reshare: 
+      reshare: Reshare
+    stream_element: 
+      show_comments: "show comments"
+  status_messages: 
+    helper: 
+      no_message_to_display: "Ingen melding å vise."
+    new_status_message: 
+      oh_yeah: "Ja da!"
+      tell_me_something_good: "Fortell noe tøft"
+    show: 
+      destroy: Utslett
+  the_world: "the world"
+  username: Username
+  users: 
+    destroy: "Account successfully closed."
+    edit: 
+      change_language: "Change Language"
+      change_password: "Change Password"
+      close_account: "Close Account"
+      download_photos: "download my photos"
+      download_xml: "download my xml"
+      export_data: "Export Data"
+      invite_contacts: "Invite contacts"
+      new_password: "New Password"
+    getting_started: 
+      connect_services: "Connect your services"
+      define_aspects: "Define your aspects"
+      edit_profile: "Edit your profile"
+      save_and_continue: "Save and continue"
+      signup_steps: "Complete your sign-up by doing these things:"
+      skip: "skip getting started"
+      step_1: 
+        your_profile: "Your Profile"
+      step_2: 
+        add: Add
+        aspect_name: "Aspect name"
+        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+        your_aspects: "Your aspects"
+      step_3: 
+        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
+        your_services: "Your services"
+      step_4: 
+        change_profile: "You can change your profile any time by clicking"
+        connect_disconnect: "You can connect/disconnect your services any time by clicking"
+        continue: "Continue on to your everyone page, an overview of all of your aspects."
+        finish: Finish
+        manage_aspects: "You can manage your aspects any time by clicking the"
+        ready_to_share: "You're now ready to start sharing with "
+        set_up: "You're all set up, %{name}!"
+        tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+        user_menu: "in your user menu (top right)."
+      welcome: "Welcome to Diaspora!"
+    public: 
+      does_not_exist: "User %{username} does not exist!"
+    update: 
+      language_changed: "Language Changed"
+      language_not_changed: "Language Change Failed"
+      password_changed: "Password Changed"
+      password_not_changed: "Password Change Failed"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index efff23a9d..582f53681 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -2,207 +2,354 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
-nl:
-  hello: "Hallo wereld"
-  application:
-      helper:
-          unknown_person: "onbekend persoon"
-          new_requests: "nieuwe verzoeken"
-  dashboards:
-      helper:
-          home: "home"
-  error_messages:
-      helper:
-          invalid_fields: "Ongeldige velden"
-          correct_the_following_errors_and_try_again: "Corrigeer de volgende fouten en probeer opnieuw."
-  people:
-      helper:
-           results_for: " resultaten voor %{params}"
-           people_on_pod_are_aware_of: " people on pod are aware of"    # No idea how to translate this!
-  layouts:
-      application:
-          edit_profile: "verander profiel"
-          logout: "uitloggen"
-  shared:
-      aspect_nav:
-          all_aspects: "Alle Aspecten"
-          manage: "Beheer"
-          manage_your_aspects: "Beheer je Aspecten"
-      sub_header:
-          all_aspects: "Alle Aspecten"
-          manage_aspects: "Beheer Aspecten"
-      publisher:
-          share: "Delen"
-      aspect_friends:
-          add_friends: "voeg vrienden toe"
-  albums:
-      album:
-          you: "jij"
-      new_album:
-          create: "maak"
-          add_a_new_album: "Maak een nieuw album"
-      show:
-          edit_album: "Verander Album"
-          albums: "albums"
-          updated: "geupdated"
-          by: "door"
-      edit:
-          editing: "Veranderen"
-          updated: "geupdated"
-          are_you_sure: "Weet je het zeker?"
-          delete_album: "Verwijder Album"
-          cancel: "Annuleer"
-      index:
-          home: "home"
-          new_album: "Nieuw Album"
-      create:
-          success: "Je hebt het album %{name} gemaakt."
-      update:
-          success: "Album %{name} succesvol veranderd."
-          failure: "Niet gelukt om album %{name} te veranderen."
-      destroy:
-          success: "Album %{name} verwijderd."
-      helper:
-          friends_albums: "Albums van Vrienden"
-          your_albums: "Jouw Albums"
-  aspects:
-      index:
-          photos: "foto's"
-      show:
-          photos: "foto's"
-      manage:
-          add_a_new_aspect: "Voeg een nieuw aspect toe"
-          add_a_new_friend:  "Voeg een nieuwe friend toe"
-          show: "Bekijk"
-          update_aspects: "Verander Aspects"
-          requests: "Aanvragen"
-          ignore_remove: "Negeer/Verwijderen"
-      new_aspect:
-          add_a_new_aspect: "Voeg een nieuw aspect toe"
-          create: "Aanmaken"
-      create:
-          success: "Klik op de plus aan de linkerkant om Diaspora te vertellen wie je nieuwe aspect kan zien."
-          failure: "Aanmaken van aspect mislukt."
-      destroy:
-          success: "%{name} is succesvol verwijderd."
-      update:
-          success: "Je aspect, %{name}, is succelvol aangepast."
-      move_friends:
-          failure: "Aanpassen van aspect is mislukt voor vriend %{real_name}."
-          success: "Aspect succesvol aangepast."
-      move_friend:
-          failure: "werkt niet %{inspect}"
-          success: "Je laat je vriend nu een ander aspect van je zien."
-      helper:
-          remove: "verwijderen"
-          aspect_not_empty: "Aspect niet leeg"
-  users:
-      edit:
-          editing_profile: "Verander profiel"
-      profile:
-          cancel: "Annuleren"
-          update_profile: "Verander Profiel"
-          home: "Home"
-          diaspora_username: "DIASPORA USERNAME"
-          info: "Info"
-          picture: "Foto"
-          editing_profile: "Verander profiel"
-          albums: "Albums"
-          you_dont_have_any_photos: "Je hebt nog geen foto's!  Ga naar de"
-          page_to_upload_some:  "pagina om er een aantal te uploaden."
-          or: "of"
-  comments:
-      comment:
-          ago: "geleden"
-      new_comment:
-          comment: "Reactie"
-  photos:
-      show:
-          prev: "vorige"
-          full_size: "volledige grootte"
-          next: "volgende"
-          edit_photo: "Verander Foto"
-          delete_photo: "Verwijder Foto"
-          are_you_sure: "Weet je het zeker?"
-          comments: "reacties"
-      edit:
-          editing: "Veranderen"
-          are_you_sure: "Weet je het zeker?"
-          delete_photo: "Verwijder Foto"
-      photo:
-          show_comments: "laat reacties zien"
-          posted_a_new_photo_to: "postte een nieuwe foto in"
-      new:
-          new_photo: "Nieuwe Foto"
-          back_to_list: "Terug naar de lijst"
-          post_it: "post het!"
-      create:
-          runtime_error: "Uploaden van foto mislukt. Weet je zeker dat je je gordel omhebt?"
-          integrity_error: "Uploaden van foto mislukt. Weet je zeker dat het een foto is?"
-          type_error: "Uploaden van foto mislukt. Weet je zeker dat er een foto was toegevoegd?"
-      update:
-          notice: "Foto succelvol veranderd."
-          error:  "Foto veranderen niet gelukt."
-      destroy:
-          notice: "Foto verwijderd."
-  registrations:
-      new:
-          sign_up: "Registeren"
-      create:
-          success: "Je bent nu lid van Diaspora!"
-  status_messages:
-      new_status_message:
-          tell_me_something_good: "vertel me iets leuks"
-          oh_yeah: "oh ja!"
-      status_message:
-          show_comments: "laat reacties zien"
-          delete: "Verwijder"
-          are_you_sure: "Weet je het zeker?"
-      show:
-          status_message: "Status Bericht"
-          comments: "reacties"
-          are_you_sure: "Weet je het zeker?"
-          destroy: "Verwijderen"
-          view_all: "Bekijk allen"
-          message: "Bericht"
-          owner: "Eigenaar"
-      helper:
-          no_message_to_display: "Geen bericht om te weergeven."
-  people:
-      person:
-          add_friend: "voeg vriend to"
-          pending_request: "openstaand verzoek"
-      index:
-          add_friend: "voeg vriend toe"
-          real_name: "echte naam"
-          diaspora_handle: "diaspora handle"
-          thats_you: "dat ben jij!"
-          friend_request_pending: "openstaand vriendenverzoek"
-          you_have_a_friend_request_from_this_person: "je hebt een vriendenverzoek van deze persoon"
-      new:
-          new_person: "Nieuwe persoon"
-          back_to_list: "Terug naar de lijst"
-      show:
-          last_seen: "voor het laast gezien: %{how_long_ago}"
-          friends_since: "vrienden sinds: %{how_long_ago}"
-          save: "opslaan"
-          are_you_sure: "Weet je het zeker?"
-          remove_friend: "verwijder vriend"
-  requests:
-      new_request:
-          add_a_new_friend_to: "Voeg een nieuwe vriend toe aan"
-          enter_a_diaspora_username: "Voer een Diaspora gebruikersnaam in:"
-          your_diaspora_username_is: "Je Diaspora gebruikersnaam is: %{diaspora_handle}"
-          friends_username: "Gebruikersnaam van vriend"
-      destroy:
-          success: "Jullie zijn nu vrienden."
-          error: "Selecteer een aspect!"
-          ignore: "Vriendenverzoek genegeerd."
-      create:
-          error: "Geen Diaspora seed met dit emailadres gevonden!"
-          already_friends: "Je bent al vrienden met %{destination_url}!"
-          success: "Een vriendenverzoek is verstuurd naar %{destination_url}."
-          horribly_wrong: "Iets is totaal verkeerd gegaan."
+nl: 
+  _photos: photos
+  _services: Services
+  account: Account
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "is already taken"
+        user: 
+          attributes: 
+            email: 
+              taken: "is already taken"
+            person: 
+              invalid: "is invalid"
+            username: 
+              taken: "is already taken"
+  ago: geleden
+  application: 
+    helper: 
+      unknown_person: "onbekend persoon"
+      youtube_title: 
+        unknown: "Unknown Video Title"
+  are_you_sure: "Are you sure?"
+  aspects: 
+    add_to_aspect: 
+      failure: "Failed to add friend to aspect."
+      success: "Successfully added friend to aspect."
+    create: 
+      failure: "Aanmaken van aspect mislukt."
+      success: "Klik op de plus aan de linkerkant om Diaspora te vertellen wie je nieuwe aspect kan zien."
+    destroy: 
+      success: "%{name} is succesvol verwijderd."
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "Aspect niet leeg"
+      remove: verwijderen
+    manage: 
+      add_a_new_aspect: "Voeg een nieuw aspect toe"
+      add_a_new_contact: "Add a new contact"
+      drag_to_add: "Drag to add people"
+      manage_aspects: "Manage aspects"
+      no_requests: "No new requests"
+      requests: Aanvragen
+    move_contact: 
+      error: "Error moving contact: %{inspect}"
+      failure: "didn't work %{inspect}"
+      success: "Person moved to new aspect"
+    new_aspect: 
+      create: Aanmaken
+      name: Name
+    no_contacts_message: 
+      add_contact: "Add a contact"
+      add_contact_to: "Add someone to %{aspect_name}"
+      invite: "Invite someone to join Diaspora!"
+      nobody: "We know you know people — bring them to Diaspora!"
+      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+    no_posts_message: 
+      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+    remove_from_aspect: 
+      failure: "Failed to remove person from aspect"
+      success: "Successfully removed person from aspect"
+    update: 
+      success: "Je aspect, %{name}, is succelvol aangepast."
+  back: Back
+  cancel: Cancel
+  comments: 
+    new_comment: 
+      comment: Reactie
+      commenting: Commenting...
+  dashboards: 
+    helper: 
+      home: Home
+  delete: Delete
+  email: Email
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Corrigeer de volgende fouten en probeer opnieuw."
+      invalid_fields: "Ongeldige velden"
+  fill_me_out: "Fill me out"
+  home: 
+    show: 
+      already_account: "already have an account?"
+      login_here: "log in here"
+      share_what_you_want: "Share what you want, with who you want."
+  invitations: 
+    check_token: 
+      not_found: "Invitation token not found"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "You already invited this person."
+      no_more: "You have no more invitations."
+      sent: "Your invitation has been sent."
+    new: 
+      if_they_accept_info: "if they accept, they will be added to the aspect you invited them"
+      invite_someone_to_join: "Invite someone to join Diaspora!"
+      message: "Message:"
+      send_an_invitation: "Send an invitation"
+      send_invitation: "Send invitation"
+      to: To
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: "account settings"
+      blog: blog
+      developers: developers
+      edit_profile: "edit profile"
+      login: login
+      logout: logout
+      view_profile: "view profile"
+  notifier: 
+    diaspora: "the diaspora email robot"
+    hello: "Hello %{name}!"
+    love: "love,"
+    new_request: 
+      just_sent_you: "just sent you a friend request on Diaspora*"
+      sign_in: "sign in here"
+      subject: "new Diaspora* friend request from %{from}"
+      try_it_out: "You should really think about checking it out."
+    request_accepted: 
+      accepted: "has accepted your friend request. They are now in your"
+      aspect: aspect.
+      subject: "%{name} has accepted your friend request on Diaspora*"
+  ok: OK
+  or: or
+  password: Password
+  password_confirmation: "Password confirmation"
+  people: 
+    edit: 
+      allow_search: "Allow for people to search for you"
+      first_name: "First name"
+      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      last_name: "Last name"
+      update_profile: "Update Profile"
+      your_bio: "Your bio"
+      your_birthday: "Your birthday"
+      your_gender: "Your gender"
+      your_name: "Your name"
+      your_photo: "Your photo"
+      your_profile: "Your profile"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: " results for %{params}"
+    index: 
+      results_for: "search results for"
+    person: 
+      add_contact: "add contact"
+      already_connected: "Already connected"
+      pending_request: "openstaand verzoek"
+      thats_you: "thats you!"
+    profile_photo_upload: 
+      or_select_one: "or select one from your already existing"
+    profile_sidebar: 
+      bio: bio
+      born: born
+      edit_my_profile: "Edit my profile"
+      gender: gender
+      in_aspects: "in aspects"
+      last_seen: "last seen: %{how_long_ago}"
+      remove_contact: "remove contact"
+    show: 
+      already_requested: "You have already sent a request to %{name}."
+      does_not_exist: "Person does not exist!"
+      no_posts: "no posts to display!"
+      not_connected: "You are not connected with this person"
+      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+    update: 
+      failed: "Failed to update profile"
+      updated: "Profile updated"
+  photos: 
+    create: 
+      integrity_error: "Uploaden van foto mislukt. Weet je zeker dat het een foto is?"
+      runtime_error: "Uploaden van foto mislukt. Weet je zeker dat je je gordel omhebt?"
+      type_error: "Uploaden van foto mislukt. Weet je zeker dat er een foto was toegevoegd?"
+    destroy: 
+      notice: "Foto verwijderd."
+    edit: 
+      editing: Veranderen
+    new: 
+      back_to_list: "Terug naar de lijst"
+      new_photo: "Nieuwe Foto"
+      post_it: "post het!"
+    new_photo: 
+      drop: "Drop photos here to upload"
+      empty: "{file} is empty, please select files again without it."
+      failed: Failed
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      upload: "Upload a photo"
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      add_a_description: "Add a description"
+      delete_photo: "Verwijder Foto"
+      edit_photo: "Verander Foto"
+      full_size: "volledige grootte"
+      make_profile_photo: "make profile photo"
+      next: volgende
+      prev: vorige
+      update_photo: "Update Photo"
+    update: 
+      error: "Foto veranderen niet gelukt."
+      notice: "Foto succelvol veranderd."
+  profile: Profile
+  registrations: 
+    closed: "Signups are closed on this Diaspora pod."
+    create: 
+      success: "Je bent nu lid van Diaspora!"
+    edit: 
+      cancel_my_account: "Cancel my account"
+      edit: "Edit %{name}"
+      leave_blank: "(leave blank if you don't want to change it)"
+      password_to_confirm: "(we need your current password to confirm your changes)"
+      unhappy: Unhappy?
+      update: Update
+    new: 
+      sign_up: Registeren
+      sign_up_for_diaspora: "Sign up for Diaspora"
+  requests: 
+    create: 
+      sending: Sending...
+      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      tried: "we tried our best to send a message to %{account}"
+    destroy: 
+      error: "Selecteer een aspect!"
+      ignore: "Vriendenverzoek genegeerd."
+      success: "Jullie zijn nu vrienden."
+    manage_aspect_contacts: 
+      contact_username: "Contact's username"
+      create_request: "Create request"
+      enter_a_diaspora_username: "Enter a Diaspora username:"
+      existing: "Existing contacts"
+      know_email: "Know their email address? You should invite them"
+      manage_within: "Manage contacts within"
+      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+  search: Search
+  services: 
+    create: 
+      success: "Authentication successful."
+    destroy: 
+      success: "Successfully destroyed authentication."
+    index: 
+      connect_to_facebook: "Connect to facebook"
+      connect_to_twitter: "Connect to twitter"
+      disconnect: disconnect
+      logged_in_as: "logged in as"
+      really_disconnect: "disconnect %{service}?"
+  settings: Settings
+  shared: 
+    aspect_contacts: 
+      add_contacts: "add contacts"
+      add_to: "add to %{aspect}"
+      everyone: Everyone
+      manage: "manage %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "add a new aspect"
+      everyone: Everyone
+      manage: Beheer
+      manage_your_aspects: "Beheer je Aspecten"
+    author_info: 
+      all: all
+      status_messages: "status messages"
+      view_profile: "View profile"
+      viewing: viewing
+    contact_list: 
+      add_to: "Add %{name} to %{aspect}"
+      remove_from: "Remove %{name} from %{aspect}"
+      search_contacts: "Search contacts"
+    invitations: 
+      invitations_left: "(%{count} left)"
+      invite_someone: "Invite someone"
+      invites: Invites
+    notification: 
+      new: "New %{type} from %{from}"
+    public_explain: 
+      logged_in: "logged in to %{service}"
+      manage: "manage connected services"
+      outside: "Public messages will be available for others outside of Diaspora to see."
+      title: "You are about to post a public message!"
+    publisher: 
+      all: all
+      make_public: "make public"
+      post_a_message_to: "Post a message to %{aspect}"
+      posting: Posting...
+      share: Delen
+      share_with: "Share with %{aspect}"
+      share_with_all: "Share with all aspects"
+    reshare: 
+      reshare: Reshare
+    stream_element: 
+      show_comments: "show comments"
+  status_messages: 
+    helper: 
+      no_message_to_display: "Geen bericht om te weergeven."
+    new_status_message: 
+      oh_yeah: "oh ja!"
+      tell_me_something_good: "vertel me iets leuks"
+    show: 
+      destroy: Verwijderen
+  the_world: "the world"
+  username: Username
+  users: 
+    destroy: "Account successfully closed."
+    edit: 
+      change_language: "Change Language"
+      change_password: "Change Password"
+      close_account: "Close Account"
+      download_photos: "download my photos"
+      download_xml: "download my xml"
+      export_data: "Export Data"
+      invite_contacts: "Invite contacts"
+      new_password: "New Password"
+    getting_started: 
+      connect_services: "Connect your services"
+      define_aspects: "Define your aspects"
+      edit_profile: "Edit your profile"
+      save_and_continue: "Save and continue"
+      signup_steps: "Complete your sign-up by doing these things:"
+      skip: "skip getting started"
+      step_1: 
+        your_profile: "Your Profile"
+      step_2: 
+        add: Add
+        aspect_name: "Aspect name"
+        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+        your_aspects: "Your aspects"
+      step_3: 
+        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
+        your_services: "Your services"
+      step_4: 
+        change_profile: "You can change your profile any time by clicking"
+        connect_disconnect: "You can connect/disconnect your services any time by clicking"
+        continue: "Continue on to your everyone page, an overview of all of your aspects."
+        finish: Finish
+        manage_aspects: "You can manage your aspects any time by clicking the"
+        ready_to_share: "You're now ready to start sharing with "
+        set_up: "You're all set up, %{name}!"
+        tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+        user_menu: "in your user menu (top right)."
+      welcome: "Welcome to Diaspora!"
+    public: 
+      does_not_exist: "User %{username} does not exist!"
+    update: 
+      language_changed: "Language Changed"
+      language_not_changed: "Language Change Failed"
+      password_changed: "Password Changed"
+      password_not_changed: "Password Change Failed"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 378b93ced..30b0183f0 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -2,8 +2,354 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
-pl:
-  hello: "Witaj świecie"
+pl: 
+  _photos: photos
+  _services: Services
+  account: Account
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "is already taken"
+        user: 
+          attributes: 
+            email: 
+              taken: "is already taken"
+            person: 
+              invalid: "is invalid"
+            username: 
+              taken: "is already taken"
+  ago: ago
+  application: 
+    helper: 
+      unknown_person: "unknown person"
+      youtube_title: 
+        unknown: "Unknown Video Title"
+  are_you_sure: "Are you sure?"
+  aspects: 
+    add_to_aspect: 
+      failure: "Failed to add contact to aspect."
+      success: "Successfully added contact to aspect."
+    create: 
+      failure: "Aspect creation failed."
+      success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
+    destroy: 
+      success: "%{name} was successfully removed."
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "Aspect not empty"
+      remove: remove
+    manage: 
+      add_a_new_aspect: "Add a new aspect"
+      add_a_new_contact: "Add a new contact"
+      drag_to_add: "Drag to add people"
+      manage_aspects: "Manage aspects"
+      no_requests: "No new requests"
+      requests: Requests
+    move_contact: 
+      error: "Error moving contact: %{inspect}"
+      failure: "didn't work %{inspect}"
+      success: "Person moved to new aspect"
+    new_aspect: 
+      create: Create
+      name: Name
+    no_contacts_message: 
+      add_contact: "Add a contact"
+      add_contact_to: "Add someone to %{aspect_name}"
+      invite: "Invite someone to join Diaspora!"
+      nobody: "We know you know people — bring them to Diaspora!"
+      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+    no_posts_message: 
+      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+    remove_from_aspect: 
+      failure: "Failed to remove person from aspect"
+      success: "Successfully removed person from aspect"
+    update: 
+      success: "Your aspect, %{name}, has been successfully edited."
+  back: Back
+  cancel: Cancel
+  comments: 
+    new_comment: 
+      comment: Comment
+      commenting: Commenting...
+  dashboards: 
+    helper: 
+      home: Home
+  delete: Delete
+  email: Email
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Correct the following errors and try again."
+      invalid_fields: "Invalid Fields"
+  fill_me_out: "Fill me out"
+  home: 
+    show: 
+      already_account: "already have an account?"
+      login_here: "log in here"
+      share_what_you_want: "Share what you want, with who you want."
+  invitations: 
+    check_token: 
+      not_found: "Invitation token not found"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "You already invited this person."
+      no_more: "You have no more invitations."
+      sent: "Your invitation has been sent."
+    new: 
+      if_they_accept_info: "if they accept, they will be added to the aspect you invited them"
+      invite_someone_to_join: "Invite someone to join Diaspora!"
+      message: "Message:"
+      send_an_invitation: "Send an invitation"
+      send_invitation: "Send invitation"
+      to: To
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: "account settings"
+      blog: blog
+      developers: developers
+      edit_profile: "edit profile"
+      login: login
+      logout: logout
+      view_profile: "view profile"
+  notifier: 
+    diaspora: "the diaspora email robot"
+    hello: "Hello %{name}!"
+    love: "love,"
+    new_request: 
+      just_sent_you: "just sent you a contact request on Diaspora*"
+      sign_in: "sign in here"
+      subject: "new Diaspora* contact request from %{from}"
+      try_it_out: "You should really think about checking it out."
+    request_accepted: 
+      accepted: "has accepted your contact request. They are now in your"
+      aspect: aspect.
+      subject: "%{name} has accepted your contact request on Diaspora*"
+  ok: OK
+  or: or
+  password: Password
+  password_confirmation: "Password confirmation"
+  people: 
+    edit: 
+      allow_search: "Allow for people to search for you"
+      first_name: "First name"
+      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      last_name: "Last name"
+      update_profile: "Update Profile"
+      your_bio: "Your bio"
+      your_birthday: "Your birthday"
+      your_gender: "Your gender"
+      your_name: "Your name"
+      your_photo: "Your photo"
+      your_profile: "Your profile"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: " results for %{params}"
+    index: 
+      results_for: "search results for"
+    person: 
+      add_contact: "add contact"
+      already_connected: "Already connected"
+      pending_request: "pending request"
+      thats_you: "thats you!"
+    profile_photo_upload: 
+      or_select_one: "or select one from your already existing"
+    profile_sidebar: 
+      bio: bio
+      born: born
+      edit_my_profile: "Edit my profile"
+      gender: gender
+      in_aspects: "in aspects"
+      last_seen: "last seen: %{how_long_ago}"
+      remove_contact: "remove contact"
+    show: 
+      already_requested: "You have already sent a request to %{name}."
+      does_not_exist: "Person does not exist!"
+      no_posts: "no posts to display!"
+      not_connected: "You are not connected with this person"
+      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+    update: 
+      failed: "Failed to update profile"
+      updated: "Profile updated"
+  photos: 
+    create: 
+      integrity_error: "Photo upload failed.  Are you sure that was an image?"
+      runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
+      type_error: "Photo upload failed.  Are you sure an image was added?"
+    destroy: 
+      notice: "Photo deleted."
+    edit: 
+      editing: Editing
+    new: 
+      back_to_list: "Back to List"
+      new_photo: "New Photo"
+      post_it: "post it!"
+    new_photo: 
+      drop: "Drop photos here to upload"
+      empty: "{file} is empty, please select files again without it."
+      failed: Failed
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      upload: "Upload a photo"
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      add_a_description: "Add a description"
+      delete_photo: "Delete Photo"
+      edit_photo: "Edit Photo"
+      full_size: "full size"
+      make_profile_photo: "make profile photo"
+      next: next
+      prev: prev
+      update_photo: "Update Photo"
+    update: 
+      error: "Failed to edit photo."
+      notice: "Photo successfully updated."
+  profile: Profile
+  registrations: 
+    closed: "Signups are closed on this Diaspora pod."
+    create: 
+      success: "You've joined Diaspora!"
+    edit: 
+      cancel_my_account: "Cancel my account"
+      edit: "Edit %{name}"
+      leave_blank: "(leave blank if you don't want to change it)"
+      password_to_confirm: "(we need your current password to confirm your changes)"
+      unhappy: Unhappy?
+      update: Update
+    new: 
+      sign_up: "Sign up"
+      sign_up_for_diaspora: "Sign up for Diaspora"
+  requests: 
+    create: 
+      sending: Sending...
+      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      tried: "we tried our best to send a message to %{account}"
+    destroy: 
+      error: "Please select an aspect!"
+      ignore: "Ignored contact request."
+      success: "You are now friends."
+    manage_aspect_contacts: 
+      contact_username: "Contact's username"
+      create_request: "Create request"
+      enter_a_diaspora_username: "Enter a Diaspora username:"
+      existing: "Existing contacts"
+      know_email: "Know their email address? You should invite them"
+      manage_within: "Manage contacts within"
+      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+  search: Search
+  services: 
+    create: 
+      success: "Authentication successful."
+    destroy: 
+      success: "Successfully destroyed authentication."
+    index: 
+      connect_to_facebook: "Connect to facebook"
+      connect_to_twitter: "Connect to twitter"
+      disconnect: disconnect
+      logged_in_as: "logged in as"
+      really_disconnect: "disconnect %{service}?"
+  settings: Settings
+  shared: 
+    aspect_contacts: 
+      add_contacts: "add contacts"
+      add_to: "add to %{aspect}"
+      everyone: Everyone
+      manage: "manage %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "add a new aspect"
+      everyone: Everyone
+      manage: Manage
+      manage_your_aspects: "Manage your Aspects"
+    author_info: 
+      all: all
+      status_messages: "status messages"
+      view_profile: "View profile"
+      viewing: viewing
+    contact_list: 
+      add_to: "Add %{name} to %{aspect}"
+      remove_from: "Remove %{name} from %{aspect}"
+      search_contacts: "Search contacts"
+    invitations: 
+      invitations_left: "(%{count} left)"
+      invite_someone: "Invite someone"
+      invites: Invites
+    notification: 
+      new: "New %{type} from %{from}"
+    public_explain: 
+      logged_in: "logged in to %{service}"
+      manage: "manage connected services"
+      outside: "Public messages will be available for others outside of Diaspora to see."
+      title: "You are about to post a public message!"
+    publisher: 
+      all: all
+      make_public: "make public"
+      post_a_message_to: "Post a message to %{aspect}"
+      posting: Posting...
+      share: Share
+      share_with: "Share with %{aspect}"
+      share_with_all: "Share with all aspects"
+    reshare: 
+      reshare: Reshare
+    stream_element: 
+      show_comments: "show comments"
+  status_messages: 
+    helper: 
+      no_message_to_display: "No message to display."
+    new_status_message: 
+      oh_yeah: "oh yeah!"
+      tell_me_something_good: "tell me something good"
+    show: 
+      destroy: Destroy
+  the_world: "the world"
+  username: Username
+  users: 
+    destroy: "Account successfully closed."
+    edit: 
+      change_language: "Change Language"
+      change_password: "Change Password"
+      close_account: "Close Account"
+      download_photos: "download my photos"
+      download_xml: "download my xml"
+      export_data: "Export Data"
+      invite_contacts: "Invite contacts"
+      new_password: "New Password"
+    getting_started: 
+      connect_services: "Connect your services"
+      define_aspects: "Define your aspects"
+      edit_profile: "Edit your profile"
+      save_and_continue: "Save and continue"
+      signup_steps: "Complete your sign-up by doing these things:"
+      skip: "skip getting started"
+      step_1: 
+        your_profile: "Your Profile"
+      step_2: 
+        add: Add
+        aspect_name: "Aspect name"
+        description: "Tell Diaspora what different aspects of you are seen by different contacts.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+        your_aspects: "Your aspects"
+      step_3: 
+        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
+        your_services: "Your services"
+      step_4: 
+        change_profile: "You can change your profile any time by clicking"
+        connect_disconnect: "You can connect/disconnect your services any time by clicking"
+        continue: "Continue on to your everyone page, an overview of all of your aspects."
+        finish: Finish
+        manage_aspects: "You can manage your aspects any time by clicking the"
+        ready_to_share: "You're now ready to start sharing with "
+        set_up: "You're all set up, %{name}!"
+        tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+        user_menu: "in your user menu (top right)."
+      welcome: "Welcome to Diaspora!"
+    public: 
+      does_not_exist: "User %{username} does not exist!"
+    update: 
+      language_changed: "Language Changed"
+      language_not_changed: "Language Change Failed"
+      password_changed: "Password Changed"
+      password_not_changed: "Password Change Failed"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index c04a60759..36071ddf0 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -2,205 +2,354 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-# Sample localization file for Portuguese Brazilian. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
-pt-BR:
-  hello: "Olá mundo"
-  application:
-      helper:
-          unknown_person: "pessoa desconhecida"
-          new_requests: "nova requisição"
-  dashboards:
-      helper:
-          home: "casa"
-  error_messages:
-      helper:
-          invalid_fields: "Campos inválidos"
-          correct_the_following_errors_and_try_again: "Corrija os erros a seguir e tente novamente."
-  people:
-      helper:
-           results_for: " resultados para %{params}"
-           people_on_pod_are_aware_of: " pessoas no pod estão conscientes de"
-  layouts:
-      application:
-          edit_profile: "editar perfil"
-          logout: "sair"
-  shared:
-      aspect_nav:
-          all_aspects: "Todos Aspectos"
-          manage: "Gerenciar"
-          manage_your_aspects: "Gerencie seus Aspectos"
-      sub_header:
-          all_aspects: "Todos Aspectos"
-          manage_aspects: "Gerenciar Aspectos"
-      publisher:
-          share: "Compartilhar"
-      aspect_friends:
-          add_friends: "adicionar amigos"
-  albums:
-      album:
-          you: "você"
-      new_album:
-          create: "criar"
-          add_a_new_album: "Adicionar novo álbum"
-      show:
-          edit_album: "Editar Álbum"
-          albums: "álbuns"
-          updated: "atualizado"
-          by: "por"
-      edit:
-          editing: "Editando"
-          updated: "atualizado"
-          are_you_sure: "Tem certeza?"
-          delete_album: "Excluir Álbum"
-          cancel: "Cancelar"
-      index:
-          home: "home"
-          new_album: "Novo Álbum"
-      create:
-          success: "Você criou com sucesso um álbum chamado %{name}."
-      update:
-          success: "O álbum %{name} foi editado com sucesso."
-          failure: "Erro ao editar o álbum %{name}."
-      destroy:
-          success: "O álbum %{name} foi excluído com sucesso."
-      helper:
-          friends_albums: "Álbum de amigos"
-          your_albums: "Seus álbuns"
-  aspects:
-      index:
-          photos: "photos"
-      show:
-          photos: "photos"
-      manage:
-          add_a_new_aspect: "Adicionar um novo aspecto"
-          add_a_new_friend:  "Adicionar um novo amigo"
-          show: "Exibir"
-          update_aspects: "Atualizar Aspectos"
-          requests: "Solicitações"
-          ignore_remove: "Ignorar/Excluir"
-      new_aspect:
-          add_a_new_aspect: "Adicionar um novo aspecto"
-          create: "Criar"
-      create:
-          success:"Clique no mais(+) do lado esquerdo para dizer ao Diaspora quem pode ver seu novo aspecto."
-      destroy:
-          success: "%{name} foi removido com sucesso."
-      update:
-          success: "Seu aspecto, %{name}, foi editado com sucesso."
-      move_friends:
-          failure: "Falha ao editar aspecto para o amigo(a) %{real_name}."
-          success: "Aspectos editados com sucesso."
-      move_friend:
-          failure: "não funcionou %{inspect}"
-          success: "Você está agora mostrando um diferente aspecto seu a um amigo(a)."
-      helper:
-          remove: "remover"
-          aspect_not_empty: "Aspecto não está vazio"
-  users:
-      edit:
-          editing_profile: "Editando perfil"
-      profile:
-          cancel: "Cancelar"
-          update_profile: "Atualizar Perfil"
-          home: "Home"
-          diaspora_username: "NOME DE USUÁRIO DIASPORA"
-          info: "Informações"
-          picture: "Imagem"
-          editing_profile: "Editando perfil"
-          albums: "Álbuns"
-          you_dont_have_any_photos: "Você não possui nenhuma photo!  Vá para"
-          page_to_upload_some:  "para fazer o upload de alguma."
-  comments:
-      comment:
-          ago: "atrás"
-      new_comment:
-          comment: "Comentário"
-  photos:
-      show:
-          prev: "anterior"
-          full_size: "tamanho máximo"
-          next: "próxima"
-          edit_photo: "Editar Foto"
-          delete_photo: "Excluir Foto"
-          are_you_sure: "Tem certeza?"
-          comments: "comentários"
-      edit:
-          editing: "Editando"
-          are_you_sure: "Tem certeza?"
-          delete_photo: "Excluir Foto"
-      photo:
-          show_comments: "exibir comentários"
-          posted_a_new_photo_to: "enviada um nova foto para"
-      new:
-          new_photo: "Nova Foto"
-          back_to_list: "Voltar para a Lista"
-          post_it: "enviar!"
-      create:
-          runtime_error: "Envio de foto falhou. Você tem tem certeza que seu sinto de segurança está preso?"
-          integrity_error: "Envio de foto falhou. Você tem certeza que é uma imagem?"
-          type_error: "Envio de foto falhou. Você tem certeza que adicionou uma imagem?"
-      update:
-          notice: "Foto enviada com sucesso."
-          error:  "Falha ao editar foto."
-      destroy:
-          notice: "Foto removida."
-  registrations:
-      new:
-          sign_up: "Cadastro"
-      create:
-          success: "Vocé entrou na Diaspora!"
-  status_messages:
-      new_status_message:
-          tell_me_something_good: "diga-me qualquer coisa legal"
-          oh_yeah: "É isso aí!"
-      status_message:
-          show_comments: "exibir comentários"
-          delete: "Excluir"
-          are_you_sure: "Tem certeza?"
-      show:
-          status_message: "Mensagem de Status"
-          comments: "comentários"
-          are_you_sure: "Tem certeza?"
-          destroy: "Excluir"
-          view_all: "Exibir Todas"
-          message: "Mensagem"
-          owner: "Pertence a"
-      helper:
-          no_message_to_display: "Nenhuma mensagem para ser mostrada."
-  people:
-      person:
-          add_friend: "adicionar amigo(a)"
-          pending_request: "requisições pendentes"
-      index:
-          add_friend: "adicionar amigo(a)"
-          real_name: "nome real"
-          diaspora_handle: "diaspora handle"
-          thats_you: "esse é você!"
-          friend_request_pending: "pedido de amizade pendente"
-          you_have_a_friend_request_from_this_person: "você possui um pedido de amizade dessa pessoa"
-      new:
-          new_person: "Nova Pessoa"
-          back_to_list: "Voltar para a Lista"
-      show:
-          last_seen: "visto pela última vez a: %{how_long_ago}"
-          friends_since: "amigos desde: %{how_long_ago}"
-          save: "salvar"
-          are_you_sure: "Tem certeza?"
-          remove_friend: "excluir amigo"
-  requests:
-      new_request:
-          add_a_new_friend_to: "Adicionar novo amigo(a) em"
-          enter_a_diaspora_username: "Digite seu nome de usuário Diaspora:"
-          your_diaspora_username_is: "Seu nome de usuário Diaspora é: %{diaspora_handle}"
-          friends_username: "Nome de usuário do Amigo(a)"
-      destroy:
-          success: "Vocês agora são amigos."
-          error: "Favor selecionar um aspecto!"
-          ignore: "Requisições de amigos ignoradas."
-      create:
-          error: "Nenhum semente Diaspora encontrado com esse email."
-          already_friends: "Você já é amigo(a) de %{destination_url}!"
-          success: "Uma requisição de amizade foi enviada para %{destination_url}."
-          horribly_wrong: "Algo horrível aconteceu."
+pt-BR: 
+  _photos: photos
+  _services: Services
+  account: Account
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "is already taken"
+        user: 
+          attributes: 
+            email: 
+              taken: "is already taken"
+            person: 
+              invalid: "is invalid"
+            username: 
+              taken: "is already taken"
+  ago: ago
+  application: 
+    helper: 
+      unknown_person: "pessoa desconhecida"
+      youtube_title: 
+        unknown: "Unknown Video Title"
+  are_you_sure: "Are you sure?"
+  aspects: 
+    add_to_aspect: 
+      failure: "Failed to add friend to aspect."
+      success: "Successfully added friend to aspect."
+    create: 
+      failure: "Aspect creation failed."
+      success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
+    destroy: 
+      success: "%{name} foi removido com sucesso."
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "Aspecto não está vazio"
+      remove: remover
+    manage: 
+      add_a_new_aspect: "Adicionar um novo aspecto"
+      add_a_new_contact: "Add a new contact"
+      drag_to_add: "Drag to add people"
+      manage_aspects: "Manage aspects"
+      no_requests: "No new requests"
+      requests: Solicitações
+    move_contact: 
+      error: "Error moving contact: %{inspect}"
+      failure: "didn't work %{inspect}"
+      success: "Person moved to new aspect"
+    new_aspect: 
+      create: Criar
+      name: Name
+    no_contacts_message: 
+      add_contact: "Add a contact"
+      add_contact_to: "Add someone to %{aspect_name}"
+      invite: "Invite someone to join Diaspora!"
+      nobody: "We know you know people — bring them to Diaspora!"
+      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+    no_posts_message: 
+      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+    remove_from_aspect: 
+      failure: "Failed to remove person from aspect"
+      success: "Successfully removed person from aspect"
+    update: 
+      success: "Seu aspecto, %{name}, foi editado com sucesso."
+  back: Back
+  cancel: Cancel
+  comments: 
+    new_comment: 
+      comment: Comentário
+      commenting: Commenting...
+  dashboards: 
+    helper: 
+      home: Home
+  delete: Delete
+  email: Email
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Corrija os erros a seguir e tente novamente."
+      invalid_fields: "Campos inválidos"
+  fill_me_out: "Fill me out"
+  home: 
+    show: 
+      already_account: "already have an account?"
+      login_here: "log in here"
+      share_what_you_want: "Share what you want, with who you want."
+  invitations: 
+    check_token: 
+      not_found: "Invitation token not found"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "You already invited this person."
+      no_more: "You have no more invitations."
+      sent: "Your invitation has been sent."
+    new: 
+      if_they_accept_info: "if they accept, they will be added to the aspect you invited them"
+      invite_someone_to_join: "Invite someone to join Diaspora!"
+      message: "Message:"
+      send_an_invitation: "Send an invitation"
+      send_invitation: "Send invitation"
+      to: To
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: "account settings"
+      blog: blog
+      developers: developers
+      edit_profile: "edit profile"
+      login: login
+      logout: logout
+      view_profile: "view profile"
+  notifier: 
+    diaspora: "the diaspora email robot"
+    hello: "Hello %{name}!"
+    love: "love,"
+    new_request: 
+      just_sent_you: "just sent you a friend request on Diaspora*"
+      sign_in: "sign in here"
+      subject: "new Diaspora* friend request from %{from}"
+      try_it_out: "You should really think about checking it out."
+    request_accepted: 
+      accepted: "has accepted your friend request. They are now in your"
+      aspect: aspect.
+      subject: "%{name} has accepted your friend request on Diaspora*"
+  ok: OK
+  or: or
+  password: Password
+  password_confirmation: "Password confirmation"
+  people: 
+    edit: 
+      allow_search: "Allow for people to search for you"
+      first_name: "First name"
+      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      last_name: "Last name"
+      update_profile: "Update Profile"
+      your_bio: "Your bio"
+      your_birthday: "Your birthday"
+      your_gender: "Your gender"
+      your_name: "Your name"
+      your_photo: "Your photo"
+      your_profile: "Your profile"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: " results for %{params}"
+    index: 
+      results_for: "search results for"
+    person: 
+      add_contact: "add contact"
+      already_connected: "Already connected"
+      pending_request: "requisições pendentes"
+      thats_you: "thats you!"
+    profile_photo_upload: 
+      or_select_one: "or select one from your already existing"
+    profile_sidebar: 
+      bio: bio
+      born: born
+      edit_my_profile: "Edit my profile"
+      gender: gender
+      in_aspects: "in aspects"
+      last_seen: "last seen: %{how_long_ago}"
+      remove_contact: "remove contact"
+    show: 
+      already_requested: "You have already sent a request to %{name}."
+      does_not_exist: "Person does not exist!"
+      no_posts: "no posts to display!"
+      not_connected: "You are not connected with this person"
+      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+    update: 
+      failed: "Failed to update profile"
+      updated: "Profile updated"
+  photos: 
+    create: 
+      integrity_error: "Envio de foto falhou. Você tem certeza que é uma imagem?"
+      runtime_error: "Envio de foto falhou. Você tem tem certeza que seu sinto de segurança está preso?"
+      type_error: "Envio de foto falhou. Você tem certeza que adicionou uma imagem?"
+    destroy: 
+      notice: "Foto removida."
+    edit: 
+      editing: Editando
+    new: 
+      back_to_list: "Voltar para a Lista"
+      new_photo: "Nova Foto"
+      post_it: enviar!
+    new_photo: 
+      drop: "Drop photos here to upload"
+      empty: "{file} is empty, please select files again without it."
+      failed: Failed
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      upload: "Upload a photo"
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      add_a_description: "Add a description"
+      delete_photo: "Excluir Foto"
+      edit_photo: "Editar Foto"
+      full_size: "tamanho máximo"
+      make_profile_photo: "make profile photo"
+      next: próxima
+      prev: anterior
+      update_photo: "Update Photo"
+    update: 
+      error: "Falha ao editar foto."
+      notice: "Foto enviada com sucesso."
+  profile: Profile
+  registrations: 
+    closed: "Signups are closed on this Diaspora pod."
+    create: 
+      success: "Vocé entrou na Diaspora!"
+    edit: 
+      cancel_my_account: "Cancel my account"
+      edit: "Edit %{name}"
+      leave_blank: "(leave blank if you don't want to change it)"
+      password_to_confirm: "(we need your current password to confirm your changes)"
+      unhappy: Unhappy?
+      update: Update
+    new: 
+      sign_up: Cadastro
+      sign_up_for_diaspora: "Sign up for Diaspora"
+  requests: 
+    create: 
+      sending: Sending...
+      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      tried: "we tried our best to send a message to %{account}"
+    destroy: 
+      error: "Favor selecionar um aspecto!"
+      ignore: "Requisições de amigos ignoradas."
+      success: "Vocês agora são amigos."
+    manage_aspect_contacts: 
+      contact_username: "Contact's username"
+      create_request: "Create request"
+      enter_a_diaspora_username: "Enter a Diaspora username:"
+      existing: "Existing contacts"
+      know_email: "Know their email address? You should invite them"
+      manage_within: "Manage contacts within"
+      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+  search: Search
+  services: 
+    create: 
+      success: "Authentication successful."
+    destroy: 
+      success: "Successfully destroyed authentication."
+    index: 
+      connect_to_facebook: "Connect to facebook"
+      connect_to_twitter: "Connect to twitter"
+      disconnect: disconnect
+      logged_in_as: "logged in as"
+      really_disconnect: "disconnect %{service}?"
+  settings: Settings
+  shared: 
+    aspect_contacts: 
+      add_contacts: "add contacts"
+      add_to: "add to %{aspect}"
+      everyone: Everyone
+      manage: "manage %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "add a new aspect"
+      everyone: Everyone
+      manage: Gerenciar
+      manage_your_aspects: "Gerencie seus Aspectos"
+    author_info: 
+      all: all
+      status_messages: "status messages"
+      view_profile: "View profile"
+      viewing: viewing
+    contact_list: 
+      add_to: "Add %{name} to %{aspect}"
+      remove_from: "Remove %{name} from %{aspect}"
+      search_contacts: "Search contacts"
+    invitations: 
+      invitations_left: "(%{count} left)"
+      invite_someone: "Invite someone"
+      invites: Invites
+    notification: 
+      new: "New %{type} from %{from}"
+    public_explain: 
+      logged_in: "logged in to %{service}"
+      manage: "manage connected services"
+      outside: "Public messages will be available for others outside of Diaspora to see."
+      title: "You are about to post a public message!"
+    publisher: 
+      all: all
+      make_public: "make public"
+      post_a_message_to: "Post a message to %{aspect}"
+      posting: Posting...
+      share: Compartilhar
+      share_with: "Share with %{aspect}"
+      share_with_all: "Share with all aspects"
+    reshare: 
+      reshare: Reshare
+    stream_element: 
+      show_comments: "show comments"
+  status_messages: 
+    helper: 
+      no_message_to_display: "Nenhuma mensagem para ser mostrada."
+    new_status_message: 
+      oh_yeah: "É isso aí!"
+      tell_me_something_good: "diga-me qualquer coisa legal"
+    show: 
+      destroy: Excluir
+  the_world: "the world"
+  username: Username
+  users: 
+    destroy: "Account successfully closed."
+    edit: 
+      change_language: "Change Language"
+      change_password: "Change Password"
+      close_account: "Close Account"
+      download_photos: "download my photos"
+      download_xml: "download my xml"
+      export_data: "Export Data"
+      invite_contacts: "Invite contacts"
+      new_password: "New Password"
+    getting_started: 
+      connect_services: "Connect your services"
+      define_aspects: "Define your aspects"
+      edit_profile: "Edit your profile"
+      save_and_continue: "Save and continue"
+      signup_steps: "Complete your sign-up by doing these things:"
+      skip: "skip getting started"
+      step_1: 
+        your_profile: "Your Profile"
+      step_2: 
+        add: Add
+        aspect_name: "Aspect name"
+        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+        your_aspects: "Your aspects"
+      step_3: 
+        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
+        your_services: "Your services"
+      step_4: 
+        change_profile: "You can change your profile any time by clicking"
+        connect_disconnect: "You can connect/disconnect your services any time by clicking"
+        continue: "Continue on to your everyone page, an overview of all of your aspects."
+        finish: Finish
+        manage_aspects: "You can manage your aspects any time by clicking the"
+        ready_to_share: "You're now ready to start sharing with "
+        set_up: "You're all set up, %{name}!"
+        tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+        user_menu: "in your user menu (top right)."
+      welcome: "Welcome to Diaspora!"
+    public: 
+      does_not_exist: "User %{username} does not exist!"
+    update: 
+      language_changed: "Language Changed"
+      language_not_changed: "Language Change Failed"
+      password_changed: "Password Changed"
+      password_not_changed: "Password Change Failed"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 95c56ca50..b0d1d474f 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -2,8 +2,354 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-# Sample localization file for Portuguese Portugal. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
-pt-PT:
-  hello: "Olá mundo"
+pt-PT: 
+  _photos: photos
+  _services: Services
+  account: Account
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "is already taken"
+        user: 
+          attributes: 
+            email: 
+              taken: "is already taken"
+            person: 
+              invalid: "is invalid"
+            username: 
+              taken: "is already taken"
+  ago: ago
+  application: 
+    helper: 
+      unknown_person: "unknown person"
+      youtube_title: 
+        unknown: "Unknown Video Title"
+  are_you_sure: "Are you sure?"
+  aspects: 
+    add_to_aspect: 
+      failure: "Failed to add friend to aspect."
+      success: "Successfully added friend to aspect."
+    create: 
+      failure: "Aspect creation failed."
+      success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
+    destroy: 
+      success: "%{name} was successfully removed."
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "Aspect not empty"
+      remove: remove
+    manage: 
+      add_a_new_aspect: "Add a new aspect"
+      add_a_new_contact: "Add a new contact"
+      drag_to_add: "Drag to add people"
+      manage_aspects: "Manage aspects"
+      no_requests: "No new requests"
+      requests: Requests
+    move_contact: 
+      error: "Error moving contact: %{inspect}"
+      failure: "didn't work %{inspect}"
+      success: "Person moved to new aspect"
+    new_aspect: 
+      create: Create
+      name: Name
+    no_contacts_message: 
+      add_contact: "Add a contact"
+      add_contact_to: "Add someone to %{aspect_name}"
+      invite: "Invite someone to join Diaspora!"
+      nobody: "We know you know people — bring them to Diaspora!"
+      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+    no_posts_message: 
+      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+    remove_from_aspect: 
+      failure: "Failed to remove person from aspect"
+      success: "Successfully removed person from aspect"
+    update: 
+      success: "Your aspect, %{name}, has been successfully edited."
+  back: Back
+  cancel: Cancel
+  comments: 
+    new_comment: 
+      comment: Comment
+      commenting: Commenting...
+  dashboards: 
+    helper: 
+      home: Home
+  delete: Delete
+  email: Email
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Correct the following errors and try again."
+      invalid_fields: "Invalid Fields"
+  fill_me_out: "Fill me out"
+  home: 
+    show: 
+      already_account: "already have an account?"
+      login_here: "log in here"
+      share_what_you_want: "Share what you want, with who you want."
+  invitations: 
+    check_token: 
+      not_found: "Invitation token not found"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "You already invited this person."
+      no_more: "You have no more invitations."
+      sent: "Your invitation has been sent."
+    new: 
+      if_they_accept_info: "if they accept, they will be added to the aspect you invited them"
+      invite_someone_to_join: "Invite someone to join Diaspora!"
+      message: "Message:"
+      send_an_invitation: "Send an invitation"
+      send_invitation: "Send invitation"
+      to: To
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: "account settings"
+      blog: blog
+      developers: developers
+      edit_profile: "edit profile"
+      login: login
+      logout: logout
+      view_profile: "view profile"
+  notifier: 
+    diaspora: "the diaspora email robot"
+    hello: "Hello %{name}!"
+    love: "love,"
+    new_request: 
+      just_sent_you: "just sent you a friend request on Diaspora*"
+      sign_in: "sign in here"
+      subject: "new Diaspora* friend request from %{from}"
+      try_it_out: "You should really think about checking it out."
+    request_accepted: 
+      accepted: "has accepted your friend request. They are now in your"
+      aspect: aspect.
+      subject: "%{name} has accepted your friend request on Diaspora*"
+  ok: OK
+  or: or
+  password: Password
+  password_confirmation: "Password confirmation"
+  people: 
+    edit: 
+      allow_search: "Allow for people to search for you"
+      first_name: "First name"
+      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      last_name: "Last name"
+      update_profile: "Update Profile"
+      your_bio: "Your bio"
+      your_birthday: "Your birthday"
+      your_gender: "Your gender"
+      your_name: "Your name"
+      your_photo: "Your photo"
+      your_profile: "Your profile"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: " results for %{params}"
+    index: 
+      results_for: "search results for"
+    person: 
+      add_contact: "add contact"
+      already_connected: "Already connected"
+      pending_request: "pending request"
+      thats_you: "thats you!"
+    profile_photo_upload: 
+      or_select_one: "or select one from your already existing"
+    profile_sidebar: 
+      bio: bio
+      born: born
+      edit_my_profile: "Edit my profile"
+      gender: gender
+      in_aspects: "in aspects"
+      last_seen: "last seen: %{how_long_ago}"
+      remove_contact: "remove contact"
+    show: 
+      already_requested: "You have already sent a request to %{name}."
+      does_not_exist: "Person does not exist!"
+      no_posts: "no posts to display!"
+      not_connected: "You are not connected with this person"
+      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+    update: 
+      failed: "Failed to update profile"
+      updated: "Profile updated"
+  photos: 
+    create: 
+      integrity_error: "Photo upload failed.  Are you sure that was an image?"
+      runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
+      type_error: "Photo upload failed.  Are you sure an image was added?"
+    destroy: 
+      notice: "Photo deleted."
+    edit: 
+      editing: Editing
+    new: 
+      back_to_list: "Back to List"
+      new_photo: "New Photo"
+      post_it: "post it!"
+    new_photo: 
+      drop: "Drop photos here to upload"
+      empty: "{file} is empty, please select files again without it."
+      failed: Failed
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      upload: "Upload a photo"
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      add_a_description: "Add a description"
+      delete_photo: "Delete Photo"
+      edit_photo: "Edit Photo"
+      full_size: "full size"
+      make_profile_photo: "make profile photo"
+      next: next
+      prev: prev
+      update_photo: "Update Photo"
+    update: 
+      error: "Failed to edit photo."
+      notice: "Photo successfully updated."
+  profile: Profile
+  registrations: 
+    closed: "Signups are closed on this Diaspora pod."
+    create: 
+      success: "You've joined Diaspora!"
+    edit: 
+      cancel_my_account: "Cancel my account"
+      edit: "Edit %{name}"
+      leave_blank: "(leave blank if you don't want to change it)"
+      password_to_confirm: "(we need your current password to confirm your changes)"
+      unhappy: Unhappy?
+      update: Update
+    new: 
+      sign_up: "Sign up"
+      sign_up_for_diaspora: "Sign up for Diaspora"
+  requests: 
+    create: 
+      sending: Sending...
+      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      tried: "we tried our best to send a message to %{account}"
+    destroy: 
+      error: "Please select an aspect!"
+      ignore: "Ignored friend request."
+      success: "You are now friends."
+    manage_aspect_contacts: 
+      contact_username: "Contact's username"
+      create_request: "Create request"
+      enter_a_diaspora_username: "Enter a Diaspora username:"
+      existing: "Existing contacts"
+      know_email: "Know their email address? You should invite them"
+      manage_within: "Manage contacts within"
+      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+  search: Search
+  services: 
+    create: 
+      success: "Authentication successful."
+    destroy: 
+      success: "Successfully destroyed authentication."
+    index: 
+      connect_to_facebook: "Connect to facebook"
+      connect_to_twitter: "Connect to twitter"
+      disconnect: disconnect
+      logged_in_as: "logged in as"
+      really_disconnect: "disconnect %{service}?"
+  settings: Settings
+  shared: 
+    aspect_contacts: 
+      add_contacts: "add contacts"
+      add_to: "add to %{aspect}"
+      everyone: Everyone
+      manage: "manage %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "add a new aspect"
+      everyone: Everyone
+      manage: Manage
+      manage_your_aspects: "Manage your Aspects"
+    author_info: 
+      all: all
+      status_messages: "status messages"
+      view_profile: "View profile"
+      viewing: viewing
+    contact_list: 
+      add_to: "Add %{name} to %{aspect}"
+      remove_from: "Remove %{name} from %{aspect}"
+      search_contacts: "Search contacts"
+    invitations: 
+      invitations_left: "(%{count} left)"
+      invite_someone: "Invite someone"
+      invites: Invites
+    notification: 
+      new: "New %{type} from %{from}"
+    public_explain: 
+      logged_in: "logged in to %{service}"
+      manage: "manage connected services"
+      outside: "Public messages will be available for others outside of Diaspora to see."
+      title: "You are about to post a public message!"
+    publisher: 
+      all: all
+      make_public: "make public"
+      post_a_message_to: "Post a message to %{aspect}"
+      posting: Posting...
+      share: Share
+      share_with: "Share with %{aspect}"
+      share_with_all: "Share with all aspects"
+    reshare: 
+      reshare: Reshare
+    stream_element: 
+      show_comments: "show comments"
+  status_messages: 
+    helper: 
+      no_message_to_display: "No message to display."
+    new_status_message: 
+      oh_yeah: "oh yeah!"
+      tell_me_something_good: "tell me something good"
+    show: 
+      destroy: Destroy
+  the_world: "the world"
+  username: Username
+  users: 
+    destroy: "Account successfully closed."
+    edit: 
+      change_language: "Change Language"
+      change_password: "Change Password"
+      close_account: "Close Account"
+      download_photos: "download my photos"
+      download_xml: "download my xml"
+      export_data: "Export Data"
+      invite_contacts: "Invite contacts"
+      new_password: "New Password"
+    getting_started: 
+      connect_services: "Connect your services"
+      define_aspects: "Define your aspects"
+      edit_profile: "Edit your profile"
+      save_and_continue: "Save and continue"
+      signup_steps: "Complete your sign-up by doing these things:"
+      skip: "skip getting started"
+      step_1: 
+        your_profile: "Your Profile"
+      step_2: 
+        add: Add
+        aspect_name: "Aspect name"
+        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+        your_aspects: "Your aspects"
+      step_3: 
+        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
+        your_services: "Your services"
+      step_4: 
+        change_profile: "You can change your profile any time by clicking"
+        connect_disconnect: "You can connect/disconnect your services any time by clicking"
+        continue: "Continue on to your everyone page, an overview of all of your aspects."
+        finish: Finish
+        manage_aspects: "You can manage your aspects any time by clicking the"
+        ready_to_share: "You're now ready to start sharing with "
+        set_up: "You're all set up, %{name}!"
+        tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+        user_menu: "in your user menu (top right)."
+      welcome: "Welcome to Diaspora!"
+    public: 
+      does_not_exist: "User %{username} does not exist!"
+    update: 
+      language_changed: "Language Changed"
+      language_not_changed: "Language Change Failed"
+      password_changed: "Password Changed"
+      password_not_changed: "Password Change Failed"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 355f6c788..62268bcbc 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -2,140 +2,354 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-ro:
-  hello: "Bună, lume!"
-  layouts:
-      application:
-          edit_profile: "editare profil"
-          logout: "deconectare"
-  shared:
-      aspect_nav:
-          all_aspects: "Toate Aspectele"
-          manage: "Administrare"
-          manage_your_aspects: "Administrare Aspecte"
-      sub_header:
-          all_aspects: "Toate Aspectele"
-          manage_aspects: "Administrare Aspecte"
-      publisher:
-          share: "Distribuie"
-      aspect_friends:
-          add_friends: "adăugare prieteni"
-  albums:
-      album:
-          you: "tu"
-      new_album:
-          create: "crează"
-          add_a_new_album: "Album nou"
-      show:
-          edit_album: "Editare Album"
-          albums: "albume"
-          updated: "actualizat"
-          by: "de"
-      edit:
-          editing: "Editare"
-          updated: "actualizat"
-          are_you_sure: "Sunteți sigur(ă)?"
-          delete_album: "Șterge Album"
-          cancel: "Renuță"
-      index:
-          home: "acasă"
-          new_album: "Album Nou"
-      create:
-          success: "Ați creat un album numit %{name}."
-      update:
-          success: "Albumul %{name} a fost modificat cu succes."
-          failure: "Eroare la editarea albumului %{name}."
-      destroy:
-          success: "Albumul %{name} a fost șters."
-  aspects:
-      index:
-          photos: "poze"
-      show:
-          photos: "poze"
-      manage:
-          add_a_new_aspect: "Adaugă aspect"
-          add_a_new_friend:  "Adadugă prieten"
-          show: "Arată"
-          update_aspects: "Actualizează Aspecte"
-          requests: "Cereri"
-          ignore_remove: "Ignoră/Șterge"
-      new_aspect:
-          add_a_new_aspect: "Adaugă aspect"
-          create: "Crează"
-      create:
-          success:"Click pe semnul plus în partea stângă pentru a indica cine poate accesa noul aspect."
-  users:
-      edit:
-          editing_profile: "Editare profil"
-      profile:
-          cancel: "Renunță"
-          update_profile: "Actualizează Profil"
-          home: "Home"
-          diaspora_username: "DIASPORA USERNAME"
-          info: "Info"
-          picture: "Poză"
-          editing_profile: "Editare profil"
-          albums: "Albume"
-          you_dont_have_any_photos: "Nu ai nici o fotografie! Mergi la"
-          page_to_upload_some:  "pentru a încărca câteva."
-  comments:
-      comment:
-          ago: "în urmă"
-      new_comment:
-          comment: "Comentariu"
-  photos:
-      show:
-          prev: "precedent"
-          full_size: "mărime deplină"
-          next: "următor"
-          edit_photo: "Modifică Poză"
-          delete_photo: "Șterge Poză"
-          are_you_sure: "Sunteți sigur(ă)?"
-          comments: "comments"
-      edit:
-          editing: "Modificare"
-          are_you_sure: "Sunteți sigur(ă)?"
-          delete_photo: "Șterge poză"
-      photo:
-          show_comments: "arată comentarii"
-          posted_a_new_photo_to: "a postat o nouă poză în"
-      new:
-          new_photo: "Poză nouă"
-          back_to_list: "Înapoi la Listă"
-          post_it: "postează!"
-  registrations:
-      new:
-          sign_up: "Înregistrare"
-  status_messages:
-      new_status_message:
-          tell_me_something_good: "spune-mi ceva bun"
-          oh_yeah: "o, da!"
-      status_message:
-          show_comments: "arată comentarii"
-          delete: "Șterge"
-          are_you_sure: "Sunteți sigur(ă)?"
-      show:
-          status_message: "Mesaj Stare"
-          comments: "comentarii"
-          are_you_sure: "Sunteți sigur(ă)?"
-          destroy: "Distruge"
-          view_all: "Vezi Toate"
-          message: "Mesaj"
-          owner: "Proprietar"
-  people:
-      index:
-          add_friend: "adaugă prieten"
-          real_name: "nume real"
-          diaspora_handle: "diaspora id"
-          thats_you: "acesta ești tu!"
-          friend_request_pending: "cerere de prietenie nerezolvată"
-          you_have_a_friend_request_from_this_person: "aveți o cerere de prietenie din partea acestei persoane"
-      new:
-          new_person: "Persoană Nouă"
-          back_to_list: "Înapoi la Listă"
-      show:
-          last_seen: "văzut: %{how_long_ago}"
-          friends_since: "prieteni: %{how_long_ago}"
-          save: "salvează"
-          are_you_sure: "Sunteți sigur(ă)?"
-          remove_friend: "șterge prieten"
+
+ro: 
+  _photos: photos
+  _services: Services
+  account: Account
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "is already taken"
+        user: 
+          attributes: 
+            email: 
+              taken: "is already taken"
+            person: 
+              invalid: "is invalid"
+            username: 
+              taken: "is already taken"
+  ago: ago
+  application: 
+    helper: 
+      unknown_person: "unknown person"
+      youtube_title: 
+        unknown: "Unknown Video Title"
+  are_you_sure: "Are you sure?"
+  aspects: 
+    add_to_aspect: 
+      failure: "Failed to add friend to aspect."
+      success: "Successfully added friend to aspect."
+    create: 
+      failure: "Aspect creation failed."
+      success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
+    destroy: 
+      success: "%{name} was successfully removed."
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "Aspect not empty"
+      remove: remove
+    manage: 
+      add_a_new_aspect: "Adaugă aspect"
+      add_a_new_contact: "Add a new contact"
+      drag_to_add: "Drag to add people"
+      manage_aspects: "Manage aspects"
+      no_requests: "No new requests"
+      requests: Cereri
+    move_contact: 
+      error: "Error moving contact: %{inspect}"
+      failure: "didn't work %{inspect}"
+      success: "Person moved to new aspect"
+    new_aspect: 
+      create: Crează
+      name: Name
+    no_contacts_message: 
+      add_contact: "Add a contact"
+      add_contact_to: "Add someone to %{aspect_name}"
+      invite: "Invite someone to join Diaspora!"
+      nobody: "We know you know people — bring them to Diaspora!"
+      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+    no_posts_message: 
+      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+    remove_from_aspect: 
+      failure: "Failed to remove person from aspect"
+      success: "Successfully removed person from aspect"
+    update: 
+      success: "Your aspect, %{name}, has been successfully edited."
+  back: Back
+  cancel: Cancel
+  comments: 
+    new_comment: 
+      comment: Comentariu
+      commenting: Commenting...
+  dashboards: 
+    helper: 
+      home: Home
+  delete: Delete
+  email: Email
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Correct the following errors and try again."
+      invalid_fields: "Invalid Fields"
+  fill_me_out: "Fill me out"
+  home: 
+    show: 
+      already_account: "already have an account?"
+      login_here: "log in here"
+      share_what_you_want: "Share what you want, with who you want."
+  invitations: 
+    check_token: 
+      not_found: "Invitation token not found"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "You already invited this person."
+      no_more: "You have no more invitations."
+      sent: "Your invitation has been sent."
+    new: 
+      if_they_accept_info: "if they accept, they will be added to the aspect you invited them"
+      invite_someone_to_join: "Invite someone to join Diaspora!"
+      message: "Message:"
+      send_an_invitation: "Send an invitation"
+      send_invitation: "Send invitation"
+      to: To
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: "account settings"
+      blog: blog
+      developers: developers
+      edit_profile: "edit profile"
+      login: login
+      logout: logout
+      view_profile: "view profile"
+  notifier: 
+    diaspora: "the diaspora email robot"
+    hello: "Hello %{name}!"
+    love: "love,"
+    new_request: 
+      just_sent_you: "just sent you a friend request on Diaspora*"
+      sign_in: "sign in here"
+      subject: "new Diaspora* friend request from %{from}"
+      try_it_out: "You should really think about checking it out."
+    request_accepted: 
+      accepted: "has accepted your friend request. They are now in your"
+      aspect: aspect.
+      subject: "%{name} has accepted your friend request on Diaspora*"
+  ok: OK
+  or: or
+  password: Password
+  password_confirmation: "Password confirmation"
+  people: 
+    edit: 
+      allow_search: "Allow for people to search for you"
+      first_name: "First name"
+      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      last_name: "Last name"
+      update_profile: "Update Profile"
+      your_bio: "Your bio"
+      your_birthday: "Your birthday"
+      your_gender: "Your gender"
+      your_name: "Your name"
+      your_photo: "Your photo"
+      your_profile: "Your profile"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: " results for %{params}"
+    index: 
+      results_for: "search results for"
+    person: 
+      add_contact: "add contact"
+      already_connected: "Already connected"
+      pending_request: "pending request"
+      thats_you: "thats you!"
+    profile_photo_upload: 
+      or_select_one: "or select one from your already existing"
+    profile_sidebar: 
+      bio: bio
+      born: born
+      edit_my_profile: "Edit my profile"
+      gender: gender
+      in_aspects: "in aspects"
+      last_seen: "last seen: %{how_long_ago}"
+      remove_contact: "remove contact"
+    show: 
+      already_requested: "You have already sent a request to %{name}."
+      does_not_exist: "Person does not exist!"
+      no_posts: "no posts to display!"
+      not_connected: "You are not connected with this person"
+      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+    update: 
+      failed: "Failed to update profile"
+      updated: "Profile updated"
+  photos: 
+    create: 
+      integrity_error: "Photo upload failed.  Are you sure that was an image?"
+      runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
+      type_error: "Photo upload failed.  Are you sure an image was added?"
+    destroy: 
+      notice: "Photo deleted."
+    edit: 
+      editing: Modificare
+    new: 
+      back_to_list: "Înapoi la Listă"
+      new_photo: "Poză nouă"
+      post_it: postează!
+    new_photo: 
+      drop: "Drop photos here to upload"
+      empty: "{file} is empty, please select files again without it."
+      failed: Failed
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      upload: "Upload a photo"
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      add_a_description: "Add a description"
+      delete_photo: "Șterge Poză"
+      edit_photo: "Modifică Poză"
+      full_size: "mărime deplină"
+      make_profile_photo: "make profile photo"
+      next: următor
+      prev: precedent
+      update_photo: "Update Photo"
+    update: 
+      error: "Failed to edit photo."
+      notice: "Photo successfully updated."
+  profile: Profile
+  registrations: 
+    closed: "Signups are closed on this Diaspora pod."
+    create: 
+      success: "You've joined Diaspora!"
+    edit: 
+      cancel_my_account: "Cancel my account"
+      edit: "Edit %{name}"
+      leave_blank: "(leave blank if you don't want to change it)"
+      password_to_confirm: "(we need your current password to confirm your changes)"
+      unhappy: Unhappy?
+      update: Update
+    new: 
+      sign_up: Înregistrare
+      sign_up_for_diaspora: "Sign up for Diaspora"
+  requests: 
+    create: 
+      sending: Sending...
+      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      tried: "we tried our best to send a message to %{account}"
+    destroy: 
+      error: "Please select an aspect!"
+      ignore: "Ignored friend request."
+      success: "You are now friends."
+    manage_aspect_contacts: 
+      contact_username: "Contact's username"
+      create_request: "Create request"
+      enter_a_diaspora_username: "Enter a Diaspora username:"
+      existing: "Existing contacts"
+      know_email: "Know their email address? You should invite them"
+      manage_within: "Manage contacts within"
+      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+  search: Search
+  services: 
+    create: 
+      success: "Authentication successful."
+    destroy: 
+      success: "Successfully destroyed authentication."
+    index: 
+      connect_to_facebook: "Connect to facebook"
+      connect_to_twitter: "Connect to twitter"
+      disconnect: disconnect
+      logged_in_as: "logged in as"
+      really_disconnect: "disconnect %{service}?"
+  settings: Settings
+  shared: 
+    aspect_contacts: 
+      add_contacts: "add contacts"
+      add_to: "add to %{aspect}"
+      everyone: Everyone
+      manage: "manage %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "add a new aspect"
+      everyone: Everyone
+      manage: Administrare
+      manage_your_aspects: "Administrare Aspecte"
+    author_info: 
+      all: all
+      status_messages: "status messages"
+      view_profile: "View profile"
+      viewing: viewing
+    contact_list: 
+      add_to: "Add %{name} to %{aspect}"
+      remove_from: "Remove %{name} from %{aspect}"
+      search_contacts: "Search contacts"
+    invitations: 
+      invitations_left: "(%{count} left)"
+      invite_someone: "Invite someone"
+      invites: Invites
+    notification: 
+      new: "New %{type} from %{from}"
+    public_explain: 
+      logged_in: "logged in to %{service}"
+      manage: "manage connected services"
+      outside: "Public messages will be available for others outside of Diaspora to see."
+      title: "You are about to post a public message!"
+    publisher: 
+      all: all
+      make_public: "make public"
+      post_a_message_to: "Post a message to %{aspect}"
+      posting: Posting...
+      share: Distribuie
+      share_with: "Share with %{aspect}"
+      share_with_all: "Share with all aspects"
+    reshare: 
+      reshare: Reshare
+    stream_element: 
+      show_comments: "show comments"
+  status_messages: 
+    helper: 
+      no_message_to_display: "No message to display."
+    new_status_message: 
+      oh_yeah: "o, da!"
+      tell_me_something_good: "spune-mi ceva bun"
+    show: 
+      destroy: Distruge
+  the_world: "the world"
+  username: Username
+  users: 
+    destroy: "Account successfully closed."
+    edit: 
+      change_language: "Change Language"
+      change_password: "Change Password"
+      close_account: "Close Account"
+      download_photos: "download my photos"
+      download_xml: "download my xml"
+      export_data: "Export Data"
+      invite_contacts: "Invite contacts"
+      new_password: "New Password"
+    getting_started: 
+      connect_services: "Connect your services"
+      define_aspects: "Define your aspects"
+      edit_profile: "Edit your profile"
+      save_and_continue: "Save and continue"
+      signup_steps: "Complete your sign-up by doing these things:"
+      skip: "skip getting started"
+      step_1: 
+        your_profile: "Your Profile"
+      step_2: 
+        add: Add
+        aspect_name: "Aspect name"
+        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+        your_aspects: "Your aspects"
+      step_3: 
+        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
+        your_services: "Your services"
+      step_4: 
+        change_profile: "You can change your profile any time by clicking"
+        connect_disconnect: "You can connect/disconnect your services any time by clicking"
+        continue: "Continue on to your everyone page, an overview of all of your aspects."
+        finish: Finish
+        manage_aspects: "You can manage your aspects any time by clicking the"
+        ready_to_share: "You're now ready to start sharing with "
+        set_up: "You're all set up, %{name}!"
+        tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+        user_menu: "in your user menu (top right)."
+      welcome: "Welcome to Diaspora!"
+    public: 
+      does_not_exist: "User %{username} does not exist!"
+    update: 
+      language_changed: "Language Changed"
+      language_not_changed: "Language Change Failed"
+      password_changed: "Password Changed"
+      password_not_changed: "Password Change Failed"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index dd94acf08..927704644 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -2,162 +2,354 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-# Sample localization file for Russian. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
-ru:
-  hello: "Привет, мир"
-  layouts:
-      application:
-          edit_profile: "редактировать профиль"
-          logout: "выйти"
-  shared:
-      aspect_nav:
-          all_aspects: "Все аспекты"
-          manage: "Управление"
-          manage_your_aspects: "Управление вашими аспектами"
-      sub_header:
-          all_aspects: "Все аспекты"
-          manage_aspects: "Управление аспектами"
-      publisher:
-          share: "Опубликовать"
-      aspect_friends:
-          add_friends: "добавить друзей"
-  albums:
-      album:
-          you: "Вы"
-      new_album:
-          create: "создать"
-          add_a_new_album: "Добавить новый альбом"
-      show:
-          edit_album: "Редактировать альбом"
-          albums: "альбомы"
-          updated: "обновленные"
-          by: "по"
-      edit:
-          editing: "Редактирование"
-          updated: "обновлено"
-          are_you_sure: "Вы уверены?"
-          delete_album: "Удалить альбом"
-          cancel: "Отмена"
-      index:
-          home: "домой"
-          new_album: "Новый альбом"
-      create:
-          success: "Вы создали новый альбом %{name}."
-      update:
-          success: "Альбом %{name} успешно редактирован."
-          failure: "Невозможно редактировать альбом %{name}."
-      destroy:
-          success: "Альбом %{name} удален."
-  aspects:
-      index:
-          photos: "фотографии"
-      show:
-          photos: "фотографии"
-      manage:
-          add_a_new_aspect: "Добавить аспект"
-          add_a_new_friend:  "Добавить друга"
-          show: "Показать"
-          update_aspects: "Обновить аспекты"
-          requests: "Запросы"
-          ignore_remove: "Игнорировать/Удалить"
-      new_aspect:
-          add_a_new_aspect: "Добавить аспект"
-          create: "Создать"
-      create:
-          success:"Нажмите на плюс слева, для того, что-бы указать Diaspora тех, кто может видеть ваш новый аспект
-      helper:
-        remove: "Удалить"
-        aspect_not_empty: "Аспект не пуст"
-  users:
-      edit:
-          editing_profile: "Редактирование профиля"
-      profile:
-          cancel: "Отмена"
-          update_profile: "Обновить профиль"
-          home: "Домой"
-          diaspora_username: "Имя пользователя DIASPORA"
-          info: "Информация"
-          picture: "Аватар"
-          editing_profile: "Редактирование профиля"
-          albums: "Альбомы"
-          you_dont_have_any_photos: "У вас нет ни одной фотографии! Перейдите в"
-          page_to_upload_some:  "для загрузки."
-          or: "или"
-  comments:
-      comment:
-          ago: "ранее"
-      new_comment:
-          comment: "Комментарий"
-  photos:
-      show:
-          prev: "предыдущая"
-          full_size: "полный размер"
-          next: "следующая"
-          edit_photo: "Редактировать"
-          delete_photo: "Удалить"
-          are_you_sure: "Вы уверены?"
-          comments: "комментарии"
-      edit:
-          editing: "Редактирование"
-          are_you_sure: "Вы уверены?"
-          delete_photo: "Удалить фотографию"
-      photo:
-          show_comments: "показать комментарии"
-          posted_a_new_photo_to: "опубликовано в"
-      new:
-          new_photo: "Новая фотография"
-          back_to_list: "Вернуться к списку"
-          post_it: "опубликовать!"
-  registrations:
-      new:
-          sign_up: "Выйти"
-  status_messages:
-      new_status_message:
-          tell_me_something_good: "скажи мне что-нибудь хорошее"
-          oh_yeah: "о да!"
-      status_message:
-          show_comments: "показать комментарии"
-          delete: "Удалить"
-          are_you_sure: "Вы уверены?"
-      show:
-          status_message: "Сообщение о статусе"
-          comments: "комментарии"
-          are_you_sure: "Вы уверены?"
-          destroy: "Уничтожить"
-          view_all: "Показать все"
-          message: "Сообщение"
-          owner: "Владелец"
-  people:
-      index:
-          add_friend: "добавить друга"
-          real_name: "настоящее имя"
-          diaspora_handle: "идентификатор diaspora"
-          thats_you: "это Вы!"
-          friend_request_pending: "запрос на дружбу в ожидании"
-          you_have_a_friend_request_from_this_person: "у вас есть запрос на дружбу от этого человека"
-      new:
-          new_person: "Новая персона"
-          back_to_list: "Обратно к списку"
-      show:
-          last_seen: "последний раз был %{how_long_ago}"
-          friends_since: "друзья с %{how_long_ago}"
-          save: "сохранить"
-          are_you_sure: "Вы уверены?"
-          remove_friend: "удалить друга"
-  requests:
-      new_request:
-          add_a_new_friend_to: "добавить нового друга к"
-          enter_a_diaspora_username: "Введите имя пользователя Diaspora:"
-          your_diaspora_username_is: "Ваше имя пользователя Diaspora: %{diaspora_handle}"
-          friends_username: "Имя пользователя друга"
-      destroy:
-          success: "Теперь вы друзья."
-          error: "Выберите аспект!"
-          ignore: "Игнорированные запросы дружбы."
-      create:
-          error: "Для этого адреса не найдено семя Diaspora!"
-          already_friends: "Вы уже друзья с %{destination_url}!"
-          success: "Запрос на дружбу выслан к %{destination_url}."
-          horribly_wrong: "Что-то пошло совсем не так."
+ru: 
+  _photos: Фото
+  _services: Сервисы
+  account: "Учётная запись"
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "уже присутствет"
+        user: 
+          attributes: 
+            email: 
+              taken: "уже присутствует в базе"
+            person: 
+              invalid: "не правильный"
+            username: 
+              taken: "уже присутствует в базе"
+  ago: назад
+  application: 
+    helper: 
+      unknown_person: "неизвестная персона"
+      youtube_title: 
+        unknown: "Неизвестный видео заголовок"
+  are_you_sure: "Вы уверены?"
+  aspects: 
+    add_to_aspect: 
+      failure: "Добавить друга в аспект не удалось."
+      success: "Друг добавлен в аспект ."
+    create: 
+      failure: "Создать аспект не удалось."
+      success: "Нажмите на плюсик с левой стороны, для выбора тех, кто сможет видеть ваш аспект"
+    destroy: 
+      success: "%{name} удалён."
+    helper: 
+      are_you_sure: "Вы уверены, что хотите удалить аспект?"
+      aspect_not_empty: "Аспект не пуст"
+      remove: удалить
+    manage: 
+      add_a_new_aspect: Создать
+      add_a_new_contact: "Добавить новый контакт"
+      drag_to_add: "Потяните для добавления в аспект"
+      manage_aspects: "Управление аспектами"
+      no_requests: "Новых запросов нет"
+      requests: Запросы
+    move_contact: 
+      error: "Ошибка перемещения контакта: %{inspect}"
+      failure: "не работает %{inspect}"
+      success: "Друг перемещён в новый аспект"
+    new_aspect: 
+      create: Создать
+      name: Имя
+    no_contacts_message: 
+      add_contact: "Добавить новый контакт"
+      add_contact_to: "Добавить кого нибудь в %{aspect_name}"
+      invite: "Пригласить кого-нибудь присоединится к Диаспоре!"
+      nobody: "Мы знаем, что у вас есть друзья — приглашайте их присоеденяться к Диаспоре !"
+      nobody_in_aspect: "Ваш аспект '%{aspect_name}' пуст."
+    no_posts_message: 
+      start_talking: "Здесь ещё никто ничего не сказал.  Начать разговор !"
+    remove_from_aspect: 
+      failure: "Не удалось удалить персоны с аспекта"
+      success: "Персона удалена с аспекта"
+    update: 
+      success: "Аспект, %{name}, отредактирован."
+  back: Назад
+  cancel: Отмена
+  comments: 
+    new_comment: 
+      comment: Комментарий
+      commenting: Commenting...
+  dashboards: 
+    helper: 
+      home: Домой
+  delete: Удаление
+  email: Email
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Исправьте ошибки и попробуйте вновь."
+      invalid_fields: "неверная запись"
+  fill_me_out: Заполнить
+  home: 
+    show: 
+      already_account: "already have an account?"
+      login_here: "log in here"
+      share_what_you_want: "Share what you want, with who you want."
+  invitations: 
+    check_token: 
+      not_found: "Код приглашения не найден"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "Вы уже пригласили этого человека."
+      no_more: "У вас закончились приглашения."
+      sent: "Ваше приглашение отправлено."
+    new: 
+      if_they_accept_info: "После согласия, они будут добавлены в аспект"
+      invite_someone_to_join: "Пригласить в диаспору!"
+      message: "Сообщение:"
+      send_an_invitation: "Отправить приглашение"
+      send_invitation: "Отправить приглашение"
+      to: Для
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: "Настройки аккаунта"
+      blog: blog
+      developers: developers
+      edit_profile: "Редактировать профиль"
+      login: login
+      logout: выйти
+      view_profile: "Просмотр профиля"
+  notifier: 
+    diaspora: "почтовый робот Диаспоры"
+    hello: "Привет %{name}!"
+    love: "Любовь,"
+    new_request: 
+      just_sent_you: "отправил вам запрос для Диаспоры"
+      sign_in: "Войдите в систему здесь"
+      subject: "Новый запрос Диаспоры от %{from}"
+      try_it_out: "Вы должны подумать о его проверке.\n"
+    request_accepted: 
+      accepted: "принял(а) ваш запрос. Сейчас он(а) находятся в вашем\n"
+      aspect: аспект.
+      subject: "%{name} принял(а) ваш запрос для присоединения к Диаспоре*"
+  ok: Ок
+  or: или
+  password: Пароль
+  password_confirmation: "Подтверждение пароля"
+  people: 
+    edit: 
+      allow_search: "Разрешить отображать вас в поиске"
+      first_name: Имя
+      info_available_to: "Эта информация будет доступна для всех ."
+      last_name: Фамилия
+      update_profile: "Обновить профиль"
+      your_bio: "О себе"
+      your_birthday: "День рождения"
+      your_gender: "Ваш пол"
+      your_name: "Ваше Имя"
+      your_photo: Фото
+      your_profile: "Ваш профиль"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: "результаты для %{params}"
+    index: 
+      results_for: "результат поиска для"
+    person: 
+      add_contact: "добавить контакт"
+      already_connected: "Уже подключен"
+      pending_request: "Ожидатется подтверждение"
+      thats_you: "Это вы!"
+    profile_photo_upload: 
+      or_select_one: "или выберите из уже существующих"
+    profile_sidebar: 
+      bio: "О себе"
+      born: "день рождения"
+      edit_my_profile: "Редиктировать профиль"
+      gender: пол
+      in_aspects: "in aspects"
+      last_seen: "Последний раз видели: %{how_long_ago}"
+      remove_contact: "удалить контакт"
+    show: 
+      already_requested: "Вы уже отправили запрос для %{name}."
+      does_not_exist: "Персоны не существует !"
+      no_posts: "Новых сообщений нет!"
+      not_connected: "Вы не связаны с этим человеком"
+      request_people: "Если хотите, вы можете спросить разрешения его/ее добавить в аспект"
+    update: 
+      failed: "Обновить профиль не удалось"
+      updated: "Профиль обновлён"
+  photos: 
+    create: 
+      integrity_error: "Загрузить фотографию не удалось. Вы уверены что выбрали изображение?"
+      runtime_error: "Загрузить фотографию не удалось."
+      type_error: "Загрузить фотографию не удалось. Вы уверены что добавили изображение?"
+    destroy: 
+      notice: "Фотография удалена."
+    edit: 
+      editing: Редактирование
+    new: 
+      back_to_list: "Вернуться к списку"
+      new_photo: "Новая фотография"
+      post_it: Опубликовать!
+    new_photo: 
+      drop: "Drop photos here to upload"
+      empty: "{file} is empty, please select files again without it."
+      failed: Failed
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      upload: "Upload a photo"
+    photo: 
+      view_all: "Посмотреть все фотографии %{name}"
+    show: 
+      add_a_description: "Добавить описание"
+      delete_photo: Удалить
+      edit_photo: Редактировать
+      full_size: "полный размер"
+      make_profile_photo: "сделать фотографией профиля"
+      next: следующая
+      prev: предыдущая
+      update_photo: "Обновить фотографию"
+    update: 
+      error: "Не удалось изменить фотографию."
+      notice: "Фотография загружена."
+  profile: Профиль
+  registrations: 
+    closed: "В этой части Диаспоры регистрация закрыта"
+    create: 
+      success: "добро пожаловать в Диаспору!"
+    edit: 
+      cancel_my_account: "Отменить мой аккаунт"
+      edit: "Редиктировать %{name}"
+      leave_blank: "(Оставьте пустым, если не хотите менять)"
+      password_to_confirm: "(Введите ваш текущий пароль для подтверждения изменений)"
+      unhappy: Несчастны?
+      update: Обновить
+    new: 
+      sign_up: Регистрация
+      sign_up_for_diaspora: "Зарегистрируйтесь в Диаспоре"
+  requests: 
+    create: 
+      sending: Отправка...
+      sent: "Вы попросили поделиться с %{name}. Они увидят это при следующем входе в Диаспору."
+      tried: "мы старались отправить сообщение для %{account}"
+    destroy: 
+      error: "Выберите аспект!"
+      ignore: "Игнорированные запросы на дружбу."
+      success: "Теперь вы друзья."
+    manage_aspect_contacts: 
+      contact_username: "Контакты пользователя"
+      create_request: "Создать запрос"
+      enter_a_diaspora_username: "Введите имя пользователя в Диаспоре:"
+      existing: "Existing contacts"
+      know_email: "Know their email address? You should invite them"
+      manage_within: "Manage contacts within"
+      your_diaspora_username_is: "Ваше имя пользователя в Диаспоре: %{diaspora_handle}"
+  search: Поиск
+  services: 
+    create: 
+      success: "Проверка подлинности прошла успешно."
+    destroy: 
+      success: "Подлинность отчищена."
+    index: 
+      connect_to_facebook: "Подключение к Facebook"
+      connect_to_twitter: "Подключение к Twitter"
+      disconnect: разъединить
+      logged_in_as: "вошли как"
+      really_disconnect: "отключить %{service}?"
+  settings: Настройки
+  shared: 
+    aspect_contacts: 
+      add_contacts: "добавить контакт"
+      add_to: "добавить в %{aspect}"
+      everyone: Каждый
+      manage: "manage %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "создать аспект"
+      everyone: Все
+      manage: Управление
+      manage_your_aspects: "Управление аспектами"
+    author_info: 
+      all: all
+      status_messages: "статус сообщения"
+      view_profile: "Просмотр профиля"
+      viewing: просмотр
+    contact_list: 
+      add_to: "Add %{name} to %{aspect}"
+      remove_from: "Remove %{name} from %{aspect}"
+      search_contacts: "Search contacts"
+    invitations: 
+      invitations_left: "(осталось %{count})"
+      invite_someone: "Пригласить кого-нибудь"
+      invites: Приглашения
+    notification: 
+      new: "Новый %{type} из %{from}"
+    public_explain: 
+      logged_in: "Войти в %{service}"
+      manage: "Управление сервисами"
+      outside: "Публичные сообщения доступны для чтения всем, даже за пределами вашей диаспоры."
+      title: "Вы собираетесь отправить публичное сообщение!"
+    publisher: 
+      all: Все
+      make_public: "Сделать публичным"
+      post_a_message_to: "Опубликовать сообщение для %{aspect}"
+      posting: Posting...
+      share: Поделиться
+      share_with: "Поделиться с %{aspect}"
+      share_with_all: "Поделиться во все аспекты"
+    reshare: 
+      reshare: "Поделиться повторно"
+    stream_element: 
+      show_comments: Комментарии
+  status_messages: 
+    helper: 
+      no_message_to_display: "Новых сообщений нет."
+    new_status_message: 
+      oh_yeah: "о да!"
+      tell_me_something_good: "расскажи мне что-нибудь хорошее"
+    show: 
+      destroy: Уничтожить
+  the_world: Мир
+  username: Пользователь
+  users: 
+    destroy: "Аккаунт закрыт."
+    edit: 
+      change_language: "Сменить язык"
+      change_password: "Сменить пароль"
+      close_account: "Закрыть учётную запись"
+      download_photos: "Скачать мои изображения"
+      download_xml: "Скачать мою информацию в xml"
+      export_data: "Экспорт информации"
+      invite_contacts: "Пригласить людей"
+      new_password: "Новый пароль"
+    getting_started: 
+      connect_services: "Соедениться с сервисами"
+      define_aspects: "Определиться с аспектами"
+      edit_profile: "Отредактировать профиль"
+      save_and_continue: "Сохранить и продолжить"
+      signup_steps: "Для заверщения вашей регистрации,выполните:"
+      skip: "Пропускать при старте"
+      step_1: 
+        your_profile: "Ваш профиль"
+      step_2: 
+        add: Добавить
+        aspect_name: "Имя аспекта"
+        description: "Укажите какие аспекты будут доступны для просмотра вашим контактам. Вы сможете изменять их в будущем, нажав на вкладку Управление в правом верхнем углу. Ваши аспекты уникальны и не видны другим."
+        your_aspects: "Ваши аспекты"
+      step_3: 
+        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\" Подключите аккаунты с других социальных сетей к вашей диаспоре. Вы сможете общедоступно размещать через вкладку \"Для всех\""
+        your_services: "Ваши сервисы"
+      step_4: 
+        change_profile: "Вы можете изменить свой профиль в любое время, нажав"
+        connect_disconnect: "Вы можете подключить или отключить свои сервисы в любое время, нажав\n"
+        continue: "Продолжить на вашей странице, обзор всех ваших аспектов."
+        finish: Finish
+        manage_aspects: "Вы можете управлять вашим аспектом в любой момент, нажав"
+        ready_to_share: "Теперь вы готовы начать обмен с"
+        set_up: "Вы все готовы, %{name}!"
+        tab_also_added: "Вкладка. Ваши контактные данные также могут быть добавлены на определенную страницу аспекта."
+        user_menu: "в пользовательском меню (вверху справа)."
+      welcome: "Добро пожаловать в Диаспору!"
+    public: 
+      does_not_exist: "Пользователя %{username} не существует!"
+    update: 
+      language_changed: "Язык изменён"
+      language_not_changed: "Не удалось изменить язык"
+      password_changed: "Пароль изменён"
+      password_not_changed: "Неудачное изменение пароля "
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index d0f5516dc..6761daf09 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -2,345 +2,354 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-#   Localization file for Swedish
-#
-#
-#   --- And now, Swedish! ---
-#
-#   Svensk terminologi i denna översättning:
-#
-#   album:           fotoalbum
-#   aspect:          sida
-#   diaspora-handle: diaspora-adress
-#   diaspora-id:     (diaspora-) användarnamn
-#   email:           mail, ebrev (diskussion pågår);
-#   pod:             plats
-#   request:         (vän-) förfrågan
-#   profile:         profil
-#   seed:            frö
-#   contact:	     kontakt
 
-sv:
-
-  settings: "Inställningar"
-  profile: "Profil"
-  account: "Konto"
-  _services: "Tjänster"
-  _photos: "foton"
-  ok: "OK"
-  cancel: "Avbryt"
-  delete: "Ta bort"  
-  or: "eller"
-  ago: "sedan"
-  username: "Användarnamn"
-  email: "E-post"
-  password: "Lösenord"
-  password_confirmation: "Bekräfta lösenord"
+sv: 
+  _photos: foton
+  _services: Tjänster
+  account: Konto
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "är redan taget"
+        user: 
+          attributes: 
+            email: 
+              taken: "är redan taget"
+            person: 
+              invalid: "är ogiltigt"
+            username: 
+              taken: "är redan taget"
+  ago: sedan
+  application: 
+    helper: 
+      unknown_person: "okänd person"
+      youtube_title: 
+        unknown: "Okänd videotitel"
   are_you_sure: "Är du säker?"
+  aspects: 
+    add_to_aspect: 
+      failure: "Personen kunde inte läggas till på sidan."
+      success: "Personen tillagd på sidan."
+    create: 
+      failure: "Sidan kunde inte skapas."
+      success: "Klicka på plustecknet till höger för att välja vilka som kan se din nya sida."
+    destroy: 
+      success: "%{name} är nu borttagen."
+    helper: 
+      are_you_sure: "Är du säker på att du vill ta bort den här sidan?"
+      aspect_not_empty: "Sidan är inte tom"
+      remove: "ta bort"
+    manage: 
+      add_a_new_aspect: "Lägg till en ny sida"
+      add_a_new_contact: "Lägg till en ny kontakt"
+      drag_to_add: "Dra för att lägga till personer"
+      manage_aspects: "Hantera sidor"
+      no_requests: "Inga nya förfrågningar"
+      requests: Kontaktförfrågningar
+    move_contact: 
+      error: "Kunde inte flytta kontakt: %{inspect}"
+      failure: "fungerade inte %{inspect}"
+      success: "Personen flyttades till den nya sidan"
+    new_aspect: 
+      create: Skapa
+      name: Namn
+    no_contacts_message: 
+      add_contact: "Lägg till en kontakt"
+      add_contact_to: "Lägg till en kontakt i %{aspect_name}"
+      invite: "Bjud in en kontakt till Diaspora!"
+      nobody: "Vi vet att du har kontakter, bjud in dem till Diaspora!"
+      nobody_in_aspect: "Sidan '%{aspect_name}' är tom."
+    no_posts_message: 
+      start_talking: "Ingen har sagt något än. Bli först!"
+    remove_from_aspect: 
+      failure: "Misslyckades med att ta bort personen från vald sida"
+      success: "Personen är nu borttagen från vald sida"
+    update: 
+      success: "Din sida %{name} är nu ändrad."
+  back: Tillbaka
+  cancel: Avbryt
+  comments: 
+    new_comment: 
+      comment: Kommentar
+      commenting: Kommenterar...
+  dashboards: 
+    helper: 
+      home: Hem
+  delete: "Ta bort"
+  email: E-post
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Rätta följande fel och försök igen."
+      invalid_fields: "Ogiltiga uppgifter"
   fill_me_out: "Fyll i mig"
-  back: "Tillbaka"
-  the_world: "världen"
-  search: "Sök"
-
-  activemodel:
-      errors:
-          models:
-              user:
-                  attributes:
-                      person:
-                          invalid: "är ogiltigt"
-                      username:
-                          taken: "är redan taget"
-                      email:
-                          taken: "är redan taget"
-              person:
-                  attributes:
-                      diaspora_handle:
-                          taken: "är redan taget"
-  application:
-      helper:
-          unknown_person: "okänd person"
-          youtube_title:
-              unknown: "Okänd videotitel"
-  error_messages:
-      helper:
-          invalid_fields: "Ogiltiga uppgifter"
-          correct_the_following_errors_and_try_again: "Rätta följande fel och försök igen."
-  layouts:
-      application:
-          view_profile: "visa profil"
-          edit_profile: "ändra profil"
-          account_settings: "kontoinstallningar"
-          logout: "logga ut"
-  shared:
-      stream_element:
-          show_comments: "show comments"
-      aspect_nav:
-          manage: "Hantera"
-          manage_your_aspects: "Hantera dina sidor"
-          everyone: "Alla"
-          add_a_new_aspect: "lägg till en ny sida"
-      publisher:
-          share: "Dela"
-          post_a_message_to: "Skicka ett meddelande till %{aspect}"
-          make_public: "gör publik"
-          share_with_all: "Dela på alla sidor"
-          share_with: "Dela med %{aspect}"
-          all: "alla"
-      aspect_contacts:
-          add_contacts: "lägg till kontakter"
-          everyone: "Alla"
-          add_to: "lägg till i %{aspect}"
-      invitations:
-          invites: "Inbjudningar"
-          invite_someone: "Bjud in en kontakt"
-          invitations_left: "(%{count} kvar)"
-      reshare:
-          reshare: "Återdela"
-      author_info:
-          view_profile: "Visa profil"
-          status_messages: "statusmeddelande"
-          viewing: "visar"
-      public_explain:
-          title: "Du är på väg att skicka ett publikt meddelande!"
-          outside: "Publika meddelanden kan läsas av användare utanför Diaspora."
-          logged_in: "inloggad på %{service}"
-          manage: "hantera anslutna tjänster"
-      notification:
-          new: "Ny %{type} från %{from}"
-  aspects:
-      no_contacts_message:
-          nobody: "Vi vet att du har kontakter, bjud in dem till Diaspora!"
-          nobody_in_aspect: "Sidan '%{aspect_name}' är tom."
-          add_contact: "Lägg till en kontakt"
-          add_contact_to: "Lägg till en kontakt i %{aspect_name}"
-          invite: "Bjud in en kontakt till Diaspora!"
-      no_posts_message:
-          start_talking:  "Ingen har sagt något än. Bli först!"
-      manage:
-          add_a_new_aspect: "Lägg till en ny sida"
-          add_a_new_contact:  "Lägg till en ny kontakt"
-          requests: "Kontaktförfrågningar"
-          no_requests: "Inga nya förfrågningar"
-          manage_aspects: "Hantera sidor"
-          drag_to_add: "Dra för att lägga till personer"
-      new_aspect:
-          add_a_new_aspect: "Lägg till ny sida"
-          name: "Namn"
-          create: "Skapa"
-      create:
-          success: "Klicka på plustecknet till höger för att välja vilka som kan se din nya sida."
-          failure: "Sidan kunde inte skapas."
-      destroy:
-          success: "%{name} är nu borttagen."
-      update:
-          success: "Din sida %{name} är nu ändrad."
-      move_contact:
-          failure: "fungerade inte %{inspect}"
-          success: "Personen flyttades till den nya sidan"
-          error: "Kunde inte flytta kontakt: %{inspect}"
-      add_to_aspect:
-          failure: "Misslyckades med att lägga in personen på den nya sidan."
-          success: "Personen tillagt på sidan."
-      helper:
-          remove: "ta bort"
-          aspect_not_empty: "Sidan är inte tom"
-          are_you_sure: "Är du säker på att du vill ta bort den här sidan?"
-      remove_from_aspect:
-          success: "Personen är nu borttagen från vald sida"
-          failure: "Misslyckades med att ta bort personen från vald sida"
-  users:
-      edit:
-          invite_contacts: "Bjud in en kontakt"
-          export_data: "Exportera data"
-          close_account: "Stäng kontot"
-          change_language: "Ändra språk"
-          change_password: "Ändra lösenord"
-          new_password: "Nytt lösenord"
-          download_xml: "Ladda ner min xml"
-          download_photos: "Ladda ner mina foton"
-      destroy: "Ditt konto är nu stängt."
-      getting_started:
-          welcome: "Välkommen till diaspora!"
-          signup_steps: "Slutför registreringen genom att följa den här guiden:"
-          edit_profile: "Ändra din profil"
-          define_aspects: "Välj dina sidor"
-          connect_services: "Anslut andra tjänster"
-          skip: "hoppa över guiden"
-          save_and_continue: "Spara och fortsätt"
-          step_1:
-              your_profile: "Din Profil"
-          step_2:
-              your_aspects: "Dina sidor"
-              description: "Här anger du vilka sidor av dig själv du vill visa på Diaspora, dessa sidor är bara något du själv ser. Genom dessa kan du välja vilka personer som ska se vad du skickar."
-              aspect_name: "Namn på sida"
-              add: "Lägg till"
-          step_3:
-              your_services: "Dina tjänster"
-              description: 'Anslut dina befintliga tjänster till ditt Diaspora-konto.  Du kommer att kunna skicka meddelanden genom dessa om du väljer "gör publik." på sidan för alla kontakter.'
-          step_4:
-              set_up: "Nu är guiden klar, %{name}!"
-              ready_to_share: "Du är nu redo att börja dela med "
-              continue: 'Fortsätt till "Alla" sidan, en överblick av alla dina sidor.'
-              change_profile: "Du kan ändra din profil närsomhelst genom att klicka på"
-              edit_profile: "ändra profil"
-              user_menu: "i användarmenyn uppe till vänster."
-              connect_disconnect: "Du kan ansluta och koppla bort dina andra tjänster när som helst genom att klicka på"
-              edit_account: "kontoinställningar"
-              manage_aspects: "Du kan hantera dina olika sidor närsomhelst genom att klicka på"
-              manage: "hantera"
-              tab_also_added: "-fliken.  Du kan även lägga till en ny kontakt direkt på en sida."
-      update:
-          password_changed: "Lösenordet är nu ändrat"
-          password_not_changed: "Lösenordet kunde inte ändras"
-          language_changed: "Språk är nu ändrat"
-          language_not_changed: "Språket kunde inte ändras"
-      public:
-          does_not_exist: "Användaren %{username} finns inte!"
-  comments:
-      new_comment:
-          comment: "Kommentar"
-  photos:
-      show:
-          delete_photo: "Ta bort foto"
-          prev: "föregående"
-          full_size: "full storlek"
-          next: "nästa"
-          edit_photo: "Ändra foto"
-          add_a_description: "Lägg till beskrivning"
-          make_profile_photo: "använd som profilbild"
-          update_photo: "Uppdatera foto"
-      edit:
-          editing: "Ändrar"
-      photo:
-          view_all: "visa alla foton %{name} laddat upp"
-      new:
-          new_photo: "Nytt foto"
-          back_to_list: "Tillbaka till listan"
-          post_it: "skicka!"
-      create:
-          runtime_error: "Fotot kunde inte laddas upp."
-          integrity_error: "Fotot kunde inte laddas upp.  Är du säker på att den där filen var en bild?"
-          type_error: "Fotot kunde inte laddas upp.  Är du säker på att det var en bild du försökte ladda upp?"
-      update:
-          notice: "Fotot är nu uppdaterat."
-          error:  "Misslyckades med att ändra fotot."
-      destroy:
-          notice: "Fotot borttaget."
-  registrations:
-      new:
-          sign_up: "Registrera dig"
-          sign_up_for_diaspora: "Gå med i Diaspora"
-      create:
-          success: "Du har nu gått med i Diaspora!"
-      edit:
-          edit: "Ändra %{name}"
-          leave_blank: "(lämna tomt om du inte vill ändra det)"
-          password_to_confirm: "(det nuvarande lösenordet krävs för att bekräfta ändringarna)"
-          unhappy: "Missnöjd?"
-          update: "Uppdatera"
-          cancel_my_account: "Avsluta mitt konto"
-  invitations:
-      create:
-          sent: 'Din inbjudan är nu skickad.'
-          no_more: 'Du har inga fler inbjudningar.'
-          already_sent: 'Du har redan bjudit in denna person.'
-          already_friends: 'Den här personen finns redan bland dina kontakter'
-      new:
-          invite_someone_to_join: "Bjud in en än till Diaspora!"
-          if_they_accept_info: "om de accepterar så kommer de att läggas till på den sida du valde"
-          to: "Till"
-          message: "Meddelande:"
-          send_an_invitation: "Skicka en inbjudan"
-          send_invitation: "Skicka inbjudan"
-      check_token:
-          not_found: "Inbjudan inte funnen"
-  status_messages:
-      new_status_message:
-          tell_me_something_good: "berätta något intressant"
-          oh_yeah: "oh yeah!"
-      show:
-          destroy: "Ta bort"
-      helper:
-          no_message_to_display: "Inget meddelande att visa."
-  people:
-      person:
-          pending_request: "väntande förfrågningar"
-          already_friends: "Finns i dina kontakter"
-          thats_you: "Detta är du!"
-          add_contact: "lägg till kontakt"
-      index:
-          results_for: "sökresultat för"
-      show:
-          no_posts: "inga meddelanden att visa!"
-          not_friends: "%{name} finns inte bland dina kontakter"
-          request_people: "Om du känner för det så skulle du kunna skicka en kontaktförfrågan."
-          already_requested: "Du har redan skickat en kontaktförfrågan till %{name}."
-          does_not_exist: "Den här personen finns inte!"
-      edit:
-          info_available_to: "Den här informationen kommer vara synlig för alla som du ansluter till på diaspora."
-          your_profile: "Din profil"
-          your_name: "Ditt namn"
-          first_name: "Förnamn"
-          last_name: "Efternamn"
-          your_gender: "Ditt kön"
-          your_birthday: "Din födelsedag"
-          your_bio: "Din biografi"
-          your_photo: "Your photo"
-          update_profile: "Uppdatera profil"
-          allow_search: "Tillåt andra att söka efter dig"
-      profile_photo_upload:
-          or_select_one: "eller välj en befintlig bild"
-      update:
-          updated: "Profilen är uppdaterad"
-          failed: "Misslyckades med att uppdatera profilen"
-      profile_sidebar:
-          remove_contact: "ta bort kontakt"
-          edit_my_profile: "Ändra min profil"
-          last_seen: "senast sedd: %{how_long_ago}"
-          bio: "bio"
-          gender: "kön"
-          born: "född"
-      helper:
-           results_for: " resultat för %{params}"
-           people_on_pod_are_aware_of: " personer på denna plats är medvetna om att"
-  requests:
-      manage_aspect_contacts:
-          add_a_new_contact_to: "Lägg till en kontakt till"
-          enter_a_diaspora_username: "Ange ett användarnamn:"
-          your_diaspora_username_is: "Din Diaspora-adress är: %{diaspora_handle}"
-          contact_username: "Kontaktens Diaspora-adress"
-          create_request: "Skapa förfrågan"
-      destroy:
-          success: "Kontakten är nu tillagd."
-          error: "Var god välj en aspekt!"
-          ignore: "Ignorerade kontaktförfrågan."
-      create:
-          tried: "vi gjorde vårat bästa för att skicka meddelandet till %{account}"
-  services:
-      index:
-        logged_in_as: "inloggad som"
-        disconnect: "koppla från"
-        really_disconnect: "koppla från %{service}?"
-        connect_to_twitter: "Anslut till twitter"
-        connect_to_facebook: "Anslut till facebook"
-      create:
-          success: "Autentiering lyckades."
-      destroy:
-          success: "Du har nu kopplat bort tjänsten."
-  dashboards:
-      helper:
-          home: "Hem"
-  notifier:
-      hello: "Hej %{name}!"
-      love: "hälsningar,"
-      diaspora: "Diasporas mailrobot"
-      new_request:
-          subject: "ny kontaktförfrågan från %{from}"
-          just_sent_you: "skickade nyss en kontaktförfrågan till dig på Diaspora"
-          try_it_out: "Du borde verkligen överväga att kolla upp detta."
-          sign_in: "logga in här"
-      request_accepted:
-          subject: "%{name} har accepterat din kontaktförfrågan på Diaspora"
-          accepted: "har accepterat din kontaktförfrågan. Denne finns nu på "
-          aspect: "sidan."
+  home: 
+    show: 
+      already_account: "har du redan ett konto?"
+      login_here: "logga in här"
+      share_what_you_want: "Dela vad du vill, med vem du vill."
+  invitations: 
+    check_token: 
+      not_found: "Inbjudan inte funnen"
+    create: 
+      already_contacts: "Du är redan ansluten till den här personen"
+      already_sent: "Du har redan bjudit in denna person."
+      no_more: "Du har inga fler inbjudningar."
+      sent: "Din inbjudan är nu skickad."
+    new: 
+      if_they_accept_info: "om de accepterar så kommer de att läggas till på den sida du valde"
+      invite_someone_to_join: "Bjud in en än till Diaspora!"
+      message: "Meddelande:"
+      send_an_invitation: "Skicka en inbjudan"
+      send_invitation: "Skicka inbjudan"
+      to: Till
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: kontoinställningar
+      blog: blogg
+      developers: utvecklare
+      edit_profile: "ändra profil"
+      login: "logga in"
+      logout: "logga ut"
+      view_profile: "visa profil"
+  notifier: 
+    diaspora: "Diasporas mailrobot"
+    hello: "Hej %{name}!"
+    love: "hälsningar,"
+    new_request: 
+      just_sent_you: "skickade nyss en kontaktförfrågan till dig på Diaspora"
+      sign_in: "logga in här"
+      subject: "ny kontaktförfrågan från %{from}"
+      try_it_out: "Du borde verkligen överväga att kolla upp detta."
+    request_accepted: 
+      accepted: "har accepterat din kontaktförfrågan. Denne finns nu på "
+      aspect: sidan.
+      subject: "%{name} har accepterat din kontaktförfrågan på Diaspora"
+  ok: OK
+  or: eller
+  password: Lösenord
+  password_confirmation: "Bekräfta lösenord"
+  people: 
+    edit: 
+      allow_search: "Tillåt andra att söka efter dig"
+      first_name: Förnamn
+      info_available_to: "Den här informationen kommer vara synlig för alla som du ansluter till på diaspora."
+      last_name: Efternamn
+      update_profile: "Uppdatera profil"
+      your_bio: "Din biografi"
+      your_birthday: "Din födelsedag"
+      your_gender: "Ditt kön"
+      your_name: "Ditt namn"
+      your_photo: "Your photo"
+      your_profile: "Din profil"
+    helper: 
+      people_on_pod_are_aware_of: " personer på denna plats är medvetna om att"
+      results_for: " resultat för %{params}"
+    index: 
+      results_for: "sökresultat för"
+    person: 
+      add_contact: "lägg till kontakt"
+      already_connected: "Redan ansluten"
+      pending_request: "väntande förfrågningar"
+      thats_you: "Detta är du!"
+    profile_photo_upload: 
+      or_select_one: "eller välj en befintlig bild"
+    profile_sidebar: 
+      bio: bio
+      born: född
+      edit_my_profile: "Ändra min profil"
+      gender: kön
+      in_aspects: "på sidor"
+      last_seen: "senast sedd: %{how_long_ago}"
+      remove_contact: "ta bort kontakt"
+    show: 
+      already_requested: "Du har redan skickat en kontaktförfrågan till %{name}."
+      does_not_exist: "Den här personen finns inte!"
+      no_posts: "inga meddelanden att visa!"
+      not_connected: "Du är inte ansluten till den här personen"
+      request_people: "Om du känner för det så skulle du kunna skicka en kontaktförfrågan."
+    update: 
+      failed: "Misslyckades med att uppdatera profilen"
+      updated: "Profilen är uppdaterad"
+  photos: 
+    create: 
+      integrity_error: "Fotot kunde inte laddas upp.  Är du säker på att den där filen var en bild?"
+      runtime_error: "Fotot kunde inte laddas upp."
+      type_error: "Fotot kunde inte laddas upp.  Är du säker på att det var en bild du försökte ladda upp?"
+    destroy: 
+      notice: "Fotot borttaget."
+    edit: 
+      editing: Ändrar
+    new: 
+      back_to_list: "Tillbaka till listan"
+      new_photo: "Nytt foto"
+      post_it: skicka!
+    new_photo: 
+      drop: "Släpp foton här för att ladda upp"
+      empty: "{file} är tom, välj om filerna utan att välja denna."
+      failed: Misslyckades
+      invalid_ext: "{file} har en ogiltig filändelse. Endast {extensions} är tillåtna."
+      size_error: "{file} är för stor, maximal filstorlek är {sizeLimit}."
+      upload: "Ladda upp ett foto"
+    photo: 
+      view_all: "visa alla foton %{name} laddat upp"
+    show: 
+      add_a_description: "Lägg till beskrivning"
+      delete_photo: "Ta bort foto"
+      edit_photo: "Ändra foto"
+      full_size: "full storlek"
+      make_profile_photo: "använd som profilbild"
+      next: nästa
+      prev: föregående
+      update_photo: "Uppdatera foto"
+    update: 
+      error: "Misslyckades med att ändra fotot."
+      notice: "Fotot är nu uppdaterat."
+  profile: Profil
+  registrations: 
+    closed: "Registreringsformuläret är stäng på den här poden."
+    create: 
+      success: "Du har nu gått med i Diaspora!"
+    edit: 
+      cancel_my_account: "Avsluta mitt konto"
+      edit: "Ändra %{name}"
+      leave_blank: "(lämna tomt om du inte vill ändra det)"
+      password_to_confirm: "(det nuvarande lösenordet krävs för att bekräfta ändringarna)"
+      unhappy: Missnöjd?
+      update: Uppdatera
+    new: 
+      sign_up: "Registrera dig"
+      sign_up_for_diaspora: "Gå med i Diaspora"
+  requests: 
+    create: 
+      sending: Skickar...
+      sent: "Du har angett att du vill dela med %{name}.  De kommer bli medveten om detta nästa gång de loggar in."
+      tried: "vi gjorde vårat bästa för att skicka meddelandet till %{account}"
+    destroy: 
+      error: "Var god välj en aspekt!"
+      ignore: "Ignorerade kontaktförfrågan."
+      success: "Kontakten är nu tillagd."
+    manage_aspect_contacts: 
+      contact_username: "Kontaktens Diaspora-adress"
+      create_request: "Skapa förfrågan"
+      enter_a_diaspora_username: "Ange ett användarnamn:"
+      existing: "Befintliga kontakter"
+      know_email: "Vet du deras e-postadress? Då borde du bjuda in dem"
+      manage_within: "Hantera kontakter i "
+      your_diaspora_username_is: "Din Diaspora-adress är: %{diaspora_handle}"
+  search: Sök
+  services: 
+    create: 
+      success: "Autentiering lyckades."
+    destroy: 
+      success: "Du har nu kopplat bort tjänsten."
+    index: 
+      connect_to_facebook: "Anslut till facebook"
+      connect_to_twitter: "Anslut till twitter"
+      disconnect: "koppla från"
+      logged_in_as: "inloggad som"
+      really_disconnect: "koppla från %{service}?"
+  settings: Inställningar
+  shared: 
+    aspect_contacts: 
+      add_contacts: "lägg till kontakter"
+      add_to: "lägg till i %{aspect}"
+      everyone: Alla
+      manage: "hantera %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "lägg till en ny sida"
+      everyone: Alla
+      manage: Hantera
+      manage_your_aspects: "Hantera dina sidor"
+    author_info: 
+      all: alla
+      status_messages: statusmeddelande
+      view_profile: "Visa profil"
+      viewing: visar
+    contact_list: 
+      add_to: "Lägg till %{name} i %{aspect}"
+      remove_from: "Ta bort %{name} från %{aspect}"
+      search_contacts: "Sök efter kontakter"
+    invitations: 
+      invitations_left: "(%{count} kvar)"
+      invite_someone: "Bjud in en kontakt"
+      invites: Inbjudningar
+    notification: 
+      new: "Ny %{type} från %{from}"
+    public_explain: 
+      logged_in: "inloggad på %{service}"
+      manage: "hantera anslutna tjänster"
+      outside: "Publika meddelanden kan läsas av användare utanför Diaspora."
+      title: "Du är på väg att skicka ett publikt meddelande!"
+    publisher: 
+      all: alla
+      make_public: "gör publik"
+      post_a_message_to: "Skicka ett meddelande till %{aspect}"
+      posting: Skickar...
+      share: Dela
+      share_with: "Dela med %{aspect}"
+      share_with_all: "Dela på alla sidor"
+    reshare: 
+      reshare: Återdela
+    stream_element: 
+      show_comments: "visa kommentarer"
+  status_messages: 
+    helper: 
+      no_message_to_display: "Inget meddelande att visa."
+    new_status_message: 
+      oh_yeah: "oh yeah!"
+      tell_me_something_good: "berätta något intressant"
+    show: 
+      destroy: "Ta bort"
+  the_world: världen
+  username: Användarnamn
+  users: 
+    destroy: "Ditt konto är nu stängt."
+    edit: 
+      change_language: "Ändra språk"
+      change_password: "Ändra lösenord"
+      close_account: "Stäng kontot"
+      download_photos: "Ladda ner mina foton"
+      download_xml: "Ladda ner min xml"
+      export_data: "Exportera data"
+      invite_contacts: "Bjud in en kontakt"
+      new_password: "Nytt lösenord"
+    getting_started: 
+      connect_services: "Anslut andra tjänster"
+      define_aspects: "Välj dina sidor"
+      edit_profile: "Ändra din profil"
+      save_and_continue: "Spara och fortsätt"
+      signup_steps: "Slutför registreringen genom att följa den här guiden:"
+      skip: "hoppa över guiden"
+      step_1: 
+        your_profile: "Din Profil"
+      step_2: 
+        add: "Lägg till"
+        aspect_name: "Namn på sida"
+        description: "Här anger du vilka sidor av dig själv du vill visa på Diaspora. Lägger du till en person på en viss sida kan denne bara se information som du publicerar på just den sidan. Vill du ändra dessa senare så kan du göra det under fliken \"Hantera\"."
+        your_aspects: "Dina sidor"
+      step_3: 
+        description: "Anslut dina befintliga tjänster till ditt Diaspora-konto.  Du kommer att kunna skicka meddelanden genom dessa om du väljer \"gör publik.\" på sidan för alla kontakter."
+        your_services: "Dina tjänster"
+      step_4: 
+        change_profile: "Du kan ändra din profil närsomhelst genom att klicka på"
+        connect_disconnect: "Du kan ansluta och koppla bort dina andra tjänster när som helst genom att klicka på"
+        continue: "Fortsätt till \"Alla\" sidan, en överblick av alla dina sidor."
+        finish: Slutför
+        manage_aspects: "Du kan hantera dina olika sidor närsomhelst genom att klicka på"
+        ready_to_share: "Du är nu redo att börja dela med "
+        set_up: "Nu är guiden klar, %{name}!"
+        tab_also_added: "-fliken.  Du kan även lägga till en ny kontakt direkt på en sida."
+        user_menu: "i användarmenyn uppe till vänster."
+      welcome: "Välkommen till diaspora!"
+    public: 
+      does_not_exist: "Användaren %{username} finns inte!"
+    update: 
+      language_changed: "Språk är nu ändrat"
+      language_not_changed: "Språket kunde inte ändras"
+      password_changed: "Lösenordet är nu ändrat"
+      password_not_changed: "Lösenordet kunde inte ändras"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 823ff180d..6e3bb3522 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -1,208 +1,355 @@
 #   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.
 
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
-tr:
-  hello: "Merhaba dünya"
-  application:
-      helper:
-          unknown_person: "bilinmiyen insanlar"
-          new_requests: "yeni istekler"
-  dashboards:
-      helper:
-          home: "ev"
-  error_messages:
-      helper:
-          invalid_fields: "Yanliș Bölümler"
-          correct_the_following_errors_and_try_again: "Alttaki yanlișlari düzeltin ve tekrar deneyin."
-  people:
-      helper:
-           results_for: "%{params} için sonuçlar"
-           people_on_pod_are_aware_of: " bu podda bizim bildiğimiz kişiler."
-  layouts:
-      application:
-          edit_profile: "profili düzelt"
-          logout: "çık"
-  shared:
-      aspect_nav:
-          all_aspects: "Bütün Yanlar"
-          manage: "Düzenle"
-          manage_your_aspects: "Bütün yanları düzenle"
-      sub_header:
-          all_aspects: "Bütün Yanlar"
-          manage_aspects: "Yanları Düzenle"
-      publisher:
-          share: "Paylaş"
-      aspect_friends:
-          add_friends: "Arkadaş ekle"
-  albums:
-      album:
-          you: "sen"
-      new_album:
-          create: "yarat"
-          add_a_new_album: "Yeni albüm ekle"
-      show:
-          edit_album: "Albümü düzelt"
-          albums: "albümler"
-          updated: "düzeltildi"
-          by: "tarafından"
-      edit:
-          editing: "düzeltiyor"
-          updated: "düzeltildi"
-          are_you_sure: "Eminmisin?"
-          delete_album: "Sil Albümü"
-          cancel: "Vazgeç"
-      index:
-          home: "Ev"
-          new_album: "Yeni Albüm"
-      create:
-          success: "Yeni bir album yarattınız %{name} isminde."
-      update:
-          success: "Albüm %{name} başarı ile eklenmiştir."
-          failure: "Albüm %{name} yı düzeltme başarılı değil."
-      destroy:
-          success: "Albüm %{name} silinmistir."
-      helper:
-          friends_albums: "Arkadaşların Albümleri"
-          your_albums: "Sizin Albümleriniz"
-  aspects:
-      index:
-          photos: "resimler"
-      show:
-          photos: "resimler"
-      manage:
-          add_a_new_aspect: "Yeni bir yan ekle"
-          add_a_new_friend:  "Yeni bir arkadaş ekle"
-          show: "Show"
-          update_aspects: "Yanlari düzelt"
-          requests: "Ricalar"
-          ignore_remove: "Goz ardi et/çıkart"
-      new_aspect:
-          add_a_new_aspect: "Yeni bir yan ekle"
-          create: "Yarat"
-      create:
-          success: "Sol taraftaki arti ya tıklıyarak Diasporaya sizin yeni yanınızı kimlerin görebileceğini belirtin."
-          failure: "Yan yaratimi basarılı değildi."
-      destroy:
-          success: "%{name} basarıyla yaratıldı."
-      update:
-          success: "Sizin yanınız, %{name}, başariyla düzeltildi."
-      move_friends:
-          failure: "Yan düzeltimi arkadisınız %{real_name} icin başarisizdi."
-          success: "Yanlar başariyla düzeltildi."
-      move_friend:
-          failure: "%{inspect} islemedi."
-          success: "Simdi siz arkadaşlarınıza başka bir yanınızı gosteriyorsunuz."
-      helper:
-          remove: "cikart"
-          aspect_not_empty: "Yan bos değil"
-  users:
-      edit:
-          editing_profile: "Profili düzeltiliyor"
-      profile:
-          cancel: "Vazgeç"
-          update_profile: "düzelt Profili"
-          home: "Ev"
-          diaspora_username: "DIASPORA ISMINIZ"
-          info: "Bilgi"
-          picture: "Resim"
-          editing_profile: "Profili düzeltmek"
-          albums: "Albümler"
-          you_dont_have_any_photos: "Hicbir fotorafiniz yok! Şuraya gidin"
-          page_to_upload_some:  "yuklemek icin."
-          or: "veya"
-  comments:
-      comment:
-          ago: "once"
-      new_comment:
-          comment: "Yorum"
-  photos:
-      show:
-          prev: "once"
-          full_size: "tam büyüklük"
-          next: "sonra"
-          edit_photo: "düzelt Fotoyu"
-          delete_photo: "Sil Fotoyu"
-          are_you_sure: "Eminmisiniz?"
-          comments: "yorumlar"
-      edit:
-          editing: "düzeltiliyor"
-          are_you_sure: "Eminmisiniz?"
-          delete_photo: "Sil Fotoyu"
-      photo:
-          show_comments: "göster yorumları"
-          posted_a_new_photo_to: "yeni bir foto koydu "
-      new:
-          new_photo: "Yeni Foto"
-          back_to_list: "Listeye Geri Git"
-          post_it: "ekle!"
-      create:
-          runtime_error: "Fotoyu yukleme başarısızdı.  Emniyet kemeriniz takılımıydı?"
-          integrity_error: "Fotoyu yukleme başarısızdı.  Resim olduğundan eminmisınız?"
-          type_error: "Fotoyu yukleme başarısızdı.  Bir resim yuklediğinize eminmisiniz?"
-      update:
-          notice: "Resim başarıyla eklendi."
-          error:  "Fotoyu düzeltme basarısızdı."
-      destroy:
-          notice: "Foto silindi."
-  registrations:
-      new:
-          sign_up: "Katıl"
-      create:
-          success: "Diasporaya katıldınız!"
-  status_messages:
-      new_status_message:
-          tell_me_something_good: "bana iyi bir şey söyle"
-          oh_yeah: "tabi ya!"
-      status_message:
-          show_comments: "göster yorumları"
-          delete: "Sil"
-          are_you_sure: "Eminmisiniz?"
-      show:
-          status_message: "Status Mesaji"
-          comments: "yorumlar"
-          are_you_sure: "Eminmisiniz?"
-          destroy: "Yok et"
-          view_all: "Hepsine bak"
-          message: "Mesaj"
-          owner: "Sahibi"
-      helper:
-          no_message_to_display: "Gosterilcek bir mesaj yok."
-  people:
-      person:
-          add_friend: "Arkadaş ekle"
-          pending_request: "bekletilen rica"
-      index:
-          add_friend: "Arkadaş ekle"
-          real_name: "esas ismi"
-          diaspora_handle: "diaspora ismi"
-          thats_you: "o sensin!"
-          friend_request_pending: "Arkadaş ricasi bekletiliyor"
-          you_have_a_friend_request_from_this_person: "siz bir arkadaş isteği aldiniz bu kişiden"
-      new:
-          new_person: "Yeni Kişi"
-          back_to_list: "Listeye geri dön"
-      show:
-          last_seen: "son gorüldü: %{how_long_ago}"
-          friends_since: "Arkadaş süreci: %{how_long_ago}"
-          save: "sakla"
-          are_you_sure: "Eminmisiniz?"
-          remove_friend: "çikart arkadaşlıktan"
-  requests:
-      new_request:
-          add_a_new_friend_to: "Buna yeni bir arkadaş ekle"
-          enter_a_diaspora_username: "Bir Diaspora ismi gir:"
-          your_diaspora_username_is: "Sizin Diaspora isminiz: %{diaspora_handle}"
-          friends_username: "Arkadaşin Diaspora ismi"
-      destroy:
-          success: "Siz şimdi arkadaşsınız."
-          error: "Lutfen bir yan seçiniz!"
-          ignore: "Arkadaş isteğini reddettiniz."
-      create:
-          error: "Diaspora cekirdeği bulunmadı bu emailde!"
-          already_friends: "Siz zaten arakadaşsınız %{destination_url} ile!"
-          success: "%{destination_url} için arakadaş olma isteği  gonderilmiştir."
-          horribly_wrong: "Bir şey muhtemalan yanliş gitti."
\ No newline at end of file
+tr: 
+  _photos: fotoğraflar
+  _services: Servisler
+  account: Hesap
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "zaten alınmış"
+        user: 
+          attributes: 
+            email: 
+              taken: "zaten alınmış"
+            person: 
+              invalid: geçersiz
+            username: 
+              taken: "zaten alınmış"
+  ago: önce
+  application: 
+    helper: 
+      unknown_person: "bilinmiyen kişiler"
+      youtube_title: 
+        unknown: "Bilinmeyen Video Başlığı"
+  are_you_sure: "Emin misiniz?"
+  aspects: 
+    add_to_aspect: 
+      failure: "Failed to add friend to aspect."
+      success: "Successfully added friend to aspect."
+    create: 
+      failure: "Yan yaratimi basarılı değildi."
+      success: "Sol taraftaki arti ya tıklıyarak Diasporaya sizin yeni yanınızı kimlerin görebileceğini belirtin."
+    destroy: 
+      success: "%{name} başarıyla yaratıldı."
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "Yan boş değil"
+      remove: çıkar
+    manage: 
+      add_a_new_aspect: "Yeni bir yan ekle"
+      add_a_new_contact: "Yeni kişi ekleyin"
+      drag_to_add: "Yeni kişi eklemek için taşıyın"
+      manage_aspects: "Manage aspects"
+      no_requests: "Yeni istek yok"
+      requests: İstekler
+    move_contact: 
+      error: "Kontak taşıma problemi: %{inspect}"
+      failure: "didn't work %{inspect}"
+      success: "Person moved to new aspect"
+    new_aspect: 
+      create: Yarat
+      name: İsim
+    no_contacts_message: 
+      add_contact: "Kontak ekleyin"
+      add_contact_to: "Add someone to %{aspect_name}"
+      invite: "Diaspora'ya tanıdıklarınızı davet edin!"
+      nobody: "Tanıdıklarınız olduğunu biliyoruz - onları Diasporaya getirin!"
+      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+    no_posts_message: 
+      start_talking: "Kimse henüz birşey söylemedi. Sohbeti başlatın!"
+    remove_from_aspect: 
+      failure: "Failed to remove person from aspect"
+      success: "Successfully removed person from aspect"
+    update: 
+      success: "Sizin yanınız, %{name}, başariyla düzeltildi."
+  back: Geri
+  cancel: "İptal Et"
+  comments: 
+    new_comment: 
+      comment: Yorum
+      commenting: Commenting...
+  dashboards: 
+    helper: 
+      home: "Ana Sayfa"
+  delete: Sil
+  email: E-Posta
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Alttaki yanlıșları düzeltin ve tekrar deneyin."
+      invalid_fields: "Yanlıș Alanlar"
+  fill_me_out: "Fill me out"
+  home: 
+    show: 
+      already_account: "already have an account?"
+      login_here: "log in here"
+      share_what_you_want: "Share what you want, with who you want."
+  invitations: 
+    check_token: 
+      not_found: "Invitation token not found"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "You already invited this person."
+      no_more: "You have no more invitations."
+      sent: "Your invitation has been sent."
+    new: 
+      if_they_accept_info: "if they accept, they will be added to the aspect you invited them"
+      invite_someone_to_join: "Invite someone to join Diaspora!"
+      message: "Message:"
+      send_an_invitation: "Send an invitation"
+      send_invitation: "Send invitation"
+      to: To
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+    header: 
+      account_settings: "account settings"
+      blog: blog
+      developers: developers
+      edit_profile: "edit profile"
+      login: login
+      logout: logout
+      view_profile: "view profile"
+  notifier: 
+    diaspora: "the diaspora email robot"
+    hello: "Hello %{name}!"
+    love: "love,"
+    new_request: 
+      just_sent_you: "just sent you a friend request on Diaspora*"
+      sign_in: "sign in here"
+      subject: "new Diaspora* friend request from %{from}"
+      try_it_out: "You should really think about checking it out."
+    request_accepted: 
+      accepted: "has accepted your friend request. They are now in your"
+      aspect: aspect.
+      subject: "%{name} has accepted your friend request on Diaspora*"
+  ok: OK
+  or: or
+  password: Password
+  password_confirmation: "Password confirmation"
+  people: 
+    edit: 
+      allow_search: "Allow for people to search for you"
+      first_name: "First name"
+      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      last_name: "Last name"
+      update_profile: "Update Profile"
+      your_bio: "Your bio"
+      your_birthday: "Your birthday"
+      your_gender: "Your gender"
+      your_name: "Your name"
+      your_photo: "Your photo"
+      your_profile: "Your profile"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: " results for %{params}"
+    index: 
+      results_for: "search results for"
+    person: 
+      add_contact: "add contact"
+      already_connected: "Already connected"
+      pending_request: "bekletilen rica"
+      thats_you: "thats you!"
+    profile_photo_upload: 
+      or_select_one: "or select one from your already existing"
+    profile_sidebar: 
+      bio: bio
+      born: born
+      edit_my_profile: "Edit my profile"
+      gender: gender
+      in_aspects: "in aspects"
+      last_seen: "last seen: %{how_long_ago}"
+      remove_contact: "remove contact"
+    show: 
+      already_requested: "You have already sent a request to %{name}."
+      does_not_exist: "Person does not exist!"
+      no_posts: "no posts to display!"
+      not_connected: "You are not connected with this person"
+      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+    update: 
+      failed: "Failed to update profile"
+      updated: "Profile updated"
+  photos: 
+    create: 
+      integrity_error: "Fotoyu yukleme başarısızdı.  Resim olduğundan eminmisınız?"
+      runtime_error: "Fotoyu yukleme başarısızdı.  Emniyet kemeriniz takılımıydı?"
+      type_error: "Fotoyu yukleme başarısızdı.  Bir resim yuklediğinize eminmisiniz?"
+    destroy: 
+      notice: "Foto silindi."
+    edit: 
+      editing: düzeltiliyor
+    new: 
+      back_to_list: "Listeye Geri Git"
+      new_photo: "Yeni Foto"
+      post_it: ekle!
+    new_photo: 
+      drop: "Drop photos here to upload"
+      empty: "{file} is empty, please select files again without it."
+      failed: Failed
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      upload: "Upload a photo"
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      add_a_description: "Add a description"
+      delete_photo: "Sil Fotoyu"
+      edit_photo: "düzelt Fotoyu"
+      full_size: "tam büyüklük"
+      make_profile_photo: "make profile photo"
+      next: sonra
+      prev: once
+      update_photo: "Fotoğrafı güncelle"
+    update: 
+      error: "Fotoyu düzeltme basarısız oldu."
+      notice: "Resim başarıyla eklendi."
+  profile: Profile
+  registrations: 
+    closed: "Üyelik bu Diaspora'da kapandı."
+    create: 
+      success: "Diasporaya katıldınız!"
+    edit: 
+      cancel_my_account: "Hesabımı iptal et"
+      edit: "Düzenle %{name}"
+      leave_blank: "(Eğer değiştirmek istemiyorsanız boş bırakın.)"
+      password_to_confirm: "(Değişikliklerin onaylanması için şu anki şifreniz gerekmektedir)"
+      unhappy: "Olmadı mı?"
+      update: Düzenle
+    new: 
+      sign_up: Katıl
+      sign_up_for_diaspora: "Sign up for Diaspora"
+  requests: 
+    create: 
+      sending: Sending...
+      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      tried: "%{account} üyesine mesaj atmak için elimizden geleni yaptık."
+    destroy: 
+      error: "Lutfen bir yan seçiniz!"
+      ignore: "Arkadaş isteğini reddettiniz."
+      success: "Siz şimdi arkadaşsınız."
+    manage_aspect_contacts: 
+      contact_username: "Kontak kullanıcı adı"
+      create_request: "Yaratma isteği"
+      enter_a_diaspora_username: "Diaspora kullanıcı adı girin:"
+      existing: "Existing contacts"
+      know_email: "Know their email address? You should invite them"
+      manage_within: "Manage contacts within"
+      your_diaspora_username_is: " Diaspora kullanıcı adınız : %{diaspora_handle}"
+  search: Search
+  services: 
+    create: 
+      success: "Doğrulama başarılı."
+    destroy: 
+      success: "Başarılı bir şekilde doğrulama yokedildi."
+    index: 
+      connect_to_facebook: "facebook bağlan"
+      connect_to_twitter: "twitter bağlan"
+      disconnect: çık
+      logged_in_as: "olarak bağlandınız"
+      really_disconnect: "disconnect %{service}?"
+  settings: Ayarlar
+  shared: 
+    aspect_contacts: 
+      add_contacts: "kontak ekle"
+      add_to: "add to %{aspect}"
+      everyone: Herkes
+      manage: "manage %{aspect}"
+    aspect_nav: 
+      add_a_new_aspect: "add a new aspect"
+      everyone: Everyone
+      manage: Düzenle
+      manage_your_aspects: "Bütün yanları düzenle"
+    author_info: 
+      all: all
+      status_messages: "durum mesajları"
+      view_profile: "Profili Gör"
+      viewing: viewing
+    contact_list: 
+      add_to: "Add %{name} to %{aspect}"
+      remove_from: "Remove %{name} from %{aspect}"
+      search_contacts: "Search contacts"
+    invitations: 
+      invitations_left: "(%{count} davet kaldı)"
+      invite_someone: "Birisini davet edin"
+      invites: Davetler
+    notification: 
+      new: "New %{type} from %{from}"
+    public_explain: 
+      logged_in: "%{service} , bağlandınız."
+      manage: "bağlı servisleri yönetin"
+      outside: "Public messages will be available for others outside of Diaspora to see."
+      title: "Herkese görünür bir mesaj göndermek üzeresiniz!"
+    publisher: 
+      all: hepsi
+      make_public: "herkese görünür yap"
+      post_a_message_to: "mesaj gönder %{aspect}"
+      posting: Posting...
+      share: Paylaş
+      share_with: "Share with %{aspect}"
+      share_with_all: "Share with all aspects"
+    reshare: 
+      reshare: Reshare
+    stream_element: 
+      show_comments: "yorumları göster"
+  status_messages: 
+    helper: 
+      no_message_to_display: "Gosterilcek bir mesaj yok."
+    new_status_message: 
+      oh_yeah: "tabi ya!"
+      tell_me_something_good: "bana iyi bir şey söyle"
+    show: 
+      destroy: "Yok et"
+  the_world: dünya
+  username: "Kullanıcı Adı"
+  users: 
+    destroy: "Hesap başarıyla kapatıldı"
+    edit: 
+      change_language: "Dili Değiştir"
+      change_password: "Şifremi Değiştir"
+      close_account: "Hesabımı kapat"
+      download_photos: "fotoğraflarımı kaydet"
+      download_xml: "xml dosyamı kaydet"
+      export_data: "Bilgilerimi Dışarı taşı"
+      invite_contacts: "Kontak davet et"
+      new_password: "Yeni Şifre"
+    getting_started: 
+      connect_services: "Servislerine bağlan"
+      define_aspects: "Define your aspects"
+      edit_profile: "Profilini düzenle"
+      save_and_continue: "Kaydet ve devam et"
+      signup_steps: "Complete your sign-up by doing these things:"
+      skip: "skip getting started"
+      step_1: 
+        your_profile: Profiliniz
+      step_2: 
+        add: Add
+        aspect_name: "Aspect name"
+        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+        your_aspects: "Your aspects"
+      step_3: 
+        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
+        your_services: Servisleriniz
+      step_4: 
+        change_profile: "You can change your profile any time by clicking"
+        connect_disconnect: "You can connect/disconnect your services any time by clicking"
+        continue: "Continue on to your everyone page, an overview of all of your aspects."
+        finish: Finish
+        manage_aspects: "You can manage your aspects any time by clicking the"
+        ready_to_share: "Artık paylaşıma hazırsınız, "
+        set_up: "Kurulum tamamlandı, %{name}!"
+        tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+        user_menu: "kullanıcı mönünüzde (üstte sağda)."
+      welcome: "Diaspora'ya hoşgeldin!"
+    public: 
+      does_not_exist: "%{username} kullanıcısı bulunmamaktadır!"
+    update: 
+      language_changed: "Dil Değişti"
+      language_not_changed: "Dil Değişikliği Başarılamadı"
+      password_changed: "Şifre Değişti"
+      password_not_changed: "Şifre Değişikliği Başarılamadı"