updated locales

43 files changed, 461 insertions, 221 deletions

diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 40872278a..dc9ca461c 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -52,14 +52,14 @@ ar:
       add_to_aspect: "أضف إلى فئة"
       toggle: 
         few: "في %{count} فئات"
-        many: "في %{count} فئات"
-        one: "في %{count} فئات"
+        many: "في %{count} فئة"
+        one: "في فئة واحدة"
         other: "في %{count} فئات"
         zero: "أضف إلى فئة"
     destroy: 
       failure: "فشل في حذف عضو من الفئة"
       no_membership: "لم يتم إيجاد العضو المحدد في هذه الفئة"
-      success: "حذف العضو من الفئة بنجاح"
+      success: "حُذِفَ العضو من الفئة بنجاح"
   aspects: 
     add_to_aspect: 
       failure: "فشل في إضافة صديق إلى الفئة"
@@ -265,7 +265,7 @@ ar:
     application: 
       have_a_problem: "واجهت مشكلة؟ اعثر على حل هنا"
       powered_by: "بدعم DIASPORA*"
-      public_feed: "فيد دياسبرا العام لـ %{name}"
+      public_feed: "ملقم دياسبرا العام لـ %{name}"
       toggle: "التحول إلى الموقع الخاص بالهواتف المحمولة"
       whats_new: "ما الجديد؟"
       your_aspects: "فئاتك"
@@ -293,6 +293,12 @@ ar:
         one: "%{count} أعجبه هذا"
         other: "%{count} إعجابًا"
         zero: "لا إعجابات"
+      people_like_this_comment: 
+        few: "أعجب %{count} أشخاص هذا"
+        many: "أعجب %{count} شخص هذا"
+        one: "أعجب هذا %{count} شخصًا واحدًا"
+        other: "أعجب %{count} شخص بهذا"
+        zero: "لا أحد أعجبه هذا"
   limited: "محدود"
   more: "أكثر"
   next: "التالي"
@@ -497,15 +503,15 @@ ar:
   profiles: 
     edit: 
       allow_search: "السماح للجميع بالبحث عنك من خلال دياسبرا"
-      edit_profile: "تحرير الصفحة الشخصية"
+      edit_profile: "حَرِّر صفحتك الشخصية"
       first_name: "الإسم"
       last_name: "اللقب"
       update_profile: "تحديث الصفحة الشخصية"
       your_bio: "سيرتك الشخصية"
-      your_birthday: "تاريخ الميلاد"
+      your_birthday: "تاريخ مولدك"
       your_gender: "الجنس"
       your_location: "المكان"
-      your_name: "إسمك"
+      your_name: "اسمك"
       your_photo: "صورتك"
       your_private_profile: "صفحتك الخاصة"
       your_public_profile: "صفحتك العامة"
@@ -527,7 +533,7 @@ ar:
       unhappy: "غير راض?"
       update: "تحديث"
     new: 
-      enter_email: "أدخل بريد إلكتروني"
+      enter_email: "أدخل عنوان بريد إلكتروني"
       enter_password: "أدخل كلمة مرور"
       enter_password_again: "أعد إدخال كلمة المرور"
       enter_username: "اختر معرف (فقط حروف, أرقام, و الإشارات الخطية)"
@@ -613,7 +619,7 @@ ar:
       logged_in_as: "ولوج بـ %{name}"
       your_aspects: "الفئات خاصتك"
     invitations: 
-      by_email: "عبر البريد الإلكتروني"
+      by_email: "عبر رسالة بالبريد الإلكتروني"
       dont_have_now: "لا تملك دعوات حاليا، لكنها قادمة قريبا"
       from_facebook: "عبر فسبوك"
       invitations_left: "%{count} متبقية"
@@ -746,7 +752,7 @@ ar:
       does_not_exist: "هذا المستخدم %{username} غير موجود"
     update: 
       email_notifications_changed: "فشل تغيير اللغة"
-      language_changed: "تم تغيير اللغة"
+      language_changed: "غُيِّرت اللغة بنجاح"
       language_not_changed: "فشل تغيير اللغة"
       password_changed: "غُيِّرت كلمة المرور بنجاح. يمكنك الولوج بكلمة سرك الجديدة."
       password_not_changed: "فشل تغيير كلمة المرور"
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index 43dafba0b..224aac056 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -293,6 +293,12 @@ bg:
         one: "харесана %{count} път"
         other: "харесана %{count} пъти"
         zero: "не е харесана"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Ограничено"
   more: "Още"
   next: "следваща"
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 324f08563..6b9916fca 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -293,6 +293,12 @@ br:
         one: "1 den zo bet plijet ganti"
         other: "%{count} den zo bet plijet ganti"
         zero: "den ebet zo bet plijet ganti"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Muioc'h"
   next: "next"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index da6f5ff07..b0ff7a901 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -293,6 +293,12 @@ cs:
         one: "1 osobě se to líbí"
         other: "%{count} lidem se to líbí"
         zero: "žádná kladná hodnocení"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Omezený"
   more: "Více"
   next: "další"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index d2e8cf417..11b9cd7b9 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -293,6 +293,12 @@ cy:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "More"
   next: "next"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 08577d65d..6fe723fe7 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -293,6 +293,12 @@ da:
         one: "1 person kunne lide det"
         other: "%{count} personer kunne lide det"
         zero: "ingen personer kunne lide det"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Mere"
   next: "Næste"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 998848661..ce9541c2b 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -29,7 +29,7 @@ de:
         reshare: 
           attributes: 
             root_guid: 
-              taken: "You've already reshared that post!"
+              taken: "Due hast diesen Beitrag bereits wiederholt!"
         user: 
           attributes: 
             email: 
@@ -276,7 +276,7 @@ de:
       login: "Anmelden"
       logout: "Abmelden"
       profile: "Profil"
-      recent_notifications: "Recent notifications"
+      recent_notifications: "Kürzliche Benachrichtigungen"
       settings: "Einstellungen"
       view_all: "alle anzeigen"
   likes: 
@@ -293,6 +293,12 @@ de:
         one: "1 Person gefällt das"
         other: "%{count} Personen gefällt das"
         zero: "Keinem gefällt das"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Begrenzt"
   more: "Mehr"
   next: "Nächste"
@@ -371,31 +377,31 @@ de:
       other: "%{actors} haben angefangen mit dir zu teilen."
       zero: "Niemand hat angefangen mit dir zu teilen."
   notifier: 
-    click_here: "click here"
+    click_here: "hier klicken"
     comment_on_post: 
-      reply: "Reply or view %{name}'s post >"
+      reply: "Antworte oder schau dir %{name}s Beitrag an >"
     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}"
-    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
+      click_link: "Um deine neue E-Mail-Adresse %{unconfirmed_email} zu aktivieren, klicke bitte auf diesen Link:"
+      subject: "Bitte aktiviere deine neue E-Mail-Adresse %{unconfirmed_email}"
+    email_sent_by_diaspora: "Diese E-Mail wurde von Diaspora verschickt. Falls du solche E-Mails nicht mehr erhalten willst,"
     hello: "Hallo %{name}!"
     liked: 
-      liked: "%{name} gefällt dein Beitrag: "
-      view_post: "View post >"
+      liked: "%{name} gefällt dein Beitrag"
+      view_post: "Beitrag betrachten >"
     mentioned: 
       mentioned: "hat dich in einem Beitrag erwähnt:"
       subject: "%{name} hat dich auf Diaspora* erwähnt"
     private_message: 
-      reply_to_or_view: "Reply to or view this conversation >"
+      reply_to_or_view: "Antworte oder sieh dir diese Unterhaltung an >"
     single_admin: 
       admin: "Dein Diaspora-Administrator"
       subject: "Eine Nachricht dein Diaspora*-Konto betreffend:"
     started_sharing: 
       sharing: "hat angefangen mit dir zu teilen!"
-      subject: "Auf Diaspora* hat %{name} angefangen mit dir zu teilen"
-      view_profile: "View %{name}'s profile"
+      subject: "%{name} hat angefangen auf Diaspora* mit dir zu teilen"
+      view_profile: "Schau dir %{name}s Profil an"
     thanks: "Danke,"
-    to_change_your_notification_settings: "to change your notification settings"
+    to_change_your_notification_settings: "um deine Benachrichtigungs-Einstellungen zu ändern"
   ok: "OK"
   or: "oder"
   password: "Passwort"
@@ -555,17 +561,17 @@ de:
       sent: "Gesendet!"
   reshares: 
     create: 
-      failure: "There was an error resharing this post."
+      failure: "Ein Fehler trat beim Wiederholen dieses Beitrags auf."
     reshare: 
-      deleted: "Original post deleted by author."
+      deleted: "Originalbeitrag wurde vom Autor entfernt."
       reshare: 
-        few: "%{count} Reshares"
-        many: "%{count} Reshares"
-        one: "1 Reshare"
-        other: "%{count} Reshares"
-        zero: "Reshare"
-      reshare_confirmation: "Reshare %{author} - %{text}?"
-      show_original: "Show Original"
+        few: "%{count} Wiederholungen"
+        many: "%{count} Wiederholungen"
+        one: "1 Wiederholung"
+        other: "%{count} Wiederholungen"
+        zero: "Wiederholen"
+      reshare_confirmation: "%{author} - „%{text}“ wiederholen?"
+      show_original: "Original anzeigen"
   search: "Suche"
   services: 
     create: 
@@ -701,13 +707,13 @@ de:
   username: "Benutzername"
   users: 
     confirm_email: 
-      email_confirmed: "E-Mail %{email} activated"
-      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
+      email_confirmed: "E-Mail %{email} wurde aktiviert"
+      email_not_confirmed: "Die E-Mail-Adresse konnte nicht aktiviert werden. Falscher Link?"
     destroy: "Dein Konto wurde gesperrt. Es kann 20 Minuten dauern, bis wir die Schließung deines Kontos abgeschlossen haben. Vielen Dank, dass du Diaspora ausprobiert hast."
     edit: 
       also_commented: "… jemand ebenfalls den Beitrag eines Kontaktes kommentiert hat?"
       change: "Ändern"
-      change_email: "Change E-Mail"
+      change_email: "E-Mail-Adresse ändern"
       change_language: "Sprache ändern"
       change_password: "Passwort ändern"
       close_account: "Konto schließen"
@@ -716,7 +722,7 @@ de:
       download_photos: "Fotos herunterladen"
       download_xml: "Daten herunterladen (XML)"
       edit_account: "Konto bearbeiten"
-      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: "Wir haben dir einen Aktivierungslink zu %{unconfirmed_email} geschickt. Solange du dem Link nicht gefolgt bist und die neue Adresse aktiviert hast, werden wir weiterhin deine ursprüngliche E-Mail-Adresse %{email} verwenden."
       export_data: "Daten exportieren"
       liked: "... wenn jemandem dein Beitrag gefällt?"
       mentioned: "… du in einem Beitrag erwähnt wirst?"
@@ -750,8 +756,8 @@ de:
       language_not_changed: "Ändern der Sprache fehlgeschlagen"
       password_changed: "Passwort geändert"
       password_not_changed: "Ändern des Passworts fehlgeschlagen"
-      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
-      unconfirmed_email_not_changed: "E-Mail Change Failed"
+      unconfirmed_email_changed: "E-Mail-Adresse geändert. Braucht Aktivierung."
+      unconfirmed_email_not_changed: "E-Mail-Adressen-Änderung fehlgeschlagen"
   webfinger: 
     fetch_failed: "konnte Webfinger-Profil für %{profile_url} nicht laden"
     hcard_fetch_failed: "es gab Probleme beim Laden der hcard für %{account}"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 3fb59cd14..45287357b 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -293,6 +293,12 @@ el:
         one: "Αρέσει σε 1 άτομο"
         other: "Αρέσει σε %{count} άτομα"
         zero: "δεν αρέσει σε κανέναν"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Περιορισμένο"
   more: "Περισσότερα"
   next: "επόμενο"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 373d97dd6..3cbb56f1c 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -293,6 +293,12 @@ en_shaw:
         one: "%{count} 𐑤𐑲𐑒"
         other: "%{count} 𐑤𐑲𐑒𐑕"
         zero: "𐑯𐑴 𐑤𐑲𐑒𐑕"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "𐑤𐑦𐑥𐑦𐑑𐑩𐑛"
   more: "𐑥𐑹"
   next: "𐑯𐑧𐑒𐑕𐑑"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 9b1424d46..edbed565c 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -6,7 +6,7 @@
 eo: 
   _applications: "Aplikaĵoj"
   _comments: "Komentoj"
-  _contacts: "Contacts"
+  _contacts: "Kontaktoj"
   _home: "Hejmo"
   _photos: "Bildoj"
   _services: "Servoj"
@@ -29,7 +29,7 @@ eo:
         reshare: 
           attributes: 
             root_guid: 
-              taken: "You've already reshared that post!"
+              taken: "Vi jam repartoprenis tiun afiŝon!"
         user: 
           attributes: 
             email: 
@@ -69,10 +69,10 @@ eo:
     aspect_listings: 
       add_an_aspect: "+ Aldoni aspekton"
     aspect_stream: 
-      commented_on: "commented on"
-      posted: "posted"
-      recently: "recently:"
-      stream: "Stream"
+      commented_on: " komentis pri "
+      posted: "afiŝita"
+      recently: "antaŭ nelonge:"
+      stream: "Novaĵlisto"
     contacts_not_visible: "Kontaktoj en tiu aspekto ne povos vidi unu la aliajn."
     contacts_visible: "Kontaktoj en tiu aspekto povos vidi unu la alian."
     create: 
@@ -103,18 +103,18 @@ eo:
         heading: "Konekti al Cubbi.es"
         learn_more: "Lerni pli"
       diaspora_id: 
-        content_1: "Your Diaspora ID is:"
-        content_2: "Give it to anyone and they'll be able to find you on Diaspora."
-        heading: "Diaspora ID"
-      handle_explanation: "Tiu ĉi estas via DIASPORA* nomo.  Kiel retpoŝtadreso, vi povas doni tiun ĉi al homoj, por ke ili vin kontaktu."
+        content_1: "Via DIASPORA* uzantnomo estas:"
+        content_2: "Donu ĝin al iu ajn, kaj tiu povos trovi vin ĉe DIASPORA*."
+        heading: "DIASPORA* uzantnomo"
+      handle_explanation: "Tiu ĉi estas via DIASPORA* uzantnomo.  Kiel retpoŝtadreso, vi povas doni tiun ĉi al homoj, por ke ili vin kontaktu."
       no_contacts: "Nul kontaktoj"
       people_sharing_with_you: "Homoj, kiuj konigas kun vi"
       post_a_message: "Afiŝi mesaĝon »"
       services: 
-        content: "You can connect the following services to Diaspora:"
-        heading: "Connect Services"
-      tags_following: "Followed Tags"
-      your_aspects: "Your Aspects"
+        content: "Vi povas konekti la postajn servojn kun DIASPORA*:"
+        heading: "Konekti Servojn"
+      tags_following: "Abonitaj Etikedoj"
+      your_aspects: "Viaj Aspektoj"
     many: "%{count} aspektoj"
     move_contact: 
       error: "Ne povis movi kontakton: %{inspect}"
@@ -124,16 +124,16 @@ eo:
       create: "Krei"
       name: "Nomo"
     no_posts_message: 
-      start_talking: "Neniu jam diris iun ajn.  Mem komencu la interparoladon!"
-      try_adding_some_more_contacts: "Try adding some more contacts."
+      start_talking: "Neniu jam diris iun ajn!"
+      try_adding_some_more_contacts: "Aldonu pli kontaktojn."
     one: "1 aspekto"
     other: "%{count} aspektoj"
     seed: 
       family: "Familio"
       work: "Verkejo"
     selected_contacts: 
-      manage_your_aspects: "Manage your aspects."
-      no_contacts: "You don't have any contacts here yet."
+      manage_your_aspects: "Redakti viajn aspektojn."
+      no_contacts: "Vi ne jam havas iujn ajn kontaktojn tie ĉi."
       view_all_contacts: "Vidi ĉiujn kontaktojn"
     show: 
       edit_aspect: "redakti aspekton"
@@ -143,12 +143,12 @@ eo:
     zero: "neniu aspektoj"
   authorizations: 
     index: 
-      revoke_access: "Revoke Access"
+      revoke_access: "Revoki Permeson"
   back: "Antaŭen"
   bookmarklet: 
     explanation: "Vi povas poŝti al DIASPORA* el ĉie per legosignado la ligilon %{link}."
     explanation_link_text: "tiu ĉi ligilo"
-    heading: "DIASPORA* Legosigneto"
+    heading: "Legosigneto"
     post_something: "Afiŝi iujn al DIASPORA*"
     post_success: "Afiŝita!  Fermanta!"
   cancel: "Rezigni"
@@ -156,7 +156,7 @@ eo:
     few: "%{count} komentoj"
     many: "%{count} komentoj"
     new_comment: 
-      comment: "Komento"
+      comment: "Komenti"
       commenting: "Komentanta..."
     one: "1 komento"
     other: "%{count} komentoj"
@@ -168,13 +168,13 @@ eo:
     index: 
       add_a_new_aspect: "Aldoni novan aspekton"
       all_contacts: "Ĉiuj kontaktoj"
-      edit_aspect: "Edit %{name}"
-      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
+      edit_aspect: "Redakti je %{name}"
+      many_people_are_you_sure: "Ĉu vi certas, ke vi volas mesaĝi pli ol {suggested_limit} homojn? Afiŝi al tiu ĉi aspekto eble estas pli bona metodo kontakti ilin."
       my_contacts: "Miaj kontaktoj"
       no_contacts: "Neniuj kontaktoj."
       only_sharing_with_me: "Nur partoprenata al mi"
       remove_person_from_aspect: "Forigi %{person_name} de \"%{aspect_name}\""
-      start_a_conversation: "Start a conversation"
+      start_a_conversation: "Komenci interparoladon"
       title: "Kontaktoj"
       your_contacts: "Viaj kontaktoj"
     many: "%{count} kontaktoj"
@@ -194,7 +194,7 @@ eo:
         many: "%{count} novaj mesaĝoj"
         one: "1 nova mesaĝo"
         other: "%{count} novaj mesaĝoj"
-        zero: "neniu nova mesaĝo"
+        zero: "neniuj novaj mesaĝoj"
     index: 
       create_a_new_message: "krei novan mesaĝon"
       inbox: "Mesaĝujo"
@@ -203,7 +203,7 @@ eo:
       no_conversation_selected: "ne interparolado estas elektita"
       no_messages: "neniuj mesaĝoj"
     new: 
-      abandon_changes: "Abandon changes?"
+      abandon_changes: "Ĉu forlasi ŝanĝojn?"
       send: "Sendi"
       subject: "subjekto"
       to: "al"
@@ -222,7 +222,7 @@ eo:
       correct_the_following_errors_and_try_again: "Ĝustigu la postajn erarojn kaj reprovu."
       invalid_fields: "Malvalidaj Kampoj"
   fill_me_out: "Kompletu min"
-  find_people: "Find people"
+  find_people: "Trovi homojn"
   hide: "Kaŝi"
   home: 
     show: 
@@ -233,7 +233,7 @@ eo:
       login_here: "ensaluti tie ĉi"
       ownership: "Proprieto"
       ownership_explanation: "Vi posedas viajn bildojn, kaj vi ne devus rezigni tiun, por konigi ilin.  Vi ankoraŭ havas proprieton de ĉiu, kiun vi konigi per DIASPORA*, donante al vi kompletan administradon pri tiel, kiel aĵoj disdoniĝas."
-      share_what_you_want: "Share what you want, with whom you want."
+      share_what_you_want: "Partopreni tiun, kiun vi volas, kun kiu vi volas."
       simplicity: "Simpleco"
       simplicity_explanation: "DIASPORA* igas konigadon facilan – kaj ankaŭ privatecon.  Private per plano, DIASPORA* ne direktas tra multajn paĝojn de agordoj kaj opcioj, por sekurigi vian profilon."
       tagline_first_half: "Konigi tio, kio vi volas,"
@@ -251,7 +251,7 @@ eo:
     edit: 
       sign_up: "registriĝi"
     new: 
-      already_invited: "Jam invitita"
+      already_invited: "Tiuj homoj ankoraŭ ne akceptis vian inviton:"
       aspect: "Aspekto"
       comma_seperated_plz: "Vi povas aldoni multajn retpoŝtadresojn, apartate de komoj."
       if_they_accept_info: "se tiu akceptos, tiu aldoniĝos al la aspekto, en kiun vi invitis tiun."
@@ -276,9 +276,9 @@ eo:
       login: "ensaluti"
       logout: "elsaluti"
       profile: "profilo"
-      recent_notifications: "Recent notifications"
+      recent_notifications: "Freŝaj sciigoj"
       settings: "agordoj"
-      view_all: "View all"
+      view_all: "Vidi ĉiujn"
   likes: 
     likes: 
       people_dislike_this: 
@@ -293,7 +293,13 @@ eo:
         one: "%{count} ŝato"
         other: "%{count} ŝatoj"
         zero: "nul ŝatoj"
-  limited: "Limited"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
+  limited: "Malpublika"
   more: "Pli"
   next: "poste"
   no_results: "Neniuj Resultoj Trovitaj"
@@ -322,7 +328,7 @@ eo:
         many: "%{count} novaj sciigoj"
         one: "1 nova sciigo"
         other: "%{count} novaj sciigoj"
-        zero: "neniu nova sciigo"
+        zero: "neniuj novaj sciigoj"
     index: 
       and: "kaj"
       and_others: 
@@ -371,31 +377,31 @@ eo:
       other: "%{actors} komencis konigi kun vi."
       zero: "%{actors} komencis konigi kun vi."
   notifier: 
-    click_here: "click here"
+    click_here: "kliku tie ĉi"
     comment_on_post: 
-      reply: "Reply or view %{name}'s post >"
+      reply: "Respondi aŭ vidi afiŝon 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}"
-    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
+      click_link: "Por aktivigi vian novan retpoŝtadreson %{unconfirmed_email}, bonvolu kliki tiun ligilon:"
+      subject: "Bonvolu aktivigi vian novan retpoŝtadreson %{unconfirmed_email}"
+    email_sent_by_diaspora: "Tiu ĉi retpoŝton poŝtiĝi de DIASPORA*.  Se vi volus recivi tiajn ĉi retpoŝtojn ne plu,"
     hello: "Saluton %{name}!"
     liked: 
-      liked: "%{name} ĵus ŝatis vian afiŝon: "
-      view_post: "View post >"
+      liked: "%{name} ĵus ŝatis vian afiŝon"
+      view_post: "Vidi afiŝon >"
     mentioned: 
       mentioned: "menciis vin en afiŝon:"
       subject: "%{name} menciis vin ĉe DIASPORA*"
     private_message: 
-      reply_to_or_view: "Reply to or view this conversation >"
+      reply_to_or_view: "Respondi al aŭ vidi tiun ĉi interparoladon >"
     single_admin: 
       admin: "Via DIASPORA* administristo"
       subject: "Mesaĝo pri via DIASPORA* konto:"
     started_sharing: 
       sharing: "komencis konigi kun vi!"
       subject: "%{name} komencis konigi kun vi ĉe DIASPORA*"
-      view_profile: "View %{name}'s profile"
+      view_profile: "Vidi la profilo de %{name}"
     thanks: "Dankon,"
-    to_change_your_notification_settings: "to change your notification settings"
+    to_change_your_notification_settings: "ŝanĝi viajn sciigajn agordojn"
   ok: "Nu"
   or: "aŭ"
   password: "Pasvorto"
@@ -448,7 +454,7 @@ eo:
       to_accept_or_ignore: "akcepti aŭ ignori ĝin."
       you_have_no_tags: "vi ne havas etikedon!"
     webfinger: 
-      fail: "Ni bedauras, sed ni ne povis trovi je %{handle}."
+      fail: "Ni bedaŭras, sed ni ne povis trovi je %{handle}."
     zero: "neniu homo"
   photos: 
     create: 
@@ -489,9 +495,9 @@ eo:
       post_hidden: "Afiŝo de %{name} kaŝiĝas."
   posts: 
     show: 
-      destroy: "Delete"
-      not_found: "Sorry, we couldn't find that post."
-      permalink: "permalink"
+      destroy: "Forlasi"
+      not_found: "Ni bedaŭras, sed ni ne povis trovi tiun afiŝon."
+      permalink: "malŝanĝantligilo"
   previous: "antaŭe"
   profile: "Profilo"
   profiles: 
@@ -514,7 +520,7 @@ eo:
     update: 
       failed: "Ne povis ĝisdatigi profilon"
       updated: "Ĝisdatigi profilon"
-  public: "Public"
+  public: "Publika"
   registrations: 
     closed: "Registrado estas ferma ĉe tiu ĉi DIASPORA* guŝo."
     create: 
@@ -555,17 +561,17 @@ eo:
       sent: "sendita!"
   reshares: 
     create: 
-      failure: "There was an error resharing this post."
+      failure: "Estis eraro, kiam repartoprenanta tiun ĉi afiŝon."
     reshare: 
-      deleted: "Original post deleted by author."
+      deleted: "Originala afiŝo forlasiĝis de afiŝinto."
       reshare: 
-        few: "%{count} Reshares"
-        many: "%{count} Reshares"
-        one: "1 Reshare"
-        other: "%{count} Reshares"
-        zero: "Reshare"
-      reshare_confirmation: "Reshare %{author} - %{text}?"
-      show_original: "Show Original"
+        few: "%{count} Repartoprenadoj"
+        many: "%{count} Repartoprenadoj"
+        one: "1 Repartoprenado"
+        other: "%{count} Repartoprenadoj"
+        zero: "Repartopreni"
+      reshare_confirmation: "Ĉu repartopreni je %{author} - %{text}?"
+      show_original: "Videbligi originalan"
   search: "Serĉi"
   services: 
     create: 
@@ -590,7 +596,7 @@ eo:
       disconnect: "malkonekti"
       edit_services: "Redakti servojn"
       logged_in_as: "ensalutis, kiel"
-      no_services: "You have not connected any services yet."
+      no_services: "Vi ankoraŭ ne konektis iujn ajn servojn."
       really_disconnect: "ĉu malkonektu el %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Kliki tiun ligilon por akcepti vian inviton"
@@ -603,7 +609,7 @@ eo:
     add_contact: 
       add_new_contact: "Aldoni novan kontakton"
       create_request: "Trovi per DIASPORA* uzantnomo"
-      diaspora_handle: "diaspora@handle.org"
+      diaspora_handle: "diaspora@pod.org"
       enter_a_diaspora_username: "Aldonu DIASPORA* uzantnomo:"
       know_email: "Ĉu vi scias ties retpoŝtadreson?  Vi devus inviti tiun."
       your_diaspora_username_is: "Via DIASPORA* uzantnomo estas: %{diaspora_handle}"
@@ -632,7 +638,7 @@ eo:
       all: "ĉiuj"
       all_contacts: "ĉiuj kontaktoj"
       click_to_share_with: "Kliki por konigi kun:"
-      discard_post: "Discard post"
+      discard_post: "Forlasi afiŝon"
       make_public: "publikigi"
       post_a_message_to: "Afiŝi al %{aspect}"
       posting: "Afiŝanta..."
@@ -640,17 +646,17 @@ eo:
       publishing_to: "eldonanta al: "
       share: "Partopreni"
       share_with: "kontigi kun"
-      upload_photos: "Upload photos"
-      whats_on_your_mind: "kio vi nun pensas?"
+      upload_photos: "Alŝuti bildojn"
+      whats_on_your_mind: "Kion vi nun pensas?"
     reshare: 
       reshare: "Rekontigi"
     stream_element: 
       dislike: "Malŝati"
       like: "ŝati"
-      shared_with: "Shared with: %{aspect_names}"
+      shared_with: "Partoprenita kun: %{aspect_names}"
       unlike: "Ne plu ŝati"
       via: "de %{link}"
-      viewable_to_anyone: "This post is viewable to anyone on the web"
+      viewable_to_anyone: "Tiu ĉi afiŝo videblas de iu ajn ĉe la reto"
   status_messages: 
     create: 
       success: "Sukcese mencigis: %{names}"
@@ -667,29 +673,29 @@ eo:
       other: "bonvolu farigi viajn afiŝojn malpli longajn ol %{count} signoj"
       zero: "bonvolu farigi viajn afiŝojn malpli longajn ol %{count} signoj"
   stream_helper: 
-    hide_comments: "kaŝi komentojn"
-    show_more_comments: "Show %{number} more comments"
+    hide_comments: "kaŝi ĉiujn komentojn"
+    show_more_comments: "Videbligi %{number} pli komentojn"
   tag_followings: 
     create: 
-      failure: "Failed to follow: #%{name}"
-      success: "Successfully following: #%{name}"
+      failure: "Ne povis aboni: #%{name}"
+      success: "Sukcese abonis: #%{name}"
     destroy: 
-      failure: "Failed to stop following: #%{name}"
-      success: "Successfully stopped following: #%{name}"
+      failure: "Ne povis malaboni: #%{name}"
+      success: "Sukcese malabonis: #%{name}"
   tags: 
     show: 
-      follow: "Follow #%{tag}"
-      following: "Following #%{tag}"
+      follow: "Aboni al #%{tag}"
+      following: "Abonita al #%{tag}"
       nobody_talking: "Neniu jam parolas pri %{tag}."
       people_tagged_with: "Homoj etikediĝis kun %{tag}"
       posts_tagged_with: "Afiŝoj etikediĝis kun #%{tag}"
-      stop_following: "Stop Following #%{tag}"
+      stop_following: "Malaboni de #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Konekti al Cubbi.es"
-      connecting_is_simple: "Konekti vian DIASPORA* konton estas tiel facila, kiel kompleti du kampojn ĉe via Cubbi.es kontpaĝo."
+      connecting_is_simple: "Konekti vian DIASPORA* konton estas tiel facila!  Skribu vian DIASPORA* uzantnomon (<b>%{diaspora_id}</b>) de via cubbi.es <a href='%{href_link}'>settings page</a> kaj kliku \"connect\"."
       daniels_account: "La DIASPORA* konto de Daniel"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
+      log_in_with_diaspora_is_comming: "Baldaŭ, vi povos konekti novan aplikaĵon sen devon krei konton, kiu estas malsama ol via DIASPORA* konto."
       love_to_try: "Ni vin amus, se vi provi ĝin."
       making_the_connection: "Konektanta"
       screenshot_explanation: "%{link1}.  Tiu aparta cubby ligas kun %{link2}."
@@ -701,13 +707,13 @@ eo:
   username: "Uzantnomo"
   users: 
     confirm_email: 
-      email_confirmed: "E-Mail %{email} activated"
-      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
+      email_confirmed: "Retpoŝtadreso %{email} aktiviĝis"
+      email_not_confirmed: "Retpoŝtadreso ne povis aktiviĝi. Ĉu malĝusta ligilo?"
     destroy: "Via konto ŝlositas. Eble esti ĝis 20 minutoj antaŭ ni fini forigi vian konton.  Dankon por via provado je DIASPORA*"
     edit: 
       also_commented: "...iu ankaŭ komentis pri la afiŝo de via kontakto?"
       change: "Ŝanĝi"
-      change_email: "Change E-Mail"
+      change_email: "Redakti Retpoŝtadreso"
       change_language: "Ŝanĝi Lingvon"
       change_password: "Ŝanĝi Pasvorton"
       close_account: "Malaniĝi"
@@ -716,7 +722,7 @@ eo:
       download_photos: "elŝuti mian bildojn"
       download_xml: "elŝuti mian xml"
       edit_account: "Redakti konton"
-      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: "Ni poŝtis al vin aktivigadan ligilon ĉe %{unconfirmed_email}.  Ni uzados vian malŝanĝitan retpoŝtadreson %{email} ĝis vi klikos tiun ĉi ligilo kaj aktivigos la novan repoŝtadreson."
       export_data: "Eksporti Datumojn"
       liked: "...iu ŝatis vian afiŝon?"
       mentioned: "...vi menciatas en afiŝo?"
@@ -750,8 +756,8 @@ eo:
       language_not_changed: "Ne povis ŝanĝi lingvon"
       password_changed: "Pasvorto Ŝanĝita.  Vi nun povas ensaluti per via nova pasvorto."
       password_not_changed: "Ne povis ŝanĝi pasvorton"
-      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
-      unconfirmed_email_not_changed: "E-Mail Change Failed"
+      unconfirmed_email_changed: "Retpoŝtadreso ŝanĝiĝis.  Tio ĉi devas aktivigado."
+      unconfirmed_email_not_changed: "Ne povis ŝanĝigis retpoŝtadreson."
   webfinger: 
     fetch_failed: "ne povas alporti webfinger-an profilon por %{profile_url}"
     hcard_fetch_failed: "estis problemo, kiam ni alportis la hcard-on de #{@account}"
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index bc03fa07c..bef713436 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -293,6 +293,12 @@ es-AR:
         one: "%{count} le gusta"
         other: "%{count} les gusta"
         zero: "a nadie le gusta"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Más"
   next: "siguiente"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 027ae9273..a67a83aa4 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -29,7 +29,7 @@ es-CL:
         reshare: 
           attributes: 
             root_guid: 
-              taken: "You've already reshared that post!"
+              taken: "Ya compartiste ese post!"
         user: 
           attributes: 
             email: 
@@ -276,7 +276,7 @@ es-CL:
       login: "entrar"
       logout: "salir"
       profile: "perfil"
-      recent_notifications: "Recent notifications"
+      recent_notifications: "Notificaciones recientes"
       settings: "Configuración"
       view_all: "Ver todo"
   likes: 
@@ -292,7 +292,13 @@ es-CL:
         many: "%{count} personas les gusta esto"
         one: "1 persona le gusta esto"
         other: "%{count} personas les gusta esto"
-        zero: "a ninguna persona le gusta esto"
+        zero: "a nadie le gusta esto aun"
+      people_like_this_comment: 
+        few: "a %{count} les gusta esto"
+        many: "a %{count} les gusta esto"
+        one: "a %{count} le gusta esto"
+        other: "a %{count} les gusta esto"
+        zero: "a nadie le gusta esto aun"
   limited: "Restringido"
   more: "Más"
   next: "Siguiente"
@@ -371,31 +377,31 @@ es-CL:
       other: "%{actors} comenzaron a compartir contigo."
       zero: "%{actors} comenzó a compartir contigo."
   notifier: 
-    click_here: "click here"
+    click_here: "haz click aquí"
     comment_on_post: 
-      reply: "Reply or view %{name}'s post >"
+      reply: "Responde o mira el 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}"
-    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
+      click_link: "Para activar la nueva dirección de email %{unconfirmed_email}, por favor haz click en este link:"
+      subject: "Por favor activa tu nueva dirección de email %{unconfirmed_email}"
+    email_sent_by_diaspora: "Este email fue enviado por Diaspora.  Si no quieres seguir recibiendo emails como este, "
     hello: "¡Hola %{name}!"
     liked: 
-      liked: "a %{name} le gustó tu post: "
-      view_post: "View post >"
+      liked: "a %{name} le gustó tu post"
+      view_post: "Ver post >"
     mentioned: 
       mentioned: "Te mencionó en un post:"
       subject: "%{name} te mencionó en Diaspora*"
     private_message: 
-      reply_to_or_view: "Reply to or view this conversation >"
+      reply_to_or_view: "Responder o ver esta conversación >"
     single_admin: 
       admin: "Tu administrador de Diaspora"
       subject: "Un mensaje sobre tu cuenta de Diaspora:"
     started_sharing: 
       sharing: "Ha comenzado a compartir contigo!"
       subject: "%{name} ha comenzado a compartir contigo en Diaspora*"
-      view_profile: "View %{name}'s profile"
+      view_profile: "Ver el perfil de %{name}"
     thanks: "Gracias,"
-    to_change_your_notification_settings: "to change your notification settings"
+    to_change_your_notification_settings: "para cambiar tu configuración de notificaciones"
   ok: "OK"
   or: "o"
   password: "Contraseña"
@@ -527,7 +533,7 @@ es-CL:
       unhappy: "¿Triste?"
       update: "Actualizar"
     new: 
-      enter_email: "Ingresa un correo"
+      enter_email: "Ingresa un email"
       enter_password: "Ingresar contraseña"
       enter_password_again: "Ingresa la misma contraseña anterior"
       enter_username: "Escoge un nick (solo letras, números, y guión bajo)"
@@ -555,17 +561,17 @@ es-CL:
       sent: "¡enviado!"
   reshares: 
     create: 
-      failure: "There was an error resharing this post."
+      failure: "Hubo un error al compartir este post."
     reshare: 
-      deleted: "Original post deleted by author."
+      deleted: "Post original eliminado por el autor."
       reshare: 
-        few: "%{count} Reshares"
-        many: "%{count} Reshares"
-        one: "1 Reshare"
-        other: "%{count} Reshares"
-        zero: "Reshare"
-      reshare_confirmation: "Reshare %{author} - %{text}?"
-      show_original: "Show Original"
+        few: "Se ha compartido %{count} veces"
+        many: "Se ha compartido %{count} veces"
+        one: "Se ha compartido 1 vez"
+        other: "Se ha compartido %{count} veces"
+        zero: "Compartir"
+      reshare_confirmation: "Compartir %{author} - %{text}?"
+      show_original: "Mostrar Original"
   search: "Buscar"
   services: 
     create: 
@@ -701,13 +707,13 @@ es-CL:
   username: "Nombre de usuario"
   users: 
     confirm_email: 
-      email_confirmed: "E-Mail %{email} activated"
-      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
+      email_confirmed: "E-Mail %{email} activado"
+      email_not_confirmed: "El email no se pudo activar. Es la dirección correcta?"
     destroy: "Tu cuenta ha sido bloqueada. Nos puede tomar hasta 20 minutos cerrar tu cuenta. Gracias por probar Diaspora."
     edit: 
       also_commented: "...alguien comenta en el post de tu amigo?"
       change: "Modificar"
-      change_email: "Change E-Mail"
+      change_email: "Cambiar email"
       change_language: "Cambiar Idioma"
       change_password: "Cambiar Contraseña"
       close_account: "Cerrar Cuenta"
@@ -716,7 +722,7 @@ es-CL:
       download_photos: "descargar mis fotos"
       download_xml: "descargar mi xml"
       edit_account: "Editar cuenta"
-      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: "Te enviamos un link de activación a %{unconfirmed_email}. Hasta que sigas ese link y actives la nueva dirección, nosotros seguiremos usando tu dirección original %{email}."
       export_data: "Exportar Datos"
       liked: "...a alguien le gusta tu post?"
       mentioned: "...te mencionan en un post?"
@@ -750,8 +756,8 @@ es-CL:
       language_not_changed: "Error al cambiar de idioma"
       password_changed: "Contraseña Cambiada. Ahora puedes conectarte con la nueva contraseña."
       password_not_changed: "Error al cambiar la contraseña"
-      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
-      unconfirmed_email_not_changed: "E-Mail Change Failed"
+      unconfirmed_email_changed: "Se ha cambiado el email. Pero se requiere su activación."
+      unconfirmed_email_not_changed: "Error al cambiar el email"
   webfinger: 
     fetch_failed: "error al buscar el perfil webfinger para %{profile_url}"
     hcard_fetch_failed: "hubo un problema buscando la hcard de %{account}"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 0b83261ed..a958edb4f 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -293,6 +293,12 @@ es:
         one: "A 1 le gusta"
         other: "A %{count} les gusta"
         zero: "A nadie le gusta"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Restringido"
   more: "Más"
   next: "siguiente"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index f2fda0419..a3d89a11d 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -293,6 +293,12 @@ eu:
         one: "%{count}ek du gustoko"
         other: "%{count} pertsonek gustoko dute hau"
         zero: "oraindik ez du inork gustoko"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Mugatua"
   more: "Gehiago"
   next: "hurrengoa"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index e8dfa8d7d..891777a2e 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -293,6 +293,12 @@ fi:
         one: "%{count} tykkää"
         other: "%{count} tykkää"
         zero: "ei tykkäyksiä"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Lisää"
   next: "seuraava"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 9ca1d7b4c..84498a684 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -293,6 +293,12 @@ fr:
         one: "%{count} personne aime"
         other: "%{count} personnes aiment"
         zero: "Personne n'aime ça"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Plus"
   next: "suivant"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 8891f7795..96383b96b 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -293,6 +293,12 @@ ga:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "More"
   next: "ar aghaidh"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index a401a97fe..aa873b172 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -293,6 +293,12 @@ he:
         one: "אדם אחד אהב את זה"
         other: "%{count} אנשים אהבו את זה"
         zero: "אף אחד לא אהב את זה"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "המשך"
   next: "הבאה"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 3bf51142e..fe0257624 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -293,6 +293,12 @@ hu:
         one: "1 személy kedveli"
         other: "%{count} személy kedveli"
         zero: "senki nem kedveli"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Bővebben"
   next: "következő"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index e085dd3a7..7d61e2214 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -293,6 +293,12 @@ id:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "More"
   next: "next"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index e08b20a49..f1666d12e 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -293,6 +293,12 @@ is:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Meira"
   next: "næsta"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index c6fd95a12..27179fcaf 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -29,7 +29,7 @@ it:
         reshare: 
           attributes: 
             root_guid: 
-              taken: "You've already reshared that post!"
+              taken: "Hai già condiviso quel post!"
         user: 
           attributes: 
             email: 
@@ -276,7 +276,7 @@ it:
       login: "accedi"
       logout: "esci"
       profile: "profilo"
-      recent_notifications: "Recent notifications"
+      recent_notifications: "Notifiche recenti"
       settings: "impostazioni"
       view_all: "Elenco completo"
   likes: 
@@ -293,6 +293,12 @@ it:
         one: "%{count} Mi piace"
         other: "%{count} Mi piace"
         zero: "0 Mi piace"
+      people_like_this_comment: 
+        few: "%{count} mi piace"
+        many: "%{count} mi piace"
+        one: "%{count} mi piace"
+        other: "%{count} mi piace"
+        zero: "0 mi piace"
   limited: "Non pubblico"
   more: "Altro"
   next: "successivo"
@@ -371,31 +377,31 @@ it:
       other: "%{actors} hanno iniziato a condividere con te."
       zero: "%{actors} ha iniziato a condividere con te."
   notifier: 
-    click_here: "click here"
+    click_here: "clicca qui"
     comment_on_post: 
-      reply: "Reply or view %{name}'s post >"
+      reply: "Rispondi o leggi il post di %{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}"
-    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
+      click_link: "Per attivare il nuo nuovo indirizzo email %{unconfirmed_email}, per favore clicca su questo link:"
+      subject: "Per favore attiva il tuo nuovo indirizzo email %{unconfirmed_email}"
+    email_sent_by_diaspora: "Questo messaggio è stato spedito da Diaspora.  Se preferisci smettere di ricevere questo tipo di email,"
     hello: "Ciao %{name}!"
     liked: 
       liked: "%{name} ha appena apprezzato il tuo post: "
-      view_post: "View post >"
+      view_post: "Leggi il post >"
     mentioned: 
       mentioned: "ti ha menzionato in un post:"
       subject: "%{name} ti ha menzionato su Diaspora*"
     private_message: 
-      reply_to_or_view: "Reply to or view this conversation >"
+      reply_to_or_view: "Rispondi o leggi questa conversazione >"
     single_admin: 
       admin: "Il tuo amministratore Diaspora"
       subject: "Un messaggio sul tuo account Diaspora:"
     started_sharing: 
       sharing: "ha iniziato a condividere con te!"
       subject: "%{name} ha iniziato a condividere con te su Diaspora*"
-      view_profile: "View %{name}'s profile"
+      view_profile: "Guarda il profilo di %{name}"
     thanks: "Grazie,"
-    to_change_your_notification_settings: "to change your notification settings"
+    to_change_your_notification_settings: "per cambiare le opzioni delle notifiche"
   ok: "OK"
   or: "o"
   password: "Password"
@@ -527,7 +533,7 @@ it:
       unhappy: "Triste?"
       update: "Aggiorna"
     new: 
-      enter_email: "Inserisci un e-mail"
+      enter_email: "Inserisci un indirizzo email"
       enter_password: "Inserisci una password"
       enter_password_again: "Inserisci la stessa password di prima"
       enter_username: "Scegli un nome utente (inserisci solo lettere, numeri e trattino basso)"
@@ -555,17 +561,17 @@ it:
       sent: "richiesta inviata!"
   reshares: 
     create: 
-      failure: "There was an error resharing this post."
+      failure: "C'è stato un errore nel ricondividere questo post."
     reshare: 
-      deleted: "Original post deleted by author."
+      deleted: "Il post originale è stato eliminato dall'autore."
       reshare: 
-        few: "%{count} Reshares"
-        many: "%{count} Reshares"
-        one: "1 Reshare"
-        other: "%{count} Reshares"
-        zero: "Reshare"
-      reshare_confirmation: "Reshare %{author} - %{text}?"
-      show_original: "Show Original"
+        few: "%{count} Ricondivisioni"
+        many: "%{count} Ricondivisioni"
+        one: "1 Ricondivisione"
+        other: "%{count} Ricondivisioni"
+        zero: "Ricondividi"
+      reshare_confirmation: "Vuoi ricondividere %{author} - %{text}?"
+      show_original: "Mostra l'originale"
   search: "Cerca"
   services: 
     create: 
@@ -613,7 +619,7 @@ it:
       logged_in_as: "accesso effettuato come %{name}"
       your_aspects: "i tuoi aspetti"
     invitations: 
-      by_email: "Via Email"
+      by_email: "Via email"
       dont_have_now: "Non ne hai alcuno per il momento, ma altri arriveranno presto!"
       from_facebook: "Da Facebook"
       invitations_left: "%{count} rimanenti"
@@ -701,26 +707,26 @@ it:
   username: "Nome Utente"
   users: 
     confirm_email: 
-      email_confirmed: "E-Mail %{email} activated"
-      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
+      email_confirmed: "Email %{email} attivata"
+      email_not_confirmed: "L'email non è stata attivata. C'è un errore nel link?"
     destroy: "Il tuo account è stato bloccato. Potrebbero occorrerci 20 minuti per terminare la chiusura del tuo account. Grazie per aver provato Diaspora."
     edit: 
       also_commented: "...qualcun altro ha commentato il post del tuo contatto?"
       change: "Cambia"
-      change_email: "Change E-Mail"
+      change_email: "Cambia email"
       change_language: "Cambia lingua"
-      change_password: "Cambia Password"
+      change_password: "Cambia password"
       close_account: "Chiudi account"
       comment_on_post: "...qualcuno ha commentato il tuo post?"
       current_password: "Password attuale"
       download_photos: "scarica le mie foto"
       download_xml: "scarica il mio xml"
       edit_account: "Modifica account"
-      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: "È stato spedito su %{unconfirmed_email} un link di attivazione. Continueremo ad usare la tua email originale %{email} finché non cliccherai sul link e attiverai il nuovo indirizzo."
       export_data: "Esporta Dati"
       liked: "...a qualcuno piace il tuo post?"
       mentioned: "...sei menzionato in un post?"
-      new_password: "Nuova Password"
+      new_password: "Nuova password"
       private_message: "...hai ricevuto un messaggio privato?"
       receive_email_notifications: "Ricevi notifiche via email quando..."
       started_sharing: "...qualcuno vuole condividere con te?"
@@ -747,11 +753,11 @@ it:
     update: 
       email_notifications_changed: "Notifiche email modificate con successo"
       language_changed: "Lingua cambiata"
-      language_not_changed: "Cambio di lingua fallito"
+      language_not_changed: "Il cambio di lingua è fallito"
       password_changed: "Password cambiata. Ora puoi effettuare l'accesso con la tua nuova password."
-      password_not_changed: "Cambio di password fallito"
-      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
-      unconfirmed_email_not_changed: "E-Mail Change Failed"
+      password_not_changed: "Il cambio di password è fallito"
+      unconfirmed_email_changed: "L'email è cambiata. E' necessario attivare l'indirizzo."
+      unconfirmed_email_not_changed: "Il cambio di email è fallito"
   webfinger: 
     fetch_failed: "impossibile recuperare il profilo webfinger da %{profile_url}"
     hcard_fetch_failed: "impossibile recuperare l'hcard di %{account}"
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index 8b2c253f4..8e6f075a9 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -293,6 +293,12 @@ ja:
         one: "これが好きな人：1人"
         other: "これが好きな人：%{count}人"
         zero: "これが好きな人：0人"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "続き"
   next: "次へ"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index d0d78e91a..1baae0db6 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -293,6 +293,12 @@ ko:
         one: "한 명이 좋아합니다"
         other: "%{count}명이 좋아합니다"
         zero: "아무도 좋아하지 않습니다"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "제한됨"
   more: "더"
   next: "다음"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 9347a70b5..e3882308b 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -293,6 +293,12 @@ lt:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "More"
   next: "next"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index da9de2ca5..43c002bb9 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -293,6 +293,12 @@ mk:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "More"
   next: "next"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 039300737..21aadabb9 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -293,6 +293,12 @@ nb:
         one: "1 person liker dette"
         other: "%{count} personer liker dette"
         zero: "ingen liker dette"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Mer"
   next: "neste"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 37a096158..33d4e2880 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -293,6 +293,12 @@ nl:
         one: "%{count} persoon vindt dit leuk"
         other: "%{count} mensen vinden dit leuk"
         zero: "niemand vindt dit leuk"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Beperkt"
   more: "Meer"
   next: "volgende"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 6146192f2..c69c2a680 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -293,6 +293,12 @@ pa:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "ਹੋਰ"
   next: "ਅੱਗੇ"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 9c5298b2e..52f835379 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -293,6 +293,12 @@ pl:
         one: "1 osoba to polubiła"
         other: "%{count} osób polubiło to"
         zero: "nikt tego nie polubił"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Więcej"
   next: "następny"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 90bfbe17f..4810d2d65 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -293,6 +293,12 @@ pt-BR:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Mais"
   next: "Próximo"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 0c6f3f03e..e957ba5a2 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -293,6 +293,12 @@ pt-PT:
         one: "%{count} pessoa gosta"
         other: "%{count} pessoas gostam"
         zero: "ninguém gosta"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Mais"
   next: "próximo"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 9627575e5..d882b6a27 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -293,6 +293,12 @@ ro:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Mai mult"
   next: "următorul"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 9b55852db..2a015e4be 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -293,6 +293,12 @@ ru:
         one: "%{count} понравилось"
         other: "%{count} понравилось"
         zero: "никому не понравилось"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Подробнее"
   next: "далее"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index ca191ef09..15ae41e47 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -293,6 +293,12 @@ sk:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Viac"
   next: "ďalej"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index ba6f7c4af..ff5fbe4d8 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -293,6 +293,12 @@ sl:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Več"
   next: "naslednja"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index bec18a453..6db83d222 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -293,6 +293,12 @@ sv:
         one: "1 person gillar det här"
         other: "%{count} personer gillar det här"
         zero: "inga personer gillar det här"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "Mer"
   next: "nästa"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index bdb95bf51..014a418ba 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -293,6 +293,12 @@ tr:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "More"
   next: "next"
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 27035e6fc..d52cc9c41 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -293,6 +293,12 @@ zh-CN:
         one: "有1个人觉得好"
         other: "有%{count}个人觉得好"
         zero: "没有人觉得好"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        zero: "no likes"
   limited: "Limited"
   more: "更多"
   next: "下一步"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index c9552cb8a..55cc55d13 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -29,7 +29,7 @@ zh-TW:
         reshare: 
           attributes: 
             root_guid: 
-              taken: "You've already reshared that post!"
+              taken: "你已經轉貼過該篇貼文了!"
         user: 
           attributes: 
             email: 
@@ -71,7 +71,7 @@ zh-TW:
     aspect_stream: 
       commented_on: "有意見的"
       posted: "發表的"
-      recently: "近來:"
+      recently: "最近:"
       stream: "事件流"
     contacts_not_visible: "此面向中的聯繫無法看見彼此."
     contacts_visible: "此面向中的聯繫可以看見彼此."
@@ -185,7 +185,7 @@ zh-TW:
     zero: "沒有任何聯繫"
   conversations: 
     create: 
-      sent: "訊息已送出"
+      sent: "已送出訊息"
     destroy: 
       success: "對話移除成功"
     helper: 
@@ -276,7 +276,7 @@ zh-TW:
       login: "登入"
       logout: "登出"
       profile: "個人檔案"
-      recent_notifications: "Recent notifications"
+      recent_notifications: "最近消息"
       settings: "設定"
       view_all: "檢視全部"
   likes: 
@@ -293,6 +293,12 @@ zh-TW:
         one: "有%{count}個讚"
         other: "有%{count}個讚"
         zero: "沒有讚"
+      people_like_this_comment: 
+        few: "有%{count}個人說讚"
+        many: "有%{count}個人說讚"
+        one: "有%{count}個人說讚"
+        other: "有%{count}個人說讚"
+        zero: "沒人說讚"
   limited: "有限分享"
   more: "更多"
   next: "後面"
@@ -371,31 +377,31 @@ zh-TW:
       other: "%{actors}開始跟你分享了."
       zero: "%{actors}開始跟你分享了."
   notifier: 
-    click_here: "click here"
+    click_here: "按這裡"
     comment_on_post: 
-      reply: "Reply or view %{name}'s post >"
+      reply: "回或看 %{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}"
-    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
+      click_link: "請按一下以下連結, 來啟用你新的電子郵件信箱 %{unconfirmed_email}:"
+      subject: "請啟用你新的電子信箱 %{unconfirmed_email}"
+    email_sent_by_diaspora: "這封電子郵件是從 Diaspora 寄出. 如果你不想再收到這類的信件,"
     hello: "%{name}你好!"
     liked: 
-      liked: "%{name}剛剛說你的貼文讚: "
-      view_post: "View post >"
+      liked: "%{name}剛剛說你的貼文讚"
+      view_post: "看貼文 >"
     mentioned: 
       mentioned: "在貼文中提到你:"
       subject: "%{name} 在 Diaspora* 提到你"
     private_message: 
-      reply_to_or_view: "Reply to or view this conversation >"
+      reply_to_or_view: "回或看這次對話 >"
     single_admin: 
       admin: "為您服務的 Diaspora 管理員"
       subject: "關於你的 Diaspora 帳號的訊息:"
     started_sharing: 
       sharing: "開始跟你分享了!"
-      subject: "%{name} 在 Diaspora* 開始跟你分享了"
-      view_profile: "View %{name}'s profile"
+      subject: "%{name} 開始在 Diaspora* 跟你分享了"
+      view_profile: "看 %{name} 的個人檔案"
     thanks: "謝謝,"
-    to_change_your_notification_settings: "to change your notification settings"
+    to_change_your_notification_settings: "來更改消息通知的設定"
   ok: "好了"
   or: "或是"
   password: "密碼"
@@ -440,8 +446,8 @@ zh-TW:
       message: "送訊息"
       no_posts: "沒有貼文可顯示!"
       not_connected: "你不跟這個人分享"
-      recent_posts: "近來貼文"
-      recent_public_posts: "近來公開貼文"
+      recent_posts: "最近貼文"
+      recent_public_posts: "最近公開貼文"
       return_to_aspects: "回你的面向主頁"
       see_all: "看全部"
       start_sharing: "開始分享"
@@ -456,7 +462,7 @@ zh-TW:
       runtime_error: "相片上傳失敗. 你確定有扣安全帶嗎?"
       type_error: "相片上傳失敗. 你確定有加入任何圖片嗎?"
     destroy: 
-      notice: "相片已刪除."
+      notice: "已刪除相片."
     edit: 
       editing: "編輯中"
     new: 
@@ -513,7 +519,7 @@ zh-TW:
       your_tags_placeholder: "像是: #電影 #貓咪 #旅行 #老師 #紐約"
     update: 
       failed: "個人檔案更新失敗"
-      updated: "個人檔案已更新"
+      updated: "已更新個人檔案"
   public: "公開"
   registrations: 
     closed: "本 Diaspora pod 不開放登記."
@@ -555,17 +561,17 @@ zh-TW:
       sent: "已送出!"
   reshares: 
     create: 
-      failure: "There was an error resharing this post."
+      failure: "轉貼這篇貼文時發生錯誤."
     reshare: 
-      deleted: "Original post deleted by author."
+      deleted: "原貼文已經被作者刪除了."
       reshare: 
-        few: "%{count} Reshares"
-        many: "%{count} Reshares"
-        one: "1 Reshare"
-        other: "%{count} Reshares"
-        zero: "Reshare"
-      reshare_confirmation: "Reshare %{author} - %{text}?"
-      show_original: "Show Original"
+        few: "被轉貼%{count}次"
+        many: "被轉貼%{count}次"
+        one: "被轉貼1次"
+        other: "被轉貼%{count}次"
+        zero: "轉貼"
+      reshare_confirmation: "要轉貼 %{author} - %{text} 嗎?"
+      show_original: "顯示原文"
   search: "搜尋"
   services: 
     create: 
@@ -643,7 +649,7 @@ zh-TW:
       upload_photos: "上傳照片"
       whats_on_your_mind: "在想什麼?"
     reshare: 
-      reshare: "重新分享"
+      reshare: "轉貼"
     stream_element: 
       dislike: "遜"
       like: "讚"
@@ -701,13 +707,13 @@ zh-TW:
   username: "用戶名稱"
   users: 
     confirm_email: 
-      email_confirmed: "E-Mail %{email} activated"
-      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
+      email_confirmed: "已啟用E-Mail %{email}"
+      email_not_confirmed: "無法啟用E-Mail. 連結有誤嗎?"
     destroy: "帳號已鎖定. 關閉帳號可能需要20分鐘才能完成. 感謝你試用 Diaspora."
     edit: 
       also_commented: "...當有人也對你的聯繫的貼文發表意見時?"
       change: "更改"
-      change_email: "Change E-Mail"
+      change_email: "更改E-Mail"
       change_language: "更改語言"
       change_password: "更改密碼"
       close_account: "關閉帳號"
@@ -716,7 +722,7 @@ zh-TW:
       download_photos: "下載我的相片"
       download_xml: "下載我的 xml"
       edit_account: "編輯帳號"
-      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: "我們已經將啟用連結寄到 %{unconfirmed_email} 給你. 在你使用該連結啟用新的位址前, 我們還會繼續使用你原來的位址, 也就是 %{email}."
       export_data: "資料匯出"
       liked: "...有人對你的貼文說讚時?"
       mentioned: "...當貼文中提到你時?"
@@ -745,13 +751,13 @@ zh-TW:
     public: 
       does_not_exist: "不存在 %{username} 這個用戶!"
     update: 
-      email_notifications_changed: "電郵通知已更改"
-      language_changed: "語言已更改"
+      email_notifications_changed: "已更改電郵通知"
+      language_changed: "已更改語言"
       language_not_changed: "語言更改失敗"
-      password_changed: "密碼已變更. 現在起你可以用新密碼登入了."
+      password_changed: "已更改密碼. 現在起你可以用新的密碼登入了."
       password_not_changed: "密碼更改失敗"
-      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
-      unconfirmed_email_not_changed: "E-Mail Change Failed"
+      unconfirmed_email_changed: "已更改E-Mail. 必須要啟動使用."
+      unconfirmed_email_not_changed: "E-Mail更改失敗"
   webfinger: 
     fetch_failed: "擷取 %{profile_url} 的 webfinger 個人檔案失敗"
     hcard_fetch_failed: "擷取 %{account} 的 hcard 資料時發生錯誤"
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index ca83aa9c6..04af0e0f4 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -23,7 +23,7 @@ de:
       no_more: "Keine weiteren Beiträge."
     publisher: 
       at_least_one_aspect: "Du musst zumindest zu einem Aspekt posten"
-    reshares: "duplicate:\"You've already reshared that post!\""
+    reshares: "Doppel: \"Du hast diesen Beitrag bereits wiederholt!\""
     search_for: "Nach {{name}} suchen"
     show_more: "Mehr zeigen"
     timeago: 
diff --git a/config/locales/javascript/javascript.eo.yml b/config/locales/javascript/javascript.eo.yml
index d8cf542c3..19c8487c7 100644
--- a/config/locales/javascript/javascript.eo.yml
+++ b/config/locales/javascript/javascript.eo.yml
@@ -23,7 +23,7 @@ eo:
       no_more: "Ne pli afiŝoj."
     publisher: 
       at_least_one_aspect: "Vi devus eldoni al almenaŭ unu aspekto"
-    reshares: "duplicate:\"You've already reshared that post!\""
+    reshares: "multobligaĵo:\"Vi jam repartoprenis tiun ĉi afiŝon!\""
     search_for: "Serĉi por {{name}}"
     show_more: "vidi plu"
     timeago: 
diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml
index 3880e0cf2..624358aa6 100644
--- a/config/locales/javascript/javascript.zh-TW.yml
+++ b/config/locales/javascript/javascript.zh-TW.yml
@@ -23,7 +23,7 @@ zh-TW:
       no_more: "沒有貼文了."
     publisher: 
       at_least_one_aspect: "發表時請至少選擇一個面向"
-    reshares: "duplicate:\"You've already reshared that post!\""
+    reshares: "重複了:\"你已經重新分享過該篇貼文了!\""
     search_for: "搜尋 {{name}}"
     show_more: "顯示更多"
     timeago: