diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index c2c7a3554..d4fcee847 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -108,9 +108,9 @@ es:
         heading: "Identidad Diaspora*"
       donate: "Donar"
       handle_explanation: "Ésta es tu dirección Diaspora*. Como una dirección de correo, puedes dársela a la gente para que te encuentre."
-      keep_us_running: "Mantén %{pod} ejecutándose rápido, ¡compra a nuestros servidores su dosis de café mensual!"
+      keep_us_running: "Haz que %{pod} vaya más rápido, ¡compra a nuestros servidores su dosis de café mensual!"
       no_contacts: "No hay contactos"
-      no_tags: "Sin etiquetas"
+      no_tags: "+ Encuentra una etiqueta a seguir"
       people_sharing_with_you: "Comparten contigo"
       post_a_message: "publica un mensaje >>"
       services: 
@@ -131,7 +131,7 @@ es:
       or_featured: "O puedes compartir con %{link}"
       start_talking: "Nadie dijo nada aún. ¡Sé el primero!"
       try_adding_some_more_contacts: "Puedes buscar (arriba) or invitar (derecha) a más contactos."
-      you_should_add_some_more_contacts: "You should add some more contacts!"
+      you_should_add_some_more_contacts: "¡Deberías añadir algunos contactos!"
     one: "1 aspecto"
     other: "%{count} aspectos"
     seed: 
@@ -233,7 +233,7 @@ es:
       correct_the_following_errors_and_try_again: "Corrija los siguientes errores e inténtelo de nuevo."
       invalid_fields: "Campos inválidos"
   fill_me_out: "Complétame"
-  find_people: "Encuentra personas"
+  find_people: "Encuentra gente o #etiquetas"
   hide: "Ocultar"
   home: 
     show: 
@@ -452,7 +452,7 @@ es:
       add_some: "añade"
       does_not_exist: "¡El usuario no existe!"
       edit: "editar"
-      has_not_shared_with_you_yet: "%{name} has not shared any posts with you yet!"
+      has_not_shared_with_you_yet: "¡%{name} todavía no ha compartido ninguna publicación contigo!"
       incoming_request: "%{name} quisiera compartir contigo"
       mention: "Mención"
       message: "Mensaje"
@@ -576,13 +576,13 @@ es:
     reshare: 
       deleted: "El comentario original fue eliminado por su autor."
       reshare: 
-        few: "Compartido %{count} veces"
-        many: "Compartido %{count} veces"
-        one: "Compartido 1 vez"
-        other: "Compartido %{count} veces"
+        few: "compartido %{count} veces"
+        many: "compartido %{count} veces"
+        one: "compartido 1 vez"
+        other: "compartido %{count} veces"
         zero: "Vuelve a compartirlo"
       reshare_confirmation: "¿Quieres volver a compartir %{author} - %{text}?"
-      reshare_original: "Volver a compartir el original"
+      reshare_original: "Volver a compartir original"
       show_original: "Mostrar el original"
   search: "Buscar"
   services: 
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 11e365b72..7f5fe84d4 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -110,7 +110,7 @@ it:
       handle_explanation: "Questo è il tuo ID su Diaspora. Lo puoi dare alle persone per farti trovare, come un indirizzo email."
       keep_us_running: "Fai andare %{pod} veloce come un razzo, finanzia la razione mensile di caffè per i nostri server!"
       no_contacts: "Nessun contatto"
-      no_tags: "Nessun tag"
+      no_tags: "+ Cerca tag da seguire"
       people_sharing_with_you: "Persone in condivisione con te"
       post_a_message: "invia un messaggio >>"
       services: 
@@ -233,7 +233,7 @@ it:
       correct_the_following_errors_and_try_again: "Correggi i seguenti errori e riprova."
       invalid_fields: "Campi non validi"
   fill_me_out: "Scrivi qui"
-  find_people: "Cerca persone"
+  find_people: "Cerca persone o #tag"
   hide: "Nascondi"
   home: 
     show: 
@@ -452,7 +452,7 @@ it:
       add_some: "aggiungine alcune"
       does_not_exist: "La persona non esiste!"
       edit: "modifica"
-      has_not_shared_with_you_yet: "%{name} has not shared any posts with you yet!"
+      has_not_shared_with_you_yet: "%{name} non ha ancora condiviso nessun post con te!"
       incoming_request: "%{name} vuole condividere con te"
       mention: "Menziona"
       message: "Messaggio"
@@ -576,10 +576,10 @@ it:
     reshare: 
       deleted: "Il post originale è stato eliminato dall'autore."
       reshare: 
-        few: "%{count} Condivisioni"
-        many: "%{count} Condivisioni"
-        one: "1 Condivisione"
-        other: "%{count} Condivisioni"
+        few: "%{count} condivisioni"
+        many: "%{count} condivisioni"
+        one: "1 condivisione"
+        other: "%{count} condivisioni"
         zero: "Condividi"
       reshare_confirmation: "Vuoi condividere il post di %{author} con i tuoi contatti?"
       reshare_original: "Condividi l'originale"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 589d1a53d..416ba0646 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -110,13 +110,13 @@ zh-TW:
       handle_explanation: "這是你的 diaspora 識別碼. 就像電子信箱一樣, 你可以把它給想聯絡你的人."
       keep_us_running: "為了讓 %{pod} 高速奔馳, 提供些咖啡存量給我們的伺服器吧!"
       no_contacts: "沒有任何聯繫"
-      no_tags: "沒有標籤"
+      no_tags: "+ 找個標籤來追蹤"
       people_sharing_with_you: "跟你分享的人"
       post_a_message: "發表訊息 >>"
       services: 
         content: "你可以連結以下服務至 Diaspora:"
         heading: "連結服務"
-      tags_following: "追隨的標籤"
+      tags_following: "追蹤的標籤"
       your_aspects: "你的面向"
     many: "%{count}個面向"
     move_contact: 
@@ -233,7 +233,7 @@ zh-TW:
       correct_the_following_errors_and_try_again: "修正以下錯誤後再試一次."
       invalid_fields: "欄位無效"
   fill_me_out: "填寫我"
-  find_people: "找人"
+  find_people: "找人或\"#標籤\""
   hide: "隱藏"
   home: 
     show: 
@@ -452,7 +452,7 @@ zh-TW:
       add_some: "新增一些"
       does_not_exist: "聯絡人不存在!"
       edit: "編輯"
-      has_not_shared_with_you_yet: "%{name} has not shared any posts with you yet!"
+      has_not_shared_with_you_yet: "%{name} 尚未跟你分享任何貼文!"
       incoming_request: "%{name} 希望能和你分享"
       mention: "提及"
       message: "送訊息"
@@ -689,19 +689,19 @@ zh-TW:
     show_more_comments: "顯示下面 %{number} 個意見"
   tag_followings: 
     create: 
-      failure: "追隨失敗: #%{name}"
-      success: "追隨成功: #%{name}"
+      failure: "追蹤失敗: #%{name}"
+      success: "追蹤成功: #%{name}"
     destroy: 
-      failure: "停止追隨失敗: #%{name}"
-      success: "停止追隨成功: #%{name}"
+      failure: "停止追蹤失敗: #%{name}"
+      success: "停止追蹤成功: #%{name}"
   tags: 
     show: 
-      follow: "追隨#%{tag}"
-      following: "正在追隨#%{tag}"
+      follow: "追蹤#%{tag}"
+      following: "正在追蹤#%{tag}"
       nobody_talking: "尚還沒有人在討論 %{tag}."
       people_tagged_with: "標記為 %{tag} 的人"
       posts_tagged_with: "標記為 #%{tag} 的貼文"
-      stop_following: "停止追隨#%{tag}"
+      stop_following: "停止追蹤#%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "與 Cubbi.es 連結"