diff --git a/config/locales/devise/devise.nl.yml b/config/locales/devise/devise.nl.yml
index ddcd2ad48..8e45a38bf 100644
--- a/config/locales/devise/devise.nl.yml
+++ b/config/locales/devise/devise.nl.yml
@@ -31,14 +31,14 @@ nl:
       invitation_instructions: 
         accept: "Accepteer uitnodiging"
         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."
+        be_yourself: "Wees jezelf"
+        be_yourself_paragraph: "Het Internet heeft unieke nieuwe manieren mogelijk gemaakt om onszelf te uiten. %{strong_diaspora} laat jou jezelf zijn en laat jou delen hoe je dat wilt, met of zonder je echte naam."
         cubbies: Cubbi.es
-        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        displaying_correctly: "Ziet deze e-mail er niet goed uit? %{link} in jouw browser"
         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..."
+        email_us: "Voor algemene vragen of hulp met je Diaspora account kun je een e-mail sturen naar %{email}."
+        finally: "Eindelijk - het is er"
+        friends_saying: "Wat je vrienden zeggen..."
         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"
diff --git a/config/locales/devise/devise.pt-PT.yml b/config/locales/devise/devise.pt-PT.yml
index edcf9301f..0f7e46b0a 100644
--- a/config/locales/devise/devise.pt-PT.yml
+++ b/config/locales/devise/devise.pt-PT.yml
@@ -30,33 +30,33 @@ pt-PT:
       hello: "Olá, %{email}!"
       invitation_instructions: 
         accept: "Aceitar o convite"
-        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: "A rede social de que estava à espera chegou. Renovada, mais segura e mais divertida, %{strong_diaspora} está pronta para o(a) ajudar a partilhar e explorar a Web de forma totalmente nova."
+        be_yourself: "Seja você mesmo"
+        be_yourself_paragraph: "A Internet criou novas  e únicas formas de nos expressar. %{strong_diaspora} permite que seja você mesma e partilhar o que quiser, com ou sem o seu nome real."
         cubbies: Cubbi.es
-        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        displaying_correctly: "Email não é apresentado correctamente? %{link} no seu navegador"
         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: "Para informações gerais ou apoio com a sua conta Diáspora, por favor envie-nos um email para %{email}."
+        finally: "Finalmente - está aqui"
+        friends_saying: "O que os seus amigos estão a dizer..."
+        get_connected: Ligue-se
+        get_connected_paragraph: "Um movimento internacional com um ideal comum para uma melhor Web, a primeira característica da %{strong_diaspora} é a sua comunidade. Conheça novas pessoas, ligue-se a amigos e junte-se à diversão."
+        have_fun: Divirta-se
+        have_fun_paragraph: "%{strong_diaspora} é sobre descobrir incríveis conteúdos novos e pessoas online. %{link}, %{strong_diaspora} é a primeira aplicação mundial e é só o inicio. Colete e partilhe a Web em toda a sua glória."
+        help_fund: "ajude a financiar a Diaspora"
+        here: "aqui"
         ignore: "Se não deseja aceitar o convite, por favor ignore este 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: "Junte-se à nossa equipa\n"
+        love: "Gostar,"
+        made_by_people: "%{strong_diaspora} é feita por pessoas que gostam tanto da Internet como você. %{jointeam}, ou %{helpfund}!"
+        more_people: "Mais pessoas estão entusiasmadas para vê-lo(a)!"
         no_account_till: "A sua conta não será criada até que aceda à hiperligação acima e se registe."
-        or: "or"
-        sign_up_now: "Sign up now →"
+        or: "ou"
+        sign_up_now: "Registe-se agora →"
         subject: "Foi convidado para se juntar ao Diaspora!"
-        team_diaspora: "Team Diaspora"
-        unsubscribe: "To unsubscribe please click %{link}."
-        view_in: "View in"
+        team_diaspora: "Equipa Diaspora"
+        unsubscribe: "Para cancelar a subscrição clique %{link}."
+        view_in: "Ver em"
       inviter: 
         accept_at: "em %{url}, pode aceitá-lo através da ligação abaixo."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.zh-TW.yml b/config/locales/devise/devise.zh-TW.yml
index b687fb49c..7dda159b6 100644
--- a/config/locales/devise/devise.zh-TW.yml
+++ b/config/locales/devise/devise.zh-TW.yml
@@ -30,33 +30,33 @@ zh-TW:
       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: "這個社群, 是一個對更好的網路環境有共同願景的國際性運動, 是 %{strong_diaspora} 的最大特色. 來和新面孔相遇, 和朋友保持聯繫, 和大家一起玩吧."
+        have_fun: "盡情玩"
+        have_fun_paragraph: "%{strong_diaspora} 就是用來探索線上令人驚奇的新事物與人物. %{link}, 這個世界上第一個 %{strong_diaspora} 應用程式, 只是個開始. 在榮耀的網路上收集並分享它的一切吧."
+        help_fund: "贊助 Diaspora"
+        here: "這裡"
         ignore: "如果你不想接受邀請,請不用管這封信."
-        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/diaspora/da.yml b/config/locales/diaspora/da.yml
index fe70d529d..b9733349d 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -119,7 +119,7 @@ da:
       keep_us_running: "Hold %{pod} kørende hurtigt og køb serverne deres kaffe fix med en månedlig donation!"
       new_here: 
         follow: "Follow %{link} and welcome new users to Diaspora*!"
-        learn_more: "Learn more"
+        learn_more: "Lær mere"
         title: "Welcome New Users"
       no_contacts: "Ingen kontakter"
       no_tags: "+ Find et tag for at følge"
@@ -301,7 +301,7 @@ da:
       comma_seperated_plz: "Du kan indtaste flere e-mailadresser adskilt med komma."
       if_they_accept_info: "hvis de accepterer, vil de blive tilføjet til det aspekt du inviterede dem til."
       invite_someone_to_join: "Invitér en person til Diaspora!"
-      language: "Language"
+      language: "Sprog"
       personal_message: "Personlig besked"
       resend: "Send igen"
       send_an_invitation: "Send en invitation"
@@ -517,7 +517,7 @@ da:
     show: 
       does_not_exist: "Personen findes ikke!"
       has_not_shared_with_you_yet: "%{name} har ikke delt nogen indlæg med dig endnu!"
-      ignoring: "You are ignoring all posts from %{name}."
+      ignoring: "Du ignorerer alle indlæg fra %{name}."
       incoming_request: "%{name} vil gerne dele med dig."
       mention: "Nævn"
       message: "Besked"
@@ -704,7 +704,7 @@ da:
       create_request: "Find med Diaspora ID"
       diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Indtast et Diaspora handle:"
-      know_email: "Kender du deres e-mail addresse? Du burde invitere dem"
+      know_email: "Kender du deres e-mail adresse? Du burde invitere dem"
       your_diaspora_username_is: "Dit Diaspora handle er: %{diaspora_handle}"
     aspect_dropdown: 
       add_to_aspect: "Tilføj kontakt"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index b1e6256cc..b5ecee23b 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -105,14 +105,14 @@ de:
       help: 
         do_you: "Hast du:"
         email_feedback: "Dein Feedback für Diaspora per %{link}"
-        feature_suggestion: "… einen %{link}-Vorschlag?"
+        feature_suggestion: "… eine Idee für eine %{link}?"
         find_a_bug: "… ein %{link}?"
         have_a_question: "… eine %{link}?"
         here_to_help: "Die Diaspora-Gemeinschaft ist für dich da!"
         need_help: "Benötigst du Hilfe?"
         satisfaction: "%{link}: Unterstützung durch die Gemeinschaft"
         tag_bug: "problem"
-        tag_feature: "feature"
+        tag_feature: "verbesserung"
         tag_question: "frage"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Von der Gemeinschaft erstellte Tutorials, Anleitungen und Nachrichten"
       introduce_yourself: "Das ist dein Stream. Leg' los und stell dich vor."
@@ -763,8 +763,8 @@ de:
       currently_unavailable: "Kommentieren derzeit nicht verfügbar"
       dislike: "Gefällt mir nicht"
       hide_and_mute: "Beitrag verbergen und stummschalten"
-      ignore_user: "Ignoriere %{name}"
-      ignore_user_description: "Benutzer ignorieren und aus allen Aspekten entfernen?"
+      ignore_user: "%{name} ignorieren"
+      ignore_user_description: "Diesen Benutzer ignorieren und aus allen Aspekten entfernen?"
       like: "Gefällt mir"
       shared_with: "Geteilt mit: %{aspect_names}"
       unlike: "Gefällt mir nicht mehr"
@@ -853,7 +853,7 @@ de:
       email_not_confirmed: "Die E-Mail-Adresse konnte nicht aktiviert werden. Falscher Link?"
     destroy: 
       no_password: "Bitte gib dein Kennwort ein, um deinen Account zu schließen."
-      success: "Dein Account wurde gesperrt. Es kann 20 Minuten dauern, bis dein Account geschlossen ist.  Danke, dass du Diaspora ausprobiert hast."
+      success: "Dein Account wurde gesperrt. Es kann 20 Minuten dauern, bis dein Account geschlossen ist. Danke, dass du Diaspora ausprobiert hast."
       wrong_password: "Das eingegebene Kennwort stimmt nicht mit deinem aktuellen Kennwort überein."
     edit: 
       also_commented: "… jemand ebenfalls den Beitrag eines Kontaktes kommentiert?"
@@ -902,8 +902,8 @@ de:
       simply_visit: "Besuche einfach"
       works_on_modern: "Funktioniert auf allen modernen Smartphones"
     privacy_settings: 
-      ignored_users: "Ignorierte Benutzer"
-      stop_ignoring: "Aufhören zu ignorieren"
+      ignored_users: "Benutzer, die ignoriert werden"
+      stop_ignoring: "Aufhören, zu ignorieren"
       title: Privatsphären-Einstellungen
     public: 
       does_not_exist: "Benutzer %{username} existiert nicht!"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 5a42fef2d..fae815f3a 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -555,7 +555,7 @@ eo:
       invalid_ext: "{file} havas malvalidan sufikson. Nur {extensions} estas validaj."
       size_error: "{file} estas tro granda; la maksimuma dosiergrandeco estas {sizeLimit}."
     new_profile_photo: 
-      or_select_one_existing: "or select one from your already existing %{photos}"
+      or_select_one_existing: "aŭ elektu unu el viaj jam ekzistantaj %{photos}"
       upload: "Alŝutu novan profilbildon!"
     photo: 
       view_all: "Vidi ĉiujn bildojn de %{name}"
@@ -852,9 +852,9 @@ eo:
       email_confirmed: "Retpoŝtadreso %{email} aktiviĝis"
       email_not_confirmed: "Retpoŝtadreso ne povis aktiviĝi. Ĉu malĝusta ligilo?"
     destroy: 
-      no_password: "Please enter your current password to close your account."
-      success: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
-      wrong_password: "The entered password didn't match your current password."
+      no_password: "Bonvolu entajpi vian nunan pasvorton por fermi vian konton."
+      success: "Via konto ŝlosiĝis. Povas daŭri 20 minutoj ĝis ĝi via konto fine estos fermita. Dankon por elprovi Diasporan."
+      wrong_password: "La entajpita pasvoroto ne kongruis kun la nuna pasvorto."
     edit: 
       also_commented: "...iu ankaŭ komentis pri la afiŝo de via kontakto?"
       change: "Ŝanĝi"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 749ef564d..21bab193c 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -100,7 +100,7 @@ es:
         content_1: "Tu identidad Diaspora* es:"
         content_2: "Compártela con quien quieras que te encuentre rápidamente."
         heading: "Identidad Diaspora*"
-      donate: "Donar"
+      donate: "Donaciones"
       handle_explanation: "Ésta es tu dirección Diaspora*. Como una dirección de email, puedes dársela a la gente para que te encuentre."
       help: 
         do_you: "Tal vez:"
@@ -118,7 +118,7 @@ es:
       introduce_yourself: "Esta es tu entrada de novedades. Adelante, preséntate..."
       keep_us_running: "Haz que %{pod} vaya más rápido, ¡compra a nuestros servidores sus dosis de café mensual!"
       new_here: 
-        follow: "¡Sigue %{link} y da la bienvenida a Diaspora* a la gente nueva!"
+        follow: "¡Sigue %{link} y da la bienvenida a Diaspora* a los nuevos usuarios!"
         learn_more: "Más información"
         title: "Bienvenida"
       no_contacts: "No hay contactos"
@@ -130,7 +130,7 @@ es:
         heading: "Servicios"
       unfollow_tag: "Dejar de seguir a #%{tag}"
       welcome_to_diaspora: "¡Bienvenid@ a Diaspora, %{name}!"
-      your_aspects: "Tus Aspectos"
+      your_aspects: "Aspectos"
     many: "%{count} aspectos"
     move_contact: 
       error: "Error moviendo el contacto: %{inspect}"
@@ -353,10 +353,10 @@ es:
   no_results: "No hay resultados"
   notifications: 
     also_commented: 
-      few: "%{actors} también comentó la %{post_link} de %{post_author}."
-      many: "%{actors} también comentó la %{post_link} de %{post_author}."
+      few: "%{actors} también comentaron la %{post_link} de %{post_author}."
+      many: "%{actors} también comentaron la %{post_link} de %{post_author}."
       one: "%{actors} también comentó la %{post_link} de %{post_author}."
-      other: "%{actors} también comentó la %{post_link} de %{post_author}."
+      other: "%{actors} también comentaron la %{post_link} de %{post_author}."
       two: "%{actors} también comentaron la %{post_link} de %{post_author}."
       zero: "%{actors} también comentó la %{post_link} de %{post_author}."
     also_commented_deleted: 
@@ -364,14 +364,14 @@ es:
       many: "%{actors} comentaron una publicación eliminada."
       one: "%{actors} comentó una publicación eliminada."
       other: "%{actors} comentaron una publicación eliminada."
-      two: "%{actors} comentó una publicación eliminada."
+      two: "%{actors} comentaron una publicación eliminada."
       zero: "%{actors} comentó una publicación eliminada."
     comment_on_post: 
       few: "%{actors} comentaron tu %{post_link}."
       many: "%{actors} comentaron tu %{post_link}."
       one: "%{actors} comentó tu %{post_link}."
       other: "%{actors} comentaron tu %{post_link}."
-      two: "%{actors} comentó tu %{post_link}."
+      two: "%{actors} comentaron tu %{post_link}."
       zero: "%{actors} comentó tu %{post_link}."
     helper: 
       new_notifications: 
@@ -397,7 +397,7 @@ es:
       many: "A %{actors} les gustó tu %{post_link}."
       one: "A %{actors} le gustó tu %{post_link}."
       other: "A %{actors} les gustó tu %{post_link}."
-      two: "A %{actors} le gustó tu %{post_link}."
+      two: "A %{actors} les gustó tu %{post_link}."
       zero: "A %{actors} le gustó tu %{post_link}."
     liked_post_deleted: 
       few: "%{actors} les gustó una publicación eliminada."
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index f114414f9..b4a368dd1 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -44,7 +44,7 @@ fr:
   application: 
     helper: 
       diaspora_alpha: "DIASPORA* ALPHA"
-      unknown_person: "personne inconnue"
+      unknown_person: "Personne inconnue"
       video_title: 
         unknown: "Titre de vidéo inconnu"
   are_you_sure: "Êtes-vous certain ?"
@@ -104,7 +104,7 @@ fr:
       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."
       help: 
         do_you: "Avez-vous :"
-        email_feedback: "%{link} l'impression, si vous préférez"
+        email_feedback: "Envoyez vos impressions par %{link} , si vous préférez."
         feature_suggestion: "... une suggestion (%{link}) ?"
         find_a_bug: "... trouvé un %{link} ?"
         have_a_question: "... une %{link} ?"
@@ -175,13 +175,13 @@ fr:
       failure: "Je ne pouvais pas ignorer cet utilisateur.  #evasion"
       success: "Très bien, vous ne verrez plus cet utilisateur dans votre flux. #silencio!"
     destroy: 
-      failure: "I couldn't stop ignoring that user.  #evasion"
+      failure: "Je ne pouvais plus cesser d'ignorer cet utilisateur.  #evasion"
       success: "Voyons ce qu'ils ont à dire ! #sayhello"
   bookmarklet: 
-    explanation: "Publier sur Diaspora depuis n'importe où en ajoutant %{link} à vos marque-pages."
+    explanation: "Publiez sur Diaspora depuis n'importe où en ajoutant %{link} à vos marque-pages."
     explanation_link_text: "ce lien"
     heading: "Bookmarklet"
-    post_something: "Publier quelque chose sur Diaspora"
+    post_something: "Publiez quelque chose sur Diaspora"
     post_success: "Publié ! Fermeture !"
   cancel: "Annuler"
   comments: 
@@ -506,10 +506,10 @@ fr:
       pending_request: "Requête en attente"
       thats_you: "C'est vous !"
     profile_sidebar: 
-      bio: "bio"
-      born: "anniversaire"
+      bio: "Bio"
+      born: "Anniversaire"
       edit_my_profile: "Modifier mon profil"
-      gender: "sexe"
+      gender: "Sexe"
       in_aspects: "dans les aspects"
       location: "localisation"
       remove_contact: "supprimer ce contact"
@@ -558,7 +558,7 @@ fr:
       or_select_one_existing: "ou choisissez parmi vos photos existantes %{photos}"
       upload: "Mettre une nouvelle photo de profil !"
     photo: 
-      view_all: "voir toute les photos de %{name}"
+      view_all: "Voir toute les photos de %{name}"
     show: 
       collection_permalink: "Lien permanent à la collection"
       delete_photo: "Supprimer la photo"
@@ -674,7 +674,7 @@ fr:
     failure: 
       error: "une erreur s'est produite lors de la connexion avec ce service"
     finder: 
-      fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes."
+      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."
       service_friends: "Amis %{service}"
     index: 
@@ -704,7 +704,7 @@ fr:
       create_request: "Rechercher par identifiant Diaspora"
       diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Entrez un nom d'utilisateur Diaspora :"
-      know_email: "Vous connaissez leur adresse de courrier électronique ? Vous devriez les inviter"
+      know_email: "Connaissez-vous 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: "Ajouter le contact"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index b6ff32f61..a7ad60c6c 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -105,15 +105,15 @@ it:
       help: 
         do_you: Vuoi...
         email_feedback: "Se preferisci, manda un feedback via %{link}"
-        feature_suggestion: "...proporre un'idea? %{link}"
-        find_a_bug: "...segnalare un problema? %{link}"
-        have_a_question: "...fare una domanda? %{link}"
+        feature_suggestion: "...proporre un'%{link}?"
+        find_a_bug: "...segnalare un %{link}?"
+        have_a_question: "...fare una %{link}?"
         here_to_help: "La comunità di Diaspora è qui!"
         need_help: "Hai bisogno di aiuto?"
         satisfaction: "%{link}: Per avere supporto dalla comunità"
-        tag_bug: "#bug"
-        tag_feature: "#funzionalità"
-        tag_question: "#domanda"
+        tag_bug: "bug"
+        tag_feature: "idea"
+        tag_question: "domanda"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Per le ultime notizie, le guide e i suggerimenti della comunità"
       introduce_yourself: "Questo è il tuo stream. Sali a bordo e presentati!"
       keep_us_running: "Mantieni %{pod} veloce e scattante, la tua donazione mensile sarà il caffè per i nostri server!"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index 490e38556..08e2f572d 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -100,7 +100,7 @@ ko:
         content_1: "내 디아스포라 ID:"
         content_2: "내 ID를 주면 누구든지 디아스포라에서 날 찾을수 있습니다."
         heading: "디아스포라 ID"
-      donate: "기부해주세요"
+      donate: "기부"
       handle_explanation: "이 디아스포라 핸들은 이메일 주소처럼 남에게 건넬 수 있습니다."
       help: 
         do_you: "해시태그:"
@@ -111,9 +111,9 @@ ko:
         here_to_help: "디아스포라 커뮤니티가 도와드립니다!"
         need_help: "도움이 필요하세요?"
         satisfaction: "%{link}: 커뮤니티 지원"
-        tag_bug: "#bug"
-        tag_feature: "#feature"
-        tag_question: "#question"
+        tag_bug: "bug"
+        tag_feature: "feature"
+        tag_question: "question"
         tutorials_wiki_and_forum: "%{tutorial}과 %{wiki}와  %{forum}: 커뮤니티가 운영하는 튜토리얼, 사용 방법과 소식"
       introduce_yourself: "내 스트림에서 스스로를 나타내십시오."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -555,7 +555,7 @@ ko:
       invalid_ext: "{file} 파일은 유효하지 않은 형식입니다. {extensions} 형식의 파일을 올려주세요."
       size_error: "{file} 파일이 {sizeLimit} 보다 큽니다"
     new_profile_photo: 
-      or_select_one_existing: "or select one from your already existing %{photos}"
+      or_select_one_existing: "이미 올려둔 사진 가운데 고를 수도 있습니다 %{photos}"
       upload: "새 프로필 사진 업로드하기!"
     photo: 
       view_all: "%{name}님의 모든 사진 보기"
@@ -661,7 +661,7 @@ ko:
         zero: "재공유"
       reshare_confirmation: "%{author}님의 %{text} 공유물을 재공유합니까?"
       reshare_original: "원본 재공유"
-      reshared_via: "재공유함 via"
+      reshared_via: "재공유 via"
       show_original: "원본 보기"
   search: "검색"
   services: 
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index d5832cf0a..fad6ef949 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -460,7 +460,7 @@ nl:
     email_sent_by_diaspora: "Deze mail is gestuurd door Diaspora.  Als je dit soort email's niet meer wilt ontvangen,"
     hello: "Hoi %{name}!"
     liked: 
-      liked: "%{name} vind je post leuk"
+      liked: "%{name} vindt je post leuk"
       view_post: "Bekijk post >"
     mentioned: 
       mentioned: "heeft jou genoemd in een post:"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 9e28233f4..5771c3c4e 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -111,9 +111,9 @@ pl:
         here_to_help: "Społeczności Diaspory jest tutaj!"
         need_help: "Potrzebujesz pomocy?"
         satisfaction: "%{link}: Strona wsparcia społeczności"
-        tag_bug: "#błąd"
+        tag_bug: "błąd"
         tag_feature: "funkcja"
-        tag_question: "#pytanie"
+        tag_question: "pytanie"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Samouczki, instrukcje i aktualności dostarczane przez Społeczność"
       introduce_yourself: "Oto Twoj strumień. Wskocz do niego i przedstaw się."
       keep_us_running: "Aby %{pod} działał szybko podaruj serwerom dawkę kofeiny w postaci miesięcznej darowizny!"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 8f24e79d3..39a763a28 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -746,7 +746,7 @@ ru:
       discard_post: "Отменить запись"
       make_public: "сделать публичным"
       new_user_prefill: 
-        hello: "Привет всем, я тут новенький (#%{new_user_tag})."
+        hello: "Всем привет, я #%{new_user_tag}."
         i_like: "Мне интересны метки %{tags}."
         invited_by: "Спасибо за приглашение, "
       post_a_message_to: "Опубликовать сообщение для %{aspect}"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 56eb2effe..e5ca3ebfe 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -66,7 +66,7 @@ sl:
       select_all: "Označi vse"
     aspect_stream: 
       stay_updated: "Ostanite na tekočem"
-      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
+      stay_updated_explanation: "Vaš glavni tok vsebuje vsebine vseh vaših kontaktov, oznak, ki jih sledite, in prispevkov od nekaterih ustvarjalnih članov skupnosti."
     contacts_not_visible: "Stiki v tem pogledu drug drugega ne bodo videli."
     contacts_visible: "Stiki v tem pogledu drug drugega lahko vidijo."
     create: 
@@ -103,24 +103,24 @@ sl:
       donate: "Prispevaj"
       handle_explanation: "To je vaš Diaspora ID naslov. Tako kot vaš e-naslov,  ga lahko uporabite kot naslov s pomočjo katerega drugi stopijo v stik z vami."
       help: 
-        do_you: "Do you:"
+        do_you: "Ali:"
         email_feedback: "%{link} povratno informacijo, če želite"
         feature_suggestion: "... imeli %{link} predlog?"
         find_a_bug: "... našli %{link}?"
         have_a_question: "... imeli %{link}?"
         here_to_help: "Skupnost Diaspora je tukaj!"
         need_help: "Potrebujete pomoč?"
-        satisfaction: "%{link}: Community-powered support"
+        satisfaction: "%{link}: Podpora s pomočjo skupnosti"
         tag_bug: "hrošč"
         tag_feature: "funkcija"
         tag_question: "vprašanje"
-        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Vodiči, navodila in novice iz skupnosti"
       introduce_yourself: "To je vaš tok. Vskoči in predstavi se."
       keep_us_running: "Pomagajte %{pod}, da bo tekel hitreje, kupite našim  strežnikom mesečno dozo kave!"
       new_here: 
         follow: "Sledite %{link} in pozdravite nove uporabnike *Diaspore!"
         learn_more: "Več o tem"
-        title: "Welcome New Users"
+        title: "Dobrodošli novi uporabniki"
       no_contacts: "Ni stikov"
       no_tags: "+ Za sledenje poišči oznako"
       people_sharing_with_you: "Ljudje, ki delijo z vami"
@@ -140,7 +140,7 @@ sl:
       create: "Ustvari"
       name: "Ime (vidno samo tebi)"
     no_contacts_message: 
-      community_spotlight: "community spotlight"
+      community_spotlight: "vsebina skupnosti"
       or_spotlight: "Ali pa lahko delite z %{link}"
       try_adding_some_more_contacts: "Poiščete ali povabite lahko več stikov."
       you_should_add_some_more_contacts: "Lahko bi dodali še kakšno osebo!"
@@ -156,7 +156,7 @@ sl:
     selected_contacts: 
       manage_your_aspects: "Urejanje pogledov."
       no_contacts: "Zaenkrat ste še brez stikov."
-      view_all_community_spotlight: "See all community spotlight"
+      view_all_community_spotlight: "Poglej celotno vsebino skupnosti"
       view_all_contacts: "Poglej vse stike"
     show: 
       edit_aspect: "uredi pogled"
@@ -217,7 +217,7 @@ sl:
     sharing: 
       people_sharing: "Ljudje, ki delijo z vami:"
     spotlight: 
-      community_spotlight: "Community Spotlight"
+      community_spotlight: "Vsebina skupnosti"
     two: "%{count} stika"
     zero: "stiki"
   conversations: 
@@ -353,12 +353,12 @@ sl:
   no_results: "Ni zadetkov"
   notifications: 
     also_commented: 
-      few: "%{actors} also commented on %{post_author}'s %{post_link}."
-      many: "%{actors} also commented on %{post_author}'s %{post_link}."
-      one: "%{actors} also commented on %{post_author}'s %{post_link}."
-      other: "%{actors} also commented on %{post_author}'s %{post_link}."
-      two: "%{actors} also commented on %{post_author}'s %{post_link}."
-      zero: "%{actors} also commented on %{post_author}'s %{post_link}."
+      few: "%{actors} so tudi komentirali %{post_link} osebe %{post_author}."
+      many: "%{actors} jih je tudi komentiralo %{post_link} osebe %{post_author}."
+      one: "%{actors} je tudi komentiral %{post_link} osebe %{post_author}."
+      other: "%{actors} so tudi komentirali %{post_link} osebe %{post_author}."
+      two: "%{actors} sta tudi komentirala %{post_link} osebe %{post_author}."
+      zero: "%{actors} jih ni tudi komentiralo %{post_link} osebe %{post_author}."
     also_commented_deleted: 
       few: "%{actors} so komentirali izbrisano objavo."
       many: "%{actors} jih je komentiralo na izbrisano objavo."
@@ -367,11 +367,11 @@ sl:
       two: "%{actors} sta komentirala na izbrisano objavo."
       zero: "Noben ni komentiral izbrisane objave."
     comment_on_post: 
-      few: "%{actors} commented on your %{post_link}."
-      many: "%{actors} commented on your %{post_link}."
-      one: "%{actors} commented on your %{post_link}."
+      few: "%{actors} so komentirali vašo %{post_link}."
+      many: "%{actors} jih je komentiralo vašo %{post_link}."
+      one: "%{actors} je komentiral vašo %{post_link}."
       other: "%{actors} jih je komentiralo na vašo %{post_link}."
-      two: "%{actors} commented on your %{post_link}."
+      two: "%{actors} sta komentirala vašo %{post_link}."
       zero: "%{actors} jih ni komentiralo na vašo %{post_link}."
     helper: 
       new_notifications: 
@@ -393,12 +393,12 @@ sl:
       mark_all_as_read: "Označi vse kot prebrano"
       notifications: "Sporočila"
     liked: 
-      few: "%{actors} has just liked your %{post_link}."
-      many: "%{actors} has just liked your %{post_link}."
-      one: "%{actors} has just liked your %{post_link}."
-      other: "%{actors} has just liked your %{post_link}."
-      two: "%{actors} has just liked your %{post_link}."
-      zero: "%{actors} has just liked your %{post_link}."
+      few: "%{actors} so pravkar všečkali vašo %{post_link}."
+      many: "%{actors} jih je pravkar všečkalo vašo %{post_link}."
+      one: "%{actors} je pravkar všečkal vašo %{post_link}."
+      other: "%{actors} so pravkar všečkali vašo %{post_link}."
+      two: "%{actors} sta pravkar všečkala vašo %{post_link}."
+      zero: "%{actors} jih ni všečkalo vaše %{post_link}."
     liked_post_deleted: 
       few: "%{actors} je všeč vaša izbrisana objava."
       many: "%{actors} je všeč vaša izbrisana objava."
@@ -436,12 +436,12 @@ sl:
       two: "%{actors} sta delila %{post_link}."
       zero: "%{actors} niso delili vaš %{post_link}."
     reshared_post_deleted: 
-      few: "%{actors} reshared your deleted post."
-      many: "%{actors} reshared your deleted post."
-      one: "%{actors} reshared your deleted post."
-      other: "%{actors} reshared your deleted post."
-      two: "%{actors} reshared your deleted post."
-      zero: "%{actors} reshared your deleted post."
+      few: "%{actors} so delili vašo izbrisano objavo."
+      many: "%{actors} jih je delilo vašo izbrisano objavo."
+      one: "%{actors} je delil vašo izbrisano objavo."
+      other: "%{actors} so delili vašo izbrisano objavo."
+      two: "%{actors} sta delila vašo izbrisano objavo."
+      zero: "%{actors} jih je delilo vašo izbrisano objavo."
     started_sharing: 
       few: "%{actors} jih je začelo deliti z vami."
       many: "%{actors} jih je začelo deliti z vami."
@@ -453,7 +453,7 @@ sl:
     a_post_you_shared: objava.
     click_here: "kliknite tukaj"
     comment_on_post: 
-      reply: "Reply or view %{name}'s post >"
+      reply: "Odgovorite ali poglejte objavo osebe %{name} >"
     confirm_email: 
       click_link: "To activate your new e-mail address %{unconfirmed_email},  please click this link:"
       subject: "Prosimo, aktivirajte vaš novi e-poštni naslov %{unconfirmed_email}"
@@ -463,10 +463,10 @@ sl:
       liked: "Osebi %{name} je všeč vaša objava: "
       view_post: "Poglej objavo >"
     mentioned: 
-      mentioned: "mentioned you in a post:"
+      mentioned: "v objavi so vas omenili:"
       subject: "%{name} vas je omenil v Diaspori*"
     private_message: 
-      reply_to_or_view: "Reply to or view this conversation >"
+      reply_to_or_view: "Odgovorite ali poglejte ta pogovor>"
     reshared: 
       reshared: "%{name} je delil vašo objavo"
       view_post: "Poglej objavo >"
@@ -478,7 +478,7 @@ sl:
       subject: "%{name} je začel deliti z vami na Diaspori*"
       view_profile: "Poglej profil osebe %{name}"
     thanks: "Hvala,"
-    to_change_your_notification_settings: "to change your notification settings"
+    to_change_your_notification_settings: "da spremenite nastavitve obvestil"
   ok: "OK"
   or: "ali"
   password: "Geslo"
@@ -587,7 +587,7 @@ sl:
       first_name: "Ime"
       last_name: "Priimek"
       update_profile: "Posodobi profil"
-      your_bio: "Your bio"
+      your_bio: "Vaš življenjepis"
       your_birthday: "Tvoj rojstni dan"
       your_gender: "Vaš spol"
       your_location: "Vaša lokacija"
@@ -649,7 +649,7 @@ sl:
     new_request_to_person: 
       sent: poslano!
   reshares: 
-    comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
+    comment_email_subject: "%{resharer} je delil objavo od osebe %{author}"
     create: 
       failure: "Prišlo je do napake pri ponovni delitvi objave."
     reshare: 
@@ -659,7 +659,7 @@ sl:
         many: "%{count} delitev"
         one: "1 delitev"
         other: "%{count} delitev"
-        two: "%{count} reshares"
+        two: "%{count} delitvi"
         zero: "Ponovno deli"
       reshare_confirmation: "Deli objavo osebe %{author}?"
       reshare_original: "Deli izvirnik"
@@ -676,7 +676,7 @@ sl:
     failure: 
       error: "pri povezovanju s servisom je prišlo do napake"
     finder: 
-      fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes."
+      fetching_contacts: "Diaspora pridobiva vaše prijatelje s vira %{service}. Prosimo počakajte nekaj minut."
       no_friends: "Noben prijatelj s Facebook-a ni bil najden."
       service_friends: "%{service} Prijatelji"
     index: 
@@ -737,7 +737,7 @@ sl:
       control_your_audience: "Nadzor ciljne skupine"
       logged_in: "prijavljeni ste v %{service}"
       manage: "uredi povezane servise"
-      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: "Uporabite #oznake za razvrstitev vaših objav in da bi našli ljudi, ki imajo podobne interese. Izpostavite ljudi z @Omembami"
       outside: "Javna sporočila bodo na ogled tudi osebam izven Diaspore."
       share: "Deli"
       title: "Objavili boste javno sporočilo!"
@@ -753,7 +753,7 @@ sl:
         invited_by: "Hvala za povabilo,"
       post_a_message_to: "Objavi sporočilo v %{aspect}"
       posting: Objavljam...
-      publishing_to: "publishing to: "
+      publishing_to: "objavljanje do: "
       share: "Objavi"
       share_with: "deli s/z"
       upload_photos: "Naložite fotografije"
@@ -765,8 +765,8 @@ sl:
       currently_unavailable: "komentiranje trenutno ni na voljo"
       dislike: "Nimam rad"
       hide_and_mute: "Skrij in utišaj objavo"
-      ignore_user: "Ignore %{name}"
-      ignore_user_description: "Ignore and remove user from all aspects?"
+      ignore_user: "Ignoriraj osebo %{name}"
+      ignore_user_description: "Ignoriraj in odstrani osebo iz vseh pogledov?"
       like: "Več mi je"
       shared_with: "Deljeno z: %{aspect_names}"
       unlike: "Ni mi všeč"
@@ -790,13 +790,13 @@ sl:
       zero: "Vaša sporočila morajo vsebovati manj kot %{count} znakov."
   stream_helper: 
     hide_comments: "Skrij vse komentarje"
-    show_more_comments: "Show %{number} more comments"
+    show_more_comments: "Prikaži še  %{number} komentarjev"
   streams: 
     aspects: 
       title: "Vaši pogledi"
     aspects_stream: "Pogledi"
     commented_on: "komentiral na"
-    community_spotlight_stream: "Community Spotlight"
+    community_spotlight_stream: "Vsebina skupnosti"
     followed_tag: 
       add_a_tag: "Dodaj oznako"
       contacts_title: "Ljudje, ki so izbrskali te oznake"
@@ -854,9 +854,9 @@ sl:
       email_confirmed: "Elektronski naslov %{email} aktiviran"
       email_not_confirmed: "Elektronski naslov ni bilo mogoče aktivirati. Napačna povezava?"
     destroy: 
-      no_password: "Please enter your current password to close your account."
+      no_password: "Da bi vaš zaprli račun, vas prosimo, da vnesete vaše trenutno geslo."
       success: "Vaš račun je bil zaklenjen. To lahko traja 20 minut za nas, da končamo zapiranje računa. Hvala, ker ste poskusili Diasporo."
-      wrong_password: "The entered password didn't match your current password."
+      wrong_password: "Vneseno geslo se ne ujema z vašim trenutnim geslom."
     edit: 
       also_commented: "...nekdo tudi komentira objavo vašega stika?"
       change: "Spremeni"
@@ -879,23 +879,23 @@ sl:
       private_message: "...prejmete privatno sporočilo?"
       receive_email_notifications: "Želite prejemati obvestila po e-pošti, ko... "
       reshared: "...nekdo deli vašo objavo?"
-      show_community_spotlight: "Show Community Spotlight in Stream?"
-      show_getting_started: "Ponovno omogočite Kako začeti"
+      show_community_spotlight: "Prikaži vsebino skupnopsti v toku?"
+      show_getting_started: "Ponovno omogočite \"Kako začeti?\""
       started_sharing: "... nekdo začne skupno rabo z vami?"
       stream_preferences: "Nastavitve toka"
       your_email: "Vaš e-naslov"
       your_handle: "Vaš diaspora naslov"
     getting_started: 
-      awesome_take_me_to_diaspora: "Super! Popelji me v Diasporo*"
+      awesome_take_me_to_diaspora: "Popelji me v Diasporo*"
       community_welcome: "Skupnosti Diaspora je vesela, da vas ima na krovu!"
       hashtag_explanation: "Zaznamki vam omogočajo, da govorimo o in sledite vašim interesom. So tudi dober način za iskanje novih ljudi na Diaspori."
-      hashtag_suggestions: "Poskusite naslednje oznake, kot so #art, #movies, #gif in podobno"
-      hooking_up_fb: "povežite vaš Facebook račun"
+      hashtag_suggestions: "Poskusite lahko oznake, kot so #art, #movies, #gif in podobno."
+      hooking_up_fb: "povezavo vašega Facebook računa"
       saved: Shranjeno!
       we_can_speed_things_up: "Mi lahko malo pospešimo stvari z"
       well_hello_there: "No, Pozdravljeni!"
       what_are_you_in_to: "Kaj vas zanima?"
-      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      what_facebook_does: "z Diasporo. Na ta način se bo preneslo vaše ime in fotografija ter omogočeno bo navzkrižno objavljanje."
       who_are_you: "Kdo si?"
     logged_out: 
       go_mobile: "Zdaj pa pojdi mobilno."
@@ -904,9 +904,9 @@ sl:
       simply_visit: "Preprost obisk"
       works_on_modern: "Deluje na vseh sodobnih pametnih telefonih"
     privacy_settings: 
-      ignored_users: "Ignored Users"
-      stop_ignoring: "Stop ignoring"
-      title: "Privacy Settings"
+      ignored_users: "Ignorirane osebe"
+      stop_ignoring: "Prekini ignoriranje"
+      title: "Nastavitve zasebnosti"
     public: 
       does_not_exist: "Uporabnik %{username} ne obstaja!"
     update: 
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 119f2161c..e25ba7d5c 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -116,11 +116,11 @@ tr:
         tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "Bu sizin akışınızdır. Atla ve kendini tanıt."
-      keep_us_running: "%{pod} ağının daha hızlı ve hatasız olması için geliştiricilere aylık kahve ısmarlayın!"
+      keep_us_running: "%{pod} ağının daha hızlı ve hatasız olması için geliştiricilere kahve ısmarlayın!"
       new_here: 
         follow: "Follow %{link} and welcome new users to Diaspora*!"
-        learn_more: "Learn more"
-        title: "Welcome New Users"
+        learn_more: "Daha fazla bilgi"
+        title: "Yenilere Hoş Geldin Deyin"
       no_contacts: "Kişi yok"
       no_tags: "+ Takip etmek için bir etiket bul"
       people_sharing_with_you: "Seninle paylaşımda bulunanlar"
@@ -130,7 +130,7 @@ tr:
         heading: "Servisleri ilişkilendir"
       unfollow_tag: "#%{tag}'i takip etmeyi bırak"
       welcome_to_diaspora: "Diaspora'ya Hoş Geldin, %{name}!"
-      your_aspects: "Yönlerin"
+      your_aspects: "Yönleriniz"
     many: "%{count} yön"
     move_contact: 
       error: "Kişi taşıma problemi: %{inspect}"
@@ -155,7 +155,7 @@ tr:
       work: "İş"
     selected_contacts: 
       manage_your_aspects: "Yönleri düzenle."
-      no_contacts: "You don't have any contacts here yet."
+      no_contacts: "Henüz biriyle iletişim yok."
       view_all_community_spotlight: "Tüm topluluk spotlight bakın"
       view_all_contacts: "Tüm kişileri görüntüle"
     show: 
@@ -555,7 +555,7 @@ tr:
       invalid_ext: "{file} geçersiz uzantıya sahip. sadece {extensions} uzantılarına izin verilir."
       size_error: "{file} çok büyük, en büyük dosya boyutu {sizeLimit}."
     new_profile_photo: 
-      or_select_one_existing: "or select one from your already existing %{photos}"
+      or_select_one_existing: "ya da varolan fotoğraflardan seç %{photos}"
       upload: "Yeni bir profil fotoğrafı yükle!"
     photo: 
       view_all: "%{name}'in bütün fotoğraflarını göster"
@@ -576,7 +576,7 @@ tr:
       not_found: "Üzgünüz, bu gönderi bulamadı."
       permalink: "kalıcı bağlantı"
   previous: "önceki"
-  privacy: "Privacy"
+  privacy: "Gizlilik"
   profile: "Profil"
   profiles: 
     edit: 
@@ -803,7 +803,7 @@ tr:
     followed_tags_stream: "#Takip Edilen Etiketler"
     mentioned_stream: "@Bahsedenler"
     mentions: 
-      contacts_title: "Kişi senden bahsetti"
+      contacts_title: "Senden Bahsedenler"
       title: "@Bahsedenler"
     multi: 
       contacts_title: "Kişiler"
@@ -902,9 +902,9 @@ tr:
       simply_visit: "Basitçe ziyaret"
       works_on_modern: "Tüm modern akıllı telefonlarda çalışır"
     privacy_settings: 
-      ignored_users: "Ignored Users"
+      ignored_users: "Gözardı Edilen Kullanıcılar"
       stop_ignoring: "Stop ignoring"
-      title: "Privacy Settings"
+      title: "Gizlilik Ayarları"
     public: 
       does_not_exist: "%{username} kullanıcısı bulunmamaktadır!"
     update: 
diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml
index 201ca5e03..2ee7424a4 100644
--- a/config/locales/javascript/javascript.da.yml
+++ b/config/locales/javascript/javascript.da.yml
@@ -61,7 +61,7 @@ da:
       prefixFromNow: "om"
       seconds: "mindre end et minut"
       suffixAgo: "siden"
-      suffixFromNow: ""
+      suffixFromNow: "fra nu"
       year: "ca. et år"
       years: "%d år"
     videos: 
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index c8d168073..cfb579c86 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -49,20 +49,20 @@ es:
     tags: 
       wasnt_that_interesting: "OK, supongo que #{{tagName}} no era tan interesante..."
     timeago: 
-      day: "un día"
+      day: "1 día"
       days: "%d días"
-      hour: "una hora aproximadamente"
+      hour: "1 hora aproximadamente"
       hours: "%d horas aproximadamente"
       minute: "1 minuto aproximadamente"
       minutes: "%d minutos"
-      month: "un mes aproximadamente"
+      month: "1 mes aproximadamente"
       months: "%d meses"
-      prefixAgo: "javascripts:timeago:prefixAgo"
+      prefixAgo: "hace"
       prefixFromNow: "javascripts:timeago:prefixFromNow"
-      seconds: "menos de un minuto"
-      suffixAgo: "hace"
+      seconds: "menos de 1 minuto"
+      suffixAgo: ""
       suffixFromNow: "desde ahora"
-      year: "un año aproximadamente"
+      year: "1 año aproximadamente"
       years: "%d años"
     videos: 
       unknown: "Tipo de video desconocido"
diff --git a/config/locales/javascript/javascript.pt-PT.yml b/config/locales/javascript/javascript.pt-PT.yml
index 26ebcb664..cb0014ba3 100644
--- a/config/locales/javascript/javascript.pt-PT.yml
+++ b/config/locales/javascript/javascript.pt-PT.yml
@@ -8,7 +8,7 @@ pt-PT:
     aspect_dropdown: 
       add_to_aspect: "Adicionar contacto"
       all_aspects: "Todos os aspectos"
-      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      error: "Não foi possível começar a partilhar com {{name}}. Você está a ignorá-los?"
       select_aspects: "Seleccionar aspectos"
       started_sharing_with: "Começou a partilhar com {{name}}!"
       stopped_sharing_with: "Deixou de partilhar com {{name}}."