diff --git a/config/locales/devise/devise.el.yml b/config/locales/devise/devise.el.yml
index bdd3a9ba3..095418b22 100644
--- a/config/locales/devise/devise.el.yml
+++ b/config/locales/devise/devise.el.yml
@@ -19,7 +19,7 @@ el:
       unauthenticated: "Θα πρέπει να συνδεθείτε ή να εγγραφείτε πριν συνεχίσετε."
       unconfirmed: "Πρέπει να επιβεβαιώσετε τον λογαριασμό σας πριν συνεχίσετε."
     invitations:
-      invitation_token_invalid: "Το σύμβολο της πρόσκλησης δεν είναι έγκυρο!"
+      invitation_token_invalid: "Μας συγωρείτε!Το σύμβολο της πρόσκλησης δεν είναι έγκυρο!"
       send_instructions: "Η πρόσκληση σας έχει σταλεί."
       updated: "Ο κωδικός πρόσβασης σας τέθηκε με επιτυχία. Είστε πλέον συνδεδεμένοι."
     mailer:
@@ -30,33 +30,33 @@ el:
       hello: "Γειά σου %{email}!"
       invitation_instructions:
         accept: "Αποδοχή πρόσκλησης"
-        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
-        be_yourself: "Be Yourself"
-        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        arrived: "Το κοινωνικό δίκτυο που περιμένατε, έφτασε. Ανανεωμένο, ασφαλέστερο, και πιο διασκεδαστικό, το %{strong_diaspora} είναι έτοιμο να σας βοηθήσει να μοιραστείτε και να ανακαλύψετε το διαδίκτυο με έναν εντελώς νέο τρόπο. "
+        be_yourself: "Να είσαι ο εαυτός σου"
+        be_yourself_paragraph: "Το Διαδίκτυο έχει δημιουργήσει μοναδικούς τρόπους για να εκφραστούμε.Το %{strong_diaspora} σας επιτρέπει να είστε ο εαυτός σας και να μοιράζεστε όπως θέλετε, με το πραγματικό σας όνομα η και όχι. "
         cubbies: Cubbi.es
-        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        displaying_correctly: "Το Email δεν εμφανίζεται σωστά; %{link} "
         email_address: questions@joindiaspora.com
-        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
-        finally: "Finally - it's here"
-        friends_saying: "What your friends are saying..."
-        get_connected: "Get Connected"
-        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
-        have_fun: "Have Fun"
-        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
-        help_fund: "help fund Diaspora"
-        here: "here"
+        email_us: "Για γενικές ερωτήσεις ή υποστήριξη για τον Diaspora λογαριασμό σας, παρακαλούμε επικοινωνήστε στο  %{email}."
+        finally: "Επιτέλους - είναι εδώ"
+        friends_saying: "Τι λένε οι φίλοι σου..."
+        get_connected: "Συνδεθείτε"
+        get_connected_paragraph: "Ως ένα διεθνές κίνημα με κοινό όραμα το καλύτερο διαδίκτυο, το #1 χαρακτηριστικό του %{strong_diaspora} είναι η κοινότητά του. Γνωρίστε νέα άτομα, συνδεθείτε με φίλους και διασκεδάστε."
+        have_fun: "Διασκεδάστε"
+        have_fun_paragraph: "Με το %{strong_diaspora} θα ανακλύψετε νέα εκπληκτικά πράγματα και ανθρώπους στο διαδίκτυο. %{link}, η πρώτη παγκόσμια εφαρμογή του %{strong_diaspora} είναι μόνο η αρχή. Συλλέξτε και μοιραστείτε το διαδίκτυο σε όλη τη δόξα του. "
+        help_fund: "βοηθείστε τη χορηγία του Diaspora "
+        here: "εδώ"
         ignore: "Εάν δεν θέλετε να αποδεχτείτε την πρόσκληση, παρακαλώ αγνοήστε αυτό το email."
-        join_team: "Join our Team"
-        love: "Love,"
-        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
-        more_people: "Even more people are excited to see you!"
+        join_team: "Γίνετε μέλος στην ομάδα μας"
+        love: "Με αγάπη,"
+        made_by_people: "Το %{strong_diaspora} είναι φτιαγμένο από άτομα που αγαπούν το Ίντερνετ όσο κι εσύ. %{jointeam}, ή %{helpfund}!"
+        more_people: "Όλο και περισσότερα άτομα ανυπομονούν να σε γνωρίσουν!"
         no_account_till: "Ο λογαριασμός σας δεν θα δημιουργηθεί μέχρι να μεταβείτε στον παρακάτω σύνδεσμο και συνδεθείτε. "
-        or: "or"
-        sign_up_now: "Sign up now →"
+        or: "ή "
+        sign_up_now: "Εγγραφείτε τώρα →"
         subject: "Έχετε προσκληθεί να συμμετάσχετε στο Diaspora!"
-        team_diaspora: "Team Diaspora"
-        unsubscribe: "To unsubscribe please click %{link}."
-        view_in: "View in"
+        team_diaspora: "Η Ομάδα του Diaspora"
+        unsubscribe: "Για να διαγραφείτε παρακαλούμε πατήστε στο σύνδεσμο : %{link}."
+        view_in: "Δείτε το στο φυλλομετρητή σας. "
       inviter:
         accept_at: "στο %{url}, μπορείτε να το αποδεχτείτε μέσω του παρακάτω συνδέσμου."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml
index ea2d6bbeb..99ba571e7 100644
--- a/config/locales/devise/devise.es.yml
+++ b/config/locales/devise/devise.es.yml
@@ -19,7 +19,7 @@ es:
       unauthenticated: "Necesitas acceder a tu cuenta o registrarte antes de continuar."
       unconfirmed: "Necesitas confirmar tu cuenta antes de continuar."
     invitations:
-      invitation_token_invalid: "¡El identificador de la invitación no es valido!"
+      invitation_token_invalid: "¡Discúlpanos, ese identificador de invitación no es valido."
       send_instructions: "Tu invitación se ha enviado."
       updated: "Tu contraseña ha sido establecida con éxito. Ahora has accedido."
     mailer:
@@ -34,7 +34,7 @@ es:
         be_yourself: "Se tú mismo"
         be_yourself_paragraph: "Internet ha creado nuevas formas únicas para que nos expresemos. %{strong_diaspora} te permite ser tú mismo y compartir lo que le apetezca, usando tu nombre real o no."
         cubbies: Cubbi.es
-        displaying_correctly: "¿No se muestra correctamente el email? %{Link} en su navegador"
+        displaying_correctly: "¿No se muestra correctamente el email? %{Link}"
         email_address: questions@joindiaspora.com
         email_us: "Para consultas generales o soporte sobre tu cuenta de Diaspora*, por favor envíanos un correo a %{email}."
         finally: "Finalmente - ya está aquí"
@@ -56,7 +56,7 @@ es:
         subject: "¡Has sido invitado a unirte a Diaspora*!"
         team_diaspora: "Equipo de Diaspora*"
         unsubscribe: "Para anular tu suscripción por favor haz clic en %{link}."
-        view_in: "Ver en"
+        view_in: "Ver en el navegador."
       inviter:
         accept_at: "en %{url}, puedes aceptar en el enlace inferior."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index 052be6b60..5280a2015 100644
--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -55,7 +55,7 @@ fr:
         sign_up_now: "Inscrivez-vous →"
         subject: "Vous avez été invité à rejoindre Diaspora!"
         team_diaspora: "L'Équipe Diaspora"
-        unsubscribe: "Pour vous désinscrir, merci de cliquer %{link}."
+        unsubscribe: "Pour vous désinscrire, merci de cliquer sur %{link}."
         view_in: "L'afficher dans votre navigateur."
       inviter:
         accept_at: "à %{url}, vous pouvez l'accepter à travers le lien ci-dessous."
diff --git a/config/locales/devise/devise.is.yml b/config/locales/devise/devise.is.yml
index 9df069f9c..d3211547e 100644
--- a/config/locales/devise/devise.is.yml
+++ b/config/locales/devise/devise.is.yml
@@ -6,61 +6,61 @@
 is:
   devise:
     confirmations:
-      confirmed: "Aðgangur þinn er nú staðfestur. Þú ert nú skráð/ur inn."
+      confirmed: "Aðgangurinn þinn hefur nú verið staðfestur. Þú ert @{f:innskráð|m:innskráður|innskráð(ur)}."
       new:
-        resend_confirmation: "Endursenda staðfestingarleiðbeiningar"
-      send_instructions: "Þú munt fá tölvupóst innan fárra mínútna, með leiðbeiningum um hvernig þú staðfestir aðgang þinn."
+        resend_confirmation: "Endursenda leiðbeiningar um staðfestingu"
+      send_instructions: "Þú munt fá tölvupóst innan fárra mínútna, með leiðbeiningum um hvernig þú staðfestir aðganginn þinn."
     failure:
-      inactive: "Aðgangur þinn hefur enn ekki verið gerður virkur."
+      inactive: "Aðgangurinn þinn hefur enn ekki verið gerður virkur."
       invalid: "Ógilt netfang eða lykilorð."
       invalid_token: "Ógildur staðfestingarlykill."
-      locked: "Aðgangur þinn er læstur."
-      timeout: "Tími þinn er útrunninn, vinsamlegast skráðu þig aftur inn til að geta haldið áfram."
-      unauthenticated: "Þú þarft að skrá þig inn eða búa þér til aðgang áður en þú getur haldið áfram."
-      unconfirmed: "Þú þarft að staðfesta aðgang þinn áður en þú getur haldið áfram."
+      locked: "Aðgangurinn þinn er læstur."
+      timeout: "Innskráningin þín hefur runnið út á tíma. Vinsamlegast skráðu þig aftur inn til að geta haldið áfram."
+      unauthenticated: "Þú þarft að skrá þig inn eða stofna nýjan aðgang áður en þú getur haldið áfram."
+      unconfirmed: "Þú þarft að staðfesta aðganginn þinn áður en þú getur haldið áfram."
     invitations:
-      invitation_token_invalid: "Boðslykillinn er ekki gildur!"
-      send_instructions: "Boð þitt hefur verið sent."
-      updated: "Nú er búið að stilla lykilorð þitt og þú hér með skráð/ur inn."
+      invitation_token_invalid: "Okkur þykir það leitt, en þetta er ekki gildur boðslykill."
+      send_instructions: "Boðið þitt hefur verið sent."
+      updated: "Nú er búið að stilla lykilorðið þitt og þú ert hér með @{f:innskráð|m:innskráður|innskráð(ur)}."
     mailer:
       confirmation_instructions:
-        confirm: "Staðfesta aðgang minn"
-        subject: "Staðfestingarleiðbeiningar"
-        you_can_confirm: "Þú getur staðfest aðgang þinn með því að elta hlekkinn hér fyrir neðan:"
+        confirm: "Staðfesta aðganginn minn"
+        subject: "Leiðbeiningar um staðfestingu"
+        you_can_confirm: "Þú getur staðfest aðganginn þinn með því að elta hlekkinn hér fyrir neðan:"
       hello: "Halló %{email}!"
       invitation_instructions:
-        accept: "Accept invitation"
-        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
-        be_yourself: "Be Yourself"
-        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        accept: "Þiggja boð"
+        arrived: "Hér er loksins komið samskiptanetið sem þú hefur beðið eftir. %{strong_diaspora} er hressara, öruggara og skemmtilegra, og tilbúið fyrir það sem þú vilt skoða eða deila með vefnum, á nýjan hátt."
+        be_yourself: "Vertu þú @{f:sjálf|m:sjálfur|sjálf(ur)}"
+        be_yourself_paragraph: "Með Internetinu hafa orðið til nýjar leiðir fyrir okkur til að tjá okkur. Á %{strong_diaspora} færð þú að vera þú @{f:sjálf|m:sjálfur|sjálf(ur)} og deila því sem þú vilt, undir þínu rétta nafni eða ekki, eftir því sem þú vilt."
         cubbies: Cubbi.es
-        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        displaying_correctly: "Birtist netfangið ekki rétt? %{link}"
         email_address: questions@joindiaspora.com
-        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
-        finally: "Finally - it's here"
-        friends_saying: "What your friends are saying..."
-        get_connected: "Get Connected"
-        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
-        have_fun: "Have Fun"
+        email_us: "Almennar fyrirspurnir og fyrirspurnir sem varða Diasporaaðganginn þinn má senda á %{email}."
+        finally: "Loksins, hérna er það komið"
+        friends_saying: "Það sem vinir þínir segja..."
+        get_connected: "Komdu í samband"
+        get_connected_paragraph: "%{strong_diaspora} er alþjóðleg hreyfing sem sér fyrir sér betri vef. Samfélagið er það sem skiptir mestu máli. Komdu með, að kynnast fólki, að halda sambandi við vini þína og taka þátt í fjörinu."
+        have_fun: "Skemmtu þér"
         have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
-        help_fund: "help fund Diaspora"
-        here: "here"
-        ignore: "If you don't want to accept the invitation, please ignore this email."
-        join_team: "Join our Team"
-        love: "Love,"
-        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
-        more_people: "Even more people are excited to see you!"
-        no_account_till: "Your account won't be created until you access the link above and sign up."
-        or: "or"
-        sign_up_now: "Sign up now →"
-        subject: "You've been invited to join Diaspora!"
-        team_diaspora: "Team Diaspora"
-        unsubscribe: "To unsubscribe please click %{link}."
+        help_fund: "hjálpaðu til við að fjármagna Diaspora"
+        here: "hér"
+        ignore: "Ef þú vilt ekki þiggja boðið, biðjumst við afsökunar á þessum tölvupósti."
+        join_team: "Taktu þátt"
+        love: "Bestu kveðjur,"
+        made_by_people: "%{strong_diaspora} er búið til af fólki sem þykir vænt um Internetið eins og þér. %{jointeam}, or %{helpfund}!"
+        more_people: "Enn fleiri eru spenntir að hitta þig!"
+        no_account_till: "Aðgangurinn þinn verður ekki til fyrr en þú fylgir hlekknum hér fyrir ofan og stofnar nýjan aðgang."
+        or: "eða"
+        sign_up_now: "Stofnaðu nýjan aðgang núna →"
+        subject: "Þér hefur verið boðið að vera með í Diaspora!"
+        team_diaspora: "Diasporahópurinn"
+        unsubscribe: "Smelltu %{link} til að segja upp áskriftinni."
         view_in: "View in"
       inviter:
-        accept_at: "at %{url}, you can accept it through the link below."
+        accept_at: "á %{url}. Þú getur þegið boðið með því að fylgja hlekknum hér fyrir neðan."
         has_invited_you: "%{name}"
-        have_invited_you: "%{names} have invited you to join Diaspora"
+        have_invited_you: "%{names} hafa boðið þér að vera með í Diaspora"
       reset_password_instructions:
         change: "Breyta lykilorðinu mínu"
         ignore: "Ef þú baðst ekki um þetta, vinsamlegast gefðu þessum tölvupósti þá engan gaum."
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index cb330c387..4e0cc5045 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -410,9 +410,9 @@ el:
       few: "Οι χρήστες %{actors} σας ανέφεραν στη %{post_link}."
       many: "Οι χρήστες %{actors} σας ανέφεραν στη %{post_link}."
       one: "Ο χρήστης %{actors} σας ανέφερε στη %{post_link}."
-      other: "Οι χρήστες %{actors} σας ανέφεραν στη %{post_link}."
+      other: "Οι χρήστες %{actors} σας ανέφεραν σε μια %{post_link}."
       two: "Οι χρήστες %{actors} σας ανέφεραν σε μια %{post_link}."
-      zero: "Ο χρήστης %{actors} σας ανέφερε στη %{post_link}."
+      zero: "Ο χρήστης %{actors} σας ανέφερε σε μια %{post_link}."
     mentioned_deleted:
       few: "Οι χρήστες %{actors} σας ανέφεραν σε μια διαγεγραμμένη δημοσίευση."
       many: "Οι χρήστες %{actors} σας ανέφεραν σε μια διαγεγραμμένη δημοσίευση."
@@ -668,7 +668,7 @@ el:
   services:
     create:
       already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
-      failure: "Authentication failed."
+      failure: "Αποτυχία πιστοποίησης."
       success: "Επιτυχής έλεγχος ταυτότητας."
     destroy:
       success: "Επιτυχής καταστροφή ταυτότητας."
@@ -736,7 +736,7 @@ el:
       control_your_audience: "Ελέγξτε το Κοινό σας"
       logged_in: "συνδεδεμένος/η στο %{service}"
       manage: "διαχείριση συναφών υπηρεσιών"
-      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
+      new_user_welcome_message: "Χρησιμοποιήστε τις #ετικέτες για να ταξινομήσετε τις δημοσιεύσεις σας και να βρείτε άτομα με κοινά ενδιαφέροντα με εσάς. Μνημονεύστε αξιόλογα άτομα με @αναφορές"
       outside: "Τα δημόσια μηνύματα θα είναι διαθέσιμα και σε χρήστες εκτός του δικτύου Diaspora"
       share: "Μοιραστείτε"
       title: "Ρύθμιση συνδεδεμένων υπηρεσιών"
@@ -805,22 +805,22 @@ el:
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
       add_a_tag: "Add a tag"
-      contacts_title: "People who dig these tags"
+      contacts_title: "Άτομα που έψαξαν αυτές τις ετικέτες"
       follow: "Follow"
-      title: "#Followed Tags"
-    followed_tags_stream: "#Followed Tags"
+      title: "#Ετικέτες που ακολουθείτε"
+    followed_tags_stream: "#Ετικέτες που ακολουθείτε"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "Άτομα που σας έχουν αναφέρει"
-      title: "Οι Αναφορές σας"
+      title: "@Αναφορές"
     multi:
       contacts_title: "Άτομα στη Ροή σας"
       title: "Ροή"
-    posted: "posted"
+    posted: "δημοσιεύτηκε"
     public:
       contacts_title: "Πρόσφατες Αφίσες"
       title: "Δημόσια Δραστηριότητα"
-    recently: "recently:"
+    recently: "πρόσφατα:"
     tags:
       contacts_title: "Άτομα που τους αρέσουν αυτές οι ετικέτες"
       tag_prefill_text: "The thing about %{tag_name} is... "
@@ -889,7 +889,7 @@ el:
       show_community_spotlight: "Show Community Spotlight in Stream?"
       show_getting_started: "Re-enable Getting Started"
       started_sharing: "...κάποιος άρχισε να διαμοιράζεται μαζί σας?"
-      stream_preferences: "Stream Preferences"
+      stream_preferences: "Προτιμήσεις Ροής"
       your_email: "Το email σας"
       your_handle: "Το αναγνωριστικό σας στο diaspora"
     getting_started:
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index ff20f8717..3cd5180e8 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -750,7 +750,7 @@ es:
         hello: "Hola a tod@s, esta es mi #%{new_user_tag}."
         i_like: "Tengo interés en %{tags}."
         invited_by: "Gracias por la invitación, "
-        newhere: "PrimeraPublicación"
+        newhere: "NuevoAquí"
       post_a_message_to: "Publicar un mensaje en %{aspect}"
       posting: Publicando...
       publishing_to: "publicar en:"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index fb985030e..684764697 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -629,9 +629,9 @@ fi:
   requests:
     create:
       sending: Lähetetään...
-      sent: "Haluat jakaa %{name} kanssa. Heidän pitäisi nähdä se kirjautuessaan seuraavan kerran Diasporaan."
+      sent: "Olet lähettänyt käyttäjälle %{name} pyynnön jakaa kanssasi. Hänen pitäisi nähdä se kirjautuessaan seuraavan kerran Diasporaan."
     destroy:
-      error: "Ole hyvä, valitse näkymä!"
+      error: "Valitse näkymä!"
       ignore: "Hylätty kontaktipyyntö."
       success: "Olet nyt jakamassa."
     helper:
@@ -921,7 +921,7 @@ fi:
       language_changed: "Kieli vaihdettu"
       language_not_changed: "Kielen vaihtaminen epäonnistui"
       password_changed: "Salasana vaihdettu. Voit nyt kirjautua uudella salasanallasi."
-      password_not_changed: "Salasanan vaihto epäonnistui"
+      password_not_changed: "Salasanan vaihtaminen epäonnistui"
       settings_not_updated: "Asetusten päivittäminen epäonnistui"
       settings_updated: "Asetukset päivitetty"
       unconfirmed_email_changed: "Sähköpostiosoite muutettu. Se täytyy aktivoida."
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 3704a46ab..3f5b8a6b8 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -37,7 +37,7 @@ fr:
             person:
               invalid: "est invalide."
             username:
-              invalid: "n'est pas valide. Nous n'autorisons que les lettres, chiffres et caractère de soulignement."
+              invalid: "n'est pas valide. Nous n'autorisons que les lettres, chiffres et caractères de soulignement."
               taken: "est déjà pris."
   ago: "Il y a %{time}"
   all_aspects: "Tous les aspects"
@@ -244,7 +244,7 @@ fr:
     new:
       abandon_changes: "Abandonner les changements ?"
       send: "Envoyer"
-      sending: "Envoi ..."
+      sending: Envoi…
       subject: "sujet"
       to: "pour"
     new_message:
@@ -271,7 +271,7 @@ fr:
     show:
       already_account: "vous avez déjà un compte?"
       choice: "Choix"
-      choice_explanation: "Diaspora vous laisse trier vos connexions dans des groupes appelé aspects. Spécifiques à Diaspora, les aspects garantissent que vos photos, histoires et blagues ne sont partagées qu'avec les personnes avec qui vous souhaitez les partager."
+      choice_explanation: "Diaspora vous laisse trier vos connexions dans des groupes appelés aspects. Spécifiques à Diaspora, les aspects garantissent que vos photos, histoires et blagues ne sont partagées qu'avec les personnes avec qui vous souhaitez les partager."
       learn_about_host: "Apprenez comment héberger votre propre serveur Diaspora."
       login_here: "connectez-vous ici"
       ownership: "Propriété"
@@ -321,7 +321,7 @@ fr:
       login: "connexion"
       logout: "Déconnexion"
       profile: "Profil"
-      recent_notifications: "Notifications récentes"
+      recent_notifications: "Notifications"
       settings: "Paramètres"
       view_all: "Tout afficher"
   likes:
@@ -355,21 +355,21 @@ fr:
     also_commented:
       few: "%{actors} a/ont également commenté le %{post_link} de %{post_author}."
       many: "%{actors} a/ont également commenté le %{post_link} de %{post_author}."
-      one: "%{actors} a/ont également commenté le %{post_link} de %{post_author}."
+      one: "%{actors} a également commenté le %{post_link} de %{post_author}."
       other: "%{actors} a/ont également commenté le %{post_link} de %{post_author}."
       two: "%{actors} ont aussi commenté %{post_link} de %{post_author}."
       zero: "%{actors} a/ont également commenté le %{post_link} de %{post_author}."
     also_commented_deleted:
-      few: "%{actors} a commenté votre message supprimé."
-      many: "%{actors} a commenté votre message supprimé."
+      few: "%{actors} ont commenté votre message supprimé."
+      many: "%{actors} ont commenté votre message supprimé."
       one: "%{actors} a commenté votre message supprimé."
-      other: "%{actors} a commenté votre message supprimé."
+      other: "%{actors} a/ont commenté votre message supprimé."
       two: "%{actors} ont commenté sur un message supprimé."
-      zero: "%{actors} a commenté votre message supprimé."
+      zero: "%{actors} a/ont commenté votre message supprimé."
     comment_on_post:
-      few: "%{actors} a/ont commenté votre %{post_link}."
-      many: "%{actors} a/ont commenté votre %{post_link}."
-      one: "%{actors} a/ont commenté votre %{post_link}."
+      few: "%{actors} ont commenté votre %{post_link}."
+      many: "%{actors} ont commenté votre %{post_link}."
+      one: "%{actors} a commenté votre %{post_link}."
       other: "%{actors} a/ont commenté votre %{post_link}."
       two: "%{actors} ont commenté votre %{post_link}."
       zero: "%{actors} a/ont commenté votre %{post_link}."
@@ -400,12 +400,12 @@ fr:
       two: "%{actors} ont aimé votre %{post_link}."
       zero: "%{actors} n'a aimé votre %{post_link}."
     liked_post_deleted:
-      few: "%{actors} a aimé votre message supprimé."
-      many: "%{actors} a aimé votre message supprimé."
+      few: "%{actors} ont aimé votre message supprimé."
+      many: "%{actors} ont aimé votre message supprimé."
       one: "%{actors} a aimé votre message supprimé."
-      other: "%{actors} a aimé votre message supprimé."
+      other: "%{actors} a/ont aimé votre message supprimé."
       two: "%{actors} aiment le message que vous avez supprimé."
-      zero: "%{actors} a aimé votre message supprimé."
+      zero: "%{actors} a/ont aimé votre message supprimé."
     mentioned:
       few: "%{actors} vous ont mentionné(e) dans un %{post_link}."
       many: "%{actors} vous ont mentionné(e) dans un %{post_link}."
@@ -414,20 +414,20 @@ fr:
       two: "%{actors} ont parlé de vous dans %{post_link}."
       zero: "%{actors} vous ont mentionné(e) dans un %{post_link}."
     mentioned_deleted:
-      few: "%{actors} vous a mentionné dans un message supprimé."
-      many: "%{actors} vous a mentionné dans un message supprimé."
-      one: "%{actors} vous a mentionné dans un message supprimé."
+      few: "%{actors} vous ont mentionné(e) dans un message supprimé."
+      many: "%{actors} vous ont mentionné(e) dans un message supprimé."
+      one: "%{actors} vous a/ont mentionné dans un message supprimé."
       other: "%{actors} vous a/ont mentionné(e) dans un message supprimé."
       two: "%{actors} ont parlé de vous dans un message supprimé."
       zero: "%{actors} vous a/ont mentionné(e) dans un message supprimé."
     post: "message"
     private_message:
-      few: "%{actors} vous a envoyé un message."
-      many: "%{actors} vous a envoyé un message."
+      few: "%{actors} vous ont envoyé un message."
+      many: "%{actors} vous ont envoyé un message."
       one: "%{actors} vous a envoyé un message."
-      other: "%{actors} vous a envoyé un message."
+      other: "%{actors} vous a/ont envoyé un message."
       two: "%{actors} vous ont envoyé un message."
-      zero: "%{actors} vous a envoyé un message."
+      zero: "%{actors} ne vous a envoyé de message."
     reshared:
       few: "%{actors} ont repartagé votre %{post_link}."
       many: "%{actors} ont repartagé votre %{post_link}."
@@ -439,13 +439,13 @@ fr:
       few: "%{actors} a partagé le message que vous avez supprimé."
       many: "%{actors} ont partagé le message que vous avez supprimé."
       one: "%{actors} a partagé le message que vous avez supprimé."
-      other: "%{actors} a partagé le message que vous avez supprimé."
+      other: "%{actors} a/ont partagé le message que vous avez supprimé."
       two: "%{actors} ont partagé le message que vous avez supprimé."
       zero: "%{actors} a partagé votre message supprimé."
     started_sharing:
-      few: "%{actors} a/ont commencé à partager avec vous."
-      many: "%{actors} a/ont commencé à partager avec vous."
-      one: "%{actors} a/ont commencé à partager avec vous."
+      few: "%{actors} ont commencé à partager avec vous."
+      many: "%{actors} ont commencé à partager avec vous."
+      one: "%{actors} a commencé à partager avec vous."
       other: "%{actors} a/ont commencé à partager avec vous."
       two: "%{actors} ont commencé à échanger avec vous."
       zero: "%{actors} a/ont commencé à partager avec vous."
@@ -457,7 +457,7 @@ fr:
     confirm_email:
       click_link: "Pour activer votre nouvelle adresse électronique %{unconfirmed_email}, merci de suivre ce lien :"
       subject: "Merci d'activer votre nouvelle adresse électronique %{unconfirmed_email}"
-    email_sent_by_diaspora: "Ce courriel a été envoyé par Diaspora. Si vous souhaitez cesser de recevoir des courriels de ce genre,"
+    email_sent_by_diaspora: "Ce courriel a été envoyé par Diaspora. Si vous ne souhaitez plus recevoir des courriels de ce genre,"
     hello: "Bonjour %{name} !"
     liked:
       liked: "%{name} aime votre message"
@@ -517,7 +517,7 @@ fr:
       remove_from: "Supprimer %{name} de %{aspect} ?"
     show:
       does_not_exist: "Cette personne n'existe pas !"
-      has_not_shared_with_you_yet: "%{name} n'as pas encore partagé de messages avec vous !"
+      has_not_shared_with_you_yet: "%{name} n'a pas encore partagé de messages avec vous !"
       ignoring: "Vous ignorez tous les messages de %{name}."
       incoming_request: "%{name} désire partager avec vous"
       mention: "Mentionner"
@@ -595,7 +595,7 @@ fr:
       your_private_profile: "Votre profil privé"
       your_public_profile: "Votre profil public"
       your_tags: "Décrivez-vous en 5 mots"
-      your_tags_placeholder: "comme #films #repasssage #voyage #professeur #paris"
+      your_tags_placeholder: "comme #films #repassage #voyage #professeur #paris"
     update:
       failed: "Impossible de mettre à jour le profil"
       updated: "Profil mis à jour"
@@ -676,7 +676,7 @@ fr:
       error: "une erreur s'est produite lors de la connexion avec ce service"
     finder:
       fetching_contacts: "Diaspora est en train de peupler vos amis %{service}. Revenez vérifier dans quelques minutes."
-      no_friends: "Pas d'amis Facebook trouvés."
+      no_friends: "Aucun ami Facebook trouvé."
       service_friends: "Amis %{service}"
     index:
       connect_to_facebook: "Connecter à Facebook"
@@ -685,7 +685,7 @@ fr:
       disconnect: "déconnecter"
       edit_services: "Modifier les services"
       logged_in_as: "connecté(e) en tant que"
-      no_services: "Vous n'êtes connectés à aucun service pour le moment."
+      no_services: "Vous n'êtes connecté à aucun service pour le moment."
       really_disconnect: "déconnecter %{service} ?"
     inviter:
       click_link_to_accept_invitation: "Suivez ce lien pour accepter l'invitation"
@@ -784,10 +784,10 @@ fr:
     too_long:
       few: "merci de bien vouloir écrire des messages de moins de %{count} caractères"
       many: "merci de bien vouloir écrire des messages de moins de %{count} caractères"
-      one: "merci de bien vouloir écrire des messages de moins de %{count} caractères"
+      one: "merci de bien vouloir écrire des messages de moins de %{count} caractère"
       other: "merci de bien vouloir écrire des messages de moins de %{count} caractères"
       two: "votre statut doit faire moins de %{count} caractères"
-      zero: "merci de bien vouloir écrire des messages de moins de %{count} caractères"
+      zero: "merci de bien vouloir écrire des messages de moins de %{count} caractère"
   stream_helper:
     hide_comments: "Masquer tous les commentaires"
     show_comments:
@@ -827,11 +827,11 @@ fr:
       title: "Messages tagués : %{tags}"
   tag_followings:
     create:
-      failure: "Erreur lors de la demande de suivi de #%{name}. Le suivez-vous déjà ?"
+      failure: "Impossible de suivre #%{name}. Le suivez-vous déjà ?"
       success: "Hourra ! Vous suivez maintenant #%{name}."
     destroy:
-      failure: "Erreur lors de la demande d'arrêt du suivi de : #%{name}"
-      success: "L'arrêt du suivi de #%{name} est un succès"
+      failure: "Impossible de ne plus suivre #%{name}. Peut-être ne le suivez-vous déjà plus?"
+      success: "Hélas! Vous ne suivez plus #%{name}."
   tags:
     show:
       follow: "Suivre #%{tag}"
@@ -844,12 +844,12 @@ fr:
   tokens:
     show:
       connect_to_cubbies: "Se connecter à Cubbi.es"
-      connecting_is_simple: "Pour vous connecter à votre compte Diaspora, c'est facile ! Il vous suffit d'entrer votre ID Diaspora (<b>%{diaspora_id}</b>) sur votre <a href='%{href_link}'>page des paramètres</a>  cubbies et de cliquer sur Connect."
-      daniels_account: "Le compte Diaspora de Daniel"
-      log_in_with_diaspora_is_comming: "Très bientôt, vous serez en mesure de vous connecter à une nouvelle application sans créer un compte séparé du votre autre sur Diaspora."
+      connecting_is_simple: "Pour vous connecter à votre compte Diaspora, c'est facile ! Il vous suffit d'entrer votre ID Diaspora (<b>%{diaspora_id}</b>) sur votre <a href='%{href_link}'>page des paramètres</a> cubbies et de cliquer sur \"connect\"."
+      daniels_account: "compte Diaspora de Daniel"
+      log_in_with_diaspora_is_comming: "Très bientôt, vous serez en mesure de vous connecter à une nouvelle application sans créer un compte distinct du vôtre sur Diaspora."
       love_to_try: "Nous aimerions beaucoup que vous essayiez."
       making_the_connection: "Créez la connexion"
-      screenshot_explanation: "%{link1}. Cette page cubbi est liée à %{link2}."
+      screenshot_explanation: "%{link1}. Cette page cubbi est liée au %{link2}."
       sign_up_today: "Inscrivez-vous dès aujourd'hui !"
       typical_userpage: "Une page d'utilisateur typique sur cubbi.es"
       via: "(via %{link})"
@@ -858,8 +858,8 @@ fr:
   username: "Nom d'utilisateur"
   users:
     confirm_email:
-      email_confirmed: "Adresse électronique %{email} activé"
-      email_not_confirmed: "L'adresse électronique n'a pas pu être activé. Lien erroné ?"
+      email_confirmed: "Adresse électronique %{email} activée"
+      email_not_confirmed: "L'adresse électronique n'a pas pu être activée. Lien erroné ?"
     destroy:
       no_password: "Veuillez introduire votre mot de passe actuel pour fermer votre compte."
       success: "Votre compte a été bloqué. 20 minutes pourraient être nécessaires pour la finalisation de sa fermeture. Merci d'avoir essayé d'utiliser Diaspora."
@@ -876,10 +876,10 @@ fr:
       download_photos: "télécharger mes photos"
       download_xml: "télécharger mon XML"
       edit_account: "Modifier le compte"
-      email_awaiting_confirmation: "Nous vous avons envoyé un lien d'activation à %{unconfirmed_email}. Jusqu'à ce que vous suivez ce lien et activez la nouvelle adresse, nous allons continuer à utiliser votre adresse originale %{email}."
+      email_awaiting_confirmation: "Nous vous avons envoyé un lien d'activation à %{unconfirmed_email}. Jusqu'à ce que vous suiviez ce lien et activiez la nouvelle adresse, nous allons continuer à utiliser votre adresse originale %{email}."
       export_data: "Exporter des données"
       getting_started: "Préférences de nouvel utilisateur"
-      liked: "...quelqu'un aime votre message ?"
+      liked: "... quelqu'un aime votre message ?"
       mentioned: "…vous êtes mentionné(e) dans une publication ?"
       new_password: "Nouveau mot de passe"
       photo_export_unavailable: "L'exportation des photos est actuellement indisponible"
@@ -888,14 +888,14 @@ fr:
       reshared: "...quelqu'un a partagé votre message ?"
       show_community_spotlight: "Afficher les actualités de la communauté dans votre Flux ?"
       show_getting_started: "Réactiver la page de découverte"
-      started_sharing: "...quelqu'un commence à partager avec vous ?"
+      started_sharing: "... quelqu'un commence à partager avec vous ?"
       stream_preferences: "Préférences du Flux"
       your_email: "Votre adresse électronique"
       your_handle: "Votre identifiant diaspora"
     getting_started:
       awesome_take_me_to_diaspora: "Impressionnant ! Offrez-moi Diaspora*"
       community_welcome: "La communauté Diaspora* est heureuse de vous avoir à bord !"
-      hashtag_explanation: "Les tags vous permettre de parler et de suivre vos intérêts. Ils sont aussi un excellent moyen de trouver de nouvelles personnes sur Diaspora."
+      hashtag_explanation: "Les tags vous permettent de parler de vos intérêts et de les suivre. Ils sont aussi un excellent moyen de rencontrer de nouvelles personnes sur Diaspora."
       hashtag_suggestions: "Essayez de suivre des tags comme #art, #films, #french, etc."
       hooking_up_fb: "connectant votre compte Facebook"
       saved: "Sauvé !"
@@ -924,7 +924,7 @@ fr:
       password_not_changed: "Échec de la mise à jour du mot de passe"
       settings_not_updated: "La mise à jour des paramètre a échouée"
       settings_updated: "Mise à jour des paramètres"
-      unconfirmed_email_changed: "Adresse électronique changée. Nécessite l'activation."
+      unconfirmed_email_changed: "Adresse électronique changée. Activation nécessaire."
       unconfirmed_email_not_changed: "Le changement d'adresse électronique a échoué"
   webfinger:
     fetch_failed: "impossible de télécharger le profil webfinger pour %{profile_url}"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index eee6c6eba..7a9164dfe 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -40,7 +40,7 @@ pt-BR:
               invalid: "é inválido. Só permitimos letras, números e sublinhados."
               taken: "já foi feito."
   ago: "%{time} atrás"
-  all_aspects: "Todos Aspectos"
+  all_aspects: "Todos os Grupos"
   application:
     helper:
       diaspora_alpha: "DIASPORA* ALPHA"
@@ -55,41 +55,41 @@ pt-BR:
       success: "Pessoa removida do aspecto"
   aspects:
     add_to_aspect:
-      failure: "Falha em adicionar contato para o aspecto."
-      success: "Contato adicionado com sucesso no aspecto."
+      failure: "Não foi possível adicionar o contato ao grupo."
+      success: "Contato adicionado ao grupo com sucesso."
     aspect_contacts:
       done_editing: "Edição concluída"
     aspect_listings:
-      add_an_aspect: "+ Adicione um aspecto"
+      add_an_aspect: "+ Adicione um grupo"
       deselect_all: "Desmarcar tudo"
       edit_aspect: "Editar %{name}"
       select_all: "Selecionar tudo"
     aspect_stream:
-      stay_updated: "Fique Atualizado "
-      stay_updated_explanation: "Seu fluxo é preenchido com todos os seus contatos, tags que você segue, e as mensagens de alguns membros criativos da comunidade."
-    contacts_not_visible: "Contatos neste aspecto não podem visualizar uns aos outros."
-    contacts_visible: "Contatos neste aspecto não visualizarão uns aos outros."
+      stay_updated: "Fique Atualizado"
+      stay_updated_explanation: "Seu fluxo é preenchido com todos os seus contatos, tags que você segue e as mensagens de alguns membros criativos da comunidade."
+    contacts_not_visible: "Contatos neste grupo não podem ver uns aos outros."
+    contacts_visible: "Contatos nesse grupo não verão uns aos outros."
     create:
-      failure: "Falha em criar aspecto."
-      success: "Seu novo aspecto %{name} foi criado"
+      failure: "Não foi possível criar o grupo."
+      success: "O grupo %{name} foi criado"
     destroy:
       failure: "%{name} não está vazio e por isso não pode ser removido."
       success: "%{name} foi removido com sucesso."
     edit:
       add_existing: "Adicione um contato existente"
-      aspect_list_is_not_visible: "a lista está oculta aos outros no aspecto"
-      aspect_list_is_visible: "a lista está visível aos outros no aspecto"
-      confirm_remove_aspect: "Tem certeza em deletar este aspecto?"
-      done: "Feito"
-      make_aspect_list_visible: "Marca lista de aspecto visível?"
-      remove_aspect: "Deletar este aspecto"
+      aspect_list_is_not_visible: "a lista de usuários não é visível para os integrantes do grupo"
+      aspect_list_is_visible: "a lista está visível aos outros no grupo"
+      confirm_remove_aspect: "Tem certeza que deseja deletar este grupo?"
+      done: Pronto!
+      make_aspect_list_visible: "Tornar contatos nesse grupo visiveis entre si?"
+      remove_aspect: "Deletar este grupo"
       rename: "Renomear"
-      update: "Atualizar"
-      updating: "Atualizando"
-    few: "%{count} aspectos"
+      update: "atualizar"
+      updating: "atualizando"
+    few: "%{count} grupos"
     helper:
-      are_you_sure: "Tem certeza em deletar este aspecto?"
-      aspect_not_empty: "Aspecto não está vazio"
+      are_you_sure: "Tem certeza em deletar este grupo?"
+      aspect_not_empty: "Grupo não está vazio"
       remove: "remover"
     index:
       cubbies:
@@ -97,74 +97,74 @@ pt-BR:
         heading: "Conecte-se em Cubbi.es"
         learn_more: "Saiba mais"
       diaspora_id:
-        content_1: "Sua Diaspora ID é:"
-        content_2: "Dê para alguém para que possa encontrá-lo(a) em Diaspora."
+        content_1: "Seu Diaspora ID é:"
+        content_2: "Isso fará com que eles possam te achar no Diaspora."
         heading: "Diaspora ID"
       donate: "Faça uma Doação"
-      handle_explanation: "Essa é sua Diaspora ID. Como um endereço de e-mail, pode ser usado por outras pessoas para contactar você."
+      handle_explanation: "Esse é seu Diaspora ID. Como um endereço de e-mail, pode ser usado por outras pessoas para entrar em contato com você."
       help:
         do_you: "Você:"
         email_feedback: "%{link} seu feedback, se você preferir"
         feature_suggestion: "... tem uma sugestão de %{link}?"
         find_a_bug: "... encontrar um %{link}?"
         have_a_question: "... Tem um %{link}?"
-        here_to_help: "Diaspora community is here to help!"
+        here_to_help: "A comunidade do Diaspora está aqui!"
         need_help: "Quer Ajuda?"
         satisfaction: "%{link}: Comunidade de suporte"
         tag_bug: "#bug"
         tag_feature: "#feature"
         tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Tutoriais produzidos pela comunidade, dicas, e notícias"
-      introduce_yourself: "Este é seu fluxo. Escreva algo e se apresente."
-      keep_us_running: "Mantenha %{pod} rodando mais rápido, comprando nossos servidores e garantindo o nosso café mensal!"
+      introduce_yourself: "Este é seu fluxo. Se apresente!"
+      keep_us_running: "Mantenha %{pod} rodando bem e compre o nosso café com uma doação mensal!"
       new_here:
         follow: "Siga %{link} e dê boas vindas aos novos usuários de Diaspora*!"
         learn_more: "Saiba mais"
-        title: "Bem vindo Novos Usuários"
-      no_contacts: "Sem contatos"
+        title: "Dê as boas vindas aos novos usuários"
+      no_contacts: "Nenhum contato"
       no_tags: "+ Procurar tag para seguir"
       people_sharing_with_you: "Pessoas compartilhando com você"
       post_a_message: "postar uma mensagem >>"
       services:
-        content: "Você pode conectar e seguir estes serviços em Diaspora:"
+        content: "Você pode conectar e seguir estes serviços no Diaspora:"
         heading: "Conectar Serviços"
       unfollow_tag: "Parar de seguir #%{tag}"
-      welcome_to_diaspora: "Bem vindo à Diaspora, %{name}!"
-      your_aspects: "Seus Aspectos"
-    many: "%{count} aspectos"
+      welcome_to_diaspora: "Bem vindo ao Diaspora, %{name}!"
+      your_aspects: "Seus Grupos"
+    many: "%{count} grupos"
     move_contact:
-      error: "Falha em mover contato: %{inspect}"
+      error: "Não foi possível mover o contato: %{inspect}"
       failure: "Falhou %{inspect}"
-      success: "Pessoa movida para o novo aspecto"
+      success: "Pessoa movida para o novo grupo"
     new:
       create: "Criar"
-      name: "Nome"
+      name: "Nome (só é visível para você)"
     no_contacts_message:
-      community_spotlight: "comunidade em foco"
+      community_spotlight: "destaque da comunidade"
       or_spotlight: "Ou você pode compartilhar com %{link}"
-      try_adding_some_more_contacts: "Você pode utilizar a pesquisa (no topo) ou convidar mais pessoas (à direita)."
+      try_adding_some_more_contacts: "Você pode buscar ou convidar mais pessoas."
       you_should_add_some_more_contacts: "Adicione mais alguns contatos!"
     no_posts_message:
       start_talking: "Ninguém disse nada ainda!"
-    one: "1 aspecto"
-    other: "%{count} aspectos"
+    one: "1 grupo"
+    other: "%{count} grupos"
     seed:
-      acquaintances: "Conhecidos da Net"
+      acquaintances: "Conhecidos"
       family: "Família"
       friends: "Amigos"
       work: "Trabalho"
     selected_contacts:
-      manage_your_aspects: "Gerencie teus aspectos."
+      manage_your_aspects: "Gerencie seus grupos."
       no_contacts: "Você não tem nenhum contato aqui ainda."
-      view_all_community_spotlight: "Ver todos os focos das comunidades"
+      view_all_community_spotlight: "Ver todos os destaques da comunidade"
       view_all_contacts: "Ver todos os contatos"
     show:
-      edit_aspect: "Editar aspecto"
-    two: "%{count} aspectos"
+      edit_aspect: "editar grupo"
+    two: "%{count} grupos"
     update:
-      failure: "Seu aspecto %{name}, tem um nome muito longo para ser salvo."
-      success: "Seu aspecto %{name}, foi editado com sucesso."
-    zero: "Nenhum Aspecto"
+      failure: "O grupo %{name} tem um nome muito longo para ser salvo."
+      success: "O grupo %{name} foi editado com sucesso."
+    zero: "nenhum grupo"
   authorizations:
     index:
       no_applications: "Você ainda não registrou nenhum aplicativo."
@@ -200,12 +200,12 @@ pt-BR:
     few: "%{count} contatos"
     index:
       add_a_new_aspect: "Adicione um novo aspecto"
-      add_to_aspect: "Add contacts to %{name}"
+      add_to_aspect: "Adicionar contatos para %{name}"
       all_contacts: "Todos Contatos"
       check_out: "Confira"
       many_people_are_you_sure: "Tem certeza de que deseja iniciar uma conversa privada com mais de %{suggested_limit} contatos? Uma postagem para o aspecto que eles estão pode ser uma melhor maneira de contactá-los."
       my_contacts: "Meus Contatos"
-      no_contacts: "Sem contatos."
+      no_contacts: "Parece que você precisa adicionar mais contatos!"
       only_sharing_with_me: "Só compartilhando comigo"
       remove_person_from_aspect: "Remover %{person_name} de \"%{aspect_name}\""
       start_a_conversation: "Iniciar um conversa"
@@ -219,7 +219,7 @@ pt-BR:
     spotlight:
       community_spotlight: "Comunidade Spotlight"
     two: "%{count} contatos"
-    zero: "nenhum contatos"
+    zero: "contatos"
   conversations:
     create:
       fail: "Mensagem inválida"
@@ -255,7 +255,7 @@ pt-BR:
       replying: Respondendo...
   date:
     formats:
-      birthday: "%B %d"
+      birthday: "%d %B"
       birthday_with_year: "%B %d %Y"
       fullmonth_day: "%B %d"
   delete: "Deletar"
@@ -311,9 +311,9 @@ pt-BR:
     application:
       powered_by: "PRODUZIDO POR DIASPORA*"
       public_feed: "Feed público de Diaspora para %{name}"
-      toggle: "Mudar para site móvel"
+      toggle: "Versão para celular"
       whats_new: "O que há de novo?"
-      your_aspects: "Seus aspectos"
+      your_aspects: "Seus grupos"
     header:
       admin: "Administrador"
       blog: "Blog"
@@ -377,7 +377,7 @@ pt-BR:
       new_notifications:
         few: "%{count} novas notificações"
         many: "%{count} novas notificações"
-        one: "1 notificação nova"
+        one: "1 nova notificação"
         other: "%{count} novas notificações"
         two: "%{count} novas notificações"
         zero: "Nenhuma notificação nova"
@@ -393,12 +393,12 @@ pt-BR:
       mark_all_as_read: "Marcar Todos como Lido"
       notifications: "Notificações"
     liked:
-      few: "%{actors}, curtiu sua postagem %{post_link}."
-      many: "%{actors}, curtiu sua postagem %{post_link}."
-      one: "%{actors}, curtiu sua postagem %{post_link}."
-      other: "%{actors}, curtiu sua postagem %{post_link}."
-      two: "%{actors} has just liked your %{post_link}."
-      zero: "%{actors}, curtiu sua postagem %{post_link}."
+      few: "%{actors} curtiu sua postagem %{post_link}."
+      many: "%{actors} curtiu sua postagem %{post_link}."
+      one: "%{actors} curtiu sua postagem %{post_link}."
+      other: "%{actors} curtiram sua postagem %{post_link}."
+      two: "%{actors} acabou de curtir o seu %{post_link}."
+      zero: "%{actors} curtiram sua postagem %{post_link}."
     liked_post_deleted:
       few: "%{actors}, curtiu sua postagem deletada."
       many: "%{actors}, curtiu sua postagem deletada."
@@ -410,9 +410,9 @@ pt-BR:
       few: "%{actors} mencionou você em %{post_link}."
       many: "%{actors} mencionou você em %{post_link}."
       one: "%{actors} mencionou você em %{post_link}."
-      other: "%{actors} mencionou você em %{post_link}."
-      two: "%{actors} has mentioned you in a %{post_link}."
-      zero: "%{actors} mencionou você em %{post_link}."
+      other: "%{actors} mencionaram você em %{post_link}."
+      two: "%{actors} mencionou você em um %{post_link}."
+      zero: "%{actors} mencionaram você em %{post_link}."
     mentioned_deleted:
       few: "%{actors} mencionou você numa postagem deletada."
       many: "%{actors} mencionou você numa postagem deletada."
@@ -429,12 +429,12 @@ pt-BR:
       two: "%{actors} lhe enviaram umas mensagens."
       zero: "%{actors}, te enviou uma mensagem."
     reshared:
-      few: "%{actors}, compartilhou o seu %{post_link}."
-      many: "%{actors}, compartilhou o seu %{post_link}."
+      few: "%{actors} compartilhou o seu %{post_link}."
+      many: "%{actors} compartilhou o seu %{post_link}."
       one: "%{actors}, compartilhou o seu %{post_link}."
-      other: "%{actors}, compartilhou o seu %{post_link}."
-      two: "%{actors} has reshared your %{post_link}."
-      zero: "%{actors}, compartilhou o seu %{post_link}."
+      other: "%{actors} compartilhou o seu %{post_link}."
+      two: "%{actors} compartilhou seu %{post_link}."
+      zero: "%{actors} compartilhou o seu %{post_link}."
     reshared_post_deleted:
       few: "%{actors}, compartilhou sua postagem deletada."
       many: "%{actors}, compartilhou sua postagem deletada."
@@ -460,7 +460,7 @@ pt-BR:
     email_sent_by_diaspora: "Este email foi enviado por Diaspora. Se você quer parar de receber emails como este,"
     hello: "Olá %{name}!"
     liked:
-      liked: "%{name}, curtiu sua postagem."
+      liked: "%{name} curtiu sua postagem."
       view_post: "Ver postagem >"
     mentioned:
       mentioned: "mencionou você em uma postagem:"
@@ -468,7 +468,7 @@ pt-BR:
     private_message:
       reply_to_or_view: "Responder ou visualizar esta conversa >"
     reshared:
-      reshared: "%{name}, apenas compartilhou sua postagem"
+      reshared: "%{name} compartilhou sua postagem"
       view_post: "Ver postagem >"
     single_admin:
       admin: "Seu administrador Diaspora"
@@ -511,7 +511,7 @@ pt-BR:
       born: "Aniversário"
       edit_my_profile: "Editar Meu Perfil"
       gender: "Sexo"
-      in_aspects: "em aspectos"
+      in_aspects: "em grupos"
       location: "Localização"
       remove_contact: "remover contato"
       remove_from: "Remover %{name} de %{aspect}?"
@@ -525,7 +525,7 @@ pt-BR:
       not_connected: "Você não está compartilhando com %{name}."
       recent_posts: "Postagens Recentes"
       recent_public_posts: "Postagens Públicas Recentes"
-      return_to_aspects: "Retorne para sua página de aspectos"
+      return_to_aspects: "Voltar para os grupos"
       see_all: "Ver todas"
       start_sharing: "Comece a compartilhar"
       to_accept_or_ignore: "Aceitar ou ignorar."
@@ -582,7 +582,7 @@ pt-BR:
   profiles:
     edit:
       allow_search: "Permitir que me encontrem em Diaspora*"
-      edit_profile: "Editar Perfil"
+      edit_profile: "Editar perfil"
       first_name: "Primeiro Nome"
       last_name: "Sobrenome"
       update_profile: "Atualizar perfil"
@@ -594,7 +594,7 @@ pt-BR:
       your_photo: "Sua foto"
       your_private_profile: "Seu perfil privado"
       your_public_profile: "Seu perfil público"
-      your_tags: "Suas: 5 #tags preferidas"
+      your_tags: "Suas #tags preferidas"
       your_tags_placeholder: "Ex: #diaspora #cinema #musica #cafe"
     update:
       failed: "Erro em atualizar perfil."
@@ -619,13 +619,13 @@ pt-BR:
       unhappy: Infeliz?
       update: "Atualizar"
     new:
-      create_my_account: "Criar minha conta"
+      create_my_account: "Criar minha conta!"
       enter_email: "Digite teu email"
       enter_password: "Digite tua senha"
       enter_password_again: "Digite novamente a tua senha"
       enter_username: "Escolha um nome de usuário (use somente letras, números e sublinhados)"
       join_the_movement: "Junte-se ao movimento!"
-      sign_up_message: "Social Networking with a <3"
+      sign_up_message: "Rede social com um <3"
   requests:
     create:
       sending: "Enviando"
@@ -708,19 +708,19 @@ pt-BR:
       know_email: "Você sabe seus e-mails? Convide-os!"
       your_diaspora_username_is: "Seu nome de usuário em Diaspora é: %{diaspora_handle}"
     aspect_dropdown:
-      add_to_aspect: "Adicionar ao aspecto"
+      add_to_aspect: "Adicionar contato"
       toggle:
         few: "Em %{count} aspectos"
         many: "Em %{count} aspectos"
         one: "Em %{count} aspecto"
         other: "Em %{count} aspectos"
         two: "Em %{count} aspectos"
-        zero: "Adicionar para aspecto"
+        zero: "Adicionar contato"
     contact_list:
       all_contacts: "Todos os contatos"
     footer:
       logged_in_as: "logado como %{name}"
-      your_aspects: "seus aspectos"
+      your_aspects: "seus grupos"
     invitations:
       by_email: "Por email"
       dont_have_now: "Você não possui nenhum, novos convites chegarão em breve!"
@@ -764,7 +764,7 @@ pt-BR:
       connect_to_comment: "Conecte-se ao usuário para comentar esta postagem"
       currently_unavailable: "comentários indisponíveis no momento"
       dislike: "Descurtir"
-      hide_and_mute: "Ocultar e Silenciar"
+      hide_and_mute: "Ocultar"
       ignore_user: "Ignorar %{name}"
       ignore_user_description: "Ignorar e remover usuário de todos os aspectos?"
       like: "Curtir"
@@ -799,8 +799,8 @@ pt-BR:
       zero: "Nenhum comentário"
   streams:
     aspects:
-      title: "Seus Aspectos"
-    aspects_stream: "Aspectos"
+      title: "Seus Grupos"
+    aspects_stream: "Grupos"
     commented_on: "comentou sobre"
     community_spotlight_stream: "Foco de Comunidade"
     followed_tag:
@@ -812,7 +812,7 @@ pt-BR:
     mentioned_stream: "@Menções"
     mentions:
       contacts_title: "Pessoas que você mencionou"
-      title: "Your Mentions"
+      title: "Suas menções"
     multi:
       contacts_title: "Pessoas em seus Fluxos"
       title: "Fluxos"
@@ -822,16 +822,16 @@ pt-BR:
       title: "Atividade Pública"
     recently: "recentemente:"
     tags:
-      contacts_title: "People who dig these tags"
+      contacts_title: "Pessoas que seguem essa tag"
       tag_prefill_text: "As coisas sobre %{tag_name} é... "
       title: "Postagens com a tag: %{tags}"
   tag_followings:
     create:
-      failure: "Falha em seguir: #%{name}"
-      success: "Sucesso em seguir: #%{name}"
+      failure: "Não foi possível seguir #%{name}. Tem certeza que ainda não o segue?"
+      success: "Sucesso! Você está seguindo #%{name}."
     destroy:
-      failure: "Falha em parar de seguir: #%{name}"
-      success: "Você parou de seguir: #%{name}"
+      failure: "Não foi possível parar de seguir #%{name}. Quem sabe você já tenha feito isso?"
+      success: "Você parou de seguir #%{name}."
   tags:
     show:
       follow: "Seguir #%{tag}"
@@ -881,7 +881,7 @@ pt-BR:
       getting_started: "Preferência de Novo Usuário"
       liked: "...alguém curtir a sua postagem?"
       mentioned: "...for mencionado(a) em uma postagem?"
-      new_password: "Nova Senha"
+      new_password: "Nova senha"
       photo_export_unavailable: "Exportação de fotos indisponível no momento."
       private_message: "...você receber uma mensagem privada?"
       receive_email_notifications: "Receber notificações por email quando..."
@@ -902,7 +902,7 @@ pt-BR:
       we_can_speed_things_up: "Podemos acelerar as coisas um pouco por "
       well_hello_there: "Bem, olá!"
       what_are_you_in_to: "Onde você está?"
-      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      what_facebook_does: "ao Diaspora. Isso vai importar seu nome, sua foto e permitir que você poste nesse serviço."
       who_are_you: "Quem é você?"
     logged_out:
       go_mobile: "Agora vá de móvel."
diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml
index f1007606e..cbb6f9e3c 100644
--- a/config/locales/javascript/javascript.el.yml
+++ b/config/locales/javascript/javascript.el.yml
@@ -6,22 +6,22 @@
 el:
   javascripts:
     aspect_dropdown:
-      add_to_aspect: "Προσθήκη σε πτυχή"
+      add_to_aspect: "Προσθήκη επαφής"
       all_aspects: "Όλες οι πτυχές"
       error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Επιλογή πτυχών"
-      started_sharing_with: "You have started sharing with {{name}}!"
-      stopped_sharing_with: "You have stopped sharing with {{name}}."
+      started_sharing_with: "Ξεκινήσατε να διαμοιράζεστε με τον χρήστη {{name}}!"
+      stopped_sharing_with: "Σταματήσατε να διαμοιράζεστε με τον χρήστη {{name}}."
       toggle:
         few: "Σε {{count}} πτυχές"
         many: "Σε {{count}} πτυχές"
         one: "Σε {{count}} πτυχές"
         other: "Σε {{count}} πτυχές"
         two: "Σε {{count}} πτυχές"
-        zero: "Προσθήκη επαφής"
+        zero: "Επιλέξτε πτυχές"
     aspect_navigation:
       deselect_all: "Εξαίρεση όλων"
-      no_aspects: "Καμία Πτυχή δεν έχει επιλεγεί "
+      no_aspects: "Καμία πτυχή δεν έχει επιλεγεί "
       select_all: "Επιλογή όλων"
     comments:
       hide: "απόκρυψη σχολίων"
@@ -30,24 +30,24 @@ el:
     failed_to_like: Αποτυχία!
     failed_to_post_message: "Αποτυχία δημοσίευσης μηνύματος!"
     getting_started:
-      alright_ill_wait: "Alright, I'll wait."
-      hey: "Hey, {{name}}!"
-      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
-      preparing_your_stream: "Preparing your personialized stream..."
+      alright_ill_wait: "Εντάξει, θα περιμένω."
+      hey: "Γεια σου, {{name}}!"
+      no_tags: "Γεια, δεν ακολουθείς ακόμα καμία ετικέτα! Συνεχίζουμε παρ' όλ' αυτά;"
+      preparing_your_stream: "Ετοιμάζεται η προσωπική σας ροή..."
     infinite_scroll:
       no_more: "Δεν υπάρχουν άλλες δημοσιεύσεις."
     photo_uploader:
-      looking_good: "OMG, you look awesome!"
+      looking_good: "Ναι! Σκίζεις!"
     publisher:
       at_least_one_aspect: "Πρέπει να κάνετε δημοσίευση σε τουλάχιστον μια πτυχή"
       limited: "Περιορισμένο - οι δημοσιεύσεις σας θα είναι ορατές μόνο από τα άτομα με τα οποία διαμοιράζεστε. "
       public: "Δημόσιο - οι δημοσιεύσεις σας θα είναι ορατές στον καθένα και θα μπορούν να βρεθούν από τις μηχανές αναζήτησης."
     reshares:
-      duplicate: "Έχετε ήδη κοινοποιήσει αυτή τη δημοσίευση!"
+      duplicate: "Αυτό είναι τόσο καλό ε; Έχετε ήδη κοινοποιήσει αυτή τη δημοσίευση!"
     search_for: "Αναζήτηση για {{name}}"
     show_more: "Προβολή περισσότερων"
     tags:
-      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
+      wasnt_that_interesting: "OK, φαντάζομαι πως το #{{tagName}} δεν ήταν και τόσο ενδιαφέρον τελικά..."
     timeago:
       day: "μία μέρα"
       days: "%d μέρες"
@@ -57,8 +57,8 @@ el:
       minutes: "%d λεπτά"
       month: "περίπου ένα μήνα"
       months: "%d μήνες"
-      prefixAgo: "javascripts:timeago:prefixAgo"
-      prefixFromNow: "javascripts:timeago:prefixFromNow"
+      prefixAgo: ""
+      prefixFromNow: ""
       seconds: "λιγότερο από ένα λεπτό"
       suffixAgo: "πριν"
       suffixFromNow: "από τώρα"
diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml
index 3b9df1b90..15d5e736a 100644
--- a/config/locales/javascript/javascript.fr.yml
+++ b/config/locales/javascript/javascript.fr.yml
@@ -32,7 +32,7 @@ fr:
     getting_started:
       alright_ill_wait: "Bon, je vais attendre."
       hey: "Hey, {{name}} !"
-      no_tags: "Hey, Vous ne suivez aucun tag !  Continuer quand même ?"
+      no_tags: "Hey, vous ne suivez aucun tag ! Continuer quand même ?"
       preparing_your_stream: "Préparation de votre flux personnalisé..."
     infinite_scroll:
       no_more: "Pas d'autres messages."
@@ -43,7 +43,7 @@ fr:
       limited: "Limité - votre message ne sera vu que par des gens avec qui vous partagez"
       public: "Public - votre message sera visible de tous et trouvé par les moteurs de recherche"
     reshares:
-      duplicate: "C'est bon, hein ? Vous avez déjà repartagé ce message !"
+      duplicate: "C'est si bien que ça ? Vous avez déjà repartagé ce message !"
     search_for: "Chercher {{name}}"
     show_more: "Voir plus"
     tags: