updated locales

config/locales/devise/devise.zh-TW.yml

@@ -8,19 +8,19 @@ zh-TW:
     confirmations: 
       confirmed: "帳號已確認成功. 你已經登入了."
       new: 
-        resend_confirmation: "Resend confirmation instructions"
+        resend_confirmation: "重送確認步驟"
-      send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
+      send_instructions: "幾分鐘內你會收到一封說明如何確認帳號的信件."
     failure: 
       inactive: "你的帳號尚未開通."
-      invalid: "電子郵件信箱或密碼有誤."
+      invalid: "電子信箱或密碼有誤."
-      invalid_token: "Invalid authentication token."
+      invalid_token: "認證信物無效."
       locked: "你的帳號已鎖定."
       timeout: "工作階段已逾時, 請重新登入已繼續."
-      unauthenticated: "繼續之前你必須先登入或註冊."
+      unauthenticated: "繼續之前你必須先登入或登記."
       unconfirmed: "你必須先確認帳號才能繼續."
     invitations: 
-      invitation_token_invalid: "The invitation token provided is not valid!"
+      invitation_token_invalid: "提供的邀請信物無效!"
-      send_instructions: "Your invitation has been sent."
+      send_instructions: "邀請函已寄出."
       updated: "密碼已設定成功. 你已經登入了."
     mailer: 
       confirmation_instructions: 
@@ -31,7 +31,7 @@ zh-TW:
       invitation: 
         accept: "接受邀請"
         ignore: "如果你不想接受邀請, 請忽略這封信件."
-        no_account_till: "在你使用以上連結註冊後, 你的帳號才會建立."
+        no_account_till: "在你使用以上連結登記後, 你的帳號才會建立."
         subject: "有人邀請你加入 Diaspora!"
       inviters: 
         accept_at: ", at %{url}, you can accept it through the link below."
@@ -44,7 +44,7 @@ zh-TW:
         subject: "密碼重設步驟"
         wont_change: "在使用以上連結設定新的密碼後, 你的密碼才會改變."
       unlock_instructions: 
-        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        account_locked: "你的帳號因為登入失敗太多次而被鎖定了."
         click_to_unlock: "點一下以下連結以將你的帳號解鎖:"
         subject: "解鎖步驟"
         unlock: "帳號解鎖"
@@ -54,19 +54,19 @@ zh-TW:
         change_password: "更改密碼"
       new: 
         forgot_password: "忘記密碼?"
-        no_account: "No account with this email exsists.  If you are waiting for an invite, we are rolling them out as soon as possible"
+        no_account: "無此電子信箱關聯的帳號. 如果你是在等邀請函, 我們會盡快寄出."
         send_password_instructions: "傳送密碼重設的步驟給我"
       send_instructions: "幾分鐘內你會收到一封說明如何重設密碼的信件."
       updated: "密碼更改成功. 你已經登入了."
     registrations: 
-      destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
+      destroyed: "再會! 你的帳號已經取消了. 希望不久後再見."
-      signed_up: "You have signed up successfully. If enabled, a confirmation was sent to your e-mail."
+      signed_up: "你已經成功登記了. 如果有設定的話, 確認信會送到你的信箱."
-      updated: "You updated your account successfully."
+      updated: "帳號更新成功."
     sessions: 
       new: 
-        alpha_software: "You are about to use alpha software."
+        alpha_software: "你將要使用剛開發的軟體."
-        bugs_and_feedback: "Be advised, you will experience bugs.  We encourage you to use the Feedback button on the right hand side of your browser to report any hiccups!  We will work as fast as we can to resolve any issues you report."
+        bugs_and_feedback: "給你個忠告, 你將會遭遇到臭蟲. 遇到任何不順, 都請你使用瀏覽器右手邊的\"回饋\"按鈕向我們回報! 我們會盡快處理你回報的任何問題."
-        bugs_and_feedback_mobile: "Be advised, you will experience bugs.  We encourage you to report any hiccups!  We will work as fast as we can to resolve any issues you report."
+        bugs_and_feedback_mobile: "給你個忠告, 你將會遭遇到臭蟲. 遇到任何不順都請你向我們回報! 我們會盡快處理你回報的任何問題."
         login: "登入"
         modern_browsers: "只支援摩登的瀏覽器."
         password: "密碼"
@@ -80,11 +80,11 @@ zh-TW:
         forgot_your_password: "忘記密碼?"
         receive_confirmation: "沒收到確認步驟?"
         receive_unlock: "沒收到解鎖步驟?"
-        sign_in: "Sign in"
+        sign_in: "登入"
-        sign_up: "Sign up"
+        sign_up: "登記"
-        sign_up_closed: "Open signups are closed at this time."
+        sign_up_closed: "目前不開放公開登記."
       mail_signup_form: 
-        sign_up_for_an_invite: "Sign up for an invite!"
+        sign_up_for_an_invite: "邀請函登記!"
     unlocks: 
       new: 
         resend_unlock: "重送解鎖步驟"
@@ -92,6 +92,6 @@ zh-TW:
       unlocked: "帳號解鎖成功. 你已經登入了."
   errors: 
     messages: 
-      already_confirmed: "was already confirmed"
+      already_confirmed: "已確認"
-      not_found: "not found"
+      not_found: "沒找到"
-      not_locked: "was not locked"
+      not_locked: "沒鎖定"

config/locales/diaspora/ar.yml

@@ -72,11 +72,13 @@ ar:
       success: ".بنجاح %{name} تم إزالة"
     edit: 
       add_existing: "Add an existing contact"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Are you sure you want to delete this aspect?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      done: "Done"
       remove_aspect: "Delete this aspect"
       rename: "rename"
-      save: "Save"
+      update: "update"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "الجانب ليس فارغ"
@@ -147,6 +149,7 @@ ar:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/cs.yml

@@ -72,11 +72,13 @@ cs:
       success: "%{name} byl úspěšně odebrán."
     edit: 
       add_existing: "Přidat existující kontakt"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Opravdu chcete odstranit tento aspekt?"
-      make_aspect_list_visible: "zviditelnit seznam aspektů ostatním"
+      done: "Done"
       remove_aspect: "Odstranit tento aspekt"
       rename: "přejmenovat"
-      save: "Uložit"
+      update: "update"
     helper: 
       are_you_sure: "Opravdu chcete odstranit tento aspekt?"
       aspect_not_empty: "Aspekt není prázdný"
@@ -136,18 +138,19 @@ cs:
     zero: "žádné kontakty"
   conversations: 
     index: 
-      create_a_new_message: "create a new message"
+      create_a_new_message: "vytvořit novou zprávu"
-      message_inbox: "Message Inbox"
+      message_inbox: "Doručené zprávy"
-      new_message: "New Message"
+      new_message: "Nová zpráva"
-      no_conversation_selected: "no conversation selected"
+      no_conversation_selected: "není výbrána žádná konverzace"
-      no_messages: "no messages"
+      no_messages: "žádné zprávy"
     new: 
-      no_results: "No Results Found"
+      no_results: "Nebyly nalezeny žádné výsledky"
-      send: "Send"
+      send: "Poslat"
-      subject: "subject"
+      subject: "předmět"
-      to: "to"
+      to: "pro"
     show: 
-      reply: "reply"
+      delete: "delete and block conversation"
+      reply: "odpověď"
   date: 
     formats: 
       birthday: "%B %d"
@@ -201,7 +204,7 @@ cs:
       have_a_problem: "Máte problém? Zde najdete odpověď"
       logged_in_as: "přihlášen jako %{name}"
       powered_by: "POWERED BY DIASPORA*"
-      public_feed: "Public Diaspora Feed for %{name}"
+      public_feed: "Veřejný Diaspora feed %{name}"
       toggle: "přepnout mobilní stránku"
       whats_new: "co je nového?"
       your_aspects: "vaše aspekty"
@@ -214,7 +217,7 @@ cs:
       logout: "odhlásit"
       view_profile: "zobrazit profil"
   more: "Více"
-  new_messages: "%{count} new messages"
+  new_messages: "%{count} nových zpráv"
   new_notifications: "%{count} nových oznámení"
   new_requests: 
     few: "%{count} nových žádostí!"
@@ -222,7 +225,7 @@ cs:
     other: "%{count} nových žádostí!"
     zero: "žádná nová žadost"
   next: "další"
-  no_new_messages: "no new messages"
+  no_new_messages: "žádné nové zprávy"
   no_new_notifications: "žádná nová oznámení"
   notifications: 
     also_commented: "také komentoval v %{post_author}"
@@ -258,10 +261,10 @@ cs:
       subject: "nová žádost na Diasporu* od %{from}"
       try_it_out: "Měli byste o tom opravdu přemýšlet."
     private_message: 
-      message_subject: "Subject: %{subject}"
+      message_subject: "Předmět: %{subject}"
-      private_message: "has sent you a private message:"
+      private_message: "vám poslal soukromou zprávu:"
-      sign_in: "Sign in to view it."
+      sign_in: "Přihlaste se pro zobrazení."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      subject: "%{name} vám poslal soukromou zprávu na Diasporu*"
     request_accepted: 
       accepted: "přijal vaši žádost!"
       sign_in: "Přihlaste se zde"
@@ -305,7 +308,7 @@ cs:
     show: 
       does_not_exist: "Osoba neexistuje!"
       incoming_request: "%{name} s vámi chce sdílet"
-      message: "Message"
+      message: "Zpráva"
       no_posts: "žádné zprávy k zobrazení!"
       not_connected: "Nesdílíte s %{name}"
       recent_posts: "Poslední příspěvky"

config/locales/diaspora/cy.yml

@@ -72,11 +72,13 @@ cy:
       success: "%{name} was successfully removed."
     edit: 
       add_existing: "Add an existing contact"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Are you sure you want to delete this aspect?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      done: "Done"
       remove_aspect: "Delete this aspect"
       rename: "rename"
-      save: "Save"
+      update: "update"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Aspect not empty"
@@ -147,6 +149,7 @@ cy:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/da.yml

@@ -72,11 +72,13 @@ da:
       success: "%{name} fjernet."
     edit: 
       add_existing: "Tilføj en eksisterende kontakt "
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Er du sikker på du vil slette dette aspekt?"
-      make_aspect_list_visible: "gør aspekt listen synlig for andre i aspektet"
+      done: "Done"
       remove_aspect: "Slet dette aspekt"
       rename: "omdøb"
-      save: "Gem"
+      update: "update"
     helper: 
       are_you_sure: "Er du sikker på at du vil fjerne dette aspekt?"
       aspect_not_empty: "Aspektet er ikke tomt"
@@ -147,6 +149,7 @@ da:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/de.yml

@@ -72,11 +72,13 @@ de:
       success: "%{name} wurde erfolgreich entfernt."
     edit: 
       add_existing: "Ein bereits bestehendes Konto hinzufügen"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Bist du dir sicher, dass du diesen Aspekt löschen möchtest?"
-      make_aspect_list_visible: "Zeige Deine Aspekt-Liste anderen in diesem Aspekt"
+      done: "Done"
       remove_aspect: "Aspekt löschen"
       rename: "umbenennen"
-      save: "Speichern"
+      update: "update"
     helper: 
       are_you_sure: "Möchtest du diesen Aspekt wirklich löschen?"
       aspect_not_empty: "Aspekt ist nicht leer"
@@ -136,18 +138,19 @@ de:
     zero: "Keine Kontakte"
   conversations: 
     index: 
-      create_a_new_message: "create a new message"
+      create_a_new_message: "Erstelle neue Nachricht"
       message_inbox: "Message Inbox"
-      new_message: "New Message"
+      new_message: "Neue Nachricht"
-      no_conversation_selected: "no conversation selected"
+      no_conversation_selected: "Keine Konversation ausgewählt"
-      no_messages: "no messages"
+      no_messages: "Keine Nachrichten"
     new: 
-      no_results: "No Results Found"
+      no_results: "Keine Ergebnisse Gefunden"
-      send: "Send"
+      send: "Senden"
-      subject: "subject"
+      subject: "Betreff"
-      to: "to"
+      to: "An"
     show: 
-      reply: "reply"
+      delete: "delete and block conversation"
+      reply: "Antworten"
   date: 
     formats: 
       birthday: "%d. %B"
@@ -201,7 +204,7 @@ de:
       have_a_problem: "Du hast ein Problem? Finde hier eine Antwort (Englisch)"
       logged_in_as: "Angemeldet als %{name}"
       powered_by: "BETRIEBEN MIT DIASPORA*"
-      public_feed: "Public Diaspora Feed for %{name}"
+      public_feed: "Öffentlicher Diaspora Feed von %{name}"
       toggle: "Mobile Ansicht umschalten"
       whats_new: "Was gibt’s Neues?"
       your_aspects: "Deine Aspekte"
@@ -214,7 +217,7 @@ de:
       logout: "Abmelden"
       view_profile: "Profil ansehen"
   more: "Mehr"
-  new_messages: "%{count} new messages"
+  new_messages: "%{count} neue Nachrichten"
   new_notifications: "%{count} neue Benachrichtigungen"
   new_requests: 
     few: "%{count} neue Anfragen!"
@@ -222,7 +225,7 @@ de:
     other: "%{count} neue Anfragen!"
     zero: "keine neuen Anfragen"
   next: "Nächste"
-  no_new_messages: "no new messages"
+  no_new_messages: "keine neue Nachrichten"
   no_new_notifications: "Keine neuen Benachrichtigungen"
   notifications: 
     also_commented: "kommentierte auch %{post_author}'s"
@@ -258,10 +261,10 @@ de:
       subject: "Neue Diaspora* Kontakt-Anfrage von %{from}"
       try_it_out: "Probier’s aus!"
     private_message: 
-      message_subject: "Subject: %{subject}"
+      message_subject: "Betreff: %{subject}"
-      private_message: "has sent you a private message:"
+      private_message: "hat dir eine Private Nachricht gesendet."
-      sign_in: "Sign in to view it."
+      sign_in: "Melde dich an um sie Anzuschauen"
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      subject: "%{name} hat dir eine Private Nachricht bei Diaspora* gesendet"
     request_accepted: 
       accepted: "hat deine Kontakt-Anfrage akzeptiert!"
       sign_in: "Hier anmelden"
@@ -305,7 +308,7 @@ de:
     show: 
       does_not_exist: "Person existiert nicht!"
       incoming_request: "Du hast eine eingehende Anfrage von dieser Person."
-      message: "Message"
+      message: "Nachricht"
       no_posts: "Keine Beiträge zum Anzeigen!"
       not_connected: "Du teilst nicht mit %{name}"
       recent_posts: "Neueste Beiträge"

config/locales/diaspora/el.yml

@@ -72,11 +72,13 @@ el:
       success: "Ο χρήστης %{name} αφαιρέθηκε επιτυχώς."
     edit: 
       add_existing: "Προσθέστε μια υπάρχουσα επαφή"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Είστε σίγουρος/η πως θέλετε να διαγράψετε αυτή την πτυχή;"
-      make_aspect_list_visible: "ορίστε τη λίστα πτυχών σας ορατή σε όλους στη πτυχή "
+      done: "Done"
       remove_aspect: "Διαγραφή αυτής της πτυχής"
       rename: "μετονομασία"
-      save: "Αποθήκευση"
+      update: "update"
     helper: 
       are_you_sure: "Είστε σίγουρος/η πως θέλετε να διαγράψετε αυτή την πτυχή;"
       aspect_not_empty: "Η πτυχή δεν είναι άδεια"
@@ -147,6 +149,7 @@ el:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/en_shaw.yml

@@ -72,11 +72,13 @@ en_shaw:
       success: "%{name} 𐑢𐑪𐑟 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑮𐑦𐑥𐑵𐑝𐑛."
     edit: 
       add_existing: "𐑨𐑛 𐑩𐑯 𐑧𐑜𐑟𐑦𐑕𐑑𐑦𐑙 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "𐑸 𐑿 𐑖𐑻 𐑿 𐑢𐑳𐑯𐑑 𐑑 𐑛𐑦𐑤𐑰𐑑 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑?"
-      make_aspect_list_visible: "𐑥𐑱𐑒 𐑨𐑕𐑐𐑧𐑒𐑑 𐑤𐑦𐑕𐑑 𐑝𐑦𐑟𐑦𐑚𐑩𐑤 𐑑 𐑳𐑞𐑼𐑟 𐑦𐑯 𐑨𐑕𐑐𐑧𐑒𐑑"
+      done: "Done"
       remove_aspect: "𐑛𐑦𐑤𐑰𐑑 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑"
       rename: "𐑮𐑦𐑯𐑱𐑥"
-      save: "𐑕𐑱𐑝"
+      update: "update"
     helper: 
       are_you_sure: "𐑸 𐑿 𐑖𐑻 𐑿 𐑢𐑳𐑯𐑑 𐑑 𐑛𐑦𐑤𐑰𐑑 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑?"
       aspect_not_empty: "𐑨𐑕𐑐𐑧𐑒𐑑 𐑯𐑪𐑑 𐑧𐑥𐑐𐑑𐑦"
@@ -147,6 +149,7 @@ en_shaw:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/eo.yml

@@ -72,11 +72,13 @@ eo:
       success: "%{name} was successfully removed."
     edit: 
       add_existing: "Add an existing contact"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Are you sure you want to delete this aspect?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      done: "Done"
       remove_aspect: "Delete this aspect"
       rename: "rename"
-      save: "Save"
+      update: "update"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Aspekto ne malplenas"
@@ -147,6 +149,7 @@ eo:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/es-CL.yml

@@ -72,11 +72,13 @@ es-CL:
       success: "%{name} fue correctamente eliminado."
     edit: 
       add_existing: "Agregar un contacto existente"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "¿Estás seguro que quieres eliminar este aspecto?"
-      make_aspect_list_visible: "Hacer visible la lista de contactos a todos en el Aspecto"
+      done: "Done"
       remove_aspect: "Eliminar este aspecto"
       rename: "renombrar"
-      save: "Guardar"
+      update: "update"
     helper: 
       are_you_sure: "¿Estás seguro que quieres eliminar este aspecto?"
       aspect_not_empty: "El aspecto no está vacío"
@@ -136,18 +138,19 @@ es-CL:
     zero: "no hay contactos"
   conversations: 
     index: 
-      create_a_new_message: "create a new message"
+      create_a_new_message: "crear un nuevo mensaje"
-      message_inbox: "Message Inbox"
+      message_inbox: "Bandeja de Entrada"
-      new_message: "New Message"
+      new_message: "Nuevo Mensaje"
-      no_conversation_selected: "no conversation selected"
+      no_conversation_selected: "ninguna conversación seleccionada"
-      no_messages: "no messages"
+      no_messages: "Sin mensajes"
     new: 
-      no_results: "No Results Found"
+      no_results: "Ningún resultado encontrado"
-      send: "Send"
+      send: "Enviar"
-      subject: "subject"
+      subject: "asunto"
-      to: "to"
+      to: "para"
     show: 
-      reply: "reply"
+      delete: "delete and block conversation"
+      reply: "responder"
   date: 
     formats: 
       birthday: "%B %d"
@@ -201,7 +204,7 @@ es-CL:
       have_a_problem: "¿Tienes un problema? Encuentra la respuesta aquí"
       logged_in_as: "Conectado como %{name}"
       powered_by: "POTENCIADO POR DIASPORA*"
-      public_feed: "Public Diaspora Feed for %{name}"
+      public_feed: "Canal publico de %{name}"
       toggle: "cambiar sitio móvil"
       whats_new: "¿Qué hay de nuevo?"
       your_aspects: "Tus Aspectos"
@@ -214,7 +217,7 @@ es-CL:
       logout: "salir"
       view_profile: "ver perfil"
   more: "Más"
-  new_messages: "%{count} new messages"
+  new_messages: "%{count} nuevos mensajes"
   new_notifications: "%{count} nueva/s notificación/es"
   new_requests: 
     few: "¡%{count} nuevas solicitudes!"
@@ -222,7 +225,7 @@ es-CL:
     other: "¡%{count} nuevas solicitudes!"
     zero: "no hay nuevas solicitudes"
   next: "Siguiente"
-  no_new_messages: "no new messages"
+  no_new_messages: "no hay mensajes nuevos"
   no_new_notifications: "No hay nuevas notificaciones"
   notifications: 
     also_commented: "también comentó en el post de %{post_author}"
@@ -258,10 +261,10 @@ es-CL:
       subject: "nueva solicitud de contacto Diaspora* de %{from}"
       try_it_out: "Deberías pensar en echarle un vistazo."
     private_message: 
-      message_subject: "Subject: %{subject}"
+      message_subject: "Asunto: %{subject}"
-      private_message: "has sent you a private message:"
+      private_message: "te envió un mensaje privado:"
-      sign_in: "Sign in to view it."
+      sign_in: "Conéctate para verlo."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      subject: "%{name} te envió un mensaje privado en Diaspora*"
     request_accepted: 
       accepted: "aceptó tu solicitud de contacto!"
       sign_in: "Conéctate aquí"
@@ -305,7 +308,7 @@ es-CL:
     show: 
       does_not_exist: "¡La persona no existe!"
       incoming_request: "Tienes una solicitud pendiente de %{name}"
-      message: "Message"
+      message: "Mensaje"
       no_posts: "¡no hay posteos para mostrar!"
       not_connected: "No estás conectado con %{name}"
       recent_posts: "Posteos Recientes"

config/locales/diaspora/es.yml

@@ -72,11 +72,13 @@ es:
       success: "%{name} fue eliminado correctamente."
     edit: 
       add_existing: "Añadir un contacto existente."
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "¿Seguro que quieres eliminar este Aspecto?"
-      make_aspect_list_visible: "Los contactos de este Aspecto podrán verse."
+      done: "Done"
       remove_aspect: "Eliminar este Aspecto"
       rename: "renombrar"
-      save: "Guardar"
+      update: "update"
     helper: 
       are_you_sure: "¿Seguro que quieres eliminar este Aspecto?"
       aspect_not_empty: "El Aspecto no está vacío"
@@ -136,18 +138,19 @@ es:
     zero: "no hay contactos"
   conversations: 
     index: 
-      create_a_new_message: "create a new message"
+      create_a_new_message: "Crear un nuevo mensaje"
-      message_inbox: "Message Inbox"
+      message_inbox: "Bandeja de entrada"
-      new_message: "New Message"
+      new_message: "Nuevo Mensaje"
-      no_conversation_selected: "no conversation selected"
+      no_conversation_selected: "ninguna conversación seleccionada"
-      no_messages: "no messages"
+      no_messages: "Sin mensajes"
     new: 
-      no_results: "No Results Found"
+      no_results: "No se encontraron resultados"
-      send: "Send"
+      send: "Enviar"
-      subject: "subject"
+      subject: "Asunto"
-      to: "to"
+      to: "para"
     show: 
-      reply: "reply"
+      delete: "delete and block conversation"
+      reply: "Responder"
   date: 
     formats: 
       birthday: "%B %d"
@@ -201,7 +204,7 @@ es:
       have_a_problem: "¿Algún problema? Encuentra una solución aquí"
       logged_in_as: "Registrado como %{name}"
       powered_by: "IMPULSADO POR DIASPORA*"
-      public_feed: "Public Diaspora Feed for %{name}"
+      public_feed: "Canal publico de %{name} "
       toggle: "cambiar sitio movil"
       whats_new: "¿Qué hay de nuevo?"
       your_aspects: "Tus Aspectos"
@@ -214,7 +217,7 @@ es:
       logout: "Desconectarse"
       view_profile: "Ver Perfil"
   more: "Más"
-  new_messages: "%{count} new messages"
+  new_messages: "%{count} nuevos mensajes"
   new_notifications: "%{count} nueva/s notificacion/es"
   new_requests: 
     few: "¡%{count} nuevas notificaciones!"
@@ -222,7 +225,7 @@ es:
     other: "¡%{count} nuevas solicitudes!"
     zero: "No hay nuevas solicitudes."
   next: "Siguiente"
-  no_new_messages: "no new messages"
+  no_new_messages: "No hay mensajes nuevos"
   no_new_notifications: "No hay nuevas notificaciones"
   notifications: 
     also_commented: "también ha comentado en la publicación de %{post_author}"
@@ -258,10 +261,10 @@ es:
       subject: "nueva solicitud de contacto Diaspora* de %{from}"
       try_it_out: "¡Pruébalo!"
     private_message: 
-      message_subject: "Subject: %{subject}"
+      message_subject: "Asunto: %{subject}"
-      private_message: "has sent you a private message:"
+      private_message: "te envió un mensaje privado:"
-      sign_in: "Sign in to view it."
+      sign_in: "Conéctate para verlo."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      subject: "%{name} te envió un mensaje privado en Diaspora*"
     request_accepted: 
       accepted: "aceptó tu solicitud de contacto."
       sign_in: "Conectar aquí"
@@ -305,7 +308,7 @@ es:
     show: 
       does_not_exist: "¡El usuario no existe!"
       incoming_request: "%{name} quisiera compartir contigo"
-      message: "Message"
+      message: "Mensaje"
       no_posts: "¡No hay publicaciones que mostrar!"
       not_connected: "No estás conectado con esta persona."
       recent_posts: "Últimas Publicaciones"

config/locales/diaspora/eu.yml

@@ -72,11 +72,13 @@ eu:
       success: "%{name} arrakastaz ezabatu da."
     edit: 
       add_existing: "Jada adiskide den norbait gehitu"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Ziur al zaude alderdi hau ezabatu nahi duzunaz?"
-      make_aspect_list_visible: "alderdi zerrenda publikoa egin"
+      done: "Done"
       remove_aspect: "Alderdi hau ezabatu"
       rename: "berrizendatu"
-      save: "Gorde"
+      update: "update"
     helper: 
       are_you_sure: "Ziur al zaude alderdi hau ezabatu nahi duzunaz?"
       aspect_not_empty: "Alderdi ez hutsa"
@@ -136,18 +138,19 @@ eu:
     zero: "adiskiderik ez"
   conversations: 
     index: 
-      create_a_new_message: "create a new message"
+      create_a_new_message: "mezu berria sortu"
-      message_inbox: "Message Inbox"
+      message_inbox: "Sarrera-ontzia"
-      new_message: "New Message"
+      new_message: "Mezu Berria"
-      no_conversation_selected: "no conversation selected"
+      no_conversation_selected: "ez da aukeratu elkarrizketarik"
-      no_messages: "no messages"
+      no_messages: "mezurik ez"
     new: 
-      no_results: "No Results Found"
+      no_results: "Ez da ezer aurkitu"
-      send: "Send"
+      send: "Bidali"
-      subject: "subject"
+      subject: "igorlea"
-      to: "to"
+      to: "nori:"
     show: 
-      reply: "reply"
+      delete: "delete and block conversation"
+      reply: "erantzun"
   date: 
     formats: 
       birthday: "%B %d"
@@ -201,7 +204,7 @@ eu:
       have_a_problem: "Arazoren bat? Aurkitu erantzuna hemen"
       logged_in_as: "%{name} zara."
       powered_by: "DIASPORAK ESKAINIA"
-      public_feed: "Public Diaspora Feed for %{name}"
+      public_feed: "%{name}(r)en Diaspora Feed publikoa"
       toggle: "aldatu mugikorreko orrialdera"
       whats_new: "ezer berririk?"
       your_aspects: "zure alderdiak"
@@ -214,7 +217,7 @@ eu:
       logout: "irten"
       view_profile: "profila ikusi"
   more: "Gehiago"
-  new_messages: "%{count} new messages"
+  new_messages: "%{count} mezu berri"
   new_notifications: "%{count} jakinarazpen berri"
   new_requests: 
     few: "%{count} eskaera berri!"
@@ -222,7 +225,7 @@ eu:
     other: "%{count} esakaera berri!"
     zero: "eskaera berririk ez"
   next: "hurrengoa"
-  no_new_messages: "no new messages"
+  no_new_messages: "mezu berririk ez"
   no_new_notifications: "jakinarazpen berririk ez"
   notifications: 
     also_commented: "iruzkindua baita zure kontaktuaren"
@@ -258,10 +261,10 @@ eu:
       subject: "Diaspora* adiskide eskaera berria %{from}(e)k bidalia"
       try_it_out: "Hobe zenuke begiztatzea."
     private_message: 
-      message_subject: "Subject: %{subject}"
+      message_subject: "Gaia: %{subject}"
-      private_message: "has sent you a private message:"
+      private_message: "(e)k mezu pribatu bat bidali dizu:"
-      sign_in: "Sign in to view it."
+      sign_in: "Sartu zaitez ikusteko."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      subject: "%{name}(e)k mezu pribatu bat bidali dizu Diasporan"
     request_accepted: 
       accepted: "(e)k zure adiskide eskaera onartu du. Orain hemen dago:"
       sign_in: "Sartu hemen"
@@ -305,7 +308,7 @@ eu:
     show: 
       does_not_exist: "Pertsona hau ez dago!"
       incoming_request: "Adiskide eskaera bat bidali dizu pertsona honek."
-      message: "Message"
+      message: "Mezua"
       no_posts: "erakusteko sarrerarik ez dago!"
       not_connected: "Ez zaude partekatzen %{name}(r)ekin"
       recent_posts: "Post berrienak"

config/locales/diaspora/fi.yml

@@ -72,11 +72,13 @@ fi:
       success: "%{name} poistettiin onnistuneesti."
     edit: 
       add_existing: "Lisää olemassa oleva kontakti"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Oletko varma että haluat poistaa tämän näkymän?"
-      make_aspect_list_visible: "tee näkymälistasta näkyvä sen jäsenille"
+      done: "Done"
       remove_aspect: "Poista näkymä"
       rename: "nimeä uudelleen"
-      save: "Tallenna"
+      update: "update"
     helper: 
       are_you_sure: "Haluatko varmasti poistaa tämän näkymän?"
       aspect_not_empty: "Näkymä ei ole tyhjä"
@@ -136,18 +138,19 @@ fi:
     zero: "ei kontakteja"
   conversations: 
     index: 
-      create_a_new_message: "create a new message"
+      create_a_new_message: "tee uusi viesti"
-      message_inbox: "Message Inbox"
+      message_inbox: "Postilaatikko"
-      new_message: "New Message"
+      new_message: "Uusi viesti"
-      no_conversation_selected: "no conversation selected"
+      no_conversation_selected: "ei valittua keskustelua"
-      no_messages: "no messages"
+      no_messages: "ei viestejä"
     new: 
-      no_results: "No Results Found"
+      no_results: "Ei tuloksia"
-      send: "Send"
+      send: "Lähetä"
-      subject: "subject"
+      subject: "aihe"
-      to: "to"
+      to: "vastaanottaja"
     show: 
-      reply: "reply"
+      delete: "delete and block conversation"
+      reply: "vastaa"
   date: 
     formats: 
       birthday: "%B %d"
@@ -214,7 +217,7 @@ fi:
       logout: "kirjaudu ulos"
       view_profile: "profiili"
   more: "Lisää"
-  new_messages: "%{count} new messages"
+  new_messages: "%{count} uutta viestiä"
   new_notifications: "%{count} uutta ilmoitusta"
   new_requests: 
     few: "%{count} uutta pyyntöä!"
@@ -222,7 +225,7 @@ fi:
     other: "%{count} uutta pyyntöä!"
     zero: "ei uusia pyyntöjä"
   next: "seuraava"
-  no_new_messages: "no new messages"
+  no_new_messages: "Ei uusia viestejä"
   no_new_notifications: "ei uusia ilmoituksia"
   notifications: 
     also_commented: "kommentoi myös %{post_author}:n"
@@ -245,9 +248,9 @@ fi:
       commented: "on kommentoinut viestiisi:"
       sign_in: "Kirjaudu sisään nähdäksesi."
       subject: "%{name} on kommentoinut viestiisi."
-    diaspora: "diasporan sähköpostirobotti"
+    diaspora: "Diasporan sähköpostirobotti"
     hello: "Hei %{name}!"
-    love: "terveisin,"
+    love: "Terveisin,"
     mentioned: 
       mentioned: "mainitsi sinut viestissään:"
       sign_in: "Kirjaudu sisään nähdäksesi."
@@ -258,10 +261,10 @@ fi:
       subject: "uusi Diaspora* kontaktipyyntö henkilöltä %{from}"
       try_it_out: "Sinun todella kannattaisi tutustua siihen."
     private_message: 
-      message_subject: "Subject: %{subject}"
+      message_subject: "Aihe: %{subject}"
-      private_message: "has sent you a private message:"
+      private_message: "on lähettänyt sinulle henkilökohtaisen viestin:"
-      sign_in: "Sign in to view it."
+      sign_in: "Kirjaudu sisään nähdäksesi."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      subject: "%{name} on lähettänyt sinulle henkilökohtaisen viestin Diaspora*:ssa"
     request_accepted: 
       accepted: "on hyväksynyt kontaktipyyntösi!"
       sign_in: "Enregistrez-vous ici"
@@ -305,7 +308,7 @@ fi:
     show: 
       does_not_exist: "Henkilöä ei ole olemassa!"
       incoming_request: "Tämä henkilö on lähettänyt sinulle pyynnön."
-      message: "Message"
+      message: "Viesti"
       no_posts: "Ei näytettäviä viestejä!"
       not_connected: "Et ole yhteydessä henkilöön %{name}"
       recent_posts: "Viimeisimmät tapahtumat"

config/locales/diaspora/fr.yml

@@ -72,11 +72,13 @@ fr:
       success: "%{name} a été supprimé avec succès."
     edit: 
       add_existing: "Ajouter un contact existant"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Voulez-vous vraiment supprimer cet aspect ?"
-      make_aspect_list_visible: "rendre la liste de l'aspect visible aux autres membres de l'aspect"
+      done: "Done"
       remove_aspect: "Supprimer cet aspect"
       rename: "renommer"
-      save: "Enregistrer"
+      update: "update"
     helper: 
       are_you_sure: "Voulez-vous vraiment supprimer cet aspect ?"
       aspect_not_empty: "L’aspect n’est pas vide"
@@ -136,18 +138,19 @@ fr:
     zero: "aucun contact"
   conversations: 
     index: 
-      create_a_new_message: "create a new message"
+      create_a_new_message: "créer un nouveau message"
-      message_inbox: "Message Inbox"
+      message_inbox: "Messages reçus"
-      new_message: "New Message"
+      new_message: "Nouveau message"
-      no_conversation_selected: "no conversation selected"
+      no_conversation_selected: "aucune conversation sélectionnée"
-      no_messages: "no messages"
+      no_messages: "aucun message"
     new: 
-      no_results: "No Results Found"
+      no_results: "Aucun résultat trouvé"
-      send: "Send"
+      send: "Envoyer"
-      subject: "subject"
+      subject: "sujet"
-      to: "to"
+      to: "pour"
     show: 
-      reply: "reply"
+      delete: "delete and block conversation"
+      reply: "répondre"
   date: 
     formats: 
       birthday: "%d %B"
@@ -201,7 +204,7 @@ fr:
       have_a_problem: "Un problème ? Trouvez une réponse ici"
       logged_in_as: "connecté comme %{name}"
       powered_by: "PROPULSÉ PAR DIASPORA*"
-      public_feed: "Public Diaspora Feed for %{name}"
+      public_feed: "Flux Diaspora public pour %{name}"
       toggle: "activer/désactiver le site mobile"
       whats_new: "Quoi de neuf ?"
       your_aspects: "vos aspects"
@@ -214,7 +217,7 @@ fr:
       logout: "se déconnecter"
       view_profile: "voir le profil"
   more: "Plus"
-  new_messages: "%{count} new messages"
+  new_messages: "%{count} nouveaux messages"
   new_notifications: "%{count} nouvelle(s) notification(s)"
   new_requests: 
     few: "%{count} nouvelles requêtes !"
@@ -222,7 +225,7 @@ fr:
     other: "%{count} nouvelles requêtes !"
     zero: "aucune nouvelle requête"
   next: "suivant"
-  no_new_messages: "no new messages"
+  no_new_messages: "aucun nouveau message"
   no_new_notifications: "aucune nouvelle notification"
   notifications: 
     also_commented: "a/ont également commenté"
@@ -258,10 +261,10 @@ fr:
       subject: "nouvelle requête de contact Diaspora* de %{from}"
       try_it_out: "Vous devriez vraiment envisager de l'essayer."
     private_message: 
-      message_subject: "Subject: %{subject}"
+      message_subject: "Sujet : %{subject}"
-      private_message: "has sent you a private message:"
+      private_message: "vous a envoyé un message privé :"
-      sign_in: "Sign in to view it."
+      sign_in: "Connectez-vous pour le voir."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      subject: "%{name} vous a envoyé un message privé sur Diaspora*"
     request_accepted: 
       accepted: "a accepté votre requête de contact !"
       sign_in: "Enregistrez ici"

config/locales/diaspora/ga.yml

@@ -72,11 +72,13 @@ ga:
       success: "Fuaireadh ré le %{name}"
     edit: 
       add_existing: "Add an existing contact"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Are you sure you want to delete this aspect?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      done: "Done"
       remove_aspect: "Delete this aspect"
       rename: "rename"
-      save: "Save"
+      update: "update"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Níl an gné folamh"
@@ -147,6 +149,7 @@ ga:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/gl.yml

@@ -72,11 +72,13 @@ gl:
       success: "%{name} foi eliminado correctamente."
     edit: 
       add_existing: "Engadir un contacto existente"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Estás seguro de querer eliminar este aspecto?"
-      make_aspect_list_visible: "facer lista de aspectos visible para a xente do aspecto"
+      done: "Done"
       remove_aspect: "Borrar este aspecto"
       rename: "renomear"
-      save: "Gardar"
+      update: "update"
     helper: 
       are_you_sure: "Estás seguro de querer borrar este aspecto?"
       aspect_not_empty: "O aspecto non esta baleiro"
@@ -136,18 +138,19 @@ gl:
     zero: "non hai contactos"
   conversations: 
     index: 
-      create_a_new_message: "create a new message"
+      create_a_new_message: "crear mensaxe"
-      message_inbox: "Message Inbox"
+      message_inbox: "Caixa de entrada"
-      new_message: "New Message"
+      new_message: "Nova mensaxe"
-      no_conversation_selected: "no conversation selected"
+      no_conversation_selected: "non se seleccionou conversación"
-      no_messages: "no messages"
+      no_messages: "sen mensaxes"
     new: 
-      no_results: "No Results Found"
+      no_results: "Sen resultados"
-      send: "Send"
+      send: "Enviar"
-      subject: "subject"
+      subject: "asunto"
-      to: "to"
+      to: "para"
     show: 
-      reply: "reply"
+      delete: "delete and block conversation"
+      reply: "responder"
   date: 
     formats: 
       birthday: "%B %d"
@@ -214,7 +217,7 @@ gl:
       logout: "Saír"
       view_profile: "Ver o perfil"
   more: "Máis"
-  new_messages: "%{count} new messages"
+  new_messages: "%{count} novas mensaxes"
   new_notifications: "%{count} novas notificacións"
   new_requests: 
     few: "%{count} novas peticións!"
@@ -222,7 +225,7 @@ gl:
     other: "%{count} novas peticións!"
     zero: "non hai novas peticións"
   next: "seguinte"
-  no_new_messages: "no new messages"
+  no_new_messages: "non hai novas mensaxes"
   no_new_notifications: "non hai novas peticións"
   notifications: 
     also_commented: "tamén comentou nos do teu contacto"
@@ -258,10 +261,10 @@ gl:
       subject: "Ten unha nova petición de contacto en Diaspora* de %{from}."
       try_it_out: "Deberías pensar seriamente en botarlle unha ollada."
     private_message: 
-      message_subject: "Subject: %{subject}"
+      message_subject: "Asunto: %{subject}"
-      private_message: "has sent you a private message:"
+      private_message: "enviouche unha mensaxe privada:"
-      sign_in: "Sign in to view it."
+      sign_in: "Entrar para velo."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      subject: "%{name} enviouche unha mensaxe privada en Diaspora*"
     request_accepted: 
       accepted: "aceptou a túa petición de contacto."
       sign_in: "Entra aquí"
@@ -305,7 +308,7 @@ gl:
     show: 
       does_not_exist: "Esa persoa non existe!"
       incoming_request: "%{name} quere compartir contigo"
-      message: "Message"
+      message: "Mensaxe"
       no_posts: "Non hai mensaxes que amosar!"
       not_connected: "Non estás conectado a %{name}"
       recent_posts: "Publicacións recentes"

config/locales/diaspora/he.yml

@@ -72,11 +72,13 @@ he:
       success: "%{name} הוסר בהצלחה."
     edit: 
       add_existing: "הוספת איש קשר קיים"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "האם אכן ברצונך למחוק את ההיבט?"
-      make_aspect_list_visible: "הפיכת רשימת ההיבטים לגלויה לאחרים בהיבט"
+      done: "Done"
       remove_aspect: "מחיקת היבט זה"
       rename: "שינוי שם"
-      save: "שמירה"
+      update: "update"
     helper: 
       are_you_sure: "האם אכן ברצונך למחוק היבט זה?"
       aspect_not_empty: "ההיבט אינו ריק"
@@ -147,6 +149,7 @@ he:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/hu.yml

@@ -72,11 +72,13 @@ hu:
       success: "%{name} csoport sikeresen törölve."
     edit: 
       add_existing: "Létező kapcsolat hozzáadása"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Biztos, hogy törölni akarod a csoportot?"
-      make_aspect_list_visible: "a csoporttagok láthassák egymást"
+      done: "Done"
       remove_aspect: "Csoport törlése"
       rename: "átnevezés"
-      save: "Mentés"
+      update: "update"
     helper: 
       are_you_sure: "Biztos, hogy törlöd a csoportot?"
       aspect_not_empty: "A csoport nem üres"
@@ -147,6 +149,7 @@ hu:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/id.yml

@@ -72,11 +72,13 @@ id:
       success: "%{name} berhasil dihapus."
     edit: 
       add_existing: "Add an existing contact"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Are you sure you want to delete this aspect?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      done: "Done"
       remove_aspect: "Delete this aspect"
       rename: "rename"
-      save: "Save"
+      update: "update"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Aspek tidak kosong"
@@ -147,6 +149,7 @@ id:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/is.yml

@@ -72,11 +72,13 @@ is:
       success: "það heppnaðist að fjarlægja %{name}."
     edit: 
       add_existing: "Bæta við tengilið sem er þegar til"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Ertu viss um að þú viljir eyða þessari ásýnd?"
-      make_aspect_list_visible: "gera þáttökulista ásýndar sýnilegan öðrum í ásýnd"
+      done: "Done"
       remove_aspect: "Eyða þessari ásýnd"
       rename: "breyta nafni"
-      save: "Vista"
+      update: "update"
     helper: 
       are_you_sure: "Ertu viss um að þú viljir eyða þessari ásýnd?"
       aspect_not_empty: "Ásýnd er ekki tóm"
@@ -147,6 +149,7 @@ is:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/it.yml

@@ -72,11 +72,13 @@ it:
       success: "%{name} è stato rimosso con successo."
     edit: 
       add_existing: "Aggiungi un contatto esistente"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Sei sicuro di voler eliminare questo aspetto?"
-      make_aspect_list_visible: "rendi i contatti presenti in questo aspetto visibili agli altri"
+      done: "Done"
       remove_aspect: "Elimina questo aspetto"
       rename: "rinomina"
-      save: "Salva"
+      update: "update"
     helper: 
       are_you_sure: "Sei sicuro di voler eliminare questo aspetto?"
       aspect_not_empty: "Aspetto non vuoto"
@@ -147,6 +149,7 @@ it:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/lt.yml

@@ -72,11 +72,13 @@ lt:
       success: "%{name} sėkmingai pašalintas."
     edit: 
       add_existing: "Add an existing contact"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Are you sure you want to delete this aspect?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      done: "Done"
       remove_aspect: "Delete this aspect"
       rename: "rename"
-      save: "Save"
+      update: "update"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Aspektas netuščias"
@@ -147,6 +149,7 @@ lt:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/mk.yml

@@ -72,11 +72,13 @@ mk:
       success: "%{name} е отстранет успешно."
     edit: 
       add_existing: "Add an existing contact"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Are you sure you want to delete this aspect?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      done: "Done"
       remove_aspect: "Delete this aspect"
       rename: "rename"
-      save: "Save"
+      update: "update"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Аспектот не е празен"
@@ -147,6 +149,7 @@ mk:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/nb.yml

@@ -72,11 +72,13 @@ nb:
       success: "%{name} har blitt fjerna."
     edit: 
       add_existing: "Add an existing contact"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Are you sure you want to delete this aspect?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      done: "Done"
       remove_aspect: "Delete this aspect"
       rename: "rename"
-      save: "Save"
+      update: "update"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Aspektet er ikke tomt"
@@ -147,6 +149,7 @@ nb:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/nl.yml

@@ -72,11 +72,13 @@ nl:
       success: "%{name} is met succes verwijderd."
     edit: 
       add_existing: "Voeg een bestaand contact toe"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Weet je zeker dat je dit aspect wilt verwijderen?"
-      make_aspect_list_visible: "maak aspect lijst zichtbaar voor anderen in aspect"
+      done: "Done"
       remove_aspect: "Verwijder dit aspect"
       rename: "hernoem"
-      save: "Opslaan"
+      update: "update"
     helper: 
       are_you_sure: "Weet je zeker dat je dit aspect wilt verwijderen?"
       aspect_not_empty: "Aspect niet leeg"
@@ -136,18 +138,19 @@ nl:
     zero: "geen contacten"
   conversations: 
     index: 
-      create_a_new_message: "create a new message"
+      create_a_new_message: "maak een nieuw bericht"
-      message_inbox: "Message Inbox"
+      message_inbox: "Berichten Inbox"
-      new_message: "New Message"
+      new_message: "Nieuw Bericht"
-      no_conversation_selected: "no conversation selected"
+      no_conversation_selected: "geen conversatie geselecteerd"
-      no_messages: "no messages"
+      no_messages: "geen berichten"
     new: 
-      no_results: "No Results Found"
+      no_results: "Geen resultaten gevonden"
-      send: "Send"
+      send: "Verstuur"
-      subject: "subject"
+      subject: "onderwerp"
-      to: "to"
+      to: "aan"
     show: 
-      reply: "reply"
+      delete: "delete and block conversation"
+      reply: "beantwoord"
   date: 
     formats: 
       birthday: "%B %d"
@@ -201,7 +204,7 @@ nl:
       have_a_problem: "Probleem? Vind hier een antwoord"
       logged_in_as: "ingelogd als %{name}"
       powered_by: "POWERED BY DIASPORA*"
-      public_feed: "Public Diaspora Feed for %{name}"
+      public_feed: "Publieke Diaspora Feed van %{name}"
       toggle: "switch mobiele versie"
       whats_new: "wat is nieuw op Diaspora?"
       your_aspects: "jouw aspecten"
@@ -214,7 +217,7 @@ nl:
       logout: "log uit"
       view_profile: "bekijk profiel"
   more: "Meer"
-  new_messages: "%{count} new messages"
+  new_messages: "%{count} nieuwe berichten"
   new_notifications: "%{count} nieuwe notificaties"
   new_requests: 
     few: "%{count} nieuwe verzoeken!"
@@ -222,7 +225,7 @@ nl:
     other: "%{count} nieuwe verzoeken!"
     zero: "geen nieuwe verzoeken"
   next: "volgende"
-  no_new_messages: "no new messages"
+  no_new_messages: "Geen nieuwe berichten"
   no_new_notifications: "Geen nieuwe notificaties"
   notifications: 
     also_commented: "heeft ook gereageerd %{post_author}'s"
@@ -258,10 +261,10 @@ nl:
       subject: "nieuw Diaspora* contactverzoek van %{from}"
       try_it_out: "Overweeg eens een kijkje te nemen."
     private_message: 
-      message_subject: "Subject: %{subject}"
+      message_subject: "Onderwerp: %{subject}"
-      private_message: "has sent you a private message:"
+      private_message: "heeft je een persoonlijk bericht gestuurd:"
-      sign_in: "Sign in to view it."
+      sign_in: "Log in om het te zien."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      subject: "%{name} heeft je een persoonlijk bericht gestuurd op Diaspora*"
     request_accepted: 
       accepted: "heeft je contactverzoek geaccepteerd!"
       sign_in: "Log hier in"
@@ -305,7 +308,7 @@ nl:
     show: 
       does_not_exist: "Die persoon bestaat niet!"
       incoming_request: "% {name} wil met je delen"
-      message: "Message"
+      message: "Bericht"
       no_posts: "geen berichten om weer te geven!"
       not_connected: "Je deelt niet met %{name}"
       recent_posts: "Recente Berichten"

config/locales/diaspora/pl.yml

@@ -72,11 +72,13 @@ pl:
       success: "%{name} został usunięty."
     edit: 
       add_existing: "Dodaj istniejący kontakt"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "@{m,f:Jesteś|n:Czy na}{ pew}{m:ien|f:na|n:no}{m,f:, że } chcesz usunąć ten aspekt?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      done: "Done"
       remove_aspect: "Usuń ten aspekt"
       rename: "zmień nazwę"
-      save: "Zapisz"
+      update: "update"
     helper: 
       are_you_sure: "@{m,f:Jesteś|n:Czy na}{ pew}{m:ien|f:na|n:no}{m,f:, że } chcesz usunąć ten aspekt?"
       aspect_not_empty: "Aspekt nie jest pusty"
@@ -147,6 +149,7 @@ pl:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/pt-BR.yml

@@ -72,11 +72,13 @@ pt-BR:
       success: "%{name} foi removido com sucesso."
     edit: 
       add_existing: "Incluir um contato existente"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Tem certeza que quer excluir este aspecto?"
-      make_aspect_list_visible: "Permitir que as pessoas deste aspecto vejam quem está nele."
+      done: "Done"
       remove_aspect: "Excluir este aspecto"
       rename: "Renomear"
-      save: "Salvar"
+      update: "update"
     helper: 
       are_you_sure: "Tem certeza que quer excluir este aspecto?"
       aspect_not_empty: "Aspecto não está vazio"
@@ -147,6 +149,7 @@ pt-BR:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/pt-PT.yml

@@ -72,11 +72,13 @@ pt-PT:
       success: "%{name} foi removido(a) com sucesso."
     edit: 
       add_existing: "Add an existing contact"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Are you sure you want to delete this aspect?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      done: "Done"
       remove_aspect: "Delete this aspect"
       rename: "rename"
-      save: "Save"
+      update: "update"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Mini-Perfil não está vazio"
@@ -147,6 +149,7 @@ pt-PT:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/ro.yml

@@ -72,11 +72,13 @@ ro:
       success: "%{name} a fost eliminat cu succes."
     edit: 
       add_existing: "Adaugă o persoană de contact existentă"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Eşti sigur că doreşti să ştergi acest aspect?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      done: "Done"
       remove_aspect: "Delete this aspect"
       rename: "rename"
-      save: "Save"
+      update: "update"
     helper: 
       are_you_sure: "Eşti sigur că doreşti să ştergi acest aspect?"
       aspect_not_empty: "Aspectul nu este gol"
@@ -147,6 +149,7 @@ ro:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/ru.yml

@@ -72,11 +72,13 @@ ru:
       success: "%{name} удалён."
     edit: 
       add_existing: "Добавить существующий контакт"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Вы уверены, что хотите удалить этот аспект?"
-      make_aspect_list_visible: "сделать список аспектов видным для других пользователей в аспекте"
+      done: "Done"
       remove_aspect: "Удалить этот аспект"
       rename: "переименовать"
-      save: "Сохранить"
+      update: "update"
     helper: 
       are_you_sure: "Вы уверены в том, что хотите удалить этот аспект?"
       aspect_not_empty: "Аспект не пуст"
@@ -147,6 +149,7 @@ ru:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/sk.yml

@@ -72,11 +72,13 @@ sk:
       success: "Užívateľ %{name} bol úspešne odstránený."
     edit: 
       add_existing: "Pridať existujúci kontakt"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Ste si istý, že chcete zmazať tento aspekt?"
-      make_aspect_list_visible: "Zviditeľniť zoznam aspektov ostatným"
+      done: "Done"
       remove_aspect: "Zmazať tento aspekt"
       rename: "premenovať"
-      save: "Uložiť"
+      update: "update"
     helper: 
       are_you_sure: "Ste si istý, že chcete zmazať tento aspekt?"
       aspect_not_empty: "Aspekt nie je prázdny"
@@ -147,6 +149,7 @@ sk:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/sl.yml

@@ -72,11 +72,13 @@ sl:
       success: "%{name} je uspešno odstranjen."
     edit: 
       add_existing: "Dodaj obstoječ kontakt"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Ste prepričani, da bi radi izbrisali ta vidik?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      done: "Done"
       remove_aspect: "Izbriši ta vidik"
       rename: "preimenuj"
-      save: "Save"
+      update: "update"
     helper: 
       are_you_sure: "Ste prepričani, da želite izbrisati skupino?"
       aspect_not_empty: "Skupina vsebuje stike"
@@ -147,6 +149,7 @@ sl:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/sv.yml

@@ -72,11 +72,13 @@ sv:
       success: "%{name} är nu borttagen."
     edit: 
       add_existing: "Add an existing contact"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Are you sure you want to delete this aspect?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      done: "Done"
       remove_aspect: "Delete this aspect"
       rename: "rename"
-      save: "Save"
+      update: "update"
     helper: 
       are_you_sure: "Är du säker på att du vill tabort den här sidan?"
       aspect_not_empty: "Sidan är inte tom"
@@ -147,6 +149,7 @@ sv:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/tr.yml

@@ -72,11 +72,13 @@ tr:
       success: "%{name} başarıyla yaratıldı."
     edit: 
       add_existing: "Add an existing contact"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Are you sure you want to delete this aspect?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      done: "Done"
       remove_aspect: "Delete this aspect"
       rename: "rename"
-      save: "Save"
+      update: "update"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Yan boş değil"
@@ -147,6 +149,7 @@ tr:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/diaspora/zh-TW.yml

@@ -21,31 +21,31 @@ zh-TW:
         contact: 
           attributes: 
             person_id: 
-              taken: "must be unique among this user's contacts."
+              taken: "對此使用者必須為不重複的聯繫."
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "is already taken."
+              taken: "已被使用."
         request: 
           attributes: 
             from_id: 
-              taken: "is a duplicate of a pre-existing request."
+              taken: "與已存在的請求重複."
         user: 
           attributes: 
             email: 
-              taken: "is already taken."
+              taken: "已被使用."
             person: 
-              invalid: "is invalid."
+              invalid: "不合格."
             username: 
-              taken: "is already taken."
+              taken: "已被使用."
   ago: "%{time} 前"
   application: 
     helper: 
       aspect_badge: 
         all_aspects: "全部面向"
-      unknown_person: "unknown person"
+      unknown_person: "不明聯絡人"
       video_title: 
-        unknown: "Unknown Video Title"
+        unknown: "影片標題不明"
   are_you_sure: "你確定嗎?"
   aspect_memberships: 
     destroy: 
@@ -59,7 +59,7 @@ zh-TW:
     aspect_contacts: 
       done_editing: "編輯完成"
     aspect_stream: 
-      activity: "活躍度"
+      activity: "近來活動"
       post_time: "發表時間"
       sort_by: "排序:"
     contacts_not_visible: "此面向中的聯繫無法看見彼此."
@@ -72,29 +72,31 @@ zh-TW:
       success: "成功刪除 %{name} 了."
     edit: 
       add_existing: "加入既有聯繫"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "你確定要刪除這個面向?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      done: "Done"
       remove_aspect: "刪除這個面向"
       rename: "改名"
-      save: "儲存"
+      update: "update"
     helper: 
       are_you_sure: "你確定要刪除這個面向?"
       aspect_not_empty: "面向不是空的"
       remove: "刪除"
     index: 
-      handle_explanation: "這是你的 diaspora 識別碼. 就像是電子郵件信箱一樣, 你可以把它給想聯絡你的人."
+      handle_explanation: "這是你的 diaspora 識別碼. 就像是電子信箱一樣, 你可以把它給想聯絡你的人."
       no_contacts: "沒有任何聯繫"
     manage: 
       add_a_new_aspect: "新增面向"
       add_a_new_contact: "加入新的聯繫"
-      drag_to_add: "Drag to add people"
+      drag_to_add: "拖拉移動人以加入他們"
       manage_aspects: "面向管理"
-      no_requests: "No new requests"
+      no_requests: "沒有新要求"
-      requests: "Requests"
+      requests: "請求"
     move_contact: 
       error: "聯繫移動錯誤: %{inspect}"
       failure: "didn't work %{inspect}"
-      success: "Person moved to new aspect"
+      success: "聯絡人已移至新的面向"
     new_aspect: 
       create: "創造"
       name: "名稱"
@@ -105,7 +107,7 @@ zh-TW:
       nobody: "帶生活中重要的人來 Diaspora!"
       nobody_in_aspect: "你的面向 '%{aspect_name}' 是空的."
     no_posts_message: 
-      start_talking: "還沒人說話. 你來起頭吧!"
+      start_talking: "還沒人說話. 你來起個頭吧!"
     seed: 
       family: "家庭"
       work: "工作"
@@ -114,12 +116,12 @@ zh-TW:
     update: 
       failure: "你的面向 %{name} 因名稱太長了無法儲存."
       success: "你的面向 %{name} 已編輯完成."
-  back: "Back"
+  back: "後退"
   cancel: "取消"
   comments: 
     new_comment: 
       comment: "發表意見"
-      commenting: "發表意見中..."
+      commenting: "意見發表中..."
   contacts: 
     create: 
       failure: "建立聯繫失敗"
@@ -127,7 +129,7 @@ zh-TW:
       failure: "跟 %{name} 切斷聯繫失敗"
       success: "成功切斷與 %{name} 的聯繫"
     few: "%{count} 個聯繫"
-    one: "1 個聯繫"
+    one: "一個聯繫"
     other: "%{count} 個聯繫"
     share_with_pane: 
       accepts: "當 %{name} 接受後, 你們就開始可以看到彼此在 Diaspora 上發表的東西"
@@ -136,73 +138,74 @@ zh-TW:
     zero: "沒有任何聯繫"
   conversations: 
     index: 
-      create_a_new_message: "create a new message"
+      create_a_new_message: "編寫新訊息"
-      message_inbox: "Message Inbox"
+      message_inbox: "訊息信箱"
-      new_message: "New Message"
+      new_message: "新訊息"
-      no_conversation_selected: "no conversation selected"
+      no_conversation_selected: "未選取任何對話"
-      no_messages: "no messages"
+      no_messages: "沒有訊息"
     new: 
-      no_results: "No Results Found"
+      no_results: "沒有結果"
-      send: "Send"
+      send: "傳送"
-      subject: "subject"
+      subject: "主旨"
-      to: "to"
+      to: "收件人"
     show: 
-      reply: "reply"
+      delete: "delete and block conversation"
+      reply: "回覆"
   date: 
     formats: 
       birthday: "%B %d"
       birthday_with_year: "%B %d %Y"
       fullmonth_day: "%B %d"
-  delete: "Delete"
+  delete: "刪除"
   email: "電子郵件"
   error_messages: 
     helper: 
-      correct_the_following_errors_and_try_again: "Correct the following errors and try again."
+      correct_the_following_errors_and_try_again: "修正以下後再試一次."
-      invalid_fields: "Invalid Fields"
+      invalid_fields: "欄位無效"
-  fill_me_out: "Fill me out"
+  fill_me_out: "填寫我"
   home: 
     show: 
       already_account: "已經有帳號了嗎?"
-      choice: "Choice"
+      choice: "選擇"
-      choice_explanation: "Diaspora lets you sort your connections into groups called aspects. Unique to Diaspora, aspects ensure that your photos, stories and jokes are shared only with the people you intend."
+      choice_explanation: "Diaspora 讓你將你的關係以\"面向\"來分類. 面向是 Diaspora 的獨創, 用來確保你的相片,遭遇和笑話, 只和你所希望的人分享."
-      learn_about_host: "Learn about how to host your own Diaspora server."
+      learn_about_host: "學習如何架設你自己的 Diaspora 伺服器."
       login_here: "從這裡登入"
-      ownership: "Ownership"
+      ownership: "所有權"
-      ownership_explanation: "You own your pictures, and you shouldn’t have to give that up just to share them. You maintain ownership of everything you share on Diaspora, giving you full control over how it's distributed."
+      ownership_explanation: "你擁有你的圖片, 且不該因為分享出去就失去它. 在 Diaspora, 所有你分享出去的東西, 你都仍有所有權, 你可以控制它們如何散布."
-      share_what_you_want: "Share what you want, with whom you want."
+      share_what_you_want: "跟你想要的人, 分享你想要的東西."
-      simplicity: "Simplicity"
+      simplicity: "簡單"
-      simplicity_explanation: "Diaspora makes sharing clean and easy – and this goes for privacy too. Inherently private, Diaspora doesn’t make you wade through pages of settings and options just to keep your profile secure."
+      simplicity_explanation: "Diaspora 讓分享變得單純且簡單, 而隱私也是一樣. 以隱私為出發點, Diaspora 讓你不用必須千辛萬苦的調整設定, 才能保護你的個人檔案安全."
       tagline_first_half: "Share what you want,"
       tagline_second_half: "with whom you want."
   invitations: 
     check_token: 
-      not_found: "Invitation token not found"
+      not_found: "找不到該邀請信物"
     create: 
       already_contacts: "你已經和這個人相連了"
       already_sent: "你邀請過這個人了."
-      no_more: "You have no more invitations."
+      no_more: "你沒有邀請函了."
-      rejected: "The following email addresses had problems: "
+      rejected: "下列電子信箱有問題: "
-      sent: "Invitations have been sent to: "
+      sent: "邀請函已經寄給: "
     edit: 
       sign_up: "sign_up"
     new: 
       already_invited: "已邀請了"
       aspect: "面向"
-      comma_seperated_plz: "You can enter multiple email addresses separated by commas."
+      comma_seperated_plz: "你可以輸入多個電子信箱, 只要以逗號分隔即可."
       if_they_accept_info: "如果他們接受, 就會被加入至你所邀請的面向中."
       invite_someone_to_join: "邀請某人來加入 Diaspora!"
-      personal_message: "Personal message"
+      personal_message: "個人訊息"
-      resend: "Resend"
+      resend: "重送"
-      send_an_invitation: "Send an invitation"
+      send_an_invitation: "送出邀請函"
-      send_invitation: "Send invitation"
+      send_invitation: "寄送邀請函"
-      to: "To"
+      to: "收件人"
   layouts: 
     application: 
       have_a_problem: "有問題嗎? 這裡有解答"
-      logged_in_as: "logged in as %{name}"
+      logged_in_as: "以 %{name} 登入"
-      powered_by: "POWERED BY DIASPORA*"
+      powered_by: "強力配置 DIASPORA*"
-      public_feed: "Public Diaspora Feed for %{name}"
+      public_feed: "%{name} 的 Diaspora 公開資訊源"
-      toggle: "toggle mobile site"
+      toggle: "行動網站切換"
       whats_new: "有什麼新消息?"
       your_aspects: "你的面向"
     header: 
@@ -213,16 +216,16 @@ zh-TW:
       login: "登入"
       logout: "登出"
       view_profile: "檢視個人檔案"
-  more: "More"
+  more: "更多"
-  new_messages: "%{count} new messages"
+  new_messages: "%{count} 則新訊息"
   new_notifications: "%{count} 則新消息"
   new_requests: 
     few: "%{count} 個新請求!"
     one: "新的請求!"
     other: "%{count} 個新請求!"
-    zero: "沒有新要求"
+    zero: "沒有新請求"
   next: "next"
-  no_new_messages: "no new messages"
+  no_new_messages: "沒有新訊息"
   no_new_notifications: "沒有新消息"
   notifications: 
     also_commented: "also commented on %{post_author}'s"
@@ -238,84 +241,84 @@ zh-TW:
     request_accepted: "已同意和你分享."
   notifier: 
     also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
+      commented: "也對 %{post_author} 的以下貼文發表意見:"
-      sign_in: "Sign in to view it."
+      sign_in: "登入後才能觀看."
-      subject: "%{name} has also commented on %{post_author}'s post."
+      subject: "%{name} 也對 %{post_author} 的貼文發表意見."
     comment_on_post: 
-      commented: "has commented on your post:"
+      commented: "對你以下貼文發表意見:"
-      sign_in: "Sign in to view it."
+      sign_in: "登入後才能觀看."
-      subject: "%{name} has commented on your post."
+      subject: "%{name} 對你的貼文發表意見."
-    diaspora: "the diaspora email robot"
+    diaspora: "diaspora 電子郵件機器人"
-    hello: "Hello %{name}!"
+    hello: "%{name}, 你好!"
     love: "love,"
     mentioned: 
       mentioned: "mentioned you in a post:"
-      sign_in: "Sign in to view it."
+      sign_in: "登入後才能觀看."
-      subject: "%{name} has mentioned you on Diaspora*"
+      subject: "%{name} 在 Diaspora* 提到你"
     new_request: 
       just_sent_you: "剛剛向你要求在 Diaspora* 上建立聯繫"
-      sign_in: "Sign in here"
+      sign_in: "由此登入"
       subject: "%{from} 想跟你在 Diaspora* 上建立聯繫的新請求"
-      try_it_out: "You should really think about checking it out."
+      try_it_out: "你應該考慮看一看."
     private_message: 
-      message_subject: "Subject: %{subject}"
+      message_subject: "主旨: %{subject}"
-      private_message: "has sent you a private message:"
+      private_message: "已傳送私人訊息給你:"
-      sign_in: "Sign in to view it."
+      sign_in: "登入後才能觀看."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      subject: "%{name} 已在 Diaspora* 傳送私人訊息給你"
     request_accepted: 
       accepted: "已接受了跟你聯繫的請求!"
-      sign_in: "Sign in here"
+      sign_in: "由此登入"
       subject: "%{name} 已接受了跟你在 Diaspora* 上聯繫的請求"
     single_admin: 
-      admin: "Your Diaspora administrator"
+      admin: "為您服務的 Diaspora 管理員"
-      subject: "A message about your Diaspora account:"
+      subject: "關於你的 Diaspora 帳號的訊息:"
     thanks: "Thanks,"
   ok: "OK"
   or: "or"
   pagination: 
-    next: "Next"
+    next: "下一頁"
-    previous: "Previous"
+    previous: "上一頁"
   password: "密碼"
   password_confirmation: "密碼確認"
   people: 
     aspect_list: 
-      edit_membership: "edit aspect membership"
+      edit_membership: "編輯面向成員"
     helper: 
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
     index: 
-      couldnt_find_them_send_invite: "找不到他們? 送一張邀請卡吧!"
+      couldnt_find_them_send_invite: "找不到他們? 寄一張邀請函吧!"
       no_one_found: "...找不到任何東西."
-      no_results: "Hey! You need to search for something."
+      no_results: "嘿! 搜尋要有目標."
       results_for: "search results for"
     person: 
       add_contact: "加入聯繫"
-      already_connected: "Already connected"
+      already_connected: "已建立連結"
-      pending_request: "pending request"
+      pending_request: "請求等候中"
-      thats_you: "thats you!"
+      thats_you: "是你耶!"
     profile_sidebar: 
-      bio: "bio"
+      bio: "自我介紹"
       born: "生日"
-      cannot_remove: "Cannot remove %{name} from last aspect. (If you want to disconnect from this person you must remove contact.)"
+      cannot_remove: "無法將聯絡人從他/她最後一個面向中移除. (如果你想跟這個人斷絕連結, 你必須刪除他/她的聯繫.)"
       edit_my_profile: "編輯我的個人檔案"
       gender: "性別"
       in_aspects: "in aspects"
       remove_contact: "刪除聯繫"
-      remove_from: "Remove %{name} from %{aspect}?"
+      remove_from: "要從 %{aspect} 刪除 %{name} 嗎?"
     show: 
-      does_not_exist: "Person does not exist!"
+      does_not_exist: "聯絡人不存在!"
-      incoming_request: "%{name} wants to share with you"
+      incoming_request: "%{name} 希望能和你分享"
-      message: "Message"
+      message: "訊息"
-      no_posts: "no posts to display!"
+      no_posts: "沒有貼文可顯示!"
-      not_connected: "You are not sharing with %{name}"
+      not_connected: "你不跟 %{name} 分享"
-      recent_posts: "Recent Posts"
+      recent_posts: "近來貼文"
-      recent_public_posts: "Recent Public Posts"
+      recent_public_posts: "近來公開貼文"
       return_to_aspects: "回你的面向主頁"
       similar_contacts: "相似的聯繫"
-      start_sharing: "start sharing"
+      start_sharing: "開始分享"
       to_accept_or_ignore: "to accept or ignore it."
     webfinger: 
-      fail: "Sorry, we couldn't find %{handle}."
+      fail: "抱歉, 找不到 %{handle}."
   photos: 
     create: 
       integrity_error: "相片上傳失敗. 你確定它是圖片嗎?"
@@ -324,7 +327,7 @@ zh-TW:
     destroy: 
       notice: "相片已刪除."
     edit: 
-      editing: "Editing"
+      editing: "編輯中"
     new: 
       back_to_list: "回列表"
       new_photo: "新相片"
@@ -339,10 +342,10 @@ zh-TW:
     photo: 
       view_all: "檢視 %{name} 所有的相片"
     show: 
-      collection_permalink: "collection permalink"
+      collection_permalink: "收集的靜態連結"
       delete_photo: "刪除相片"
       edit: "編輯"
-      edit_delete_photo: "Edit photo description / delete photo"
+      edit_delete_photo: "編輯相片敘述或刪除相片"
       make_profile_photo: "選為個人照"
       original_post: "原貼文"
       permalink: "靜態連結"
@@ -371,100 +374,100 @@ zh-TW:
       failed: "個人檔案更新失敗"
       updated: "個人檔案已更新"
   registrations: 
-    closed: "Signups are closed on this Diaspora pod."
+    closed: "此 Diaspora pod 不開放登記."
     create: 
-      success: "You've joined Diaspora!"
+      success: "你已經加入 Diaspora 了!"
     edit: 
       cancel_my_account: "取消我的帳號"
-      edit: "Edit %{name}"
+      edit: "編輯 %{name}"
-      leave_blank: "(leave blank if you don't want to change it)"
+      leave_blank: "(不想變更則請留白)"
-      password_to_confirm: "(we need your current password to confirm your changes)"
+      password_to_confirm: "(我們需要你目前的密碼以確認你要變更)"
-      unhappy: "Unhappy?"
+      unhappy: "不滿意?"
       update: "更新"
     new: 
-      enter_email: "Enter an e-mail"
+      enter_email: "輸入電子信箱"
       enter_password: "輸入密碼"
       enter_password_again: "輸入與前面相同的密碼"
-      enter_username: "Pick a username (only letters, numbers, and underscores)"
+      enter_username: "選個用戶名稱(名稱只能包含拉丁字母,數字,以及底線字元)"
-      sign_up: "Sign up"
+      sign_up: "登記"
-      sign_up_for_diaspora: "Sign up for Diaspora"
+      sign_up_for_diaspora: "登記使用 Diaspora"
   requests: 
     create: 
-      sending: "Sending"
+      sending: "傳送中"
       sent: "你已經要求要和 %{name} 分享. 他們下次登入 Diaspora 時就會看見."
     destroy: 
       error: "請選一個面向!"
       ignore: "忽略建立聯繫的請求."
-      success: "You are now friends."
+      success: "你們現在是朋友了."
     manage_aspect_contacts: 
       existing: "聯繫編輯"
       manage_within: "Manage contacts within"
     new_request_to_person: 
-      sent: "sent!"
+      sent: "已送出!"
   search: "搜尋"
   services: 
     create: 
-      success: "Authentication successful."
+      success: "認證成功."
     destroy: 
-      success: "Successfully deleted authentication."
+      success: "認證刪除成功."
     failure: 
-      error: "there was an error connecting that service"
+      error: "與該服務連結時有錯誤"
     finder: 
       friends: 
-        few: "%{count} friends"
+        few: "%{count} 個朋友"
-        one: "1 friend"
+        one: "一個朋友"
-        other: "%{count} friends"
+        other: "%{count} 個朋友"
-        zero: "no friends"
+        zero: "沒有朋友"
       invite_your_friends_from: "邀請你在 %{service} 的朋友"
-      not_connected: "not connected"
+      not_connected: "未連結"
     index: 
-      connect_to_facebook: "和 facebook 連結"
+      connect_to_facebook: "與 facebook 連結"
-      connect_to_twitter: "和 twitter 連結"
+      connect_to_twitter: "與 twitter 連結"
-      disconnect: "disconnect"
+      disconnect: "切斷連結"
-      edit_services: "Edit services"
+      edit_services: "編輯服務"
       logged_in_as: "logged in as"
-      really_disconnect: "disconnect %{service}?"
+      really_disconnect: "切斷與 %{service} 的連結?"
     inviter: 
       click_link_to_accept_invitation: "按一下這個連結來接受邀請"
-      join_me_on_diaspora: "跟我來加入 DIASPORA*"
+      join_me_on_diaspora: "跟我一起加入 DIASPORA*"
     remote_friend: 
       invite: "邀請"
-      resend: "resend"
+      resend: "重送"
   settings: "設定"
   shared: 
     add_contact: 
-      create_request: "Find by Diaspora handle"
+      create_request: "以 Diaspora 識別碼搜尋"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "輸入 Diaspora 用戶名稱:"
-      know_email: "知道他們的電子郵件信箱嗎? 你應該邀請他們來"
+      know_email: "知道他們的電子信箱嗎? 你應該邀請他們來"
       your_diaspora_username_is: "你的 Diaspora 用戶名稱是: %{diaspora_handle}"
     contact_list: 
       all_contacts: "全部聯繫"
-      cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
+      cannot_remove: "無法將聯絡人從他/她最後一個面向中移除. (如果你想跟這個人斷絕連結, 你必須刪除他/她的聯繫.)"
     invitations: 
       by_email: "by Email"
       dont_have_now: "目前你還不能邀請任何人, 但很快就可以了!"
       from_facebook: "From Facebook"
-      invitations_left: "(%{count} left)"
+      invitations_left: "(剩餘 %{count} 張)"
       invite_someone: "邀請某人來"
       invite_your_friends: "邀請你的朋友來"
       invites: "邀請"
-      invites_closed: "Invites are currently closed on this Diaspora pod"
+      invites_closed: "目前本 Diaspora pod 不開放邀請功能"
     notification: 
       new: "%{from} 有新的 %{type}"
     public_explain: 
-      logged_in: "logged in to %{service}"
+      logged_in: "已登入至 %{service}"
       manage: "管理已連線的服務"
-      outside: "Public messages will be available for others outside of Diaspora to see."
+      outside: "不使用 Diaspora 的人也能看到公開訊息."
-      title: "You are about to post a public message!"
+      title: "你將要發表公開訊息!"
     publisher: 
       add_photos: "加入相片"
-      all: "all"
+      all: "全部"
       all_contacts: "全部的聯繫"
-      make_public: "make public"
+      make_public: "公開"
       mention_helper_text: "想提到某人的話, 先敲 '@' 再接著打他們的名字"
-      post_a_message_to: "Post a message to %{aspect}"
+      post_a_message_to: "在 %{aspect} 發表訊息"
-      posting: "Posting..."
+      posting: "發表中..."
       share: "分享"
       share_with: "share with"
       whats_on_your_mind: "在想什麼?"
@@ -479,8 +482,8 @@ zh-TW:
       oh_yeah: "oh yeah!"
       tell_me_something_good: "tell me something good"
     show: 
-      destroy: "Delete"
+      destroy: "刪除"
-      permalink: "permalink"
+      permalink: "靜態連結"
   stream_helper: 
     hide_comments: "隱藏意見"
     show_comments: "顯示所有意見"
@@ -502,24 +505,24 @@ zh-TW:
       new_password: "新的密碼"
       receive_email_notifications: "要透過電子郵件接收消息?"
       your_email: "你的電子郵件"
-      your_handle: "你的 diaspora 識別"
+      your_handle: "你的 diaspora 識別碼"
     getting_started: 
-      connect_on_diaspora: "Connect on Diaspora"
+      connect_on_diaspora: "連上 Diaspora"
-      connect_services: "Connect your other services"
+      connect_services: "連結至你使用的其他服務"
       edit_profile: "編輯個人檔案"
-      finished: "Finished!"
+      finished: "完成!"
-      save_and_continue: "Save and continue"
+      save_and_continue: "儲存並繼續"
-      signup_steps: "Finish your sign up by completing these three steps:"
+      signup_steps: "做完這三個步驟以完成登記:"
-      skip: "skip getting started"
+      skip: "跳過使用入門"
       step_2: 
-        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        find_your_friends_on_diaspora: "你想在 Diaspora 聯絡 Facebook 上的朋友嗎?"
-        skip: "Skip"
+        skip: "跳過"
       step_3: 
-        finish: "Finish"
+        finish: "完成"
-        people_already_on_diaspora: "People already on Diaspora"
+        people_already_on_diaspora: "已使用 Diaspora 的人"
-      welcome: "Welcome to Diaspora!"
+      welcome: "歡迎來到 Diaspora!"
     public: 
-      does_not_exist: "User %{username} does not exist!"
+      does_not_exist: "不存在 %{username} 這個用戶!"
     update: 
       email_notifications_changed: "電子郵件消息已更改"
       language_changed: "語言已更改"

config/locales/diaspora/zh.yml

@@ -72,11 +72,13 @@ zh:
       success: "成功删除%{name}。"
     edit: 
       add_existing: "增加一个现有联系人"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "你确定你要删除这个分组吗？"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      done: "Done"
       remove_aspect: "删除这个分组"
       rename: "改名"
-      save: "Save"
+      update: "update"
     helper: 
       are_you_sure: "您确定要删除这个分组吗？"
       aspect_not_empty: "此分组非空"
@@ -147,6 +149,7 @@ zh:
       subject: "subject"
       to: "to"
     show: 
+      delete: "delete and block conversation"
       reply: "reply"
   date: 
     formats: 

config/locales/javascript/javascript.zh-TW.yml

@@ -19,7 +19,7 @@ zh-TW:
       minutes: "%d 分鐘"
       month: "約一個月"
       months: "%d 個月"
-      prefixAgo: ""
+      prefixAgo: "在"
       prefixFromNow: "距今"
       seconds: "少於一分鐘"
       suffixAgo: "前"