diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index e810f743a..03e0c213a 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -206,6 +206,7 @@ ar:
     new: 
       abandon_changes: "أأتجاهل التغييرات؟"
       send: "أَرْسِل"
+      sending: "Sending..."
       subject: "العنوان"
       to: "إلى"
     show: 
@@ -572,6 +573,7 @@ ar:
         other: "أُعِيدَ نشرها %{count} مرة"
         zero: "أَعِد النشر"
       reshare_confirmation: "هل أُعِد نشر مشاركة %{author} - ومحتواها: %{text} ?"
+      reshare_original: "Reshare orignial"
       show_original: "اعرض الأصلية"
   search: "بحث"
   services: 
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index 5cc304384..1fdd1bc29 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -206,6 +206,7 @@ bg:
     new: 
       abandon_changes: "Отказвате се от промените?"
       send: "Изпращане"
+      sending: "Sending..."
       subject: "тема"
       to: "до"
     show: 
@@ -572,6 +573,7 @@ bg:
         other: "%{count} споделяния"
         zero: "Споделяне"
       reshare_confirmation: "Споделяне на \"%{text}\" от %{author}?"
+      reshare_original: "Reshare orignial"
       show_original: "Оригиналът"
   search: "Търсене"
   services: 
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 2910e3641..cfb1958ad 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -206,6 +206,7 @@ br:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Kaset"
+      sending: "Sending..."
       subject: "sujed"
       to: "da"
     show: 
@@ -572,6 +573,7 @@ br:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Klask"
   services: 
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index d820669cb..f04659875 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -206,6 +206,7 @@ cs:
     new: 
       abandon_changes: "Zamítnout změny?"
       send: "Poslat"
+      sending: "Sending..."
       subject: "předmět"
       to: "pro"
     show: 
@@ -572,6 +573,7 @@ cs:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Hledat"
   services: 
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 55f0830d7..830d515b1 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -206,6 +206,7 @@ cy:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
+      sending: "Sending..."
       subject: "subject"
       to: "to"
     show: 
@@ -572,6 +573,7 @@ cy:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Search"
   services: 
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 48dccea79..d4fdd4cd4 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -206,6 +206,7 @@ da:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
+      sending: "Sending..."
       subject: "emne"
       to: "til"
     show: 
@@ -572,6 +573,7 @@ da:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Søg"
   services: 
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 2773ef603..b00c89ad1 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -29,7 +29,7 @@ de:
         reshare: 
           attributes: 
             root_guid: 
-              taken: "Due hast diesen Beitrag bereits wiederholt!"
+              taken: "Due hast diesen Beitrag bereits weitergesagt!"
         user: 
           attributes: 
             email: 
@@ -108,7 +108,7 @@ de:
         heading: "Diaspora ID"
       handle_explanation: "Das ist deine Diaspora ID. Du kannst sie wie eine E-Mail-Adresse weitergeben, damit andere Nutzer mit dir Kontakt aufnehmen können."
       no_contacts: "Keine Kontakte"
-      no_tags: "No tags"
+      no_tags: "Keine Tags"
       people_sharing_with_you: "Leute die mit dir teilen"
       post_a_message: "schreibe eine Nachricht >>"
       services: 
@@ -206,6 +206,7 @@ de:
     new: 
       abandon_changes: "Änderungen verwerfen?"
       send: "Senden"
+      sending: "Senden..."
       subject: "Betreff"
       to: "An"
     show: 
@@ -296,10 +297,10 @@ de:
         zero: "Keinem gefällt das"
       people_like_this_comment: 
         few: "%{count} likes"
-        many: "%{count} likes"
-        one: "%{count} like"
-        other: "%{count} likes"
-        zero: "no likes"
+        many: "Gefällt %{count}"
+        one: "Gefällt %{count}"
+        other: "Gefällt %{count}"
+        zero: "Gefällt niemanden"
   limited: "Begrenzt"
   more: "Mehr"
   next: "Nächste"
@@ -562,16 +563,17 @@ de:
       sent: "Gesendet!"
   reshares: 
     create: 
-      failure: "Ein Fehler trat beim Wiederholen dieses Beitrags auf."
+      failure: "Ein Fehler trat beim weitersagen dieses Beitrags auf."
     reshare: 
       deleted: "Originalbeitrag wurde vom Autor entfernt."
       reshare: 
-        few: "%{count} Wiederholungen"
-        many: "%{count} Wiederholungen"
-        one: "1 Wiederholung"
-        other: "%{count} Wiederholungen"
-        zero: "Wiederholen"
-      reshare_confirmation: "%{author} - „%{text}“ wiederholen?"
+        few: "%{count} mal weitergesagt"
+        many: "%{count} mal weitergesagt"
+        one: "Einmal weitergesagt"
+        other: "%{count} mal weitergesagt"
+        zero: "Weitersagen"
+      reshare_confirmation: "%{author}'s Beitrag weitersagen?"
+      reshare_original: "Original weitersagen"
       show_original: "Original anzeigen"
   search: "Suche"
   services: 
@@ -650,7 +652,7 @@ de:
       upload_photos: "Fotos hochladen"
       whats_on_your_mind: "Woran denkst du gerade?"
     reshare: 
-      reshare: "Erneut senden an"
+      reshare: "Weitersagen"
     stream_element: 
       dislike: "Gefällt mir nicht"
       like: "Gefällt mir"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 4325bebc8..71defc2cc 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -206,6 +206,7 @@ el:
     new: 
       abandon_changes: "Απόρριψη αλλαγών?"
       send: "Αποστολή"
+      sending: "Sending..."
       subject: "θέμα"
       to: "στον"
     show: 
@@ -572,6 +573,7 @@ el:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Αναζήτηση"
   services: 
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 41f443ac9..5aae22cad 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -206,6 +206,7 @@ en_shaw:
     new: 
       abandon_changes: "𐑩𐑚𐑨𐑯𐑛𐑩𐑯 𐑗𐑱𐑯𐑡𐑩𐑟?"
       send: "𐑕𐑧𐑯𐑛"
+      sending: "Sending..."
       subject: "𐑕𐑳𐑚𐑡𐑧𐑒𐑑"
       to: "𐑑"
     show: 
@@ -572,6 +573,7 @@ en_shaw:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "𐑕𐑻𐑗"
   services: 
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index c72ddf7da..60c852743 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -108,7 +108,7 @@ eo:
         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"
-      no_tags: "No tags"
+      no_tags: "Neniu etikedigo"
       people_sharing_with_you: "Homoj, kiuj konigas kun vi"
       post_a_message: "Afiŝi mesaĝon »"
       services: 
@@ -206,6 +206,7 @@ eo:
     new: 
       abandon_changes: "Ĉu forlasi ŝanĝojn?"
       send: "Sendi"
+      sending: "Poŝtanta..."
       subject: "subjekto"
       to: "al"
     show: 
@@ -295,11 +296,11 @@ eo:
         other: "%{count} ŝatoj"
         zero: "nul ŝatoj"
       people_like_this_comment: 
-        few: "%{count} likes"
-        many: "%{count} likes"
-        one: "%{count} like"
-        other: "%{count} likes"
-        zero: "no likes"
+        few: "%{count} ŝatadoj"
+        many: "%{count} ŝatadoj"
+        one: "%{count} ŝatado"
+        other: "%{count} ŝatadoj"
+        zero: "neniu ŝatado"
   limited: "Malpublika"
   more: "Pli"
   next: "poste"
@@ -382,7 +383,7 @@ eo:
     comment_on_post: 
       reply: "Respondi aŭ vidi afiŝon de %{name} >"
     confirm_email: 
-      click_link: "Por aktivigi vian novan retpoŝtadreson %{unconfirmed_email}, bonvolu kliki tiun ligilon:"
+      click_link: "Por aktivigi vian novan retpoŝtadreson %{unconfirmed_email}, bonvolu kliki tiun ĉi 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}!"
@@ -572,6 +573,7 @@ eo:
         other: "%{count} Repartoprenadoj"
         zero: "Repartopreni"
       reshare_confirmation: "Ĉu repartopreni je %{author} - %{text}?"
+      reshare_original: "Repartopreni la originalan"
       show_original: "Videbligi originalan"
   search: "Serĉi"
   services: 
@@ -620,7 +622,7 @@ eo:
       logged_in_as: "ensalutita, kiel %{name}"
       your_aspects: "viaj aspektoj"
     invitations: 
-      by_email: "Per Retpoŝtado"
+      by_email: "Per retpoŝtado"
       dont_have_now: "Vi ne havas iujn ajn nun, sed pli invitoj baldaŭ venos!"
       from_facebook: "El Facebook"
       invitations_left: "%{count} postrestantas"
@@ -714,20 +716,20 @@ eo:
     edit: 
       also_commented: "...iu ankaŭ komentis pri la afiŝo de via kontakto?"
       change: "Ŝanĝi"
-      change_email: "Redakti Retpoŝtadreso"
-      change_language: "Ŝanĝi Lingvon"
-      change_password: "Ŝanĝi Pasvorton"
+      change_email: "Redakti retpoŝtadreso"
+      change_language: "Ŝanĝi lingvon"
+      change_password: "Ŝanĝi pasvorton"
       close_account: "Malaniĝi"
       comment_on_post: "...iu komentas pri via poŝto?"
       current_password: "Nuna pasvorto"
       download_photos: "elŝuti mian bildojn"
       download_xml: "elŝuti mian xml"
       edit_account: "Redakti konton"
-      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."
+      email_awaiting_confirmation: "Ni poŝtis al vin aktivigadan ligilon ĉe %{unconfirmed_email}.  Ĝis vi klikos tiun ĉi ligilo kaj aktivigos la novan repoŝtadreson, ni uzados vian malŝanĝitan retpoŝtadreson %{email}."
       export_data: "Eksporti Datumojn"
       liked: "...iu ŝatis vian afiŝon?"
       mentioned: "...vi menciatas en afiŝo?"
-      new_password: "Nova Pasvorto"
+      new_password: "Nova pasvorto"
       private_message: "...vi ricevas nepublikan mesaĝon?"
       receive_email_notifications: "Ĉu ricevi retpoŝtajn sciigojn, kiam..."
       started_sharing: "...iu komencis konigi kun vi?"
@@ -753,11 +755,11 @@ eo:
       does_not_exist: "Uzanto %{username} ne ekzistas!"
     update: 
       email_notifications_changed: "Retpoŝtaj sciigoj ŝanĝitas"
-      language_changed: "Lingvo Ŝanĝiĝis"
+      language_changed: "Lingvo ŝanĝiĝis"
       language_not_changed: "Ne povis ŝanĝi lingvon"
-      password_changed: "Pasvorto Ŝanĝita.  Vi nun povas ensaluti per via nova pasvorto."
+      password_changed: "Pasvorto ŝanĝita.  Vi nun povas ensaluti per via nova pasvorto."
       password_not_changed: "Ne povis ŝanĝi pasvorton"
-      unconfirmed_email_changed: "Retpoŝtadreso ŝanĝiĝis.  Tio ĉi devas aktivigado."
+      unconfirmed_email_changed: "Retpoŝtadreso ŝanĝiĝis.  Devas aktivigadon."
       unconfirmed_email_not_changed: "Ne povis ŝanĝigis retpoŝtadreson."
   webfinger: 
     fetch_failed: "ne povas alporti webfinger-an profilon por %{profile_url}"
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index 84915b5df..87e8fd667 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -206,6 +206,7 @@ es-AR:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Enviar"
+      sending: "Sending..."
       subject: "asunto"
       to: "para"
     show: 
@@ -572,6 +573,7 @@ es-AR:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Buscar"
   services: 
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 575e2f147..c905d768b 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -206,6 +206,7 @@ es-CL:
     new: 
       abandon_changes: "Descartar los cambios?"
       send: "Enviar"
+      sending: "Sending..."
       subject: "asunto"
       to: "para"
     show: 
@@ -572,6 +573,7 @@ es-CL:
         other: "Se ha compartido %{count} veces"
         zero: "Compartir"
       reshare_confirmation: "Compartir %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Mostrar Original"
   search: "Buscar"
   services: 
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index dfc489ba2..7e9c376e7 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -206,6 +206,7 @@ es:
     new: 
       abandon_changes: "¿Descartar los cambios?"
       send: "Enviar"
+      sending: "Sending..."
       subject: "asunto"
       to: "para"
     show: 
@@ -572,6 +573,7 @@ es:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Buscar"
   services: 
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 9fedfbf0e..10726166b 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -206,6 +206,7 @@ eu:
     new: 
       abandon_changes: "Aldaketak bertan behera utzi?"
       send: "Bidali"
+      sending: "Sending..."
       subject: "gaia"
       to: "nori:"
     show: 
@@ -572,6 +573,7 @@ eu:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Bilatu"
   services: 
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 615e95e9a..b90665a35 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -206,6 +206,7 @@ fi:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Lähetä"
+      sending: "Sending..."
       subject: "aihe"
       to: "vastaanottaja"
     show: 
@@ -572,6 +573,7 @@ fi:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Etsi"
   services: 
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index af8c7110b..7f7582858 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -206,6 +206,7 @@ fr:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Envoyer"
+      sending: "Sending..."
       subject: "sujet"
       to: "pour"
     show: 
@@ -572,6 +573,7 @@ fr:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Rechercher"
   services: 
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 26b9ba1ec..f80195c93 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -206,6 +206,7 @@ ga:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
+      sending: "Sending..."
       subject: "subject"
       to: "to"
     show: 
@@ -572,6 +573,7 @@ ga:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Search"
   services: 
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 792367bd0..ed561fc71 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -206,6 +206,7 @@ he:
     new: 
       abandon_changes: "Abandon changes?"
       send: "שליחה"
+      sending: "Sending..."
       subject: "נושא"
       to: "אל"
     show: 
@@ -572,6 +573,7 @@ he:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "חיפוש"
   services: 
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 2ac6c865c..99a2c425d 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -206,6 +206,7 @@ hu:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Küldés"
+      sending: "Sending..."
       subject: "tárgy"
       to: "címzett"
     show: 
@@ -572,6 +573,7 @@ hu:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Keresés"
   services: 
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index f92129397..5ad7df892 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -206,6 +206,7 @@ id:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
+      sending: "Sending..."
       subject: "subject"
       to: "to"
     show: 
@@ -572,6 +573,7 @@ id:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Search"
   services: 
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 7144ac2d0..4c3637255 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -206,6 +206,7 @@ is:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
+      sending: "Sending..."
       subject: "subject"
       to: "to"
     show: 
@@ -572,6 +573,7 @@ is:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Leita"
   services: 
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 1451aa901..1af2202b9 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -206,6 +206,7 @@ it:
     new: 
       abandon_changes: "Annulla i cambiamenti?"
       send: "Invia"
+      sending: "Sending..."
       subject: "oggetto"
       to: "a"
     show: 
@@ -572,6 +573,7 @@ it:
         other: "%{count} condivisioni"
         zero: "Ricondividi"
       reshare_confirmation: "Vuoi ricondividere %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Mostra l'originale"
   search: "Cerca"
   services: 
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index 3256d87c1..f233dd611 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -206,6 +206,7 @@ ja:
     new: 
       abandon_changes: "Abandon changes?"
       send: "送信する"
+      sending: "Sending..."
       subject: "件名"
       to: "宛先"
     show: 
@@ -572,6 +573,7 @@ ja:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "検索"
   services: 
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index da1c81041..4355cde55 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -206,6 +206,7 @@ ko:
     new: 
       abandon_changes: "변경을 포기할까요?"
       send: "보내기"
+      sending: "Sending..."
       subject: "제목"
       to: "받는이"
     show: 
@@ -572,6 +573,7 @@ ko:
         other: "%{count} Reshares"
         zero: "재공유"
       reshare_confirmation: "%{author}님의 %{text} 공유물을 재공유합니까?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "검색"
   services: 
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 2461d6cdc..831a99b6c 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -206,6 +206,7 @@ lt:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
+      sending: "Sending..."
       subject: "subject"
       to: "to"
     show: 
@@ -572,6 +573,7 @@ lt:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Paieška"
   services: 
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 7e1b579d3..bbee7eb9a 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -206,6 +206,7 @@ mk:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
+      sending: "Sending..."
       subject: "subject"
       to: "to"
     show: 
@@ -572,6 +573,7 @@ mk:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Барај"
   services: 
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 64368a392..11a90320c 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -206,6 +206,7 @@ nb:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
+      sending: "Sending..."
       subject: "emne"
       to: "til"
     show: 
@@ -572,6 +573,7 @@ nb:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Søk"
   services: 
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 794a14d74..7791d1e3f 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -29,7 +29,7 @@ nl:
         reshare: 
           attributes: 
             root_guid: 
-              taken: "You've already reshared that post!"
+              taken: "Je hebt deze post al opnieuw gedeeld!"
         user: 
           attributes: 
             email: 
@@ -108,7 +108,7 @@ nl:
         heading: "Diaspora ID"
       handle_explanation: "Dit is jouw Diaspora id. Deze kun je aan mensen geven zodat ze je kunnen bereiken, net als een e-mailadres."
       no_contacts: "Geen contacten"
-      no_tags: "No tags"
+      no_tags: "Geen tags"
       people_sharing_with_you: "Mensen die met jou delen"
       post_a_message: "plaats een bericht >>"
       services: 
@@ -206,6 +206,7 @@ nl:
     new: 
       abandon_changes: "Wijzigingen annuleren?"
       send: "Verstuur"
+      sending: "Sending..."
       subject: "onderwerp"
       to: "aan"
     show: 
@@ -277,7 +278,7 @@ nl:
       login: "inloggen"
       logout: "log uit"
       profile: "profiel"
-      recent_notifications: "Recent notifications"
+      recent_notifications: "Recente notificaties"
       settings: "instellingen"
       view_all: "Bekijk alles"
   likes: 
@@ -378,31 +379,31 @@ nl:
       other: "%{actors} delen nu met jou."
       zero: "%{actors} deelt nu met jou."
   notifier: 
-    click_here: "click here"
+    click_here: "klik hier"
     comment_on_post: 
-      reply: "Reply or view %{name}'s post >"
+      reply: "Reageer of bekijk %{name}'s post >"
     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,"
+    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: "
-      view_post: "View post >"
+      view_post: "Bekijk post >"
     mentioned: 
       mentioned: "heeft jou genoemd in een post:"
       subject: "%{name} heeft jou genoemd op Diaspora*"
     private_message: 
-      reply_to_or_view: "Reply to or view this conversation >"
+      reply_to_or_view: "Reageer op of bekijk deze conversatie >"
     single_admin: 
       admin: "Je Diaspora administrator"
       subject: "Een bericht over je Diaspora account:"
     started_sharing: 
       sharing: "deelt vanaf nu met jou!"
       subject: "%{name} deelt vanaf nu met je op Diaspora*"
-      view_profile: "View %{name}'s profile"
+      view_profile: "Bekijk %{name}'s profiel"
     thanks: "Bedankt,"
-    to_change_your_notification_settings: "to change your notification settings"
+    to_change_your_notification_settings: "om je notificatie instellingen te wijzigen"
   ok: "OK"
   or: "of"
   password: "Wachtwoord"
@@ -496,8 +497,8 @@ nl:
       post_hidden: "%{name}'s post is verborgen."
   posts: 
     show: 
-      destroy: "Delete"
-      not_found: "Sorry, we couldn't find that post."
+      destroy: "Verwijder"
+      not_found: "Sorry, die post konden we niet vinden."
       permalink: "permalink"
   previous: "vorige"
   profile: "Profiel"
@@ -562,9 +563,9 @@ nl:
       sent: "verzonden!"
   reshares: 
     create: 
-      failure: "There was an error resharing this post."
+      failure: "Er is een fout opgetreden bij het herdelen van deze post."
     reshare: 
-      deleted: "Original post deleted by author."
+      deleted: "De originele post is verwijderd door de auteur."
       reshare: 
         few: "%{count} Reshares"
         many: "%{count} Reshares"
@@ -572,6 +573,7 @@ nl:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Zoek"
   services: 
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index c58abb1e1..3aa365c6f 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -206,6 +206,7 @@ pa:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
+      sending: "Sending..."
       subject: "subject"
       to: "to"
     show: 
@@ -572,6 +573,7 @@ pa:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "ਖੋਜ"
   services: 
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 84008aebe..5fa720aec 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -206,6 +206,7 @@ pl:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Wyślij"
+      sending: "Sending..."
       subject: "temat"
       to: "do"
     show: 
@@ -572,6 +573,7 @@ pl:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Szukaj"
   services: 
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index ee31d3c90..0536b019f 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -206,6 +206,7 @@ pt-BR:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
+      sending: "Sending..."
       subject: "subject"
       to: "to"
     show: 
@@ -572,6 +573,7 @@ pt-BR:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Busca"
   services: 
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 9a6e539bf..5d47afdbc 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -206,6 +206,7 @@ pt-PT:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Enviar"
+      sending: "Sending..."
       subject: "assunto"
       to: "para"
     show: 
@@ -572,6 +573,7 @@ pt-PT:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Procurar"
   services: 
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 09e865109..72311b1b9 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -206,6 +206,7 @@ ro:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
+      sending: "Sending..."
       subject: "subject"
       to: "to"
     show: 
@@ -572,6 +573,7 @@ ro:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Caută"
   services: 
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index ea22f9649..6280d3f61 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -206,6 +206,7 @@ ru:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Отправить"
+      sending: "Sending..."
       subject: "тема"
       to: "к"
     show: 
@@ -572,6 +573,7 @@ ru:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Поиск"
   services: 
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 6602c6e93..40eb6b2f0 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -206,6 +206,7 @@ sk:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Poslať"
+      sending: "Sending..."
       subject: "predmet"
       to: "komu"
     show: 
@@ -572,6 +573,7 @@ sk:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Hľadať"
   services: 
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 1d1b0947d..6d5294919 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -206,6 +206,7 @@ sl:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
+      sending: "Sending..."
       subject: "subject"
       to: "to"
     show: 
@@ -572,6 +573,7 @@ sl:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Najdi"
   services: 
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 89d38fc3c..eb34f0c90 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -206,6 +206,7 @@ sv:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Skicka"
+      sending: "Sending..."
       subject: "ämne"
       to: "till"
     show: 
@@ -572,6 +573,7 @@ sv:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Sök"
   services: 
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index e6cb8b1ac..4e0504320 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -206,6 +206,7 @@ tr:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
+      sending: "Sending..."
       subject: "subject"
       to: "to"
     show: 
@@ -572,6 +573,7 @@ tr:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "Ara"
   services: 
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 8990790ec..4d4e131c1 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -206,6 +206,7 @@ zh-CN:
     new: 
       abandon_changes: "Abandon changes?"
       send: "发送"
+      sending: "Sending..."
       subject: "主题"
       to: "收件人"
     show: 
@@ -572,6 +573,7 @@ zh-CN:
         other: "%{count} Reshares"
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
+      reshare_original: "Reshare orignial"
       show_original: "Show Original"
   search: "搜索"
   services: 
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 9d41b42be..7dd6afbba 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -206,6 +206,7 @@ zh-TW:
     new: 
       abandon_changes: "放棄目前變動?"
       send: "傳送"
+      sending: "Sending..."
       subject: "主旨"
       to: "收件人"
     show: 
@@ -572,6 +573,7 @@ zh-TW:
         other: "被轉貼%{count}次"
         zero: "轉貼"
       reshare_confirmation: "要轉貼 %{author} - %{text} 嗎?"
+      reshare_original: "Reshare orignial"
       show_original: "顯示原文"
   search: "搜尋"
   services: 
diff --git a/config/locales/javascript/javascript.eo.yml b/config/locales/javascript/javascript.eo.yml
index c64880821..b2a7f28d5 100644
--- a/config/locales/javascript/javascript.eo.yml
+++ b/config/locales/javascript/javascript.eo.yml
@@ -24,7 +24,7 @@ eo:
     publisher: 
       at_least_one_aspect: "Vi devus eldoni al almenaŭ unu aspekto"
     reshares: 
-      duplicate: "You've already reshared that post!"
+      duplicate: "Vi jam repartoprenis tiun afiŝon!"
     search_for: "Serĉi por {{name}}"
     show_more: "vidi plu"
     timeago: