diff --git a/config/locales/devise/devise.bg.yml b/config/locales/devise/devise.bg.yml
index 3fb89820b..85ba3b134 100644
--- a/config/locales/devise/devise.bg.yml
+++ b/config/locales/devise/devise.bg.yml
@@ -34,9 +34,9 @@ bg:
         no_account_till: "Акаунтът няма да бъде създаден докато не посетите горната връзката и се регистрирате."
         subject: "Поканени сте да се присъедините към Diaspora!"
       inviter: 
-        accept_at: "at %{url}, you can accept it through the link below."
+        accept_at: "от %{url}, можете да приемете чрез връзката по-долу в писмото."
         has_invited_you: "%{name}"
-        have_invited_you: "%{names} have invited you to join Diaspora"
+        have_invited_you: "%{names} ви кани да се присъедините към Diaspora"
       reset_password_instructions: 
         change: "Промяна на паролата"
         ignore: "Ако не сте заявили промяната, моля игнорирайте писмото."
diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml
index 2251687ee..337cc0d70 100644
--- a/config/locales/devise/devise.es.yml
+++ b/config/locales/devise/devise.es.yml
@@ -34,9 +34,9 @@ es:
         no_account_till: "Tu cuenta no será creada hasta que no accedas al enlace de arriba para registrarte."
         subject: "¡Has sido invitado a unirte a Diaspora*!"
       inviter: 
-        accept_at: "at %{url}, you can accept it through the link below."
+        accept_at: "en %{url}, puedes aceptar en el siguiente enlace."
         has_invited_you: "%{name}"
-        have_invited_you: "%{names} have invited you to join Diaspora"
+        have_invited_you: "%{names} te ha invitado a unirte a Diaspora*"
       reset_password_instructions: 
         change: "Cambiar mi contraseña"
         ignore: "Si no has solicitado esto, por favor ignora este mensaje."
diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index d83d253e0..f74906610 100644
--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -34,9 +34,9 @@ fr:
         no_account_till: "Votre compte ne sera pas que lorsque vous irez sur le lien ci-dessus et que vous vous inscrirez."
         subject: "Vous avez été invité à rejoindre Diaspora!"
       inviter: 
-        accept_at: "at %{url}, you can accept it through the link below."
+        accept_at: "à %{url}, vous pouvez l'accepter à travers le lien ci-dessous."
         has_invited_you: "%{name}"
-        have_invited_you: "%{names} have invited you to join Diaspora"
+        have_invited_you: "%{names} vous a invité à rejoindre Diaspora"
       reset_password_instructions: 
         change: "Changer mon mot de passe"
         ignore: "Si vous n'avez pas demandé cela, merci d'ignorer cet e-mail."
diff --git a/config/locales/devise/devise.pt-PT.yml b/config/locales/devise/devise.pt-PT.yml
index 1a4e21300..c3f70fffd 100644
--- a/config/locales/devise/devise.pt-PT.yml
+++ b/config/locales/devise/devise.pt-PT.yml
@@ -34,9 +34,9 @@ pt-PT:
         no_account_till: "A sua conta não será criada até que aceda à hiperligação acima e se registe."
         subject: "Foi convidado para se juntar ao Diaspora!"
       inviter: 
-        accept_at: "at %{url}, you can accept it through the link below."
+        accept_at: "em %{url}, pode aceitá-lo através da ligação abaixo."
         has_invited_you: "%{name}"
-        have_invited_you: "%{names} have invited you to join Diaspora"
+        have_invited_you: "%{names} convidaram-no para se juntar ao Diaspora"
       reset_password_instructions: 
         change: "Alterar a minha palavra-passe"
         ignore: "Se não fez este pedido, por favor ignore este email."
diff --git a/config/locales/devise/devise.zh-TW.yml b/config/locales/devise/devise.zh-TW.yml
index 50004ef2f..966c79a11 100644
--- a/config/locales/devise/devise.zh-TW.yml
+++ b/config/locales/devise/devise.zh-TW.yml
@@ -34,9 +34,9 @@ zh-TW:
         no_account_till: "在你按了以上連結並註冊後,你的帳號才會成功開戶."
         subject: "有人邀請你加入 Diaspora!"
       inviter: 
-        accept_at: "at %{url}, you can accept it through the link below."
+        accept_at: "於 %{url}, 你可以透過以下連結來接受."
         has_invited_you: "%{name}"
-        have_invited_you: "%{names} have invited you to join Diaspora"
+        have_invited_you: "%{names} 邀請你加入 Diaspora"
       reset_password_instructions: 
         change: "更改密碼"
         ignore: "如果你沒請求過, 請忽略這封信件."
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index 3d408f043..52131b03f 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -190,7 +190,7 @@ bg:
     zero: "няма контакти"
   conversations: 
     create: 
-      fail: "Invalid message"
+      fail: "Невалидно съобщение"
       sent: "Съобщението е изпратено"
     destroy: 
       success: "Разговорът е премахнат успешно"
@@ -215,7 +215,7 @@ bg:
       subject: "тема"
       to: "до"
     new_message: 
-      fail: "Invalid message"
+      fail: "Невалидно съобщение"
     show: 
       delete: "изтриване и блокиране на разговора"
       reply: "отговор"
@@ -464,7 +464,7 @@ bg:
       to_accept_or_ignore: "to accept or ignore it."
     sub_header: 
       add_some: "add some"
-      edit: "edit"
+      edit: "редактиране"
       you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "За съжаление %{handle} не може да бъде намерен."
@@ -625,13 +625,13 @@ bg:
       know_email: "Знаете адресите на ел. им поща? Трябва да ги поканите"
       your_diaspora_username_is: "Вашето потребителско име в Diaspora е %{diaspora_handle}"
     aspect_dropdown: 
-      add_to_aspect: "Add to aspect"
+      add_to_aspect: "Добавяне в аспект"
       toggle: 
-        few: "In %{count} aspects"
-        many: "In %{count} aspects"
-        one: "In %{count} aspect"
-        other: "In %{count} aspects"
-        zero: "Add to aspect"
+        few: "В %{count} аспекта"
+        many: "В %{count} аспекта"
+        one: "В %{count} аспект"
+        other: "В %{count} аспекта"
+        zero: "Добавяне в аспект"
     contact_list: 
       all_contacts: "Всички контакти"
     footer: 
@@ -751,11 +751,11 @@ bg:
       your_email: "Вашата ел. поща"
       your_handle: "Вашият адрес в Diaspora"
     getting_started: 
-      bold: "aspects"
+      bold: "аспекти"
       connect_to: "Свържете профила си с"
       connect_to_your_other_social_networks: "Свържете профила си с други социални мрежи"
       connect_with_people: "Свържете се с интересни хора"
-      connect_with_people_explanation_pt1: "Свържете се с хора поставяйки ги в един или няколко от вашите"
+      connect_with_people_explanation_pt1: "Свържете се с хора поставяйки ги в един или няколко от вашите %{bold}"
       connect_with_people_explanation_pt2: "Групирането на контактите в аспекти ще ви позволи да споделяте/филрирате информация само с/от определена подгрупа от контактите ви."
       featured_tags: "Отличени тагове"
       featured_users: "Отличени потребители"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 402c410fd..16a997530 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -190,7 +190,7 @@ es:
     zero: "no hay contactos"
   conversations: 
     create: 
-      fail: "Invalid message"
+      fail: "Mensaje no válido"
       sent: "Mensaje enviado"
     destroy: 
       success: "Conversación eliminada con éxito"
@@ -215,11 +215,11 @@ es:
       subject: "asunto"
       to: "para"
     new_message: 
-      fail: "Invalid message"
+      fail: "Mensaje no válido"
     show: 
       delete: "Eliminar y bloquear conversación"
       reply: "responder"
-      replying: "Replying..."
+      replying: "Respondiendo..."
   date: 
     formats: 
       birthday: "%d %B "
@@ -463,9 +463,9 @@ es:
       start_sharing: "empezar a compartir"
       to_accept_or_ignore: "aceptar o ignorar"
     sub_header: 
-      add_some: "add some"
-      edit: "edit"
-      you_have_no_tags: "you have no tags!"
+      add_some: "añadir algunos"
+      edit: "editar"
+      you_have_no_tags: "¡no tiene etiquetas!"
     webfinger: 
       fail: "Perdona, no pudimos encontrar %{handle}"
     zero: "ninguna persona"
@@ -625,13 +625,13 @@ es:
       know_email: "¿Conoces sus direcciones de correo? ¡Puedes invitarles!"
       your_diaspora_username_is: "Su nombre de usuario Diaspora* es: %{diaspora_handle}"
     aspect_dropdown: 
-      add_to_aspect: "Add to aspect"
+      add_to_aspect: "Añadir al aspecto"
       toggle: 
-        few: "In %{count} aspects"
-        many: "In %{count} aspects"
-        one: "In %{count} aspect"
-        other: "In %{count} aspects"
-        zero: "Add to aspect"
+        few: "En %{count} aspectos"
+        many: "En %{count} aspectos"
+        one: "En %{count} aspecto"
+        other: "En %{count} aspectos"
+        zero: "Añadir al aspecto"
     contact_list: 
       all_contacts: "Todos los contactos"
     footer: 
@@ -751,11 +751,11 @@ es:
       your_email: "Tu email"
       your_handle: "Tu dirección Diaspora*"
     getting_started: 
-      bold: "aspects"
+      bold: "aspectos"
       connect_to: "Conectar a"
       connect_to_your_other_social_networks: "Conéctate a tus otras redes sociales"
       connect_with_people: "Conectate con gente interesante"
-      connect_with_people_explanation_pt1: "Comparte con gente añadiéndola en uno o más de tus"
+      connect_with_people_explanation_pt1: "Comparte con gente añadiéndola en uno o más de tus %{bold}"
       connect_with_people_explanation_pt2: "Los Aspectos son una manera intuitiva de agrupar contactos nuevos o caras familiares, de forma privada, permitiéndote el filtrado o compartir cosas con subgrupos de entre tus contactos muy fácilmente."
       featured_tags: "Etiquetas ofrecidas"
       featured_users: "Usuarios ofrecidos"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index e1d368e51..d9a4f184f 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -37,7 +37,7 @@ fr:
             person: 
               invalid: "est invalide."
             username: 
-              invalid: "is invalid. We only allow letters, numbers, and underscores"
+              invalid: "n'est pas valide. Nous n'autorisons que les lettres, chiffres et _"
               taken: "est déjà pris."
   ago: "Il y a %{time}"
   all_aspects: "Tous les aspects"
@@ -99,18 +99,18 @@ fr:
         content_1: "Votre identifiant Diaspora est :"
         content_2: "Communiquez-le à tout le monde et ils pourront vous trouver sur Diaspora."
         heading: "Identifiant Diaspora"
-      donate: "Donate"
+      donate: "Faire un don"
       handle_explanation: "Ceci est votre identifiant diaspora. Comme une adresse de courrier électronique, vous pouvez le communiquer à d'autres personnes pour leur permettre de vous joindre."
-      keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
+      keep_us_running: "Permettez à %{pod} de fonctionner rapidement, achetez une dose de café mensuelle à nos serveurs !"
       no_contacts: "Aucun contact"
-      no_tags: "No tags"
+      no_tags: "+ Trouver un tag à suivre"
       people_sharing_with_you: "Personnes partageant avec vous"
       post_a_message: "publier un message >>"
       services: 
         content: "Vous pouvez connecter les services suivants à Diaspora :"
         heading: "Services connectés"
       tags_following: "Tags Suivis"
-      unfollow_tag: "Stop following #%{tag}"
+      unfollow_tag: "Arrêter de suivre #%{tag}"
       your_aspects: "Vos aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -121,18 +121,18 @@ fr:
       create: "Créer"
       name: "Nom"
     no_contacts_message: 
-      featured_users: "featured users"
-      or_featured: "Or you can share with %{link}"
-      try_adding_some_more_contacts: "You can search (top) or invite (right) more contacts."
-      you_should_add_some_more_contacts: "You should add some more contacts!"
+      featured_users: "utilisateurs recommandés"
+      or_featured: "Ou vous pouvez partager avec %{link}"
+      try_adding_some_more_contacts: "Vous pouvez rechercher (en haut) ou inviter (à droite) plus de contacts."
+      you_should_add_some_more_contacts: "Vous devez ajouter un peu plus de contacts !"
     no_posts_message: 
       start_talking: "Personne n’a encore rien dit !"
     one: "1 aspect"
     other: "%{count} aspects"
     seed: 
-      acquaintances: "Acquaintances"
+      acquaintances: "Connaissances"
       family: "Famille"
-      friends: "Friends"
+      friends: "Amis"
       work: "Travail"
     selected_contacts: 
       manage_your_aspects: "Gérer vos aspects."
@@ -168,7 +168,7 @@ fr:
     create: 
       failure: "Impossible de créer le contact"
     featured: 
-      featured_users: "Featured Users"
+      featured_users: "Utilisateurs recommandés"
     few: "%{count} contacts"
     index: 
       add_a_new_aspect: "Ajouter un nouvel aspect"
@@ -190,7 +190,7 @@ fr:
     zero: "aucun contact"
   conversations: 
     create: 
-      fail: "Invalid message"
+      fail: "Message invalide"
       sent: "Message envoyé"
     destroy: 
       success: "La conversation a été supprimée."
@@ -215,11 +215,11 @@ fr:
       subject: "sujet"
       to: "pour"
     new_message: 
-      fail: "Invalid message"
+      fail: "Message invalide"
     show: 
       delete: "supprimer et bloquer la conversation"
       reply: "répondre"
-      replying: "Replying..."
+      replying: "En réponse..."
   date: 
     formats: 
       birthday: "%d %B"
@@ -232,7 +232,7 @@ fr:
       correct_the_following_errors_and_try_again: "Corrigez les erreurs suivantes, puis réessayez."
       invalid_fields: "Champs invalides"
   fill_me_out: "Remplissez-moi"
-  find_people: "Rechercher des personnes"
+  find_people: "Rechercher des personnes ou des #tags"
   hide: "Masquer"
   home: 
     show: 
@@ -249,7 +249,7 @@ fr:
       tagline_first_half: "Partagez ce que vous voulez,"
       tagline_second_half: "avec qui vous voudrez."
   invitations: 
-    a_facebook_user: "A Facebook user"
+    a_facebook_user: "Un utilisateur de Facebook"
     check_token: 
       not_found: "Jeton d'invitation introuvable"
     create: 
@@ -260,10 +260,10 @@ fr:
       rejected: "Les adresses de courrier électronique suivantes ont rencontré des problèmes :"
       sent: "Les invitations ont été envoyées à :"
     edit: 
-      accept_your_invitation: "Accept your invitation"
-      your_account_awaits: "Your account awaits!"
+      accept_your_invitation: "Accepter l'invitation"
+      your_account_awaits: "Votre compte vous attend !"
     new: 
-      already_invited: "Déjà invité(e)"
+      already_invited: "Les personnes suivantes n'ont pas accepté votre invitation :"
       aspect: "Aspect"
       comma_seperated_plz: "Vous pouvez entrer plusieurs adresses de courrier électronique séparées par des virgules."
       if_they_accept_info: "s'ils acceptent, ils seront ajoutés à l'aspect dans lequel vous les avez invités."
@@ -388,17 +388,17 @@ fr:
       other: "%{actors} a/ont commencé à partager avec vous."
       zero: "%{actors} a/ont commencé à partager avec vous."
   notifier: 
-    a_post_you_shared: "a post."
+    a_post_you_shared: "un post."
     click_here: "cliquez ici"
     comment_on_post: 
       reply: "Répondre ou voir le post de %{name} >"
     confirm_email: 
-      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
-      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+      click_link: "Pour activer votre nouvelle adresse email %{unconfirmed_email}, merci de cliquer sur ce lien :"
+      subject: "Merci d'activer votre nouvelle adresse email %{unconfirmed_email}"
     email_sent_by_diaspora: "Ce courriel a été envoyé par Diaspora. Si vous souhaitez cesser de recevoir des courriels de ce genre,"
     hello: "Bonjour %{name} !"
     liked: 
-      liked: "%{name} vient juste d'aimer votre message : "
+      liked: "%{name} aime juste votre message"
       view_post: "Voir le post >"
     mentioned: 
       mentioned: "vous a mentionné(e) dans un message :"
@@ -410,7 +410,7 @@ fr:
       subject: "Un message concernant votre compte Diaspora :"
     started_sharing: 
       sharing: "a commencé à partager avec vous !"
-      subject: "%{name} a commencé à partager avec vous sur Diaspora*"
+      subject: "%{name} commence à partager avec vous sur Diaspora*"
       view_profile: "Voir le profil de %{name}"
     thanks: "Merci,"
     to_change_your_notification_settings: "pour changer vos paramètres de notification"
@@ -451,7 +451,7 @@ fr:
       remove_from: "Supprimer %{name} de %{aspect} ?"
     show: 
       does_not_exist: "Cette personne n'existe pas !"
-      has_not_shared_with_you_yet: "%{name} has not shared any posts with you yet!"
+      has_not_shared_with_you_yet: "%{name} n'as pas encore partagé de post avec vous !"
       incoming_request: "%{name} désire partager avec vous"
       mention: "Mentionner"
       message: "Message"
@@ -463,14 +463,14 @@ fr:
       start_sharing: "commencer à partager"
       to_accept_or_ignore: "pour l'accepter ou l'ignorer."
     sub_header: 
-      add_some: "add some"
-      edit: "edit"
-      you_have_no_tags: "you have no tags!"
+      add_some: "ajouter quelques"
+      edit: "modifier"
+      you_have_no_tags: "vous n'avez pas de tags !"
     webfinger: 
       fail: "Impossible de trouver %{handle}."
     zero: "personne"
   photos: 
-    comment_email_subject: "%{name}'s photo"
+    comment_email_subject: "photo de %{name}"
     create: 
       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 ?"
@@ -498,7 +498,7 @@ fr:
       edit: "modifier"
       edit_delete_photo: "Modifier la description de la photo / supprimer la photo"
       make_profile_photo: "en faire la photo de profil"
-      show_original_post: "Show original post"
+      show_original_post: "Montrer le post original"
       update_photo: "Mettre à jour la photo"
     update: 
       error: "La modification de la photo a échoué."
@@ -546,13 +546,13 @@ fr:
       unhappy: "Insatisfait(e) ?"
       update: "Mettre à jour"
     new: 
-      create_my_account: "Create my account"
+      create_my_account: "Créer mon compte"
       enter_email: "Saisissez une adresse de courrier électronique"
       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)"
-      join_the_movement: "Join the movement!"
-      sign_up_today: "Sign up today"
+      join_the_movement: "Rejoignez le mouvement !"
+      sign_up_today: "Inscrivez-vous aujourd'hui"
   requests: 
     create: 
       sending: "En cours d'envoi"
@@ -574,20 +574,20 @@ fr:
     new_request_to_person: 
       sent: "envoyée !"
   reshares: 
-    comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
+    comment_email_subject: "Partage par %{resharer} d'un message de %{author}"
     create: 
       failure: "Une erreur a été rencontrée lors du repartage de ce post."
     reshare: 
       deleted: "Le post original a été supprimé par l'auteur."
       reshare: 
-        few: "%{count} Reshares"
-        many: "%{count} Reshares"
-        one: "1 Reshare"
-        other: "%{count} Reshares"
+        few: "%{count} partages"
+        many: "%{count} partages"
+        one: "1 partage"
+        other: "%{count} partages"
         zero: "Repartager"
-      reshare_confirmation: "Reshare %{author} - %{text}?"
-      reshare_original: "Reshare orignial"
-      show_original: "Show Original"
+      reshare_confirmation: "Partager le post d'%{author} ?"
+      reshare_original: "Partager l'original"
+      show_original: "Afficher l'original"
   search: "Rechercher"
   services: 
     create: 
@@ -597,8 +597,8 @@ fr:
     failure: 
       error: "une erreur s'est produite lors de la connexion avec ce service"
     finder: 
-      no_friends: "No Facebook friends found."
-      service_friends: "%{service} Friends"
+      no_friends: "Pas d'amis Facebook trouvés."
+      service_friends: "Amis %{service}"
     index: 
       connect_to_facebook: "Connecter à Facebook"
       connect_to_tumblr: "Connecter à Tumblr"
@@ -613,7 +613,7 @@ fr:
       join_me_on_diaspora: "Rejoignez-moi sur DIASPORA*"
     remote_friend: 
       invite: "inviter"
-      not_on_diaspora: "Not yet on Diaspora"
+      not_on_diaspora: "Pas encore sur Disapora"
       resend: "envoyer à nouveau"
   settings: "Options"
   shared: 
@@ -625,13 +625,13 @@ fr:
       know_email: "Vous connaissez leur adresse de courrier électronique ? Vous devriez les inviter"
       your_diaspora_username_is: "Votre nom d'utilisateur Diaspora est : %{diaspora_handle}"
     aspect_dropdown: 
-      add_to_aspect: "Add to aspect"
+      add_to_aspect: "Ajouter à l'aspect"
       toggle: 
-        few: "In %{count} aspects"
-        many: "In %{count} aspects"
-        one: "In %{count} aspect"
-        other: "In %{count} aspects"
-        zero: "Add to aspect"
+        few: "Dans %{count} aspects"
+        many: "Dans %{count} aspects"
+        one: "Dans %{count} aspect"
+        other: "Dans %{count} aspects"
+        zero: "Ajouter à l'aspect"
     contact_list: 
       all_contacts: "Tous les contacts"
     footer: 
@@ -711,7 +711,7 @@ fr:
   tokens: 
     show: 
       connect_to_cubbies: "Se connecter à Cubbi.es"
-      connecting_is_simple: "La connexion de votre compte Diaspora est assez simple puisqu'il suffit de saisir deux champs sur votre page de compte Cubbi.es."
+      connecting_is_simple: "Se connecter à votre compte Diaspora est simple ! Il suffit d'entrer votre ID Diaspora (<b>%{diaspora_id}</b>) sur votre <a href='%{href_link}'>page des paramètres</a>  cubbies et de cliquez 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."
       love_to_try: "Nous aimerions beaucoup que vous essayiez."
@@ -725,13 +725,13 @@ fr:
   username: "Nom d'utilisateur"
   users: 
     confirm_email: 
-      email_confirmed: "E-Mail %{email} activated"
-      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
+      email_confirmed: "Email %{email} activé"
+      email_not_confirmed: "L'email n'a pas pu être activé. Lien erroné ?"
     destroy: "Votre compte a été clôturé. Il faudra peut-être 20 minutes pour terminer la fermeture de votre compte. Merci d'essayer Diaspora."
     edit: 
       also_commented: "…quelqu'un d'autre commente une publication de votre contact ?"
       change: "Modifier"
-      change_email: "Change E-Mail"
+      change_email: "Changer d'email"
       change_language: "Changer la langue"
       change_password: "Changer le mot de passe"
       close_account: "Clôturer le compte"
@@ -740,7 +740,7 @@ fr:
       download_photos: "télécharger mes photos"
       download_xml: "télécharger mon XML"
       edit_account: "Modifier le compte"
-      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
+      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}."
       export_data: "Exporter des données"
       liked: "...quelqu'un aime votre message ?"
       mentioned: "…vous êtes mentionné(e) dans une publication ?"
@@ -752,30 +752,30 @@ fr:
       your_handle: "Votre identifiant diaspora"
     getting_started: 
       bold: "aspects"
-      connect_to: "Connect to"
-      connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      featured_tags: "Featured tags"
-      featured_users: "Featured users"
-      fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
-      finished: "Terminé !"
-      follow_your_interests: "Follow your interests"
+      connect_to: "Connectez-vous à"
+      connect_to_your_other_social_networks: "Connectez-vous à vos autres réseaux sociaux"
+      connect_with_people: "Connectez-vous avec des gens cool"
+      connect_with_people_explanation_pt1: "Connectez-vous avec des gens en les plaçant dans un ou plusieurs de vos %{gras}"
+      connect_with_people_explanation_pt2: "Les aspects sont un moyen intuitif de grouper les visages familiers et nouveaux, privés, vous permettant de filtrer ou partager avec des sous-ensembles de vos contacts facilement."
+      featured_tags: "Tags recommandés"
+      featured_users: "Utilisateurs recommandés"
+      fill_out_your_profile: "Remplissez votre profil"
+      find_friends: "Trouver des amis"
+      find_friends_from_facebook: "trouver des amis de Facebook"
+      finished: "Terminé"
+      follow_your_interests: "Suivez vos intérêts"
       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."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
+      profile_description: "Permettez aux gens de vous trouver plus facilement en remplissant vos informations de profil."
       profile_fields: 
         bio: "Bio"
         birthday: "Anniversaire"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
+        gender: "Sexe"
+        location: "Localisation"
+        name: "Nom"
         photo: "Photo"
         tags: "Tags"
-      see_all_featured_users: "See all featured users"
-      welcome: "Bienvenue sur Diaspora !"
+      see_all_featured_users: "Voir tous les utilisateurs recommandés"
+      welcome: "Bienvenue !"
       welcome_with_name: "Bienvenue, %{name} !"
     public: 
       does_not_exist: "L'utilisateur %{username} n'existe pas !"
@@ -785,8 +785,8 @@ fr:
       language_not_changed: "Échec lors de la mise à jour de la langue"
       password_changed: "Mot de passe mis à jour. Vous pouvez maintenant vous identifier avec votre nouveau mot de passe."
       password_not_changed: "Échec de la mise à jour du mot de passe"
-      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
-      unconfirmed_email_not_changed: "E-Mail Change Failed"
+      unconfirmed_email_changed: "Email changé. Nécessite l'activation."
+      unconfirmed_email_not_changed: "Le changement de courriel a échoué"
   webfinger: 
     fetch_failed: "impossible de télécharger le profil webfinger pour %{profile_url}"
     hcard_fetch_failed: "une erreur est survenue lors du téléchargement de la hcard de %{account}"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 84f4a9b50..d712de867 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -190,7 +190,7 @@ it:
     zero: "nessun contatto"
   conversations: 
     create: 
-      fail: "Invalid message"
+      fail: "Messaggio non valido"
       sent: "Messaggio inviato"
     destroy: 
       success: "Conversazione rimossa con successo"
@@ -215,11 +215,11 @@ it:
       subject: "oggetto"
       to: "a"
     new_message: 
-      fail: "Invalid message"
+      fail: "Messaggio non valido"
     show: 
       delete: "cancella e blocca la conversazione"
       reply: "rispondi"
-      replying: "Replying..."
+      replying: "Invio risposta..."
   date: 
     formats: 
       birthday: "%d %B"
@@ -463,9 +463,9 @@ it:
       start_sharing: "inizia a condividere"
       to_accept_or_ignore: "per accettarla o ignorarla."
     sub_header: 
-      add_some: "add some"
-      edit: "edit"
-      you_have_no_tags: "you have no tags!"
+      add_some: "aggiungi qualcuno"
+      edit: "modifica"
+      you_have_no_tags: "non hai alcun tag!"
     webfinger: 
       fail: "Spiacenti, non possiamo trovare %{handle}."
     zero: "nessuna persona"
@@ -625,13 +625,13 @@ it:
       know_email: "Conosci i loro indirizzi email? Dovresti invitarli"
       your_diaspora_username_is: "Il tuo ID è: %{diaspora_handle}"
     aspect_dropdown: 
-      add_to_aspect: "Add to aspect"
+      add_to_aspect: "Aggiungi ad un aspetto"
       toggle: 
-        few: "In %{count} aspects"
-        many: "In %{count} aspects"
-        one: "In %{count} aspect"
-        other: "In %{count} aspects"
-        zero: "Add to aspect"
+        few: "In %{count} aspetti"
+        many: "In %{count} aspetti"
+        one: "In %{count} aspetto"
+        other: "In %{count} aspetti"
+        zero: "Aggiungi ad un aspetto"
     contact_list: 
       all_contacts: "Tutti i contatti"
     footer: 
@@ -751,11 +751,11 @@ it:
       your_email: "La tua email"
       your_handle: "Il tuo ID"
     getting_started: 
-      bold: "aspects"
+      bold: "aspetti"
       connect_to: "Connettiti a"
       connect_to_your_other_social_networks: "Connetti altri social network"
       connect_with_people: "Connettiti con gente speciale"
-      connect_with_people_explanation_pt1: "Stai in contatto con le persone mettendole in uno o più dei tuoi "
+      connect_with_people_explanation_pt1: "Stai in contatto con le persone mettendole in uno o più dei tuoi %{bold}"
       connect_with_people_explanation_pt2: "Gli aspetti sono un sistema intuitivo per raggruppare vecchie e nuove conoscenze in modo riservato, così potrai filtrare o condividere i contenuti con chi vuoi e con facilità."
       featured_tags: "Tag consigliati"
       featured_users: "Utenti consigliati"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 30f315328..c60f534b4 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -37,7 +37,7 @@ pt-PT:
             person: 
               invalid: "não é válido."
             username: 
-              invalid: "is invalid. We only allow letters, numbers, and underscores"
+              invalid: "é inválido. Apenas é permitido usar letras, números, e underscores"
               taken: "já foi escolhido."
   ago: "Há %{time} atrás"
   all_aspects: "Todos os Aspectos"
@@ -110,7 +110,7 @@ pt-PT:
         content: "Pode conectar os seguintes serviços ao Diaspora:"
         heading: "Conectar Serviços"
       tags_following: "Tags Seguidas"
-      unfollow_tag: "Stop following #%{tag}"
+      unfollow_tag: "Deixar de seguir #%{tag}"
       your_aspects: "Os Seus Aspectos"
     many: "%{count} aspectos"
     move_contact: 
@@ -122,9 +122,9 @@ pt-PT:
       name: "Nome"
     no_contacts_message: 
       featured_users: "utilizadores destacados"
-      or_featured: "Or you can share with %{link}"
+      or_featured: "Ou pode partilhar com %{link}"
       try_adding_some_more_contacts: "Pode pesquisar (acima) ou convidar (à direita) mais contactos."
-      you_should_add_some_more_contacts: "You should add some more contacts!"
+      you_should_add_some_more_contacts: "Devia adicionar mais alguns contactos!"
     no_posts_message: 
       start_talking: "Ainda ninguém disse nada!"
     one: "1 aspecto"
@@ -190,7 +190,7 @@ pt-PT:
     zero: "sem contactos"
   conversations: 
     create: 
-      fail: "Invalid message"
+      fail: "Mensagens inválidas"
       sent: "A mensagem foi enviada"
     destroy: 
       success: "A conversa foi removida com sucesso"
@@ -215,11 +215,11 @@ pt-PT:
       subject: "assunto"
       to: "para"
     new_message: 
-      fail: "Invalid message"
+      fail: "Mensagem inválida"
     show: 
       delete: "apagar e bloquear a conversa"
       reply: "responder"
-      replying: "Replying..."
+      replying: "A responder..."
   date: 
     formats: 
       birthday: "%d de %B"
@@ -249,7 +249,7 @@ pt-PT:
       tagline_first_half: "Partilhe o que desejar,"
       tagline_second_half: "com quem desejar."
   invitations: 
-    a_facebook_user: "A Facebook user"
+    a_facebook_user: "Um utilizador do Facebook"
     check_token: 
       not_found: "Código de convite não encontrado"
     create: 
@@ -260,8 +260,8 @@ pt-PT:
       rejected: "Os seguintes endereços de email tiveram problemas: "
       sent: "Os convites foram enviados a:"
     edit: 
-      accept_your_invitation: "Accept your invitation"
-      your_account_awaits: "Your account awaits!"
+      accept_your_invitation: "Aceite o seu convite"
+      your_account_awaits: "A sua conta está à espera!"
     new: 
       already_invited: "As pessoas seguintes não aceitaram o seu convite:"
       aspect: "Aspecto"
@@ -388,7 +388,7 @@ pt-PT:
       other: "%{actors} começaram a partilhar consigo."
       zero: "%{actors} começou a partilhar consigo."
   notifier: 
-    a_post_you_shared: "a post."
+    a_post_you_shared: "uma publicação."
     click_here: "clique aqui"
     comment_on_post: 
       reply: "Responder ou ver a publicação de %{name} >"
@@ -463,14 +463,14 @@ pt-PT:
       start_sharing: "começar a partilhar"
       to_accept_or_ignore: "para o aceitar ou ignorar."
     sub_header: 
-      add_some: "add some"
-      edit: "edit"
-      you_have_no_tags: "you have no tags!"
+      add_some: "adicionar alguns"
+      edit: "editar"
+      you_have_no_tags: "não tem tags!"
     webfinger: 
       fail: "Lamentamos muito, não conseguimos encontrar %{handle}."
     zero: "não há pessoas"
   photos: 
-    comment_email_subject: "%{name}'s photo"
+    comment_email_subject: "foto de %{name}"
     create: 
       integrity_error: "O envio da fotografia falhou. Tem a certeza de que o ficheiro que seleccionou era uma imagem?"
       runtime_error: "O envio da fotografia falhou. Tem a certeza que o seu cinto de segurança está apertado?"
@@ -498,7 +498,7 @@ pt-PT:
       edit: "editar"
       edit_delete_photo: "Editar descrição da fotografia / apagar fotografia"
       make_profile_photo: "tornar foto de perfil"
-      show_original_post: "Show original post"
+      show_original_post: "Mostrar publicação original"
       update_photo: "Actualizar Fotografia"
     update: 
       error: "Falha ao editar a fotografia"
@@ -546,13 +546,13 @@ pt-PT:
       unhappy: "Descontente?"
       update: "Actualizar"
     new: 
-      create_my_account: "Create my account"
+      create_my_account: "Criar a minha conta"
       enter_email: "Introduza um  endereço de email"
       enter_password: "Introduza uma palavra-passe"
       enter_password_again: "Introduza de novo a mesma palavra-passe"
       enter_username: "Escolha um nome de utilizador (apenas letras, números e underscores)"
-      join_the_movement: "Join the movement!"
-      sign_up_today: "Sign up today"
+      join_the_movement: "Junte-se ao movimento!"
+      sign_up_today: "Registe-se hoje"
   requests: 
     create: 
       sending: "A enviar"
@@ -574,7 +574,7 @@ pt-PT:
     new_request_to_person: 
       sent: "enviado!"
   reshares: 
-    comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
+    comment_email_subject: "repartilha de %{resharer} da publicação de %{author}"
     create: 
       failure: "Ocorreu um erro ao repartilhar esta publicação."
     reshare: 
@@ -597,8 +597,8 @@ pt-PT:
     failure: 
       error: "ocorreu um erro ao ligar a esse serviço"
     finder: 
-      no_friends: "No Facebook friends found."
-      service_friends: "%{service} Friends"
+      no_friends: "Nenhum amigo do Facebook foi encontrado."
+      service_friends: "Amigos do %{service}"
     index: 
       connect_to_facebook: "Ligar ao Facebook"
       connect_to_tumblr: "Ligar ao Tumblr"
@@ -613,7 +613,7 @@ pt-PT:
       join_me_on_diaspora: "Junte-se a mim no DIASPORA*"
     remote_friend: 
       invite: "convite"
-      not_on_diaspora: "Not yet on Diaspora"
+      not_on_diaspora: "Ainda não no Diaspora"
       resend: "reenviar"
   settings: "Definições"
   shared: 
@@ -625,13 +625,13 @@ pt-PT:
       know_email: "Sabe os seus endereços de email? Deveria convidá-los"
       your_diaspora_username_is: "O seu nome de utilizador do Diaspora é: %{diaspora_handle}"
     aspect_dropdown: 
-      add_to_aspect: "Add to aspect"
+      add_to_aspect: "Adicionar ao aspecto"
       toggle: 
-        few: "In %{count} aspects"
-        many: "In %{count} aspects"
-        one: "In %{count} aspect"
-        other: "In %{count} aspects"
-        zero: "Add to aspect"
+        few: "Em %{count} aspectos"
+        many: "Em %{count} aspectos"
+        one: "Em %{count} aspecto"
+        other: "Em %{count} aspectos"
+        zero: "Adicionar ao aspecto"
     contact_list: 
       all_contacts: "Todos os contactos"
     footer: 
@@ -751,12 +751,12 @@ pt-PT:
       your_email: "O seu endereço de email"
       your_handle: "A sua identificação do Diaspora"
     getting_started: 
-      bold: "aspects"
+      bold: "aspectos"
       connect_to: "Conectar a"
       connect_to_your_other_social_networks: "Conecte-se às suas outras redes sociais"
       connect_with_people: "Ligue-se a pessoas interessantes"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
+      connect_with_people_explanation_pt1: "Ligue-se a pessoas ao colocá-las em um ou mais dos seus %{bold}"
+      connect_with_people_explanation_pt2: "Aspectos são uma forma intuitiva de agrupar rostos novos e familiares, de forma privada, permitindo-lhe filtrar ou partilhar com subconjuntos dos seus contactos facilmente."
       featured_tags: "Tags destacadas"
       featured_users: "Utilizadores destacados"
       fill_out_your_profile: "Preencha o seu perfil"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 7bad5b608..eda471604 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -190,7 +190,7 @@ zh-TW:
     zero: "沒有任何聯繫"
   conversations: 
     create: 
-      fail: "Invalid message"
+      fail: "無效的訊息"
       sent: "已送出訊息"
     destroy: 
       success: "對話移除成功"
@@ -215,11 +215,11 @@ zh-TW:
       subject: "主旨"
       to: "收件人"
     new_message: 
-      fail: "Invalid message"
+      fail: "無效的訊息"
     show: 
       delete: "刪除並中止對話"
       reply: "回覆"
-      replying: "Replying..."
+      replying: "回應中..."
   date: 
     formats: 
       birthday: "%B %d"
@@ -463,9 +463,9 @@ zh-TW:
       start_sharing: "開始分享"
       to_accept_or_ignore: "接受或不管它."
     sub_header: 
-      add_some: "add some"
-      edit: "edit"
-      you_have_no_tags: "you have no tags!"
+      add_some: "加入一些"
+      edit: "編輯"
+      you_have_no_tags: "你沒有任何標籤!"
     webfinger: 
       fail: "抱歉, 找不到 %{handle}."
     zero: "沒有聯絡人"
@@ -625,13 +625,13 @@ zh-TW:
       know_email: "知道他們的電子信箱嗎? 你應該邀請他們來"
       your_diaspora_username_is: "你的 Diaspora 用戶名稱是: %{diaspora_handle}"
     aspect_dropdown: 
-      add_to_aspect: "Add to aspect"
+      add_to_aspect: "加入至面向"
       toggle: 
-        few: "In %{count} aspects"
-        many: "In %{count} aspects"
-        one: "In %{count} aspect"
-        other: "In %{count} aspects"
-        zero: "Add to aspect"
+        few: "在%{count}個面向中"
+        many: "在%{count}個面向中"
+        one: "在%{count}個面向中"
+        other: "在%{count}個面向中"
+        zero: "加入至面向"
     contact_list: 
       all_contacts: "全部聯繫"
     footer: 
@@ -751,11 +751,11 @@ zh-TW:
       your_email: "你的電子郵件"
       your_handle: "你的 diaspora 識別碼"
     getting_started: 
-      bold: "aspects"
+      bold: "面向"
       connect_to: "連結至"
       connect_to_your_other_social_networks: "與其他社交網站連結"
       connect_with_people: "與酷咖連結"
-      connect_with_people_explanation_pt1: "為了和別人聯繫, 將他們放入你的任何一個或多個"
+      connect_with_people_explanation_pt1: "為了和別人聯繫, 將他們放入你的任何一個或多個%{bold}"
       connect_with_people_explanation_pt2: "面向是區分新人或熟人的直覺方式, 並且只有你自己知道, 讓你可以輕易過濾他們, 或只和部份聯絡人分享."
       featured_tags: "特色標籤"
       featured_users: "特色使用者"