diff --git a/config/locales/devise/devise.zh-TW.yml b/config/locales/devise/devise.zh-TW.yml
index 8152bace8..07a0589ad 100644
--- a/config/locales/devise/devise.zh-TW.yml
+++ b/config/locales/devise/devise.zh-TW.yml
@@ -12,7 +12,7 @@ zh-TW:
       send_instructions: "幾分鐘內你會收到一封說明如何確認帳號的信件."
     failure: 
       inactive: "你的帳號尚未開通."
-      invalid: "電子信箱或密碼有誤."
+      invalid: "用戶名稱或密碼有誤."
       invalid_token: "認證信物無效."
       locked: "你的帳號已鎖定."
       timeout: "工作階段已逾時, 若要繼續請重新登入."
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 6e122d9d0..af3d2113f 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -511,7 +511,7 @@ cs:
       from_facebook: "z Facebooku"
       invitations_left: "(%{count} zbývá)"
       invite_someone: "Pozvěte někoho"
-      invite_your_friends: "Pozvěte vaše přátele"
+      invite_your_friends: "Najděte vaše přátele"
       invites: "Pozvánky"
       invites_closed: "Pozvánky jsou aktuálně uzavřeny na tomto Diaspora podu"
     notification: 
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index c27c42f7d..02f7a5358 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -69,7 +69,7 @@ es:
       aspect_list_is_visible: "Lista de contactos visible para los demás en el Aspecto"
       confirm_remove_aspect: "¿Seguro que quieres eliminar este Aspecto?"
       done: "Listo"
-      make_aspect_list_visible: "Hacer visibles los contactos en este Aspecto."
+      make_aspect_list_visible: "Hacer visible la lista de contactos en el Aspecto."
       remove_aspect: "Eliminar este Aspecto"
       rename: "renombrar"
       update: "Actualizar"
@@ -448,7 +448,7 @@ es:
     destroy: 
       error: "¡Selecciona un Aspecto!"
       ignore: "Solicitud de contacto ignorada."
-      success: "Ahora sois amigos."
+      success: "Ahora están compartiendo."
     helper: 
       new_requests: 
         few: "¡%{count} nuevas solicitudes!"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 67852a525..0094f9515 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -113,7 +113,7 @@ eu:
     zero: "alderdirik ez"
   back: "Atzera"
   bookmarklet: 
-    explanation: "%{link} edozein lekutik esteka hau markagailuetarantz herresta eginez."
+    explanation: "%{link} edozein lekutik esteka hau laster-marketarantz herresta eginez."
     explanation_link_text: "Diasporan partekatu"
     post_something: "Partekatu zerbait Diasporan"
     post_success: "Bidalia! Irteten!"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 1187553dd..ca0c61f72 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -235,17 +235,17 @@ zh-TW:
   likes: 
     likes: 
       people_dislike_this: 
-        few: "有%{count}個人不喜歡"
-        many: "有%{count}個人不喜歡"
-        one: "有1個人不喜歡"
-        other: "有%{count}個人不喜歡"
-        zero: "沒有人不喜歡"
+        few: "有%{count}個人說遜"
+        many: "有%{count}個人說遜"
+        one: "有1個人說遜"
+        other: "有%{count}個人說遜"
+        zero: "沒有人說遜"
       people_like_this: 
-        few: "有%{count}個人喜歡"
-        many: "有%{count}個人喜歡"
-        one: "有1個人喜歡"
-        other: "有%{count}個人喜歡"
-        zero: "沒有人喜歡"
+        few: "有%{count}個人說讚"
+        many: "有%{count}個人說讚"
+        one: "有1個人說讚"
+        other: "有%{count}個人說讚"
+        zero: "沒有人說讚"
   more: "更多"
   next: "後面"
   no_results: "搜尋沒有結果"
@@ -405,7 +405,7 @@ zh-TW:
   profile: "個人檔案"
   profiles: 
     edit: 
-      allow_search: "讓別人在 Diaspora 可以搜尋到你"
+      allow_search: "讓別人可以在 Diaspora 搜尋到你"
       edit_profile: "編輯個人檔案"
       first_name: "First name"
       last_name: "Last name"
@@ -448,7 +448,7 @@ zh-TW:
     destroy: 
       error: "請選一個面向!"
       ignore: "忽略建立聯繫的請求."
-      success: "你們現在是朋友了."
+      success: "你們現在互相分享了."
     helper: 
       new_requests: 
         few: "%{count}個新請求!"
@@ -511,7 +511,7 @@ zh-TW:
       from_facebook: "從 Facebook"
       invitations_left: "(剩餘%{count}張)"
       invite_someone: "邀請某人來"
-      invite_your_friends: "邀請你的朋友來"
+      invite_your_friends: "找到你的朋友"
       invites: "邀請"
       invites_closed: "目前本 Diaspora pod 不開放邀請功能"
     notification: 
@@ -537,8 +537,8 @@ zh-TW:
     reshare: 
       reshare: "重新分享"
     stream_element: 
-      dislike: "不喜歡"
-      like: "喜歡"
+      dislike: "遜"
+      like: "讚"
   status_messages: 
     create: 
       success: "成功推薦了: %{names}"