diff --git a/config/locales/devise/devise.cs.yml b/config/locales/devise/devise.cs.yml
index e7a006afc..46d2f995d 100644
--- a/config/locales/devise/devise.cs.yml
+++ b/config/locales/devise/devise.cs.yml
@@ -12,7 +12,7 @@ cs:
       send_instructions: "Během několika minut obdržíte email s instrukcemi k potvrzení vašeho účtu."
     failure: 
       inactive: "Váš účet ještě nebyl aktivován."
-      invalid: "Neplatný email nebo heslo."
+      invalid: "Neplatné uživatelské jméno nebo heslo."
       invalid_token: "Neplatný autentizační token."
       locked: "Váš účet je uzamčen."
       timeout: "Vaše sezení vypršelo, pro pokračování se prosím přihlašte znovu."
@@ -34,7 +34,7 @@ cs:
         no_account_till: "Váš účet nebude vytvořen dokud nepřistoupíte na uvedený odkaz a zaregistrujete se."
         subject: "Byli jste pozváni na Diasporu!"
       inviters: 
-        accept_at: ", na %{url}, akceptujte kliknutím na odkaz."
+        accept_at: ", na %{url}, pozvánku můžete přijmout kliknutím na odkaz níže.\n"
         has_invited_you: "%{name} Vás pozval na Diasporu"
         have_invited_you: "%{names} Vás pozvali na Diasporu"
       reset_password_instructions: 
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index 9c1702865..943995275 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -118,7 +118,7 @@ bg:
         content: "Можете да свържете следните услуги към Diaspora:"
         heading: "Свързване към услуги"
       tags_following: "Тагове, които следите"
-      unfollow_tag: "Stop following #%{tag}"
+      unfollow_tag: "Прекратяване следенето на #%{tag}"
       your_aspects: "Вашите аспекти"
     many: "%{count} аспекта"
     move_contact: 
@@ -253,7 +253,7 @@ bg:
       tagline_first_half: "Споделете каквото желаете,"
       tagline_second_half: "с когото пожелаете."
   invitations: 
-    a_facebook_user: "A Facebook user"
+    a_facebook_user: "Потребител на Facebook"
     check_token: 
       not_found: "Данните за поканата не са намерени"
     create: 
@@ -501,7 +501,7 @@ bg:
       edit: "редактиране"
       edit_delete_photo: "Редактиране на описанието / изтриване"
       make_profile_photo: "ползване като профилна снимка"
-      show_original_post: "Show original post"
+      show_original_post: "Оригиналната публикация"
       update_photo: "Update Photo"
     update: 
       error: "Снимката не бе изтрита."
@@ -600,8 +600,8 @@ bg:
     failure: 
       error: "възникна грешка при свързването с услугата"
     finder: 
-      no_friends: "No Facebook friends found."
-      service_friends: "%{service} Friends"
+      no_friends: "Няма намерени приятели от Facebook."
+      service_friends: "Приятели от %{service}"
     index: 
       connect_to_facebook: "Свързване с facebook"
       connect_to_tumblr: "Свързване с tumblr"
@@ -616,7 +616,7 @@ bg:
       join_me_on_diaspora: "Присъединете се към мен в DIASPORA*"
     remote_friend: 
       invite: "покани"
-      not_on_diaspora: "Not yet on Diaspora"
+      not_on_diaspora: "Все още не е в Diaspora"
       resend: "повторно изпращане"
   settings: "Настройки"
   shared: 
@@ -746,12 +746,12 @@ bg:
       your_email: "Вашата ел. поща"
       your_handle: "Вашият адрес в Diaspora"
     getting_started: 
-      aspects: "aspects"
+      aspects: "аспекти"
       connect_to: "Свържете профила си с"
       connect_to_your_other_social_networks: "Свържете профила си с други социални мрежи"
       connect_with_people: "Свържете се с интересни хора"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
+      connect_with_people_explanation_pt1: "Свържете се с хора поставяйки ги в един или няколко от вашите"
+      connect_with_people_explanation_pt2: "Групирането на контактите в аспекти ще ви позволи да споделяте/филрирате информация само с/от определена подгрупа от контактите ви."
       featured_tags: "Отличени тагове"
       featured_users: "Отличени потребители"
       fill_out_your_profile: "Попълнете профила си"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 211b63d1f..8c36106f0 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -29,7 +29,7 @@ cs:
         reshare: 
           attributes: 
             root_guid: 
-              taken: "You've already reshared that post!"
+              taken: "Toto zprávu už sdílíte."
         user: 
           attributes: 
             email: 
@@ -37,7 +37,7 @@ cs:
             person: 
               invalid: "je neplatný."
             username: 
-              invalid: "is invalid. We only allow letters, numbers, and underscores"
+              invalid: "je neplatné. Povolené znaky jsou pouze písmena, číslice a podtržítko"
               taken: "je již obsazeno."
   ago: "před %{time}"
   all_aspects: "Všechny aspekty"
@@ -107,9 +107,9 @@ cs:
         content_1: "Vaše Diaspora ID je:"
         content_2: "Dejte to někomu a bude vás moci najít na Diaspoře."
         heading: "Diaspora ID"
-      donate: "Donate"
+      donate: "Přispět"
       handle_explanation: "Toto je vaše Diaspora ID. Podobně jako e-mailovou adresu ho můžete dál lidem a budete na něm dostupní."
-      keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
+      keep_us_running: "Pomozte %{pod} udržet rychlý, kupte našim serverům dávku kávy."
       no_contacts: "Žádné kontakty"
       no_tags: "No tags"
       people_sharing_with_you: "Lidé, kteří s vámi sdílí"
@@ -118,7 +118,7 @@ cs:
         content: "Můžete připojit následující služby na Diasporu:"
         heading: "Připojit služby"
       tags_following: "Následované značky"
-      unfollow_tag: "Stop following #%{tag}"
+      unfollow_tag: "Přestat sledovat #%{tag}"
       your_aspects: "Vaše aspekty"
     many: "%{count} aspektů"
     move_contact: 
@@ -130,7 +130,7 @@ cs:
       name: "Název"
     no_contacts_message: 
       featured_users: "featured users"
-      or_featured: "Or you can share with %{link}"
+      or_featured: "Nebo můžete sdílet s %{link}"
       try_adding_some_more_contacts: "You can search (top) or invite (right) more contacts."
       you_should_add_some_more_contacts: "You should add some more contacts!"
     no_posts_message: 
@@ -140,7 +140,7 @@ cs:
     seed: 
       acquaintances: "Acquaintances"
       family: "Rodina"
-      friends: "Friends"
+      friends: "Přátelé"
       work: "Práce"
     selected_contacts: 
       manage_your_aspects: "Spravovat vaše aspekty."
@@ -218,7 +218,7 @@ cs:
     new: 
       abandon_changes: "Zamítnout změny?"
       send: "Poslat"
-      sending: "Sending..."
+      sending: "Posílám..."
       subject: "předmět"
       to: "pro"
     show: 
@@ -253,7 +253,7 @@ cs:
       tagline_first_half: "Sdílejte co chcete,"
       tagline_second_half: "s kým chcete."
   invitations: 
-    a_facebook_user: "A Facebook user"
+    a_facebook_user: "Uživatel Facebooku"
     check_token: 
       not_found: "Pozvánkový tiket nebyl nalezen"
     create: 
@@ -264,8 +264,8 @@ cs:
       rejected: "Následující emailové adresy mají problémy: "
       sent: "Pozvánky byly poslány pro:"
     edit: 
-      accept_your_invitation: "Accept your invitation"
-      your_account_awaits: "Your account awaits!"
+      accept_your_invitation: "Přijměte pozvání"
+      your_account_awaits: "Váš účet čeká!"
     new: 
       already_invited: "Následující lidé nepřijali vaše pozvání:"
       aspect: "Aspekt"
@@ -393,31 +393,31 @@ cs:
       zero: "%{actors} s vámi začali sdílet."
   notifier: 
     a_post_you_shared: "a post."
-    click_here: "click here"
+    click_here: "klikněte zde"
     comment_on_post: 
-      reply: "Reply or view %{name}'s post >"
+      reply: "Zobrazit zprávu od %{name} nebo na ni odpovědět >"
     confirm_email: 
       click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
       subject: "Please activate your new e-mail address %{unconfirmed_email}"
-    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
+    email_sent_by_diaspora: "Tento email odeslala Diaspora. Pokud si nepřejete nadále dostávat takovéto emaily,"
     hello: "Vítej %{name}!"
     liked: 
       liked: "%{name} si právě oblíbil váš příspěvek: "
-      view_post: "View post >"
+      view_post: "Zobrazit zprávu >"
     mentioned: 
       mentioned: "zmínil jste v příspěvku:"
       subject: "%{name} vás zmínil na Diaspoře*"
     private_message: 
-      reply_to_or_view: "Reply to or view this conversation >"
+      reply_to_or_view: "Zobrazit konverzaci nebo na ni odpovědět >"
     single_admin: 
       admin: "Váš Diaspora administrátor"
       subject: "Zpráva o vašem účtu na Diaspoře:"
     started_sharing: 
       sharing: "s vámi začal sdílet!"
       subject: "%{name} s vámi začal sdílet na Diaspoře*"
-      view_profile: "View %{name}'s profile"
+      view_profile: "Zobrazit profil %{name}"
     thanks: "Díky,"
-    to_change_your_notification_settings: "to change your notification settings"
+    to_change_your_notification_settings: "upravte si nastavení oznámení."
   ok: "OK"
   or: "nebo"
   password: "Heslo"
@@ -457,7 +457,7 @@ cs:
       add_some: "přidat nějaké"
       does_not_exist: "Osoba neexistuje!"
       edit: "upravit"
-      has_not_shared_with_you_yet: "%{name} has not shared any posts with you yet!"
+      has_not_shared_with_you_yet: "%{name} s vámi zatím žádnou zprávu nesdílí!"
       incoming_request: "%{name} s vámi chce sdílet"
       mention: "Zmínka"
       message: "Zpráva"
@@ -501,7 +501,7 @@ cs:
       edit: "upravit"
       edit_delete_photo: "Upravit popis fotky / smazat fotku"
       make_profile_photo: "vytvořit profilovou fotku"
-      show_original_post: "Show original post"
+      show_original_post: "Zobrazit původní zprávu"
       update_photo: "Aktualizovat fotku"
     update: 
       error: "Nepodařilo se upravit fotku."
@@ -581,7 +581,7 @@ cs:
     create: 
       failure: "There was an error resharing this post."
     reshare: 
-      deleted: "Original post deleted by author."
+      deleted: "Původní zpráva byla autorem odstraněna."
       reshare: 
         few: "%{count} Reshares"
         many: "%{count} Reshares"
@@ -600,7 +600,7 @@ cs:
     failure: 
       error: "nastala chyba při připojení ke službě"
     finder: 
-      no_friends: "No Facebook friends found."
+      no_friends: "Žádní přátelé z Facebooku nenalezeni."
       service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Připojit na Facebook"
@@ -616,7 +616,7 @@ cs:
       join_me_on_diaspora: "Připoj se ke mě na DIASPORU*"
     remote_friend: 
       invite: "pozvat"
-      not_on_diaspora: "Not yet on Diaspora"
+      not_on_diaspora: "Ještě není na Diaspoře"
       resend: "přeposlat"
   settings: "Nastavení"
   shared: 
@@ -746,32 +746,32 @@ cs:
       your_email: "Váš email"
       your_handle: "Vaše Diaspora ID"
     getting_started: 
-      aspects: "aspects"
-      connect_to: "Connect to"
-      connect_to_your_other_social_networks: "Connect to your other social networks"
+      aspects: "aspektů"
+      connect_to: "Připojit k"
+      connect_to_your_other_social_networks: "Připojit k dalším sociálním sítím"
       connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
+      connect_with_people_explanation_pt1: "Spojte se s lidmi jejich umístěním do jednoho nebo více z vašich"
+      connect_with_people_explanation_pt2: "Apekty jsou snadný způsob, jak seskupovat nové a známé tváře. Dovolují jednoduše sdílet s podmnožinami vašich kontaktů."
       featured_tags: "Featured tags"
       featured_users: "Featured users"
-      fill_out_your_profile: "Fill out your profile"
+      fill_out_your_profile: "Vyplňte si svůj profil"
       find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
+      find_friends_from_facebook: "najít přátele z Facebooku"
       finished: "Dokončeno!"
       follow_your_interests: "Follow your interests"
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
+      profile_description: "Zjednodušte ostatním vás najít vyplněním informací ve vašem profilu."
       profile_fields: 
         bio: "Bio"
-        birthday: "Birthday"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "Photo"
+        birthday: "Datum narození"
+        gender: "Pohlaví"
+        location: "Bydliště"
+        name: "Jméno"
+        photo: "Fotografie"
         tags: "Tags"
       see_all_featured_users: "See all featured users"
       welcome: "Vítejte na Diaspoře!"
-      welcome_with_name: "Welcome, %{name}!"
+      welcome_with_name: "Vítej, %{name}!"
     public: 
       does_not_exist: "Uživatel %{username} neexistuje!"
     update: 
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 1f887d3e0..8d591cb53 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -600,8 +600,8 @@ es:
     failure: 
       error: "hubo un error conectando ese servicio"
     finder: 
-      no_friends: "No Facebook friends found."
-      service_friends: "%{service} Friends"
+      no_friends: "No se han encontrados amigos de Facebook."
+      service_friends: "%{service} Amigos"
     index: 
       connect_to_facebook: "Conecta con Facebook"
       connect_to_tumblr: "Conecta con Tumblr"
@@ -616,7 +616,7 @@ es:
       join_me_on_diaspora: "Comparte conmigo en DIASPORA*."
     remote_friend: 
       invite: "invitar"
-      not_on_diaspora: "Not yet on Diaspora"
+      not_on_diaspora: "Aún no en Diaspora*"
       resend: "reenviar"
   settings: "Configuración"
   shared: 
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index edb0d71d1..ea3ba4c1f 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -669,7 +669,7 @@ fr:
       shared_with: "Shared with: %{aspect_names}"
       unlike: "Je n'aime pas"
       via: "via %{link}"
-      viewable_to_anyone: "This post is viewable to anyone on the web"
+      viewable_to_anyone: "Publication visible par n'importe qui sur le web"
   status_messages: 
     create: 
       success: "Mention de : %{names}"
@@ -697,7 +697,7 @@ fr:
       success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
-      follow: "Follow #%{tag}"
+      follow: "Suivre #%{tag}"
       following: "Following #%{tag}"
       nobody_talking: "Personne ne parle encore de %{tag}."
       people_tagged_with: "Personnes taguées avec %{tag}"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 6c0793d88..f7e88010a 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -81,7 +81,7 @@ sk:
       success: "Váš nový aspekt %{name} bol vytvorený"
     destroy: 
       failure: "%{name} is not empty and could not be removed."
-      success: "Užívateľ %{name} bol úspešne odstránený."
+      success: "%{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"
@@ -145,7 +145,7 @@ sk:
     selected_contacts: 
       manage_your_aspects: "Manage your aspects."
       no_contacts: "You don't have any contacts here yet."
-      view_all_contacts: "View all contacts"
+      view_all_contacts: "Zobraziť všetky kontakty"
     show: 
       edit_aspect: "upraviť aspekt"
     update: 
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 2d72f75b2..7554b7b05 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -37,7 +37,7 @@ zh-TW:
             person: 
               invalid: "不合格."
             username: 
-              invalid: "is invalid. We only allow letters, numbers, and underscores"
+              invalid: "不被接受. 只能夠使用字母, 數字, 以及底線符號"
               taken: "已被使用."
   ago: "%{time}前"
   all_aspects: "所有面向"
@@ -118,7 +118,7 @@ zh-TW:
         content: "你可以連結以下服務至 Diaspora:"
         heading: "連結服務"
       tags_following: "追蹤的標籤"
-      unfollow_tag: "Stop following #%{tag}"
+      unfollow_tag: "停止追隨#%{tag}"
       your_aspects: "你的面向"
     many: "%{count}個面向"
     move_contact: 
@@ -253,7 +253,7 @@ zh-TW:
       tagline_first_half: "分享你想分享的東西,"
       tagline_second_half: "給你想分享的人."
   invitations: 
-    a_facebook_user: "A Facebook user"
+    a_facebook_user: "Facebook 使用者"
     check_token: 
       not_found: "找不到該邀請信物"
     create: 
@@ -392,7 +392,7 @@ zh-TW:
       other: "%{actors}開始跟你分享了."
       zero: "%{actors}開始跟你分享了."
   notifier: 
-    a_post_you_shared: "a post."
+    a_post_you_shared: "一則貼文."
     click_here: "按這裡"
     comment_on_post: 
       reply: "回或看 %{name} 的貼文 >"
@@ -473,7 +473,7 @@ zh-TW:
       fail: "抱歉, 找不到 %{handle}."
     zero: "沒有聯絡人"
   photos: 
-    comment_email_subject: "%{name}'s photo"
+    comment_email_subject: "%{name} 的相片"
     create: 
       integrity_error: "相片上傳失敗. 你確定它是圖片嗎?"
       runtime_error: "相片上傳失敗. 你確定有扣安全帶嗎?"
@@ -501,7 +501,7 @@ zh-TW:
       edit: "編輯"
       edit_delete_photo: "編輯相片敘述或刪除相片"
       make_profile_photo: "選為個人照"
-      show_original_post: "Show original post"
+      show_original_post: "顯示原文"
       update_photo: "更新相片"
     update: 
       error: "相片編輯失敗."
@@ -577,7 +577,7 @@ zh-TW:
     new_request_to_person: 
       sent: "已送出!"
   reshares: 
-    comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
+    comment_email_subject: "%{resharer} 轉貼了 %{author} 的貼文"
     create: 
       failure: "轉貼這篇貼文時發生錯誤."
     reshare: 
@@ -600,8 +600,8 @@ zh-TW:
     failure: 
       error: "與該服務連結時有錯誤"
     finder: 
-      no_friends: "No Facebook friends found."
-      service_friends: "%{service} Friends"
+      no_friends: "沒有 Facebook 朋友."
+      service_friends: "%{service} 朋友"
     index: 
       connect_to_facebook: "與 Facebook 連結"
       connect_to_tumblr: "與 Tumblr 連結"
@@ -616,7 +616,7 @@ zh-TW:
       join_me_on_diaspora: "跟我一起加入 DIASPORA*"
     remote_friend: 
       invite: "邀請"
-      not_on_diaspora: "Not yet on Diaspora"
+      not_on_diaspora: "還沒來 Diaspora"
       resend: "重送"
   settings: "設定"
   shared: 
@@ -746,7 +746,7 @@ zh-TW:
       your_email: "你的電子郵件"
       your_handle: "你的 diaspora 識別碼"
     getting_started: 
-      aspects: "aspects"
+      aspects: "面向"
       connect_to: "連結至"
       connect_to_your_other_social_networks: "與其他社交網站連結"
       connect_with_people: "與酷咖連結"
diff --git a/config/locales/javascript/javascript.cs.yml b/config/locales/javascript/javascript.cs.yml
index e0da5012b..69e3ce3dd 100644
--- a/config/locales/javascript/javascript.cs.yml
+++ b/config/locales/javascript/javascript.cs.yml
@@ -23,10 +23,10 @@ cs:
       no_more: "Žádné další příspěvky."
     publisher: 
       at_least_one_aspect: "Musíte publikovat alespoň do jednoho aspektu"
-      limited: "Limited - your post will only be seen by people you are sharing with"
-      public: "Public - your post will be visible to everyone and found by search engines"
+      limited: "Omezený - váše zpráva bude přístupná pouze lidem z vybraných aspektů"
+      public: "Veřejné - váši zprávu si bude moci přečíst kdokoliv a může být nalezena vyhledávači"
     reshares: 
-      duplicate: "You've already reshared that post!"
+      duplicate: "Tato zprávu už sdílíte!"
     search_for: "Hledat {{name}}"
     show_more: "zobrazit více"
     timeago: 
diff --git a/config/locales/javascript/javascript.sk.yml b/config/locales/javascript/javascript.sk.yml
index 661d5d3a4..44686308e 100644
--- a/config/locales/javascript/javascript.sk.yml
+++ b/config/locales/javascript/javascript.sk.yml
@@ -14,7 +14,7 @@ sk:
         other: "In {{count}} aspects"
         zero: "Add to aspect"
     comments: 
-      hide: "hide comments"
+      hide: "skyť komentáre"
       show: "show all comments"
     confirm_dialog: "Ste si istý?"
     failed_to_like: "Failed to like!"