updated locales - as always all the honor goes to the people at 99translations

29 files changed, 403 insertions, 151 deletions

diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index f110beb07..1056184dd 100644
--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -64,8 +64,8 @@ fr:
     sessions: 
       new: 
         alpha_software: "Vous êtes sur le point d'utiliser une application en version alpha."
-        bugs_and_feedback: "Soyez bien conscient que vous serez confronté à des bugs. Nous vous encourageons à utiliser le bouton Feedback à la droite de votre navigateur pour reporter tout disfonctionnement ! Nous travaillerons au plus vite pour régler chaque problème que vous reporterez."
-        bugs_and_feedback_mobile: "Be advised, you will experience bugs.  We encourage you to report any hiccups!  We will work as fast as we can to resolve any issues you report."
+        bugs_and_feedback: "Ne vous étonnez pas, vous allez rencontrer des bugs. Nous vous encourageons à utiliser le bouton Feedback sur le côté droit de votre navigateur pour signaler tout dysfonctionnement ! Nous travaillerons au plus vite pour régler chaque problème que vous signalerez."
+        bugs_and_feedback_mobile: "Ne vous étonnez pas, vous allez rencontrer des bugs. Nous vous encourageons à nous signaler tout dysfonctionnement ! Nous travaillerons au plus vite pour régler chaque problème que vous signalerez."
         have_a_problem: "Un problème ? Trouvez une réponse ici"
         login: "Se connecter"
         modern_browsers: "supporte seulement des navigateurs modernes."
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 1c43abb80..b751c8fda 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -24,9 +24,11 @@ ar:
               invalid: "es inválido"
             username: 
               taken: "is already taken"
-  ago: "ago"
+  ago: "%{time} ago"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "شخص غير معروف"
       youtube_title: 
         unknown: "Unknown Video Title"
@@ -134,6 +136,7 @@ ar:
     edit: 
       sign_up: "sign_up"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspect"
       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."
@@ -200,6 +203,8 @@ ar:
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "buscar resultados para"
     person: 
@@ -366,14 +371,17 @@ ar:
   users: 
     destroy: "Account successfully closed."
     edit: 
+      change: "Change"
       change_language: "Change Language"
       change_password: "Cambiar Contraseña"
       close_account: "Cerrar Cuenta"
       download_photos: "descargar mis fotos"
       download_xml: "download my xml"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Exportar datos"
       new_password: "Nueva Contraseña"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
@@ -407,6 +415,7 @@ ar:
     public: 
       does_not_exist: "¡El usuario %{username} no existe!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Language Changed"
       language_not_changed: "Language Change Failed"
       password_changed: "Password Changed"
diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index 7e9381efd..c75d8be15 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -24,9 +24,11 @@ ca:
               invalid: "no és vàlid"
             username: 
               taken: "Ja ha estat escollit"
-  ago: "fa"
+  ago: "%{time} fa"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "persona desconeguda"
       youtube_title: 
         unknown: "Títol desconegut de vídeo"
@@ -134,6 +136,7 @@ ca:
     edit: 
       sign_up: "conectar-se"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspect"
       comma_seperated_plz: "Pots escriure múltiples direccions d'E-Mail separades per comes."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
@@ -200,6 +203,8 @@ ca:
       people_on_pod_are_aware_of: "persones al \"pod\" són conscients de"
       results_for: "resultats per %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "resultats de la cerca per"
     person: 
@@ -366,14 +371,17 @@ ca:
   users: 
     destroy: "Cuenta cerrada con éxito."
     edit: 
+      change: "Change"
       change_language: "Cambiar idioma"
       change_password: "Cambiar contraseña"
       close_account: "Cerrar cuenta"
       download_photos: "Descargar mis fotos"
       download_xml: "Descargar mi xml"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Exportar datos"
       new_password: "Nueva contraseña"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "Tu email"
       your_handle: "Tu dirección Diaspora"
     getting_started: 
@@ -407,6 +415,7 @@ ca:
     public: 
       does_not_exist: "¡El usuario %{username} no existe!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Idioma Cambiado"
       language_not_changed: "Cambio de Idioma Fallido"
       password_changed: "Contraseña Cambiada"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 4d6364b66..6c013d07a 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -24,9 +24,11 @@ cs:
               invalid: "is invalid"
             username: 
               taken: "is already taken"
-  ago: "ago"
+  ago: "%{time} ago"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "neznámá osoba"
       youtube_title: 
         unknown: "Unknown Video Title"
@@ -134,6 +136,7 @@ cs:
     edit: 
       sign_up: "sign_up"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspect"
       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."
@@ -200,6 +203,8 @@ cs:
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "search results for"
     person: 
@@ -366,14 +371,17 @@ cs:
   users: 
     destroy: "Account successfully closed."
     edit: 
+      change: "Change"
       change_language: "Change Language"
       change_password: "Change Password"
       close_account: "Close Account"
       download_photos: "download my photos"
       download_xml: "download my xml"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Export Data"
       new_password: "New Password"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
@@ -407,6 +415,7 @@ cs:
     public: 
       does_not_exist: "User %{username} does not exist!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Language Changed"
       language_not_changed: "Language Change Failed"
       password_changed: "Password Changed"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 3367eac9c..f5c661655 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -24,9 +24,11 @@ cy:
               invalid: "Is invalid"
             username: 
               taken: "is already taken"
-  ago: "ago"
+  ago: "%{time} ago"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "unknown person"
       youtube_title: 
         unknown: "Unknown Video Title"
@@ -134,6 +136,7 @@ cy:
     edit: 
       sign_up: "sign_up"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspect"
       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."
@@ -200,6 +203,8 @@ cy:
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "search results for"
     person: 
@@ -366,14 +371,17 @@ cy:
   users: 
     destroy: "Account successfully closed."
     edit: 
+      change: "Change"
       change_language: "Change Language"
       change_password: "Change Password"
       close_account: "Close Account"
       download_photos: "download my photos"
       download_xml: "download my xml"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Export Data"
       new_password: "New Password"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
@@ -407,6 +415,7 @@ cy:
     public: 
       does_not_exist: "User %{username} does not exist!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Language Changed"
       language_not_changed: "Language Change Failed"
       password_changed: "Password Changed"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 2ac5b92f2..61c66de7e 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -24,9 +24,11 @@ da:
               invalid: "er ugyldig"
             username: 
               taken: "er allerede taget"
-  ago: "siden"
+  ago: "%{time} siden"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "ukendt person"
       youtube_title: 
         unknown: "Ukendt videotitel"
@@ -134,6 +136,7 @@ da:
     edit: 
       sign_up: "Bliv medlem"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspekt"
       comma_seperated_plz: "Du kan indtaste flere e-mailadresser adskilt med komma."
       if_they_accept_info: "hvis de accepterer, vil de blive tilføjet til det aspekt du inviterede dem til."
@@ -200,6 +203,8 @@ da:
       people_on_pod_are_aware_of: "brugere på serveren er bevidste om"
       results_for: " resultat for %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "søgeresultater for"
     person: 
@@ -366,14 +371,17 @@ da:
   users: 
     destroy: "Kontoen er nu lukket."
     edit: 
+      change: "Change"
       change_language: "Skift sprog"
       change_password: "Skift adgangskode"
       close_account: "Luk konto"
       download_photos: "Download mine billeder"
       download_xml: "Download min XML"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Exportér data"
       new_password: "Ny adgangskode"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "Din e-mail"
       your_handle: "Dit diaspora handle"
     getting_started: 
@@ -407,6 +415,7 @@ da:
     public: 
       does_not_exist: "Brugeren %{username} findes ikke!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Sprog ændret"
       language_not_changed: "Kunne ikke ændre sprog"
       password_changed: "Adgangskode ændret"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index d43310d3f..e4d12c5bf 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -24,9 +24,11 @@ de:
               invalid: "ist ungültig"
             username: 
               taken: "ist bereits vergeben"
-  ago: "her"
+  ago: "%{time} her"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "unbekannte Person"
       youtube_title: 
         unknown: "Unbekannter Video-Titel"
@@ -88,7 +90,7 @@ de:
     show: 
       edit_aspect: "Aspekt bearbeiten"
     update: 
-      failure: "Your aspect, %{name}, had too long name to be saved."
+      failure: "Dein Aspekt %{name} hat einen zu langen Namen zum Speichern."
       success: "Dein Aspekt %{name} wurde erfolgreich bearbeitet."
   back: "Zurück"
   cancel: "Abbrechen"
@@ -134,6 +136,7 @@ de:
     edit: 
       sign_up: "anmelden"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspekt"
       comma_seperated_plz: "Du kannst mehrere E-Mail-Adressen eintragen. Trenne sie mit Kommata."
       if_they_accept_info: "wenn sie akzeptieren, werden sie zu dem Aspekt hinzugefügt, in den du sie eingeladen hast."
@@ -185,7 +188,7 @@ de:
   people: 
     edit: 
       allow_search: "Erlaube anderen Diaspora-Nutzern, nach dir zu suchen"
-      edit_profile: "Edit profile"
+      edit_profile: "Profil bearbeiten"
       first_name: "Vorname"
       info_available_to: "Diese Infos werden für alle verfügbar sein, mit denen du bei Diaspora verbunden bist."
       last_name: "Nachname"
@@ -200,7 +203,9 @@ de:
       people_on_pod_are_aware_of: "Leute auf dem Pod wissen von"
       results_for: "Ergebnisse für %{params}"
     index: 
-      no_results: "Hey! You need to search for something."
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
+      no_results: "Hey! Du musst nach etwas suchen."
       results_for: "Suchergebnisse für"
     person: 
       add_contact: "Kontakt hinzufügen"
@@ -223,7 +228,7 @@ de:
       no_posts: "Keine Posts zum Anzeigen!"
       not_connected: "Du bist nicht mit dieser Person verbunden"
       recent_posts: "Letzte Beiträge"
-      recent_public_posts: "Recent Public Posts"
+      recent_public_posts: "Neueste öffentliche Beiträge"
       request_people: "Wenn du möchtest, kannst du ihn fragen, ob du ihn/sie in einem deiner Aspekte platzieren darfst."
       return_to_aspects: "Kehre zur Aspekt-Übersicht zurück."
       to_accept_or_ignore: "um zu akzeptieren oder zu ignorieren."
@@ -250,8 +255,8 @@ de:
       invalid_ext: "{file} hat keine gültige Erweiterung. Nur {extensions} sind erlaubt."
       size_error: "{file} ist zu groß. Die maximale Dateigröße ist {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "or select one from your already existing"
-      upload: "Upload a new profile photo!"
+      or_select_one: "oder wähle eins aus deinen bereits bestehenden"
+      upload: "Lade ein neues Profilfoto hoch!"
     photo: 
       view_all: "zeige alle Fotos von %{name}"
     show: 
@@ -310,7 +315,7 @@ de:
       connect_to_facebook: "Mit Facebook verbinden"
       connect_to_twitter: "Mit Twitter verbinden"
       disconnect: "Verbindung entfernen"
-      edit_services: "Edit services"
+      edit_services: "Dienste bearbeiten"
       logged_in_as: "angemeldet als"
       really_disconnect: "Verbindung mit %{service} entfernen?"
   settings: "Einstellungen"
@@ -366,14 +371,17 @@ de:
   users: 
     destroy: "Konto erfolgreich stillgelegt."
     edit: 
+      change: "Ändern"
       change_language: "Sprache ändern"
       change_password: "Passwort ändern"
       close_account: "Konto stilllegen"
       download_photos: "Meine Fotos herunterladen"
       download_xml: "Mein XML herunterladen"
-      edit_account: "Edit account"
+      edit_account: "Konto bearbeiten"
+      email_notifications: "Emailbenachrichtigungen"
       export_data: "Konto exportieren"
       new_password: "Neues Passwort"
+      receive_email_notifications: "Emailbenachrichtigungen empfangen?"
       your_email: "deine E-Mail-Adresse"
       your_handle: "Deine Diaspora-Adresse"
     getting_started: 
@@ -407,6 +415,7 @@ de:
     public: 
       does_not_exist: "Benutzer %{username} existiert nicht!"
     update: 
+      email_notifications_changed: "Wechsel der Sprache fehlgeschlagen"
       language_changed: "Sprache geändert"
       language_not_changed: "Ändern der Sprache fehlgeschlagen"
       password_changed: "Passwort geändert"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 6837088b8..31786d20c 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -24,9 +24,11 @@ el:
               invalid: "δεν είναι έγκυρο"
             username: 
               taken: "χρησιμοποιείται ήδη"
-  ago: "πριν"
+  ago: "%{time} πριν"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "άγνωστο άτομο"
       youtube_title: 
         unknown: "αγνώστος τίτλος αρχείου πολυμέσων"
@@ -134,6 +136,7 @@ el:
     edit: 
       sign_up: "εγγραφή"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspect"
       comma_seperated_plz: "Μπορείτε να εισάγετε πολλαπλές διευθύνσεις ηλεκτρονικού ταχυδρομείου διαχωρισμένες με κόμμα."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
@@ -200,6 +203,8 @@ el:
       people_on_pod_are_aware_of: "άνθρωποι στο pod γνωρίζουν ότι"
       results_for: "αποτελέσματα για %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "αποτελέσματα αναζήτησης για"
     person: 
@@ -366,14 +371,17 @@ el:
   users: 
     destroy: "Ο λογαριασμός έκλεισε με επιτυχία."
     edit: 
+      change: "Change"
       change_language: "Αλλαγή Γλώσσας"
       change_password: "Αλλαγή κωδικού πρόσβασης"
       close_account: "Κλείσιμο Λογαριασμού"
       download_photos: "κατέβασε τις φωτογραφίες μου"
       download_xml: "κατέβασε το xml μου"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Εξαγωγή Δεδομένων"
       new_password: "Νέος κωδικός πρόσβασης"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "Το email σας"
       your_handle: "Η λαβή diaspora σας"
     getting_started: 
@@ -407,6 +415,7 @@ el:
     public: 
       does_not_exist: "Ο χρήστης  %{username} δεν υπάρχει!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Αλλαγή γλώσσας"
       language_not_changed: "Η αλλαγή γλώσσας απέτυχε"
       password_changed: "Αλλαγή Κωδικού"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 062bd9d98..e5643550a 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -24,9 +24,11 @@ eo:
               invalid: "is invalid"
             username: 
               taken: "is already taken"
-  ago: "ago"
+  ago: "%{time} ago"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "unknown person"
       youtube_title: 
         unknown: "Unknown Video Title"
@@ -134,6 +136,7 @@ eo:
     edit: 
       sign_up: "sign_up"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspect"
       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."
@@ -200,6 +203,8 @@ eo:
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "search results for"
     person: 
@@ -366,14 +371,17 @@ eo:
   users: 
     destroy: "Account successfully closed."
     edit: 
+      change: "Change"
       change_language: "Change Language"
       change_password: "Change Password"
       close_account: "Close Account"
       download_photos: "download my photos"
       download_xml: "download my xml"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Export Data"
       new_password: "New Password"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
@@ -407,6 +415,7 @@ eo:
     public: 
       does_not_exist: "User %{username} does not exist!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Language Changed"
       language_not_changed: "Language Change Failed"
       password_changed: "Password Changed"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 7d813d468..0ba4516ef 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -27,6 +27,8 @@ es-CL:
   ago: "hace"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "persona desconocida"
       youtube_title: 
         unknown: "Titulo del video desconocido"
@@ -134,6 +136,7 @@ es-CL:
     edit: 
       sign_up: "regístrate"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspecto"
       comma_seperated_plz: "Puedes escribir varias direcciones de correo separadas por comas."
       if_they_accept_info: "Si aceptan, ellos se agregarán al aspecto que los invitaste."
@@ -200,6 +203,8 @@ es-CL:
       people_on_pod_are_aware_of: "la gente en el servidor son conscientes de"
       results_for: "resultados para %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "¡Oye! Tienes que buscar algo."
       results_for: "resultados de búsqueda para"
     person: 
@@ -366,14 +371,17 @@ es-CL:
   users: 
     destroy: "Cuenta cerrada correctamente."
     edit: 
+      change: "Change"
       change_language: "Cambiar Idioma"
       change_password: "Cambiar Contraseña"
       close_account: "Cerrar Cuenta"
       download_photos: "descargar mis fotos"
       download_xml: "descargar mi xml"
       edit_account: "Editar cuenta"
+      email_notifications: "Email notificaions"
       export_data: "Exportar Datos"
       new_password: "Nueva Contraseña"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "Tu correo electrónico"
       your_handle: "Tu dirección diaspora"
     getting_started: 
@@ -407,6 +415,7 @@ es-CL:
     public: 
       does_not_exist: "¡El usuario %{username} no existe!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Idioma Cambiado"
       language_not_changed: "Error al cambiar de idioma"
       password_changed: "Contraseña Cambiada"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index a907e0622..e53e8d016 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -24,9 +24,11 @@ es:
               invalid: "no es válido"
             username: 
               taken: "Ya ha sido elegido"
-  ago: "hace"
+  ago: "%{time} hace"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "persona desconocida"
       youtube_title: 
         unknown: "Título Desconocido de Vídeo"
@@ -134,6 +136,7 @@ es:
     edit: 
       sign_up: "conectarse"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspecto"
       comma_seperated_plz: "Puedes escribir múltiples direcciones de email separadas por comas."
       if_they_accept_info: ""
@@ -200,6 +203,8 @@ es:
       people_on_pod_are_aware_of: "gente en el \"pod\" son conscientes de"
       results_for: "resultados para %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "resultados de la búsqueda para"
     person: 
@@ -366,14 +371,17 @@ es:
   users: 
     destroy: "Cuenta cerrada con éxito."
     edit: 
+      change: "Change"
       change_language: "Cambiar idioma"
       change_password: "Cambiar contraseña"
       close_account: "Cerrar cuenta"
       download_photos: "Descargar mis fotos"
       download_xml: "Descargar mi xml"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Exportar datos"
       new_password: "Nueva contraseña"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "Tu email"
       your_handle: "Tu dirección Diaspora"
     getting_started: 
@@ -407,6 +415,7 @@ es:
     public: 
       does_not_exist: "¡El usuario %{username} no existe!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Idioma Cambiado"
       language_not_changed: "Cambio de Idioma Fallido"
       password_changed: "Contraseña Cambiada"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 83cb00b84..789a67303 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -24,9 +24,11 @@ fi:
               invalid: "ei kelpaa"
             username: 
               taken: "on jo käytössä"
-  ago: "sitten"
+  ago: "%{time} sitten"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "tuntematon persoona"
       youtube_title: 
         unknown: "Videon otsikko tuntematon"
@@ -88,7 +90,7 @@ fi:
     show: 
       edit_aspect: "muokkaa verkostonäkymää"
     update: 
-      failure: "Your aspect, %{name}, had too long name to be saved."
+      failure: "Antamasi verkostonäkymän nimi, %{name}, on liian pitkä."
       success: "Verkostonäkymäsi, %{name}, muokkaus onnistui."
   back: "Takaisin"
   cancel: "Peruuta"
@@ -134,6 +136,7 @@ fi:
     edit: 
       sign_up: "sign_up"
     new: 
+      already_invited: "Already invited"
       aspect: "Verkostonäkymä"
       comma_seperated_plz: "Erottele sähköpostiosoitteet pilkulla."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
@@ -185,7 +188,7 @@ fi:
   people: 
     edit: 
       allow_search: "Salli ihmisten etsiä sinua Diasporassa"
-      edit_profile: "Edit profile"
+      edit_profile: "Muokkaa profiilia"
       first_name: "Etunimi"
       info_available_to: "Kaikki Diasporan kontaktisi näkevät nämä tiedot."
       last_name: "Sukunimi"
@@ -200,7 +203,9 @@ fi:
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " tulokset kyselylle: %{params}"
     index: 
-      no_results: "Hey! You need to search for something."
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
+      no_results: "Hei! Sinun tulisi etsiä jotakin."
       results_for: "hakutulokset kohteelle "
     person: 
       add_contact: "lisää kontakti"
@@ -223,7 +228,7 @@ fi:
       no_posts: "ei näytettäviä viestejä!"
       not_connected: "Et ole yhteydessä tähän henkilöön"
       recent_posts: "Tuoreimmat viestit"
-      recent_public_posts: "Recent Public Posts"
+      recent_public_posts: "Viimeisimmät julkiset viestit"
       request_people: "Jos haluat, voit pyytää häntä liittymään yhteen verkostonäkymistäsi."
       return_to_aspects: "Palaa verkostonäkymien sivulle"
       to_accept_or_ignore: "hyväksy tai hylkää."
@@ -250,8 +255,8 @@ fi:
       invalid_ext: "{file} sisältää viallisen tiedostopäätteen. Tuetut muodot ovat {extensions}."
       size_error: "{file} on liian suuri, suurin tiedostokoko on {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "or select one from your already existing"
-      upload: "Upload a new profile photo!"
+      or_select_one: "tai valitse joku olemassa olevista"
+      upload: "Lisää uusi profiilikuva!"
     photo: 
       view_all: "Näytä kaikki käyttäjän %{name}kuvat"
     show: 
@@ -310,7 +315,7 @@ fi:
       connect_to_facebook: "Yhdistä facebook:iin"
       connect_to_twitter: "Yhdistä twitter:iin"
       disconnect: "katkaise"
-      edit_services: "Edit services"
+      edit_services: "Muokkaa palveluita"
       logged_in_as: "kirjautunut käyttäjänä:"
       really_disconnect: "katkaise %{service}?"
   settings: "Asetukset"
@@ -366,14 +371,17 @@ fi:
   users: 
     destroy: "Käyttäjätilin sulkeminen onnistui."
     edit: 
+      change: "Vaihda"
       change_language: "Vaihda kieli"
       change_password: "Vaihda salasana"
       close_account: "Poista käyttäjätili"
       download_photos: "lataa kaikki kuvat"
       download_xml: "lataa tiedot XML-muodossa"
-      edit_account: "Edit account"
+      edit_account: "Muokkaa käyttäjätiliä"
+      email_notifications: "Sähköposti-ilmoitukset"
       export_data: "Vie tietoja"
       new_password: "Uusi salasana"
+      receive_email_notifications: "Vastaanota sähköposti-ilmoituksia?"
       your_email: "Sähköpostisoitteesi"
       your_handle: "Diaspora tunnuksesi"
     getting_started: 
@@ -407,6 +415,7 @@ fi:
     public: 
       does_not_exist: "Käyttäjää %{username} ei ole olemassa!"
     update: 
+      email_notifications_changed: "Kielenvaihto epäonnistui"
       language_changed: "Kieli vaihdettu"
       language_not_changed: "Kielen vaihtaminen epäonnistui"
       password_changed: "Salasana vaihdettu"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 220a364ff..a8c70aa5d 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -24,24 +24,26 @@ fr:
               invalid: "est invalide"
             username: 
               taken: "est déjà pris"
-  ago: "plus tôt"
+  ago: "%{time} plus tôt"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "personne inconnue"
       youtube_title: 
         unknown: "Titre de vidéo inconnu"
-  are_you_sure: "Are you sure?"
+  are_you_sure: "Vous confirmez ?"
   aspects: 
     add_to_aspect: 
       failure: "L’ajout du contact à l’aspect a échoué."
       success: "Vous avez ajouté le contact à l’aspect avec succès."
     all_aspects_contacts: 
-      add_aspect: "add aspect"
-      all_contacts: "All contacts"
+      add_aspect: "ajouter un aspect"
+      all_contacts: "Tous les contacts"
       aspects: "Aspects"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
+      no_contacts: "Vous n'avez pas de contacts pour l'instant. Recherchez des contacts ici."
     aspect_contacts: 
-      done_editing: "done editing"
+      done_editing: "fin de la modification"
     create: 
       failure: "La création de l’aspect a échoué."
       success: "Votre nouvel aspect %{name} a été créé."
@@ -49,10 +51,10 @@ fr:
       success: "%{name} a été supprimé avec succès."
     edit_aspect_pane: 
       add_existing: "Ajouter un contact existant"
-      confirm_remove_aspect: "Supprimer l'aspect ?"
-      remove_aspect: "Supprimer l'aspect"
+      confirm_remove_aspect: "Voulez-vous vraiment supprimer cet aspect ?"
+      remove_aspect: "Supprimer cet aspect"
     helper: 
-      are_you_sure: "Are you sure you want to delete this aspect?"
+      are_you_sure: "Voulez-vous vraiment supprimer cet aspect ?"
       aspect_not_empty: "L’aspect n’est pas vide"
       remove: "supprimer"
     index: 
@@ -60,7 +62,7 @@ fr:
     manage: 
       add_a_new_aspect: "Ajouter un nouvel aspect"
       add_a_new_contact: "Ajouter un nouveau contact"
-      drag_to_add: "Faîtes glisser pour ajouter des personnes"
+      drag_to_add: "Faites glisser pour ajouter des personnes"
       manage_aspects: "Gérer les aspects"
       no_requests: "Pas de nouvelle requête"
       requests: "Requêtes"
@@ -76,7 +78,7 @@ fr:
       add_contact_to: "Ajouter quelqu'un à %{aspect_name}"
       invite: "Inviter quelqu'un à rejoindre Diaspora !"
       nobody: "Invitez les personnes qui comptent dans votre vie sur Diaspora !"
-      nobody_in_aspect: "Votre aspect '%{aspect_name}' est vide."
+      nobody_in_aspect: "Votre aspect « %{aspect_name} » est vide."
     no_posts_message: 
       start_talking: "Personne n’a encore rien dit.  Engagez dès à présent la conversation !"
     remove_from_aspect: 
@@ -86,10 +88,10 @@ fr:
       family: "Famille"
       work: "Travail"
     show: 
-      edit_aspect: "éditer l'aspect"
+      edit_aspect: "modifier l'aspect"
     update: 
-      failure: "Your aspect, %{name}, had too long name to be saved."
-      success: "Votre aspect '%{name}' a été édité avec succès."
+      failure: "Votre aspect %{name} a un nom trop long pour être enregistré."
+      success: "Votre aspect « %{aspect_name} » a été modifié avec succès."
   back: "Retour"
   cancel: "Annuler"
   comments: 
@@ -120,25 +122,26 @@ fr:
       share_what_you_want: "Partagez ce que vous voulez, avec qui vous voulez."
       simplicity: "Simplicité"
       simplicity_explanation: "Diaspora rend le partage propre et facile - et cela est également valable pour la vie privée. Intrinsèquement privé, Diaspora ne vous contraint pas à vous frayer un chemin à travers des pages de configuration et d'options uniquement pour maintenir votre profil sécurisé."
-      tagline_first_half: "Share what you want,"
-      tagline_second_half: "with whom you want."
+      tagline_first_half: "Partagez ce que vous voulez,"
+      tagline_second_half: "avec qui vous voudrez."
   invitations: 
     check_token: 
       not_found: "Jeton d'invitation introuvable"
     create: 
-      already_contacts: "You are already connected with this person"
-      already_sent: "You already invited this person."
+      already_contacts: "Vous avez déjà établi une connexion avec cette personne"
+      already_sent: "Vous avez déjà invité cette personne."
       no_more: "Vous n’avez plus d’invitation."
       rejected: "Les adresses e-mail suivantes ont rencontré des problèmes :"
       sent: "Les invitations ont été envoyées à :"
     edit: 
       sign_up: "inscription"
     new: 
+      already_invited: "Déjà invité(e)"
       aspect: "Aspect"
       comma_seperated_plz: "Vous pouvez entrer plusieurs adresses e-mail séparées par des virgules."
-      if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
+      if_they_accept_info: "s'ils acceptent, ils seront ajoutés à l'aspect dans lequel vous les avez invités."
       invite_someone_to_join: "Inviter quelqu'un à rejoindre Diaspora !"
-      personal_message: "Personal message"
+      personal_message: "Message personnel"
       send_an_invitation: "Envoyer une invitation"
       send_invitation: "Envoyer l'invitation"
       to: "À"
@@ -149,7 +152,7 @@ fr:
       account_settings: "options du compte"
       blog: "blog"
       code: "code"
-      edit_profile: "éditer le profil"
+      edit_profile: "modifier le profil"
       login: "connexion"
       logout: "se déconnecter"
       view_profile: "voir le profil"
@@ -185,9 +188,9 @@ fr:
   people: 
     edit: 
       allow_search: "Autoriser des personnes à vous rechercher au sein de Diaspora"
-      edit_profile: "Edit profile"
+      edit_profile: "Modifier le profil"
       first_name: "Votre prénom"
-      info_available_to: "Cette info sera consultable par toutes les personnes avec qui vous êtes connecté sur Diaspora."
+      info_available_to: "Cette info sera consultable par toutes les personnes avec qui vous êtes connecté(e) sur Diaspora."
       last_name: "Votre nom de famille"
       update_profile: "Mettre à jour le profil"
       your_bio: "Votre bio"
@@ -200,7 +203,9 @@ fr:
       people_on_pod_are_aware_of: "les personnes sur le pod sont au courant de"
       results_for: "résultats pour %{params}"
     index: 
-      no_results: "Hey! You need to search for something."
+      couldnt_find_them_send_invite: "Vous ne les trouvez pas ? Envoyez-leur une invitation !"
+      no_one_found: "… et personne n'a été trouvé."
+      no_results: "Hé ! Vous devez rechercher quelque chose."
       results_for: "résultats de la recherche pour"
     person: 
       add_contact: "ajouter un contact"
@@ -211,36 +216,36 @@ fr:
       bio: "bio"
       born: "né(e)"
       cannot_remove: "Impossible de supprimer %{name} du dernier aspect. (Si vous voulez supprimer toute connexion avec cette personne vous devez la supprimer en tant que contact.)"
-      edit_my_profile: "Éditer mon profil"
+      edit_my_profile: "Modifier mon profil"
       gender: "sexe"
       in_aspects: "dans les aspects"
       remove_contact: "supprimer le contact"
       remove_from: "Supprimer %{name} de %{aspect} ?"
     show: 
-      already_requested: "You have already sent a request to %{name}."
+      already_requested: "Vous avez déjà envoyé une requête à %{name}."
       does_not_exist: "Cette personne n'existe pas !"
       incoming_request: "Vous avez une requête venant de cette personne."
       no_posts: "aucun message à afficher !"
-      not_connected: "You are not connected with this person"
-      recent_posts: "Recent Posts"
-      recent_public_posts: "Recent Public Posts"
-      request_people: "Si vous le voulez, vous pouvez demander à le/la placer dans un de vos aspects."
+      not_connected: "Vous n'êtes pas connecté(e) avec cette personne"
+      recent_posts: "Messages récents"
+      recent_public_posts: "Messages publics récents"
+      request_people: "Si vous le désirez, vous pouvez demander à le/la placer dans un de vos aspects."
       return_to_aspects: "Retourner à votre page des aspects"
       to_accept_or_ignore: "pour l'accepter ou l'ignorer."
     update: 
       failed: "La mise à jour du profil a échoué"
       updated: "Profil mis à jour"
     webfinger: 
-      fail: "Sorry, we couldn't find %{handle}."
+      fail: "Impossible de trouver %{handle}."
   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: "Impossible d'envoyer la photo. S'agit-il réellement d'une image ?"
+      runtime_error: "L'envoi de la photo a échoué. Avez-vous attaché votre ceinture ?"
+      type_error: "L'envoi de la photo a échoué. Une photo a-t-elle réellement été ajoutée ?"
     destroy: 
       notice: "La photo a été supprimée."
     edit: 
-      editing: "Édition"
+      editing: "Modification"
     new: 
       back_to_list: "Retourner à la liste"
       new_photo: "Nouvelle photo"
@@ -250,21 +255,21 @@ fr:
       invalid_ext: "{file} a une extension invalide. Seules {extensions} sont autorisées."
       size_error: "{file} est trop grand, la taille maximum pour un fichier est {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "or select one from your already existing"
-      upload: "Upload a new profile photo!"
+      or_select_one: "ou faites votre choix parmi vos"
+      upload: "Envoyer une nouvelle photo de profil !"
     photo: 
       view_all: "voir toute les photos de %{name}"
     show: 
       delete_photo: "Supprimer la photo"
-      edit: "éditer"
-      edit_delete_photo: "Éditer la description de la photo / supprimer la photo"
+      edit: "modifier"
+      edit_delete_photo: "Modifier la description de la photo / supprimer la photo"
       make_profile_photo: "en faire la photo de profil"
-      original_post: "Post original"
-      permalink: "permalink"
+      original_post: "Message original"
+      permalink: "permalien"
       update_photo: "Mettre à jour la photo"
       view: "voir"
     update: 
-      error: "L’édition de la photo a échoué."
+      error: "La modification de la photo a échoué."
       notice: "La photo a été mise à jour avec succès."
   profile: "Profil"
   registrations: 
@@ -272,32 +277,32 @@ fr:
     create: 
       success: "Vous avez rejoint Diaspora !"
     edit: 
-      cancel_my_account: "Clôre mon compte"
-      edit: "Éditer %{name}"
+      cancel_my_account: "Clôturer mon compte"
+      edit: "Modifier %{name}"
       leave_blank: "(laissez blanc si vous ne souhaitez pas le changer)"
       password_to_confirm: "(nous avons besoin de votre mot de passe actuel pour confirmer vos changements)"
-      unhappy: "Insatisfait ?"
+      unhappy: "Insatisfait(e) ?"
       update: "Mettre à jour"
     new: 
-      enter_email: "Enter an e-mail"
-      enter_password: "Enter a password"
-      enter_password_again: "Enter the same password as before"
-      enter_username: "Pick a username (only letters, numbers, and underscores)"
+      enter_email: "Saisissez une adresse e-mail"
+      enter_password: "Saisissez un mot de passe"
+      enter_password_again: "Saisissez à nouveau le même mot de passe"
+      enter_username: "Choisissez un nom d'utilisateur (uniquement des lettres, chiffres et caractères de soulignement)"
       sign_up: "Inscription"
       sign_up_for_diaspora: "Inscription à Diaspora"
   requests: 
     create: 
       sending: "En cours d'envoi"
-      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      sent: "Vous avez demandé à partager avec %{name}. Cela lui sera visible à sa prochaine connexion à Diaspora."
     destroy: 
       error: "Veuillez sélectionner un aspect !"
       ignore: "Requête de contact ignorée."
-      success: "Vous êtes à présent amis."
+      success: "Vous êtes à présent ami(e)s."
     manage_aspect_contacts: 
       existing: "Contacts existants"
       manage_within: "Gérer les contacts de"
     new_request_to_person: 
-      sent: "envoyée!"
+      sent: "envoyée !"
   search: "Rechercher"
   services: 
     create: 
@@ -305,35 +310,35 @@ fr:
     destroy: 
       success: "Authentification clôturée avec succès."
     failure: 
-      error: "there was an error connecting that service"
+      error: "une erreur s'est produite lors de la connexion avec ce service"
     index: 
       connect_to_facebook: "Connecter à facebook"
       connect_to_twitter: "Connecter à twitter"
       disconnect: "déconnecter"
-      edit_services: "Edit services"
-      logged_in_as: "connecté en tant que"
+      edit_services: "Modifier les services"
+      logged_in_as: "connecté(e) en tant que"
       really_disconnect: "déconnecter %{service} ?"
   settings: "Options"
   shared: 
     add_contact: 
-      create_request: "Trouver à l'aide du Diaspora handle"
+      create_request: "Rechercher par handle Diaspora"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Entrez un nom d'utilisateur Diaspora :"
-      know_email: "Know their email address? You should invite them"
+      know_email: "Vous connaissez leur adresse e-mail ? Vous devriez les inviter"
       your_diaspora_username_is: "Votre nom d'utilisateur diaspora est : %{diaspora_handle}"
     contact_list: 
       all_contacts: "Tous les 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.)"
     invitations: 
       dont_have_now: "Vous n'avez aucun droit pour l'instant, mais plus d'invitations arriveront bientôt !"
-      invitations_left: "(%{count} restant(s))"
+      invitations_left: "(il vous en reste %{count})"
       invite_someone: "Inviter quelqu'un"
-      invites: "Invites"
-      invites_closed: "Les invitations sont présentement fermées sur ce pod"
+      invites: "Invitations"
+      invites_closed: "Les invitations sont actuellement fermées sur ce pod Diaspora"
     notification: 
       new: "Nouveau/nouvelle %{type} de %{from}"
     public_explain: 
-      logged_in: "connecté à %{service}"
+      logged_in: "connecté(e) à %{service}"
       manage: "gérer les services connectés"
       outside: "Les messages publics pourront être vus par d'autres en dehors de Diaspora."
       title: "Vous êtes sur le point d'envoyer un message public !"
@@ -342,8 +347,8 @@ fr:
       all: "tous"
       all_contacts: "tous les contacts"
       make_public: "rendre public"
-      post_a_message_to: "Poster un message à %{aspect}"
-      posting: "Post en cours d'envoi..."
+      post_a_message_to: "Publier un message dans %{aspect}"
+      posting: "Publication…"
       share: "Partager"
       share_with: "Partager avec %{aspect}"
       share_with_all: "partager avec tous les aspects"
@@ -357,32 +362,35 @@ fr:
       tell_me_something_good: "dites-moi quelque chose de bien"
     show: 
       destroy: "Détruire"
-      permalink: "permalink"
+      permalink: "permalien"
   stream_helper: 
-    hide_comments: "cacher les commentaires"
-    show_comments: "afficher les commentaires"
-  the_world: "le monde"
+    hide_comments: "masquer les commentaires"
+    show_comments: "afficher tous les commentaires"
+  the_world: "tout le monde"
   username: "Nom d'utilisateur"
   users: 
     destroy: "Compte clôturé avec succès."
     edit: 
+      change: "Modifier"
       change_language: "Changer la langue"
       change_password: "Changer le mot de passe"
-      close_account: "Clôre le compte"
+      close_account: "Clôturer le compte"
       download_photos: "télécharger mes photos"
-      download_xml: "télécharger mon xml"
-      edit_account: "Edit account"
+      download_xml: "télécharger mon XML"
+      edit_account: "Modifier le compte"
+      email_notifications: "Notifications par e-mail"
       export_data: "Exporter des données"
       new_password: "Nouveau mot de passe"
+      receive_email_notifications: "Recevoir des notifications par e-mail ?"
       your_email: "Votre e-mail"
-      your_handle: "Votre diaspora handle"
+      your_handle: "Votre handle diaspora"
     getting_started: 
       connect_services: "Connectez vos autres services"
       define_aspects: "Définissez vos aspects"
-      edit_profile: "Éditez votre profil"
+      edit_profile: "Modifiez votre profil"
       finished: "Terminé !"
       save_and_continue: "Enregistrer et continuer"
-      signup_steps: "Complétez votre inscription en suivant ces trois étapes :"
+      signup_steps: "Terminez votre inscription en suivant ces trois étapes :"
       skip: "passer la présentation"
       step_2: 
         add: "Ajouter"
@@ -393,20 +401,21 @@ fr:
         your_aspects: "Vos aspects"
         your_inviter: "Personnes en attente d'une réponse de votre part :"
       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\""
+        description: "Vous pouvez connecter vos réseaux sociaux existants à votre compte Diaspora. Vous pourrez publier publiquement depuis votre page d'accueil en sélectionnant « rendre public »"
         your_services: "Vos services"
       step_4: 
-        change_profile: "Vous pouvez éditer votre profil et gérer vos services connectés à tout moment sur"
+        change_profile: "Vous pouvez modifier votre profil et gérer vos services connectés à tout moment via"
         continue: "Continuez sur votre page d'accueil, qui représente un aperçu de tous vos aspects."
         finish: "Terminer"
         manage_aspects: "Vous pouvez également ajouter des contacts sur chacune de vos pages d'aspect."
-        ready_to_share: "Vous êtes maintenant prêt à partager avec "
-        set_up: "Vous êtes entièrement configuré, %{name} !"
+        ready_to_share: "Vous êtes maintenant prêt(e) à partager avec "
+        set_up: "Tout est prêt, %{name} !"
         user_menu: "le menu utilisateur situé en haut à droite."
       welcome: "Bienvenue sur Diaspora !"
     public: 
       does_not_exist: "L'utilisateur %{username} n'existe pas !"
     update: 
+      email_notifications_changed: "Échec du changement de langue"
       language_changed: "Langue mise à jour"
       language_not_changed: "Échec lors de la mise à jour de la langue"
       password_changed: "Mot de passe mis à jour"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index b37c87dec..05af9b72a 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -24,9 +24,11 @@ he:
               invalid: "אינו תקני"
             username: 
               taken: "כבר תפוס"
-  ago: "עברו"
+  ago: "%{time} עברו"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "אדם לא ידוע"
       youtube_title: 
         unknown: "כותרת הווידאו אינה ידועה"
@@ -134,6 +136,7 @@ he:
     edit: 
       sign_up: "הרשמה"
     new: 
+      already_invited: "כבר נשלחה הזמנה"
       aspect: "היבט"
       comma_seperated_plz: "באפשרותך להזין מספר כתובות דוא״ל ולהפרידן בפסיקים."
       if_they_accept_info: "אם הם יאשרו, הם יתווספו להיבט שאליו הזמנת אותם."
@@ -185,7 +188,7 @@ he:
   people: 
     edit: 
       allow_search: "אישור לאחרים לחפש אחריך בדיאספורה"
-      edit_profile: "Edit profile"
+      edit_profile: "עריכת הפרופיל"
       first_name: "השם הפרטי"
       info_available_to: "פרטים אלו יהיו זמינים לכל אלו שנוצר ביניכם קשר דרך דיאספורה."
       last_name: "שם המשפחה"
@@ -200,7 +203,9 @@ he:
       people_on_pod_are_aware_of: " האנשים בפוד מודעים לגבי"
       results_for: " תוצאות עבור %{params}"
     index: 
-      no_results: "Hey! You need to search for something."
+      couldnt_find_them_send_invite: "לא נמצאים?  אפשר להזמין אותם!"
+      no_one_found: "...ולא נמצא אף אחד."
+      no_results: "הי! לא חיפשת שום דבר."
       results_for: "תוצאות חיפוש עבור"
     person: 
       add_contact: "הוספת איש קשר"
@@ -250,8 +255,8 @@ he:
       invalid_ext: "לקובץ {file} יש סיומת בלתי מוכרת. רק הסיומות {extensions} מותרות לשימוש."
       size_error: "הקובץ {file} גדול מדי, גודל הקובץ המרבי הוא {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "or select one from your already existing"
-      upload: "Upload a new profile photo!"
+      or_select_one: "או לבחור באחת הקיימות"
+      upload: "העלאת תמונת פרופיל חדש!"
     photo: 
       view_all: "צפייה בכל התמונות של %{name}"
     show: 
@@ -310,7 +315,7 @@ he:
       connect_to_facebook: "התחברות לפייסבוק"
       connect_to_twitter: "התחברות לטוויטר"
       disconnect: "ניתוק"
-      edit_services: "Edit services"
+      edit_services: "עריכת שירותים"
       logged_in_as: "נכנסת בשם"
       really_disconnect: "האם לנתק את %{service}?"
   settings: "הגדרות"
@@ -366,14 +371,17 @@ he:
   users: 
     destroy: "החשבון נסגר בהצלחה."
     edit: 
+      change: "שינוי"
       change_language: "החלפת השפה"
       change_password: "החלפת הססמה"
       close_account: "סגירת החשבון"
       download_photos: "הורדת התמונות שלי"
       download_xml: "הורדת ה־xml שלי"
-      edit_account: "Edit account"
+      edit_account: "עריכת החשבון"
+      email_notifications: "התרעות בדוא״ל"
       export_data: "יצוא הנתונים"
       new_password: "ססמה חדשה"
+      receive_email_notifications: "האם לקבל התרעות בדוא״ל?"
       your_email: "כתובת הדוא״ל שלך"
       your_handle: "שם המשתמש שלך בדיאספורה"
     getting_started: 
@@ -407,6 +415,7 @@ he:
     public: 
       does_not_exist: "המשתמש %{username} אינו קיים!"
     update: 
+      email_notifications_changed: "החלפת השפה נכשלה"
       language_changed: "השפה הוחלפה"
       language_not_changed: "החלפת השפה נכשלה"
       password_changed: "הססמה הוחלפה"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 51e30e222..8f29f3f03 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -27,6 +27,8 @@ hu:
   ago: "ezelőtt"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "ismeretlen személy"
       youtube_title: 
         unknown: "Ismeretlen videó cím"
@@ -88,7 +90,7 @@ hu:
     show: 
       edit_aspect: "csoport szerkesztése"
     update: 
-      failure: "Your aspect, %{name}, had too long name to be saved."
+      failure: "A %{name} nevű csoportodnak túl hosszú a neve."
       success: "%{name} csoport szerkesztve."
   back: "Vissza"
   cancel: "Mégsem"
@@ -134,6 +136,7 @@ hu:
     edit: 
       sign_up: "Regisztráció"
     new: 
+      already_invited: "Already invited"
       aspect: "Csoport"
       comma_seperated_plz: "Megadhatsz több e-mail címet is vesszővel elválasztva."
       if_they_accept_info: "Ha elfogadják felkérésed, akkor belekerülnek abba a csoportba amelyikbe meghívtad őket."
@@ -185,7 +188,7 @@ hu:
   people: 
     edit: 
       allow_search: "Megengedem, hogy megtalálható legyek a Diaspora keresési találatokban."
-      edit_profile: "Edit profile"
+      edit_profile: "Profil szerkesztése"
       first_name: "Keresztnév"
       info_available_to: "Ez az információ elérhető lesz Diaspora ismerőseidnek."
       last_name: "Vezetéknév"
@@ -200,7 +203,9 @@ hu:
       people_on_pod_are_aware_of: "az emberek tisztában vannak"
       results_for: "eredmények %{params}"
     index: 
-      no_results: "Hey! You need to search for something."
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
+      no_results: "Hé! Valamit keresned kell."
       results_for: "találatok keresése"
     person: 
       add_contact: "Kapcsolat hozzáadása"
@@ -223,7 +228,7 @@ hu:
       no_posts: "nincs hozzászólás!"
       not_connected: "Ez a személy nem ismerősöd"
       recent_posts: "Legutóbbi hozzászólások"
-      recent_public_posts: "Recent Public Posts"
+      recent_public_posts: "Legutóbbi nyilvános hozzászólások"
       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."
@@ -250,8 +255,8 @@ hu:
       invalid_ext: "{file} érvénytelen kiterjesztés. Csak {extensions} kiterjesztések megengedettek."
       size_error: "{file} túl nagy, maximum fájlméret {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "or select one from your already existing"
-      upload: "Upload a new profile photo!"
+      or_select_one: "vagy válassz a már létezők közül"
+      upload: "Új profilkép feltöltése!"
     photo: 
       view_all: "%{name} összes képének megtekintése"
     show: 
@@ -310,7 +315,7 @@ hu:
       connect_to_facebook: "Csatlakozás Facebook-hoz"
       connect_to_twitter: "Csatlakozás Twitter-hez"
       disconnect: "szétkapcsol"
-      edit_services: "Edit services"
+      edit_services: "Szolgáltatások szerkesztése"
       logged_in_as: "bejelentkezett, mint"
       really_disconnect: "Lecsatlakozik: %{service}?"
   settings: "Beállítások"
@@ -366,14 +371,17 @@ hu:
   users: 
     destroy: "Fiók sikeresen lezárult."
     edit: 
+      change: "Módosítás"
       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"
-      edit_account: "Edit account"
+      edit_account: "Fiók szerkesztése"
+      email_notifications: "E-mail értesítések"
       export_data: "Adatok exportálása"
       new_password: "Új jelszó"
+      receive_email_notifications: "Kérsz e-mail értesítéseket?"
       your_email: "E-mail címed"
       your_handle: "Diaspora felhasználóneved"
     getting_started: 
@@ -407,6 +415,7 @@ hu:
     public: 
       does_not_exist: "%{username} nem létezik!"
     update: 
+      email_notifications_changed: "Nyelv váltása sikertelen"
       language_changed: "Nyelv megváltozott"
       language_not_changed: "Nyelv megváltoztatása nem sikerült"
       password_changed: "A jelszó megváltozott"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 49805289e..1dabc2080 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -24,9 +24,11 @@ id:
               invalid: "is invalid"
             username: 
               taken: "is already taken"
-  ago: "ago"
+  ago: "%{time} ago"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "orang tak dikenal"
       youtube_title: 
         unknown: "Unknown Video Title"
@@ -134,6 +136,7 @@ id:
     edit: 
       sign_up: "sign_up"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspect"
       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."
@@ -200,6 +203,8 @@ id:
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "search results for"
     person: 
@@ -366,14 +371,17 @@ id:
   users: 
     destroy: "Account successfully closed."
     edit: 
+      change: "Change"
       change_language: "Change Language"
       change_password: "Change Password"
       close_account: "Close Account"
       download_photos: "download my photos"
       download_xml: "download my xml"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Export Data"
       new_password: "New Password"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
@@ -407,6 +415,7 @@ id:
     public: 
       does_not_exist: "User %{username} does not exist!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Language Changed"
       language_not_changed: "Language Change Failed"
       password_changed: "Password Changed"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 52bca9f5d..68d1e85d9 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -24,9 +24,11 @@ it:
               invalid: "non è valido"
             username: 
               taken: "non è disponibile"
-  ago: "fa"
+  ago: "%{time} fa"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "persona sconosciuta"
       youtube_title: 
         unknown: "Titolo Video Sconosciuto"
@@ -134,6 +136,7 @@ it:
     edit: 
       sign_up: "iscriviti"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspect"
       comma_seperated_plz: "Puoi inserire più indirizzi email separati da virgole."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
@@ -200,6 +203,8 @@ it:
       people_on_pod_are_aware_of: " le persone sul pod sanno che"
       results_for: " risultati per %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "risultati della ricerca per"
     person: 
@@ -235,8 +240,8 @@ it:
   photos: 
     create: 
       integrity_error: "Il caricamento della foto non è riuscito. Sei sicuro che fosse un'immagine?"
-      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?"
+      runtime_error: "La fotografia non si è caricata.  Hai dimenticato forse la cintura?"
+      type_error: "La foto non si è caricata.  Sei sicuro di aver aggiunto un'immagine?"
     destroy: 
       notice: "Foto eliminata."
     edit: 
@@ -288,7 +293,7 @@ it:
   requests: 
     create: 
       sending: "Invio in corso..."
-      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      sent: "Hai chiesto di condividire come %{name}. Dovrebbero vederlo nel loro prossimo accesso."
     destroy: 
       error: "Seleziona un aspetto!"
       ignore: "Richiesta di amicizia ignorata."
@@ -366,14 +371,17 @@ it:
   users: 
     destroy: "Account chiuso con successo."
     edit: 
+      change: "Change"
       change_language: "Cambia Lingua"
       change_password: "Cambia Password"
       close_account: "Chiudi Account"
       download_photos: "scarica le mie"
       download_xml: "scarica il mio xml"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Esporta Dati"
       new_password: "Nuova Password"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "La tua email"
       your_handle: "Il tuo contatto Diaspora"
     getting_started: 
@@ -407,6 +415,7 @@ it:
     public: 
       does_not_exist: "L'utente %{username} non esiste!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Lingua Cambiata"
       language_not_changed: "Cambio di lingua fallito"
       password_changed: "Password Cambiata"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 0f3af94db..2e229260b 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -24,9 +24,11 @@ lt:
               invalid: "negalioja"
             username: 
               taken: "užimtas"
-  ago: "prieš"
+  ago: "%{time} prieš"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "nežinomas asmuo"
       youtube_title: 
         unknown: "Nežinomas video pavadinimas"
@@ -134,6 +136,7 @@ lt:
     edit: 
       sign_up: "Prisijungti"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspect"
       comma_seperated_plz: "Keletą el. pašto adresų gali įvesti atskirdamas juos kableliais."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
@@ -200,6 +203,8 @@ lt:
       people_on_pod_are_aware_of: " žmonės serveryje žino"
       results_for: " \"%{params}\" rezultatai"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "ieškoti rezultatų pagal"
     person: 
@@ -366,14 +371,17 @@ lt:
   users: 
     destroy: "Paskyra uždaryta sėkmingai."
     edit: 
+      change: "Change"
       change_language: "Keisti kalbą"
       change_password: "Keisti slaptažodį"
       close_account: "Uždaryti paskyrą"
       download_photos: "atsisiųsti mano nuotraukas"
       download_xml: "atsisiųsti mano duomenis xml formatu"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Eksportuoti duomenis"
       new_password: "Naujas slaptažodis"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "Tavo el. pašto adresas"
       your_handle: "Tavo Diasporos vartotojo vardas"
     getting_started: 
@@ -407,6 +415,7 @@ lt:
     public: 
       does_not_exist: "Vartotojas %{username} neegzistuoja!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Kalba pakeista"
       language_not_changed: "Kalbos pakeisti nepavyko"
       password_changed: "Slaptažodis pakeistas"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 44326b080..5f53c6f50 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -24,9 +24,11 @@ mk:
               invalid: "не е валидно"
             username: 
               taken: "веќе е заземено"
-  ago: "пред"
+  ago: "%{time} пред"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "непозната личност"
       youtube_title: 
         unknown: "Непознато име на видео"
@@ -134,6 +136,7 @@ mk:
     edit: 
       sign_up: "регистрирај_се"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspect"
       comma_seperated_plz: "Можете да внесете повеќе е-маил адреси разделени со запирки."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
@@ -200,6 +203,8 @@ mk:
       people_on_pod_are_aware_of: " достапните луѓе се запознаени со"
       results_for: " резултати за %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "резултати од пребарување за"
     person: 
@@ -366,14 +371,17 @@ mk:
   users: 
     destroy: "Корисничката сметка е успешно затворена."
     edit: 
+      change: "Change"
       change_language: "Промени јазик"
       change_password: "Промени лозинка"
       close_account: "Затвори корисничка сметка"
       download_photos: "симни ги моите слики"
       download_xml: "симни го мојот xml"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Изнеси податоци"
       new_password: "Нова лозинка"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "Вашиот е-маил"
       your_handle: "Вашето diaspora корисничко име"
     getting_started: 
@@ -407,6 +415,7 @@ mk:
     public: 
       does_not_exist: "Корисникот %{username} не постои!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Јазикот е променет"
       language_not_changed: "Изменувањето на јазик е неуспешно"
       password_changed: "Лозинката е променета"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 5b0261ad7..f57545646 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -24,9 +24,11 @@ nb:
               invalid: "is invalid"
             username: 
               taken: "is already taken"
-  ago: "ago"
+  ago: "%{time} ago"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "ukjent person"
       youtube_title: 
         unknown: "Unknown Video Title"
@@ -134,6 +136,7 @@ nb:
     edit: 
       sign_up: "sign_up"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspect"
       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."
@@ -200,6 +203,8 @@ nb:
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "search results for"
     person: 
@@ -366,14 +371,17 @@ nb:
   users: 
     destroy: "Account successfully closed."
     edit: 
+      change: "Change"
       change_language: "Change Language"
       change_password: "Change Password"
       close_account: "Close Account"
       download_photos: "download my photos"
       download_xml: "download my xml"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Export Data"
       new_password: "New Password"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
@@ -407,6 +415,7 @@ nb:
     public: 
       does_not_exist: "User %{username} does not exist!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Language Changed"
       language_not_changed: "Language Change Failed"
       password_changed: "Password Changed"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index d2074d8bf..469e877f7 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -24,9 +24,11 @@ nl:
               invalid: "is ongeldig"
             username: 
               taken: "is al bezet"
-  ago: "geleden"
+  ago: "%{time} geleden"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "onbekend persoon"
       youtube_title: 
         unknown: "Onbekende video titel"
@@ -59,8 +61,8 @@ nl:
       handle_explanation: "Dit is jouw Diaspora handle. Deze kun je aan mensen geven zodat ze je kunnen bereiken, net als een e-mailadres."
     manage: 
       add_a_new_aspect: "Voeg een nieuw aspect toe"
-      add_a_new_contact: "Voeg een nieuw contact toe"
-      drag_to_add: "Sleep om mensen toe te voegen"
+      add_a_new_contact: "Voeg contact toe"
+      drag_to_add: "Sleep om toe te voegen"
       manage_aspects: "Beheer aspecten"
       no_requests: "Geen nieuwe aanvragen"
       requests: "Aanvragen"
@@ -134,6 +136,7 @@ nl:
     edit: 
       sign_up: "registreer"
     new: 
+      already_invited: "Al uitgenodigd"
       aspect: "Aspect"
       comma_seperated_plz: "Je kunt meerdere e-mailadressen invullen, gescheiden door komma's."
       if_they_accept_info: "als hij of zij accepteert zal hij of zij toegevoegd worden aan het aspect waarvoor je hem of haar uitgenodigd hebt."
@@ -185,7 +188,7 @@ nl:
   people: 
     edit: 
       allow_search: "Sta toe door anderen gevonden te kunnen worden binnen Diaspora"
-      edit_profile: "Edit profile"
+      edit_profile: "Bewerk profiel"
       first_name: "Voornaam"
       info_available_to: "Deze informatie is beschikbaar voor al je contacten op Diaspora."
       last_name: "Achternaam"
@@ -200,7 +203,9 @@ nl:
       people_on_pod_are_aware_of: "mensen op de pod zich bewust van zijn"
       results_for: "resultaten voor %{params}"
     index: 
-      no_results: "Hey! You need to search for something."
+      couldnt_find_them_send_invite: "Hem of haar niet kunnen vinden? Stuur een uitnodiging!"
+      no_one_found: "...en je hebt niemand gevonden."
+      no_results: "Heey! Je moet wel ergens naar zoeken."
       results_for: "zoekresultaten voor"
     person: 
       add_contact: "voeg contact toe"
@@ -250,8 +255,8 @@ nl:
       invalid_ext: "{file} heeft een ongeldige extensie. Alleen {extensions} zijn toegestaan."
       size_error: "{file} is te groot, de maximale bestandsgrootte is {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "or select one from your already existing"
-      upload: "Upload a new profile photo!"
+      or_select_one: "of selecteer een van je reeds bestaande"
+      upload: "Upload een nieuwe profiel foto!"
     photo: 
       view_all: "bekijk al %{name}'s foto's"
     show: 
@@ -310,7 +315,7 @@ nl:
       connect_to_facebook: "Verbind met Facebook"
       connect_to_twitter: "Verbind met Twitter"
       disconnect: "koppel los"
-      edit_services: "Edit services"
+      edit_services: "Bewerk services"
       logged_in_as: "ingelogd als"
       really_disconnect: "verbreek verbinding met %{service}?"
   settings: "Instellingen"
@@ -366,14 +371,17 @@ nl:
   users: 
     destroy: "Account succesvol verwijderd."
     edit: 
+      change: "Verander"
       change_language: "Taal wijzigen"
       change_password: "Verander wachtwoord"
       close_account: "Verwijder account"
       download_photos: "download mijn foto's"
       download_xml: "download mijn xml"
-      edit_account: "Edit account"
+      edit_account: "Bewerk account"
+      email_notifications: "E-mail notificaties"
       export_data: "Exporteer data"
       new_password: "Nieuw wachtwoord"
+      receive_email_notifications: "E-mail notificaties ontvangen?"
       your_email: "Jou e-mail"
       your_handle: "Jou Diaspora handle"
     getting_started: 
@@ -407,6 +415,7 @@ nl:
     public: 
       does_not_exist: "Gebruiker %{username} bestaat niet!"
     update: 
+      email_notifications_changed: "Taal veranderen mislukt"
       language_changed: "Taal gewijzigd"
       language_not_changed: "Taal wijzigen mislukt"
       password_changed: "Wachtwoord gewijzigd"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index dcc593332..986bb6912 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -24,9 +24,11 @@ pl:
               invalid: "jest niewłaściwa"
             username: 
               taken: "jest już zajęta"
-  ago: "temu"
+  ago: "%{time} temu"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "nieznana osoba"
       youtube_title: 
         unknown: "Nieznany tytuł wideo"
@@ -134,6 +136,7 @@ pl:
     edit: 
       sign_up: "rejestracja"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspekt"
       comma_seperated_plz: "Możesz podać kilka adresów e-mailowych, oddzielając je przecinkami."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
@@ -200,6 +203,8 @@ pl:
       people_on_pod_are_aware_of: " osoby na podzie wiedzą, że"
       results_for: " wyniki dla %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "wyniki wyszukiwania dla"
     person: 
@@ -366,14 +371,17 @@ pl:
   users: 
     destroy: "Konto zostało pomyślnie zamknięte."
     edit: 
+      change: "Change"
       change_language: "Zmień język"
       change_password: "Zmiana hasła"
       close_account: "Zamknij konto"
       download_photos: "pobierz moje zdjęcia"
       download_xml: "pobierz mój xml"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Eksportowanie danych"
       new_password: "Nowe hasło"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "Twój e-mail"
       your_handle: "Twój identyfikator w Diasporze"
     getting_started: 
@@ -407,6 +415,7 @@ pl:
     public: 
       does_not_exist: "Użytkownik %{username} nie istnieje!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Zmieniono język"
       language_not_changed: "Nie udało się zmienić języka"
       password_changed: "Zmieniono hasło"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 926ddde2e..598d8019f 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -24,9 +24,11 @@ pt-BR:
               invalid: "é inválido"
             username: 
               taken: "já está sendo usado(a)"
-  ago: "atrás"
+  ago: "%{time} atrás"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "pessoa desconhecida"
       youtube_title: 
         unknown: "Título de vídeo desconhecido"
@@ -134,6 +136,7 @@ pt-BR:
     edit: 
       sign_up: "cadastre-se"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspect"
       comma_seperated_plz: "Você pode adicionar múltiplos endereços de email, separados por vírgulas."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
@@ -200,6 +203,8 @@ pt-BR:
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "Resultado da busca por"
     person: 
@@ -366,14 +371,17 @@ pt-BR:
   users: 
     destroy: "Conta encerrada com sucesso."
     edit: 
+      change: "Change"
       change_language: "Trocar idioma"
       change_password: "Trocar senha"
       close_account: "Encerrar minha conta"
       download_photos: "baixar minhas fotos"
       download_xml: "baixar meu xml"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Exportar dados"
       new_password: "Nova Senha"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "Seu email"
       your_handle: "Seu endereço diaspora"
     getting_started: 
@@ -407,6 +415,7 @@ pt-BR:
     public: 
       does_not_exist: "O usuário %{username} não existe!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Idioma Alterado"
       language_not_changed: "Alteração de Idioma Falhou"
       password_changed: "Senha Alterada"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index a7c25b863..05dd8b2a9 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -24,9 +24,11 @@ pt-PT:
               invalid: "é inválida"
             username: 
               taken: "já existe"
-  ago: "atrás"
+  ago: "%{time} atrás"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "utilizador(a) desconhecido(a)"
       youtube_title: 
         unknown: "Título do Vídeo Desconhecido"
@@ -134,6 +136,7 @@ pt-PT:
     edit: 
       sign_up: "registar"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspect"
       comma_seperated_plz: "Podes inserir vários endereços de email separados por vírgulas."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
@@ -200,6 +203,8 @@ pt-PT:
       people_on_pod_are_aware_of: " as pessoas no pod estão cientes de que"
       results_for: " resultados para %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "resultados de pesquisa para"
     person: 
@@ -366,14 +371,17 @@ pt-PT:
   users: 
     destroy: "Conta encerrada com sucesso"
     edit: 
+      change: "Change"
       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"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Exportar Dados"
       new_password: "Nova Palavra-chave"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "O teu email"
       your_handle: "O teu nome de utilizador no Diaspora"
     getting_started: 
@@ -407,6 +415,7 @@ pt-PT:
     public: 
       does_not_exist: "O utilizador %{username} não existe!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Idioma Modificado"
       language_not_changed: "Falha ao Modificar Idioma"
       password_changed: "Palavra-chave Modificada"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index bda18817b..736fda7db 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -24,9 +24,11 @@ ro:
               invalid: "este invalid"
             username: 
               taken: "este deja luat"
-  ago: "ago"
+  ago: "%{time} ago"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "persoană necunoscută"
       youtube_title: 
         unknown: "Unknown Video Title"
@@ -134,6 +136,7 @@ ro:
     edit: 
       sign_up: "sign_up"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspect"
       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."
@@ -200,6 +203,8 @@ ro:
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "search results for"
     person: 
@@ -366,14 +371,17 @@ ro:
   users: 
     destroy: "Account successfully closed."
     edit: 
+      change: "Change"
       change_language: "Change Language"
       change_password: "Change Password"
       close_account: "Close Account"
       download_photos: "download my photos"
       download_xml: "download my xml"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Export Data"
       new_password: "New Password"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
@@ -407,6 +415,7 @@ ro:
     public: 
       does_not_exist: "User %{username} does not exist!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Language Changed"
       language_not_changed: "Language Change Failed"
       password_changed: "Password Changed"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 37d82e1c6..37dde6d13 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -24,9 +24,11 @@ ru:
               invalid: "неправильный"
             username: 
               taken: "уже занято"
-  ago: "назад"
+  ago: "%{time} назад"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "неизвестная персона"
       youtube_title: 
         unknown: "Неизвестный видео заголовок"
@@ -134,6 +136,7 @@ ru:
     edit: 
       sign_up: "регистрация"
     new: 
+      already_invited: "Already invited"
       aspect: "Аспект"
       comma_seperated_plz: "Вы можете ввести несколько адресов электронной почты через запятую."
       if_they_accept_info: "после согласия с их стороны, они будут добавлены в предложенный вами аспект."
@@ -200,6 +203,8 @@ ru:
       people_on_pod_are_aware_of: "люди на сервере знают о"
       results_for: "результаты для %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "результат поиска для"
     person: 
@@ -366,14 +371,17 @@ ru:
   users: 
     destroy: "Аккаунт закрыт."
     edit: 
+      change: "Change"
       change_language: "Сменить язык"
       change_password: "Сменить пароль"
       close_account: "Закрыть учётную запись"
       download_photos: "Скачать мои изображения"
       download_xml: "Скачать мою информацию в xml"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Экспорт информации"
       new_password: "Новый пароль"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "Ваш адрес электронной почты"
       your_handle: "Ваше управление Диаспорой"
     getting_started: 
@@ -407,6 +415,7 @@ ru:
     public: 
       does_not_exist: "Пользователя %{username} не существует!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Язык изменён"
       language_not_changed: "Не удалось изменить язык"
       password_changed: "Пароль изменён"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index cdc422248..fae7937c2 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -24,9 +24,11 @@ sk:
               invalid: "je neplatný"
             username: 
               taken: "je už obsadené"
-  ago: "dozadu"
+  ago: "%{time} dozadu"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "neznáma osoba"
       youtube_title: 
         unknown: "Názov videa neznámy"
@@ -134,6 +136,7 @@ sk:
     edit: 
       sign_up: "Zaregistrovať sa"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspect"
       comma_seperated_plz: "Môžete vložiť viacero adries oddelených čiarkou."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
@@ -200,6 +203,8 @@ sk:
       people_on_pod_are_aware_of: "Ľudia na pode sú si vedomí"
       results_for: "Výsledky hľadania %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "Výsledky vyhľadávania pre"
     person: 
@@ -366,14 +371,17 @@ sk:
   users: 
     destroy: "Účet bol úspešne zrušený."
     edit: 
+      change: "Change"
       change_language: "Zmeniť jazyk"
       change_password: "Zmeniť heslo"
       close_account: "Zrušiť účet"
       download_photos: "Stiahnuť moje fotky"
       download_xml: "stiahnuť moje xml"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Exportovať dáta"
       new_password: "Nové heslo"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "Váš e-mail"
       your_handle: "Príručka k Diaspore"
     getting_started: 
@@ -407,6 +415,7 @@ sk:
     public: 
       does_not_exist: "Užívateľ %{username} neexistuje!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Jazyk zmenený"
       language_not_changed: "Zmena jazyka zlyhala"
       password_changed: "Heslo zmenené"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 7fc6c8be6..dd1bf66ba 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -24,9 +24,11 @@ sv:
               invalid: "är ogiltigt"
             username: 
               taken: "är redan taget"
-  ago: "sedan"
+  ago: "%{time} sedan"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "okänd person"
       youtube_title: 
         unknown: "Okänd videotitel"
@@ -134,6 +136,7 @@ sv:
     edit: 
       sign_up: "registrera"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspekt"
       comma_seperated_plz: "Du kan ange flera e-postadresser separerade av kommatecken."
       if_they_accept_info: "om de accepterar, kommer de bli med på den sida du har bjudit in dem till."
@@ -185,7 +188,7 @@ sv:
   people: 
     edit: 
       allow_search: "Tillåt andra användare på Diaspora att söka efter dig"
-      edit_profile: "Edit profile"
+      edit_profile: "Ändra profil"
       first_name: "Förnamn"
       info_available_to: "Den här informationen kommer vara synlig för alla som du ansluter till på diaspora."
       last_name: "Efternamn"
@@ -200,7 +203,9 @@ sv:
       people_on_pod_are_aware_of: " personer på denna plats är medvetna om att"
       results_for: " resultat för %{params}"
     index: 
-      no_results: "Hey! You need to search for something."
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
+      no_results: "Du måste söka efter något."
       results_for: "Sökresultat för"
     person: 
       add_contact: "lägg till kontakt"
@@ -250,8 +255,8 @@ sv:
       invalid_ext: "{file} har en ogiltig filändelse. Endast {extensions} är tillåtna."
       size_error: "{file} är för stor, maximal tillåten filstorlek är {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "or select one from your already existing"
-      upload: "Upload a new profile photo!"
+      or_select_one: "eller välj en av dina befintliga"
+      upload: "Ladda upp en ny profilbild!"
     photo: 
       view_all: "visa alla foton som %{name} laddat upp"
     show: 
@@ -310,7 +315,7 @@ sv:
       connect_to_facebook: "Anslut till facebook"
       connect_to_twitter: "Anslut till twitter"
       disconnect: "koppla från"
-      edit_services: "Edit services"
+      edit_services: "Anslutna tjänster"
       logged_in_as: "inloggad som"
       really_disconnect: "koppla från %{service}?"
   settings: "Inställningar"
@@ -366,14 +371,17 @@ sv:
   users: 
     destroy: "Ditt konto är nu stängt."
     edit: 
+      change: "Ändra"
       change_language: "Ändra språk"
       change_password: "Ändra lösenord"
       close_account: "Stäng kontot"
       download_photos: "Ladda ner mina foton"
       download_xml: "Ladda ner min xml"
-      edit_account: "Edit account"
+      edit_account: "Ändra konto"
+      email_notifications: "E-post meddelanden"
       export_data: "Exportera data"
       new_password: "Nytt lösenord"
+      receive_email_notifications: "Vill du få meddelande via e-post?"
       your_email: "Din epost"
       your_handle: "Ditt Diaspora-användarnamn"
     getting_started: 
@@ -407,6 +415,7 @@ sv:
     public: 
       does_not_exist: "Användaren %{username} finns inte!"
     update: 
+      email_notifications_changed: "Byte av språk misslyckades"
       language_changed: "Språk är nu ändrat"
       language_not_changed: "Språket kunde inte ändras"
       password_changed: "Lösenordet är nu ändrat"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 567d3eff2..5ef048db1 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -24,9 +24,11 @@ tr:
               invalid: "geçersiz"
             username: 
               taken: "zaten alınmış"
-  ago: "önce"
+  ago: "%{time} önce"
   application: 
     helper: 
+      aspect_badge: 
+        all_aspects: "All aspects"
       unknown_person: "bilinmiyen kişiler"
       youtube_title: 
         unknown: "Bilinmeyen Video Başlığı"
@@ -134,6 +136,7 @@ tr:
     edit: 
       sign_up: "sign_up"
     new: 
+      already_invited: "Already invited"
       aspect: "Aspect"
       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."
@@ -200,6 +203,8 @@ tr:
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
     index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "search results for"
     person: 
@@ -366,14 +371,17 @@ tr:
   users: 
     destroy: "Hesap başarıyla kapatıldı"
     edit: 
+      change: "Change"
       change_language: "Dili Değiştir"
       change_password: "Şifremi Değiştir"
       close_account: "Hesabımı kapat"
       download_photos: "fotoğraflarımı kaydet"
       download_xml: "xml dosyamı kaydet"
       edit_account: "Edit account"
+      email_notifications: "Email notificaions"
       export_data: "Bilgilerimi Dışarı taşı"
       new_password: "Yeni Şifre"
+      receive_email_notifications: "Receive email notificaions?"
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
@@ -407,6 +415,7 @@ tr:
     public: 
       does_not_exist: "%{username} kullanıcısı bulunmamaktadır!"
     update: 
+      email_notifications_changed: "Language Change Failed"
       language_changed: "Dil Değişti"
       language_not_changed: "Dil Değişikliği Başarılamadı"
       password_changed: "Şifre Değişti"