diff --git a/config/languages.yml b/config/languages.yml
index be42b1cf42e93efbe33031f8699178b348186aee..50e717aa410e893858b3bda2ea6abeeee6aa9207 100644
--- a/config/languages.yml
+++ b/config/languages.yml
@@ -3,6 +3,7 @@ available:
   cs: 'Lietuviškai'
   cy: 'Cymraeg'
   de: 'Deutsch'
+  el: "Ελληνικά"
   en: 'English'
   es: 'Español'
   es-CL: 'Español Chileno'
diff --git a/config/locales/devise/devise.ar.yml b/config/locales/devise/devise.ar.yml
index f4cdebf5942e9811c02ee8a8ce6436fa03953a21..98ece363b64e61e2038c86db3fe2b3362b414903 100644
--- a/config/locales/devise/devise.ar.yml
+++ b/config/locales/devise/devise.ar.yml
@@ -48,7 +48,7 @@ ar:
         click_to_unlock: "Click the link below to unlock your account:"
         subject: "Unlock Instructions"
         unlock: "Unlock my account"
-      welcome: "Welcome %{email}!"
+      welcome: "Welcome"
     passwords: 
       edit: 
         change_password: "Change my password"
@@ -82,6 +82,8 @@ ar:
         sign_in: "Sign in"
         sign_up: "Sign up"
         sign_up_closed: "Open signups are closed at this time."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Resend unlock instructions"
diff --git a/config/locales/devise/devise.ca.yml b/config/locales/devise/devise.ca.yml
new file mode 100644
index 0000000000000000000000000000000000000000..83be71c9aebdcd57033e24d12a83d87e77e420cc
--- /dev/null
+++ b/config/locales/devise/devise.ca.yml
@@ -0,0 +1,96 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+ca: 
+  devise: 
+    confirmations: 
+      confirmed: "Your account was successfully confirmed. You are now signed in."
+      new: 
+        resend_confirmation: "Resend confirmation instructions"
+      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: 
+      edit: 
+        change_password: "Change my password"
+      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: 
+        alpha_software: "You are about to use alpha software."
+        bugs_and_feedback: "Be advised, you will experience bugs.  We encourage you to use the Feedback button on the right hand side of your browser to report any hiccups!  We will work as fast as we can to resolve any issues you report."
+        have_a_problem: "Have a problem? Find an answer here"
+        login: "Login"
+        modern_browsers: "only supports modern browsers."
+        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?"
+        receive_confirmation: "Didn't receive confirmation instructions?"
+        receive_unlock: "Didn't receive unlock instructions?"
+        sign_in: "Sign in"
+        sign_up: "Sign up"
+        sign_up_closed: "Open signups are closed at this time."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
+    unlocks: 
+      new: 
+        resend_unlock: "Resend unlock instructions"
+      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: "not found"
+      not_locked: "was not locked"
diff --git a/config/locales/devise/devise.cs.yml b/config/locales/devise/devise.cs.yml
index 62b905b7ed6ae84e68f52d6f32e6eff20137d7b0..7ba787b38749539bb92f068b6cd6a44af82ef897 100644
--- a/config/locales/devise/devise.cs.yml
+++ b/config/locales/devise/devise.cs.yml
@@ -82,6 +82,8 @@ cs:
         sign_in: "Sign in"
         sign_up: "Sign up"
         sign_up_closed: "Open signups are closed at this time."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Resend unlock instructions"
diff --git a/config/locales/devise/devise.cy.yml b/config/locales/devise/devise.cy.yml
index e8e35f8b1e3da7f91393f2c119b6061971e89473..87e356e3dab5926600e80533e5cac46b4f032ad6 100644
--- a/config/locales/devise/devise.cy.yml
+++ b/config/locales/devise/devise.cy.yml
@@ -82,6 +82,8 @@ cy:
         sign_in: "Sign in"
         sign_up: "Sign up"
         sign_up_closed: "Open signups are closed at this time."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Resend unlock instructions"
diff --git a/config/locales/devise/devise.da.yml b/config/locales/devise/devise.da.yml
index e8cdb95af67349d32ff607ba79cb18825dbd2027..fca41cbfc1ca04d307a20729e1849fd93bc825f2 100644
--- a/config/locales/devise/devise.da.yml
+++ b/config/locales/devise/devise.da.yml
@@ -8,7 +8,7 @@ da:
     confirmations: 
       confirmed: "Din konto er blevet bekræftet. Du er nu logget ind"
       new: 
-        resend_confirmation: "Resend confirmation instructions"
+        resend_confirmation: "Send bekræftigelse igen"
       send_instructions: "Du vil modtage en e-mail med instruktioner om, hvordan du bekræfte din konto, om et par minutter."
     failure: 
       inactive: "Din konto var ikke aktiveret endnu."
@@ -51,23 +51,23 @@ da:
       welcome: "Velkommen %{email}!"
     passwords: 
       edit: 
-        change_password: "Change my password"
+        change_password: "skift password"
       new: 
         forgot_password: "Glemt din adgangskode?"
         send_password_instructions: "Send mig instruktioner til nulstilning af kodeord"
       send_instructions: "Du vil modtage en e-mail med instruktioner om hvordan du kan nulstille din adgangskode om et par minutter."
       updated: "Dit adgangskode er nu ændret. Du er nu logget ind."
     registrations: 
-      destroyed: "Farvel! Din konto er blevet aflyst. Vi håber at se dig igen snart."
-      signed_up: "Du har nu tilmeldt dig. Hvis aktiveret er en bekræftelse sendt til din e-mail."
+      destroyed: "Farvel! Din konto er nu lukket. Vi håber at se dig igen snart."
+      signed_up: "Du har nu tilmeldt dig. En bekræftelse er blevet sendt til din e-mail, hvis den er aktiveret."
       updated: "Din konto er nu opdateret."
     sessions: 
       new: 
-        alpha_software: "You are about to use alpha software."
-        bugs_and_feedback: "Be advised, you will experience bugs.  We encourage you to use the Feedback button on the right hand side of your browser to report any hiccups!  We will work as fast as we can to resolve any issues you report."
+        alpha_software: "Du er ved at starte alpha software."
+        bugs_and_feedback: "Vær opmærksom på at du vil opleve fejl og mangler. Vi opfordrer dig til at bruge feedbackknappen i højre side af din browser til at melde de fejl du støder på. Vi arbejder så hurtigt vi kan på at løse de problemer du melder."
         have_a_problem: "Har du problemer? Find svaret her"
         login: "Log ind"
-        modern_browsers: "only supports modern browsers."
+        modern_browsers: "understøtter kun nyere browsere."
         password: "Adgangskode"
         remember_me: "Husk mig"
         sign_in: "Log ind"
@@ -77,14 +77,16 @@ da:
     shared: 
       links: 
         forgot_your_password: "Glemt din adgangskode?"
-        receive_confirmation: "Didn't receive confirmation instructions?"
-        receive_unlock: "Didn't receive unlock instructions?"
+        receive_confirmation: "Modtog du ikke bekræftigelsen? "
+        receive_unlock: "Modtog du ikke aktiveringsvejledningen?"
         sign_in: "Log ind"
         sign_up: "Opret en profil"
-        sign_up_closed: "Open signups are closed at this time."
+        sign_up_closed: "Der er på nuværende tidspunkt lukket for fri tilmelding."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
-        resend_unlock: "Resend unlock instructions"
+        resend_unlock: "Send vejledningen til aktivering af konto igen"
       send_instructions: "Du vil modtage en e-mail med instruktioner om hvordan man kan låse din konto op om et par minutter."
       unlocked: "Din konto er blevet låst op. Du er nu logget ind."
   errors: 
diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
index b5a9160a83b44fc23c83d54cee584e4e46da4aa8..cd90c067bb703f49ae777385408c37ff1359a492 100644
--- a/config/locales/devise/devise.de.yml
+++ b/config/locales/devise/devise.de.yml
@@ -82,6 +82,8 @@ de:
         sign_in: "Anmelden"
         sign_up: "Registrieren"
         sign_up_closed: "Öffentliche Registrierungen sind momentan nicht möglich."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Entsperr-Anweisungen erneut senden"
diff --git a/config/locales/devise/devise.el.yml b/config/locales/devise/devise.el.yml
index 362750847d7bcb0dc2e213766fb8986a3fdd21f2..ed30f0e86044efcac1e07880450346874c7b64a0 100644
--- a/config/locales/devise/devise.el.yml
+++ b/config/locales/devise/devise.el.yml
@@ -24,31 +24,31 @@ el:
       updated: "Ο κωδικός πρόσβασής σας τέθηκε με επιτυχία. Είστε πλέον συνδεδεμένοι."
     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}!"
+        confirm: "Επιβεβαίωση του λογαριασμού μου"
+        subject: "Οδηγίες επιβεβαίωσης"
+        you_can_confirm: "Μπορείτε να επιβεβαιώσετε τον λογαριασμό σας μέσω του παρακάτω συνδέσμου:"
+      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!"
+        accept: "Αποδοχή πρόσκλησης"
+        ignore: "Εάν δεν θέλετε να αποδεχθείτε την πρόσκληση, αγνοήστε αυτό το μήνυμα."
+        no_account_till: "Ο λογαριασμός σας δεν θα δημιουργηθεί μέχρι να επισκεφθείτε τον παραπάνω σύνδεσμο και να εγγραφείτε."
+        subject: "Έχετε λάβει πρόσκληση για να γίνετε μέλος του Diaspora!"
       inviters: 
-        accept_at: ", at %{url}, you can accept it through the link below."
+        accept_at: ", στο %{url}, μπορείτε να το αποδεχτείτε, μέσω του επόμενου συνδέσμου."
         has_invited_you: "%{name} σας προσκάλεσε να γίνετε μέλος του Diaspora"
-        have_invited_you: "%{names} have invited you to join Diaspora"
+        have_invited_you: "%{names} σας κάλεσε να γίνετε μέλος του 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."
+        change: "Αλλαγή του κωδικού μου"
+        ignore: "Εάν δεν το ζητήσατε, παρακαλούμε να αγνοήσετε αυτό το μήνυμα."
+        someone_requested: "Κάποιος έχει ζητήσει ένα σύνδεσμο για να αλλάξει τον κωδικό πρόσβασής σας. Μπορείτε να το κάνετε αυτό μέσω του παρακάτω συνδέσμου."
+        subject: "Οδηγίες επαναφοράς κωδικού πρόσβασης"
+        wont_change: "Ο κωδικός πρόσβασής σας δεν θα αλλάξει μέχρι να επισκεφθείτε τον παραπάνω σύνδεσμο και να δημιουργήσετε ένα νέο."
       unlock_instructions: 
         account_locked: "Ο λογαριασμός σας έχει κλειδωθεί λόγω υπερβολικού πλήθους ανεπιτυχών απόπειρων να συνδεθείτε."
         click_to_unlock: "Κάντε κλικ στον παρακάτω σύνδεσμο για να ξεκλειδώσετε το λογαριασμό σας:"
         subject: "Οδηγίες Ξεκλειδώματος"
         unlock: "Ξεκλείδωμα του λογαριασμού μου"
-      welcome: "Welcome %{email}!"
+      welcome: "Καλώς ήρθες %{email}!"
     passwords: 
       edit: 
         change_password: "Αλλαγή του κωδικού μου"
@@ -63,11 +63,11 @@ el:
       updated: "Ενημερώσατε το λογαριασμό σας με επιτυχία."
     sessions: 
       new: 
-        alpha_software: "You are about to use alpha software."
-        bugs_and_feedback: "Be advised, you will experience bugs.  We encourage you to use the Feedback button on the right hand side of your browser to report any hiccups!  We will work as fast as we can to resolve any issues you report."
+        alpha_software: "Είστε έτοιμος να χρησιμοποιήσετε λογισμικό σε alpha φάση."
+        bugs_and_feedback: "Να γνωρίζετε ότι θα αντιμετωπίσετε σφάλματα. Σας ενθαρρύνουμε να χρησιμοποιήσετε το κουμπί \"Ανατροφοδότηση\" στη δεξιά πλευρά του browser σας για να αναφέρετε οποιοδήποτε σφάλμα! Θα εργαστούμε όσο πιο γρήγορα μπορούμε για να την επίλυση οποιουδήποτε ζητήματος μας αναφέρετε."
         have_a_problem: "Έχετε κάποιο πρόβλημα; Βρείτε την απάντηση εδώ"
         login: "Είσοδος"
-        modern_browsers: "only supports modern browsers."
+        modern_browsers: "υποστηρίζει μόνο σύγχρονα προγράμματα περιήγησης."
         password: "Κωδικός"
         remember_me: "Να με θυμάσαι"
         sign_in: "Συνδεθείτε"
@@ -80,13 +80,15 @@ el:
         receive_confirmation: "Δεν λάβατε οδηγίες για την επιβεβαίωση;"
         receive_unlock: "Δεν λάβατε τις οδηγίες ξεκλειδώματος;"
         sign_in: "Συνδεθείτε"
-        sign_up: "Sign up"
-        sign_up_closed: "Open signups are closed at this time."
+        sign_up: "Εγγραφή"
+        sign_up_closed: "Οι εγγραφές είναι κλειστές αυτή τη στιγμή."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
-        resend_unlock: "Resend unlock instructions"
-      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."
+        resend_unlock: "Ξαναστείλε τις οδηγίες ξεκλειδώματος"
+      send_instructions: "Σε λίγα λεπτά θα λάβετε ένα email με οδηγίες για το πώς να ξεκλειδώσετε το λογαριασμό σας."
+      unlocked: "Ο λογαριασμός σας ξεκλειδώθηκε με επιτυχία. Έχετε πλέον συνδεθεί"
   errors: 
     messages: 
       already_confirmed: "έχει ήδη επιβεβαιωθεί"
diff --git a/config/locales/devise/devise.eo.yml b/config/locales/devise/devise.eo.yml
index 1c78ba089c162a058d8c234f111513d251c86934..9d17af31e7eab829b5c31a4807e17f363da83bc2 100644
--- a/config/locales/devise/devise.eo.yml
+++ b/config/locales/devise/devise.eo.yml
@@ -82,6 +82,8 @@ eo:
         sign_in: "Ensaluti"
         sign_up: "Sign up"
         sign_up_closed: "Open signups are closed at this time."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Resend unlock instructions"
diff --git a/config/locales/devise/devise.es-CL.yml b/config/locales/devise/devise.es-CL.yml
index 85791668adbfacaf8074158fc8854186a162bbd0..166cfd24136c45caaa4abeae77afe21536981d52 100644
--- a/config/locales/devise/devise.es-CL.yml
+++ b/config/locales/devise/devise.es-CL.yml
@@ -82,6 +82,8 @@ es-CL:
         sign_in: "Entrar"
         sign_up: "Registrarse"
         sign_up_closed: "Los registros no estan disponibles en este momento."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Reenviar instrucciones de desbloqueo"
diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml
index 340a2964cfef7464cf48b233a60a649e08236568..2ec27ffdda6f923f018680f503899b5c1d60c619 100644
--- a/config/locales/devise/devise.es.yml
+++ b/config/locales/devise/devise.es.yml
@@ -82,6 +82,8 @@ es:
         sign_in: "Ingresar"
         sign_up: "Regístrate"
         sign_up_closed: "Los registros están cerrados temporalmente."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Volver a enviar las instrucciones de desbloqueo"
diff --git a/config/locales/devise/devise.fi.yml b/config/locales/devise/devise.fi.yml
index a24d140e36c1567bdbe0da7949ba9db460c31a14..ba5a0f54424e7492d39e41758764d938454ed1bc 100644
--- a/config/locales/devise/devise.fi.yml
+++ b/config/locales/devise/devise.fi.yml
@@ -82,6 +82,8 @@ fi:
         sign_in: "Kirjaudu"
         sign_up: "Rekisteröidy"
         sign_up_closed: "Open signups are closed at this time."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Resend unlock instructions"
diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index fca9f5162903c900d8572e67d8452acb8ff0e3f3..eb12b5241dbb8070f8c17b1edb3d5260b8e5f26d 100644
--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -82,6 +82,8 @@ fr:
         sign_in: "Connexion"
         sign_up: "Inscription"
         sign_up_closed: "Les inscriptions libres sont fermées pour l'instant."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Renvoyer les instructions de déblocage"
diff --git a/config/locales/devise/devise.he.yml b/config/locales/devise/devise.he.yml
index 1f92db898ea7df30d3a3ff8d36721962d1df9780..acc82f570e6b1317e64988d4b1eee8a2515b1853 100644
--- a/config/locales/devise/devise.he.yml
+++ b/config/locales/devise/devise.he.yml
@@ -82,6 +82,8 @@ he:
         sign_in: "כניסה"
         sign_up: "הרשמה"
         sign_up_closed: "לא ניתן להירשם באופן חופשי נכון לעכשיו."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "שליחת הוראות שחרור מחדש"
diff --git a/config/locales/devise/devise.hu.yml b/config/locales/devise/devise.hu.yml
new file mode 100644
index 0000000000000000000000000000000000000000..094b5234a5afb3ebfead80db160f62b571d3d778
--- /dev/null
+++ b/config/locales/devise/devise.hu.yml
@@ -0,0 +1,96 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+hu: 
+  devise: 
+    confirmations: 
+      confirmed: "Your account was successfully confirmed. You are now signed in."
+      new: 
+        resend_confirmation: "Resend confirmation instructions"
+      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: 
+      edit: 
+        change_password: "Change my password"
+      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: 
+        alpha_software: "You are about to use alpha software."
+        bugs_and_feedback: "Be advised, you will experience bugs.  We encourage you to use the Feedback button on the right hand side of your browser to report any hiccups!  We will work as fast as we can to resolve any issues you report."
+        have_a_problem: "Have a problem? Find an answer here"
+        login: "Login"
+        modern_browsers: "only supports modern browsers."
+        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?"
+        receive_confirmation: "Didn't receive confirmation instructions?"
+        receive_unlock: "Didn't receive unlock instructions?"
+        sign_in: "Sign in"
+        sign_up: "Sign up"
+        sign_up_closed: "Open signups are closed at this time."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
+    unlocks: 
+      new: 
+        resend_unlock: "Resend unlock instructions"
+      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: "not found"
+      not_locked: "was not locked"
diff --git a/config/locales/devise/devise.id.yml b/config/locales/devise/devise.id.yml
index 1c9d0af0f591dee94ead6c4d88307f64b63aa9a0..bb64b4c8132488e71d23c69b2c3f263cdeb8d87d 100644
--- a/config/locales/devise/devise.id.yml
+++ b/config/locales/devise/devise.id.yml
@@ -82,6 +82,8 @@ id:
         sign_in: "Sign in"
         sign_up: "Sign up"
         sign_up_closed: "Open signups are closed at this time."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Resend unlock instructions"
diff --git a/config/locales/devise/devise.it.yml b/config/locales/devise/devise.it.yml
index 19f6d13be57ea62cd34690c2478c74d92cbfc043..74c93127ffd8772fb77b333f0a1d2d66af78ac01 100644
--- a/config/locales/devise/devise.it.yml
+++ b/config/locales/devise/devise.it.yml
@@ -82,6 +82,8 @@ it:
         sign_in: "Accedi"
         sign_up: "Registrati"
         sign_up_closed: "Le iscrizioni pubbliche sono chiuse al momento."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Invia di nuovo le istruzioni per lo sblocco"
diff --git a/config/locales/devise/devise.lt.yml b/config/locales/devise/devise.lt.yml
index e6e91f6141b1d7b9d8068ef69e69803a44e72aab..12eb4da3f7ca1fe2af2d06758aa4f4c3db82848e 100644
--- a/config/locales/devise/devise.lt.yml
+++ b/config/locales/devise/devise.lt.yml
@@ -82,6 +82,8 @@ lt:
         sign_in: "Prisijungti"
         sign_up: "Registruotis"
         sign_up_closed: "Atviri prisijungimai šiuo metu uždaryti."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Siųsti nurodymus, kaip atrakinti, iš naujo"
diff --git a/config/locales/devise/devise.mk.yml b/config/locales/devise/devise.mk.yml
index b3949ffa73309d9f30f720721c3c8838e377b9c8..1f114891f1726df02b0dacf5d128ff219f129417 100644
--- a/config/locales/devise/devise.mk.yml
+++ b/config/locales/devise/devise.mk.yml
@@ -82,6 +82,8 @@ mk:
         sign_in: "Најави се"
         sign_up: "Регистрирај се"
         sign_up_closed: "Отворените регистрации привремено се затворени."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Повторно испрати инструкции за отклучување"
diff --git a/config/locales/devise/devise.nb.yml b/config/locales/devise/devise.nb.yml
index 8882974909f7edc89e6d95bb382821788c0e405d..36c8ebee1a34ee2dfd4af9ccc3c0d7a7d979726a 100644
--- a/config/locales/devise/devise.nb.yml
+++ b/config/locales/devise/devise.nb.yml
@@ -82,6 +82,8 @@ nb:
         sign_in: "Sign in"
         sign_up: "Sign up"
         sign_up_closed: "Open signups are closed at this time."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Resend unlock instructions"
diff --git a/config/locales/devise/devise.nl.yml b/config/locales/devise/devise.nl.yml
index 8ced7e88fa783a96a809c3e8a63a6a71d478042f..ee50dbbd71a6615a0bfabb0397a50a85020267ad 100644
--- a/config/locales/devise/devise.nl.yml
+++ b/config/locales/devise/devise.nl.yml
@@ -82,6 +82,8 @@ nl:
         sign_in: "Log in"
         sign_up: "Registreer"
         sign_up_closed: "Vrij registreren is momenteel niet mogelijk."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Stuur ontgrendel instructies nogmaals"
diff --git a/config/locales/devise/devise.pl.yml b/config/locales/devise/devise.pl.yml
index 4928f3d1aa12cd64e3f95cf84045cd043f079224..b92c7334c93fcaef495db96f9f86ca493ea4e294 100644
--- a/config/locales/devise/devise.pl.yml
+++ b/config/locales/devise/devise.pl.yml
@@ -6,10 +6,10 @@
 pl: 
   devise: 
     confirmations: 
-      confirmed: "Twoje konto zostało aktywowane, zostałeś zalogowany."
+      confirmed: "Twoje konto zostało aktywowane. Zalogowano pomyślnie."
       new: 
-        resend_confirmation: "Prześlij instrukcje aktywacji ponownie"
-      send_instructions: "W ciÄ…gu kilku minut otrzymasz maila zawierajÄ…cego instrukcje dotyczÄ…ce aktywacji konta."
+        resend_confirmation: "Prześlij ponownie instrukcje aktywacji"
+      send_instructions: "W ciÄ…gu kilku minut otrzymasz e-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."
@@ -21,32 +21,32 @@ pl:
     invitations: 
       invitation_token_invalid: "Podany klucz zaproszenia jest niepoprawny!"
       send_instructions: "Twoje zaproszenie zostało wysłane."
-      updated: "Hasło zostało pomyślnie zmienione. Logowanie zakończone."
+      updated: "Hasło zostało pomyślnie zmienione. Zalogowano."
     mailer: 
       confirmation_instructions: 
         confirm: "Aktywuj moje konto"
         subject: "Instrukcje aktywacji"
-        you_can_confirm: "Możesz aktywować swoje konto klikając na poniższy link:"
+        you_can_confirm: "Możesz aktywować swoje konto klikając poniższy odnośnik:"
       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?' "
+        ignore: "Jeśli nie chcesz zaakceptować zaproszenia, zignoruj ten e-mail."
+        no_account_till: "Twoje konto nie zostanie założone dopóki nie klikniesz odnośnika powyżej i nie zarejestrujesz się."
         subject: "Masz zaproszenie do Diaspory!"
       inviters: 
-        accept_at: ", pod adresem %{url}, możesz przyjąć zaproszenie poprzez link poniżej."
-        has_invited_you: "%{name} zaprosił/a Cię do Diaspory"
+        accept_at: ", pod adresem %{url}, możesz przyjąć zaproszenie przez poniższy odnośnik."
+        has_invited_you: "%{name} zaprosił(-a) Cię do Diaspory"
         have_invited_you: "%{names} zaprosili CiÄ™ do Diaspory"
       reset_password_instructions: 
         change: "Zmień moje hasło"
-        ignore: "Jeśli nie chcesz zresetować hasła, zignoruj ten email."
-        someone_requested: "Odebraliśmy zgłoszenie zmiany hasła, jeśli chcesz to zrobić kliknij na poniższy link:"
+        ignore: "Jeśli nie chcesz zresetować hasła, zignoruj ten e-mail."
+        someone_requested: "Odebraliśmy zgłoszenie zmiany hasła, jeśli chcesz to zrobić kliknij poniższy odnośnik:"
         subject: "Instrukcje zmiany hasła"
-        wont_change: "Twoje hasło zostanie zmienione dopiero gdy klikniesz na link i podasz nowe hasło."
+        wont_change: "Twoje hasło zostanie zmienione dopiero, gdy klikniesz odnośnik 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"
+        account_locked: "Twoje konto zostało zablokowane, ponieważ przekroczono limit nieudanych prób logowania."
+        click_to_unlock: "Kliknij poniższy link, aby odblokować konto:"
+        subject: "Instrukcje odblokowywania"
         unlock: "Odblokuj moje konto"
       welcome: "Witaj %{email}!"
     passwords: 
@@ -54,22 +54,22 @@ pl:
         change_password: "Zmień hasło"
       new: 
         forgot_password: "Nie pamiętasz hasła?"
-        send_password_instructions: "Wyślij instrukcję resetowania hasła"
-      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."
+        send_password_instructions: "Wyślij instrukcje resetowania hasła"
+      send_instructions: "W ciągu kilku minut otrzymasz e-maila zawierającego instrukcjie dotyczące zresetowania hasła."
+      updated: "Twoje hasło zostało zmienione. Zalogowano pomyślnie."
     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ę."
+      signed_up: "Zostałeś zarejestrowany. Jeśli aktywowano odpowiednią opcję, wyślemy do Ciebie e-mail potwierdzający rejestrację."
       updated: "Pomyślnie zaktualizowano informacje o Twoim koncie."
     sessions: 
       new: 
-        alpha_software: "Pamiętaj, że będziesz używać programu we wczesnym stadium rozwoju (alpha)."
-        bugs_and_feedback: "Bądź świadom/a, że doświadczysz błędów. Zachęcam do korzystania z przycisku \"Feedback\" po prawej stronie twojej przeglądarki, aby sygnalizować wszelkie problemy. Pracujemy najszybciej jak się da aby rozwiązać wszelkie kłopoty jakie zgłaszacie."
-        have_a_problem: "Jakiś kłopot? Znajdź odpowiedź tu"
+        alpha_software: "Pamiętaj, że będziesz używać programu we wczesnym stadium rozwoju (alfa)."
+        bugs_and_feedback: "Bądź świadom(-a), że doświadczysz błędów. Zachęcamy do korzystania z przycisku Feedback umieszczonego po prawej stronie okna przeglądarki, aby sygnalizować wszelkie problemy. Pracujemy najszybciej jak się da, aby rozwiązać wszelkie zgłaszane kłopoty."
+        have_a_problem: "Jakiś kłopot? Tu znajdziesz odpowiedź"
         login: "Login"
-        modern_browsers: "wspiera wyłącznie nowoczesne przeglądarki."
+        modern_browsers: "obsługuje wyłącznie nowoczesne przeglądarki."
         password: "Hasło"
-        remember_me: "Zapamiętaj sesję"
+        remember_me: "Zapamiętaj mnie"
         sign_in: "Zaloguj siÄ™"
         username: "Nazwa użytkownika"
       signed_in: "Zalogowano pomyślnie."
@@ -77,16 +77,18 @@ pl:
     shared: 
       links: 
         forgot_your_password: "Nie pamiętasz hasła?"
-        receive_confirmation: "Nie otrzymałeś/aś instrukcji aktywacji?"
-        receive_unlock: "Nie otrzymałeś/aś instrukcji odblokowania?"
+        receive_confirmation: "Nie otrzymałeś(-aś) instrukcji aktywacji?"
+        receive_unlock: "Nie otrzymałeś(-aś) instrukcji odblokowywania?"
         sign_in: "Zaloguj siÄ™"
         sign_up: "Zarejestruj siÄ™"
-        sign_up_closed: "Otwarta rejestracja jest zamknięta w tym momencie."
+        sign_up_closed: "Otwarta rejestracja jest w tym momencie wyłączona."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
-        resend_unlock: "Wyślij ponownie instrukcję odblokowywania"
-      send_instructions: "W ciÄ…gu kilku minut otrzymasz email z instrukcjami odblokowania konta."
-      unlocked: "Twoje konto zostało odblokowane, jesteś zalogowany."
+        resend_unlock: "Wyślij ponownie instrukcje odblokowywania"
+      send_instructions: "W ciÄ…gu kilku minut otrzymasz e-mail z instrukcjami odblokowywania konta."
+      unlocked: "Twoje konto zostało odblokowane. Zalogowano pomyślnie."
   errors: 
     messages: 
       already_confirmed: "potwierdzono wcześniej"
diff --git a/config/locales/devise/devise.pt-BR.yml b/config/locales/devise/devise.pt-BR.yml
index 13e5ddff2c4e0e39c510326350ca6e846c483bdd..e69540deb56a40643556a85d4ad646d0c270729d 100644
--- a/config/locales/devise/devise.pt-BR.yml
+++ b/config/locales/devise/devise.pt-BR.yml
@@ -82,6 +82,8 @@ pt-BR:
         sign_in: "Entrar"
         sign_up: "Cadastre-se"
         sign_up_closed: "Open signups are closed at this time."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Resend unlock instructions"
diff --git a/config/locales/devise/devise.pt-PT.yml b/config/locales/devise/devise.pt-PT.yml
index 0819d2d9e6af36bade3999792a5d265f8be21c06..9b44d3ff6ed6c156f199a43fe46bcc7eaee9956f 100644
--- a/config/locales/devise/devise.pt-PT.yml
+++ b/config/locales/devise/devise.pt-PT.yml
@@ -6,46 +6,46 @@
 pt-PT: 
   devise: 
     confirmations: 
-      confirmed: "A sua conta foi confirmada com sucesso. Está on-line."
+      confirmed: "A tua conta foi confirmada com sucesso. Estás online."
       new: 
         resend_confirmation: "Reenviar instruções de confirmação"
-      send_instructions: "Vai receber um email com instruções sobre como confirmar a sua conta dentro de alguns minutos."
+      send_instructions: "Vais receber um email com instruções sobre como confirmar a tua conta dentro de alguns minutos."
     failure: 
-      inactive: "A sua conta ainda não foi activada."
+      inactive: "A tua 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."
+      locked: "A tua conta foi bloqueada."
       timeout: "A sua sessão expirou, por favor faça login novamente para continuar."
       unauthenticated: "Faça login ou registe-se antes de continuar."
-      unconfirmed: "Confirme a sua conta antes de continuar."
+      unconfirmed: "Confirma a tua conta antes de continuar."
     invitations: 
-      invitation_token_invalid: "O código de convite que introduziu não é válido!"
-      send_instructions: "O seu convite foi enviado."
-      updated: "A sua senha foi definida com sucesso. Está on-line."
+      invitation_token_invalid: "O código de convite que introduziste não é válido!"
+      send_instructions: "O teu convite foi enviado."
+      updated: "A tua senha foi definida com sucesso. Estás online."
     mailer: 
       confirmation_instructions: 
         confirm: "Confirmar a minha conta"
         subject: "Instruções de confirmação"
-        you_can_confirm: "Pode confirmar a sua conta através da seguinte ligação:"
+        you_can_confirm: "Podes confirmar a tua conta através do seguinte link:"
       hello: "Olá, %{email}!"
       invitation: 
-        accept: "Aceitar convite"
-        ignore: "Se não pretender aceitar o convite, por favor ignore este email."
-        no_account_till: "A sua conta não será criada até que aceda à ligação acima e se registe."
-        subject: "Foi convidado(a) para o Diaspora!"
+        accept: "Aceitar o convite"
+        ignore: "Se não pretenderes aceitar este convite, por favor ignora este email."
+        no_account_till: "A tua conta não será criada até que acedas ao link  acima e te registes"
+        subject: "Foste convidado(a) para te juntares ao Diaspora!"
       inviters: 
-        accept_at: ", at %{url}, you can accept it through the link below."
-        has_invited_you: "%{name} convidou-o(a) para o Diaspora"
-        have_invited_you: "%{names} convidaram-no(a) para o Diaspora"
+        accept_at: ", em %{url}, pode aceitar através do seguinte link:"
+        has_invited_you: "%{name} convidou-te para o Diaspora"
+        have_invited_you: "%{names} convidaram-te para o Diaspora"
       reset_password_instructions: 
         change: "Alterar a minha senha"
-        ignore: "Se não pediu isto, por favor ignore este email."
-        someone_requested: "Alguém pediu uma ligação para alterar a sua senha, e pode fazê-lo através da seguinte ligação."
-        subject: "Instruções de reposição de palavra-passe"
-        wont_change: "A sua senha não mudará até que aceda à ligação acima e crie uma nova."
+        ignore: "Se não fizeste este pedido, por favor ignora este email."
+        someone_requested: "Alguém pediu para alterar a tua senha, e podes alterar a mesma através do seguinte link"
+        subject: "Instruções de reposição da palavra-passe"
+        wont_change: "A tua senha não será modificada até clicares no link acima e criares uma nova senha. "
       unlock_instructions: 
-        account_locked: "A sua conta foi bloqueada devido a um número excessivo de tentativas de login falhadas."
-        click_to_unlock: "Clique na seguinte ligação para desbloquear a sua conta:"
+        account_locked: "A tua conta foi bloqueada devido a um número excessivo de tentativas de login falhadas."
+        click_to_unlock: "Clica no link abaixo para desbloquear a tua conta:"
         subject: "Instruções de Desbloqueio"
         unlock: "Desbloquear a minha conta"
       welcome: "Bem-vindo(a), %{email}!"
@@ -53,40 +53,42 @@ pt-PT:
       edit: 
         change_password: "Alterar a minha senha"
       new: 
-        forgot_password: "Esqueceu-se da sua senha?"
-        send_password_instructions: "Enviar-me instruções de reposição de senha"
-      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."
+        forgot_password: "Esqueceste-te da tua senha?"
+        send_password_instructions: "Enviem-me as instruções para modificar a minha senha"
+      send_instructions: "Vais receber um email com instruções sobre como alterar a senha dentro de alguns minutos."
+      updated: "A tua senha foi alterada com sucesso. Estás online."
     registrations: 
-      destroyed: "Adeus! A sua conta foi cancelada com sucesso. Esperamos vê-lo(a) de novo brevemente."
-      signed_up: "Registou-se com sucesso. Se activado, uma confirmação foi enviada para o seu email."
-      updated: "Actualizou a sua conta com sucesso."
+      destroyed: "Adeus! A sua tua foi cancelada com sucesso. Esperamos ver-te de novo brevemente."
+      signed_up: "Registo bem sucedido. Se assim escolheste, uma confirmação foi enviada para o teu email."
+      updated: "Actualizaste a tua conta com sucesso."
     sessions: 
       new: 
-        alpha_software: "Está prestes a utilizar software \"alpha\"."
-        bugs_and_feedback: "Tenha em atenção que irão ocorrer erros. Encorajamo-lo(a) a usar o botão de Feedback na margem direita do seu navegador para denunciar quaisquer anomalias! Trabalharemos o mais rapidamente possível para resolver os problemas que denunciar."
-        have_a_problem: "Tem um problema? Encontre uma solução aqui"
+        alpha_software: "Estás preste a utilizar um programa em fase \"alpha\"."
+        bugs_and_feedback: "Tem em atenção que irão ocorrer erros. Encorajamos-te a usar o botão de Feedback na margem direita do teu navegador para reportar quaisquer anomalias! Trabalharemos o mais rapidamente possível para resolver os problemas que denunciares."
+        have_a_problem: "Tens um problema? Encontra a solução aqui"
         login: "Login"
         modern_browsers: "apenas suporta navegadores modernos."
         password: "Palavra-passe"
-        remember_me: "Lembrar-me"
+        remember_me: "Recordar-me"
         sign_in: "Entrar"
         username: "Nome de utilizador"
       signed_in: "Login com sucesso."
       signed_out: "Logout com sucesso."
     shared: 
       links: 
-        forgot_your_password: "Esqueceu-se da sua senha?"
-        receive_confirmation: "Não recebeu instruções de confirmação?"
-        receive_unlock: "Não recebeu instruções de desbloqueio?"
+        forgot_your_password: "Esqueceste-te da tua senha?"
+        receive_confirmation: "Não recebeste as instruções de confirmação?"
+        receive_unlock: "Não recebeste as instruções de desbloqueio?"
         sign_in: "Entrar"
-        sign_up: "Registar-se"
+        sign_up: "Regista-te"
         sign_up_closed: "Os registos abertos não estão disponíveis por agora."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Reenviar instruções de desbloqueio"
-      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."
+      send_instructions: "Vais receber uma mensagem sobre como desbloquear a tua conta dentro de alguns minutos."
+      unlocked: "A tua conta foi desbloqueada com sucesso. Estás online."
   errors: 
     messages: 
       already_confirmed: "já foi confirmado"
diff --git a/config/locales/devise/devise.ro.yml b/config/locales/devise/devise.ro.yml
index f6a1d3c4c1d638273bc54cd619d516f0e6557417..407536a41adf6148f5fca433da171ee930636190 100644
--- a/config/locales/devise/devise.ro.yml
+++ b/config/locales/devise/devise.ro.yml
@@ -82,6 +82,8 @@ ro:
         sign_in: "Sign in"
         sign_up: "Sign up"
         sign_up_closed: "Open signups are closed at this time."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Resend unlock instructions"
diff --git a/config/locales/devise/devise.ru.yml b/config/locales/devise/devise.ru.yml
index afc6d99b9491ad726b4f875239a34c0b9423fab5..d43cf824b98c3d700aefcaf9dbaa4d2dcbfafffc 100644
--- a/config/locales/devise/devise.ru.yml
+++ b/config/locales/devise/devise.ru.yml
@@ -8,44 +8,44 @@ ru:
     confirmations: 
       confirmed: "Ваша учётная запись подтверждена. Добро пожаловать."
       new: 
-        resend_confirmation: "Выслать повторно инструкции по подтверждению"
+        resend_confirmation: "Выслать повторно инструкции по подтверждению."
       send_instructions: "Вы получите email с указаниями по подтверждению учётной записи в течение нескольких минут."
     failure: 
-      inactive: "Ваша учётная запись не активирована."
-      invalid: "Неверный логин или пароль."
-      invalid_token: "Недопустимый символ."
+      inactive: "Ваша учётная запись ещё не активирована."
+      invalid: "Неверный email или пароль."
+      invalid_token: "Неверная проверка подлинности."
       locked: "Ваша учётная запись заблокирована."
-      timeout: "Срок вашего сеанса истёк, пожалуйста повторите процедуру представления в системе вновь."
-      unauthenticated: "Вам необходимо представиться или зарегистрироваться для продолжения."
-      unconfirmed: "Вам необходимо подтвердить свою учётную запись для продолжения."
+      timeout: "Срок вашего сеанса истёк, пожалуйста войдите в систему вновь."
+      unauthenticated: "Вы должны войти или зарегистрироваться, прежде чем продолжить."
+      unconfirmed: "Вам необходимо подтвердить свою учётную запись, прежде чем продолжить."
     invitations: 
-      invitation_token_invalid: "Код приглошения введён не правильно!"
-      send_instructions: "Ваше приглошение отправленно."
+      invitation_token_invalid: "Введённый вами код приглашения не действителен!"
+      send_instructions: "Ваше приглашение отправлено."
       updated: "Пароль установлен. Добро пожаловать."
     mailer: 
       confirmation_instructions: 
         confirm: "Подтвердить мой аккаунт"
-        subject: "Инструкция для подтверждения"
+        subject: "Инструкции по подтверждению"
         you_can_confirm: "Вы можете подтвердить ваш аккаунт перейдя по ссылке: "
       hello: "Привет %{email}!"
       invitation: 
         accept: "Принять приглашение"
         ignore: "Если вы не хотите принимать приглашение, пожалуйста, проигнорируйте это письмо."
-        no_account_till: "Ваш аккаунт не будет  пока вы не перейдёте по ссылке и не зарегистрируетесь."
-        subject: "Вас пригласили присоединиться к Диаспоре! "
+        no_account_till: "Ваш аккаунт не будет создан пока, вы не перейдёте по ссылке и не зарегистрируетесь."
+        subject: "Вас пригласили присоединиться к Диаспоре!"
       inviters: 
         accept_at: "вы можете принять его, перейдя по ссылке %{url}"
         has_invited_you: "%{name} приглашает вас присоединиться к Диаспоре"
-        have_invited_you: "%{names} пригласил(а) вас присоединиться к Диаспоре"
+        have_invited_you: "%{names} приглашает вас присоединиться к Диаспоре"
       reset_password_instructions: 
         change: "Сменить пароль"
         ignore: "Если вы не запрашивали этого, пожалуйста, проигнорируйте это письмо."
         someone_requested: "Кто то создал запрос смены вашего пароля, и вы можете сделать это перейдя по ссылке ниже."
-        subject: "Инструкция по сбросу пароля"
+        subject: "Инструкции по сбросу пароля"
         wont_change: "Ваш пароль не изменится, пока вы не перейдёте по ссылке и не создадите новый."
       unlock_instructions: 
         account_locked: "Ваша учетная запись была заблокирована из-за чрезмерного количества неудачных попыток входа."
-        click_to_unlock: "Нажмите на ссылку, чтобы разблокировать учётную запись:"
+        click_to_unlock: "Перейдите по ссылке, чтобы разблокировать учётную запись:"
         subject: "Инструкции по разблокированию"
         unlock: "Разблокировать мою учётную запись"
       welcome: "Добро пожаловать %{email}!"
@@ -60,13 +60,13 @@ ru:
     registrations: 
       destroyed: "До свиданья! Ваша учётная запись удалена. Мы будем рады видеть вас вновь."
       signed_up: "Регистрация учётной записи завершена. Вам отправлен email с дальнейшими указаниями."
-      updated: "Информация о вашей учётной запись обновлена."
+      updated: "Информация о вашей учётной записи обновлена."
     sessions: 
       new: 
         alpha_software: "Вы собираетесь использовать альфа версию программного обеспечения."
         bugs_and_feedback: "Имейте в виду, вы будете сталкиваться с ошибками. Мы рекомендуем вам использовать кнопку Обратная связь с правой стороны браузера! Мы будем решать ошибки так быстро, как сможем."
         have_a_problem: "Столкнулись с проблемой? Попробуйте найти ответ здесь"
-        login: "E-mail или логин"
+        login: "Логин"
         modern_browsers: "поддерживает только современные браузеры."
         password: "Пароль"
         remember_me: "Запомнить меня"
@@ -77,14 +77,16 @@ ru:
     shared: 
       links: 
         forgot_your_password: "Забыли пароль?"
-        receive_confirmation: "Не получили инструкцию по подтверждению?\n"
-        receive_unlock: "Не получили инструкции по разблокированию ?\n"
+        receive_confirmation: "Не получили инструкции по подтверждению?"
+        receive_unlock: "Не получили инструкции по разблокированию?"
         sign_in: "Войти"
         sign_up: "Регистрация"
-        sign_up_closed: "Открытая регистрация на данный момент не доступна."
+        sign_up_closed: "Регистрация на данный момент не доступна."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
-        resend_unlock: "Отправить повторно инструкцию по разблокированию"
+        resend_unlock: "Отправить повторно инструкции по разблокированию"
       send_instructions: "Вы получите email с указаниями по разблокированнию учётной записи в течение нескольких минут."
       unlocked: "Ваша учётная запись разблокированна. С возвращением."
   errors: 
diff --git a/config/locales/devise/devise.sk.yml b/config/locales/devise/devise.sk.yml
index 6e38ea4cfc2a792cfab14e09787ed3c7af2176f2..d7c906d39dfdc261e98f5028524f4f7c1bd2367e 100644
--- a/config/locales/devise/devise.sk.yml
+++ b/config/locales/devise/devise.sk.yml
@@ -82,6 +82,8 @@ sk:
         sign_in: "Prihlásiť"
         sign_up: "Zaregistrovať"
         sign_up_closed: "Momentálne sú ďalšie registrácie pozastavené."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Zaslať návod na odblokovanie"
diff --git a/config/locales/devise/devise.sv.yml b/config/locales/devise/devise.sv.yml
index bc1be8368689af8d1c298f94e30530a0369b8801..90fadcebce361f003986280f290793393d6957b2 100644
--- a/config/locales/devise/devise.sv.yml
+++ b/config/locales/devise/devise.sv.yml
@@ -82,6 +82,8 @@ sv:
         sign_in: "Logga in"
         sign_up: "Registrera dig"
         sign_up_closed: "Formuläret för att bli medlem är tyvärr stängt."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Skicka upplåsningsinstruktioner igen"
diff --git a/config/locales/devise/devise.tr.yml b/config/locales/devise/devise.tr.yml
index 6af19f4ad53972a3b1d601cb29a12b7bbbc41266..ff94d7affffc6d61c60b0b418eabb7c78166d988 100644
--- a/config/locales/devise/devise.tr.yml
+++ b/config/locales/devise/devise.tr.yml
@@ -82,6 +82,8 @@ tr:
         sign_in: "GiriÅŸ Yap"
         sign_up: "Ãœye Ol"
         sign_up_closed: "Open signups are closed at this time."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
     unlocks: 
       new: 
         resend_unlock: "Resend unlock instructions"
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 87b294e73f077fc3d81ccd5ac676ef97d2cd4d3a..e83fe4514b39e9ac85260ece7a1c8f8f7ff15490 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -40,6 +40,10 @@ ar:
       success: ".من الذي يمكنه مشاهدة مظهرك الجديد Diaspora انقر على علامة الزائد على الجانب الأيسر لتقول ل"
     destroy: 
       success: ".بنجاح %{name} تم إزالة"
+    edit_aspect_pane: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Remove aspect?"
+      remove_aspect: "Remove Aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "الجانب ليس فارغ"
@@ -75,8 +79,6 @@ ar:
       family: "Family"
       work: "Work"
     show: 
-      contact: "contact"
-      contacts: "contacts"
       edit_aspect: "edit aspect"
     update: 
       success: ".بنجاح %{name} تم تعديل"
@@ -86,6 +88,11 @@ ar:
     new_comment: 
       comment: "تعليق"
       commenting: "Commenting..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Eliminar"
   email: "Email"
   error_messages: 
@@ -134,6 +141,11 @@ ar:
       login: "login"
       logout: "logout"
       view_profile: "view profile"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "the diaspora email robot"
     hello: "Hello %{name}!"
@@ -283,16 +295,13 @@ ar:
       aspect_settings: "Aspect settings"
       aspects: "Aspects"
       confirm_remove_aspect: "Remove aspect?"
-      contacts: "contacts"
       done_editing: "done editing"
       invites: "Invites"
-      new_request: "%{count} new request!"
-      new_requests: "%{count} new requests!"
       no_contacts: "You currently have no contacts.  Find your contacts here."
       remove_aspect: "Remove Aspect"
     contact_list: 
+      all_contacts: "All contacts"
       cannot_remove: "Cannot remove person from last aspect."
-      search_contacts: "Search contacts"
     invitations: 
       dont_have_now: "You don't have any right now, but more invites are coming soon!"
       invitations_left: "(%{count} left)"
@@ -316,8 +325,6 @@ ar:
       share_with_all: "Share with all aspects"
     reshare: 
       reshare: "Reshare"
-    stream_element: 
-      show_comments: "show comments"
   status_messages: 
     helper: 
       no_message_to_display: "لا يوجد رسالة لعرضها"
@@ -326,6 +333,9 @@ ar:
       tell_me_something_good: "قل لي شيئا جيداً"
     show: 
       destroy: "إزالة"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "the world"
   username: "Username"
   users: 
@@ -352,7 +362,10 @@ ar:
         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."
+        drag_to_add: "Drag them to the aspect of yourself they know"
+        no_requests: "You have no requests"
         your_aspects: "Your aspects"
+        your_inviter: "Here are the people who are waiting for you:"
       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"
diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d36a9322fd587fc33fd4c5ede82f06ee783d6c5e
--- /dev/null
+++ b/config/locales/diaspora/ca.yml
@@ -0,0 +1,387 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+ca: 
+  _comments: "Comments"
+  _home: "Home"
+  _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: "Your new aspect %{name} was created"
+    destroy: 
+      success: "%{name} was successfully removed."
+    edit_aspect_pane: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Remove aspect?"
+      remove_aspect: "Remove Aspect"
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "Aspect not empty"
+      remove: "remove"
+    index: 
+      handle_explanation: "This is your diaspora handle. Like an email address, you can give this to people to reach you."
+    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: "Bring the people that matter in your life 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"
+    seed: 
+      family: "Family"
+      work: "Work"
+    show: 
+      edit_aspect: "edit aspect"
+    update: 
+      success: "Your aspect, %{name}, has been successfully edited."
+  back: "Back"
+  cancel: "Cancel"
+  comments: 
+    new_comment: 
+      comment: "Comment"
+      commenting: "Commenting..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
+  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?"
+      choice: "Choice"
+      choice_explanation: "Diaspora lets you sort your connections into groups called aspects. Unique to Diaspora, aspects ensure that your photos, stories and jokes are shared only with the people you intend."
+      learn_about_host: "Learn about how to host your own Diaspora server."
+      login_here: "log in here"
+      ownership: "Ownership"
+      ownership_explanation: "You own your pictures, and you shouldn’t have to give that up just to share them. You maintain ownership of everything you share on Diaspora, giving you full control over how it's distributed."
+      share_what_you_want: "Share what you want, with whom you want."
+      simplicity: "Simplicity"
+      simplicity_explanation: "Diaspora makes sharing clean and easy – and this goes for privacy too. Inherently private, Diaspora doesn’t make you wade through pages of settings and options just to keep your profile secure."
+  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."
+      rejected: "The following email addresses had problems: "
+      sent: "Invitations have been sent to: "
+    edit: 
+      sign_up: "sign_up"
+    new: 
+      comma_seperated_plz: "You can enter multiple email addresses separated by commas."
+      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"
+      edit_profile: "edit profile"
+      login: "login"
+      logout: "logout"
+      view_profile: "view profile"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
+  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 within Diaspora"
+      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"
+      cannot_remove: "Cannot remove %{name} from last aspect. (If you want to disconnect from this person you must remove contact.)"
+      edit_my_profile: "Edit my profile"
+      gender: "gender"
+      in_aspects: "in aspects"
+      remove_contact: "remove contact"
+      remove_from: "Remove %{name} from %{aspect}?"
+    show: 
+      already_requested: "You have already sent a request to %{name}."
+      does_not_exist: "Person does not exist!"
+      incoming_request: "You have an incoming request from this person."
+      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."
+      return_to_aspects: "Return to your aspects page"
+      to_accept_or_ignore: "to accept or ignore it."
+    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: 
+      empty: "{file} is empty, please select files again without it."
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      delete_photo: "Delete Photo"
+      edit: "edit"
+      edit_delete_photo: "Edit photo description / delete photo"
+      make_profile_photo: "make profile photo"
+      original_post: "Original Post"
+      update_photo: "Update Photo"
+      view: "view"
+    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."
+    destroy: 
+      error: "Please select an aspect!"
+      ignore: "Ignored contact request."
+      success: "You are now friends."
+    manage_aspect_contacts: 
+      existing: "Existing contacts"
+      manage_within: "Manage contacts within"
+    new_request_to_person: 
+      sent: "sent!"
+  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: 
+    add_contact: 
+      create_request: "Find by Diaspora handle"
+      diaspora_handle: "Diaspora Handle"
+      enter_a_diaspora_username: "Enter a Diaspora username:"
+      know_email: "Know their email address? You should invite them"
+      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+    aspect_contacts: 
+      add_aspect: "add aspect"
+      add_existing: "Add an existing contact"
+      add_to: "add to %{aspect}"
+      all_contacts: "All contacts"
+      aspect_settings: "Aspect settings"
+      aspects: "Aspects"
+      confirm_remove_aspect: "Remove aspect?"
+      done_editing: "done editing"
+      invites: "Invites"
+      no_contacts: "You currently have no contacts.  Find your contacts here."
+      remove_aspect: "Remove Aspect"
+    contact_list: 
+      all_contacts: "All contacts"
+      cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
+    invitations: 
+      dont_have_now: "You don't have any right now, but more invites are coming soon!"
+      invitations_left: "(%{count} left)"
+      invite_someone: "Invite someone"
+    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: 
+      add_photos: "add photos"
+      all: "all"
+      all_contacts: "all contacts"
+      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 across all of your aspects"
+    reshare: 
+      reshare: "Reshare"
+  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"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
+  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"
+      new_password: "New Password"
+      your_email: "Your email"
+      your_handle: "Your diaspora handle"
+    getting_started: 
+      connect_services: "Connect your other services"
+      define_aspects: "Define your aspects"
+      edit_profile: "Edit your profile"
+      finished: "Finished!"
+      save_and_continue: "Save and continue"
+      signup_steps: "Finish your sign up by completing these three steps:"
+      skip: "skip getting started"
+      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 through your account menu at the top right. Your aspects are unique to you and not visible by others."
+        drag_to_add: "Drag them to the aspect of yourself they know"
+        no_requests: "You have no requests"
+        your_aspects: "Your aspects"
+        your_inviter: "Here are the people who are waiting for you:"
+      step_3: 
+        description: "You are able to connect your existing social networks to your Diaspora account. You will be able to post publically through your Home page when you select “make public\""
+        your_services: "Your services"
+      step_4: 
+        change_profile: "You can edit your profile and manage your connected services at any time through "
+        continue: "Continue on to your Home page, an overview of all of your aspects."
+        finish: "Finish"
+        manage_aspects: "You can also add contacts while on any aspect page."
+        ready_to_share: "You're now ready to start sharing with "
+        set_up: "You're all set up, %{name}!"
+        user_menu: "the user menu located at the 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 6cfd673f6e515d13f301d8da52dae7f8a3b33010..1d357906bd81f6bcec8dfef1438a8db1262016cd 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -40,6 +40,10 @@ cs:
       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."
+    edit_aspect_pane: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Remove aspect?"
+      remove_aspect: "Remove Aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Aspekt není prázdný"
@@ -75,8 +79,6 @@ cs:
       family: "Family"
       work: "Work"
     show: 
-      contact: "contact"
-      contacts: "contacts"
       edit_aspect: "edit aspect"
     update: 
       success: "Váš aspekt, %{name}, byl úspěšně upraven."
@@ -86,6 +88,11 @@ cs:
     new_comment: 
       comment: "Komentář"
       commenting: "Commenting..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Delete"
   email: "Email"
   error_messages: 
@@ -134,6 +141,11 @@ cs:
       login: "login"
       logout: "logout"
       view_profile: "view profile"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "the diaspora email robot"
     hello: "Hello %{name}!"
@@ -283,16 +295,13 @@ cs:
       aspect_settings: "Aspect settings"
       aspects: "Aspects"
       confirm_remove_aspect: "Remove aspect?"
-      contacts: "contacts"
       done_editing: "done editing"
       invites: "Invites"
-      new_request: "%{count} new request!"
-      new_requests: "%{count} new requests!"
       no_contacts: "You currently have no contacts.  Find your contacts here."
       remove_aspect: "Remove Aspect"
     contact_list: 
+      all_contacts: "All contacts"
       cannot_remove: "Cannot remove person from last aspect."
-      search_contacts: "Search contacts"
     invitations: 
       dont_have_now: "You don't have any right now, but more invites are coming soon!"
       invitations_left: "(%{count} left)"
@@ -316,8 +325,6 @@ cs:
       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."
@@ -326,6 +333,9 @@ cs:
       tell_me_something_good: "pověz mi něco dobrého"
     show: 
       destroy: "Zničit"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "the world"
   username: "Username"
   users: 
@@ -352,7 +362,10 @@ cs:
         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."
+        drag_to_add: "Drag them to the aspect of yourself they know"
+        no_requests: "You have no requests"
         your_aspects: "Your aspects"
+        your_inviter: "Here are the people who are waiting for you:"
       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"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index b7113f49e2f4ca81d97bba8ee3fe1ea051e29a97..d23a12758d64cbe754582071e482aae5a41fb0cb 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -6,7 +6,7 @@
 cy: 
   _comments: "Comments"
   _home: "Home"
-  _photos: "photos"
+  _photos: "Photos"
   _services: "Services"
   account: "Account"
   activemodel: 
@@ -15,13 +15,13 @@ cy:
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "is already taken"
+              taken: "Is already taken"
         user: 
           attributes: 
             email: 
-              taken: "is already taken"
+              taken: "Is already taken"
             person: 
-              invalid: "is invalid"
+              invalid: "Is invalid"
             username: 
               taken: "is already taken"
   ago: "ago"
@@ -40,6 +40,10 @@ cy:
       success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
     destroy: 
       success: "%{name} was successfully removed."
+    edit_aspect_pane: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Remove aspect?"
+      remove_aspect: "Remove Aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Aspect not empty"
@@ -75,8 +79,6 @@ cy:
       family: "Family"
       work: "Work"
     show: 
-      contact: "contact"
-      contacts: "contacts"
       edit_aspect: "edit aspect"
     update: 
       success: "Your aspect, %{name}, has been successfully edited."
@@ -86,6 +88,11 @@ cy:
     new_comment: 
       comment: "Sylw"
       commenting: "Commenting..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Delete"
   email: "Email"
   error_messages: 
@@ -134,6 +141,11 @@ cy:
       login: "login"
       logout: "logout"
       view_profile: "view profile"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "the diaspora email robot"
     hello: "Hello %{name}!"
@@ -283,16 +295,13 @@ cy:
       aspect_settings: "Aspect settings"
       aspects: "Aspects"
       confirm_remove_aspect: "Remove aspect?"
-      contacts: "contacts"
       done_editing: "done editing"
       invites: "Invites"
-      new_request: "%{count} new request!"
-      new_requests: "%{count} new requests!"
       no_contacts: "You currently have no contacts.  Find your contacts here."
       remove_aspect: "Remove Aspect"
     contact_list: 
+      all_contacts: "All contacts"
       cannot_remove: "Cannot remove person from last aspect."
-      search_contacts: "Search contacts"
     invitations: 
       dont_have_now: "You don't have any right now, but more invites are coming soon!"
       invitations_left: "(%{count} left)"
@@ -316,8 +325,6 @@ cy:
       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."
@@ -326,6 +333,9 @@ cy:
       tell_me_something_good: "Dwi eisiau clywed rhwbeth da"
     show: 
       destroy: "Dinistrio"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "the world"
   username: "Username"
   users: 
@@ -352,7 +362,10 @@ cy:
         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."
+        drag_to_add: "Drag them to the aspect of yourself they know"
+        no_requests: "You have no requests"
         your_aspects: "Your aspects"
+        your_inviter: "Here are the people who are waiting for you:"
       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"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 67a7afb50e0e796bdc9fcf79b189b2606b4c13a5..55c7bffde44a2b3e3d408efd51ab78584775209b 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -6,7 +6,7 @@
 da: 
   _comments: "Kommentarer"
   _home: "Hjem"
-  _photos: "foto"
+  _photos: "Foto"
   _services: "Tjenester"
   account: "Konto"
   activemodel: 
@@ -40,6 +40,10 @@ da:
       success: "Klik på pluset i venstre side for at fortælle diaspora, hvem der kan se dit nye aspekt."
     destroy: 
       success: "%{name} fjernet."
+    edit_aspect_pane: 
+      add_existing: "Tilføj eksisterende kontakt"
+      confirm_remove_aspect: "Fjern aspekt?"
+      remove_aspect: "Fjern Aspekt"
     helper: 
       are_you_sure: "Er du sikker på du vil slette dette aspekt?"
       aspect_not_empty: "Aspektet er ikke tom"
@@ -75,9 +79,7 @@ da:
       family: "Familie"
       work: "Arbejde"
     show: 
-      contact: "contact"
-      contacts: "contacts"
-      edit_aspect: "edit aspect"
+      edit_aspect: "redigér aspekt"
     update: 
       success: "Dit aspekt, %{name}, er nu blevet redigeret."
   back: "Tilbage"
@@ -86,6 +88,11 @@ da:
     new_comment: 
       comment: "Kommenter"
       commenting: "Kommentering ..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Slet"
   email: "Email"
   error_messages: 
@@ -97,11 +104,11 @@ da:
     show: 
       already_account: "har du allerede en konto?"
       choice: "Vælg"
-      choice_explanation: "Diaspora allows you to sort your connections into groups called Aspects. Unique to Diaspora, Aspects ensure your photos, stories and jokes are shared with only the people you want them to be."
-      learn_about_host: "Learn about how to host your own Diaspora server"
+      choice_explanation: "Diaspora lader dig sortere dine kontakter i grupper kaldet aspekter. Diaspora er unik idet aspekter sikrer at dine fotos, historier og vittigheder kun er delt med dem du vil. "
+      learn_about_host: "Se hvordan man hoster sin egen Diaspora server."
       login_here: "log ind her"
       ownership: "Ejerskab"
-      ownership_explanation: "You own your pictures, and you shouldn’t have to give that up just in order to share them. You maintain ownership of everything you share on Diaspora, giving you full control over how it is distributed."
+      ownership_explanation: "Du ejer dine billeder, og burde ikke opgive rettighederne over dem bare for at dele dem. Du beholder ejerskab over alt du deler på Diaspora, hvilket giver dig fuld kontrol over hvordan det bliver distribueret."
       share_what_you_want: "Del hvad du vil, med hvem du vil."
       simplicity: "Enkelhed"
       simplicity_explanation: "Diaspora makes sharing clean and easy – this goes doubly so for privacy. Innherently private, Diaspora doesn’t have pages of settings and options to wade through to keep your profile secure and to your liking."
@@ -112,12 +119,12 @@ da:
       already_contacts: "Du er allerede forbundet med denne person"
       already_sent: "Du har allerede inviteret denne person."
       no_more: "Du har ikke flere invitationer."
-      rejected: "The following email addresses had problems: "
+      rejected: "Der var problemer med de følgende email adresser: "
       sent: "Din invitation er blevet sendt."
     edit: 
       sign_up: "Bliv medlem"
     new: 
-      comma_seperated_plz: "You can enter multiple email addresses separated by commas."
+      comma_seperated_plz: "Du kan indtaste flere emailadresser adskilt med komma."
       if_they_accept_info: "hvis de accepterer, vil de blive tilføjet det aspekt du har inviteret dem til"
       invite_someone_to_join: "Invitere en person til Diaspora!"
       message: "Besked:"
@@ -134,6 +141,11 @@ da:
       login: "log in"
       logout: "log ud"
       view_profile: "vis profil"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "Diaspora email robotten"
     hello: "Hej %{name}!"
@@ -188,7 +200,7 @@ da:
     show: 
       already_requested: "Du har allerede sendt en forespørgsel til %{name}."
       does_not_exist: "Personen findes ikke!"
-      incoming_request: "You have an incoming request from this person."
+      incoming_request: "Du har en anmodning fra denne person."
       no_posts: "ingen indlæg at vise!"
       not_connected: "Du er ikke forbundet med denne person"
       request_people: "Hvis du ønsker, kan du anmode om at placere ham/hende i et af dine aspekter."
@@ -270,31 +282,28 @@ da:
   settings: "Indstillinger"
   shared: 
     add_contact: 
-      create_request: "Find by Diaspora handle"
+      create_request: "Find med Diaspora handle"
       diaspora_handle: "Diaspora handle"
       enter_a_diaspora_username: "Indtast et Diaspora brugernavn:"
-      know_email: "Know their email address? You should invite them"
+      know_email: "Kender du deres emails? Så invitér dem"
       your_diaspora_username_is: "Dit Diaspora brugernavn er: %{diaspora_handle}"
     aspect_contacts: 
       add_aspect: "tilføj aspect"
       add_existing: "Tilføj eksisterende kontakt"
       add_to: "tilføj til %{aspect}"
-      all_contacts: "All contacts"
+      all_contacts: "Alle kontakter"
       aspect_settings: "Aspect indstillinger"
       aspects: "Aspects"
       confirm_remove_aspect: "Fjern aspect?"
-      contacts: "kontakter"
-      done_editing: "done editing"
-      invites: "Invites"
-      new_request: "%{count} new request!"
-      new_requests: "%{count} new requests!"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
-      remove_aspect: "Remove Aspect"
+      done_editing: "redigering færdig"
+      invites: "Inviterede"
+      no_contacts: "Du har lige nu ingen kontakter. Find dem her."
+      remove_aspect: "Fjern Aspekt"
     contact_list: 
-      cannot_remove: "Cannot remove person from last aspect."
-      search_contacts: "Søg kontakter"
+      all_contacts: "Alle kontakter"
+      cannot_remove: "Kan ikke fjerne person fra sidste aspekt."
     invitations: 
-      dont_have_now: "You don't have any right now, but more invites are coming soon!"
+      dont_have_now: "Du har ikke nogen lige nu, men der kommer snart flere inviterede!"
       invitations_left: "(%{count} tilbage)"
       invite_someone: "Inviter en person"
     notification: 
@@ -305,9 +314,9 @@ da:
       outside: "Offentlige meddelelser vil være tilgængelige for andre uden for Diaspora."
       title: "Du er ved at skrive en offentlig besked!"
     publisher: 
-      add_photos: "add photos"
+      add_photos: "tilføj billeder"
       all: "alle"
-      all_contacts: "all contacts"
+      all_contacts: "alle kontaktpersoner"
       make_public: "offentliggøre"
       post_a_message_to: "Send en besked til %{aspect}"
       posting: "Sender..."
@@ -316,8 +325,6 @@ da:
       share_with_all: "Del med alle aspekter"
     reshare: 
       reshare: "Del igen"
-    stream_element: 
-      show_comments: "vis kommentarer"
   status_messages: 
     helper: 
       no_message_to_display: "Ingen beskeder at vise."
@@ -326,6 +333,9 @@ da:
       tell_me_something_good: "fortælle mig noget godt"
     show: 
       destroy: "Ødelæg"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "verdenen"
   username: "Brugernavn"
   users: 
@@ -338,8 +348,8 @@ da:
       download_xml: "downloade min xml"
       export_data: "Exporter data"
       new_password: "Ny adgangskode"
-      your_email: "Your email"
-      your_handle: "Your diaspora handle"
+      your_email: "Din email"
+      your_handle: "Dit diaspora handle"
     getting_started: 
       connect_services: "Tilslut dine tjenester"
       define_aspects: "Definer dine aspekter"
@@ -352,7 +362,10 @@ da:
         add: "Tilføj"
         aspect_name: "Aspekt navn"
         description: "Fortæl Diaspora hvilke forskellige aspekter af jer der er set af dine forskellige kontakter. Du kan administrere disse senere ved at klikke på administer fanen øverst til højre. Dine aspekter er unikke, og er ikke synlige for andre."
+        drag_to_add: "Træk dem til det aspekt af dig de kender"
+        no_requests: "You have no requests"
         your_aspects: "Dine aspekter"
+        your_inviter: "Her er personerne der venter på dig:"
       step_3: 
         description: "Tilslut dine eksisterende sociale netværk til din Diaspora konto. Du vil være i stand til at sende offentligt gennem din Enhver fane, når du vælger \"offentlige\"."
         your_services: "Dine tjenester"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 840089b796903c4948d2a2c65781d31d02deccfb..3c9d68597248b47dd521edd84dbfa5d14aea7a67 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -40,6 +40,10 @@ de:
       success: "Dein neuer Aspekt %{name} wurde erstellt."
     destroy: 
       success: "Aspekt %{name} wurde erfolgreich entfernt."
+    edit_aspect_pane: 
+      add_existing: "Füge einen bestehenden Kontakt hinzu"
+      confirm_remove_aspect: "Aspekt entfernen?"
+      remove_aspect: "Aspekt entfernen"
     helper: 
       are_you_sure: "Bist du sicher, dass du diesen Aspekt löschen möchtest?"
       aspect_not_empty: "Aspekt ist nicht leer."
@@ -75,8 +79,6 @@ de:
       family: "Familie"
       work: "Arbeit"
     show: 
-      contact: "Kontakt"
-      contacts: "Kontakte"
       edit_aspect: "Aspekt bearbeiten"
     update: 
       success: "Dein Aspekt %{name} wurde erfolgreich bearbeitet."
@@ -86,6 +88,11 @@ de:
     new_comment: 
       comment: "Kommentieren"
       commenting: "Kommentieren..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Löschen"
   email: "E-Mail"
   error_messages: 
@@ -134,6 +141,11 @@ de:
       login: "Anmelden"
       logout: "Abmelden"
       view_profile: "Profil zeigen"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "dein Diaspora-E-Mail-Roboter"
     hello: "Hallo %{name}!"
@@ -283,16 +295,13 @@ de:
       aspect_settings: "Aspekt-Einstellungen"
       aspects: "Aspekte"
       confirm_remove_aspect: "Aspekt löschen?"
-      contacts: "Kontakte"
       done_editing: "Bearbeitung fertig"
       invites: "Einladungen"
-      new_request: "%{count} neue Anfrage!"
-      new_requests: "%{count} neue Anfragen!"
       no_contacts: "Du hast momentan keine Kontakte. Finde deine Freunde hier."
       remove_aspect: "Aspekt löschen"
     contact_list: 
+      all_contacts: "Alle Kontakte"
       cannot_remove: "Kontakt kann nicht aus dem letzten Aspekt entfernt werden."
-      search_contacts: "Kontakte durchsuchen"
     invitations: 
       dont_have_now: "Du hast keine Einladungen mehr übrig. Es wird bald wieder neue geben!"
       invitations_left: "(%{count} übrig)"
@@ -316,8 +325,6 @@ de:
       share_with_all: "Mit allen Aspekten teilen"
     reshare: 
       reshare: "Erneut senden an"
-    stream_element: 
-      show_comments: "Kommentare anzeigen"
   status_messages: 
     helper: 
       no_message_to_display: "Keine Nachricht zum Anzeigen."
@@ -326,6 +333,9 @@ de:
       tell_me_something_good: "Was gibt es Neues?"
     show: 
       destroy: "Entfernen"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "die Welt"
   username: "Benutzername"
   users: 
@@ -352,7 +362,10 @@ de:
         add: "Hinzufügen"
         aspect_name: "Name des Aspekts"
         description: "Sage Diaspora welche verschiedenen Aspekte von dir von verschiedenen Kontakten gesehen werden sollen. Du kannst diese später verwalten, indem du auf Verwalten oben rechts klickst. Deine Aspekte sind nur für dich und nicht für Andere sichtbar."
+        drag_to_add: "Ziehe sie in einen deiner Aspekte"
+        no_requests: "You have no requests"
         your_aspects: "Deine Aspekte"
+        your_inviter: "Hier sind die Leute, die auf dich warten:"
       step_3: 
         description: "Du kannst deine gewohnten sozialen Netzwerke mit deinem Diaspora-Konto verbinden. Du kannst auch deine Nachrichten außerhalb von Diaspora veröffentlichen, wenn du 'öffentlich machen' auswählst."
         your_services: "Deine Dienste"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 4b5f5ecade348400d98c98b0d7da2b0f7e0980ab..5269280cbbe8ce24400c916fd3616947838f623a 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -40,6 +40,10 @@ el:
       success: "Η νέα σας πτυχή %{name} δημιουργήθηκε"
     destroy: 
       success: "%{name} αφαιρέθηκε επιτυχώς."
+    edit_aspect_pane: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Remove aspect?"
+      remove_aspect: "Remove Aspect"
     helper: 
       are_you_sure: "Θέλεις να διαγράψεις αυτή την πτυχή;"
       aspect_not_empty: "Η πτυχή δεν είναι άδεια"
@@ -75,8 +79,6 @@ el:
       family: "Οικογένεια"
       work: "Εργασία"
     show: 
-      contact: "επαφή"
-      contacts: "επαφές"
       edit_aspect: "επεξεργασία πτυχής"
     update: 
       success: "Η πτυχή σας,% {name}, έχει επεξεργαστεί επιτυχώς."
@@ -86,6 +88,11 @@ el:
     new_comment: 
       comment: "Σχόλιο"
       commenting: "Σχολιάζει..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Διαγραφή"
   email: "Email"
   error_messages: 
@@ -102,7 +109,7 @@ el:
       login_here: "συνδεθείτε εδώ"
       ownership: "Ιδιοκτησία"
       ownership_explanation: "Οι φωτογραφίες σας είναι δική σας ιδιοκτησία, και δεν πρέπει να κάνετε παραχωρήσεις απλά και μόνο για  να τις μοιραστείτε. Στο Diaspora διατηρήτε την κυριότητα για ότι μοιράζεστε, ενώ έχετε τον πλήρη έλεγχο για το πώς θα διανεμηθεί."
-      share_what_you_want: "Μοιραστείτε αυτό που θέλετε, με οποίον θέλετε."
+      share_what_you_want: "Μοιραστείτε αυτό που θέλετε, με όποιον θέλετε."
       simplicity: "Απλότητα"
       simplicity_explanation: "Το Diaspora σας επιτρέπει να μοιράζεστε εύκολα και διάφανα – και αυτό ισχύει και για την ιδιωτικότητά σας. Από τη φύση του ιδιωτικό, το Diaspora δεν έχει σελίδες επί σελίδων με ρυθμίσεις και επιλογές για να διατηρήσετε το προφίλ σας ασφαλές."
   invitations: 
@@ -112,13 +119,13 @@ el:
       already_contacts: "Είστε ήδη συνδεθεί με αυτό το πρόσωπο"
       already_sent: "Έχετε ήδη προσκαλέσει αυτό το πρόσωπο."
       no_more: "Δεν έχετε άλλες προσκλήσεις."
-      rejected: "The following email addresses had problems: "
+      rejected: "Οι παρακάτω διευθύνσεις ηλεκτρονικού ταχυδρομείου είχαν προβλήματα:"
       sent: "Η πρόσκλησή σας έχει σταλεί."
     edit: 
       sign_up: "εγγραφή"
     new: 
-      comma_seperated_plz: "You can enter multiple email addresses separated by commas."
-      if_they_accept_info: "αν αποδεχθούν, θα προστεθούν στην πτυχή που τους καλέσατε"
+      comma_seperated_plz: "Μπορείτε να εισάγετε πολλαπλές διευθύνσεις ηλεκτρονικού ταχυδρομείου διαχωρισμένες με κόμμα."
+      if_they_accept_info: "Αν αποδεχθούν, θα προστεθούν στην πτυχή που τους καλέσατε"
       invite_someone_to_join: "Προσκαλέστε κάποιον να ενταχθεί στο Diaspora!"
       message: "Μήνυμα:"
       send_an_invitation: "Στείλε μια πρόσκληση"
@@ -134,6 +141,11 @@ el:
       login: "Είσοδος"
       logout: "αποσύνδεση"
       view_profile: "προβολή προφίλ"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "ρομπότ για τα email του δικτύου Diaspora"
     hello: "Γειά σου %{name}!"
@@ -188,12 +200,12 @@ el:
     show: 
       already_requested: "Εχετέ ήδη στείλει ένα αίτημα στον %{name}."
       does_not_exist: "Ο/Η χρήστης δεν υπάρχει!"
-      incoming_request: "You have an incoming request from this person."
+      incoming_request: "Έχετε ένα εισερχόμενη αίτημα από αυτό το πρόσωπο."
       no_posts: "Κανένα μήνυμα προς εμφάνιση!"
       not_connected: "Δεν έχετε συνδεθεί με αυτό το πρόσωπο"
       request_people: "Εάν επιθυμείτε μπορείτε να ζητήσετε την προσθήκη του/της."
-      return_to_aspects: "Return to your aspects page"
-      to_accept_or_ignore: "to accept or ignore it."
+      return_to_aspects: "Επιστροφή στη σελίδα με τις πτυχές σας"
+      to_accept_or_ignore: "να το αποδεχθεί ή να το αγνοήσει."
     update: 
       failed: "Αποτυχία ενημέρωσης προφίλ"
       updated: "Το προφίλ ενημερώθηκε επιτυχώς"
@@ -244,7 +256,7 @@ el:
       sign_up_for_diaspora: "Εγγραφείτε στο Diaspora"
   requests: 
     create: 
-      sending: "Αποστολή..."
+      sending: "Αποστολή"
       sent: "Έχετε ζητήσει να μοιραστείτε με τον/την %{name}. Θα το δουν την επόμενη φορά που θα συνδεθούν στο Diaspora."
     destroy: 
       error: "Παρακαλώ επιλέξτε μια πτυχή!"
@@ -273,28 +285,25 @@ el:
       create_request: "Εύρεση βάσει λαβής Diaspora"
       diaspora_handle: "Λαβή Diaspora"
       enter_a_diaspora_username: "Εισάγετε όνομα χρήστη Diaspora:"
-      know_email: "Know their email address? You should invite them"
+      know_email: "Γνωρίζετε τη διεύθυνση ηλεκτρονικού ταχυδρομείου τους; Καλέστε τους"
       your_diaspora_username_is: "Το όνομα χρήστη σας στο Diaspora είναι: %{diaspora_handle}"
     aspect_contacts: 
       add_aspect: "προσθήκη πτυχής"
       add_existing: "Προσθέστε μια υπάρχουσα επαφή"
       add_to: "Προσθήκη στη %{aspect}"
-      all_contacts: "All contacts"
+      all_contacts: "Όλες οι επαφές"
       aspect_settings: "Ρυθμίσεις πτυχής"
       aspects: "Πτυχές"
       confirm_remove_aspect: "Κατάργηση πτυχής;"
-      contacts: "επαφές"
       done_editing: "ολοκληρώση επεξεργασίας"
       invites: "Προσκλήσεις"
-      new_request: "%{count} νέο αίτημα!"
-      new_requests: "%{count} νέα αιτήματα!"
       no_contacts: "Έχετε αυτή τη στιγμή δεν έχετε καμία επαφή. Βρείτε τις επαφές σας εδώ."
       remove_aspect: "Κατάργηση Πτυχής"
     contact_list: 
+      all_contacts: "All contacts"
       cannot_remove: "Δεν είναι δυνατή η αφαίρεση του ατόμου από την τελευταία πτυχή. (Αν θέλετε να αποσυνδεθείτε από το πρόσωπο αυτό πρέπει να καταργήσετε την αντίστοιχη επαφή.)"
-      search_contacts: "Αναζήτηση επαφών"
     invitations: 
-      dont_have_now: "You don't have any right now, but more invites are coming soon!"
+      dont_have_now: "Δεν έχετε κάποιο δικαίωμα τώρα, αλλά περισσότερες προσκλήσεις έρχονται σύντομα!"
       invitations_left: "(%{count} απομένουν)"
       invite_someone: "Προσκαλέστε κάποιον/α"
     notification: 
@@ -316,8 +325,6 @@ el:
       share_with_all: "Μοιράσου με όλες τις πτυχές"
     reshare: 
       reshare: "Μοιράσου και πάλι"
-    stream_element: 
-      show_comments: "εμφάνιση σχολίων"
   status_messages: 
     helper: 
       no_message_to_display: "Κανένα μήνυμα"
@@ -326,6 +333,9 @@ el:
       tell_me_something_good: "πές μου κάτι καλό"
     show: 
       destroy: "Καταστροφή"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "ο κόσμος"
   username: "Όνομα Χρήστη"
   users: 
@@ -338,8 +348,8 @@ el:
       download_xml: "κατέβασε το xml μου"
       export_data: "Εξαγωγή Δεδομένων"
       new_password: "Νέος κωδικός πρόσβασης"
-      your_email: "Your email"
-      your_handle: "Your diaspora handle"
+      your_email: "Το email σας"
+      your_handle: "Η λαβή diaspora σας"
     getting_started: 
       connect_services: "Συνδέστε τις υπηρεσίες σας"
       define_aspects: "Ορίστε τις πτυχές σας"
@@ -352,7 +362,10 @@ el:
         add: "Προσθήκη"
         aspect_name: "Όνομα πτυχής"
         description: "Ενημερώστε το Diaspora σχετικά με το ποιά σημεία του προφιλ σας θα βλέπουν οι φίλοι σας. Μπορείτε να αλλάξετε αυτές τις ρυθμίσεις αργότερα επιλέγοντας το πλαίσιο manage στο πάνω δεξί άκρο του παραθύρου αυτού. Τα σχετικά στοιχεια του προφιλ σας αναφέρονται αποκλειστικά σε εσάς, κανείς αλλος χρήστης δεν έχει πρόσβαση σε αυτά."
+        drag_to_add: "Drag them to the aspect of yourself they know"
+        no_requests: "You have no requests"
         your_aspects: "Οι πτυχές σας"
+        your_inviter: "Here are the people who are waiting for you:"
       step_3: 
         description: "Μπορείτε να συνδέσετε τους λογαριασμού σας σε άλλα κοινωνικά δίκτυα με το λογαριασμό σας στο Diaspora. Θα μπορείτε να δημοσιεύσετε μέσω της Αρχική σελίδα σας όταν επιλέγετε \"δημοσιοποίησε\""
         your_services: "Οι υπηρεσίες σας"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index db8e6f316db2e63a7505752d5dc5350c7e252e12..7f0453899ee468bfe105875e3a273d16ea552818 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -40,6 +40,10 @@ eo:
       success: "Your new aspect %{name} was created"
     destroy: 
       success: "%{name} was successfully removed."
+    edit_aspect_pane: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Remove aspect?"
+      remove_aspect: "Remove Aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Aspect not empty"
@@ -75,8 +79,6 @@ eo:
       family: "Family"
       work: "Work"
     show: 
-      contact: "contact"
-      contacts: "contacts"
       edit_aspect: "edit aspect"
     update: 
       success: "Your aspect, %{name}, has been successfully edited."
@@ -86,6 +88,11 @@ eo:
     new_comment: 
       comment: "Comment"
       commenting: "Commenting..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Delete"
   email: "Email"
   error_messages: 
@@ -134,6 +141,11 @@ eo:
       login: "login"
       logout: "logout"
       view_profile: "view profile"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "the diaspora email robot"
     hello: "Hello %{name}!"
@@ -283,16 +295,13 @@ eo:
       aspect_settings: "Aspect settings"
       aspects: "Aspects"
       confirm_remove_aspect: "Remove aspect?"
-      contacts: "contacts"
       done_editing: "done editing"
       invites: "Invites"
-      new_request: "%{count} new request!"
-      new_requests: "%{count} new requests!"
       no_contacts: "You currently have no contacts.  Find your contacts here."
       remove_aspect: "Remove Aspect"
     contact_list: 
+      all_contacts: "All contacts"
       cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
-      search_contacts: "Search contacts"
     invitations: 
       dont_have_now: "You don't have any right now, but more invites are coming soon!"
       invitations_left: "(%{count} left)"
@@ -316,8 +325,6 @@ eo:
       share_with_all: "share across all of your aspects"
     reshare: 
       reshare: "Reshare"
-    stream_element: 
-      show_comments: "show comments"
   status_messages: 
     helper: 
       no_message_to_display: "No message to display."
@@ -326,6 +333,9 @@ eo:
       tell_me_something_good: "tell me something good"
     show: 
       destroy: "Destroy"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "the world"
   username: "Username"
   users: 
@@ -352,7 +362,10 @@ eo:
         add: "Add"
         aspect_name: "Aspect name"
         description: "Tell Diaspora what different aspects of you are seen by different contacts. You can manage these later through your account menu at the top right. Your aspects are unique to you and not visible by others."
+        drag_to_add: "Drag them to the aspect of yourself they know"
+        no_requests: "You have no requests"
         your_aspects: "Your aspects"
+        your_inviter: "Here are the people who are waiting for you:"
       step_3: 
         description: "You are able to connect your existing social networks to your Diaspora account. You will be able to post publically through your Home page when you select “make public\""
         your_services: "Your services"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index b24335a7e4c6c860086da7be9421f8195c5523ad..5d9957fd0b7f60ccd4e051d75734394f432e98e8 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -40,6 +40,10 @@ es-CL:
       success: "Tu nuevo aspecto %{name} fue creado"
     destroy: 
       success: "%{name} fue correctamente eliminado."
+    edit_aspect_pane: 
+      add_existing: "Agregar un contacto existente"
+      confirm_remove_aspect: "¿Eliminar aspecto?"
+      remove_aspect: "Eliminar Aspecto"
     helper: 
       are_you_sure: "¿Seguro que quieres borrar este aspecto?"
       aspect_not_empty: "El aspecto no está vacío"
@@ -75,8 +79,6 @@ es-CL:
       family: "Familia"
       work: "Trabajo"
     show: 
-      contact: "contacto"
-      contacts: "contactos"
       edit_aspect: "editar aspecto"
     update: 
       success: "Tu aspecto, %{name}, ha sido correctamente editado."
@@ -86,6 +88,11 @@ es-CL:
     new_comment: 
       comment: "Comentario"
       commenting: "Comentando..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Borrar"
   email: "Correo electrónico"
   error_messages: 
@@ -99,7 +106,7 @@ es-CL:
       choice: "Opción"
       choice_explanation: "Diaspora te permite organizar conexiones en grupos llamados aspectos. En Diaspora, los aspectos aseguran que tus fotos, historias y bromas sean compartidas sólo con la gente que tu quieras."
       learn_about_host: "Aprende como hostear tu propio servidor Diaspora."
-      login_here: "iniciar sesión aquí"
+      login_here: "inicia sesión aquí"
       ownership: "Propiedad"
       ownership_explanation: "Eres dueño de tus imágenes, y no deberías tener que cederlas sólo para compartirlas. Tú mantienes la propiedad sobre todo lo que compartas en Diaspora, dándote control total sobre lo que es distribuido."
       share_what_you_want: "Comparte lo que quieras, con quien quieras."
@@ -134,6 +141,11 @@ es-CL:
       login: "entrar"
       logout: "salir"
       view_profile: "ver perfil"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "correo robot de diaspora"
     hello: "Hola %{name}!"
@@ -283,16 +295,13 @@ es-CL:
       aspect_settings: "Configuración de aspectos"
       aspects: "Aspectos"
       confirm_remove_aspect: "¿Eliminar aspectos?"
-      contacts: "contactos"
       done_editing: "editado"
       invites: "Invitaciones"
-      new_request: "%{count} ¡nueva solicitud!"
-      new_requests: "%{count} ¡nuevas solicitudes!"
       no_contacts: "Aún no tienes contactos. Encuentra tus contactos aquí."
       remove_aspect: "Eliminar Aspecto"
     contact_list: 
+      all_contacts: "Todos los contactos"
       cannot_remove: "No se puede eliminar a la persona del último aspecto. (Si quieres desconectarte de esta persona primero debes eliminar al contacto.)"
-      search_contacts: "Buscar contactos"
     invitations: 
       dont_have_now: "No tienes ninguna ahora, ¡pero pronto vendrán mas invitaciones!"
       invitations_left: "(quedan %{count})"
@@ -316,8 +325,6 @@ es-CL:
       share_with_all: "compartir con todos tus aspectos"
     reshare: 
       reshare: "Compartir de nuevo"
-    stream_element: 
-      show_comments: "mostrar comentarios"
   status_messages: 
     helper: 
       no_message_to_display: "No hay mensaje que mostrar."
@@ -326,6 +333,9 @@ es-CL:
       tell_me_something_good: "dime algo bueno"
     show: 
       destroy: "Destruir"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "el mundo"
   username: "Nombre de usuario"
   users: 
@@ -352,7 +362,10 @@ es-CL:
         add: "Agregar"
         aspect_name: "Nombre del aspecto"
         description: "Dile a Diaspora qué aspectos diferentes de ti serán vistos por diferentes contactos. Puedes manejar estos aspectos luego en tu menú de cuenta, arriba a la derecha. Tus aspectos son solamente vistos por ti, y no por otros."
+        drag_to_add: "Arrástralos al aspecto que ellos conocen de ti mismo"
+        no_requests: "You have no requests"
         your_aspects: "Tus aspectos"
+        your_inviter: "Aquí está la gente que te está esperando:"
       step_3: 
         description: "Puedes conectar tus redes sociales existentes a tu cuenta Diaspora. Podrás realizar posteos públicos desde tu Inicio cuando selecciones \"hacer público\""
         your_services: "Tus servicios"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 2a47f5b5c0362aa952a1cad40bf20bcaf7750860..b7d591e1dd9f27b79cf016321f3f5001526554dd 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -40,6 +40,10 @@ es:
       success: "Tu nuevo aspecto %{name} ha sido creado"
     destroy: 
       success: "%{name} fue eliminado correctamente."
+    edit_aspect_pane: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Remove aspect?"
+      remove_aspect: "Remove Aspect"
     helper: 
       are_you_sure: "¿Seguro que deseas eliminar este aspecto?"
       aspect_not_empty: "Aspecto no vacío"
@@ -75,8 +79,6 @@ es:
       family: "Familia"
       work: "Trabajo"
     show: 
-      contact: "contacto"
-      contacts: "contactos"
       edit_aspect: "editar aspecto"
     update: 
       success: "Tu aspecto, %{name}, fue editado correctamente."
@@ -86,6 +88,11 @@ es:
     new_comment: 
       comment: "Comentar"
       commenting: "Comentando..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Borrar"
   email: "Correo electrónico"
   error_messages: 
@@ -134,6 +141,11 @@ es:
       login: "Ingresar"
       logout: "desconectarse"
       view_profile: "ver perfil"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "Correo robot de Diaspora"
     hello: "¡Hola %{name}!"
@@ -283,16 +295,13 @@ es:
       aspect_settings: "Configuración de aspecto"
       aspects: "Aspectos"
       confirm_remove_aspect: "Remover aspecto?"
-      contacts: "contactos"
       done_editing: "editado"
       invites: "Invitaciones"
-      new_request: "¡%{count} nueva petición!"
-      new_requests: "%¡{count} nuevas peticiones!"
       no_contacts: "Actualmente no tienes contactos. Búscalos aquí."
       remove_aspect: "Eliminar aspecto"
     contact_list: 
+      all_contacts: "All contacts"
       cannot_remove: "No se puede eliminar a la persona del último aspecto. (Si quieres desconectar a esta persona debes removerla de tus contactos.)"
-      search_contacts: "Buscar contactos"
     invitations: 
       dont_have_now: "No tienes ninguna ahora mismo, pero pronto llegarán más invitaciones!"
       invitations_left: "(quedan %{count})"
@@ -316,8 +325,6 @@ es:
       share_with_all: "Compartir con todos los aspectos"
     reshare: 
       reshare: "Compartir de nuevo"
-    stream_element: 
-      show_comments: "mostrar comentarios"
   status_messages: 
     helper: 
       no_message_to_display: "No hay mensajes que mostrar."
@@ -326,6 +333,9 @@ es:
       tell_me_something_good: "dime algo bueno"
     show: 
       destroy: "Destruir"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "el mundo"
   username: "Nombre de usuario"
   users: 
@@ -352,7 +362,10 @@ es:
         add: "Añadir"
         aspect_name: "Nombre del aspecto"
         description: "Dile a Diaspora qué aspectos diferentes de ti serán vistos por diferentes contactos. Puedes manejar estos aspectos luego en tu menú de cuenta, arriba a la derecha. Tus aspectos son solamente vistos por ti, y no por otros."
+        drag_to_add: "Drag them to the aspect of yourself they know"
+        no_requests: "You have no requests"
         your_aspects: "Tus aspectos"
+        your_inviter: "Here are the people who are waiting for you:"
       step_3: 
         description: "Puedes conectar tus redes sociales existentes con tu cuenta Diaspora. Podrás realizar posts públicos desde tu Inicio cuando selecciones \"hacer público\""
         your_services: "Tus servicios"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 1b30c5d21601e9eb58d97d1875f7b53563dc497f..17931d6a585f3a7d738939bf1f309546eeed146f 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -40,6 +40,10 @@ fi:
       success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
     destroy: 
       success: "%{name} was successfully removed."
+    edit_aspect_pane: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Remove aspect?"
+      remove_aspect: "Remove Aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Aspect not empty"
@@ -75,8 +79,6 @@ fi:
       family: "Perhe"
       work: "Työ"
     show: 
-      contact: "contact"
-      contacts: "contacts"
       edit_aspect: "edit aspect"
     update: 
       success: "Your aspect, %{name}, has been successfully edited."
@@ -84,8 +86,13 @@ fi:
   cancel: "Peruuta"
   comments: 
     new_comment: 
-      comment: "Comment"
+      comment: "Kommentoi"
       commenting: "Commenting..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Poista"
   email: "Sähköposti"
   error_messages: 
@@ -134,6 +141,11 @@ fi:
       login: "kirjaudu sisään"
       logout: "kirjaudu ulos"
       view_profile: "tarkastele profiilia"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "the diaspora email robot"
     hello: "Hei %{name}!"
@@ -180,35 +192,35 @@ fi:
       bio: "biografia"
       born: "syntynyt"
       cannot_remove: "Cannot remove %{name} from last aspect."
-      edit_my_profile: "Edit my profile"
+      edit_my_profile: "Muokkaa profiilia"
       gender: "sukupuoli"
       in_aspects: "in aspects"
       remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
       already_requested: "You have already sent a request to %{name}."
-      does_not_exist: "Person does not exist!"
+      does_not_exist: "Henkilöä ei ole olemassa!"
       incoming_request: "You have an incoming request from this person."
-      no_posts: "no posts to display!"
+      no_posts: "ei näytettäviä viestejä!"
       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."
       return_to_aspects: "Return to your aspects page"
       to_accept_or_ignore: "to accept or ignore it."
     update: 
-      failed: "Failed to update profile"
-      updated: "Profile updated"
+      failed: "Profiilin päivittäminen epäonnistui"
+      updated: "Profiili päivitetty"
   photos: 
     create: 
-      integrity_error: "Photo upload failed.  Are you sure that was an image?"
+      integrity_error: "Kuvan lataus epäonnistui. Olethan varma että kyseessä oli kuvatiedosto?"
       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."
+      notice: "Kuva poistettu."
     edit: 
       editing: "Editing"
     new: 
       back_to_list: "Back to List"
-      new_photo: "New Photo"
+      new_photo: "Uusi kuva"
       post_it: "post it!"
     new_photo: 
       empty: "{file} is empty, please select files again without it."
@@ -217,17 +229,17 @@ fi:
     photo: 
       view_all: "view all of %{name}'s photos"
     show: 
-      delete_photo: "Delete Photo"
+      delete_photo: "Poista kuva"
       edit: "muokkaa"
       edit_delete_photo: "Muokkaa kuvan kuvausta / poista kuva"
-      make_profile_photo: "make profile photo"
+      make_profile_photo: "laita profiili kuvaksi"
       original_post: "Original Post"
-      update_photo: "Update Photo"
+      update_photo: "Päivitä kuva"
       view: "view"
     update: 
-      error: "Failed to edit photo."
-      notice: "Photo successfully updated."
-  profile: "Profile"
+      error: "Kuvan muokkaus epäonnistui."
+      notice: "Kuva päivitetty onnistuneesti."
+  profile: "Profiili"
   registrations: 
     closed: "Signups are closed on this Diaspora pod."
     create: 
@@ -255,7 +267,7 @@ fi:
       manage_within: "Manage contacts within"
     new_request_to_person: 
       sent: "sent!"
-  search: "Search"
+  search: "Etsi"
   services: 
     create: 
       success: "Authentication successful."
@@ -283,16 +295,13 @@ fi:
       aspect_settings: "Aspect settings"
       aspects: "Aspects"
       confirm_remove_aspect: "Remove aspect?"
-      contacts: "contacts"
       done_editing: "done editing"
       invites: "Invites"
-      new_request: "%{count} new request!"
-      new_requests: "%{count} new requests!"
       no_contacts: "You currently have no contacts.  Find your contacts here."
       remove_aspect: "Remove Aspect"
     contact_list: 
+      all_contacts: "All contacts"
       cannot_remove: "Cannot remove person from last aspect."
-      search_contacts: "Search contacts"
     invitations: 
       dont_have_now: "You don't have any right now, but more invites are coming soon!"
       invitations_left: "(%{count} jäljellä)"
@@ -316,8 +325,6 @@ fi:
       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."
@@ -326,6 +333,9 @@ fi:
       tell_me_something_good: "tell me something good"
     show: 
       destroy: "Destroy"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "the world"
   username: "Käyttäjätunnus"
   users: 
@@ -352,7 +362,10 @@ fi:
         add: "Lisää"
         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."
+        drag_to_add: "Drag them to the aspect of yourself they know"
+        no_requests: "You have no requests"
         your_aspects: "Your aspects"
+        your_inviter: "Here are the people who are waiting for you:"
       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"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 89da6a9685c55901993fc14c5e16010481b3627a..2e8c5d97e1626ce767323e9323658586e371fc83 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -40,6 +40,10 @@ fr:
       success: "Votre nouvel aspect %{name} a été créé."
     destroy: 
       success: "%{name} a été supprimé avec succès."
+    edit_aspect_pane: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Remove aspect?"
+      remove_aspect: "Remove Aspect"
     helper: 
       are_you_sure: "Êtes-vous sûr(e) de vouloir supprimer cet aspect ?"
       aspect_not_empty: "L’aspect n’est pas vide"
@@ -75,8 +79,6 @@ fr:
       family: "Famille"
       work: "Travail"
     show: 
-      contact: "contact"
-      contacts: "contacts"
       edit_aspect: "éditer l'aspect"
     update: 
       success: "Votre aspect, %{name}, a été édité avec succès."
@@ -86,6 +88,11 @@ fr:
     new_comment: 
       comment: "Commentaire"
       commenting: "Commentaire en cours d'envoi..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Supprimer"
   email: "E-mail"
   error_messages: 
@@ -134,6 +141,11 @@ fr:
       login: "connexion"
       logout: "se déconnecter"
       view_profile: "voir le profil"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "le robot de messagerie e-mail de diaspora"
     hello: "Bonjour %{name} !"
@@ -188,12 +200,12 @@ fr:
     show: 
       already_requested: "Vous avez déjà envoyé une requête à %{name}."
       does_not_exist: "Cette personne n'existe pas !"
-      incoming_request: "You have an incoming request from this person."
+      incoming_request: "Vous avez une requête venant de cette personne."
       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."
-      return_to_aspects: "Return to your aspects page"
-      to_accept_or_ignore: "to accept or ignore it."
+      return_to_aspects: "Retourner à votre page des aspects"
+      to_accept_or_ignore: "l'accepter ou l'ignorer."
     update: 
       failed: "La mise à jour du profil a échoué"
       updated: "Profil mis à jour"
@@ -283,16 +295,13 @@ fr:
       aspect_settings: "Options de l'aspect"
       aspects: "Aspects"
       confirm_remove_aspect: "Supprimer l'aspect ?"
-      contacts: "contacts"
       done_editing: "edition terminée"
       invites: "Invitations"
-      new_request: "%{count} nouvelle requête !"
-      new_requests: "%{count} nouvelles requêtes !"
       no_contacts: "Vous n'avez aucun contact pour l'instant. Trouvez vos contacts ici."
       remove_aspect: "Supprimer l'aspect"
     contact_list: 
+      all_contacts: "All contacts"
       cannot_remove: "Impossible de supprimer la personne du dernier aspect. (Si vous voulez supprimer toute connexion avec cette personne vous devez la supprimer en tant que contact.)"
-      search_contacts: "Rechercher des contacts"
     invitations: 
       dont_have_now: "Vous n'avez aucun droit pour l'instant, mais plus d'invitations arriveront bientôt !"
       invitations_left: "(%{count} restant(s))"
@@ -316,8 +325,6 @@ fr:
       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."
@@ -326,6 +333,9 @@ fr:
       tell_me_something_good: "dites-moi quelque chose de bien"
     show: 
       destroy: "Détruire"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "le monde"
   username: "Nom d'utilisateur"
   users: 
@@ -352,7 +362,10 @@ fr:
         add: "Ajouter"
         aspect_name: "Nom de l'aspect"
         description: "Signalez à Diaspora quels différents aspects sont vus par différents contacts. Vous pourrez plus tard gérer ceux-ci en allant sur votre menu de compte en haut à droite. Vos aspects vous sont spécifiques et ne sont pas visibles pour les autres."
+        drag_to_add: "Drag them to the aspect of yourself they know"
+        no_requests: "You have no requests"
         your_aspects: "Vos aspects"
+        your_inviter: "Here are the people who are waiting for you:"
       step_3: 
         description: "Vous pouvez connecter vos réseaux sociaux existants à votre compte Diaspora. Vous pourrez poster publiquement sur votre page d'accueil en sélectionnant \"rendre public\""
         your_services: "Vos services"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 3d7b131784e4d2c55ce080414bde7c775740d053..093752c57921b4999c1976279c9be5a515cf3480 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -40,6 +40,10 @@ he:
       success: "ההיבט החדש שלך %{name} נוצר"
     destroy: 
       success: "%{name} הוסר בהצלחה."
+    edit_aspect_pane: 
+      add_existing: "הוספת איש קשר קיים"
+      confirm_remove_aspect: "האם להסיר היבט?"
+      remove_aspect: "הסרת היבט"
     helper: 
       are_you_sure: "האם אכן ברצונך למחוק היבט זה?"
       aspect_not_empty: "ההיבט אינו ריק"
@@ -75,8 +79,6 @@ he:
       family: "משפחה"
       work: "עבודה"
     show: 
-      contact: "איש קשר"
-      contacts: "אנשי קשר"
       edit_aspect: "עריכת היבט"
     update: 
       success: "ההיבט שלך, %{name}, נערך בהצלחה."
@@ -86,6 +88,11 @@ he:
     new_comment: 
       comment: "הערה"
       commenting: "נוספת הערה..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "מחיקה"
   email: "דוא״ל"
   error_messages: 
@@ -134,6 +141,11 @@ he:
       login: "כניסה"
       logout: "יציאה"
       view_profile: "צפייה בפרופיל"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "רובוט הדוא״ל של דיאספורה"
     hello: "שלום %{name}!"
@@ -271,7 +283,7 @@ he:
   shared: 
     add_contact: 
       create_request: "חיפוש לפי שם משתמש בדיאספורה"
-      diaspora_handle: "שם משתמש בדיאספורה"
+      diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "נא להזין שם משתמש בדיאספורה:"
       know_email: "כתובת הדוא״ל שלהם ידועה לך? כדאי לך להזמין אותם"
       your_diaspora_username_is: "שם המשתמש שלך בדיאספורה הוא: %{diaspora_handle}"
@@ -283,16 +295,13 @@ he:
       aspect_settings: "הגדרות היבט"
       aspects: "היבטים"
       confirm_remove_aspect: "האם להסיר היבט?"
-      contacts: "אנשי קשר"
       done_editing: "סיום העריכה"
       invites: "הזמנות"
-      new_request: "בקשה חדשה אחת!"
-      new_requests: "%{count} בקשות חדשות!"
       no_contacts: "כרגע אין לך אנשי קשר. ניתן לחפש אנשי קשר דרך כאן."
       remove_aspect: "הסרת היבט"
     contact_list: 
+      all_contacts: "כל אנשי הקשר"
       cannot_remove: "לא ניתן להסיר את איש הקשר מההיבט האחרון. (אם ברצונך להתנתק מאיש הקשר עליך להסירו מרשימת אנשי הקשר)."
-      search_contacts: "חיפוש באנשי הקשר"
     invitations: 
       dont_have_now: "אין לך כרגע, אך יתווספו לך הזמנות בקרוב!"
       invitations_left: "(%{count} נותרו)"
@@ -316,8 +325,6 @@ he:
       share_with_all: "שיתוף בין כל ההיבטים שלך"
     reshare: 
       reshare: "שיתוף מחדש"
-    stream_element: 
-      show_comments: "הצגת תגובות"
   status_messages: 
     helper: 
       no_message_to_display: "אין הודעה להצגה."
@@ -326,6 +333,9 @@ he:
       tell_me_something_good: "בא לי לשמוע סיפור נחמד"
     show: 
       destroy: "הריסה"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "העולם"
   username: "שם משתמש"
   users: 
@@ -352,7 +362,10 @@ he:
         add: "הוספה"
         aspect_name: "שם ההיבט"
         description: "כאן ניתן לספר לדיאספורה מהם ההיבטים השונים בהם אנשי הקשר שלך מסווגים. ניתן לנהל את אלו בשלב מאוחר יותר דרך תפריט החשבון בפינה השמאלית העליונה. ההיבטים שלך ייחודיים לך ואינם גלויים בפני אחרים."
+        drag_to_add: "יש לגרור אותם להיבט לו הם משויכים בעיניך"
+        no_requests: "You have no requests"
         your_aspects: "ההיבטים שלך"
+        your_inviter: "להלן רשימת האנשים הממתינים לך:"
       step_3: 
         description: "באפשרותך להתחבר לרשתות החברתיות הקיימות שלך באמצעות חשבונך בדיאספורה. תהיה באפשרותך לפרסם באופן ציבורי דרך לשונית הבית שלך בעת בחירה ב\"הפיכה לציבורי\"."
         your_services: "השירותים שלך"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
new file mode 100644
index 0000000000000000000000000000000000000000..fad68d0cc90f57443b513df53be74873dbce5544
--- /dev/null
+++ b/config/locales/diaspora/hu.yml
@@ -0,0 +1,387 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+hu: 
+  _comments: "Hozzászólások"
+  _home: "Kezdőlap"
+  _photos: "Képek"
+  _services: "Szolgáltatások"
+  account: "Felhasználói fiók"
+  activemodel: 
+    errors: 
+      models: 
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "már foglalt"
+        user: 
+          attributes: 
+            email: 
+              taken: "már foglalt"
+            person: 
+              invalid: "érvénytelen"
+            username: 
+              taken: "már foglalt"
+  ago: "ezelőtt"
+  application: 
+    helper: 
+      unknown_person: "ismeretlen személy"
+      youtube_title: 
+        unknown: "Ismeretlen videó cím"
+  are_you_sure: "Biztos vagy benne?"
+  aspects: 
+    add_to_aspect: 
+      failure: "A kapcsolatot nem sikerült felvenni a csoportba."
+      success: "A kapcsolat hozzáadva a csoporthoz."
+    create: 
+      failure: "Csoport létrehozása sikertelen."
+      success: "Új csoport létrehozva: %{name}"
+    destroy: 
+      success: "%{name} csoport sikeresen törölve."
+    edit_aspect_pane: 
+      add_existing: "Létező kapcsolat hozzáadása"
+      confirm_remove_aspect: "Törlöd a csoportot?"
+      remove_aspect: "csoport törlése"
+    helper: 
+      are_you_sure: "Biztos vagy benne, hogy törlöd ezt a csoportot?"
+      aspect_not_empty: "A csoport nem üres"
+      remove: "eltávolítás"
+    index: 
+      handle_explanation: "Ez a Te Diaspora felhasználóneved. Megadhatod elérhetőségként, mint egy email címet."
+    manage: 
+      add_a_new_aspect: "Új csoport hozzáadása"
+      add_a_new_contact: "Új ismerős hozzáadása"
+      drag_to_add: "Fogd meg és húzd ide az embereket."
+      manage_aspects: "Csoportok kezelése"
+      no_requests: "Nincs új felkérés"
+      requests: "Felkérések"
+    move_contact: 
+      error: "Hiba a kapcsolat mozgatásakor: %{inspect}"
+      failure: "nem működött: %{inspect}"
+      success: "Más csoportba tett téged."
+    new_aspect: 
+      create: "Létrehoz"
+      name: "Név"
+    no_contacts_message: 
+      add_contact: "Ismerős felvétele"
+      add_contact_to: "Adj hozzá valakit ehhez: %{aspect_name}"
+      invite: "Hívj meg valakit a Diaspora-ra!"
+      nobody: "Hozd a Diaspora-ra azokat, akik számítanak az életedben!"
+      nobody_in_aspect: "A '%{aspect_name}' csoportod üres."
+    no_posts_message: 
+      start_talking: "Senki nem szólt egy szót sem. Kezd el te!"
+    remove_from_aspect: 
+      failure: "Nem sikerült eltávolítani személyt a csoportból"
+      success: "A személyt sikeresen eltávolítottad a csoportból."
+    seed: 
+      family: "Család"
+      work: "Munka"
+    show: 
+      edit_aspect: "csoport szerkesztése"
+    update: 
+      success: "%{name} csoport szerkesztve."
+  back: "Vissza"
+  cancel: "Mégsem"
+  comments: 
+    new_comment: 
+      comment: "Hozzászólás"
+      commenting: "Hozzászólok.."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
+  delete: "Törlés"
+  email: "Email"
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Javítsd a következő hibákat, és próbáljd újra."
+      invalid_fields: "Érvénytelen adatok"
+  fill_me_out: "Tölts ki engem!"
+  home: 
+    show: 
+      already_account: "már van fiókod?"
+      choice: "Választás"
+      choice_explanation: "A Diaspora* közösségi oldalon különböző szempontok alapján Csoportokba rendezheted a kapcsolataidat. Ezek segítségével mindig a megfelelő emberekkel oszthatod meg a történeteidet, vicceidet, képeidet."
+      learn_about_host: "Így indíthatod el saját Diaspora* szervered."
+      login_here: "Jelentkezz be itt"
+      ownership: "Tulajdonos"
+      ownership_explanation: "A képeidet te birtoklod, és ezt nem kell feladnod, hogy megoszthasd őket másokkal. Minden megosztás felett teljes irányításod van a Diaspora* közösségi oldalon."
+      share_what_you_want: "Ossz meg amit akarsz, azzal akivel akarod!"
+      simplicity: "Egyszerűség"
+      simplicity_explanation: "A Diaspora könnyűvé és érthetővé teszi a megosztást - és ez a biztonságra is vonatkozik. Nem kell hosszú beállító oldalakon átvergődnöd, hogy biztonságban tudd a profilodat."
+  invitations: 
+    check_token: 
+      not_found: "Meghívó token nem található"
+    create: 
+      already_contacts: "Már kapcsolatban állsz vele."
+      already_sent: "Már meghívtad ezt a személyt."
+      no_more: "Nincs több felkérésed."
+      rejected: "Az alábbi e-mail címmel voltak problémák:"
+      sent: "Meghívók elküldve ide:"
+    edit: 
+      sign_up: "Regisztráció"
+    new: 
+      comma_seperated_plz: "Megadhatsz több e-mail címet is vesszővel elválasztva."
+      if_they_accept_info: "Ha elfogadják, akkor belekerülnek a csoportba ahová meghívtad őket."
+      invite_someone_to_join: "Hívj meg valakit, hogy csatlakozzon a Diaspora-hoz!"
+      message: "Ãœzenet:"
+      send_an_invitation: "Küldj egy meghívót"
+      send_invitation: "Meghívás küldése"
+      to: "Címzett"
+  layouts: 
+    application: 
+      powered_by: "powered by DIASPORA*"
+    header: 
+      account_settings: "Fiók beállítások"
+      blog: "blog"
+      edit_profile: "profil szerkesztése"
+      login: "belépés"
+      logout: "kilépés"
+      view_profile: "profil megtekintése"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
+  notifier: 
+    diaspora: "A diaspora email robot"
+    hello: "Szia %{name}!"
+    love: "Szeretettel,"
+    new_request: 
+      just_sent_you: "ismerősnek jelölt a Diaspora* közösségi oldalon."
+      sign_in: "jelentkezz be"
+      subject: "új Diaspora* ismerősnek jelölt: %{from}"
+      try_it_out: "Tényleg ki kellene próbálnod."
+    request_accepted: 
+      accepted: "elfogadta a jelölésed. Most már a"
+      aspect: "csoportodban van."
+      subject: "%{name} elfogadta a felkérésed."
+  ok: "Rendben"
+  or: "vagy"
+  password: "Jelszó"
+  password_confirmation: "Jelszó megerősítése"
+  people: 
+    edit: 
+      allow_search: "Megengedem, hogy megtalálható legyek a Diaspora keresési találatokban."
+      first_name: "Keresztnév"
+      info_available_to: "Ez az információ elérhető lesz Diaspora ismerőseidnek."
+      last_name: "Vezetéknév"
+      update_profile: "Profil frissítése"
+      your_bio: "Rólam"
+      your_birthday: "Születésnapom"
+      your_gender: "Nem"
+      your_name: "Neved"
+      your_photo: "Fényképed"
+      your_profile: "Profilod"
+    helper: 
+      people_on_pod_are_aware_of: "az emberek tisztában vannak"
+      results_for: "eredmények %{params}"
+    index: 
+      results_for: "találatok keresése"
+    person: 
+      add_contact: "Kapcsolat hozzáadása"
+      already_connected: "Már csatlakozott"
+      pending_request: "folyamatban lévő kérelem"
+      thats_you: "Ez vagy Te!"
+    profile_photo_upload: 
+      or_select_one: "vagy válasszon egyet a már meglévőkből"
+    profile_sidebar: 
+      bio: "Személyes"
+      born: "született"
+      cannot_remove: "Nem tudjod törölni %{name}-t az utolsó csoportodból. (Ha nem kívánsz az ismerőse lenni, törölnöd kell a kapcsolatot.)"
+      edit_my_profile: "Profilom szerkesztése"
+      gender: "nem"
+      in_aspects: "csoportokban"
+      remove_contact: "kapcsolat törlése"
+      remove_from: "Törlöd %{name}-t a %{aspect} csoportból?"
+    show: 
+      already_requested: "Már küldtél felkérést neki: %{name}."
+      does_not_exist: "Személy nem létezik!"
+      incoming_request: "Felkérésed érkezett ettől a személytől"
+      no_posts: "nincs hozzászólás!"
+      not_connected: "Ez a személy nem az ismerősöd"
+      request_people: "Ha szeretnéd felkérheted ezt a személyt az egyik csoportodba."
+      return_to_aspects: "Menj vissza a csoportokhoz"
+      to_accept_or_ignore: "hogy elfogadd vagy elutasítsd."
+    update: 
+      failed: "Profil frissítése sikertelen"
+      updated: "Profil frissítve"
+  photos: 
+    create: 
+      integrity_error: "Kép feltöltése nem sikerült. Biztos vagy benne, hogy ez egy képfájl?"
+      runtime_error: "Kép feltöltése nem sikerült. Be van kapcsolva a biztonsági öved?"
+      type_error: "Kép feltöltése nem sikerült. Biztos vagy benne, hogy egy képfájl töltöttél fel?"
+    destroy: 
+      notice: "Kép törölve."
+    edit: 
+      editing: "Szerkesztés"
+    new: 
+      back_to_list: "Vissza a listához"
+      new_photo: "Új kép"
+      post_it: "Tedd ki!"
+    new_photo: 
+      empty: "{file} egy üres fájl, hagyd ki a feltöltésből."
+      invalid_ext: "{file} érvénytelen kiterjesztés. Csak {extensions} kiterjesztések megengedettek."
+      size_error: "{file} túl nagy, maximum fájlméret {sizeLimit}."
+    photo: 
+      view_all: "%{name} összes képének megtekintése"
+    show: 
+      delete_photo: "Kép törlése"
+      edit: "szerkesztés"
+      edit_delete_photo: "Kép leírás szerkesztése / kép törlése"
+      make_profile_photo: "beállítás profilképnek"
+      original_post: "eredeti üzenet"
+      update_photo: "Kép frissítése"
+      view: "nézet"
+    update: 
+      error: "Nem sikerült szerkeszteni a képet."
+      notice: "Kép szerkesztése sikerült."
+  profile: "Profil"
+  registrations: 
+    closed: "A regisztráció zárva ezen a Diaspora kiszolgálón."
+    create: 
+      success: "Csatlakoztás a Diaspora-hoz!"
+    edit: 
+      cancel_my_account: "Fiókom törlése"
+      edit: "%{name} szerkesztése"
+      leave_blank: "(Hagyd üresen, ha nem akarod megváltoztatni)"
+      password_to_confirm: "(Szükségünk van a jelenlegi jelszavadra, hogy jóváhagyd a változást)"
+      unhappy: "Boldogtalan vagy?"
+      update: "Frissítés"
+    new: 
+      sign_up: "Regisztrálj"
+      sign_up_for_diaspora: "Regisztrálj a Diaspora-ra"
+  requests: 
+    create: 
+      sending: "Küldés"
+      sent: "%{name} felkérted a megosztásra.  Ő következő bejelentkezésekor látja majd."
+    destroy: 
+      error: "Kérlek válassz egy csoportot!"
+      ignore: "Elutasított kapcsolati felkérés."
+      success: "Barátok lettek."
+    manage_aspect_contacts: 
+      existing: "Meglévő kapcsolatok"
+      manage_within: "Kapcsolatok kezelése"
+    new_request_to_person: 
+      sent: "elküldve!"
+  search: "Keresés"
+  services: 
+    create: 
+      success: "A hitelesítés sikeres."
+    destroy: 
+      success: "Sikeresen megsemmisítetted hitelesítést."
+    index: 
+      connect_to_facebook: "Csatlakozás Facebook-hoz"
+      connect_to_twitter: "Csatlakozás Twitter-hez"
+      disconnect: "szétkapcsol"
+      logged_in_as: "bejelentkezett, mint"
+      really_disconnect: "Lecsatlakozik: %{service}?"
+  settings: "Beállítások"
+  shared: 
+    add_contact: 
+      create_request: "Keress Diaspora felhasználónév alapján"
+      diaspora_handle: "Diaspora felhasználónév"
+      enter_a_diaspora_username: "Add meg a Diaspora felhasználónevet:"
+      know_email: "Tudod az email címét? Hívd meg!"
+      your_diaspora_username_is: "Diaspora felhasználóneved: %{diaspora_handle}"
+    aspect_contacts: 
+      add_aspect: "Csoport hozzáadása"
+      add_existing: "Létező kapcsolat hozzáadása"
+      add_to: "hozzáadás ehhez: %{aspect}"
+      all_contacts: "Összes kapcsolat"
+      aspect_settings: "Csoport beállítások"
+      aspects: "Csoportok"
+      confirm_remove_aspect: "Törlöd a csoportokat?"
+      done_editing: "szerkesztés kész"
+      invites: "Felkérések"
+      no_contacts: "Jelenleg nincs ismerősöd. Itt keresd meg őket."
+      remove_aspect: "Csoport törlése"
+    contact_list: 
+      all_contacts: "Összes kapcsolat"
+      cannot_remove: "Nem törölheted az utolsó csoportot. (Ha nem akarsz a személy ismerőse lenni, töröld a kapcsolatot.)"
+    invitations: 
+      dont_have_now: "Nincs több meghívód, de hamarosan kapsz még!"
+      invitations_left: "(%{count} maradt)"
+      invite_someone: "Hívj meg valakit"
+    notification: 
+      new: "Új %{type}. Feladó: %{from}"
+    public_explain: 
+      logged_in: "bejelentkezve ide: %{service}"
+      manage: "kapcsolódó szolgáltatások kezelése"
+      outside: "A publikus üzeneteket a Diaspora-n kívüli személyek is láthatják."
+      title: "Publikus üzenetet fogsz megjelentetni!"
+    publisher: 
+      add_photos: "Képek hozzáadása"
+      all: "összes"
+      all_contacts: "összes kapcsolat"
+      make_public: "nyilvánossá tesz"
+      post_a_message_to: "Üzenet küldése ennek a csoportnak: %{aspect}"
+      posting: "Küldés..."
+      share: "Megosztás"
+      share_with: "Megosztás ezzel a csoporttal: %{aspect}"
+      share_with_all: "megosztás az összes csoportommal"
+    reshare: 
+      reshare: "Újraosztás"
+  status_messages: 
+    helper: 
+      no_message_to_display: "Nincs üzenet."
+    new_status_message: 
+      oh_yeah: "Ez az!"
+      tell_me_something_good: "Mondj valami jót!"
+    show: 
+      destroy: "Megsemmisít"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
+  the_world: "a világ"
+  username: "Felhasználónév"
+  users: 
+    destroy: "Fiók sikeresen lezárult."
+    edit: 
+      change_language: "Nyelv megváltoztatása"
+      change_password: "Jelszó módosítása"
+      close_account: "Fiók bezárása"
+      download_photos: "Képeim letöltése"
+      download_xml: "Saját XML letöltése"
+      export_data: "Adatok exportálása"
+      new_password: "Új jelszó"
+      your_email: "E-mail címed"
+      your_handle: "Diaspora felhasználóneved"
+    getting_started: 
+      connect_services: "Csatlakoztassa a többi szolgáltatását is ide"
+      define_aspects: "Csoport leírása"
+      edit_profile: "Profil szerkesztése"
+      finished: "Kész!"
+      save_and_continue: "Mentés és folytatás"
+      signup_steps: "Regisztráció utolsó 3 lépése:"
+      skip: "ugrás a kezdetekhez"
+      step_2: 
+        add: "Hozzáadás"
+        aspect_name: "Csoport neve"
+        description: "Mondd el a Diaspora-nak, hogy milyen szempontok alapján csoportosítod ismerőseid. Később is magadhatod a jobb felső sarokban lévő Fiók menüben. A csoportjaid csak Te láthatod, mások nem."
+        drag_to_add: "Tedd bele őket a megfelelő csoportba"
+        no_requests: "You have no requests"
+        your_aspects: "Csoportjaid"
+        your_inviter: "Itt azok az emberek, akik várnak rád:"
+      step_3: 
+        description: "Csatlakoztathatod más közösségi hálózatodat is a Diaspora fiókodhoz. Lehetőséged van nyilvános üzenet írására is. Ehhez a Kezdőoldalon ki kell választanod a \"nyílvánossá tesz\" opciót."
+        your_services: "Szolgáltatásai"
+      step_4: 
+        change_profile: "Bármikor módosíthatod a profilját, és kezelheted a kapcsolódó szolgáltatásokat"
+        continue: "A kezdőlapon láthatod a csoportjaid."
+        finish: "Befejezés"
+        manage_aspects: "Bármelyik csoportnál felvehetsz új ismerősöket."
+        ready_to_share: "Most már készen állsz a megosztásra"
+        set_up: "Készen is vagyunk, %{name}!"
+        user_menu: "a menü a bal felső sarokban van"
+      welcome: "Ãœdv a Diaspora*-n!"
+    public: 
+      does_not_exist: "%{username} nem létezik!"
+    update: 
+      language_changed: "Nyelv megváltozott"
+      language_not_changed: "Nyelv megváltoztatása nem sikerült"
+      password_changed: "A jelszó megváltozott"
+      password_not_changed: "Jelszó megváltoztatása nem sikerült"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 45236b7df8a5e48143817a24f41b230efa2bb4e4..2bae57c98a2cd06756ea6b09230bd01be118ee9d 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -40,6 +40,10 @@ id:
       success: "Klik pada tanda plus di sisi kiri untuk memberitahu Diaspora siapa yang dapat melihat aspek baru Anda."
     destroy: 
       success: "%{name} berhasil dihapus."
+    edit_aspect_pane: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Remove aspect?"
+      remove_aspect: "Remove Aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Aspek tidak kosong"
@@ -75,8 +79,6 @@ id:
       family: "Family"
       work: "Work"
     show: 
-      contact: "contact"
-      contacts: "contacts"
       edit_aspect: "edit aspect"
     update: 
       success: "Aspek anda, %{name}, telah berhasil diubah."
@@ -86,6 +88,11 @@ id:
     new_comment: 
       comment: "Komentar"
       commenting: "Commenting..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Delete"
   email: "Email"
   error_messages: 
@@ -134,6 +141,11 @@ id:
       login: "login"
       logout: "logout"
       view_profile: "view profile"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "the diaspora email robot"
     hello: "Hello %{name}!"
@@ -283,16 +295,13 @@ id:
       aspect_settings: "Aspect settings"
       aspects: "Aspects"
       confirm_remove_aspect: "Remove aspect?"
-      contacts: "contacts"
       done_editing: "done editing"
       invites: "Invites"
-      new_request: "%{count} new request!"
-      new_requests: "%{count} new requests!"
       no_contacts: "You currently have no contacts.  Find your contacts here."
       remove_aspect: "Remove Aspect"
     contact_list: 
+      all_contacts: "All contacts"
       cannot_remove: "Cannot remove person from last aspect."
-      search_contacts: "Search contacts"
     invitations: 
       dont_have_now: "You don't have any right now, but more invites are coming soon!"
       invitations_left: "(%{count} left)"
@@ -316,8 +325,6 @@ id:
       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."
@@ -326,6 +333,9 @@ id:
       tell_me_something_good: "katakan padaku sesuatu yang baik"
     show: 
       destroy: "Hapus"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "the world"
   username: "Username"
   users: 
@@ -352,7 +362,10 @@ id:
         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."
+        drag_to_add: "Drag them to the aspect of yourself they know"
+        no_requests: "You have no requests"
         your_aspects: "Your aspects"
+        your_inviter: "Here are the people who are waiting for you:"
       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"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 58211708000f0fd1a8e93eb8e5cc3d5d12768006..17d57e8d744599e0a68b4a3847f6de2fa1595db4 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -40,6 +40,10 @@ it:
       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."
+    edit_aspect_pane: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Remove aspect?"
+      remove_aspect: "Remove Aspect"
     helper: 
       are_you_sure: "Sei sicuro di voler cancellare questo aspetto?"
       aspect_not_empty: "Aspetto non vuoto"
@@ -75,8 +79,6 @@ it:
       family: "Famiglia"
       work: "Lavoro"
     show: 
-      contact: "contatto"
-      contacts: "contatti"
       edit_aspect: "modifica aspetto"
     update: 
       success: "Il tuo aspetto, %{name}, è stato modificato con successo."
@@ -86,6 +88,11 @@ it:
     new_comment: 
       comment: "Commento"
       commenting: "Invio commento in corso..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Cancella"
   email: "Email"
   error_messages: 
@@ -134,6 +141,11 @@ it:
       login: "accedi"
       logout: "esci"
       view_profile: "visualizza profilo"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "l'email robot di diaspora"
     hello: "Ciao %{name}!"
@@ -283,16 +295,13 @@ it:
       aspect_settings: "Impostazioni aspetto"
       aspects: "Aspetti"
       confirm_remove_aspect: "Rimuovere aspetto?"
-      contacts: "contatti"
       done_editing: "modifica completata"
       invites: "Inviti"
-      new_request: "%{count} nuova richiesta!"
-      new_requests: "%{count} nuove richieste!"
       no_contacts: "Al momento non hai contatti.  Trova i tuoi contatti qui."
       remove_aspect: "Rimuovi Aspetto"
     contact_list: 
+      all_contacts: "All contacts"
       cannot_remove: "Impossibile rimuovere la persona dall'ultimo aspetto."
-      search_contacts: "Condividi contatti"
     invitations: 
       dont_have_now: "Non ne hai alcuno per il momento, ma altri arriveranno presto!"
       invitations_left: "(%{count} rimanenti)"
@@ -316,8 +325,6 @@ it:
       share_with_all: "Condividi con tutti gli aspetti"
     reshare: 
       reshare: "Ricondividi"
-    stream_element: 
-      show_comments: "mostra commenti"
   status_messages: 
     helper: 
       no_message_to_display: "Nessun messaggio da visualizzare."
@@ -326,6 +333,9 @@ it:
       tell_me_something_good: "dimmi qualcosa di buono"
     show: 
       destroy: "Distruggi"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "il mondo"
   username: "Username"
   users: 
@@ -352,7 +362,10 @@ it:
         add: "Aggiungi"
         aspect_name: "Nome aspetto"
         description: "Specifica a Diaspora quali dei tuoi diversi aspetti sono visti da persone diverse. Potrai gestirli in un secondo momento attraverso il menu account in alto a destra. I tuoi aspetti sono visibili solo da te e non dagli altri."
+        drag_to_add: "Drag them to the aspect of yourself they know"
+        no_requests: "You have no requests"
         your_aspects: "I tuoi aspetti"
+        your_inviter: "Here are the people who are waiting for you:"
       step_3: 
         description: "Puoi collegare altri social network a cui sei iscritto al tuo account Diaspora. Potrai postarci pubblicamente della tua Home page quando selezioni \"rendilo pubblico\""
         your_services: "I tuoi servizi"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 327248ab9da99f4ac40635e8646bf4249c117ad4..aff9bab5ffdb322f887c8a1ba98eb7905238941c 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -40,6 +40,10 @@ lt:
       success: "Spustelk pliusÄ… kairÄ—je ir nurodyk, kas Diasporoje gali matyti tavo naujÄ… aspektÄ…."
     destroy: 
       success: "%{name} sėkmingai pašalintas."
+    edit_aspect_pane: 
+      add_existing: "Pridėk egzistuojantį kontaktą"
+      confirm_remove_aspect: "Pašalinti aspektą?"
+      remove_aspect: "Pašalinti aspektą"
     helper: 
       are_you_sure: "Ar tikrai Å¡alinti aspektÄ…?"
       aspect_not_empty: "Aspektas netuščias"
@@ -75,8 +79,6 @@ lt:
       family: "Å eima"
       work: "Darbas"
     show: 
-      contact: "kontaktas"
-      contacts: "kontaktai"
       edit_aspect: "keisti aspektÄ…"
     update: 
       success: "Aspektas \"%{name}\" pakeistas sÄ—kmingai."
@@ -86,6 +88,11 @@ lt:
     new_comment: 
       comment: "Komentuoti"
       commenting: "Siunčiamas komentaras..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Å alinti"
   email: "El. paštas"
   error_messages: 
@@ -134,6 +141,11 @@ lt:
       login: "prisijungti"
       logout: "atsijungti"
       view_profile: "peržiūrėti profilį"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "Diasporos pašto robotas"
     hello: "Labas, %{name}!"
@@ -270,8 +282,8 @@ lt:
   settings: "Nustatymai"
   shared: 
     add_contact: 
-      create_request: "Rask pagal Diaspora vartotojo vardÄ…"
-      diaspora_handle: "Diasporos vartotojo vardas"
+      create_request: "Rask pagal Diasporos vartotojo vardÄ…"
+      diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Įvesk Diasporos vartotojo vardą:"
       know_email: "Žinai jų el. pašto adresus? Turėtum juos pakviesti"
       your_diaspora_username_is: "Tavo Diasporos vartotojo vardas yra: %{diaspora_handle}"
@@ -283,16 +295,13 @@ lt:
       aspect_settings: "Aspekto nustatymai"
       aspects: "Aspektai"
       confirm_remove_aspect: "Pašalinti aspektą?"
-      contacts: "kontaktai"
       done_editing: "redagavimas baigtas"
       invites: "Pakvietimai"
-      new_request: "%{count} naujas pakvietimas!"
-      new_requests: "Naujų pakvietimų: %{count}!"
       no_contacts: "Šiuo metu neturi kontaktų. Rask savo kontaktus čia."
       remove_aspect: "Pašalinti aspektą"
     contact_list: 
+      all_contacts: "Visi kontaktai"
       cannot_remove: "Iš paskutinio aspekto asmens pašalinti negalima."
-      search_contacts: "Ieškoti kontaktų"
     invitations: 
       dont_have_now: "Tu neturi jokių pakvietimų dabar, tačiau netrukus gausi daugiau!"
       invitations_left: "(liko %{count})"
@@ -316,8 +325,6 @@ lt:
       share_with_all: "Skelbti visuose aspektuose"
     reshare: 
       reshare: "Skelbti papildomai"
-    stream_element: 
-      show_comments: "rodyti komentarus"
   status_messages: 
     helper: 
       no_message_to_display: "Žinučių nėra."
@@ -326,6 +333,9 @@ lt:
       tell_me_something_good: "papasakok man kÄ… nors gero"
     show: 
       destroy: "Sunaikinti"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "pasaulis"
   username: "Vartotojo vardas"
   users: 
@@ -352,7 +362,10 @@ lt:
         add: "pridÄ—ti"
         aspect_name: "Aspekto pavadinimas"
         description: "Nurodyk Diasporai, kuriuos tavo aspektus matys kurie draugai. Tai galėsi keisti vėliau paspausdamas valdymo puslapį viršuje dešinėje. Tavo aspektai yra unikalūs tau, ir nematomi kitiems."
+        drag_to_add: "Pertempk juos į savo aspektą, kurį jie žino"
+        no_requests: "You have no requests"
         your_aspects: "Tavo aspektai"
+        your_inviter: "Žmonės, kurie tavęs laukia:"
       step_3: 
         description: "Prijunk savo socialinius tinklus prie Diasporos paskyros. Tu galėsi viešai rašyti per savo \"visi\" puslapį, kai pasirinksi \"viešai\""
         your_services: "Tavo tinklai"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index cc152a991cb9f05c4a1ebc46fcbec9da0ff7f9f4..cd7038260cd18ce353012f96f98d1e82c38a9788 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -40,6 +40,10 @@ mk:
       success: "Вашиот нов аспект %{name} е креиран"
     destroy: 
       success: "%{name} е отстранет успешно."
+    edit_aspect_pane: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Remove aspect?"
+      remove_aspect: "Remove Aspect"
     helper: 
       are_you_sure: "Дали сигурно сакате да го отстраните овој аспект?"
       aspect_not_empty: "Аспектот не е празен"
@@ -75,8 +79,6 @@ mk:
       family: "Фамилија"
       work: "Работа"
     show: 
-      contact: "контакт"
-      contacts: "контакти"
       edit_aspect: "уреди аспект"
     update: 
       success: "Вашиот аспект, %{name}, беше успешно уреден."
@@ -86,6 +88,11 @@ mk:
     new_comment: 
       comment: "Коментар"
       commenting: "Коментирање..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Избриши"
   email: "Е-маил"
   error_messages: 
@@ -134,6 +141,11 @@ mk:
       login: "најави се"
       logout: "одјави се"
       view_profile: "погледни профил"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "diaspora е-маил робот"
     hello: "Здраво %{name}!"
@@ -283,16 +295,13 @@ mk:
       aspect_settings: "Подесувања на аспект"
       aspects: "Аспекти"
       confirm_remove_aspect: "Одстрани аспект?"
-      contacts: "контакти"
       done_editing: "заврши со уредување"
       invites: "Покани"
-      new_request: "%{count} ново барање!"
-      new_requests: "%{count} нови барања!"
       no_contacts: "Моментално немате контакти. Најдете ги вашите контакти овде."
       remove_aspect: "Одстрани аспект"
     contact_list: 
+      all_contacts: "All contacts"
       cannot_remove: "Неможе да се одстрани личноста од последниот аспект. (Ако сакате да се раздвоите од оваа личност мора да ја одстраните од листата на контакти.)"
-      search_contacts: "Пребарувај контакти"
     invitations: 
       dont_have_now: "Моментално немате права, но повеќе покани ќе дојдат наскоро!"
       invitations_left: "(%{count} лево)"
@@ -316,8 +325,6 @@ mk:
       share_with_all: "сподели на сите ваши аспекти"
     reshare: 
       reshare: "Сподели повторно"
-    stream_element: 
-      show_comments: "покажи коментари"
   status_messages: 
     helper: 
       no_message_to_display: "Нема пораки за прикажување."
@@ -326,6 +333,9 @@ mk:
       tell_me_something_good: "кажи ми нешто добро"
     show: 
       destroy: "Уништи"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "светот"
   username: "Корисничко име"
   users: 
@@ -352,7 +362,10 @@ mk:
         add: "Додај"
         aspect_name: "Име на аспект"
         description: "Кажи и на Diaspora кои различни аспекти можат да бидат видени од различни контакти. Овие можат да бидат менаџирани преку подесувањата за корисничката сметка во горниот десен агол. Вашите аспекти се единствени и не можат да бидат видени од некој друг."
+        drag_to_add: "Drag them to the aspect of yourself they know"
+        no_requests: "You have no requests"
         your_aspects: "Ваши аспекти"
+        your_inviter: "Here are the people who are waiting for you:"
       step_3: 
         description: "Можете да ги поврзете вашите постоечки социјални мрежи со вашата Diaspora корисничка сметка. Ќе можете да објавувате јавно преку вашата Домашна страница ако изберете \"направи јавен\""
         your_services: "Вашите сервиси"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 31f0a6e251341a931c19bcada80af24c968d4b53..7bff729674a50fd3015a072a498cda7f1510bbe0 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -40,6 +40,10 @@ nb:
       success: "Klikk på plusstegnet på venstre side for å fortelle Diaspora hvem som kan se det nye aspektet ditt."
     destroy: 
       success: "%{name} har blitt fjerna."
+    edit_aspect_pane: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Remove aspect?"
+      remove_aspect: "Remove Aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Aspektet er ikke tomt"
@@ -75,8 +79,6 @@ nb:
       family: "Family"
       work: "Work"
     show: 
-      contact: "contact"
-      contacts: "contacts"
       edit_aspect: "edit aspect"
     update: 
       success: "Aspektet ditt, %{name}, har blitt endra."
@@ -86,6 +88,11 @@ nb:
     new_comment: 
       comment: "Kommenter"
       commenting: "Commenting..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Delete"
   email: "Email"
   error_messages: 
@@ -134,6 +141,11 @@ nb:
       login: "login"
       logout: "logout"
       view_profile: "view profile"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "the diaspora email robot"
     hello: "Hello %{name}!"
@@ -283,16 +295,13 @@ nb:
       aspect_settings: "Aspect settings"
       aspects: "Aspects"
       confirm_remove_aspect: "Remove aspect?"
-      contacts: "contacts"
       done_editing: "done editing"
       invites: "Invites"
-      new_request: "%{count} new request!"
-      new_requests: "%{count} new requests!"
       no_contacts: "You currently have no contacts.  Find your contacts here."
       remove_aspect: "Remove Aspect"
     contact_list: 
+      all_contacts: "All contacts"
       cannot_remove: "Cannot remove person from last aspect."
-      search_contacts: "Search contacts"
     invitations: 
       dont_have_now: "You don't have any right now, but more invites are coming soon!"
       invitations_left: "(%{count} left)"
@@ -316,8 +325,6 @@ nb:
       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."
@@ -326,6 +333,9 @@ nb:
       tell_me_something_good: "Fortell noe tøft"
     show: 
       destroy: "Utslett"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "the world"
   username: "Username"
   users: 
@@ -352,7 +362,10 @@ nb:
         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."
+        drag_to_add: "Drag them to the aspect of yourself they know"
+        no_requests: "You have no requests"
         your_aspects: "Your aspects"
+        your_inviter: "Here are the people who are waiting for you:"
       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"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 1d09ad546686f4ee4e8e22f62bdb98a688cf524d..d87550b5d3e8c597a872d4f77a1e6c2d81610c61 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -40,6 +40,10 @@ nl:
       success: "Je nieuwe aspect %{name} is aangemaakt"
     destroy: 
       success: "%{name} is succesvol verwijderd."
+    edit_aspect_pane: 
+      add_existing: "Voeg een bestaand contact toe"
+      confirm_remove_aspect: "Aspect verwijderen?"
+      remove_aspect: "Verwijder Aspect"
     helper: 
       are_you_sure: "Weet je zeker dat je dit aspect wilt verwijderen?"
       aspect_not_empty: "Aspect niet leeg"
@@ -75,8 +79,6 @@ nl:
       family: "Familie"
       work: "Werk"
     show: 
-      contact: "contact"
-      contacts: "contacten"
       edit_aspect: "bewerk aspect"
     update: 
       success: "Je aspect, %{name}, is succesvol aangepast."
@@ -86,6 +88,11 @@ nl:
     new_comment: 
       comment: "Reactie"
       commenting: "Reageren..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Verwijderen"
   email: "E-mail"
   error_messages: 
@@ -134,6 +141,11 @@ nl:
       login: "log in"
       logout: "log uit"
       view_profile: "bekijk profiel"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "de diaspora email robot"
     hello: "Hoi %{name}!"
@@ -188,12 +200,12 @@ nl:
     show: 
       already_requested: "Je hebt al een verzoek gestuurd aan %{name}."
       does_not_exist: "Die persoon bestaat niet!"
-      incoming_request: "You have an incoming request from this person."
+      incoming_request: "Je hebt een binnenkomend verzoek van deze persoon."
       no_posts: "geen berichten om weer te geven!"
       not_connected: "Je bent niet bevriend met deze persoon"
       request_people: "Als je wilt kun je hem of haar in een van je aspecten plaatsen."
-      return_to_aspects: "Return to your aspects page"
-      to_accept_or_ignore: "to accept or ignore it."
+      return_to_aspects: "Ga terug naar je aspecten pagina"
+      to_accept_or_ignore: "om te accepteren of te negeren."
     update: 
       failed: "Updaten van profiel mislukt"
       updated: "Profiel geupdated"
@@ -283,16 +295,13 @@ nl:
       aspect_settings: "Aspect instellingen"
       aspects: "Aspecten"
       confirm_remove_aspect: "Aspect verwijderen?"
-      contacts: "contacten"
       done_editing: "klaar met bewerken"
       invites: "Uitnodigingen"
-      new_request: "%{count} nieuw verzoek!"
-      new_requests: "%{count} nieuwe verzoeken!"
       no_contacts: "Momenteel heb je nog geen contacten. Vind je contacten hier."
       remove_aspect: "Verwijder Aspect"
     contact_list: 
+      all_contacts: "Alle contacten"
       cannot_remove: "Kan persoon niet van laatste aspect verwijderen. (Als je met deze persoon wilt breken moet je dit contact verwijderen)"
-      search_contacts: "Zoek contacten"
     invitations: 
       dont_have_now: "Momenteel heb je er geen maar meer uitnodigingen volgen spoedig!"
       invitations_left: "(%{count} over)"
@@ -316,8 +325,6 @@ nl:
       share_with_all: "Deel met alle je aspecten"
     reshare: 
       reshare: "Herdeel"
-    stream_element: 
-      show_comments: "toon reacties"
   status_messages: 
     helper: 
       no_message_to_display: "Geen bericht om te weergeven."
@@ -326,6 +333,9 @@ nl:
       tell_me_something_good: "vertel me iets leuks"
     show: 
       destroy: "Verwijderen"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "de wereld"
   username: "Gebruikersnaam"
   users: 
@@ -352,7 +362,10 @@ nl:
         add: "Voeg toe"
         aspect_name: "Aspect naam"
         description: "Laat Diaspora weten welke verschillende aspecten verschillende mensen van jou zien. Je kunt deze later veranderen door middel van je accountmenu rechtsboven. Aspecten zijn uniek voor jou en niet zichtbaar voor anderen."
+        drag_to_add: "Sleep ze naar het aspect dat zij van jou kennen"
+        no_requests: "You have no requests"
         your_aspects: "Jouw aspecten"
+        your_inviter: "Dit zijn de mensen die op jou wachten:"
       step_3: 
         description: "Je kunt je bestaande sociale netwerken verbinden met je Diaspora account. Je kan via je Home pagina openbare berichten plaatsen door 'maak openbaar' aan te vinken."
         your_services: "Jou services"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 92b38d6c9ef44f8fa18a45e37c41090021216a22..456f8c2f9be420a35ac80642d10ee1f4e0da9898 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -5,7 +5,7 @@
 
 pl: 
   _comments: "Komentarze"
-  _home: "Strona domowa"
+  _home: "Wszyscy"
   _photos: "zdjęcia"
   _services: "Usługi"
   account: "Konto"
@@ -34,23 +34,27 @@ pl:
   aspects: 
     add_to_aspect: 
       failure: "Nie udało się dodać kontaktu do aspektu."
-      success: "Dodane kontakt to aspektu."
+      success: "Dodano kontakt to aspektu."
     create: 
-      failure: "Nie udało się stworzyć aspektu."
-      success: "Twój nowy aspekt, on nazwie %{name}, został stworzony"
+      failure: "Nie udało się utworzyć aspektu."
+      success: "Twój nowy aspekt, on nazwie %{name}, został utworzony"
     destroy: 
       success: "%{name} został usunięty."
+    edit_aspect_pane: 
+      add_existing: "Dodaj istniejÄ…cy kontakt"
+      confirm_remove_aspect: "Usunąć aspekt?"
+      remove_aspect: "Usuń aspekt"
     helper: 
       are_you_sure: "Czy na pewno chcesz usunąć ten aspekt?"
       aspect_not_empty: "Aspekt nie jest pusty"
       remove: "usuń"
     index: 
-      handle_explanation: "To jest twoja nazwa użytkownika w Diaspora. Możesz podawać ją lub swój email ludziom którzy chcą Cie dodać."
+      handle_explanation: "To jest Twój identyfikator w Diasporze. Podobnie jak adresu e-mailowy, możesz podawać go innym, aby mogli się z Tobą skontaktować."
     manage: 
       add_a_new_aspect: "Dodaj nowy aspekt"
       add_a_new_contact: "Dodaj nowy kontakt"
       drag_to_add: "Przeciągnij, aby dodać ludzi"
-      manage_aspects: "ZarzÄ…dzaj aspektami"
+      manage_aspects: "ZarzÄ…dzanie aspektami"
       no_requests: "Brak nowych zaproszeń"
       requests: "Zaproszenia"
     move_contact: 
@@ -58,67 +62,70 @@ pl:
       failure: "nie zadziałało %{inspect}"
       success: "Osoba przeniesiona do nowego aspektu"
     new_aspect: 
-      create: "Stwórz"
+      create: "Utwórz"
       name: "Nazwa"
     no_contacts_message: 
       add_contact: "Dodaj kontakt"
       add_contact_to: "Dodaj kogoÅ› do aspektu %{aspect_name}"
-      invite: "ZaproÅ› znajomych do diaspora!"
-      nobody: "Wiemy, że znasz kogo trzeba - zaproś ich do Diaspora!"
+      invite: "ZaproÅ› znajomych do Diaspory!"
+      nobody: "Zaproś do Diaspory ludzi ważnych dla Ciebie!"
       nobody_in_aspect: "Twój aspekt '%{aspect_name}' jest pusty."
     no_posts_message: 
       start_talking: "Nikt jeszcze nic nie powiedział. Rozkręć rozmowę!"
     remove_from_aspect: 
-      failure: "Nie udało się przenieść osoby z aspektu"
+      failure: "Nie udało się usunąć osoby z aspektu"
       success: "Pomyślnie usunięto osobę z aspektu"
     seed: 
       family: "Rodzina"
       work: "Praca"
     show: 
-      contact: "kontakt"
-      contacts: "kontakty"
       edit_aspect: "edytuj aspekt"
     update: 
-      success: "Twój aspekt, %{name}, został pomyślnie zmieniony."
+      success: "Twój aspekt '%{name}' został pomyślnie zmieniony."
   back: "Wróć"
   cancel: "Anuluj"
   comments: 
     new_comment: 
-      comment: "Napisz komentarz..."
-      commenting: "KomentujÄ™..."
-  delete: "Usuń"
-  email: "Email"
+      comment: "Skomentuj…"
+      commenting: "Komentowanie…"
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
+  delete: "Skasuj"
+  email: "E-mail"
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Popraw poniższe błędy i spróbuj ponownie."
       invalid_fields: "Pola z błędami"
-  fill_me_out: "Wpisz coÅ› tutaj"
+  fill_me_out: "Wypełnij to pole"
   home: 
     show: 
       already_account: "masz już konto?"
       choice: "Wybór"
-      choice_explanation: "Diaspora pozwala Ci przypisać twoich znajomych do grup zwanych Aspektami. Aspekty, dostępne wyłącznie w Diasporze, gwarantują, że twoje zdjęcia, posty i wiadomości są widoczne wyłącznie dla osób które wybierzesz."
-      learn_about_host: "Dowiedz się, jak założyć własny serwer Diaspora."
-      login_here: "zaloguj siÄ™ tu"
-      ownership: "Prywatność"
-      ownership_explanation: "Twoje zdjęcia są twoją własnością, zrzeczenie się tego prawa nie powinno być konieczne aby się tymi zdjęciami dzielić. Zachowujesz prawo własności do wszystkiego czym dzielisz się na Diaspora, co daje pełną kontrolę nad rozpowszechnianiem tych danych."
-      share_what_you_want: "Share what you want, with whom you want."
+      choice_explanation: "Diaspora pozwala Ci przypisać twoich znajomych do grup zwanych Aspektami. Aspekty, dostępne wyłącznie w Diasporze, gwarantują, że twoje zdjęcia, wpisy i wiadomości są widoczne wyłącznie dla osób które wybierzesz."
+      learn_about_host: "Dowiedz się, jak założyć własny serwer Diaspory."
+      login_here: "zaloguj siÄ™"
+      ownership: "Własność"
+      ownership_explanation: "Twoje zdjęcia są Twoją własnością i nie musisz zrzekać się tego prawa, aby się nimi dzielić. Zarządzasz swoim prawem własności w stosunku do wszystkich materiałów umieszczanych w Diasporze, dzięki czemu masz kontrolę nad sposobem ich rozpowszechniania."
+      share_what_you_want: "Podziel siÄ™ czym chcesz i z kim chcesz."
       simplicity: "Prostota"
-      simplicity_explanation: "Diaspora sprawia, że dzielenie się ze znajomymi jest \"miłe, łatwe i przyjemne\", zwłaszcza w odniesieniu do ochrony do prywatności. Dbając o prywatność Dispora, nie ma mnóstwa stron ustawień, czy opcji, przez które trzeba się przedrzeć, aby zabezpieczyć Twój profil."
+      simplicity_explanation: "Diaspora sprawia, że dzielenie się ze znajomymi jest miłe, łatwe i przyjemne, zwłaszcza w odniesieniu do ochrony prywatności. Dbając o prywatność Dispora nie każe Ci korzystać z mnóstwa stron ustawień czy opcji, przez które trzeba się przedzierać, aby zabezpieczyć profil."
   invitations: 
     check_token: 
       not_found: "Identyfikator zaproszenia nie znaleziony"
     create: 
-      already_contacts: "Jesteś już połączony/a z tą osobą."
+      already_contacts: "Jesteś już połączony(-a) z tą osobą."
       already_sent: "Wysłano już zaproszenie do tej osoby."
-      no_more: "Nie masz żadnych zaproszeń."
-      rejected: "Poniższy adres email ma problem:"
-      sent: "Twoje zaproszenie zostało wysłane."
+      no_more: "Nie masz więcej zaproszeń."
+      rejected: "Poniższy adres e-mail okazał się problematyczny:"
+      sent: "Zaproszenia zostały wysłane do:"
     edit: 
-      sign_up: "zaloguj_siÄ™"
+      sign_up: "rejestracja"
     new: 
-      comma_seperated_plz: "Możesz podać kilka adresów email, oddzielając je przecinkami."
-      if_they_accept_info: "jeśli zaproszenie zostanie zaakceptowane, zostaną oni dodani do aspektu, do którego ich zaprosiłeś."
+      comma_seperated_plz: "Możesz podać kilka adresów e-mailowych, oddzielając je przecinkami."
+      if_they_accept_info: "jeśli zaproszenie zostanie zaakceptowane, zostaną oni dodani do aspektu, do którego ich przypisano."
       invite_someone_to_join: "ZaproÅ› kogoÅ› do Diaspory!"
       message: "Wiadomość:"
       send_an_invitation: "Wyślij zaproszenie"
@@ -126,39 +133,44 @@ pl:
       to: "Do"
   layouts: 
     application: 
-      powered_by: "POWERED BY DIASPORA *"
+      powered_by: "NAPĘDZANE PRZEZ DIASPORĘ *"
     header: 
       account_settings: "ustawienia konta"
-      blog: "bloguj"
-      edit_profile: "edytuj profil"
-      login: "zaloguj"
-      logout: "wyloguj"
-      view_profile: "pokaż profil"
+      blog: "blog"
+      edit_profile: "edycja profilu"
+      login: "logowanie"
+      logout: "wylogowanie"
+      view_profile: "podglÄ…d profilu"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
-    diaspora: "robot emailowy diaspory"
+    diaspora: "robot e-mailowy diaspory"
     hello: "Cześć %{name}!"
-    love: "ściskamy,"
+    love: "uściski,"
     new_request: 
-      just_sent_you: "właśnie wysłał/a Ci zaproszenie na Diaspora*"
-      sign_in: "zaloguj siÄ™ tu"
-      subject: "nowy zaproszenie do znajomych w Diaspora* od %{from}"
+      just_sent_you: "właśnie wysłał(-a) Ci zaproszenie do Diaspory*"
+      sign_in: "zaloguj siÄ™"
+      subject: "nowe zaproszenie do znajomych w Diasporze* od %{from}"
       try_it_out: "Przemyśl to, naprawdę warto spróbować."
     request_accepted: 
-      accepted: "przyjął/eła twoje zaproszenie do znajomych. Jest teraz w twoich"
-      aspect: "aspekt."
-      subject: "%{name} zaakceptował/a twoje zaproszenie do znajomych na Diaspora*"
+      accepted: "zaakceptował(-a) Twoje zaproszenie. Jest w aspekcie"
+      aspect: "."
+      subject: "%{name} zaakceptował(-a) twoje zaproszenie do znajomych w Diasporze*"
   ok: "OK"
   or: "lub"
   password: "Hasło"
-  password_confirmation: "Potwierdź hasło"
+  password_confirmation: "Potwierdzenie hasła"
   people: 
     edit: 
-      allow_search: "Zezwól na wyszukiwanie twojego profilu wewnątrz Diaspora"
+      allow_search: "Zezwól na wyszukiwanie Twojego profilu w Diasporze"
       first_name: "ImiÄ™"
-      info_available_to: "Ta informacja będzie dostępna dla każdego kto połączy się z tobą na Diaspora."
+      info_available_to: "Ta informacja będzie widoczna dla każdego, z kim połączysz się w Diasporze."
       last_name: "Nazwisko"
-      update_profile: "Aktualizuj Profil"
-      your_bio: "Notka biograficzna"
+      update_profile: "Aktualizuj profil"
+      your_bio: "O Tobie"
       your_birthday: "Twoja data urodzenia"
       your_gender: "Twoja płeć"
       your_name: "Twoje imiÄ™"
@@ -166,158 +178,153 @@ pl:
       your_profile: "Twój profil"
     helper: 
       people_on_pod_are_aware_of: " osoby na podzie wiedzą, że"
-      results_for: " wyniki dla for %{params}"
+      results_for: " wyniki dla %{params}"
     index: 
       results_for: "wyniki wyszukiwania dla"
     person: 
       add_contact: "dodaj kontakt"
-      already_connected: "Już podłączony"
-      pending_request: "oczekujÄ…ce zaproszenia"
-      thats_you: "to ty!"
+      already_connected: "Już podłączono"
+      pending_request: "zaproszenie oczekujÄ…ce"
+      thats_you: "to przecież Ty!"
     profile_photo_upload: 
       or_select_one: "lub wybierz jedno z już istniejących"
     profile_sidebar: 
       bio: "notka biograficzna"
-      born: "data urodzenia"
-      cannot_remove: "Nie można usunąć %{name} z ostatniego aspektu. (Jeśli chcesz się odłączyć od tej osoby musisz usunąć ją ze znajomych)"
-      edit_my_profile: "Edytuj mój profil"
+      born: "urodziny"
+      cannot_remove: "Nie można usunąć %{name} z jedynego pozostałego aspektu. (Jeśli chcesz się odłączyć od tej osoby musisz usunąć ją ze znajomych.)"
+      edit_my_profile: "Edycja mojego profilu"
       gender: "płeć"
       in_aspects: "w aspektach"
-      remove_contact: "usuń kontakt"
+      remove_contact: "usuwanie kontaktu"
       remove_from: "Usunąć %{name} z aspektu %{aspect}?"
     show: 
       already_requested: "Wysłano już zaproszenie do %{name}."
       does_not_exist: "Osoba nie istnieje!"
-      incoming_request: "You have an incoming request from this person."
-      no_posts: "brak postów!"
-      not_connected: "Nie jesteś połączony/a z tą osobą"
+      incoming_request: "Masz nowe zaproszenie od tej osoby."
+      no_posts: "brak wpisów!"
+      not_connected: "Nie jesteś połączony(-a) z tą osobą"
       request_people: "Jeśli chcesz, możesz zaprosić jego/ją do jednego ze swoich aspektów."
-      return_to_aspects: "Return to your aspects page"
-      to_accept_or_ignore: "to accept or ignore it."
+      return_to_aspects: "Wróć do strony aspektów"
+      to_accept_or_ignore: "by je przyjąć lub zignorować."
     update: 
       failed: "Nie udało się zaktualizować profilu"
       updated: "Profil zaktualizowany"
   photos: 
     create: 
-      integrity_error: "Nie udało się dodać zdjęcia.  Czy to na pewno był obraz?"
-      runtime_error: "Nie udało się dodać zdjęcia. Czy pas bezpieczeństwa jest na pewno zapięty?"
+      integrity_error: "Nie udało się dodać zdjęcia.  Czy to na pewno był plik z obrazem?"
+      runtime_error: "Nie udało się dodać zdjęcia. Czy pasy bezpieczeństwa jest na pewno zapięte?"
       type_error: "Nie udało się dodać zdjęcia. Czy na pewno wybrany był obraz?"
     destroy: 
       notice: "Zdjęcie usunięte."
     edit: 
       editing: "Edycja"
     new: 
-      back_to_list: "Wróć do Listy"
-      new_photo: "Nowe Zdjęcie"
-      post_it: "opublikuj to!"
+      back_to_list: "Wróć do listy"
+      new_photo: "Nowe zdjęcie"
+      post_it: "wyślij!"
     new_photo: 
-      empty: "Plik {file} jest pusty, proszÄ™ wybierz pliki ponownie bez niego."
-      invalid_ext: "Plik {file} ma niewłaściwe rozszerzenie. Tylko pliki {extensions} są dozwolone."
+      empty: "Plik {file} jest pusty. Wybierz proszÄ™ jeszcze raz odpowiednie pliki, pomijajÄ…c ten."
+      invalid_ext: "Plik {file} ma niewłaściwe rozszerzenie. Akceptowane rozszerzenia: {extensions}"
       size_error: "Plik {file} jest zbyt duży, maksymalny rozmiar to {sizeLimit}."
     photo: 
-      view_all: "pokaż wszystkie zdjęcia %{name}"
+      view_all: "pokaż wszystkie zdjęcia należące do: %{name}"
     show: 
-      delete_photo: "Usuń Zdjęcie"
+      delete_photo: "Usuń zdjęcie"
       edit: "edytuj"
       edit_delete_photo: "Edytuj opis zdjęcia / usuń zdjęcie"
       make_profile_photo: "zrób zdjęcie profilowe"
-      original_post: "Oryginalny post"
-      update_photo: "Aktualizuj Zdjęcie"
-      view: "pokaż"
+      original_post: "Oryginalny wpis"
+      update_photo: "Aktualizuj zdjęcie"
+      view: "podglÄ…d"
     update: 
-      error: "Nie udało się edytować zdjęcia."
+      error: "Błąd podczas edycji zdjęcia."
       notice: "Pomyślnie zaktualizowano zdjęcie."
   profile: "Profil"
   registrations: 
-    closed: "Rejestracja jest zamknięta na tym podzie Diaspory."
+    closed: "Na tym podzie Diaspory rejestracja jest zamknięta"
     create: 
-      success: "JesteÅ› teraz w Diaspora!"
+      success: "Masz konto w Diasporze!"
     edit: 
-      cancel_my_account: "Usuń moje konto"
-      edit: "Edytuj %{name}"
-      leave_blank: "(pozostaw puste, jeśli nie chcesz zmienić)"
-      password_to_confirm: "(potrzebujemy twojego obecnego hasła, żeby zatwierdzić zmiany)"
-      unhappy: "Niezadowolony/a?"
-      update: "Aktualizuj"
+      cancel_my_account: "Przerwij zakładanie konta"
+      edit: "Edycja: %{name}"
+      leave_blank: "(pozostaw puste, jeśli nie chcesz zmieniać)"
+      password_to_confirm: "(potrzebujemy Twojego obecnego hasła, żeby zatwierdzić zmiany)"
+      unhappy: "Niezadowolony(-a)?"
+      update: "Aktualizacja"
     new: 
       sign_up: "Zarejestruj siÄ™"
-      sign_up_for_diaspora: "Zarejestruj siÄ™ w Diaspora"
+      sign_up_for_diaspora: "Zarejestruj siÄ™ w Diasporze"
   requests: 
     create: 
       sending: "Wysyłanie"
-      sent: "Chcesz się podzielić z %{name}. Ta osoba powinna to zobaczyć następnym razem gdy zaloguje się do Diaspory."
+      sent: "Chcesz się podzielić z %{name}. Ta osoba zobaczy to, gdy następnym razem zaloguje się do Diaspory."
     destroy: 
-      error: "ProszÄ™ wybierz aspekt!"
-      ignore: "Zignorowano zaproszenie do znajomych."
-      success: "Jesteście teraz przyjaciółmi."
+      error: "ProszÄ™, wybierz aspekt!"
+      ignore: "Zignorowano zaproszenie do znajomości."
+      success: "Jesteście teraz znajomymi."
     manage_aspect_contacts: 
       existing: "IstniejÄ…ce kontakty"
-      manage_within: "ZarzÄ…dzaj kontaktami wewnÄ…trz"
+      manage_within: "ZarzÄ…dzanie kontaktami w"
     new_request_to_person: 
-      sent: "wyślij!"
+      sent: "wysłano!"
   search: "Szukaj"
   services: 
     create: 
-      success: "Logowanie zakończone sukcesem."
+      success: "Zalogowano pomyślnie."
     destroy: 
       success: "Pomyślnie zniszczono hasło i login."
     index: 
-      connect_to_facebook: "Połącz z facebookiem"
-      connect_to_twitter: "Połącz z twitterem"
+      connect_to_facebook: "Połącz z Facebookiem"
+      connect_to_twitter: "Połącz z Twitterem"
       disconnect: "rozłącz"
       logged_in_as: "zalogowano jako"
       really_disconnect: "rozłączyć %{service}?"
   settings: "Ustawienia"
   shared: 
     add_contact: 
-      create_request: "Znajdź po nicku Diaspora"
-      diaspora_handle: "Nazwa użytkownika na Diaspora"
-      enter_a_diaspora_username: "Wpisz nazwę użytkownika Diaspora:"
-      know_email: "Znasz adres email tej osoby? Może warto ją zaprosić?"
-      your_diaspora_username_is: "Twoja nazwa użytkownika na Diaspora: %{diaspora_handle}"
+      create_request: "Znajdź po identyfikatorze Diaspory"
+      diaspora_handle: "identyfikator@w.diasporze"
+      enter_a_diaspora_username: "Wpisz nazwę użytkownika Diaspory:"
+      know_email: "Znasz adres e-mail tej osoby? Może warto ją zaprosić?"
+      your_diaspora_username_is: "Twój identyfikator w Diasporze: %{diaspora_handle}"
     aspect_contacts: 
       add_aspect: "dodaj aspekt"
-      add_existing: "Dodaj istniejÄ…cy kontakt"
+      add_existing: "Add an existing contact"
       add_to: "dodaj do aspektu %{aspect}"
       all_contacts: "Wszyscy znajomi"
-      aspect_settings: "Ustawienia aspektu"
+      aspect_settings: "Aspect settings"
       aspects: "Aspekty"
-      confirm_remove_aspect: "Usunąć aspekt?"
-      contacts: "znajomi"
+      confirm_remove_aspect: "Remove aspect?"
       done_editing: "gotowe"
       invites: "Zaproszenia"
-      new_request: "%{count} nowych zaproszeń!"
-      new_requests: "%{count} nowych zaproszeń!"
-      no_contacts: "Nie masz obecnie żadnych znajomych.  Znajdź przyjaciół tutaj."
-      remove_aspect: "Usuń Aspekt"
+      no_contacts: "Nie masz obecnie żadnych znajomych.  Poszukaj przyjaciół."
+      remove_aspect: "Remove Aspect"
     contact_list: 
-      cannot_remove: "Nie można usunąć osoby z ostatniego aspektu. (Jeśli chcesz się rozłączyć z tą osobą musisz ją usunąć ze znajomych)"
-      search_contacts: "Szukaj w kontaktach"
+      all_contacts: "Wszystkie kontakty"
+      cannot_remove: "Nie można usunąć osoby z jedynego pozostałego aspektu. (Jeśli chcesz się rozłączyć z tą osobą musisz ją usunąć ze znajomych.)"
     invitations: 
-      dont_have_now: "You don't have any right now, but more invites are coming soon!"
-      invitations_left: "(%{count} pozostało)"
+      dont_have_now: "Nie masz wolnych zaproszeń, ale niebawem się pojawią!"
+      invitations_left: "(pozostało %{count} zaproszeń)"
       invite_someone: "ZaproÅ› kogoÅ›"
     notification: 
-      new: "Nowy/a/e %{type} od %{from}"
+      new: "Nowy(-a,-e) %{type} od %{from}"
     public_explain: 
       logged_in: "zalogowano do %{service}"
-      manage: "zarządzaj podłączonymi usługami"
+      manage: "zarządzaj powiązanymi usługami"
       outside: "Publiczna wiadomość będzie widoczna dla wszystkich spoza Diaspory."
-      title: "Zamierzasz opublikować publiczną wiadomość!"
+      title: "Zamierzasz wysłać wiadomość publiczną!"
     publisher: 
       add_photos: "dodaj zdjęcia"
       all: "wszyscy"
       all_contacts: "wszyscy znajomi"
-      make_public: "publicznie dostępne"
-      post_a_message_to: "Opublikuj wiadomość w %{aspect}"
-      posting: "PublikujÄ™..."
+      make_public: "upublicznij"
+      post_a_message_to: "Wyślij wiadomość do %{aspect}"
+      posting: "Wysyłanie…"
       share: "Podziel siÄ™"
       share_with: "Podziel siÄ™ z aspektem %{aspect}"
       share_with_all: "Podziel siÄ™ ze wszystkimi aspektami"
     reshare: 
       reshare: "Podziel siÄ™ ponownie"
-    stream_element: 
-      show_comments: "pokaż komentarze"
   status_messages: 
     helper: 
       no_message_to_display: "Brak wiadomości."
@@ -325,50 +332,56 @@ pl:
       oh_yeah: "o tak!"
       tell_me_something_good: "co dobrego?"
     show: 
-      destroy: "Zniszcz"
+      destroy: "Usuń"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "świat"
   username: "Nazwa użytkownika"
   users: 
-    destroy: "Konto zamknięte pomyślnie."
+    destroy: "Konto zostało pomyślnie zamknięte."
     edit: 
       change_language: "Zmień język"
-      change_password: "Zmień hasło"
+      change_password: "Zmiana hasła"
       close_account: "Zamknij konto"
       download_photos: "pobierz moje zdjęcia"
       download_xml: "pobierz mój xml"
-      export_data: "Eksportuj Dane"
-      new_password: "Nowe Hasło"
-      your_email: "Twój email"
-      your_handle: "Twoja nazwa użytkownika na diaspora"
+      export_data: "Eksportowanie danych"
+      new_password: "Nowe hasło"
+      your_email: "Twój e-mail"
+      your_handle: "Twoja nazwa użytkownika w Diasporze"
     getting_started: 
       connect_services: "Połącz się ze swoimi usługami"
       define_aspects: "Zdefiniuj swoje aspekty"
       edit_profile: "Edytuj swój profil"
       finished: "Gotowe!"
       save_and_continue: "Zapisz i kontynuuj"
-      signup_steps: "Dokończ rejestrację robiąc trzy rzeczy:"
-      skip: "pomiń"
+      signup_steps: "Dokończ rejestrację w trzech krokach:"
+      skip: "pomiń wprowadzenie"
       step_2: 
         add: "Dodaj"
         aspect_name: "Nazwa aspektu"
-        description: "Powiedz Diasporze które aspekty Twojej osoby są widziane przez które osoby. Możesz tym zarządzać także później poprzez menu konta, w prawym górnym rogu. Twoje aspekty są widoczne wyłącznie dla Ciebie."
+        description: "Powiedz Diasporze, które aspekty Twojego życia mają być widoczne dla wybranych znajomych. Możesz później zarządzać tym ustawieniem klikając zakładkę zarządzania umieszczoną w prawym górnym rogu. Twoje aspekty są widoczne wyłącznie dla Ciebie."
+        drag_to_add: "Przeciągnij ich do właściwych aspektów Twojego życia"
+        no_requests: "You have no requests"
         your_aspects: "Twoje aspekty"
+        your_inviter: "Oto lista osób, które na Ciebie czekają:"
       step_3: 
-        description: "Połącz się z social networks, których już używasz. Będziesz wstanie publikować publicznie używając twojego panelu Wszyscy kiedy wybierzesz \"publiczne.\""
+        description: "Połącz używane sieci społecznościowe z Diasporą.  Będziesz w stanie publikować wpisy w zakładce Wszyscy, gdy wybierzesz \"upublicznij\"."
         your_services: "Twoje usługi"
       step_4: 
-        change_profile: "Możesz zmienić swój profil i zarządzać swoimi usługami w każdej chwili poprzez"
-        continue: "Przejdź do swojej Strony domowej, na której pokazane są wszystkie aspekty. "
+        change_profile: "W każdej chwili możesz zmienić informacje profilowe i zarządzać powiązanymi usługami korzystając"
+        continue: "Kontunuuj na stronie Wszyscy, która zawiera przegląd aspektów."
         finish: "Zakończ"
-        manage_aspects: "Możesz również dodawać kontakty będąc na stronie któregokolwiek z aspektów"
+        manage_aspects: "Możesz również dodawać kontakty będąc na stronie dowolnego aspektu."
         ready_to_share: "Możesz teraz zacząć dzielić się z"
         set_up: "Wszystko gotowe, %{name}!"
-        user_menu: "menu użytkownika, znajdującego się w prawym górnym rogu."
-      welcome: "Witaj w Diaspora!"
+        user_menu: "z Twojego menu użytkownika (prawy górny róg)."
+      welcome: "Witaj w Diasporze!"
     public: 
       does_not_exist: "Użytkownik %{username} nie istnieje!"
     update: 
-      language_changed: "Zmieniono Język"
+      language_changed: "Zmieniono język"
       language_not_changed: "Nie udało się zmienić języka"
       password_changed: "Zmieniono hasło"
       password_not_changed: "Nie udało się zmienić hasła"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index da6d636d896166edfb7e8c543f3d11c48a65f236..0725a94cc6b3ae96f1e57ab82caf35333051651c 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -40,6 +40,10 @@ pt-BR:
       success: "Seu novo perfil %{name} foi criado"
     destroy: 
       success: "%{name} foi removido com sucesso."
+    edit_aspect_pane: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Remove aspect?"
+      remove_aspect: "Remove Aspect"
     helper: 
       are_you_sure: "Tem certeza de que deseja excluir este perfil?"
       aspect_not_empty: "Aspecto não está vazio"
@@ -75,8 +79,6 @@ pt-BR:
       family: "Family"
       work: "Work"
     show: 
-      contact: "contact"
-      contacts: "contacts"
       edit_aspect: "edit aspect"
     update: 
       success: "Seu aspecto, %{name}, foi editado com sucesso."
@@ -86,6 +88,11 @@ pt-BR:
     new_comment: 
       comment: "Comentário"
       commenting: "Comentando..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Apagar"
   email: "Email"
   error_messages: 
@@ -134,6 +141,11 @@ pt-BR:
       login: "entrar"
       logout: "sair"
       view_profile: "ver perfil"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "the diaspora email robot"
     hello: "Hello %{name}!"
@@ -283,16 +295,13 @@ pt-BR:
       aspect_settings: "Aspect settings"
       aspects: "Aspects"
       confirm_remove_aspect: "Remove aspect?"
-      contacts: "contacts"
       done_editing: "done editing"
       invites: "Invites"
-      new_request: "%{count} new request!"
-      new_requests: "%{count} new requests!"
       no_contacts: "You currently have no contacts.  Find your contacts here."
       remove_aspect: "Remove Aspect"
     contact_list: 
+      all_contacts: "All contacts"
       cannot_remove: "Cannot remove person from last aspect."
-      search_contacts: "Search contacts"
     invitations: 
       dont_have_now: "You don't have any right now, but more invites are coming soon!"
       invitations_left: "(%{count} left)"
@@ -316,8 +325,6 @@ pt-BR:
       share_with_all: "compartilhe através de todos os seus perfis"
     reshare: 
       reshare: "Reshare"
-    stream_element: 
-      show_comments: "mostrar comentários"
   status_messages: 
     helper: 
       no_message_to_display: "Nenhuma mensagem para ser mostrada."
@@ -326,6 +333,9 @@ pt-BR:
       tell_me_something_good: "me diga algo bom"
     show: 
       destroy: "Excluir"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "o mundo"
   username: "Username"
   users: 
@@ -352,7 +362,10 @@ pt-BR:
         add: "Add"
         aspect_name: "Aspect name"
         description: "Diga ao Diaspora quais perfis seus são conhecidos por quais contatos. Você pode gerenciar isso depois no menu da sua conta, no topo à direita. Seus perfis são conhecidos apenas por você e não são visíveis por outras pessoas."
+        drag_to_add: "Drag them to the aspect of yourself they know"
+        no_requests: "You have no requests"
         your_aspects: "Your aspects"
+        your_inviter: "Here are the people who are waiting for you:"
       step_3: 
         description: "Você pode conectar suas redes sociais existentes à sua conta do Diaspora. Você poderá postar publicamente na sua página principal quando selecionar \"tornar público\""
         your_services: "Your services"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index dc6e580b0501f9314cbab621dd7187bdfa131e51..dc6f6c30ff9c5e7c113f431ea53f84ec2ab00d8e 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -4,8 +4,8 @@
 
 
 pt-PT: 
-  _comments: "Comments"
-  _home: "Home"
+  _comments: "Comentários"
+  _home: "Início"
   _photos: "Fotografias"
   _services: "Serviços"
   account: "Conta"
@@ -29,346 +29,359 @@ pt-PT:
     helper: 
       unknown_person: "utilizador(a) desconhecido(a)"
       youtube_title: 
-        unknown: "Unknown Video Title"
+        unknown: "Título do Vídeo Desconhecido"
   are_you_sure: "Tem a certeza?"
   aspects: 
     add_to_aspect: 
-      failure: "Failed to add friend to aspect."
-      success: "Successfully added friend to aspect."
+      failure: "Falha ao adicionar amigo ao grupo."
+      success: "Amigo adicionado com sucesso ao grupo."
     create: 
-      failure: "A criação do perfil falhou."
-      success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
+      failure: "A criação do grupo falhou."
+      success: "O teu novo grupo %{name} foi  criado"
     destroy: 
       success: "%{name} foi removido(a) com sucesso."
+    edit_aspect_pane: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Remove aspect?"
+      remove_aspect: "Remove Aspect"
     helper: 
-      are_you_sure: "Are you sure you want to delete this aspect?"
-      aspect_not_empty: "Perfil não está vazio"
+      are_you_sure: "Tens a certeza que queres apagar este grupo?"
+      aspect_not_empty: "Mini-Perfil não está vazio"
       remove: "remover"
     index: 
-      handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
+      handle_explanation: "Esta é a tua chave do Diaspora. Tal como um email, podes dar esta chave às pessoas para que te possam contactar."
     manage: 
-      add_a_new_aspect: "Adicionar um novo perfil"
-      add_a_new_contact: "Add a new contact"
-      drag_to_add: "Drag to add people"
-      manage_aspects: "Gerir perfil"
+      add_a_new_aspect: "Adicionar um novo grupo"
+      add_a_new_contact: "Adicionar um novo contacto"
+      drag_to_add: "Arrasta para adicionar pessoas"
+      manage_aspects: "Gerir Grupos"
       no_requests: "Não existem novos pedidos"
       requests: "Pedidos"
     move_contact: 
-      error: "Error moving contact: %{inspect}"
-      failure: "didn't work %{inspect}"
-      success: "Person moved to new aspect"
+      error: "Erro ao mover contacto: %{inspect}"
+      failure: "não funcionou %{inspect}"
+      success: "Pessoa movida para o novo grupo"
     new_aspect: 
       create: "Criar"
       name: "Nome"
     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."
+      add_contact: "Adicionar um contacto"
+      add_contact_to: "Adicionar alguém a %{aspect_name}"
+      invite: "Convida alguém para se juntar ao Diaspora!"
+      nobody: "Traz as pessoas que são importantes para ti para o Diaspora!"
+      nobody_in_aspect: "O teu grupo '%{aspect_name}' está vazio."
     no_posts_message: 
-      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+      start_talking: "Ainda ninguém disse nada. Dá início à conversa!"
     remove_from_aspect: 
-      failure: "Failed to remove person from aspect"
-      success: "Successfully removed person from aspect"
+      failure: "Falha ao remover pessoa do grupo"
+      success: "Pessoa removida do grupo com sucesso"
     seed: 
-      family: "Family"
-      work: "Work"
+      family: "Família"
+      work: "Trabalho"
     show: 
-      contact: "contact"
-      contacts: "contacts"
-      edit_aspect: "edit aspect"
+      edit_aspect: "editar Grupo"
     update: 
-      success: "Your aspect, %{name}, has been successfully edited."
-  back: "Back"
-  cancel: "Cancel"
+      success: "O teu grupo, %{name}, foi editado com sucesso."
+  back: "Voltar"
+  cancel: "Cancelar"
   comments: 
     new_comment: 
-      comment: "Comment"
-      commenting: "Commenting..."
-  delete: "Delete"
+      comment: "Comentar"
+      commenting: "A comentar..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
+  delete: "Apagar"
   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"
+      correct_the_following_errors_and_try_again: "Corrige os seguintes erros e tenta novamente."
+      invalid_fields: "Campos Inválidos"
+  fill_me_out: "Informa-me"
   home: 
     show: 
-      already_account: "already have an account?"
-      choice: "Choice"
-      choice_explanation: "Diaspora allows you to sort your connections into groups called Aspects. Unique to Diaspora, Aspects ensure your photos, stories and jokes are shared with only the people you want them to be."
-      learn_about_host: "Learn about how to host your own Diaspora server"
-      login_here: "log in here"
-      ownership: "Ownership"
-      ownership_explanation: "You own your pictures, and you shouldn’t have to give that up just in order to share them. You maintain ownership of everything you share on Diaspora, giving you full control over how it is distributed."
-      share_what_you_want: "Share what you want, with who you want."
-      simplicity: "Simplicity"
-      simplicity_explanation: "Diaspora makes sharing clean and easy – this goes doubly so for privacy. Innherently private, Diaspora doesn’t have pages of settings and options to wade through to keep your profile secure and to your liking."
+      already_account: "já tens uma conta?"
+      choice: "Escolha"
+      choice_explanation: "O Diaspora permite-te organizar as tuas ligações em grupos. Exclusivos no Diaspora, os grupos garantem que as tuas fotografias, histórias e brincadeiras são partilhadas apenas com as pessoas com que tu queres que elas sejam partilhadas."
+      learn_about_host: "Aprende como alojar o teu próprio servidor do Diaspora"
+      login_here: "entra aqui"
+      ownership: "Propriedade"
+      ownership_explanation: "És dono das tuas fotografias, e não deves abdicar disso para as poderes partilhar. Tu manténs a posse de tudo o que partilhares no Diaspora, dando-te total controlo sobre como é partilhado."
+      share_what_you_want: "Partilha o que quiseres, com quem quiseres."
+      simplicity: "Simplicidade"
+      simplicity_explanation: "O Diaspora torna a partilha clara e fácil – e o mesmo se aplica à privacidade. Privado por definição, o Diaspora não tem inúmeras páginas de definições e opções de forma a manteres o teu perfil seguro e privado."
   invitations: 
     check_token: 
-      not_found: "Invitation token not found"
+      not_found: "Token de convite não encontrado"
     create: 
-      already_contacts: "You are already connected with this person"
-      already_sent: "You already invited this person."
-      no_more: "You have no more invitations."
-      rejected: "The following email addresses had problems: "
-      sent: "Your invitation has been sent."
+      already_contacts: "Já estás ligado a esta pessoa"
+      already_sent: "Já convidaste esta pessoa."
+      no_more: "Não tens mais convites."
+      rejected: "Os seguintes endereços de email tiveram problemas: "
+      sent: "Os teu convites foram enviados a:"
     edit: 
-      sign_up: "sign_up"
+      sign_up: "registar"
     new: 
-      comma_seperated_plz: "You can enter multiple email addresses separated by commas."
-      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"
+      comma_seperated_plz: "Podes inserir vários endereços de email separados por vírgulas."
+      if_they_accept_info: "se eles o aceitarem, serão adicionados ao grupo para o qual os convidaste"
+      invite_someone_to_join: "Convida alguém para se juntar ao Diaspora!"
+      message: "Mensagem:"
+      send_an_invitation: "Envia um convite"
+      send_invitation: "Enviar convite"
+      to: "Para"
   layouts: 
     application: 
       powered_by: "POWERED BY DIASPORA*"
     header: 
-      account_settings: "account settings"
+      account_settings: "definições da conta"
       blog: "blog"
-      edit_profile: "edit profile"
-      login: "login"
-      logout: "logout"
-      view_profile: "view profile"
+      edit_profile: "editar perfil"
+      login: "entrar"
+      logout: "sair"
+      view_profile: "ver perfil"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
-    diaspora: "the diaspora email robot"
-    hello: "Hello %{name}!"
-    love: "love,"
+    diaspora: "o robot de email do diaspora"
+    hello: "Olá %{name}!"
+    love: "com carinho,"
     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."
+      just_sent_you: "acaba de enviar-te um pedido de contacto no Diaspora*"
+      sign_in: "regista-te aqui"
+      subject: "novo pedido de contacto do Diaspora* de %{from}"
+      try_it_out: "Devias mesmo pensar em dar-lhe uma vista de olhos."
     request_accepted: 
-      accepted: "has accepted your friend request. They are now in your"
-      aspect: "aspect."
-      subject: "%{name} has accepted your friend request on Diaspora*"
+      accepted: "aceitou(aram) o teu pedido de contacto. Está(ão) agora no teu"
+      aspect: "grupo."
+      subject: "%{name} aceitou o teu pedido de contacto no Diaspora*"
   ok: "OK"
-  or: "or"
-  password: "Password"
-  password_confirmation: "Confirmação de senha"
+  or: "ou"
+  password: "Palavra-chave"
+  password_confirmation: "Confirmação de palavra-chave"
   people: 
     edit: 
-      allow_search: "Allow for people to search for you"
+      allow_search: "Autoriza a que as pessoas te procurem dentro do Diaspora"
       first_name: "Primeiro Nome"
-      info_available_to: "Esta informação ficará disponível para todos aqueles a que se ligar no Diaspora. "
+      info_available_to: "Esta informação ficará disponível para todos aqueles a que te ligares no Diaspora. "
       last_name: "Último Nome"
       update_profile: "Actualizar o Perfil"
-      your_bio: "Biografia"
+      your_bio: "Sobre ti"
       your_birthday: "Aniversário"
       your_gender: "Género"
       your_name: "Nome"
-      your_photo: "Fotografia"
+      your_photo: "A tua foto"
       your_profile: "Perfil"
     helper: 
-      people_on_pod_are_aware_of: " people on pod are aware of"
-      results_for: " results for %{params}"
+      people_on_pod_are_aware_of: " as pessoas no pod estão cientes de que"
+      results_for: " resultados para %{params}"
     index: 
       results_for: "resultados de pesquisa para"
     person: 
-      add_contact: "add contact"
-      already_connected: "Already connected"
+      add_contact: "adicionar contacto"
+      already_connected: "Já está ligado"
       pending_request: "pedido pendente"
       thats_you: "És tu!"
     profile_photo_upload: 
       or_select_one: "ou escolhe um dos já existentes"
     profile_sidebar: 
-      bio: "bio"
-      born: "born"
-      cannot_remove: "Cannot remove %{name} from last aspect."
+      bio: "sobre"
+      born: "nascido a"
+      cannot_remove: "Impossível remover %{name} do último grupo.(Se te quiseres desligar desta pessoa terás que remover o contacto)"
       edit_my_profile: "Editar o meu perfil"
-      gender: "gender"
-      in_aspects: "in aspects"
-      remove_contact: "remove contact"
-      remove_from: "Remove %{name} from %{aspect}?"
+      gender: "género"
+      in_aspects: "nos grupos"
+      remove_contact: "remover contacto"
+      remove_from: "Remover %{name} de %{aspect}?"
     show: 
       already_requested: "Já enviaste um pedido a %{name}."
-      does_not_exist: "Essa pessoa não existe ou não está cá. "
-      incoming_request: "You have an incoming request from this person."
+      does_not_exist: "Essa pessoa não existe!"
+      incoming_request: "Tens um pedido desta pessoa"
       no_posts: "Não existem entradas para mostrar!"
-      not_connected: "You are not connected with this person"
-      request_people: "Se quiseres podes pedir para ele/ela te colocar num dos teus perfis."
-      return_to_aspects: "Return to your aspects page"
-      to_accept_or_ignore: "to accept or ignore it."
+      not_connected: "Não estás ligado a esta pessoa"
+      request_people: "Se quiseres podes pedir para ele/ela te colocar num dos seus grupos."
+      return_to_aspects: "Voltar à página dos grupos"
+      to_accept_or_ignore: "para o aceitares ou ignorares"
     update: 
-      failed: "Failed to update profile"
-      updated: "Profile updated"
+      failed: "Falha ao actualizar o perfil"
+      updated: "Perfil actualizado"
   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?"
+      integrity_error: "Falha ao carregar a fotografia. Tens a certeza que era uma imagem?"
+      runtime_error: "Falha ao carregar a fotografia. Tens o cinto de segurança apertado?"
+      type_error: "Falha ao carregar uma fotografia. Tens a certeza que adicionaste uma imagem?"
     destroy: 
-      notice: "Photo deleted."
+      notice: "Fotografia apagada."
     edit: 
-      editing: "Editing"
+      editing: "A editar"
     new: 
-      back_to_list: "Back to List"
-      new_photo: "New Photo"
-      post_it: "post it!"
+      back_to_list: "Voltar à Lista"
+      new_photo: "Nova Fotografia"
+      post_it: "Publica!"
     new_photo: 
-      empty: "{file} is empty, please select files again without it."
-      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
-      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      empty: "{file} está vazio, por favor escolhe novamente os ficheiros sem este último."
+      invalid_ext: "{file} tem uma extensão inválida. Apenas são permitidas as extensões {extensions}."
+      size_error: "{file} é muito grande, o tamanho máximo é {sizeLimit}."
     photo: 
-      view_all: "view all of %{name}'s photos"
+      view_all: "ver todas as fotografias de %{name}"
     show: 
-      delete_photo: "Delete Photo"
-      edit: "edit"
-      edit_delete_photo: "Edit photo description / delete photo"
-      make_profile_photo: "make profile photo"
-      original_post: "Original Post"
-      update_photo: "Update Photo"
-      view: "view"
+      delete_photo: "Apagar Fotografia"
+      edit: "editar"
+      edit_delete_photo: "Editar descrição da fotografia / apagar fotografia"
+      make_profile_photo: "criar foto de perfil"
+      original_post: "Publicação Original"
+      update_photo: "Actualizar Fotografia"
+      view: "ver"
     update: 
-      error: "Failed to edit photo."
-      notice: "Photo successfully updated."
-  profile: "Profile"
+      error: "Falha ao editar a fotografia"
+      notice: "Fotografia adicionada com sucesso."
+  profile: "Perfil"
   registrations: 
-    closed: "Signups are closed on this Diaspora pod."
+    closed: "Os registos estão encerrados neste pod do Diaspora."
     create: 
-      success: "You've joined Diaspora!"
+      success: "Juntaste-te ao 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"
+      cancel_my_account: "Cancelar a minha conta"
+      edit: "Editar %{name}"
+      leave_blank: "(deixar em branco se não quiseres modificar)"
+      password_to_confirm: "(necessitamos da tua palavra-chave actual para confirmar as tuas modificações)"
+      unhappy: "Descontente?"
+      update: "Actualizar"
     new: 
-      sign_up: "Sign up"
-      sign_up_for_diaspora: "Sign up for Diaspora"
+      sign_up: "Registar"
+      sign_up_for_diaspora: "Regista-te no Diaspora"
   requests: 
     create: 
-      sending: "Sending..."
-      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      sending: "A enviar..."
+      sent: "Pediste para partilhar com %{name}. Devem ver o pedido da próxima vez que entrarem no Diaspora."
     destroy: 
-      error: "Please select an aspect!"
-      ignore: "Ignored friend request."
+      error: "Por favor, escolhe um grupo!"
+      ignore: "Ignorar pedido de contacto."
       success: "São agora amigos."
     manage_aspect_contacts: 
-      existing: "Existing contacts"
-      manage_within: "Manage contacts within"
+      existing: "Contactos existentes"
+      manage_within: "Gerir contactos dentro"
     new_request_to_person: 
-      sent: "sent!"
-  search: "Search"
+      sent: "enviado!"
+  search: "Procurar"
   services: 
     create: 
       success: "Autenticação bem sucedida."
     destroy: 
       success: "A autenticação foi destruída com sucesso."
     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}?"
+      connect_to_facebook: "Ligar ao Facebook"
+      connect_to_twitter: "Ligar ao Twitter"
+      disconnect: "Desligar"
+      logged_in_as: "registado como"
+      really_disconnect: "desligar do %{service}?"
   settings: "Definições "
   shared: 
     add_contact: 
-      create_request: "Find by Diaspora handle"
-      diaspora_handle: "Diaspora handle"
-      enter_a_diaspora_username: "Enter a Diaspora username:"
-      know_email: "Know their email address? You should invite them"
-      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+      create_request: "Encontrar através do nome de utilizador no Diaspora"
+      diaspora_handle: "Nome de Utilizador"
+      enter_a_diaspora_username: "Insere um nome de utilizador do Diaspora"
+      know_email: "Sabes os seus emails? Devias enviar convites"
+      your_diaspora_username_is: "O teu nome de utilizador do Diaspora é: %{diaspora_handle}"
     aspect_contacts: 
-      add_aspect: "add aspect"
-      add_existing: "Add an existing contact"
-      add_to: "add to %{aspect}"
-      all_contacts: "All contacts"
-      aspect_settings: "Aspect settings"
-      aspects: "Aspects"
-      confirm_remove_aspect: "Remove aspect?"
-      contacts: "contacts"
-      done_editing: "done editing"
-      invites: "Invites"
-      new_request: "%{count} new request!"
-      new_requests: "%{count} new requests!"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
-      remove_aspect: "Remove Aspect"
+      add_aspect: "adicionar grupo"
+      add_existing: "Adicionar um contacto existente"
+      add_to: "adicionar a %{aspect}"
+      all_contacts: "Todos os contactos"
+      aspect_settings: "Definições do Grupo"
+      aspects: "Grupos"
+      confirm_remove_aspect: "Remover o Grupo?"
+      done_editing: "terminar edição"
+      invites: "Convites"
+      no_contacts: "Não tens nenhuns contactos neste momento. Descobre os teus contactos aqui."
+      remove_aspect: "Remover Grupo"
     contact_list: 
-      cannot_remove: "Cannot remove person from last aspect."
-      search_contacts: "Search contacts"
+      all_contacts: "All contacts"
+      cannot_remove: "Impossível remover esta pessoa do último Grupo. (Se quiseres desligar-te desta pessoa terás que remover o contacto.)"
     invitations: 
-      dont_have_now: "You don't have any right now, but more invites are coming soon!"
+      dont_have_now: "Não tens nenhum agora, mas terás mais convites brevemente!"
       invitations_left: "(faltam %{count})"
-      invite_someone: "Invite someone"
+      invite_someone: "Convida alguém"
     notification: 
-      new: "New %{type} from %{from}"
+      new: "Novo %{type} de %{from}"
     public_explain: 
-      logged_in: "Logado em %{service}"
-      manage: "Gerir ligação a outros serviços"
-      outside: "Public messages will be available for others outside of Diaspora to see."
-      title: "You are about to post a public message!"
+      logged_in: "Registado em %{service}"
+      manage: "Gerir ligações a outros serviços"
+      outside: "As mensagens públicas ficarão visíveis a pessoas fora do Diaspora."
+      title: "Estás prestes a publicar uma mensagem pública!"
     publisher: 
-      add_photos: "add photos"
-      all: "all"
-      all_contacts: "all contacts"
-      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"
+      add_photos: "adicionar fotografias"
+      all: "tudo"
+      all_contacts: "todos os contactos"
+      make_public: "tornar público"
+      post_a_message_to: "Publicar uma mensagem em %{aspect}"
+      posting: "A publicar..."
+      share: "Partilhar"
+      share_with: "Partilhar com %{aspect}"
+      share_with_all: "Partilhar com todos os grupos"
     reshare: 
-      reshare: "Reshare"
-    stream_element: 
-      show_comments: "show comments"
+      reshare: "Partilhar Novamente"
   status_messages: 
     helper: 
-      no_message_to_display: "No message to display."
+      no_message_to_display: "Nenhuma mensagem para mostrar."
     new_status_message: 
-      oh_yeah: "oh yeah!"
-      tell_me_something_good: "tell me something good"
+      oh_yeah: "Boa!"
+      tell_me_something_good: "Diz-me algo bom"
     show: 
-      destroy: "Destroy"
-  the_world: "the world"
-  username: "Username"
+      destroy: "Destruir"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
+  the_world: "o mundo"
+  username: "Nome de Utilizador"
   users: 
-    destroy: "Account successfully closed."
+    destroy: "Conta encerrada com sucesso"
     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"
-      new_password: "New Password"
-      your_email: "Your email"
-      your_handle: "Your diaspora handle"
+      change_language: "Modificar Idioma"
+      change_password: "Modificar Palavra-chave"
+      close_account: "Encerrar Conta"
+      download_photos: "descarregar as minhas fotos"
+      download_xml: "descarregar o meu xml"
+      export_data: "Exportar Dados"
+      new_password: "Nova Palavra-chave"
+      your_email: "O teu email"
+      your_handle: "O teu nome de utilizador no Diaspora"
     getting_started: 
-      connect_services: "Connect your services"
-      define_aspects: "Define your aspects"
-      edit_profile: "Edit your profile"
-      finished: "Finished!"
-      save_and_continue: "Save and continue"
-      signup_steps: "Complete your sign-up by doing these things:"
-      skip: "skip getting started"
+      connect_services: "Liga os teus outros serviços"
+      define_aspects: "Define os teus grupos"
+      edit_profile: "Edita o teu perfil"
+      finished: "Terminado!"
+      save_and_continue: "Guardar e continuar"
+      signup_steps: "Termina o teu registo completando estes três passos:"
+      skip: "saltar a introdução"
       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"
+        add: "Adicionar"
+        aspect_name: "Nome do grupo"
+        description: "Indica ao Diaspora que diferentes grupos teus são vistos por diferentes contactos. Podes geri-los mais tarde clicando no separador de gestão no canto superior direito. Os teus grupos são únicos, e não são visíveis por outros."
+        drag_to_add: "Drag them to the aspect of yourself they know"
+        no_requests: "You have no requests"
+        your_aspects: "Os teus grupos"
+        your_inviter: "Here are the people who are waiting for you:"
       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"
+        description: "É possível ligares as tuas outras redes sociais à tua conta no Diaspora*. Poderás tornas as tuas mensagens públicas a partir da tua página principal quando escolheres \"tornar público\""
+        your_services: "Os teus serviços"
       step_4: 
-        change_profile: "You can change your profile 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}!"
-        user_menu: "in your user menu (top right)."
-      welcome: "Welcome to Diaspora!"
+        change_profile: "Podes editar o teu perfil e gerir os teus serviços conectados em qualquer altura através de"
+        continue: "Continuar para a tua página Inicial, uma vista global de todos os teus grupos."
+        finish: "Terminar"
+        manage_aspects: "Também podes adicionar contactos quando estiveres na página de um grupo"
+        ready_to_share: "Estás agora pronto para começar a partilhar com"
+        set_up: "Estás pronto, %{name}!"
+        user_menu: "no teu menu de utilizador (canto superior direito)."
+      welcome: "Bem-vindo(a) ao Diaspora!"
     public: 
-      does_not_exist: "User %{username} does not exist!"
+      does_not_exist: "O utilizador %{username} não existe!"
     update: 
-      language_changed: "Language Changed"
-      language_not_changed: "Language Change Failed"
-      password_changed: "Password Changed"
-      password_not_changed: "Password Change Failed"
+      language_changed: "Idioma Modificado"
+      language_not_changed: "Falha ao Modificar Idioma"
+      password_changed: "Palavra-chave Modificada"
+      password_not_changed: "Falha ao Modificar Palavra-chave"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index eea82bb5fa354115f415a6994f5fb1cf07111e5d..356bed446e5f60f227ca1f4f3cae1e13b923dc02 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -40,6 +40,10 @@ ro:
       success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
     destroy: 
       success: "%{name} was successfully removed."
+    edit_aspect_pane: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Remove aspect?"
+      remove_aspect: "Remove Aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Aspect not empty"
@@ -75,8 +79,6 @@ ro:
       family: "Family"
       work: "Work"
     show: 
-      contact: "contact"
-      contacts: "contacts"
       edit_aspect: "edit aspect"
     update: 
       success: "Your aspect, %{name}, has been successfully edited."
@@ -86,6 +88,11 @@ ro:
     new_comment: 
       comment: "Comentariu"
       commenting: "Commenting..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Delete"
   email: "Email"
   error_messages: 
@@ -134,6 +141,11 @@ ro:
       login: "login"
       logout: "logout"
       view_profile: "view profile"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "the diaspora email robot"
     hello: "Hello %{name}!"
@@ -283,16 +295,13 @@ ro:
       aspect_settings: "Aspect settings"
       aspects: "Aspects"
       confirm_remove_aspect: "Remove aspect?"
-      contacts: "contacts"
       done_editing: "done editing"
       invites: "Invites"
-      new_request: "%{count} new request!"
-      new_requests: "%{count} new requests!"
       no_contacts: "You currently have no contacts.  Find your contacts here."
       remove_aspect: "Remove Aspect"
     contact_list: 
+      all_contacts: "All contacts"
       cannot_remove: "Cannot remove person from last aspect."
-      search_contacts: "Search contacts"
     invitations: 
       dont_have_now: "You don't have any right now, but more invites are coming soon!"
       invitations_left: "(%{count} left)"
@@ -316,8 +325,6 @@ ro:
       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."
@@ -326,6 +333,9 @@ ro:
       tell_me_something_good: "spune-mi ceva bun"
     show: 
       destroy: "Distruge"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "the world"
   username: "Username"
   users: 
@@ -352,7 +362,10 @@ ro:
         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."
+        drag_to_add: "Drag them to the aspect of yourself they know"
+        no_requests: "You have no requests"
         your_aspects: "Your aspects"
+        your_inviter: "Here are the people who are waiting for you:"
       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"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 9eb58bebb45355867013452ad322c0011717cd22..2c53f19c37bc6af675724b5dfcda378cbc8eef83 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -5,8 +5,8 @@
 
 ru: 
   _comments: "Коментарии"
-  _home: "Домой"
-  _photos: "Фото"
+  _home: "Домашний"
+  _photos: "Фотографии"
   _services: "Сервисы"
   account: "Учётная запись"
   activemodel: 
@@ -15,7 +15,7 @@ ru:
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "уже присутствет"
+              taken: "уже присутствует"
         user: 
           attributes: 
             email: 
@@ -23,7 +23,7 @@ ru:
             person: 
               invalid: "неправильный"
             username: 
-              taken: "уже присутствует в базе"
+              taken: "уже занято"
   ago: "назад"
   application: 
     helper: 
@@ -33,35 +33,39 @@ ru:
   are_you_sure: "Вы уверены?"
   aspects: 
     add_to_aspect: 
-      failure: "Добавить друга в аспект не удалось."
-      success: "Друг добавлен в аспект ."
+      failure: "Не удалось добавить друга в аспект."
+      success: "Друг добавлен в аспект."
     create: 
-      failure: "Создать аспект не удалось."
+      failure: "Не удалось создать аспект."
       success: "Ваш новый аспект %{name} создан"
     destroy: 
       success: "%{name} удалён."
+    edit_aspect_pane: 
+      add_existing: "Добавить существующий контакт"
+      confirm_remove_aspect: "Удалить аспект?"
+      remove_aspect: "Удалить Аспект"
     helper: 
       are_you_sure: "Вы уверены, что хотите удалить аспект?"
       aspect_not_empty: "Аспект не пуст"
       remove: "удалить"
     index: 
-      handle_explanation: "Это идентификатор вашей диаспоры. Так же как адрес электронной почты, который вы можете дать людям, чтобы они связались с вами."
+      handle_explanation: "Это идентификатор вашей Диаспоры. Так же как адрес электронной почты, который вы можете дать людям, для связи с вами."
     manage: 
-      add_a_new_aspect: "Создать"
+      add_a_new_aspect: "Добавить аспект"
       add_a_new_contact: "Добавить новый контакт"
       drag_to_add: "Потяните для добавления в аспект"
       manage_aspects: "Управление аспектами"
       no_requests: "Новых запросов нет"
       requests: "Запросы"
     move_contact: 
-      error: "Ошибка перемещения контакта: %{inspect}"
+      error: "Ошибка при перемещении контакта: %{inspect}"
       failure: "не работает %{inspect}"
       success: "Друг перемещён в новый аспект"
     new_aspect: 
       create: "Создать"
       name: "Имя"
     no_contacts_message: 
-      add_contact: "Добавить новый контакт"
+      add_contact: "Добавить контакт"
       add_contact_to: "Добавить кого-нибудь в %{aspect_name}"
       invite: "Пригласить кого-нибудь присоединится к Диаспоре!"
       nobody: "Сообщите людям, что происходит в вашей жизни через Диаспору!"
@@ -75,9 +79,7 @@ ru:
       family: "Семья"
       work: "Работа"
     show: 
-      contact: "Контакт"
-      contacts: "Контакты"
-      edit_aspect: "Редактировать аспект"
+      edit_aspect: "редактировать аспект"
     update: 
       success: "Аспект, %{name}, отредактирован."
   back: "Назад"
@@ -86,40 +88,45 @@ ru:
     new_comment: 
       comment: "Комментарий"
       commenting: "Комментирование ..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Удаление"
-  email: "E-mail"
+  email: "Email"
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Исправьте ошибки и попробуйте снова."
-      invalid_fields: "Неверная запись"
+      invalid_fields: "Неверные поля"
   fill_me_out: "Заполнить"
   home: 
     show: 
       already_account: "уже есть учётная запись?"
       choice: "Выбор"
-      choice_explanation: "Диаспора позволяет сортировать группы контактов, называемые аспектами. Аспекты - уникальная особенность диаспоры. Они позволяет обеспечить приватность ваших фотографий, историй и т.д. Последние будут доступны только для тех людей, которые принадлежат соответствующему аспекту."
+      choice_explanation: "Диаспора позволяет сортировать группы контактов, называемые аспектами. Аспекты - уникальная особенность диаспоры. Они позволяют обеспечить приватность ваших фотографий, историй и т.д. Последние будут доступны только для тех людей, которые принадлежат соответствующему аспекту."
       learn_about_host: "Узнайте о том, как организовать свой собственный сервер Диаспоры."
       login_here: "Войти здесь"
       ownership: "Собственность"
-      ownership_explanation: "Вы сохраняете право собственности на все, что вы предоставляете Диаспоре, что дает вам полный контроль над тем, как это распространяется."
-      share_what_you_want: "Делитесь, чем хотите, и с кем хотите."
+      ownership_explanation: "Вы сохраняете право собственности на все, что вы предоставляете Диаспоре, это дает вам полный контроль над тем, как это распространяется."
+      share_what_you_want: "Делитесь чем хотите, с кем хотите."
       simplicity: "Простота"
-      simplicity_explanation: "Диаспора делает обмен прозрачным и простым - и это распространяется и на частную жизнь. По существу, диаспора не заставляет вас пробираться через страницы настроек и опций для того, чтобы держать ваш профиль в безопасности."
+      simplicity_explanation: "Диаспора делает обмен прозрачным и простым - это распространяется и на частную жизнь. По существу, диаспора не заставляет вас пробираться через страницы настроек и опций для того, чтобы держать ваш профиль в безопасности."
   invitations: 
     check_token: 
       not_found: "Код приглашения не найден"
     create: 
-      already_contacts: "Вы уже связаны с этим человеком."
+      already_contacts: "Вы уже связаны с этим человеком"
       already_sent: "Вы уже пригласили этого человека."
       no_more: "У вас закончились приглашения."
-      rejected: "Следующие адреса электронной почты были проблемными:"
-      sent: "Ваше приглашение отправлено."
+      rejected: "Следующие адреса электронной почты имеют проблемы:"
+      sent: "Ваши приглашения отправлены:"
     edit: 
       sign_up: "регистрация"
     new: 
       comma_seperated_plz: "Вы можете ввести несколько адресов электронной почты через запятую."
-      if_they_accept_info: "После их согласия они будут добавлены в аспект"
-      invite_someone_to_join: "Пригласить в диаспору!"
+      if_they_accept_info: "После их согласия они будут добавлены в аспект."
+      invite_someone_to_join: "Пригласить кого-либо в Диаспору!"
       message: "Сообщение:"
       send_an_invitation: "Отправить приглашение"
       send_invitation: "Отправить приглашение"
@@ -128,20 +135,25 @@ ru:
     application: 
       powered_by: "ПОДДЕРЖИВАЕТСЯ ДИАСПОРОЙ*"
     header: 
-      account_settings: "Настройки аккаунта"
+      account_settings: "настройки аккаунта"
       blog: "блог"
-      edit_profile: "Редактировать профиль"
+      edit_profile: "редактировать профиль"
       login: "логин"
       logout: "выйти"
-      view_profile: "Просмотр профиля"
+      view_profile: "просмотр профиля"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "почтовый робот Диаспоры"
     hello: "Привет %{name}!"
     love: "Любовь,"
     new_request: 
-      just_sent_you: "отправил вам запрос для Диаспоры"
-      sign_in: "Войдите в систему здесь"
-      subject: "Новый запрос Диаспоры от %{from}"
+      just_sent_you: "отправил вам запрос для Диаспоры*"
+      sign_in: "войдите в систему здесь"
+      subject: "новый запрос Диаспоры от %{from}"
       try_it_out: "Вы должны подумать о его проверке.\n"
     request_accepted: 
       accepted: "принял(а) ваш запрос. Сейчас он(а) находятся в вашем\n"
@@ -153,16 +165,16 @@ ru:
   password_confirmation: "Подтверждение пароля"
   people: 
     edit: 
-      allow_search: "Разрешить отображать вас в поиске"
+      allow_search: "Разрешить отображать вас в поиске Диаспоры"
       first_name: "Имя"
-      info_available_to: "Эта информация будет доступна для всех."
+      info_available_to: "Эта информация будет доступна для всех, кто будет связан с вами в Диаспоре."
       last_name: "Фамилия"
       update_profile: "Обновить профиль"
       your_bio: "О себе"
       your_birthday: "День рождения"
       your_gender: "Ваш пол"
       your_name: "Ваше Имя"
-      your_photo: "Фото"
+      your_photo: "Ваши фото"
       your_profile: "Ваш профиль"
     helper: 
       people_on_pod_are_aware_of: "люди на сервере знают о"
@@ -172,14 +184,14 @@ ru:
     person: 
       add_contact: "добавить контакт"
       already_connected: "Уже подключен"
-      pending_request: "Ожидатется подтверждение"
-      thats_you: "Это вы!"
+      pending_request: "ожидающий запрос"
+      thats_you: "это вы!"
     profile_photo_upload: 
       or_select_one: "или выберите из уже существующих"
     profile_sidebar: 
       bio: "О себе"
       born: "день рождения"
-      cannot_remove: "Не удалось удалить %{name} c последнего аспекта. Если вы хотите отключиться от этого человека необходимо удалить контакт.\n"
+      cannot_remove: "Не удалось удалить %{name} c последнего аспекта.(Если вы хотите отключиться от этого человека необходимо удалить контакт)"
       edit_my_profile: "Редиктировать профиль"
       gender: "пол"
       in_aspects: "в аспектах"
@@ -188,14 +200,14 @@ ru:
     show: 
       already_requested: "Вы уже отправили запрос для %{name}."
       does_not_exist: "Персоны не существует !"
-      incoming_request: "You have an incoming request from this person."
-      no_posts: "Новых сообщений нет!"
+      incoming_request: "Вам поступил запрос от этого человека."
+      no_posts: "новых сообщений нет!"
       not_connected: "Вы не связаны с этим человеком"
-      request_people: "Если хотите, вы можете спросить его/ее разрешения добавить в аспект"
-      return_to_aspects: "Return to your aspects page"
-      to_accept_or_ignore: "to accept or ignore it."
+      request_people: "Если хотите, вы можете спросить его/ее разрешения добавить в аспекты."
+      return_to_aspects: "Вернуться на страницу аспектов"
+      to_accept_or_ignore: "принять или игнорировать."
     update: 
-      failed: "Обновить профиль не удалось"
+      failed: "Не удалось обновить профиль"
       updated: "Профиль обновлён"
   photos: 
     create: 
@@ -217,7 +229,7 @@ ru:
     photo: 
       view_all: "Посмотреть все фотографии %{name}"
     show: 
-      delete_photo: "Удалить"
+      delete_photo: "Удалить фото"
       edit: "редактировать"
       edit_delete_photo: "Изменить описание фото / удалить фото"
       make_profile_photo: "сделать фотографией профиля"
@@ -236,7 +248,7 @@ ru:
       cancel_my_account: "Отменить мой аккаунт"
       edit: "Редактировать %{name}"
       leave_blank: "(Оставьте пустым, если не хотите менять)"
-      password_to_confirm: "(Введите ваш текущий пароль для подтверждения изменений)"
+      password_to_confirm: "(введите ваш текущий пароль для подтверждения изменений)"
       unhappy: "Несчастны?"
       update: "Обновить"
     new: 
@@ -271,7 +283,7 @@ ru:
   shared: 
     add_contact: 
       create_request: "Поиск по Диаспоре"
-      diaspora_handle: "Руководство Диаспоры"
+      diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Введите имя пользователя Диаспоры:"
       know_email: "Знаете их адреса электронной почты? Приглашайте"
       your_diaspora_username_is: "Ваше имя пользователя Диаспоры: %{diaspora_handle}"
@@ -283,16 +295,13 @@ ru:
       aspect_settings: "Настройки Аспектов"
       aspects: "Аспекты"
       confirm_remove_aspect: "Удалить аспект?"
-      contacts: "Контакты"
       done_editing: "редактирование завершено"
       invites: "Приглашения"
-      new_request: "%{count} новый запрос!"
-      new_requests: "%{count} новых запросов!"
       no_contacts: "У вас нет контактов. Найти контакты здесь."
       remove_aspect: "Удалить Аспект"
     contact_list: 
-      cannot_remove: "Не может удалить человека с последнего аспекта. (Если вы хотите, отключить этого человека необходимо удалить контакт)"
-      search_contacts: "Поиск контактов"
+      all_contacts: "Все контакты"
+      cannot_remove: "Не может удалить человека с последнего аспекта.(Если вы хотите, отключить этого человека необходимо удалить контакт)"
     invitations: 
       dont_have_now: "Сейчас у вас больше нет приглашений, но новые уже не за горами!"
       invitations_left: "(осталось %{count})"
@@ -300,15 +309,15 @@ ru:
     notification: 
       new: "Новый %{type} из %{from}"
     public_explain: 
-      logged_in: "Войти в %{service}"
-      manage: "Управление сервисами"
+      logged_in: "войти в %{service}"
+      manage: "управление сервисами"
       outside: "Публичные сообщения доступны для чтения всем, даже за пределами вашей Диаспоры."
       title: "Вы собираетесь отправить публичное сообщение!"
     publisher: 
       add_photos: "добавить фото"
-      all: "Все"
+      all: "все"
       all_contacts: "все контакты"
-      make_public: "Сделать публичным"
+      make_public: "сделать публичным"
       post_a_message_to: "Опубликовать сообщение для %{aspect}"
       posting: "Отправка ..."
       share: "Поделиться"
@@ -316,17 +325,18 @@ ru:
       share_with_all: "Поделиться во все аспекты"
     reshare: 
       reshare: "Поделиться повторно"
-    stream_element: 
-      show_comments: "Комментарии"
   status_messages: 
     helper: 
       no_message_to_display: "Новых сообщений нет."
     new_status_message: 
-      oh_yeah: "О да!"
+      oh_yeah: "о да!"
       tell_me_something_good: "расскажи мне что-нибудь хорошее"
     show: 
       destroy: "Уничтожить"
-  the_world: "Мир"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
+  the_world: "мир"
   username: "Пользователь"
   users: 
     destroy: "Аккаунт закрыт."
@@ -347,23 +357,26 @@ ru:
       finished: "Готово!"
       save_and_continue: "Сохранить и продолжить"
       signup_steps: "Для заверщения вашей регистрации, выполните:"
-      skip: "Пропускать при старте"
+      skip: "пропускать при старте"
       step_2: 
         add: "Добавить"
         aspect_name: "Имя аспекта"
         description: "Укажите какие аспекты будут доступны для просмотра вашим контактам. Вы сможете изменять их в будущем, нажав на вкладку Управление в правом верхнем углу. Ваши аспекты уникальны и не видны другим."
+        drag_to_add: "Перетащите их в ваш аспект"
+        no_requests: "You have no requests"
         your_aspects: "Ваши аспекты"
+        your_inviter: "Здесь люди ожидающие вас:"
       step_3: 
-        description: "Подключите аккаунты с других социальных сетей к вашей диаспоре. Вы сможете общедоступно размещать через вкладку \"Для всех\""
+        description: "Подключите аккаунты с других социальных сетей к вашей Диаспоре. Вы сможете общедоступно размещать через вкладку \"Домашний\""
         your_services: "Ваши сервисы"
       step_4: 
         change_profile: "Вы можете редактировать свой профиль и управлять подключенными услугами в любое время"
         continue: "Продолжить на вашей странице, обзор всех ваших аспектов."
-        finish: "Конец"
+        finish: "Завершить"
         manage_aspects: "Так же вы можете добавлять контакты на любой странице аспектов."
         ready_to_share: "Теперь вы готовы начать обмен с"
         set_up: "Вы все готовы, %{name}!"
-        user_menu: "пользовательское меню, расположенное в правом верхнем углу.\n"
+        user_menu: "пользовательское меню, расположено в правом верхнем углу."
       welcome: "Добро пожаловать в Диаспору!"
     public: 
       does_not_exist: "Пользователя %{username} не существует!"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 2de12afa5fc42ba941292198340986d7c3167cfe..07fbec604bdeea6f06f71264e95d6db79483ba0e 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -40,6 +40,10 @@ sk:
       success: "Váš nový aspekt %{name} bol vytvorený"
     destroy: 
       success: "Užívateľ %{name} bol úspešne odstránený."
+    edit_aspect_pane: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Remove aspect?"
+      remove_aspect: "Remove Aspect"
     helper: 
       are_you_sure: "Skutočne chcete odstrániť tento aspekt?"
       aspect_not_empty: "Aspekt nie je prázdny"
@@ -75,8 +79,6 @@ sk:
       family: "Rodina"
       work: "Práca"
     show: 
-      contact: "Kontakt"
-      contacts: "Kontakty"
       edit_aspect: "upraviť aspekt"
     update: 
       success: "Váš aspekt, %{name}, bol úspešne upravený."
@@ -86,6 +88,11 @@ sk:
     new_comment: 
       comment: "Komentár"
       commenting: "Komentuje..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Zmazať"
   email: "e-mail"
   error_messages: 
@@ -134,6 +141,11 @@ sk:
       login: "prihlásenie"
       logout: "odhlásiť sa"
       view_profile: "pozrieť profil"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "e-mail robot Diaspóry"
     hello: "Ahoj %{name}!"
@@ -283,16 +295,13 @@ sk:
       aspect_settings: "Nastavenia aspektu"
       aspects: "Aspekty"
       confirm_remove_aspect: "Odstrániť aspekt?"
-      contacts: "Kontakty"
       done_editing: "dokončiť úpravy"
       invites: "Pozvánky"
-      new_request: "Počet nových žiadostí - %{count}"
-      new_requests: "Počet žiadostí : %{count} "
       no_contacts: "Momentálne nemáte žiadne kontakty. Nájdite ich tu."
       remove_aspect: "Odstrániť aspekt"
     contact_list: 
+      all_contacts: "All contacts"
       cannot_remove: "Nie je možné osobu odstrániť z posledného aspektu. (Ak s ňou chcete nadobro prerušiť kontakt, odstráňte ju prosím z Vášho zoznamu osôb.)"
-      search_contacts: "Hľadať kontakty"
     invitations: 
       dont_have_now: "Momentálne už nemáte žiadnu pozvánku. Ďalšie pribudnú už čoskoro."
       invitations_left: "(%{count} ostáva)"
@@ -316,8 +325,6 @@ sk:
       share_with_all: "zdieľať so všetkými aspektami"
     reshare: 
       reshare: "Znovu zdieľať"
-    stream_element: 
-      show_comments: "Zobraziť komentáre"
   status_messages: 
     helper: 
       no_message_to_display: "Źiadne správy na zobrazenie."
@@ -326,6 +333,9 @@ sk:
       tell_me_something_good: "Povedz niečo dobré"
     show: 
       destroy: "Zničiť"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "svet"
   username: "Užívateľské meno"
   users: 
@@ -352,7 +362,10 @@ sk:
         add: "Pridať"
         aspect_name: "Názov aspektu"
         description: "Prezraďte Diaspóre, kto môže vidieť Vaše aspekty. Neskôr ich môžete spravovať kliknutím na tlačidlo - nastavenia účtu, vpravo hore."
+        drag_to_add: "Drag them to the aspect of yourself they know"
+        no_requests: "You have no requests"
         your_aspects: "Váš aspekt"
+        your_inviter: "Here are the people who are waiting for you:"
       step_3: 
         description: "Diaspóru môžete prepojiť s Vašimi sociálnymi sieťami v nastaveniach. Vaše statusy uverejníte mimo Diaspóry vybratím možnosti \"zverejniť\"."
         your_services: "Vaše služby"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 8ff63fc47429b19160e54d6f6ac83b8d079c0db6..a3ae3d55f78bba9d4810b0f322eac84a626b8c2c 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -40,6 +40,10 @@ sv:
       success: "Din nya sida %{name} har skapats"
     destroy: 
       success: "%{name} är nu borttagen."
+    edit_aspect_pane: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Remove aspect?"
+      remove_aspect: "Remove Aspect"
     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"
@@ -75,8 +79,6 @@ sv:
       family: "Familj"
       work: "Arbete"
     show: 
-      contact: "kontakt"
-      contacts: "kontakter"
       edit_aspect: "ändra sida"
     update: 
       success: "Din sida %{name} är nu ändrad."
@@ -86,6 +88,11 @@ sv:
     new_comment: 
       comment: "Kommentar"
       commenting: "Kommenterar..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Ta bort"
   email: "E-post"
   error_messages: 
@@ -134,6 +141,11 @@ sv:
       login: "logga in"
       logout: "logga ut"
       view_profile: "visa profil"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "Diasporas mailrobot"
     hello: "Hej %{name}!"
@@ -283,16 +295,13 @@ sv:
       aspect_settings: "Inställningar för sida"
       aspects: "Sidor"
       confirm_remove_aspect: "Ta bort sida?"
-      contacts: "kontakter"
       done_editing: "färdig"
       invites: "Inbjudningar"
-      new_request: "%{count} nya förfrågningar!"
-      new_requests: "%{count} nya förfrågningar!"
       no_contacts: "Du har förnärvarande inga kontakter.  Hitta nya kontakter här."
       remove_aspect: "Ta bort sida"
     contact_list: 
+      all_contacts: "All contacts"
       cannot_remove: "Kan inte ta bort personen från fler sidor, ta bort kontakten om du inte längre vill vara ansluten till denne."
-      search_contacts: "Sök efter kontakter"
     invitations: 
       dont_have_now: "Du har inga inbjudningar just nu, men fler kommer delas ut inom kort!"
       invitations_left: "(%{count} kvar)"
@@ -316,8 +325,6 @@ sv:
       share_with_all: "Dela på alla dina sidor"
     reshare: 
       reshare: "Ã…terdela"
-    stream_element: 
-      show_comments: "visa kommentarer"
   status_messages: 
     helper: 
       no_message_to_display: "Inget meddelande att visa."
@@ -326,6 +333,9 @@ sv:
       tell_me_something_good: "berätta något intressant"
     show: 
       destroy: "Ta bort"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "världen"
   username: "Användarnamn"
   users: 
@@ -352,7 +362,10 @@ sv:
         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\"."
+        drag_to_add: "Drag them to the aspect of yourself they know"
+        no_requests: "You have no requests"
         your_aspects: "Dina sidor"
+        your_inviter: "Here are the people who are waiting for you:"
       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"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index d7391cddf3ac81520ebae3f332b47e29806e730b..9491789a5fdecbcc7b36c5a50386586a76dbf878 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -40,6 +40,10 @@ tr:
       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ı."
+    edit_aspect_pane: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Remove aspect?"
+      remove_aspect: "Remove Aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Yan boÅŸ deÄŸil"
@@ -75,8 +79,6 @@ tr:
       family: "Family"
       work: "Work"
     show: 
-      contact: "contact"
-      contacts: "contacts"
       edit_aspect: "edit aspect"
     update: 
       success: "Sizin yanınız, %{name}, başariyla düzeltildi."
@@ -86,6 +88,11 @@ tr:
     new_comment: 
       comment: "Yorum"
       commenting: "Commenting..."
+  contacts: 
+    few: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    zero: "no contacts"
   delete: "Sil"
   email: "E-Posta"
   error_messages: 
@@ -134,6 +141,11 @@ tr:
       login: "login"
       logout: "logout"
       view_profile: "view profile"
+  new_requests: 
+    few: "%{count} new requests!"
+    one: "new request!"
+    other: "%{count} new requests!"
+    zero: "no new requests"
   notifier: 
     diaspora: "the diaspora email robot"
     hello: "Hello %{name}!"
@@ -283,16 +295,13 @@ tr:
       aspect_settings: "Aspect settings"
       aspects: "Aspects"
       confirm_remove_aspect: "Remove aspect?"
-      contacts: "contacts"
       done_editing: "done editing"
       invites: "Invites"
-      new_request: "%{count} new request!"
-      new_requests: "%{count} new requests!"
       no_contacts: "You currently have no contacts.  Find your contacts here."
       remove_aspect: "Remove Aspect"
     contact_list: 
+      all_contacts: "All contacts"
       cannot_remove: "Cannot remove person from last aspect."
-      search_contacts: "Search contacts"
     invitations: 
       dont_have_now: "You don't have any right now, but more invites are coming soon!"
       invitations_left: "(%{count} davet kaldı)"
@@ -316,8 +325,6 @@ tr:
       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."
@@ -326,6 +333,9 @@ tr:
       tell_me_something_good: "bana iyi bir şey söyle"
     show: 
       destroy: "Yok et"
+  stream_helper: 
+    hide_comments: "hide comments"
+    show_comments: "show comments"
   the_world: "dünya"
   username: "Kullanıcı Adı"
   users: 
@@ -352,7 +362,10 @@ tr:
         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."
+        drag_to_add: "Drag them to the aspect of yourself they know"
+        no_requests: "You have no requests"
         your_aspects: "Your aspects"
+        your_inviter: "Here are the people who are waiting for you:"
       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"