updated locales

config/locales/diaspora/ar.yml

@@ -482,7 +482,6 @@ ar:
       edit_delete_photo: "تعديل وصف الصورة / حذف الصورة"
       make_profile_photo: "اجعلها صورة شخصية"
       original_post: "منشور أصلي"
-      permalink: "رابط دائم"
       update_photo: "تحديث صورة"
       view: "مشاهدة"
     update: 
@@ -492,7 +491,10 @@ ar:
     update: 
       post_hidden: "تم إخفاء مشاركة %{name}"
   posts: 
-    doesnt_exist: "هذه المشاركة غير موجودة"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "السابق"
   profile: "الصفحة الشخصية"
   profiles: 
@@ -648,10 +650,6 @@ ar:
       no_message_to_display: "لا يوجد رسائل لعرضها"
     new: 
       mentioning: "إشارة إلى: %{person}"
-    show: 
-      destroy: "إزالة"
-      not_found: "للأسف، لم نجد هذا المنشور"
-      permalink: "رابط دائم"
     too_long: 
       few: "رجاء لا تتجاوز في منشوراتك حد %{count} حرفا"
       many: "رجاء لا تتجاوز في منشوراتك حد %{count} حرفا"

config/locales/diaspora/bg.yml

@@ -165,7 +165,7 @@ bg:
       add_a_new_aspect: "Създаване на аспект"
       all_contacts: "Всички контакти"
       edit_aspect: "Редактиране на \"%{name}\""
-      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
+      many_people_are_you_sure: "Наистина ли желаете да започнете частен разговор с повече от %{suggested_limit} контакта? Публикация в аспекта е по-подходящ начин за свързване с толкова хора."
       my_contacts: "Моите контакти"
       no_contacts: "Няма контакти."
       only_sharing_with_me: "Само споделящите с мен"
@@ -228,7 +228,7 @@ bg:
       learn_about_host: "Научете как да стартирате Diaspora на собствен сървър."
       login_here: "впишете се от тук"
       ownership: "Собственост"
-      ownership_explanation: "Вие притежавате снимките си и не е необходимо да се отказвате от това си право само за да ги споделите. Запазвате собсвеност върху всичко, което споделяте в Diaspora и контролирате разпространението."
+      ownership_explanation: "Вие притежавате снимките си и не е необходимо да се отказвате от това си право само за да ги споделите. Запазвате собственост върху всичко, което споделяте в Diaspora и контролирате разпространението."
       share_what_you_want: "Споделяйте каквото желаете, с когото пожелаете."
       simplicity: "Леснота"
       simplicity_explanation: "Споделянето чрез Diaspora е просто и лесно. Характерно за Diaspora е, че запазва личния ви живот поверителен без нужда от настройване на различни страници с безброй опции."
@@ -374,7 +374,7 @@ bg:
       commented: "добави коментар на ваша публикация:"
       sign_in: "Впишете се, за да го прегледате."
       subject: "%{name} коментира ваша публикация."
-    diaspora: "системата за ел. поща на diaspora"
+    diaspora: "системата за ел. поща на Diaspora"
     hello: "Здравейте %{name}!"
     liked: 
       liked: "току-що %{name} хареса вашата публикация:"
@@ -482,7 +482,6 @@ bg:
       edit_delete_photo: "Редактиране на описанието / изтриване"
       make_profile_photo: "ползване като профилна снимка"
       original_post: "Оригинална публикация"
-      permalink: "постоянен адрес"
       update_photo: "Update Photo"
       view: "view"
     update: 
@@ -492,7 +491,10 @@ bg:
     update: 
       post_hidden: "Скрита е публикация на %{name}."
   posts: 
-    doesnt_exist: "публикацията не съществува!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "предишна"
   profile: "Профил"
   profiles: 
@@ -648,10 +650,6 @@ bg:
       no_message_to_display: "Няма съобщение за изобразяване."
     new: 
       mentioning: "Споменаване на %{person}"
-    show: 
-      destroy: "Изтриване"
-      not_found: "За съжаление публикацията не може да бъде намерена."
-      permalink: "постоянен адрес"
     too_long: 
       few: ", моля съкратете съобщението си до %{count} знака"
       many: ", моля съкратете съобщението си до %{count} знака"
@@ -667,7 +665,7 @@ bg:
       success: "Започнахте да следите \"#%{name}\""
     destroy: 
       failure: "Следенето на \"#%{name}\" не е прекратено"
-      success: "Следенето на \"#%{name}\" е прекатено"
+      success: "Следенето на \"#%{name}\" е прекратено"
   tags: 
     show: 
       follow: "Следете #%{tag}"
@@ -680,15 +678,15 @@ bg:
     show: 
       connect_to_cubbies: "Свързване с Cubbi.es"
       connecting_is_simple: "За свързване на акаунта ви в Diaspora е необходимо да въведете вашият адрес в Diaspora (<b>%{diaspora_id}</b>) в <a href='%{href_link}'>страницата с настройки</a> на Cubbi.es и да натиснете \"Connect\"."
-      daniels_account: "акаунтът на Daniel в Diaspora"
+      daniels_account: "акаунта на Daniel в Diaspora"
       log_in_with_diaspora_is_comming: "В най-скоро време ще можете да свързвате ново приложение без необходимост от създаване на отделен, от този, който ползвате, акаунт в Diaspora."
-      love_to_try: "Бихме се радвали ако пробвате!"
+      love_to_try: "Бихме се радвали ако го пробвате!"
       making_the_connection: "Създаване на връзката"
       screenshot_explanation: "%{link1}.  Тази cubby страница е свързана с %{link2}."
       sign_up_today: "Регистрирайте се днес!"
       typical_userpage: "Типична потребителска страница от cubbi.es"
       via: "(чрез %{link})"
-      what_is_cubbies: "Cubbi.es е първото приложение за Diaspora. Също така е и най-добият начин за събиране на изображения online."
+      what_is_cubbies: "Cubbi.es е първото приложение за Diaspora. Също така е и най-добрият начин за събиране на изображения."
   undo: "Отмяна?"
   username: "Потребителско име"
   users: 
@@ -716,7 +714,7 @@ bg:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Свързване към други услуги"
-      could_not_find_anyone: "Не окривате никой ваш приятел в Diaspora*? Ползвайте търсачката, за да ги поканите."
+      could_not_find_anyone: "Не откривате никой ваш приятел в Diaspora*? Ползвайте търсачката, за да ги поканите."
       edit_profile: "Редактирайте профилът си"
       finished: "Готово!"
       save_and_continue: "Запиши и продължи"

config/locales/diaspora/br.yml

@@ -482,7 +482,6 @@ br:
       edit_delete_photo: "Kemmañ deskrivadenn ar foto / skarzhañ ar foto"
       make_profile_photo: "lakaat e-giz poltred"
       original_post: "Skrid Orin"
-      permalink: "liammpad"
       update_photo: "Nevesaat ar Foto"
       view: "view"
     update: 
@@ -492,7 +491,10 @@ br:
     update: 
       post_hidden: "Embann %{name} zo bet lakaet diwar-wel."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "war-raok"
   profile: "Patrom"
   profiles: 
@@ -648,10 +650,6 @@ br:
       no_message_to_display: "Kemennadenn ebet da ziskouez."
     new: 
       mentioning: "Mentioning: %{person}"
-    show: 
-      destroy: "Skarzhañ"
-      not_found: "Digarezit, n'eus ket moaien kavout ar skrid."
-      permalink: "liammpad"
     too_long: 
       few: "please make your status messages less than %{count} characters"
       many: "please make your status messages less than %{count} characters"

config/locales/diaspora/cs.yml

@@ -107,9 +107,9 @@ cs:
       people_sharing_with_you: "Lidé, kteří s vámi sdílí"
       post_a_message: "odeslat příspěvek >>"
       services: 
-        content: "You can connect the following services to Diaspora:"
-        heading: "Connect Services"
-      tags_following: "Followed Tags"
+        content: "Můžete připojit následující služby na Diasporu:"
+        heading: "Připojit služby"
+      tags_following: "Následované značky"
       your_aspects: "Vaše aspekty"
     many: "%{count} aspektů"
     move_contact: 
@@ -165,7 +165,7 @@ cs:
       add_a_new_aspect: "Přidat nový aspekt"
       all_contacts: "Všechny kontakty"
       edit_aspect: "Upravit %{name}"
-      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
+      many_people_are_you_sure: "Jste si jisti, že chcete začít soukromý rozhovor s více než %{suggested_limit} kontakty? Posílání zpráv do tohoto aspektu může být lepší způsob, jak s nimi spojit."
       my_contacts: "Moje kontakty"
       no_contacts: "Žádné kontakty."
       only_sharing_with_me: "Pouze sdílení se mnou"
@@ -199,7 +199,7 @@ cs:
       no_conversation_selected: "není výbrána žádná konverzace"
       no_messages: "žádné zprávy"
     new: 
-      abandon_changes: "Abandon changes?"
+      abandon_changes: "Zamítnout změny?"
       send: "Poslat"
       subject: "předmět"
       to: "pro"
@@ -288,7 +288,7 @@ cs:
         one: "1 osobě se to líbí"
         other: "%{count} lidem se to líbí"
         zero: "žádná kladná hodnocení"
-  limited: "Limited"
+  limited: "Omezený"
   more: "Více"
   next: "další"
   no_results: "Nebyly nalezeny žádné výsledky"
@@ -482,7 +482,6 @@ cs:
       edit_delete_photo: "Upravit popis fotky / smazat fotku"
       make_profile_photo: "vytvořit profilovou fotku"
       original_post: "Původní příspěvek"
-      permalink: "trvalý odkaz"
       update_photo: "Aktualizovat fotku"
       view: "zobrazit"
     update: 
@@ -492,7 +491,10 @@ cs:
     update: 
       post_hidden: "Příspěvek od uživatele %{name} byl skryt."
   posts: 
-    doesnt_exist: "tento příspěvek neexistuje!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "předchozí"
   profile: "Profil"
   profiles: 
@@ -515,7 +517,7 @@ cs:
     update: 
       failed: "Nepodařilo se aktualizovat profil"
       updated: "Profil aktualizován"
-  public: "Public"
+  public: "Veřejné"
   registrations: 
     closed: "Zápisy jsou aktuálně uzavřeny na tomto Diasporu podu."
     create: 
@@ -578,7 +580,7 @@ cs:
       disconnect: "odpojit"
       edit_services: "Upravit služby"
       logged_in_as: "přihlášen jako"
-      no_services: "You have not connected any services yet."
+      no_services: "Nemáte připojenou žádnou službu."
       really_disconnect: "odpojit %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Klikněte na tento odkaz, pokud chcete přijmout pozvání"
@@ -635,10 +637,10 @@ cs:
     stream_element: 
       dislike: "to se mi nelíbí"
       like: "to se mi líbí"
-      shared_with: "Shared with: %{aspect_names}"
+      shared_with: "Sdíleno s: %{aspect_names}"
       unlike: "to se mi už nelíbí"
       via: "skrz %{link}"
-      viewable_to_anyone: "This post is viewable to anyone on the web"
+      viewable_to_anyone: "Tento příspěvek je viditelný komukoli na webu"
   status_messages: 
     create: 
       success: "Úspěšně zmíněno: %{names}"
@@ -648,10 +650,6 @@ cs:
       no_message_to_display: "Není k zobrazení žádná zpráva."
     new: 
       mentioning: "Zmínka: %{person}"
-    show: 
-      destroy: "Smazat"
-      not_found: "Omlouváme se, ale nemůžeme najít tento příspěvek."
-      permalink: "trvalý odkaz"
     too_long: 
       few: "vaše stavové zprávy musí mít méně než %{count} znaků"
       many: "vaše stavové zprávy musí mít méně než %{count} znaků"
@@ -663,25 +661,25 @@ cs:
     show_more_comments: "Zobrazit %{number} dalších komentářů"
   tag_followings: 
     create: 
-      failure: "Failed to follow: #%{name}"
-      success: "Successfully following: #%{name}"
+      failure: "Nepodařilo se následovat: #%{name}"
+      success: "Úspěšně následujete: #%{name}"
     destroy: 
-      failure: "Failed to stop following: #%{name}"
-      success: "Successfully stopped following: #%{name}"
+      failure: "Nepodařilo se zastavit následování: #%{name}"
+      success: "Úspěšně zastaveno následování: #%{name}"
   tags: 
     show: 
-      follow: "Follow #%{tag}"
-      following: "Following #%{tag}"
+      follow: "Následovat #%{tag}"
+      following: "Následující #%{tag}"
       nobody_talking: "Nikdo dosud nemluví o %{tag}."
       people_tagged_with: "Lidé označeni %{tag}"
       posts_tagged_with: "Příspěvky označené #%{tag}"
-      stop_following: "Stop Following #%{tag}"
+      stop_following: "Přestat následovat #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Připojit na Cubbi.es"
-      connecting_is_simple: "Připojení účtu na Diaspoře je tak jednoduché, jak vyplňovat dvě pole na vaší stránce účtu Cubbi.es."
+      connecting_is_simple: "Připojení účtu na Diaspoře je tak jednoduché! Zadejte vaše Diaspora ID (<b>%{diaspora_id}</b>) z nastavení cubbies a připojte se."
       daniels_account: "Daniel's Diaspora account"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
+      log_in_with_diaspora_is_comming: "Velice brzy se budete moci připojit na novou aplikaci bez nutnosti zakládat účet odděleně od účtu na Diaspoře."
       love_to_try: "Rádi bychom, aby jste to vyzkoušeli."
       making_the_connection: "Vytvoření spojení"
       screenshot_explanation: "%{link1}. Tato konkrétní cubby je připojena na %{link2}."

config/locales/diaspora/cy.yml

@@ -482,7 +482,6 @@ cy:
       edit_delete_photo: "Edit photo description / delete photo"
       make_profile_photo: "make profile photo"
       original_post: "Original Post"
-      permalink: "permalink"
       update_photo: "Update Photo"
       view: "view"
     update: 
@@ -492,7 +491,10 @@ cy:
     update: 
       post_hidden: "%{name}'s post has been hidden."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "previous"
   profile: "Profile"
   profiles: 
@@ -648,10 +650,6 @@ cy:
       no_message_to_display: "No message to display."
     new: 
       mentioning: "Mentioning: %{person}"
-    show: 
-      destroy: "Destroy"
-      not_found: "Sorry, we couldn't find that post."
-      permalink: "permalink"
     too_long: 
       few: "please make your status messages less than %{count} characters"
       many: "please make your status messages less than %{count} characters"

config/locales/diaspora/da.yml

@@ -63,9 +63,9 @@ da:
     aspect_contacts: 
       done_editing: "afslut redigering"
     aspect_listings: 
-      add_an_aspect: "+ Add an aspect"
+      add_an_aspect: "+ Tilføj et aspekt"
     aspect_stream: 
-      commented_on: "commented on"
+      commented_on: "kommenter på"
       posted: "posted"
       recently: "recently:"
       stream: "Stream"
@@ -99,7 +99,7 @@ da:
         heading: "Connect to Cubbi.es"
         learn_more: "Learn more"
       diaspora_id: 
-        content_1: "Your Diaspora ID is:"
+        content_1: "Dit Diaspora ID er:"
         content_2: "Give it to anyone and they'll be able to find you on Diaspora."
         heading: "Diaspora ID"
       handle_explanation: "Dette er dit diaspora handle. Som med en e-mail-adresse, kan du give denne til folk, så de kan kontakte dig."
@@ -110,7 +110,7 @@ da:
         content: "You can connect the following services to Diaspora:"
         heading: "Connect Services"
       tags_following: "Followed Tags"
-      your_aspects: "Your Aspects"
+      your_aspects: "Dine aspekter"
     many: "%{count} aspekter"
     move_contact: 
       error: "Kunne ikke flytte kontaktperson: %{inspect}"
@@ -128,9 +128,9 @@ da:
       family: "Familie"
       work: "Arbejde"
     selected_contacts: 
-      manage_your_aspects: "Manage your aspects."
-      no_contacts: "You don't have any contacts here yet."
-      view_all_contacts: "View all contacts"
+      manage_your_aspects: "Administrer dine aspekter."
+      no_contacts: "Du har ingen kontakter her endnu."
+      view_all_contacts: "Vis alle kontakter"
     show: 
       edit_aspect: "redigér aspekt"
     update: 
@@ -162,12 +162,12 @@ da:
       failure: "Kunne ikke oprette kontakt"
     few: "%{count} kontaktpersoner"
     index: 
-      add_a_new_aspect: "Add a new aspect"
-      all_contacts: "All Contacts"
+      add_a_new_aspect: "Tilføj nyt aspekt"
+      all_contacts: "Alle kontakter"
       edit_aspect: "Edit %{name}"
       many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
-      no_contacts: "No contacts."
+      no_contacts: "Ingen kontakter."
       only_sharing_with_me: "Only sharing with me"
       remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
       start_a_conversation: "Start a conversation"
@@ -218,7 +218,7 @@ da:
       correct_the_following_errors_and_try_again: "Ret følgende fejl og prøv igen."
       invalid_fields: "Ugyldige felter"
   fill_me_out: "Udfyld mig"
-  find_people: "Find people"
+  find_people: "Find venner"
   hide: "Skjul"
   home: 
     show: 
@@ -341,10 +341,10 @@ da:
       other: "%{actors} liked your deleted post."
       zero: "%{actors} liked your deleted post."
     mentioned: 
-      few: "%{actors} has mentioned you in a %{post_link}."
+      few: "%{actors} har nævnt dig i en %{post_link}."
       many: "%{actors} has mentioned you in a %{post_link}."
-      one: "%{actors} has mentioned you in a %{post_link}."
-      other: "%{actors} has mentioned you in a %{post_link}."
+      one: "%{actors} har nævnt dig i en besked %{post_link}."
+      other: "%{actors} har nævnt dig i en besked %{post_link}."
       zero: "%{actors} has mentioned you in a %{post_link}."
     mentioned_deleted: 
       few: "%{actors} mentioned you in a deleted post."
@@ -482,7 +482,6 @@ da:
       edit_delete_photo: "Redigér billedbeskrivelse / slet billede"
       make_profile_photo: "Gør til profilbillede"
       original_post: "Original Post"
-      permalink: "permanentlink"
       update_photo: "Opdatér billede"
       view: "se"
     update: 
@@ -492,7 +491,10 @@ da:
     update: 
       post_hidden: "%{name}'s post er blevet skjult."
   posts: 
-    doesnt_exist: "den post eksisterer ikke!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "Forrige"
   profile: "Profil"
   profiles: 
@@ -628,7 +630,7 @@ da:
       publishing_to: "del med: "
       share: "Del"
       share_with: "Del med"
-      upload_photos: "Upload photos"
+      upload_photos: "Upload fotos"
       whats_on_your_mind: "Hvad har du på hjertet?"
     reshare: 
       reshare: "Del igen"
@@ -648,19 +650,15 @@ da:
       no_message_to_display: "Ingen beskeder at vise."
     new: 
       mentioning: "Nævnt: %{person}"
-    show: 
-      destroy: "Slet"
-      not_found: "Desværre, vi kunne ikke finde den post."
-      permalink: "permanentlink"
     too_long: 
       few: "din status skal være mindre end %{count} tegn"
       many: "Din status besked skal være mindre en %{count} tegn"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
+      one: "Status opdateringen skal  være mindre end %{count} tegn"
+      other: "Lav venligst en meddelse på under %{count} tegn"
       zero: "please make your status messages less than %{count} characters"
   stream_helper: 
     hide_comments: "Skjul kommentarer"
-    show_more_comments: "Show %{number} more comments"
+    show_more_comments: "Vis %{number} kommentarer mere"
   tag_followings: 
     create: 
       failure: "Failed to follow: #%{name}"

config/locales/diaspora/de.yml

@@ -86,8 +86,8 @@ de:
       make_aspect_list_visible: "Aspekte veröffentlichen?"
       remove_aspect: "Aspekt löschen"
       rename: "umbenennen"
-      update: "Aktualisieren"
-      updating: "Aktualisiere"
+      update: "Ändern"
+      updating: "Ändere"
     few: "%{count} Aspekte"
     helper: 
       are_you_sure: "Möchtest du diesen Aspekt wirklich löschen?"
@@ -107,8 +107,8 @@ de:
       people_sharing_with_you: "Leute die mit dir teilen"
       post_a_message: "schreibe eine Nachricht >>"
       services: 
-        content: "You can connect the following services to Diaspora:"
-        heading: "Connect Services"
+        content: "Du kannst die folgenden Dienste mit Diaspora verbinden:"
+        heading: "Verbinde Dienste"
       tags_following: "Followed Tags"
       your_aspects: "Deine Aspekte"
     many: "%{count} Aspekte"
@@ -165,12 +165,12 @@ de:
       add_a_new_aspect: "Einen neuen Aspekt hinzufügen"
       all_contacts: "Alle Kontakte"
       edit_aspect: "Bearbeite %{name}"
-      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
+      many_people_are_you_sure: "Bist du dir sicher, dass du eine private Unterhaltung mit mehr als %{suggested_limit} Kontakten beginnen möchtest? Einen Beitrag in diesen Aspekt zu schreiben könnte ein besserer Weg sein um sie zu kontaktieren."
       my_contacts: "Meine Kontakte"
       no_contacts: "Keine Kontakte."
       only_sharing_with_me: "Nur mit mir teilende"
       remove_person_from_aspect: "Entferne %{person_name} aus \"%{aspect_name}\""
-      start_a_conversation: "Starte ein Gespräch"
+      start_a_conversation: "Starte eine Unterhaltung"
       title: "Kontakte"
       your_contacts: "Deine Kontakte"
     many: "%{count} Kontakte"
@@ -199,7 +199,7 @@ de:
       no_conversation_selected: "Keine Konversation ausgewählt"
       no_messages: "Keine Nachrichten"
     new: 
-      abandon_changes: "Abandon changes?"
+      abandon_changes: "Änderungen verwerfen?"
       send: "Senden"
       subject: "Betreff"
       to: "An"
@@ -482,7 +482,6 @@ de:
       edit_delete_photo: "Fotobeschreibung bearbeiten / Foto löschen"
       make_profile_photo: "Als Profilbild verwenden"
       original_post: "Ursprünglicher Beitrag"
-      permalink: "Permalink"
       update_photo: "Foto aktualisieren"
       view: "Anzeigen"
     update: 
@@ -492,7 +491,10 @@ de:
     update: 
       post_hidden: "%{name}s Beitrag wurde ausgeblendet."
   posts: 
-    doesnt_exist: "Dieser Post existiert nicht!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "Vorherige"
   profile: "Profil"
   profiles: 
@@ -515,7 +517,7 @@ de:
     update: 
       failed: "Fehler beim aktualisieren deines Profils"
       updated: "Profil aktualisiert"
-  public: "Public"
+  public: "Öffentlich"
   registrations: 
     closed: "Registrierungen sind auf diesem Pod geschlossen."
     create: 
@@ -578,7 +580,7 @@ de:
       disconnect: "Verbindung entfernen"
       edit_services: "Dienste bearbeiten"
       logged_in_as: "angemeldet als"
-      no_services: "You have not connected any services yet."
+      no_services: "Du hast noch keine Dienste verbunden."
       really_disconnect: "Verbindung mit %{service} entfernen?"
     inviter: 
       click_link_to_accept_invitation: "Öffne diesen Link um die Einladung zu akzeptieren"
@@ -635,10 +637,10 @@ de:
     stream_element: 
       dislike: "Gefällt mir nicht"
       like: "Gefällt mir"
-      shared_with: "Shared with: %{aspect_names}"
+      shared_with: "Geteilt mit: %{aspect_names}"
       unlike: "Gefällt mir nicht mehr"
       via: "via %{link}"
-      viewable_to_anyone: "This post is viewable to anyone on the web"
+      viewable_to_anyone: "Dieser Beitrag ist für jeden im Web sichtbar"
   status_messages: 
     create: 
       success: "Erfolgreich erwähnt: %{names}"
@@ -648,10 +650,6 @@ de:
       no_message_to_display: "Keine Nachricht zum Anzeigen."
     new: 
       mentioning: "Erwähnt: %{person}"
-    show: 
-      destroy: "Entfernen"
-      not_found: "Es tut uns Leid, aber wir konnten den Post nicht finden."
-      permalink: "Permalink"
     too_long: 
       few: "Bitte kürze deinen Beitrag auf weniger als %{count} Zeichen."
       many: "Bitte kürze deinen Beitrag auf weniger als %{count} Zeichen."
@@ -670,12 +668,12 @@ de:
       success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
-      follow: "Follow #%{tag}"
-      following: "Following #%{tag}"
+      follow: "#%{tag} folgen"
+      following: "#%{tag} folgen"
       nobody_talking: "Niemand hat bereits etwas über %{tag} gesagt."
       people_tagged_with: "Personen die mit %{tag} getagt sind"
       posts_tagged_with: "Beiträge die mit #%{tag} getagt sind"
-      stop_following: "Stop Following #%{tag}"
+      stop_following: "#%{tag} nicht mehr folgen"
   tokens: 
     show: 
       connect_to_cubbies: "Mit Cubbi.es verbinden"

config/locales/diaspora/el.yml

@@ -107,8 +107,8 @@ el:
       people_sharing_with_you: "Άτομα που μοιράζονται μαζί σας"
       post_a_message: "δημοσιεύστε ένα μήνυμα >>"
       services: 
-        content: "You can connect the following services to Diaspora:"
-        heading: "Connect Services"
+        content: "Μπορείτε να συνδέσετε τις παρακάτω υπηρεσίες στο Diaspora:"
+        heading: "Συνδέστε Υπηρεσίες"
       tags_following: "Followed Tags"
       your_aspects: "Οι Πτυχές σας"
     many: "%{count} πτυχές"
@@ -165,7 +165,7 @@ el:
       add_a_new_aspect: "Προσθέστε μια νέα πτυχή"
       all_contacts: "Όλες οι Επαφές"
       edit_aspect: "Επεξεργασία %{name}"
-      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
+      many_people_are_you_sure: "Είστε σίγουρος/η ότι θέλετε να ξεκινήσετε μια ιδιωτική συνομιλία με περισσότερες από %{suggested_limit} επαφές? Η δημοσίευση σε αυτή την πτυχή ίσως είναι ο καλύτερος τρόπος για να επικοινωνήσετε μαζί τους."
       my_contacts: "Οι Επαφές μου"
       no_contacts: "Καμία Επαφή"
       only_sharing_with_me: "Μοιράζονται μόνο με εμένα"
@@ -199,7 +199,7 @@ el:
       no_conversation_selected: "δεν επιλέχτηκε συζήτηση"
       no_messages: "κανένα μήνυμα"
     new: 
-      abandon_changes: "Abandon changes?"
+      abandon_changes: "Απόρριψη αλλαγών?"
       send: "Αποστολή"
       subject: "θέμα"
       to: "στον"
@@ -288,7 +288,7 @@ el:
         one: "Αρέσει σε 1 άτομο"
         other: "Αρέσει σε %{count} άτομα"
         zero: "δεν αρέσει σε κανέναν"
-  limited: "Limited"
+  limited: "Περιορισμένο"
   more: "Περισσότερα"
   next: "επόμενο"
   no_results: "Δεν βρέθηκαν αποτελέσματα"
@@ -482,7 +482,6 @@ el:
       edit_delete_photo: "Επεξεργασία περιγραφής φωτογραφίας / διαγραφή φωτογραφίας"
       make_profile_photo: "ορισμός ως φωτογραφίας προφίλ"
       original_post: "Αυθεντική Δημοσίευση"
-      permalink: "permalink"
       update_photo: "Ενημέρωση Φωτογραφίας"
       view: "προβολή"
     update: 
@@ -492,7 +491,10 @@ el:
     update: 
       post_hidden: "Στη δημοσίευση του χρήστη %{name} έχει γίνει απόκρυψη."
   posts: 
-    doesnt_exist: "η δημοσίευση δεν υπάρχει!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "προηγούμενο"
   profile: "Προφίλ"
   profiles: 
@@ -515,7 +517,7 @@ el:
     update: 
       failed: "Αποτυχία ενημέρωσης προφίλ"
       updated: "Το προφίλ ενημερώθηκε"
-  public: "Public"
+  public: "Δημόσιο"
   registrations: 
     closed: "Οι εγγραφές είναι κλειστές σε αυτό το pod του Diaspora."
     create: 
@@ -578,7 +580,7 @@ el:
       disconnect: "αποσύνδεση"
       edit_services: "Επεξεργασία υπηρεσιών"
       logged_in_as: "συνδεδεμένο ως"
-      no_services: "You have not connected any services yet."
+      no_services: "Δεν έχετε συνδέσει κάποια υπηρεσία ακόμα."
       really_disconnect: "αποσύνδεση %{service};"
     inviter: 
       click_link_to_accept_invitation: "Κάντε κλικ σ' αυτό το σύνδεσμο για να αποδεχθείτε την πρόσκλησή σας"
@@ -638,7 +640,7 @@ el:
       shared_with: "Shared with: %{aspect_names}"
       unlike: "Δεν μου αρέσει"
       via: "μέσω %{link}"
-      viewable_to_anyone: "This post is viewable to anyone on the web"
+      viewable_to_anyone: "Αυτή η δημοσίευση είναι εμφανής σε όλους στο διαδίκτυο"
   status_messages: 
     create: 
       success: "Αναφέρθηκαν επιτυχώς: %{names}"
@@ -648,10 +650,6 @@ el:
       no_message_to_display: "Κανένα μήνυμα"
     new: 
       mentioning: "Αναφορά σε: %{person}"
-    show: 
-      destroy: "Διαγραφή"
-      not_found: "Συγνώμη, δεν μπορέσαμε να βρούμε αυτή τη δημοσίευση."
-      permalink: "permalink"
     too_long: 
       few: "παρακαλώ μετατρέψτε τα μηνύματα κατάστασης σας σε λιγότερους από %{count} χαρακτήρες"
       many: "παρακαλώ ελαττώστε την κατάσταση σας σε λιγότερο από %{count} χαρακτήρες"
@@ -679,9 +677,9 @@ el:
   tokens: 
     show: 
       connect_to_cubbies: "Σύνδεση με Cubbi.es"
-      connecting_is_simple: "Η σύνδεση του Diaspora λογαριασμού σας γίνεται απλά με τη συμπλήρωση των δύο πεδίων στην σελίδα σύνδεσης του Cubbi.es."
+      connecting_is_simple: "Η σύνδεση του Diaspora λογαριασμού σας είναι απλούστατη! Απλά εισάγετε το Diaspora Αναγνωριστικό σας (ID) (<b>%{diaspora_id}</b>) από το cubbies <a href='%{href_link}'>settings page</a> και πατήστε Σύνδεση. "
       daniels_account: "Diaspora λογαριασμό του Daniel"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
+      log_in_with_diaspora_is_comming: "Σύντομα θα μπορείτε να συνδέεστε σε μια νέα εφαρμογή χωρίς να δημιουργείτε διαφορετικό λογαριασμό απ' αυτόν στο Diaspora."
       love_to_try: "Θα χαιρόμασταν αν το δοκιμάζατε."
       making_the_connection: "Σύνδεση"
       screenshot_explanation: "%{link1}.  Αυτό το συγκεκριμένο cubby συνδέεται στον %{link2}."

config/locales/diaspora/en_shaw.yml

@@ -482,7 +482,6 @@ en_shaw:
       edit_delete_photo: "𐑧𐑛𐑦𐑑 𐑓𐑴𐑑𐑴 𐑛𐑦𐑕𐑒𐑮𐑦𐑐𐑖𐑩𐑯 / 𐑛𐑦𐑤𐑰𐑑 𐑓𐑴𐑑𐑴"
       make_profile_photo: "𐑥𐑱𐑒 𐑐𐑮𐑴𐑓𐑲𐑤 𐑓𐑴𐑑𐑴"
       original_post: "𐑩𐑮𐑦𐑡𐑦𐑯𐑩𐑤 𐑐𐑴𐑕𐑑"
-      permalink: "𐑐𐑻𐑥𐑩𐑤𐑦𐑙𐑒"
       update_photo: "𐑩𐑐𐑛𐑱𐑑 𐑓𐑴𐑑𐑴"
       view: "𐑝𐑿"
     update: 
@@ -492,7 +491,10 @@ en_shaw:
     update: 
       post_hidden: "%{name}𐑟 𐑐𐑴𐑕𐑑 𐑣𐑨𐑟 𐑚𐑧𐑯 𐑣𐑦𐑛𐑩𐑯."
   posts: 
-    doesnt_exist: "𐑞𐑨𐑑 𐑐𐑴𐑕𐑑 𐑛𐑳𐑟 𐑯𐑪𐑑 𐑧𐑜𐑟𐑦𐑕𐑑!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "𐑐𐑮𐑰𐑝𐑾𐑕"
   profile: "𐑐𐑮𐑴𐑓𐑲𐑤"
   profiles: 
@@ -648,10 +650,6 @@ en_shaw:
       no_message_to_display: "𐑯𐑴 𐑥𐑧𐑕𐑩𐑡 𐑑 𐑛𐑦𐑕𐑐𐑤𐑱."
     new: 
       mentioning: "𐑥𐑧𐑯𐑖𐑩𐑯𐑦𐑙: %{person}"
-    show: 
-      destroy: "𐑛𐑦𐑤𐑰𐑑"
-      not_found: "𐑕𐑪𐑮𐑦, 𐑢𐑰 𐑒𐑫𐑛𐑩𐑯𐑑 𐑓𐑲𐑯𐑛 𐑞𐑨𐑑 𐑐𐑴𐑕𐑑."
-      permalink: "𐑐𐑻𐑥𐑩𐑤𐑦𐑙𐑒"
     too_long: 
       few: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟"
       many: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟"

config/locales/diaspora/eo.yml

@@ -482,7 +482,6 @@ eo:
       edit_delete_photo: "Redakti bildpriskribon / forigi bildon"
       make_profile_photo: "estigi profilbildon"
       original_post: "Origina Afiŝo"
-      permalink: "malŝanĝantligilo"
       update_photo: "Ĝisdatigi Bildon"
       view: "vidi"
     update: 
@@ -492,7 +491,10 @@ eo:
     update: 
       post_hidden: "Afiŝo de %{name} kaŝiĝas."
   posts: 
-    doesnt_exist: "tiu afiŝo ne ekzistas!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "antaŭe"
   profile: "Profilo"
   profiles: 
@@ -648,10 +650,6 @@ eo:
       no_message_to_display: "Ne afiŝoj vidiĝi."
     new: 
       mentioning: "Mencianta: %{person}"
-    show: 
-      destroy: "Forigi"
-      not_found: "Bedaŭre, ne povis trovi tiun poŝton."
-      permalink: "malŝanĝantligilo"
     too_long: 
       few: "bonvolu farigi viajn afiŝojn malpli longajn ol %{count} signoj"
       many: "bonvolu farigi viajn afiŝojn malpli longajn ol %{count} signoj"

config/locales/diaspora/es-AR.yml

@@ -482,7 +482,6 @@ es-AR:
       edit_delete_photo: "Editar descripción de foto / eliminar foto"
       make_profile_photo: "convertir en foto de perfil"
       original_post: "Publicación original"
-      permalink: "enlace permanente"
       update_photo: "Actualizar foto"
       view: "ver"
     update: 
@@ -492,7 +491,10 @@ es-AR:
     update: 
       post_hidden: "La publicación de %{name} fue ocultada."
   posts: 
-    doesnt_exist: "¡Esa publicación no existe!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "anterior"
   profile: "Perfil"
   profiles: 
@@ -648,10 +650,6 @@ es-AR:
       no_message_to_display: "No hay mensajes que mostrar."
     new: 
       mentioning: "Mencionar a: %{person}"
-    show: 
-      destroy: "Eliminar"
-      not_found: "Lo sentimos, no encontramos esa publicación."
-      permalink: "enlace permanente"
     too_long: 
       few: "Por favor, hacé tu mensaje de estado tenga menos de %{count} caracteres"
       many: "Por favor, hacé tu mensaje de estado tenga menos de %{count} caracteres"

config/locales/diaspora/es-CL.yml

@@ -165,7 +165,7 @@ es-CL:
       add_a_new_aspect: "Agregar un nuevo aspecto"
       all_contacts: "Todos los Contactos"
       edit_aspect: "Editar %{name}"
-      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
+      many_people_are_you_sure: "Estas seguro que quieres iniciar una conversación privada con más de %{suggested_limit} contactos? Postear algo en este aspecto quizás sea una mejor manera de contactarte con ellos."
       my_contacts: "Mis Contactos"
       no_contacts: "Sin Contactos."
       only_sharing_with_me: "Solo compartiendo conmigo"
@@ -482,7 +482,6 @@ es-CL:
       edit_delete_photo: "Editar descripción de foto / borrar foto"
       make_profile_photo: "convertir en foto de perfil"
       original_post: "Post original"
-      permalink: "permalink"
       update_photo: "Actualizar Foto"
       view: "ver"
     update: 
@@ -492,7 +491,10 @@ es-CL:
     update: 
       post_hidden: "El post de %{name} se ha ocultado."
   posts: 
-    doesnt_exist: "Ese post no existe!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "Anterior"
   profile: "Perfil"
   profiles: 
@@ -648,10 +650,6 @@ es-CL:
       no_message_to_display: "No hay mensaje que mostrar."
     new: 
       mentioning: "Mencionar a: %{person}"
-    show: 
-      destroy: "Eliminar"
-      not_found: "Perdón, no pudimos encontrar ese post."
-      permalink: "permalink"
     too_long: 
       few: "Tu mensaje de estado debe tener menos de %{count} caracteres"
       many: "Tu mensaje de estado debe tener menos de %{count} caracteres"

config/locales/diaspora/es.yml

@@ -165,7 +165,7 @@ es:
       add_a_new_aspect: "Añadir un nuevo aspecto"
       all_contacts: "Todos los Contactos"
       edit_aspect: "Editar %{name}"
-      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
+      many_people_are_you_sure: "¿Estás seguro de que quieres comenzar una conversación privada con más de %{suggested_limit} contactos? Comentarlo en sus aspectos puede que sea mejor para contactar con ellos."
       my_contacts: "Mis Contactos"
       no_contacts: "Sin contactos."
       only_sharing_with_me: "Solo compartiendo conmigo"
@@ -482,7 +482,6 @@ es:
       edit_delete_photo: "Editar pie de foto / eliminar foto"
       make_profile_photo: "convertir en foto de perfil"
       original_post: "Publicación original"
-      permalink: "Enlace permanente"
       update_photo: "Actualizar foto"
       view: "ver"
     update: 
@@ -492,7 +491,10 @@ es:
     update: 
       post_hidden: "La publicación de %{name} se ha ocultado."
   posts: 
-    doesnt_exist: "esa publicación no existe!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "anterior"
   profile: "Perfil"
   profiles: 
@@ -648,10 +650,6 @@ es:
       no_message_to_display: "No hay mensajes que mostrar."
     new: 
       mentioning: "Mencionar a: %{person}"
-    show: 
-      destroy: "Eliminar"
-      not_found: "Lo sentimos, no pudimos encontrar esa publicación."
-      permalink: "Enlace permanente"
     too_long: 
       few: "Tu mensaje de estado debe tener menos de %{count} caracteres"
       many: "Tu mensaje de estado debe tener menos de %{count} caracteres"
@@ -679,9 +677,9 @@ es:
   tokens: 
     show: 
       connect_to_cubbies: "Conecta con Cubbi.es"
-      connecting_is_simple: "Enlazar tu cuenta de Diaspora* es sencillo. Solo introduce tu identificador de Diaspora*(<b>%{diaspora_id}</b>) en tu cuenta de Cubbi.es <a href='%{href_link}'>settings page</a> y darle a conectar."
+      connecting_is_simple: "Enlazar tu cuenta de Diaspora* es sencillo. Solo introduce tu identificador de Diaspora*(<b>%{diaspora_id}</b>) en la página de <a href='%{href_link}'>configuración</a> de tu cuenta cubbi.es y darle a conectar."
       daniels_account: "La cuenta de Diaspora de Daniel"
-      log_in_with_diaspora_is_comming: "Muy pronto podrás conectar a nuevas aplicaciones sin tener que crearte un nueva cuenta aparte de la de Diaspora*."
+      log_in_with_diaspora_is_comming: "Muy pronto podrás conectar a una nueva aplicación sin tener que crearte un nueva cuenta aparte de la de Diaspora*."
       love_to_try: "Nos encantaría que lo pruebes."
       making_the_connection: "Haciendo la conexión"
       screenshot_explanation: "%{link1}. Este cubby en particular está enlazado a %{link2}."

config/locales/diaspora/eu.yml

@@ -65,7 +65,7 @@ eu:
     aspect_listings: 
       add_an_aspect: "+ Alderdi berria sortu"
     aspect_stream: 
-      commented_on: "iruzkindua hemen:"
+      commented_on: "iruzkindua"
       posted: "bidalita"
       recently: "oraintsu:"
       stream: "Kronologia"
@@ -107,9 +107,9 @@ eu:
       people_sharing_with_you: "Zurekin harremanetan dagoen jendea"
       post_a_message: "mezu bat bidali >>"
       services: 
-        content: "You can connect the following services to Diaspora:"
-        heading: "Connect Services"
-      tags_following: "Followed Tags"
+        content: "Honako zerbitzuak lotu ditzakezu Diasporara:"
+        heading: "Zerbitzuak Lotu"
+      tags_following: "Jarraitutako Etiketak"
       your_aspects: "Zure Alderdiak"
     many: "%{count} alderdi"
     move_contact: 
@@ -165,7 +165,7 @@ eu:
       add_a_new_aspect: "Alderdi berria gehitu"
       all_contacts: "Adiskide Guztiak"
       edit_aspect: "Aldatu %{name}"
-      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
+      many_people_are_you_sure: "Ziur al zaude elkarrizketa pribatu bat hasi nahi duzula %{suggested_limit} baino adiskide gehiagorekin? Alderdi horretan mezu bat bidaltzea beharbada haiekin harremanetan egoteko modu hobea izan daiteke."
       my_contacts: "Nire Adiskideak"
       no_contacts: "Adiskiderik ez."
       only_sharing_with_me: "Bakarrik nirekin harremanetan"
@@ -199,7 +199,7 @@ eu:
       no_conversation_selected: "ez da aukeratu elkarrizketarik"
       no_messages: "mezurik ez"
     new: 
-      abandon_changes: "Abandon changes?"
+      abandon_changes: "Aldaketak bertan behera utzi?"
       send: "Bidali"
       subject: "gaia"
       to: "nori:"
@@ -273,7 +273,7 @@ eu:
       logout: "irten"
       profile: "profila"
       settings: "lehentasunak"
-      view_all: "View all"
+      view_all: "Guztiak ikusi"
   likes: 
     likes: 
       people_dislike_this: 
@@ -288,7 +288,7 @@ eu:
         one: "%{count}ek du gustoko"
         other: "%{count} pertsonek gustoko dute hau"
         zero: "oraindik ez du inork gustoko"
-  limited: "Limited"
+  limited: "Mugatua"
   more: "Gehiago"
   next: "hurrengoa"
   no_results: "Ez Da Ezer Aurkitu"
@@ -482,7 +482,6 @@ eu:
       edit_delete_photo: "Argazkiaren deskribapena aldatu / argazkia ezabatu"
       make_profile_photo: "profileko argazki bihurtu"
       original_post: "Jatorrizko mezua"
-      permalink: "permalink"
       update_photo: "Argazkia Eguneratu"
       view: "ikusi"
     update: 
@@ -492,7 +491,10 @@ eu:
     update: 
       post_hidden: "%{name}(r)en mezua ezkutatua izan da."
   posts: 
-    doesnt_exist: "mezu hori ez dago!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "aurrekoa"
   profile: "Profila"
   profiles: 
@@ -515,7 +517,7 @@ eu:
     update: 
       failed: "Huts profila eguneratzean"
       updated: "Profila eguneratu duzu."
-  public: "Public"
+  public: "Publikoa"
   registrations: 
     closed: "Izen emateak itxirik daude Diaspora zerbitzari hontan."
     create: 
@@ -578,7 +580,7 @@ eu:
       disconnect: "irten"
       edit_services: "Aldatu zerbitzuak"
       logged_in_as: "Lotuta duzun kontua honakoa da:"
-      no_services: "You have not connected any services yet."
+      no_services: "Oraindik ez duzu zerbitzurik lotu."
       really_disconnect: "irten %{service}(e)tik?"
     inviter: 
       click_link_to_accept_invitation: "Jarraitu esteka hau zure gonbidapena onartzeko"
@@ -635,10 +637,10 @@ eu:
     stream_element: 
       dislike: "Ez dut gustoko"
       like: "Gustoko dut"
-      shared_with: "Shared with: %{aspect_names}"
+      shared_with: "%{aspect_names}(r)kin partekatua"
       unlike: "Ez dut gustoko"
       via: "%{link}(r)en bidez"
-      viewable_to_anyone: "This post is viewable to anyone on the web"
+      viewable_to_anyone: "Mezu hau edonork ikusi dezake Interneten"
   status_messages: 
     create: 
       success: "Arrakastaz aipatu dituzu: %{names}"
@@ -648,10 +650,6 @@ eu:
       no_message_to_display: "Erakusteko mezurik ez."
     new: 
       mentioning: "Aipatzen: %{person}"
-    show: 
-      destroy: "Suntsitu"
-      not_found: "Barkatu, baina ezin izan dugu mezu hori aurkitu."
-      permalink: "permalink"
     too_long: 
       few: "mesedez, egin itzazu zure mezuak %{count} karaktere baino motzagoak"
       many: "mesedez, egin itzazu zure mezuak %{count} karaktere baino motzagoak"
@@ -663,25 +661,25 @@ eu:
     show_more_comments: "Erakutsi %{number} iruzkin gehiago"
   tag_followings: 
     create: 
-      failure: "Failed to follow: #%{name}"
-      success: "Successfully following: #%{name}"
+      failure: "Huts #%{name} jarraitzean"
+      success: "Arrakastaz #%{name} jarraitzen"
     destroy: 
-      failure: "Failed to stop following: #%{name}"
-      success: "Successfully stopped following: #%{name}"
+      failure: "Huts #%{name} ez jarraitzean"
+      success: "Arrakastaz #%{name} ez duzu jarraitzen"
   tags: 
     show: 
-      follow: "Follow #%{tag}"
-      following: "Following #%{tag}"
+      follow: "Jarraitu #%{tag}"
+      following: "#%{tag} jarraitzen"
       nobody_talking: "Inor ez du %{tag}(r)i buruz hitz egin oraindik."
       people_tagged_with: "%{tag} etiketadun jendea"
       posts_tagged_with: "#%{tag} etiketadun mezuak"
-      stop_following: "Stop Following #%{tag}"
+      stop_following: "Ez Jarraitu #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Cubbi.es-era lotu"
-      connecting_is_simple: "Diaspora kontua oso sinplea da: soilik bi eremu bete behar dituzu zure Cubbi.es erabiltzaile orrialdean."
+      connecting_is_simple: "Zure Diaspora kontua lotzea erraza da! Idatzi zure Diaspora IDa (<b>%{diaspora_id}</b>) zure cubbiesen <a href='%{href_link}'>ezarpenen orrialdetik</a> eta sakatu lotu."
       daniels_account: "Danielen Diaspora kontua"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
+      log_in_with_diaspora_is_comming: "Laster, aplikazio berri batera konektatu ahal izango zara, kontu berri bat sortu gabe zerbitzu horretan."
       love_to_try: "Zuk probatzea gustatuko litzaiguke."
       making_the_connection: "Lotura Ezartzen"
       screenshot_explanation: "%{link1}. Cubby hau %{link2}(r)ekin lotuta dago."

config/locales/diaspora/fi.yml

@@ -6,7 +6,7 @@
 fi: 
   _applications: "Sovellukset"
   _comments: "Kommentit"
-  _contacts: "Contacts"
+  _contacts: "Kontaktit"
   _home: "Etusivu"
   _photos: "kuvat"
   _services: "Ulkoiset palvelut"
@@ -65,9 +65,9 @@ fi:
     aspect_listings: 
       add_an_aspect: "+ Lisää näkymä"
     aspect_stream: 
-      commented_on: "commented on"
-      posted: "posted"
-      recently: "recently:"
+      commented_on: "kommentoitu"
+      posted: "lähetetty"
+      recently: "äskettäin:"
       stream: "Stream"
     contacts_not_visible: "Kontaktit tässä näkymässä eivät voi nähdä toisiaan."
     contacts_visible: "Kontaktit tässä näkymässä voivat nähdä toisensa."
@@ -99,7 +99,7 @@ fi:
         heading: "Yhdistä Cubbi.es:iin"
         learn_more: "Learn more"
       diaspora_id: 
-        content_1: "Your Diaspora ID is:"
+        content_1: "Diaspora ID:si on:"
         content_2: "Give it to anyone and they'll be able to find you on Diaspora."
         heading: "Diaspora ID"
       handle_explanation: "Tämä on Diaspora-osoitteesi. Voit käyttää sitä kuten sähköpostiosoitettasi. Sen avulla sinut tavoitetaan Diasporasta."
@@ -109,7 +109,7 @@ fi:
       services: 
         content: "You can connect the following services to Diaspora:"
         heading: "Connect Services"
-      tags_following: "Followed Tags"
+      tags_following: "Seuratut Tagit"
       your_aspects: "Näkymäsi"
     many: "%{count} näkymää"
     move_contact: 
@@ -482,7 +482,6 @@ fi:
       edit_delete_photo: "Muokkaa kuvan kuvausta / poista kuva"
       make_profile_photo: "laita profiilikuvaksi"
       original_post: "Alkuperäinen viesti"
-      permalink: "pysyvä linkki"
       update_photo: "Päivitä kuva"
       view: "näytä"
     update: 
@@ -492,7 +491,10 @@ fi:
     update: 
       post_hidden: "Viesti käyttäjältä %{name} on piilotettu."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "edellinen"
   profile: "Profiili"
   profiles: 
@@ -648,10 +650,6 @@ fi:
       no_message_to_display: "Ei näytettäviä viestejä."
     new: 
       mentioning: "Mainitse: %{person}"
-    show: 
-      destroy: "Poista"
-      not_found: "Sorry, we couldn't find that post."
-      permalink: "pysyvä linkki"
     too_long: 
       few: "please make your status messages less than %{count} characters"
       many: "Ole hyvä ja kirjoita tilaasi vähemmän kuin %{count} merkkiä"

config/locales/diaspora/fr.yml

@@ -482,7 +482,6 @@ fr:
       edit_delete_photo: "Modifier la description de la photo / supprimer la photo"
       make_profile_photo: "en faire la photo de profil"
       original_post: "Message original"
-      permalink: "permalien"
       update_photo: "Mettre à jour la photo"
       view: "voir"
     update: 
@@ -492,7 +491,10 @@ fr:
     update: 
       post_hidden: "Le message de %{name} à été masqué."
   posts: 
-    doesnt_exist: "cette publication n'existe pas !"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "précédent"
   profile: "Profil"
   profiles: 
@@ -648,10 +650,6 @@ fr:
       no_message_to_display: "Aucun message à afficher."
     new: 
       mentioning: "Mentionne : %{person}"
-    show: 
-      destroy: "Supprimer"
-      not_found: "Désolé, nous ne trouvons pas ce message."
-      permalink: "permalien"
     too_long: 
       few: "s'il vous plaît, veuillez écrire des messages de moins de %{count} caractères"
       many: "s'il vous plaît, veuillez écrire des messages de moins de %{count} caractères"

config/locales/diaspora/ga.yml

@@ -482,7 +482,6 @@ ga:
       edit_delete_photo: "Athraigh tuarisc an pictiúr / scrios pictiúr"
       make_profile_photo: "Déan mar mo pictiúr prófíl"
       original_post: "Original Post"
-      permalink: "nasc-buan"
       update_photo: "Nuashonraigh Pictiúr"
       view: "féach ar"
     update: 
@@ -492,7 +491,10 @@ ga:
     update: 
       post_hidden: "%{name}'s post has been hidden."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "roimhhe"
   profile: "Próifíl"
   profiles: 
@@ -648,10 +650,6 @@ ga:
       no_message_to_display: "Níl aon teachtaireacht chun taispeáint."
     new: 
       mentioning: "Mentioning: %{person}"
-    show: 
-      destroy: "Scrios"
-      not_found: "Sorry, we couldn't find that post."
-      permalink: "nasc-buan"
     too_long: 
       few: "please make your status messages less than %{count} characters"
       many: "please make your status messages less than %{count} characters"

config/locales/diaspora/he.yml

@@ -482,7 +482,6 @@ he:
       edit_delete_photo: "עריכת תיאור תמונה / מחיקת תמונה"
       make_profile_photo: "יצירת תמונת פרופיל"
       original_post: "רשומה מקורית"
-      permalink: "קישור קבוע"
       update_photo: "עדכון התמונה"
       view: "צפייה"
     update: 
@@ -492,7 +491,10 @@ he:
     update: 
       post_hidden: "הרשומה של %{name} הוסתרה."
   posts: 
-    doesnt_exist: "רשומה זו אינה קיימת!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "הקודמת"
   profile: "פרופיל"
   profiles: 
@@ -648,10 +650,6 @@ he:
       no_message_to_display: "אין הודעה להצגה."
     new: 
       mentioning: "אזכור: %{person}"
-    show: 
-      destroy: "מחיקה"
-      not_found: "לא ניתן למצוא רשומה זו, עמך הסליחה."
-      permalink: "קישור קבוע"
     too_long: 
       few: "נא לוודא שהודעת המצב שלך אינה עולה על %{count} תווים"
       many: "נא לוודא שהודעת המצב שלך אינה עולה על %{count} תווים"

config/locales/diaspora/hu.yml

@@ -104,7 +104,7 @@ hu:
         heading: "Diaspora ID"
       handle_explanation: "Ez a Te Diaspora felhasználóneved. Megadhatod elérhetőségként, mint egy email címet."
       no_contacts: "Nincs ismerős"
-      people_sharing_with_you: "People sharing with you"
+      people_sharing_with_you: "Ismerőseid"
       post_a_message: "üzenet küldése >>"
       services: 
         content: "You can connect the following services to Diaspora:"
@@ -117,8 +117,8 @@ hu:
       failure: "nem működött: %{inspect}"
       success: "Más csoportba tett téged."
     new: 
-      create: "Create"
-      name: "Name"
+      create: "Létrehoz"
+      name: "Név"
     no_posts_message: 
       start_talking: "Mindenki hallgat. Kezd el te a beszélgetést."
       try_adding_some_more_contacts: "Try adding some more contacts."
@@ -377,9 +377,9 @@ hu:
     diaspora: "A diaspora email robot"
     hello: "Szia %{name}!"
     liked: 
-      liked: "%{name} has just liked your post: "
+      liked: "%{name} kedveli a bejegyzésedet:"
       sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
+      subject: "%{name} kedveli a bejegyzésed"
     love: "Szeretettel,"
     manage_your_email_settings: "Kezeld az email beállításaidat"
     mentioned: 
@@ -482,7 +482,6 @@ hu:
       edit_delete_photo: "Kép leírás szerkesztése / kép törlése"
       make_profile_photo: "beállítás profilképnek"
       original_post: "Eredeti bejegyzés"
-      permalink: "permalink"
       update_photo: "Kép frissítése"
       view: "nézet"
     update: 
@@ -492,7 +491,10 @@ hu:
     update: 
       post_hidden: "%{name} bejegyzése elrejtve."
   posts: 
-    doesnt_exist: "ez a bejegyzés nem létezik!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "előző"
   profile: "Profil"
   profiles: 
@@ -636,7 +638,7 @@ hu:
       dislike: "Nem tetszik"
       like: "Tetszik"
       shared_with: "Shared with: %{aspect_names}"
-      unlike: "Unlike"
+      unlike: "Nem tetszik"
       via: "via %{link}"
       viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
@@ -648,10 +650,6 @@ hu:
       no_message_to_display: "Nincs üzenet."
     new: 
       mentioning: "Megemlít: %{person}"
-    show: 
-      destroy: "Töröl"
-      not_found: "Bocsánat, nem találjuk a bejegyzést."
-      permalink: "permalink"
     too_long: 
       few: "please make your status messages less than %{count} characters"
       many: "please make your status messages less than %{count} characters"
@@ -705,7 +703,7 @@ hu:
       download_xml: "Saját XML letöltése"
       edit_account: "Fiók szerkesztése"
       export_data: "Adatok exportálása"
-      liked: "...someone likes your post?"
+      liked: "... valakinek tetszik a bejegyzésed?"
       mentioned: "...meg vagy említve egy bejegyzésben?"
       new_password: "Új jelszó"
       private_message: "...privát üzenetet kaptál?"

config/locales/diaspora/id.yml

@@ -482,7 +482,6 @@ id:
       edit_delete_photo: "Edit photo description / delete photo"
       make_profile_photo: "make profile photo"
       original_post: "Original Post"
-      permalink: "permalink"
       update_photo: "Update Photo"
       view: "view"
     update: 
@@ -492,7 +491,10 @@ id:
     update: 
       post_hidden: "%{name}'s post has been hidden."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "previous"
   profile: "Profile"
   profiles: 
@@ -648,10 +650,6 @@ id:
       no_message_to_display: "Tidak ada pesan yang dapat ditampilkan."
     new: 
       mentioning: "Mentioning: %{person}"
-    show: 
-      destroy: "Hapus"
-      not_found: "Sorry, we couldn't find that post."
-      permalink: "permalink"
     too_long: 
       few: "please make your status messages less than %{count} characters"
       many: "please make your status messages less than %{count} characters"

config/locales/diaspora/is.yml

@@ -482,7 +482,6 @@ is:
       edit_delete_photo: "Breyta lýsingu við mynd / eyða mynd"
       make_profile_photo: "setja mynd á síðuna mína"
       original_post: "Upphaflegur póstur."
-      permalink: "varanleg slóð"
       update_photo: "Uppfæra mynd"
       view: "sýn"
     update: 
@@ -492,7 +491,10 @@ is:
     update: 
       post_hidden: "%{name}'s post has been hidden."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "fyrra"
   profile: "Síðan mín"
   profiles: 
@@ -648,10 +650,6 @@ is:
       no_message_to_display: "Engin skilaboð að sýna!"
     new: 
       mentioning: "Mentioning: %{person}"
-    show: 
-      destroy: "Eyða"
-      not_found: "Sorry, we couldn't find that post."
-      permalink: "varanleg slóð"
     too_long: 
       few: "please make your status messages less than %{count} characters"
       many: "please make your status messages less than %{count} characters"

config/locales/diaspora/it.yml

@@ -109,7 +109,7 @@ it:
       services: 
         content: "Puoi abbinare a Diaspora i seguenti servizi:"
         heading: "Servizi connessi"
-      tags_following: "Tag che stai seguendo"
+      tags_following: "Tag che segui"
       your_aspects: "I tuoi aspetti"
     many: "%{count} aspetti"
     move_contact: 
@@ -165,7 +165,7 @@ it:
       add_a_new_aspect: "Aggiungi un nuovo aspetto"
       all_contacts: "Tutti i contatti"
       edit_aspect: "Modifica %{name}"
-      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
+      many_people_are_you_sure: "Stai inviando un messaggio privato a più di %{suggested_limit} contatti. Vuoi farlo davvero? Forse potrebbe essere più opportuno pubblicarlo su un aspetto!"
       my_contacts: "I miei contatti"
       no_contacts: "Nessun contatto."
       only_sharing_with_me: "Condividono con me"
@@ -190,7 +190,7 @@ it:
         many: "%{count} nuovi messaggi"
         one: "un nuovo messaggio"
         other: "%{count} nuovi messaggi"
-        zero: "nessun nuovo messaggio"
+        zero: "Nessun nuovo messaggio"
     index: 
       create_a_new_message: "scrivi un nuovo messaggio"
       inbox: "In arrivo"
@@ -317,7 +317,7 @@ it:
         many: "%{count} nuove notifiche"
         one: "una nuova notifica"
         other: "%{count} nuove notifiche"
-        zero: "nessuna nuova notifica"
+        zero: "Nessuna nuova notifica"
     index: 
       and: "e"
       and_others: 
@@ -482,7 +482,6 @@ it:
       edit_delete_photo: "Modifica descrizione della foto / elimina foto"
       make_profile_photo: "usa come immagine del profilo"
       original_post: "Post Originale"
-      permalink: "permalink"
       update_photo: "Aggiorna Foto"
       view: "guarda"
     update: 
@@ -492,7 +491,10 @@ it:
     update: 
       post_hidden: "Il post di %{name} è stato nascosto."
   posts: 
-    doesnt_exist: "questo post non esiste!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "precedente"
   profile: "Profilo"
   profiles: 
@@ -510,8 +512,8 @@ it:
       your_photo: "La tua foto"
       your_private_profile: "Il tuo profilo privato"
       your_public_profile: "Il tuo profilo pubblico"
-      your_tags: "Tu: in 5 #tags"
-      your_tags_placeholder: "per esempio #diaspora #stirare #gattini #musica"
+      your_tags: "Descriviti con 5 parole"
+      your_tags_placeholder: "per esempio #cinema #stirare #gattini #musica"
     update: 
       failed: "Aggiornamento del profilo non riuscito"
       updated: "Profilo aggiornato"
@@ -629,7 +631,7 @@ it:
       share: "Condividi"
       share_with: "condividi con"
       upload_photos: "Carica foto"
-      whats_on_your_mind: "cosa stai pensando?"
+      whats_on_your_mind: "A cosa stai pensando?"
     reshare: 
       reshare: "Ricondividi"
     stream_element: 
@@ -648,10 +650,6 @@ it:
       no_message_to_display: "Nessun messaggio da visualizzare."
     new: 
       mentioning: "Stai menzionando: %{person}"
-    show: 
-      destroy: "Elimina"
-      not_found: "Ci scusiamo, non possiamo trovare il post."
-      permalink: "permalink"
     too_long: 
       few: "per favore scrivi i tuoi messaggi di stato con meno di %{count} caratteri"
       many: "per favore scrivi i tuoi messaggi di stato con meno di %{count} caratteri"
@@ -659,7 +657,7 @@ it:
       other: "per favore scrivi i tuoi messaggi di stato con meno di %{count} caratteri"
       zero: "per favore scrivi i tuoi messaggi di stato con meno di %{count} caratteri"
   stream_helper: 
-    hide_comments: "nascondi i commenti"
+    hide_comments: "Nascondi i commenti"
     show_more_comments: "Mostra gli altri %{number} commenti"
   tag_followings: 
     create: 
@@ -679,7 +677,7 @@ it:
   tokens: 
     show: 
       connect_to_cubbies: "Connettiti a Cubbi.es"
-      connecting_is_simple: "Per connettere il tuo account Diaspora basta riempire due campi di testo nelle tue impostazioni su Cubbi.es."
+      connecting_is_simple: "Connettere il tuo account Diaspora è semplice! Inserisci il tuo ID (<b>%{diaspora_id}</b>) nella <a href='%{href_link}'>pagina delle impostazioni</a> di cubbies e premi <i>connect</i>."
       daniels_account: "account Diaspora di Daniel"
       log_in_with_diaspora_is_comming: "Presto potrai connetterti ad una nuova applicazione senza dover creare un account separato da quello che hai già su Diaspora."
       love_to_try: "Ci farebbe piacere che tu lo provassi."

config/locales/diaspora/ja.yml

@@ -482,7 +482,6 @@ ja:
       edit_delete_photo: "写真の説明を編集する／写真を削除する"
       make_profile_photo: "プロフィール写真にする"
       original_post: "元の投稿"
-      permalink: "パーマリンク"
       update_photo: "写真を更新する"
       view: "表示"
     update: 
@@ -492,7 +491,10 @@ ja:
     update: 
       post_hidden: "%{name}さんの投稿を非表示にしました。"
   posts: 
-    doesnt_exist: "投稿が存在しません。"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "前へ"
   profile: "プロフィール"
   profiles: 
@@ -648,10 +650,6 @@ ja:
       no_message_to_display: "表示するメッセージがありません。"
     new: 
       mentioning: "%{person}さんのメンション"
-    show: 
-      destroy: "削除"
-      not_found: "投稿が見つかりませんでした。"
-      permalink: "パーマリンク"
     too_long: 
       few: "please make your status messages less than %{count} characters"
       many: "please make your status messages less than %{count} characters"

config/locales/diaspora/ko.yml

@@ -165,7 +165,7 @@ ko:
       add_a_new_aspect: "새 애스펙 추가"
       all_contacts: "모든 컨택"
       edit_aspect: "%{name} 고치기"
-      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
+      many_people_are_you_sure: "컨택 %{suggested_limit}명보다 많은 사람들에게 쪽지를 보내려 하십니까? 해당 애스펙에 공유물을 공유하는게 연락하기에 더 나은 방법입니다."
       my_contacts: "내 컨택"
       no_contacts: "컨택 없음."
       only_sharing_with_me: "나와만 공유하고 있는 사람들"
@@ -482,7 +482,6 @@ ko:
       edit_delete_photo: "사진 설명 고치기 / 사진 지우기"
       make_profile_photo: "프로필 사진 만들기"
       original_post: "원래 공유물"
-      permalink: "영구주소"
       update_photo: "사진 갱신"
       view: "보기"
     update: 
@@ -492,7 +491,10 @@ ko:
     update: 
       post_hidden: "%{name}님의 공유물을 감췄습니다."
   posts: 
-    doesnt_exist: "없는 공유물입니다!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "이전"
   profile: "프로필"
   profiles: 
@@ -648,10 +650,6 @@ ko:
       no_message_to_display: "보여줄 공유물이 없습니다."
     new: 
       mentioning: "%{person}님을 멘션합니다"
-    show: 
-      destroy: "지우기"
-      not_found: "공유물을 찾을 수 없습니다."
-      permalink: "영구주소"
     too_long: 
       few: "공유할 메시지를 %{count}자보다 적게 줄여주세요"
       many: "공유할 메시지를 %{count}자보다 적게 줄여주세요"

config/locales/diaspora/lt.yml

@@ -482,7 +482,6 @@ lt:
       edit_delete_photo: "Redaguoti nuotraukos aprašymą / pašalinti nuotrauką"
       make_profile_photo: "padaryti profilio nuotrauką"
       original_post: "Original Post"
-      permalink: "permalink"
       update_photo: "Atnaujinti nuotrauką"
       view: "rodyti"
     update: 
@@ -492,7 +491,10 @@ lt:
     update: 
       post_hidden: "%{name}'s post has been hidden."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "previous"
   profile: "Profilis"
   profiles: 
@@ -648,10 +650,6 @@ lt:
       no_message_to_display: "Žinučių nėra."
     new: 
       mentioning: "Mentioning: %{person}"
-    show: 
-      destroy: "Sunaikinti"
-      not_found: "Sorry, we couldn't find that post."
-      permalink: "permalink"
     too_long: 
       few: "please make your status messages less than %{count} characters"
       many: "please make your status messages less than %{count} characters"

config/locales/diaspora/mk.yml

@@ -482,7 +482,6 @@ mk:
       edit_delete_photo: "Уреди опис на слика/избриши слика"
       make_profile_photo: "направи ја профил слика"
       original_post: "Original Post"
-      permalink: "permalink"
       update_photo: "Ажурирај слика"
       view: "поглед"
     update: 
@@ -492,7 +491,10 @@ mk:
     update: 
       post_hidden: "%{name}'s post has been hidden."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "previous"
   profile: "Профил"
   profiles: 
@@ -648,10 +650,6 @@ mk:
       no_message_to_display: "Нема пораки за прикажување."
     new: 
       mentioning: "Mentioning: %{person}"
-    show: 
-      destroy: "Уништи"
-      not_found: "Sorry, we couldn't find that post."
-      permalink: "permalink"
     too_long: 
       few: "please make your status messages less than %{count} characters"
       many: "please make your status messages less than %{count} characters"

config/locales/diaspora/nb.yml

@@ -482,7 +482,6 @@ nb:
       edit_delete_photo: "Rediger bildebeskrivelse / slett bilde"
       make_profile_photo: "gjør til profilbilde"
       original_post: "Orginalt Innlegg"
-      permalink: "permalink"
       update_photo: "Oppdater Bilde"
       view: "vis"
     update: 
@@ -492,7 +491,10 @@ nb:
     update: 
       post_hidden: "%{name}s innlegg har blitt skjult."
   posts: 
-    doesnt_exist: "det innlegget finnes ikke!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "forrige"
   profile: "Profil"
   profiles: 
@@ -648,10 +650,6 @@ nb:
       no_message_to_display: "Ingen melding å vise."
     new: 
       mentioning: "Nevner: %{person}"
-    show: 
-      destroy: "Utslett"
-      not_found: "Beklager, vi kunne ikke finne innlegget."
-      permalink: "permalink"
     too_long: 
       few: "please make your status messages less than %{count} characters"
       many: "please make your status messages less than %{count} characters"

config/locales/diaspora/nl.yml

@@ -165,7 +165,7 @@ nl:
       add_a_new_aspect: "Voeg een aspect toe"
       all_contacts: "Alle Contacten"
       edit_aspect: "Bewerk %{name}"
-      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
+      many_people_are_you_sure: "Weet je zeker dat je een privégesprek wil starten met meer dan %{suggested_limit} contacten? Een bericht plaatsen in dit aspect is waarschijnlijk een betere manier om met hen te communiceren."
       my_contacts: "Mijn Contacten"
       no_contacts: "Geen contacten."
       only_sharing_with_me: "Delen alleen met mij"
@@ -482,7 +482,6 @@ nl:
       edit_delete_photo: "Bewerk foto-omschrijving / verwijder foto"
       make_profile_photo: "kies als profielfoto"
       original_post: "Originele post"
-      permalink: "permalink"
       update_photo: "Update foto"
       view: "bekijk"
     update: 
@@ -492,7 +491,10 @@ nl:
     update: 
       post_hidden: "%{name}'s post is verborgen."
   posts: 
-    doesnt_exist: "die post bestaat niet!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "vorige"
   profile: "Profiel"
   profiles: 
@@ -648,10 +650,6 @@ nl:
       no_message_to_display: "Geen bericht om te weergeven."
     new: 
       mentioning: "Noem: %{person}"
-    show: 
-      destroy: "Verwijderen"
-      not_found: "Sorry, we konden die post niet vinden."
-      permalink: "permalink"
     too_long: 
       few: "statusberichten mogen niet langer zijn dan %{count} tekens"
       many: "statusberichten mogen niet langer zijn dan %{count} tekens"
@@ -675,7 +673,7 @@ nl:
       nobody_talking: "Nog niemand heeft het over %{tag}."
       people_tagged_with: "Personen gemerkt met %{tag}"
       posts_tagged_with: "Berichten gemerkt met #%{tag}"
-      stop_following: "Stop met volgende van #%{tag}"
+      stop_following: "Stop met volgen van #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Verbind met Cubbi.es"

config/locales/diaspora/pa.yml

@@ -482,7 +482,6 @@ pa:
       edit_delete_photo: "Edit photo description / delete photo"
       make_profile_photo: "make profile photo"
       original_post: "Original Post"
-      permalink: "permalink"
       update_photo: "Update Photo"
       view: "view"
     update: 
@@ -492,7 +491,10 @@ pa:
     update: 
       post_hidden: "%{name}'s post has been hidden."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "ਪਿੱਛੇ"
   profile: "Profile"
   profiles: 
@@ -648,10 +650,6 @@ pa:
       no_message_to_display: "ਵੇਖਾਉਣ ਲਈ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ।"
     new: 
       mentioning: "Mentioning: %{person}"
-    show: 
-      destroy: "Delete"
-      not_found: "Sorry, we couldn't find that post."
-      permalink: "permalink"
     too_long: 
       few: "please make your status messages less than %{count} characters"
       many: "please make your status messages less than %{count} characters"

config/locales/diaspora/pl.yml

@@ -482,7 +482,6 @@ pl:
       edit_delete_photo: "Edytuj opis zdjęcia / usuń zdjęcie"
       make_profile_photo: "ustaw jako zdjęcie profilowe"
       original_post: "Pierwotny wpis"
-      permalink: "permalink"
       update_photo: "Aktualizuj zdjęcie"
       view: "podgląd"
     update: 
@@ -492,7 +491,10 @@ pl:
     update: 
       post_hidden: "wpis użytkownika %{name} został ukryty."
   posts: 
-    doesnt_exist: "ten wpis nie istnieje!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "poprzedni"
   profile: "Profil"
   profiles: 
@@ -648,10 +650,6 @@ pl:
       no_message_to_display: "Brak wiadomości."
     new: 
       mentioning: "Wspominasz o: %{person}"
-    show: 
-      destroy: "Usuń"
-      not_found: "Niestety, nie udało się nam znaleźć tego wpisu."
-      permalink: "odnośnik bezpośredni"
     too_long: 
       few: "skróć swoje wiadomości statusowe do mniej niż %{count} znaków"
       many: "skróć swoje wiadomości statusowe do mniej niż %{count} znaków"

config/locales/diaspora/pt-BR.yml

@@ -482,7 +482,6 @@ pt-BR:
       edit_delete_photo: "Editar descrição / remover foto"
       make_profile_photo: "Toarnar esta foto a do seu perfil"
       original_post: "Original Post"
-      permalink: "Link permanente"
       update_photo: "Atualizar foto"
       view: "ver"
     update: 
@@ -492,7 +491,10 @@ pt-BR:
     update: 
       post_hidden: "%{name}'s post has been hidden."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "Anterior"
   profile: "Perfil"
   profiles: 
@@ -648,10 +650,6 @@ pt-BR:
       no_message_to_display: "Sem mensagens para mostrar."
     new: 
       mentioning: "Mentioning: %{person}"
-    show: 
-      destroy: "Excluir"
-      not_found: "Sorry, we couldn't find that post."
-      permalink: "Link permanente"
     too_long: 
       few: "please make your status messages less than %{count} characters"
       many: "please make your status messages less than %{count} characters"

config/locales/diaspora/pt-PT.yml

@@ -482,7 +482,6 @@ pt-PT:
       edit_delete_photo: "Editar descrição da fotografia / apagar fotografia"
       make_profile_photo: "tornar foto de perfil"
       original_post: "Publicação Original"
-      permalink: "permalink"
       update_photo: "Actualizar Fotografia"
       view: "ver"
     update: 
@@ -492,7 +491,10 @@ pt-PT:
     update: 
       post_hidden: "A publicação de %{name} foi escondida."
   posts: 
-    doesnt_exist: "essa publicação não existe!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "anterior"
   profile: "Perfil"
   profiles: 
@@ -648,10 +650,6 @@ pt-PT:
       no_message_to_display: "Não há mensagens para mostrar."
     new: 
       mentioning: "Mencionando: %{person}"
-    show: 
-      destroy: "Apagar"
-      not_found: "Lamentamos muito, não conseguimos encontrar essa publicação."
-      permalink: "permalink"
     too_long: 
       few: "por favor não utilize mais de %{count} caracteres ao escrever as suas mensagens de estado"
       many: "por favor não utilize mais de %{count} caracteres ao escrever as suas mensagens de estado"

config/locales/diaspora/ro.yml

@@ -482,7 +482,6 @@ ro:
       edit_delete_photo: "Edit photo description / delete photo"
       make_profile_photo: "Setează ca fotografie de profil"
       original_post: "Original Post"
-      permalink: "permalink"
       update_photo: "Actualizează fotografia"
       view: "vizualizează"
     update: 
@@ -492,7 +491,10 @@ ro:
     update: 
       post_hidden: "%{name}'s post has been hidden."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "anterioare"
   profile: "Profil"
   profiles: 
@@ -648,10 +650,6 @@ ro:
       no_message_to_display: "Nici un mesaj nou."
     new: 
       mentioning: "Mentioning: %{person}"
-    show: 
-      destroy: "Şterge"
-      not_found: "Sorry, we couldn't find that post."
-      permalink: "permalink"
     too_long: 
       few: "please make your status messages less than %{count} characters"
       many: "please make your status messages less than %{count} characters"

config/locales/diaspora/ru.yml

@@ -482,7 +482,6 @@ ru:
       edit_delete_photo: "Изменить описание фотографии / удалить фотографию"
       make_profile_photo: "сделать фотографией профиля"
       original_post: "Исходное сообщение"
-      permalink: "постоянная ссылка"
       update_photo: "Обновить фотографию"
       view: "смотреть"
     update: 
@@ -492,7 +491,10 @@ ru:
     update: 
       post_hidden: "сообщения %{name} скрыты."
   posts: 
-    doesnt_exist: "этого сообщения не существует!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "предыдущая"
   profile: "Профиль"
   profiles: 
@@ -648,10 +650,6 @@ ru:
       no_message_to_display: "Новых сообщений нет."
     new: 
       mentioning: "Упоминание: %{person}"
-    show: 
-      destroy: "Удалить"
-      not_found: "К сожалению мы не смогли найти это сообщение."
-      permalink: "постоянная ссылка"
     too_long: 
       few: "сократите пожалуйста ваше сообщение до %{count} символов"
       many: "сократите пожалуйста ваше сообщение до %{count} символов"

config/locales/diaspora/sk.yml

@@ -482,7 +482,6 @@ sk:
       edit_delete_photo: "Upraviť popis fotky / zmazať fotku"
       make_profile_photo: "Zhotoviť profilovú fotku"
       original_post: "Pôvodný príspevok"
-      permalink: "permalink"
       update_photo: "Aktualizovať fotku"
       view: "Pozrieť"
     update: 
@@ -492,7 +491,10 @@ sk:
     update: 
       post_hidden: "%{name}'s post has been hidden."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "Predchádzajúce"
   profile: "Profil"
   profiles: 
@@ -648,10 +650,6 @@ sk:
       no_message_to_display: "Žiadne správy k zobrazeniu."
     new: 
       mentioning: "Mentioning: %{person}"
-    show: 
-      destroy: "Zmazať"
-      not_found: "Sorry, we couldn't find that post."
-      permalink: "permalink"
     too_long: 
       few: "please make your status messages less than %{count} characters"
       many: "please make your status messages less than %{count} characters"

config/locales/diaspora/sl.yml

@@ -482,7 +482,6 @@ sl:
       edit_delete_photo: "Dodaj opis slike ali izbriši sliko"
       make_profile_photo: "uporabi sliko za moj profil"
       original_post: "Original Post"
-      permalink: "trajna povezava"
       update_photo: "Posodobi sliko"
       view: "poglej"
     update: 
@@ -492,7 +491,10 @@ sl:
     update: 
       post_hidden: "%{name}'s post has been hidden."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "prejšnja"
   profile: "Profil"
   profiles: 
@@ -648,10 +650,6 @@ sl:
       no_message_to_display: "Ni sporočil."
     new: 
       mentioning: "Mentioning: %{person}"
-    show: 
-      destroy: "Izbriši"
-      not_found: "Sorry, we couldn't find that post."
-      permalink: "trajna povezava"
     too_long: 
       few: "please make your status messages less than %{count} characters"
       many: "please make your status messages less than %{count} characters"

config/locales/diaspora/sv.yml

@@ -482,7 +482,6 @@ sv:
       edit_delete_photo: "Ändra beskrivning / ta bort bild"
       make_profile_photo: "använd som profilbild"
       original_post: "Ursprungligt inlägg"
-      permalink: "permalink"
       update_photo: "Uppdatera foto"
       view: "visa"
     update: 
@@ -492,7 +491,10 @@ sv:
     update: 
       post_hidden: "%{name}s post har gömts."
   posts: 
-    doesnt_exist: "den posten finns inte!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "föregående"
   profile: "Profil"
   profiles: 
@@ -648,10 +650,6 @@ sv:
       no_message_to_display: "Inget meddelande att visa."
     new: 
       mentioning: "Omnämner: %{person}"
-    show: 
-      destroy: "Ta bort"
-      not_found: "Ursäkta, vi hittar inte den posten."
-      permalink: "permalänk"
     too_long: 
       few: "ditt statusmeddelande får inte vara längre än %{count} bokstäver"
       many: "ditt statusmeddelande får inte vara längre än %{count} bokstäver"

config/locales/diaspora/tr.yml

@@ -482,7 +482,6 @@ tr:
       edit_delete_photo: "Fotoğrafın tanımını düzenle/ fotoğrafı sil"
       make_profile_photo: "profil fotoğrafı yap"
       original_post: "Original Post"
-      permalink: "permalink"
       update_photo: "Fotoğrafı güncelle"
       view: "view"
     update: 
@@ -492,7 +491,10 @@ tr:
     update: 
       post_hidden: "%{name}'s post has been hidden."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "previous"
   profile: "Profil"
   profiles: 
@@ -648,10 +650,6 @@ tr:
       no_message_to_display: "Gosterilcek bir mesaj yok."
     new: 
       mentioning: "Mentioning: %{person}"
-    show: 
-      destroy: "Yok et"
-      not_found: "Sorry, we couldn't find that post."
-      permalink: "permalink"
     too_long: 
       few: "please make your status messages less than %{count} characters"
       many: "please make your status messages less than %{count} characters"

config/locales/diaspora/zh-CN.yml

@@ -482,7 +482,6 @@ zh-CN:
       edit_delete_photo: "编辑照片描述或删除照片"
       make_profile_photo: "选为个人头像"
       original_post: "原式内容"
-      permalink: "永久链接"
       update_photo: "更新照片"
       view: "查看"
     update: 
@@ -492,7 +491,10 @@ zh-CN:
     update: 
       post_hidden: "隐藏 %{name} 的内容成功"
   posts: 
-    doesnt_exist: "内容不存在！"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "上一步"
   profile: "个人档案"
   profiles: 
@@ -648,10 +650,6 @@ zh-CN:
       no_message_to_display: "没有信息可显示。"
     new: 
       mentioning: "提及发布中: %{person}"
-    show: 
-      destroy: "删除"
-      not_found: "抱歉，找不到该内容。"
-      permalink: "静态连接"
     too_long: 
       few: "请确认您的状态信息不超过%{count}个字符"
       many: "请确认您的状态信息不超过%{count}个字符"

config/locales/diaspora/zh-TW.yml

@@ -4,9 +4,9 @@
 
 
 zh-TW: 
-  _applications: "Applications"
+  _applications: "應用程式"
   _comments: "意見"
-  _contacts: "Contacts"
+  _contacts: "聯絡人"
   _home: "首頁"
   _photos: "相片"
   _services: "服務"
@@ -63,12 +63,12 @@ zh-TW:
     aspect_contacts: 
       done_editing: "編輯完成"
     aspect_listings: 
-      add_an_aspect: "+ Add an aspect"
+      add_an_aspect: "+ 新增面向"
     aspect_stream: 
-      commented_on: "commented on"
-      posted: "posted"
-      recently: "recently:"
-      stream: "Stream"
+      commented_on: "有意見的"
+      posted: "發表的"
+      recently: "近來:"
+      stream: "事件流"
     contacts_not_visible: "此面向中的聯繫無法看見彼此."
     contacts_visible: "此面向中的聯繫可以看見彼此."
     create: 
@@ -99,18 +99,18 @@ zh-TW:
         heading: "與 Cubbi.es 連結"
         learn_more: "進一步了解"
       diaspora_id: 
-        content_1: "Your Diaspora ID is:"
-        content_2: "Give it to anyone and they'll be able to find you on Diaspora."
-        heading: "Diaspora ID"
-      handle_explanation: "這是你的 diaspora 識別碼. 就像是電子信箱一樣, 你可以把它給想聯絡你的人."
+        content_1: "你的 Diaspora 識別碼是:"
+        content_2: "給任何一個人, 讓他/她們可以在 Diaspora 找到你."
+        heading: "Diaspora 識別碼"
+      handle_explanation: "這是你的 diaspora 識別碼. 就像電子信箱一樣, 你可以把它給想聯絡你的人."
       no_contacts: "沒有任何聯繫"
       people_sharing_with_you: "跟你分享的人"
       post_a_message: "發表訊息 >>"
       services: 
-        content: "You can connect the following services to Diaspora:"
-        heading: "Connect Services"
-      tags_following: "Followed Tags"
-      your_aspects: "Your Aspects"
+        content: "你可以連結以下服務至 Diaspora:"
+        heading: "連結服務"
+      tags_following: "追隨的標籤"
+      your_aspects: "你的面向"
     many: "%{count}個面向"
     move_contact: 
       error: "聯繫移動錯誤: %{inspect}"
@@ -120,17 +120,17 @@ zh-TW:
       create: "建立"
       name: "名字"
     no_posts_message: 
-      start_talking: "還沒人說話. 你來起個頭吧!"
-      try_adding_some_more_contacts: "Try adding some more contacts."
+      start_talking: "都還沒有人出聲!"
+      try_adding_some_more_contacts: "試著加入更多聯絡人."
     one: "1個面向"
     other: "%{count}個面向"
     seed: 
       family: "家人"
       work: "工作"
     selected_contacts: 
-      manage_your_aspects: "Manage your aspects."
-      no_contacts: "You don't have any contacts here yet."
-      view_all_contacts: "View all contacts"
+      manage_your_aspects: "管理你的面向."
+      no_contacts: "你在這裡還沒有任何聯絡人."
+      view_all_contacts: "檢視所有聯絡人"
     show: 
       edit_aspect: "編輯面向"
     update: 
@@ -139,12 +139,12 @@ zh-TW:
     zero: "沒有面向"
   authorizations: 
     index: 
-      revoke_access: "Revoke Access"
+      revoke_access: "撤銷存取權"
   back: "後退"
   bookmarklet: 
     explanation: "%{link}加入書籤後可對任何網站使用."
     explanation_link_text: "這個連結"
-    heading: "Diaspora 書籤小程式"
+    heading: "書籤小程式"
     post_something: "貼些東西到 Diaspora"
     post_success: "貼好了! 關掉中!"
   cancel: "取消"
@@ -164,13 +164,13 @@ zh-TW:
     index: 
       add_a_new_aspect: "加入新面向"
       all_contacts: "全部聯絡人"
-      edit_aspect: "Edit %{name}"
-      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
+      edit_aspect: "編輯%{name}"
+      many_people_are_you_sure: "你確定要進行跟%{suggested_limit}個聯絡人的私人對話? 貼文到該面向可能是比較好跟他們聯絡的方式."
       my_contacts: "我的聯絡人"
       no_contacts: "沒有聯絡人."
-      only_sharing_with_me: "Only sharing with me"
+      only_sharing_with_me: "和我分享的人"
       remove_person_from_aspect: "將 %{person_name} 從\"%{aspect_name}\"中移除"
-      start_a_conversation: "Start a conversation"
+      start_a_conversation: "開始對話"
       title: "聯絡人"
       your_contacts: "你的聯絡人"
     many: "%{count}個聯繫"
@@ -199,7 +199,7 @@ zh-TW:
       no_conversation_selected: "未選取任何對話"
       no_messages: "沒有訊息"
     new: 
-      abandon_changes: "Abandon changes?"
+      abandon_changes: "放棄目前變動?"
       send: "傳送"
       subject: "主旨"
       to: "收件人"
@@ -218,7 +218,7 @@ zh-TW:
       correct_the_following_errors_and_try_again: "修正以下錯誤後再試一次."
       invalid_fields: "欄位無效"
   fill_me_out: "填寫我"
-  find_people: "Find people"
+  find_people: "找人"
   hide: "隱藏"
   home: 
     show: 
@@ -273,7 +273,7 @@ zh-TW:
       logout: "登出"
       profile: "個人檔案"
       settings: "設定"
-      view_all: "View all"
+      view_all: "檢視全部"
   likes: 
     likes: 
       people_dislike_this: 
@@ -288,7 +288,7 @@ zh-TW:
         one: "有%{count}個讚"
         other: "有%{count}個讚"
         zero: "沒有讚"
-  limited: "Limited"
+  limited: "有限分享"
   more: "更多"
   next: "後面"
   no_results: "搜尋沒有結果"
@@ -482,7 +482,6 @@ zh-TW:
       edit_delete_photo: "編輯相片敘述或刪除相片"
       make_profile_photo: "選為個人照"
       original_post: "原貼文"
-      permalink: "靜態連結"
       update_photo: "更新相片"
       view: "檢視"
     update: 
@@ -492,7 +491,10 @@ zh-TW:
     update: 
       post_hidden: "已隱藏 %{name} 的貼文"
   posts: 
-    doesnt_exist: "貼文不存在!"
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
   previous: "前面"
   profile: "個人檔案"
   profiles: 
@@ -515,7 +517,7 @@ zh-TW:
     update: 
       failed: "個人檔案更新失敗"
       updated: "個人檔案已更新"
-  public: "Public"
+  public: "公開"
   registrations: 
     closed: "本 Diaspora pod 不開放登記."
     create: 
@@ -578,7 +580,7 @@ zh-TW:
       disconnect: "切斷連結"
       edit_services: "編輯服務"
       logged_in_as: "登入為"
-      no_services: "You have not connected any services yet."
+      no_services: "你還沒有任何已連結的服務."
       really_disconnect: "切斷與 %{service} 的連結?"
     inviter: 
       click_link_to_accept_invitation: "按一下這個連結來接受邀請"
@@ -591,7 +593,7 @@ zh-TW:
     add_contact: 
       add_new_contact: "加入新聯繫"
       create_request: "以 Diaspora 識別碼搜尋"
-      diaspora_handle: "diaspora@handle.org"
+      diaspora_handle: "diaspora@pod.org"
       enter_a_diaspora_username: "輸入 Diaspora 用戶名稱:"
       know_email: "知道他們的電子信箱嗎? 你應該邀請他們來"
       your_diaspora_username_is: "你的 Diaspora 用戶名稱是: %{diaspora_handle}"
@@ -620,7 +622,7 @@ zh-TW:
       all: "全部"
       all_contacts: "全部的聯繫"
       click_to_share_with: "點一下以一起分享: "
-      discard_post: "Discard post"
+      discard_post: "捨棄貼文"
       make_public: "公開"
       post_a_message_to: "在 %{aspect} 發表訊息"
       posting: "發表中..."
@@ -628,17 +630,17 @@ zh-TW:
       publishing_to: "發表至: "
       share: "分享"
       share_with: "跟他/她分享:"
-      upload_photos: "Upload photos"
+      upload_photos: "上傳照片"
       whats_on_your_mind: "在想什麼?"
     reshare: 
       reshare: "重新分享"
     stream_element: 
       dislike: "遜"
       like: "讚"
-      shared_with: "Shared with: %{aspect_names}"
+      shared_with: "分享給: %{aspect_names}"
       unlike: "收回讚"
       via: "經由%{link}"
-      viewable_to_anyone: "This post is viewable to anyone on the web"
+      viewable_to_anyone: "任何網頁使用者都能看到這篇貼文"
   status_messages: 
     create: 
       success: "成功推薦了: %{names}"
@@ -648,10 +650,6 @@ zh-TW:
       no_message_to_display: "沒有訊息可顯示."
     new: 
       mentioning: "提及發表中: %{person}"
-    show: 
-      destroy: "刪除"
-      not_found: "抱歉, 找不到該則貼文."
-      permalink: "靜態連結"
     too_long: 
       few: "請限制狀態訊息在%{count}個字內"
       many: "請限制狀態訊息在%{count}個字內"
@@ -659,29 +657,29 @@ zh-TW:
       other: "請限制狀態訊息在%{count}個字內"
       zero: "請限制狀態訊息在%{count}個字內"
   stream_helper: 
-    hide_comments: "隱藏意見"
-    show_more_comments: "Show %{number} more comments"
+    hide_comments: "隱藏所有意見"
+    show_more_comments: "顯示下面 %{number} 個意見"
   tag_followings: 
     create: 
-      failure: "Failed to follow: #%{name}"
-      success: "Successfully following: #%{name}"
+      failure: "追隨失敗: #%{name}"
+      success: "追隨成功: #%{name}"
     destroy: 
-      failure: "Failed to stop following: #%{name}"
-      success: "Successfully stopped following: #%{name}"
+      failure: "停止追隨失敗: #%{name}"
+      success: "停止追隨成功: #%{name}"
   tags: 
     show: 
-      follow: "Follow #%{tag}"
-      following: "Following #%{tag}"
+      follow: "追隨#%{tag}"
+      following: "正在追隨#%{tag}"
       nobody_talking: "尚還沒有人在討論 %{tag}."
       people_tagged_with: "標記為 %{tag} 的人"
       posts_tagged_with: "標記為 #%{tag} 的貼文"
-      stop_following: "Stop Following #%{tag}"
+      stop_following: "停止追隨#%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "與 Cubbi.es 連結"
-      connecting_is_simple: "只要在 Cubbi.es 的帳號設定中輸入兩個欄位, 就可以和你的 Diaspora 帳號建立連結了."
+      connecting_is_simple: "跟 Diapora 帳號連結很簡單! 只要從 cubbies <a href='%{href_link}'>設定頁面</a>輸入你的 Diaspora 識別碼, 再按下\"連結\"就可以了."
       daniels_account: "Daniel的 Diaspora 帳號"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
+      log_in_with_diaspora_is_comming: "很快你就可以使用 Diaspora 帳號連線至新的應用程式, 而不用另外再開新的帳號了."
       love_to_try: "希望你能試試看."
       making_the_connection: "建立連結"
       screenshot_explanation: "%{link1}. 這個cubby頁面是連結至%{link2}."