diff --git a/config/locales/devise/devise.ko.yml b/config/locales/devise/devise.ko.yml
index 06a080848..a76db5934 100644
--- a/config/locales/devise/devise.ko.yml
+++ b/config/locales/devise/devise.ko.yml
@@ -84,7 +84,7 @@ ko:
         sign_up: "가입하기"
         sign_up_closed: "공개 가입이 닫혀있습니다."
       mail_signup_form: 
-        sign_up_for_an_invite: "초대받고 싶으면 이메일 주소를 등록해두세오!"
+        sign_up_for_an_invite: "초대받고 싶으면 이메일 주소를 등록해두세요!"
     unlocks: 
       new: 
         resend_unlock: "풀기 메일 다시 보내기"
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 29ec52cbb..8222fdefe 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -8,7 +8,7 @@ ar:
   _home: "الرئيسية"
   _photos: "صور"
   _services: "خدمات"
-  account: "حساب"
+  account: "الحساب الشخصي"
   activerecord: 
     errors: 
       models: 
@@ -36,7 +36,7 @@ ar:
   all_aspects: "كل الفئات"
   application: 
     helper: 
-      diaspora_alpha: "DIASPORA* ALPHA"
+      diaspora_alpha: "دياسبرا* ألفا"
       unknown_person: "شخص غير معروف"
       video_title: 
         unknown: "عنوان فيديو غير محدد"
@@ -70,7 +70,7 @@ ar:
       aspect_list_is_visible: "قائمة الفئة مرئية للأعضاء الآخرين في الفئة"
       confirm_remove_aspect: "تأكيد حذف هذه الفئة؟"
       done: "تم بنجاح"
-      make_aspect_list_visible: "تريدها فئة مرئية؟"
+      make_aspect_list_visible: "فئة مرئية"
       remove_aspect: "حذف هذه الفئة"
       rename: "إعادة تسمية"
       update: "تحديث"
@@ -222,7 +222,7 @@ ar:
     application: 
       have_a_problem: "واجهت مشكلة؟ اعثر على حل هنا"
       powered_by: "بدعم DIASPORA*"
-      public_feed: "Public Diaspora Feed for %{name}"
+      public_feed: "فيد دياسبرا العام لـ for %{name}"
       toggle: "التحول إلى الموقع الخاص بالهواتف المحمولة"
       whats_new: "ما الجديد؟"
       your_aspects: "فئاتك"
@@ -231,7 +231,7 @@ ar:
       code: "شيفرة"
       login: "لُج"
       logout: "خروج"
-      profile: "الحساب الشخصي"
+      profile: "الصفحة الشخصية"
       settings: "إعدادات"
   likes: 
     likes: 
@@ -267,6 +267,7 @@ ar:
       and_others: "و %{number} آخرين"
       mark_all_as_read: "وضع الجميع كمقروء"
       notifications: "تنبيهات"
+    liked: "أعجبه منشورك:"
     mentioned: "قام بذكرك في"
     new_request: "عرض المشاركة معك"
     post: "منشور"
@@ -274,15 +275,19 @@ ar:
     request_accepted: "وافق على عرضك للمشاركة"
   notifier: 
     also_commented: 
-      commented: "أيضا على مشاركة %{post_author}:"
+      commented: "علق أيضا على مشاركة %{post_author}:"
       sign_in: "لُج لمشاهدته"
-      subject: "%{name} أيضا علق"
+      subject: "%{name} على أيضا على منشور %{post_author}."
     comment_on_post: 
       commented: "علق على مشاركتك"
-      sign_in: "لُج لمشاهدته\""
+      sign_in: "لُج لمشاهدته"
       subject: "%{name} علق على مشاركتك"
-    diaspora: "البريد الآلي لدياسبرا\""
+    diaspora: "البريد الآلي لدياسبرا"
     hello: "مرحبا %{name}!"
+    liked: 
+      liked: "%{name} أعجبه منشورك: "
+      sign_in: "لج لمشاهدته"
+      subject: "%{name} أعجبه منشورك"
     love: "كل الود,"
     manage_your_email_settings: "إدارة إعدادات بريدك الإلكتروني"
     mentioned: 
@@ -310,7 +315,7 @@ ar:
   ok: "حسنا"
   or: "أو"
   password: "كلمة المرور"
-  password_confirmation: "تأكيد كلمة المرور"
+  password_confirmation: "تأكيد كلمة المرور الجديدة"
   people: 
     add_contact_small: 
       add_contact_from_tag: "إضافة مراسل من tag"
@@ -335,10 +340,10 @@ ar:
       thats_you: "هذا أنت"
     profile_sidebar: 
       bio: "سيرة"
-      born: "ولد"
+      born: "تاريخ الميلاد"
       cannot_remove: "استحالة حذف %{name} من الفئة"
       edit_my_profile: "تحرير صفحتي الشخصية"
-      gender: "جنس"
+      gender: "الجنس"
       in_aspects: "في الفئة"
       location: "المكان"
       remove_contact: "حذف العضو"
@@ -413,8 +418,8 @@ ar:
       update_profile: "تحديث الصفحة الشخصية"
       your_bio: "سيرتك الشخصية"
       your_birthday: "تاريخ الميلاد"
-      your_gender: "جنسك"
-      your_location: "مكانك"
+      your_gender: "الجنس"
+      your_location: "المكان"
       your_name: "إسمك"
       your_photo: "صورتك"
       your_private_profile: "صفحتك الخاصة"
@@ -484,7 +489,7 @@ ar:
       connect_to_twitter: "إتصل بتويتر"
       disconnect: "فصل الإتصال"
       edit_services: "تعديل الخدمات"
-      logged_in_as: "ولوج بـ"
+      logged_in_as: "متصل بحساب"
       really_disconnect: "فصل إتصال %{service}?"
     inviter: 
       click_link_to_accept_invitation: "إضغط على هذا الرابط لقبول دعوتك"
@@ -530,7 +535,7 @@ ar:
       make_public: "عممها"
       post_a_message_to: "انشر رسالة إلى %{aspect}"
       posting: "نشر..."
-      public: "عام"
+      public: "العالم"
       publishing_to: "نشر إلى: "
       share: "مشاركة"
       share_with: "مشاركة مع %{aspect}"
@@ -540,6 +545,7 @@ ar:
     stream_element: 
       dislike: "لم يعجبني هذا"
       like: "أعجبني هذا"
+      unlike: "إلغاء إعجابي"
   status_messages: 
     create: 
       success: "ذكرت بنجاح: %{names}"
@@ -568,7 +574,7 @@ ar:
     destroy: "تم إغلاق الحساب بنجاح"
     edit: 
       also_commented: "...علق أحدهم على منشور مراسلك"
-      change: "Change"
+      change: "تغيير"
       change_language: "تغيير اللعة"
       change_password: "تغيير كلمة المرور"
       close_account: "غلق الحساب"
@@ -578,6 +584,7 @@ ar:
       download_xml: "تحميل xml خاصتي"
       edit_account: "تعديل الحساب"
       export_data: "تصدير البيانات"
+      liked: "...أعجب أحدهم بمنشورك"
       mentioned: "...تم ذكرك في رسالة"
       new_password: "كلمة مرور جديدة"
       private_message: "...وصلتك راسلة خاصة"
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index d22d85a7e..a90fd84a3 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -267,6 +267,7 @@ bg:
       and_others: "и %{number} други"
       mark_all_as_read: "Маркиране на всички като прочетени"
       notifications: "Известия"
+    liked: "has just liked your post"
     mentioned: "ви спомена в"
     new_request: "ви предложи да споделяте."
     post: "публикация."
@@ -283,6 +284,10 @@ bg:
       subject: "%{name} коментира ваша публикация."
     diaspora: "the diaspora email robot"
     hello: "Здравейте %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "love,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
@@ -540,6 +545,7 @@ bg:
     stream_element: 
       dislike: "Не ми харесва"
       like: "Харесва ми"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -578,6 +584,7 @@ bg:
       download_xml: "данните ви (XML формат)"
       edit_account: "Редактиране на акаунта"
       export_data: "Сваляне на..."
+      liked: "...someone likes your post?"
       mentioned: "...бъдете споменат в публикация?"
       new_password: "Нова парола"
       private_message: "...получите лично съобщение?"
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index e6eaa1357..6cb0e7d2b 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -267,6 +267,7 @@ br:
       and_others: "ha %{number} reoù all"
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
+    liked: "has just liked your post"
     mentioned: "en deus meneget ac'hanoc'h e-barzh ur skrid"
     new_request: "offered to share with you."
     post: "post"
@@ -283,6 +284,10 @@ br:
       subject: "%{name} has commented on your post."
     diaspora: "the diaspora email robot"
     hello: "Hello %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "love,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
@@ -540,6 +545,7 @@ br:
     stream_element: 
       dislike: "Ne blij ket din"
       like: "Plij' ra din"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -578,6 +584,7 @@ br:
       download_xml: "download my xml"
       edit_account: "Edit account"
       export_data: "Export Data"
+      liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "Ger-Kuzh Nevez"
       private_message: "...you receive a private message?"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 13e5a6bb8..f76238153 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -123,7 +123,7 @@ cs:
     few: "%{count} komentáře"
     many: "%{count} komentářů"
     new_comment: 
-      comment: "komentář"
+      comment: "Komentář"
       commenting: "Komentování..."
     one: "1 komentář"
     other: "%{count} komentářů"
@@ -267,6 +267,7 @@ cs:
       and_others: "a %{number} dalších"
       mark_all_as_read: "Označit vše jako přečtené"
       notifications: "Oznámení"
+    liked: "si právě oblíbil váš příspěvek"
     mentioned: "vás zmínil v příspěvku"
     new_request: "nabídnul vám sdílení."
     post: "zpráva"
@@ -283,6 +284,10 @@ cs:
       subject: "%{name} komentoval váš příspěvek."
     diaspora: "diaspora email robot"
     hello: "Vítej %{name}!"
+    liked: 
+      liked: "%{name} si právě oblíbil váš příspěvek: "
+      sign_in: "Přihlaste se pro zobrazení"
+      subject: "%{name} si právě oblíbil váš příspěvek"
     love: "s láskou,"
     manage_your_email_settings: "spravovat nastavení emailu"
     mentioned: 
@@ -540,6 +545,7 @@ cs:
     stream_element: 
       dislike: "to se mi nelíbí"
       like: "to se mi líbí"
+      unlike: "to se mi už nelíbí"
   status_messages: 
     create: 
       success: "Úspěšně zmíněno: %{names}"
@@ -578,6 +584,7 @@ cs:
       download_xml: "stáhnout moje xml"
       edit_account: "Upravit účet"
       export_data: "Exportovat data"
+      liked: "...někomu se líbí váš příspěvek?"
       mentioned: "...jste zmíněn v příspěvku?"
       new_password: "Nové heslo"
       private_message: "...obdržíte soukromou zprávu?"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 933867708..5f7842dc3 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -267,6 +267,7 @@ cy:
       and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
+    liked: "has just liked your post"
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
@@ -283,6 +284,10 @@ cy:
       subject: "%{name} has commented on your post."
     diaspora: "the diaspora email robot"
     hello: "Hello %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "love,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
@@ -540,6 +545,7 @@ cy:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -578,6 +584,7 @@ cy:
       download_xml: "download my xml"
       edit_account: "Edit account"
       export_data: "Export Data"
+      liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "New Password"
       private_message: "...you receive a private message?"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index f12cb97c6..1940e4adc 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -267,6 +267,7 @@ da:
       and_others: "og %{number} andre"
       mark_all_as_read: "Marker alle som læst"
       notifications: "Notifikationer"
+    liked: "has just liked your post"
     mentioned: "har omtalt dig i deres"
     new_request: "tilbød at dele med dig."
     post: "indlæg"
@@ -283,6 +284,10 @@ da:
       subject: "%{name} har kommenteret på din post!"
     diaspora: "Diaspora e-mail robotten"
     hello: "Hej %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "Hilsen,"
     manage_your_email_settings: "rediger dine email indstillinger"
     mentioned: 
@@ -540,6 +545,7 @@ da:
     stream_element: 
       dislike: "Jeg kan ikke lide det"
       like: "Jeg kan lide det"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "%{names} nævnet med succes"
@@ -578,6 +584,7 @@ da:
       download_xml: "Download min XML"
       edit_account: "Rediger konto"
       export_data: "Exportér data"
+      liked: "...someone likes your post?"
       mentioned: "...du er nævnt i en post?"
       new_password: "Ny adgangskode"
       private_message: "...du har modtaget en besked?"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 485979056..769fc36d8 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -267,6 +267,7 @@ de:
       and_others: "und %{number} andere"
       mark_all_as_read: "Markiere alle als gelesen"
       notifications: "Benachrichtigungen"
+    liked: "gefällt dein Beitrag"
     mentioned: "hat dich erwähnt in einem"
     new_request: "hat angeboten mit dir zu teilen."
     post: "Beitrag"
@@ -283,6 +284,10 @@ de:
       subject: "%{name} hat deinen Beitrag kommentiert."
     diaspora: "der Diaspora E-Mail-Roboter"
     hello: "Hallo %{name}!"
+    liked: 
+      liked: "%{name} gefällt dein Beitrag: "
+      sign_in: "Melde dich an um es zu sehen"
+      subject: "%{name} gefällt dein Beitrag"
     love: "Gruß,"
     manage_your_email_settings: "E-Mail  Einstellungen"
     mentioned: 
@@ -540,6 +545,7 @@ de:
     stream_element: 
       dislike: "Gefällt mir nicht"
       like: "Gefällt mir"
+      unlike: "Gefällt mir nicht mehr"
   status_messages: 
     create: 
       success: "Erfolgreich erwähnt: %{names}"
@@ -578,6 +584,7 @@ de:
       download_xml: "Daten herunterladen (XML)"
       edit_account: "Konto bearbeiten"
       export_data: "Daten exportieren"
+      liked: "...wenn jemandem dein Beitrag gefällt?"
       mentioned: "… du in einem Beitrag erwähnt wirst?"
       new_password: "Neues Passwort"
       private_message: "… du eine private Nachricht erhältst?"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index f07345b5e..2a4de1316 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -246,7 +246,7 @@ el:
         many: "Αρέσει σε %{count} άτομα"
         one: "Αρέσει σε 1 άτομο"
         other: "Αρέσει σε %{count} άτομα"
-        zero: "σε κανέναν δεν αρέσει"
+        zero: "δεν αρέσει σε κανέναν"
   more: "Περισσότερα"
   next: "επόμενο"
   no_results: "Δεν βρέθηκαν αποτελέσματα"
@@ -267,6 +267,7 @@ el:
       and_others: "και %{number} άλλοι"
       mark_all_as_read: "Σήμανση όλων ως διαβασμένα"
       notifications: "Ειδοποιήσεις"
+    liked: "μόλις του/της άρεσε η δημοσίευση σας"
     mentioned: "σας ανέφερε σε"
     new_request: "προσφέρθηκε να μοιραστεί μαζί σας."
     post: "δημοσίευση."
@@ -283,6 +284,10 @@ el:
       subject: "Ο χρήστης %{name} σχολίασε τη δημοσίευση σας."
     diaspora: "το ρομποτάκι για τα email του δικτύου Diaspora.."
     hello: "Γειά σου %{name}!"
+    liked: 
+      liked: "στον %{name} αρέσει η δημοσίευση σας: "
+      sign_in: "Sign to view it"
+      subject: "στον %{name} αρέσει η δημοσίευση σας"
     love: "Με αγάπη,"
     manage_your_email_settings: "διαχείριση των ρυθμίσεων ηλεκτρονικού ταχυδρομείου"
     mentioned: 
@@ -540,6 +545,7 @@ el:
     stream_element: 
       dislike: "Δεν μ' αρέσει"
       like: "Μου αρέσει"
+      unlike: "Δεν μου αρέσει"
   status_messages: 
     create: 
       success: "Αναφέρθηκαν επιτυχώς: %{names}"
@@ -578,6 +584,7 @@ el:
       download_xml: "κατέβασε το xml μου"
       edit_account: "Επεξεργασία λογαριασμού"
       export_data: "Εξαγωγή Δεδομένων"
+      liked: "...σε κάποιον αρέσει η δημοσίευση σας;"
       mentioned: "...επισημανθήκατε σε μία φωτογραφία?"
       new_password: "Νέος κωδικός πρόσβασης"
       private_message: "...μόλις λάβατε μία προσωπική ειδοποίηση?"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 700c1c204..e841ee588 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -267,6 +267,7 @@ en_shaw:
       and_others: "𐑯 %{number} 𐑳𐑞𐑼𐑟"
       mark_all_as_read: "𐑥𐑸𐑒 𐑷𐑤 𐑨𐑟 𐑮𐑧𐑛"
       notifications: "𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟"
+    liked: "has just liked your post"
     mentioned: "𐑣𐑨𐑟 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩"
     new_request: "𐑪𐑓𐑼𐑛 𐑑 𐑖𐑺 𐑢𐑦𐑞 𐑿."
     post: "𐑐𐑴𐑕𐑑"
@@ -283,6 +284,10 @@ en_shaw:
       subject: "%{name} 𐑣𐑨𐑟 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 𐑐𐑴𐑕𐑑."
     diaspora: "𐑞 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑦-𐑥𐑱𐑤 𐑮𐑴𐑚𐑪𐑑"
     hello: "𐑣𐑧𐑤𐑴 %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "𐑤𐑳𐑝,"
     manage_your_email_settings: "𐑥𐑨𐑯𐑩𐑡 𐑿𐑼 𐑦-𐑥𐑱𐑤 𐑕𐑧𐑑𐑦𐑙𐑟"
     mentioned: 
@@ -540,6 +545,7 @@ en_shaw:
     stream_element: 
       dislike: "𐑲 𐑛𐑦𐑕𐑤𐑲𐑒 𐑞𐑦𐑕"
       like: "𐑲 𐑤𐑲𐑒 𐑞𐑦𐑕"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑥𐑧𐑯𐑖𐑩𐑯𐑛: %{names}"
@@ -578,6 +584,7 @@ en_shaw:
       download_xml: "𐑛𐑬𐑯𐑤𐑴𐑛 𐑥𐑲 𐑧.𐑥.𐑤."
       edit_account: "𐑧𐑛𐑦𐑑 𐑩𐑒𐑬𐑯𐑑"
       export_data: "𐑧𐑒𐑕𐑐𐑹𐑑 𐑛𐑱𐑑𐑩"
+      liked: "...someone likes your post?"
       mentioned: "...𐑿 𐑸 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑦𐑯 𐑩 𐑐𐑴𐑕𐑑?"
       new_password: "𐑯𐑿 𐑐𐑨𐑕𐑢𐑼𐑛"
       private_message: "...𐑿 𐑮𐑦𐑕𐑰𐑝 𐑩 𐑐𐑮𐑲𐑝𐑩𐑑 𐑥𐑧𐑕𐑩𐑡?"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 290288f68..1ff8e0526 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -267,6 +267,7 @@ eo:
       and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
+    liked: "has just liked your post"
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
@@ -283,6 +284,10 @@ eo:
       subject: "%{name} has commented on your post."
     diaspora: "the diaspora email robot"
     hello: "Saluton %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "love,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
@@ -540,6 +545,7 @@ eo:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -578,6 +584,7 @@ eo:
       download_xml: "download my xml"
       edit_account: "Edit account"
       export_data: "Export Data"
+      liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "New Password"
       private_message: "...you receive a private message?"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 40916f602..7c22a138b 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -123,7 +123,7 @@ es-CL:
     few: "%{count} comentarios"
     many: "%{count} comentarios"
     new_comment: 
-      comment: "Comentario"
+      comment: "Comentar"
       commenting: "Comentando..."
     one: "1 comentario"
     other: "%{count} comentarios"
@@ -267,6 +267,7 @@ es-CL:
       and_others: "y otros %{number}"
       mark_all_as_read: "Marcar todo como leido"
       notifications: "Notificaciones"
+    liked: "le gustó tu post"
     mentioned: "te mencionó en un"
     new_request: "quiere compartir contigo."
     post: "post."
@@ -283,6 +284,10 @@ es-CL:
       subject: "%{name} comentó en tu post."
     diaspora: "correo robot de diaspora"
     hello: "¡Hola %{name}!"
+    liked: 
+      liked: "a %{name} le gustó tu post: "
+      sign_in: "Entra para verlo"
+      subject: "a %{name} le gustó tu post"
     love: "cariño,"
     manage_your_email_settings: "maneja tus configuraciones de email"
     mentioned: 
@@ -540,6 +545,7 @@ es-CL:
     stream_element: 
       dislike: "No me gusta esto"
       like: "Me gusta esto"
+      unlike: "No me gusta"
   status_messages: 
     create: 
       success: "Se ha mencionado con éxito a: %{names}"
@@ -578,6 +584,7 @@ es-CL:
       download_xml: "descargar mi xml"
       edit_account: "Editar cuenta"
       export_data: "Exportar Datos"
+      liked: "...a alguien le gusta tu post?"
       mentioned: "...te mencionan en un post?"
       new_password: "Nueva Contraseña"
       private_message: "...recibes un mensaje privado?"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 12a77f035..8e7d61ee5 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -236,17 +236,17 @@ es:
   likes: 
     likes: 
       people_dislike_this: 
-        few: "%{count} personas no les gusta esto"
-        many: "%{count} personas no les gusta esto"
-        one: "1 persona no le gusta esto"
-        other: "%{count} personas no les gusta esto"
-        zero: "a nadie le disgusta esto"
+        few: "A %{count} no les gusta"
+        many: "A %{count} no les gusta"
+        one: "A 1 no le gusta"
+        other: "A %{count} no les gusta"
+        zero: "A nadie le disgusta"
       people_like_this: 
-        few: "%{count} personas les gusta eso"
-        many: "%{count} personas les gusta esto"
-        one: "1 persona le gusta esto"
-        other: "%{count} personas les gusta esto"
-        zero: "a nadie le gusta esto"
+        few: "A %{count} les gusta"
+        many: "A %{count} les gusta"
+        one: "A 1 le gusta"
+        other: "A %{count} les gusta"
+        zero: "A nadie le gusta"
   more: "Más"
   next: "Siguiente"
   no_results: "No hay resultados"
@@ -267,6 +267,7 @@ es:
       and_others: "y otros %{number}"
       mark_all_as_read: "Marcar todo como leído"
       notifications: "Notificaciones"
+    liked: "le gustó tu publicación"
     mentioned: "te mencionó en una"
     new_request: "quisiera compartir contigo."
     post: "publicación."
@@ -283,6 +284,10 @@ es:
       subject: "%{name} escribió en tu publicación."
     diaspora: "Email robot de Diaspora*"
     hello: "¡Hola %{name}!"
+    liked: 
+      liked: "a %{name} le gustó tu publicación:"
+      sign_in: "Conéctate para poder verlo"
+      subject: "a %{name} le gustó tu publicación"
     love: "¡Qué pasa!"
     manage_your_email_settings: "configura tu correo"
     mentioned: 
@@ -538,8 +543,9 @@ es:
     reshare: 
       reshare: "Publicar en..."
     stream_element: 
-      dislike: "No me gusta esto"
-      like: "Me gusta esto"
+      dislike: "No me gusta"
+      like: "Me gusta"
+      unlike: "No me gusta"
   status_messages: 
     create: 
       success: "Se ha mencionado con éxito a: %{names}"
@@ -578,6 +584,7 @@ es:
       download_xml: "descargar mi xml"
       edit_account: "Editar cuenta"
       export_data: "Exportar datos"
+      liked: "...a alguien le gusta tu publicación?"
       mentioned: "...eres mencionado en una publicación?"
       new_password: "Nueva contraseña"
       private_message: "...recibes un mensaje privado?"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 94f9160f5..b924fd010 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -123,7 +123,7 @@ eu:
     few: "%{count} iruzkin"
     many: "%{count} iruzkin"
     new_comment: 
-      comment: "iruzkindu"
+      comment: "Iruzkindu"
       commenting: "Iruzkintzen..."
     one: "iruzkin 1"
     other: "%{count} iruzkin"
@@ -231,22 +231,22 @@ eu:
       code: "kodea"
       login: "sartu"
       logout: "irten"
-      profile: "Profila"
-      settings: "Lehentasunak"
+      profile: "profila"
+      settings: "lehentasunak"
   likes: 
     likes: 
       people_dislike_this: 
         few: "%{count} pertsonek ez dute hau gustuko"
         many: "%{count} pertsonek ez dute hau gustuko"
-        one: "pertsona batek ez du hau gustuko"
+        one: "%{count}ek ez du hau gustuko"
         other: "%{count} pertsonek ez dute hau gustuko"
-        zero: "gusoko ez duen pertsonarik ez dago"
+        zero: "gustoko ez duen pertsonarik ez"
       people_like_this: 
         few: "%{count} pertsonek gustoko dute hau"
         many: "%{count} pertsonek gustoko dute hau"
-        one: "pertsona batek gustoko du hau"
+        one: "%{count}ek du gustoko"
         other: "%{count} pertsonek gustoko dute hau"
-        zero: "hau ez du inork gustoko"
+        zero: "oraindik ez du inork gustoko"
   more: "Gehiago"
   next: "hurrengoa"
   no_results: "Ez Da Ezer Aurkitu"
@@ -267,6 +267,7 @@ eu:
       and_others: "eta beste %{number}(e)k"
       mark_all_as_read: "Guztiak irakurrita"
       notifications: "Jakinarazpenak"
+    liked: "(e)k zure mezua gustoko du"
     mentioned: "(e)k zu aipatu zaitu hemen:"
     new_request: "(e)k zurekin partekatu nahi du."
     post: "mezua."
@@ -283,6 +284,10 @@ eu:
       subject: "%{name}(e)k zure mezua iruzkindu du."
     diaspora: "diasporaren e-posta robota"
     hello: "Kaixo, %{name}!"
+    liked: 
+      liked: "%{name}(e)k zure mezua gustoko du:"
+      sign_in: "Sartu zaitez ikusteko"
+      subject: "%{name}(e)k zure mezua atsegin du"
     love: "ikusi arte,"
     manage_your_email_settings: "kudeatu zure e-posta ezarpenak"
     mentioned: 
@@ -540,6 +545,7 @@ eu:
     stream_element: 
       dislike: "Ez dut gustoko"
       like: "Gustoko dut"
+      unlike: "Ez dut gustoko"
   status_messages: 
     create: 
       success: "Arrakastaz aipatu dituzu: %{names}"
@@ -578,6 +584,7 @@ eu:
       download_xml: "nire xml jaitsi"
       edit_account: "Kontua aldatu"
       export_data: "Datuak esportatu"
+      liked: "...norbaitek zure mezu bat gustoko duenean?"
       mentioned: "...mezu batean aipatzen zaituztenean?"
       new_password: "Pasahitz Berria"
       private_message: "...mezu pribatu bat jasotzen duzunean?"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index dcaaf8e2d..848b13f77 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -236,17 +236,17 @@ fi:
   likes: 
     likes: 
       people_dislike_this: 
-        few: "%{count} people disliked this"
-        many: "%{count} people disliked this"
-        one: "1 person disliked this"
+        few: "%{count} ei tykkää"
+        many: "%{count} ei tykkää"
+        one: "%{count} ei tykkää"
         other: "%{count} people disliked this"
         zero: "no people disliked this"
       people_like_this: 
-        few: "%{count} people liked this"
-        many: "%{count} ihmistä tykkää tästä"
-        one: "1 person liked this"
-        other: "%{count} people liked this"
-        zero: "no people liked this"
+        few: "%{count} tykkää"
+        many: "%{count} tykkää"
+        one: "%{count} tykkää"
+        other: "%{count} tykkää"
+        zero: "ei tykkäyksiä"
   more: "Lisää"
   next: "seuraava"
   no_results: "Tuloksia ei löytynyt"
@@ -263,10 +263,11 @@ fi:
         other: "%{count} uutta ilmoitusta"
         zero: "ei uusia ilmoituksia"
     index: 
-      and: "and"
-      and_others: "and %{number} others"
+      and: "ja"
+      and_others: "ja %{number} muuta"
       mark_all_as_read: "Merkitse kaikki luetuiksi"
       notifications: "Ilmoitukset"
+    liked: "has just liked your post"
     mentioned: "on maininnut sinut "
     new_request: "haluaa jakaa kanssasi."
     post: "viesti."
@@ -283,6 +284,10 @@ fi:
       subject: "%{name} on kommentoinut viestiisi."
     diaspora: "Diasporan sähköpostirobotti"
     hello: "Hei %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "Terveisin,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
@@ -539,7 +544,8 @@ fi:
       reshare: "Jaa uudelleen"
     stream_element: 
       dislike: "En tykkää"
-      like: "Tykkään"
+      like: "Tykkää"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -578,6 +584,7 @@ fi:
       download_xml: "Lataa tiedot XML-muodossa"
       edit_account: "Muokkaa käyttäjätiliä"
       export_data: "Vie tietoja"
+      liked: "...someone likes your post?"
       mentioned: "...sinut mainitaan viestissä?"
       new_password: "Uusi salasana"
       private_message: "...saat uuden viestin?"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index cf805386a..348bc2dd6 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -267,6 +267,7 @@ fr:
       and_others: "et %{number} autres"
       mark_all_as_read: "Tout marquer comme lu"
       notifications: "Notifications"
+    liked: "has just liked your post"
     mentioned: "vous a mentionné(e) dans un"
     new_request: "a proposé de partager avec vous."
     post: "message."
@@ -283,6 +284,10 @@ fr:
       subject: "%{name} a commenté votre message."
     diaspora: "le robot de messagerie électronique de Diaspora"
     hello: "Bonjour %{name} !"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "affectueusement,"
     manage_your_email_settings: "modifier vos paramètres de courriel"
     mentioned: 
@@ -540,6 +545,7 @@ fr:
     stream_element: 
       dislike: "Je n'aime pas"
       like: "J'aime"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Mention de : %{names}"
@@ -578,6 +584,7 @@ fr:
       download_xml: "télécharger mon XML"
       edit_account: "Modifier le compte"
       export_data: "Exporter des données"
+      liked: "...someone likes your post?"
       mentioned: "…vous êtes mentionné(e) dans une publication ?"
       new_password: "Nouveau mot de passe"
       private_message: "…vous recevez un message privé ?"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 8aa68b4e0..96837ee7b 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -267,6 +267,7 @@ ga:
       and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Fograí"
+    liked: "has just liked your post"
     mentioned: "has mentioned you in their"
     new_request: "ofráiladh chun roint leant"
     post: "póst"
@@ -283,6 +284,10 @@ ga:
       subject: "%{name} has commented on your post."
     diaspora: "an róbat ríomhpost diaspora"
     hello: "Haileo %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "le meas,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
@@ -540,6 +545,7 @@ ga:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -578,6 +584,7 @@ ga:
       download_xml: "íoslódáil mo xml"
       edit_account: "Athraigh cúntas"
       export_data: "Easpórtáil Sonraí"
+      liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "Pasfhocal nua"
       private_message: "...you receive a private message?"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 21901896f..4916d3655 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -267,6 +267,7 @@ he:
       and_others: "ו־%{number} אחרים"
       mark_all_as_read: "סימון הכול כלאחר קריאה"
       notifications: "התרעות"
+    liked: "has just liked your post"
     mentioned: "הזכיר/ה אותך ב"
     new_request: "הציע/ה לשתף אתך."
     post: "רשומה."
@@ -283,6 +284,10 @@ he:
       subject: "%{name} הגיב/ה על הרשומה שלך."
     diaspora: "רובוט הדוא״ל של דיאספורה"
     hello: "שלום %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "באהבה,"
     manage_your_email_settings: "ניהול הגדרות הדוא״ל שלך"
     mentioned: 
@@ -540,6 +545,7 @@ he:
     stream_element: 
       dislike: "לא אהבתי את זה"
       like: "אהבתי"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "אוזכרו בהצלחה: %{names}"
@@ -578,6 +584,7 @@ he:
       download_xml: "הורדת ה־xml שלי"
       edit_account: "עריכת החשבון"
       export_data: "יצוא הנתונים"
+      liked: "...someone likes your post?"
       mentioned: "...מישהו הזכיר אותך ברשומה?"
       new_password: "ססמה חדשה"
       private_message: "...קיבלת הודעה פרטית?"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index c3ccf6de8..6aa3c5bca 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -267,6 +267,7 @@ hu:
       and_others: "és %{number} másik"
       mark_all_as_read: "Mind megjelölése olvasottként"
       notifications: "Értesítések"
+    liked: "has just liked your post"
     mentioned: "megemlített téged egy"
     new_request: "megosztást ajánlott neked."
     post: "bejegyzésben."
@@ -283,6 +284,10 @@ hu:
       subject: "%{name} hozzászólt a bejegyzésedhez."
     diaspora: "A diaspora email robot"
     hello: "Szia %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "Szeretettel,"
     manage_your_email_settings: "Kezeld az email beállításaidat"
     mentioned: 
@@ -540,6 +545,7 @@ hu:
     stream_element: 
       dislike: "Nem tetszik"
       like: "Tetszik"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Megemlítetted: %{names}"
@@ -578,6 +584,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?"
       mentioned: "...meg vagy említve egy bejegyzésben?"
       new_password: "Új jelszó"
       private_message: "...privát üzenetet kaptál?"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 5484c5235..f771ab664 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -267,6 +267,7 @@ id:
       and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
+    liked: "has just liked your post"
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
@@ -283,6 +284,10 @@ id:
       subject: "%{name} has commented on your post."
     diaspora: "the diaspora email robot"
     hello: "Hello %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "love,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
@@ -540,6 +545,7 @@ id:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -578,6 +584,7 @@ id:
       download_xml: "download my xml"
       edit_account: "Edit account"
       export_data: "Export Data"
+      liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "New Password"
       private_message: "...you receive a private message?"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 739d70511..2850c7cc4 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -267,6 +267,7 @@ is:
       and_others: "and %{number} others"
       mark_all_as_read: "Merkja allt sem lesið"
       notifications: "Tilkynningar"
+    liked: "has just liked your post"
     mentioned: "hefur getið þín í þeirra"
     new_request: "bauð þér samnýtingu."
     post: "setja inn"
@@ -283,6 +284,10 @@ is:
       subject: "%{name} hefur gert atugasemd við þína færslu."
     diaspora: "the diaspora email robot"
     hello: "Halló %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "ást,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
@@ -540,6 +545,7 @@ is:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -578,6 +584,7 @@ is:
       download_xml: "download my xml"
       edit_account: "Breyta notandastillingum"
       export_data: "Export Data"
+      liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "Nýtt lykilorð"
       private_message: "...you receive a private message?"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index e75f09d5b..3f6ce297c 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -267,6 +267,7 @@ it:
       and_others: "e altri %{number}"
       mark_all_as_read: "Segna Tutti come Letti"
       notifications: "Notifiche"
+    liked: "has just liked your post"
     mentioned: "ti ha menzionato in un "
     new_request: "vuole condividere con te."
     post: "post."
@@ -283,6 +284,10 @@ it:
       subject: "%{name} ha commentato il tuo post."
     diaspora: "l'email robot di diaspora"
     hello: "Ciao %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "amore,"
     manage_your_email_settings: "gestisci le tue impostazioni email"
     mentioned: 
@@ -540,6 +545,7 @@ it:
     stream_element: 
       dislike: "Non mi piace"
       like: "Mi piace"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Menzionati con successo: %{names}"
@@ -578,6 +584,7 @@ it:
       download_xml: "scarica il mio xml"
       edit_account: "Modifica account"
       export_data: "Esporta Dati"
+      liked: "...someone likes your post?"
       mentioned: "...sei menzionato in un post?"
       new_password: "Nuova Password"
       private_message: "...hai ricevuto un messaggio privato?"
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index 6700c141d..c057ce3ca 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -267,6 +267,7 @@ ja:
       and_others: "他%{number}件"
       mark_all_as_read: "全件を既読にする"
       notifications: "通知"
+    liked: "has just liked your post"
     mentioned: "さんはあなたをメンションしました。"
     new_request: "さんは共有の許可を求めました。"
     post: "（投稿で）"
@@ -283,6 +284,10 @@ ja:
       subject: "%{name}は投稿にコメントしました。"
     diaspora: "ダイアスポラ＊メールロボット"
     hello: "%{name}さん、こんにちは！"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "それでは、"
     manage_your_email_settings: "メール設定を管理する"
     mentioned: 
@@ -540,6 +545,7 @@ ja:
     stream_element: 
       dislike: "これ嫌い！"
       like: "これ好き！"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "%{names}を参照するのに成功しました。"
@@ -578,6 +584,7 @@ ja:
       download_xml: "XMLをダウンロードする"
       edit_account: "アカウント編集"
       export_data: "データ出力"
+      liked: "...someone likes your post?"
       mentioned: "投稿に自分がメンションされたとき"
       new_password: "新しいパスワード"
       private_message: "非公開メッセージが届いたとき"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index 5485fadfc..59163bbc6 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -186,7 +186,7 @@ ko:
     show: 
       already_account: "이미 계정을 가지고 있습니까?"
       choice: "선택"
-      choice_explanation: "디아스포라에서는 애스펙이라는 모둠으로 관계를 관리합니다. 디아스포라만의 독특함인 애스펙은 나의 사진, 이야기, 농담이 내가 의도한 사람들과만 공유되도록 보장합니다."
+      choice_explanation: "디아스포라에서는 애스펙이라는 그룹으로 관계를 관리합니다. 디아스포라만의 독특함인 애스펙은 나의 사진, 이야기, 농담이 내가 의도한 사람들과만 공유되도록 보장합니다."
       learn_about_host: "디아스포라 서버를 직접 운영하는 방법"
       login_here: "로그인"
       ownership: "소유권"
@@ -267,6 +267,7 @@ ko:
       and_others: "나머지 %{number}개"
       mark_all_as_read: "모두 읽음으로 표시"
       notifications: "알림"
+    liked: "님이 내 공유물을 좋아합니다"
     mentioned: " 님이 귀하를 멘션하였습니다."
     new_request: " 님이 공유를 요청하였습니다."
     post: "공유물"
@@ -283,6 +284,10 @@ ko:
       subject: "%{name} 님이 귀하의 공유물에 댓글을 달았습니다."
     diaspora: "디아스포라 자동 이메일"
     hello: "%{name} 님!"
+    liked: 
+      liked: "%{name} 님이 내 공유물을 좋아합니다:"
+      sign_in: "Sign to view it"
+      subject: "%{name} 님이 내 공유물을 좋아합니다."
     love: ""
     manage_your_email_settings: "이메일 설정 관리"
     mentioned: 
@@ -540,6 +545,7 @@ ko:
     stream_element: 
       dislike: "싪어요"
       like: "좋아요"
+      unlike: "좋아요 취소"
   status_messages: 
     create: 
       success: "%{names} 님을 성공적으로 멘션했습니다."
@@ -578,6 +584,7 @@ ko:
       download_xml: "내 xml 다운로드"
       edit_account: "계정 고치기"
       export_data: "자료 뽑아내기"
+      liked: "누군가가 내 공유물을 좋아할 때"
       mentioned: "내가 멘션되었을 때"
       new_password: "새 암호"
       private_message: "쪽지를 받았을 때"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index e4e4e3e57..10c4de90f 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -267,6 +267,7 @@ lt:
       and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
+    liked: "has just liked your post"
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
@@ -283,6 +284,10 @@ lt:
       subject: "%{name} has commented on your post."
     diaspora: "Diasporos pašto robotas"
     hello: "Labas, %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "su meile,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
@@ -540,6 +545,7 @@ lt:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -578,6 +584,7 @@ lt:
       download_xml: "atsisiųsti mano duomenis xml formatu"
       edit_account: "Edit account"
       export_data: "Eksportuoti duomenis"
+      liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "Naujas slaptažodis"
       private_message: "...you receive a private message?"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 88ac70896..b584d442d 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -267,6 +267,7 @@ mk:
       and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
+    liked: "has just liked your post"
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
@@ -283,6 +284,10 @@ mk:
       subject: "%{name} has commented on your post."
     diaspora: "diaspora е-маил робот"
     hello: "Здраво %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "со љубов,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
@@ -540,6 +545,7 @@ mk:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -578,6 +584,7 @@ mk:
       download_xml: "симни го мојот xml"
       edit_account: "Edit account"
       export_data: "Изнеси податоци"
+      liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "Нова лозинка"
       private_message: "...you receive a private message?"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index bf4be313e..2e1f7bb31 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -267,6 +267,7 @@ nb:
       and_others: "og %{number} andre"
       mark_all_as_read: "Merk alle som leste"
       notifications: "Varsler"
+    liked: "has just liked your post"
     mentioned: "har nevnt deg i sin"
     new_request: "spør om å få dele med deg."
     post: "innlegg"
@@ -283,6 +284,10 @@ nb:
       subject: "%{name} har kommentert på ditt innlegg."
     diaspora: "diasporas epostrobot"
     hello: "Hei %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "vennlig hilsen,"
     manage_your_email_settings: "administrer e-postinnstillingene"
     mentioned: 
@@ -538,8 +543,9 @@ nb:
     reshare: 
       reshare: "Del på nytt"
     stream_element: 
-      dislike: "Jeg misliker dette"
-      like: "Jeg liker dette"
+      dislike: "Liker ikke"
+      like: "Liker"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Nevnte :%{navn}"
@@ -578,6 +584,7 @@ nb:
       download_xml: "last ned min xml"
       edit_account: "Endre konto"
       export_data: "Eksporter Data"
+      liked: "...someone likes your post?"
       mentioned: " du nevnes i et innlegg?"
       new_password: "Nytt Passord"
       private_message: " du mottar en privat melding?"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index b123007e2..47a033a84 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -123,7 +123,7 @@ nl:
     few: "%{count} reacties"
     many: "%{count} reacties"
     new_comment: 
-      comment: "reactie"
+      comment: "Reactie"
       commenting: "Reageren..."
     one: "1 reactie"
     other: "%{count} reacties"
@@ -236,23 +236,23 @@ nl:
   likes: 
     likes: 
       people_dislike_this: 
-        few: "%{count} personen vinden dit niet leuk"
-        many: "%{count} personen vinden dit niet leuk"
-        one: "1 persoon vindt dit niet leuk"
-        other: "%{count} personen vinden dit niet leuk"
+        few: "%{count} mensen vinden dit niet leuk"
+        many: "%{count} mensen vinden dit niet leuk"
+        one: "%{count} persoon vindt dit niet leuk"
+        other: "%{count} mensen vinden dit niet leuk"
         zero: "niemand vindt dit niet leuk"
       people_like_this: 
-        few: "%{count} personen vinden dit leuk"
-        many: "%{count} personen vinden dit leuk"
-        one: "1 persoon vindt dit leuk"
-        other: "%{count} personen vinden dit leuk"
+        few: "%{count} mensen vinden dit leuk"
+        many: "%{count} mensen vinden dit leuk"
+        one: "%{count} persoon vindt dit leuk"
+        other: "%{count} mensen vinden dit leuk"
         zero: "niemand vindt dit leuk"
   more: "Meer"
   next: "volgende"
   no_results: "Geen resultaten gevonden"
   notifications: 
     also_commented: "heeft ook gereageerd %{post_author}'s"
-    also_commented_deleted: "reageerde op een verwijderde post"
+    also_commented_deleted: "reageerde op een verwijderde post."
     comment_on_post: "reageerde op jouw"
     deleted: "verwijderde"
     helper: 
@@ -267,9 +267,10 @@ nl:
       and_others: "en %{number} anderen"
       mark_all_as_read: "Markeer alles gelezen"
       notifications: "Notificaties"
-    mentioned: "heeft je genoemd in een post"
+    liked: "vind je post leuk"
+    mentioned: "heeft je genoemd in een"
     new_request: "bood aan om met jou te delen."
-    post: "post"
+    post: "post."
     private_message: "heeft je een bericht gestuurd."
     request_accepted: "heeft je verzoek geaccepteerd."
   notifier: 
@@ -283,6 +284,10 @@ nl:
       subject: "%{name} heeft op jouw post gereageerd."
     diaspora: "de diaspora email robot"
     hello: "Hoi %{name}!"
+    liked: 
+      liked: "%{name} vind je post leuk: "
+      sign_in: "Sign to view it"
+      subject: "%{name} vind jou post leuk"
     love: "liefs,"
     manage_your_email_settings: "beheer je e-mail instellingen"
     mentioned: 
@@ -538,8 +543,9 @@ nl:
     reshare: 
       reshare: "Herdeel"
     stream_element: 
-      dislike: "Ik vind dit niet leuk"
-      like: "Ik vind dit leuk"
+      dislike: "Vind ik niet meer leuk"
+      like: "Vind ik leuk"
+      unlike: "vind ik niet meer leuk"
   status_messages: 
     create: 
       success: "Succesvol genoemd: %{names}"
@@ -578,6 +584,7 @@ nl:
       download_xml: "download mijn xml"
       edit_account: "Bewerk account"
       export_data: "Exporteer data"
+      liked: "... iemand je post leuk vind?"
       mentioned: "...je genoemd word in een post?"
       new_password: "Nieuw wachtwoord"
       private_message: "...je een privébericht ontvangt?"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 1c2cf8fb5..40f69f57a 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -267,6 +267,7 @@ pa:
       and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
+    liked: "has just liked your post"
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "ਪੋਸਟ"
@@ -283,6 +284,10 @@ pa:
       subject: "%{name} has commented on your post."
     diaspora: "the diaspora email robot"
     hello: "ਹੈਲੋ %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "love,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
@@ -540,6 +545,7 @@ pa:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -578,6 +584,7 @@ pa:
       download_xml: "download my xml"
       edit_account: "Edit account"
       export_data: "Export Data"
+      liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "New Password"
       private_message: "...you receive a private message?"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index d138878d0..307592642 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -267,6 +267,7 @@ pl:
       and_others: "i %{number} innych"
       mark_all_as_read: "Oznacz wszystkie jako przeczytane"
       notifications: "Powiadomienia"
+    liked: "has just liked your post"
     mentioned: "wspomniał o tobie we wpisie"
     new_request: "chce zostać twoim znajomym."
     post: "wpis"
@@ -283,6 +284,10 @@ pl:
       subject: "Użytkownik %{name} skomentował Twój wpis."
     diaspora: "robot e-mailowy diaspory"
     hello: "Cześć %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "uściski,"
     manage_your_email_settings: "zarządzaj ustawieniami emaila"
     mentioned: 
@@ -540,6 +545,7 @@ pl:
     stream_element: 
       dislike: "Nie lubię tego"
       like: "Lubię to"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Pomyślnie wspomniano o: %{names}"
@@ -578,6 +584,7 @@ pl:
       download_xml: "pobierz mój xml"
       edit_account: "Edytuj konto"
       export_data: "Eksportowanie danych"
+      liked: "...someone likes your post?"
       mentioned: "...zostałeś wspomniany(a) we wpisie?"
       new_password: "Nowe hasło"
       private_message: "...otrzymasz prywatną wiadomość?"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 9511ebff4..642834bea 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -267,6 +267,7 @@ pt-BR:
       and_others: "and %{number} others"
       mark_all_as_read: "Marcar Tudo como Lido"
       notifications: "Notificações"
+    liked: "has just liked your post"
     mentioned: "has mentioned you in their"
     new_request: "deseja partilhar com você."
     post: "post"
@@ -283,6 +284,10 @@ pt-BR:
       subject: "%{name} comentou sua postagem."
     diaspora: "o robô de email da Diaspora*"
     hello: "Olá, %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "Com carinho,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
@@ -540,6 +545,7 @@ pt-BR:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -578,6 +584,7 @@ pt-BR:
       download_xml: "Baixar meu XML"
       edit_account: "Alterar conta"
       export_data: "Exportar dados"
+      liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "Nova Senha"
       private_message: "...you receive a private message?"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 641419bbb..d7438a7b5 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -267,6 +267,7 @@ pt-PT:
       and_others: "e %{number} outros"
       mark_all_as_read: "Marcar Tudo como Lido"
       notifications: "Notificações"
+    liked: "has just liked your post"
     mentioned: "has mentioned you in their"
     new_request: "deseja partilhar consigo."
     post: "post"
@@ -283,6 +284,10 @@ pt-PT:
       subject: "%{name} comentou no seu post."
     diaspora: "o robot de email do diaspora"
     hello: "Olá %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "com carinho,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
@@ -540,6 +545,7 @@ pt-PT:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -578,6 +584,7 @@ pt-PT:
       download_xml: "descarregar o meu xml"
       edit_account: "Editar conta"
       export_data: "Exportar Dados"
+      liked: "...someone likes your post?"
       mentioned: "...você é mencionado num post?"
       new_password: "Nova Palavra-chave"
       private_message: "...você recebe uma mensagem privada?"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 9e46661f8..bc5eead37 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -267,6 +267,7 @@ ro:
       and_others: "and %{number} others"
       mark_all_as_read: "Marchează-le pe toate ca citite"
       notifications: "Notificări"
+    liked: "has just liked your post"
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
@@ -283,6 +284,10 @@ ro:
       subject: "%{name} has commented on your post."
     diaspora: "robotul e-mail Diaspora"
     hello: "Bună %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "cu dragoste,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
@@ -540,6 +545,7 @@ ro:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -578,6 +584,7 @@ ro:
       download_xml: "descarcă datele mele (xml)"
       edit_account: "Edit account"
       export_data: "Exportare de date"
+      liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "Parolă nouă"
       private_message: "...you receive a private message?"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 1e108b2be..a0e51a30a 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -123,7 +123,7 @@ ru:
     few: "%{count} комментариев"
     many: "%{count} комментариев"
     new_comment: 
-      comment: "комментировать"
+      comment: "комментарий"
       commenting: "Комментирование ..."
     one: "1 комментарий"
     other: "%{count} комментариев"
@@ -236,17 +236,17 @@ ru:
   likes: 
     likes: 
       people_dislike_this: 
-        few: "%{count} персонам не понравилось"
-        many: "%{count} персонам не понравилось"
-        one: "1 пользователю это не понравилось"
-        other: "%{count} пользователям это не понравилось "
-        zero: "это никому не понравилось "
+        few: "%{count} не понравилось"
+        many: "%{count} не понравилось"
+        one: "%{count} не понравилось"
+        other: "%{count} не понравилось "
+        zero: "никому не понравилось"
       people_like_this: 
-        few: "%{count} персонам это понравилось"
-        many: "%{count} персонам это понравилось"
-        one: "1 человеку это понравилось"
-        other: "%{count} персонам это понравилось"
-        zero: "это никому не понравилось"
+        few: "%{count} понравилось"
+        many: "%{count} понравилось"
+        one: "%{count} понравилось"
+        other: "%{count} понравилось"
+        zero: "никому не понравилось"
   more: "Подробнее"
   next: "далее"
   no_results: "Результатов не найдено"
@@ -267,6 +267,7 @@ ru:
       and_others: "и %{number} других"
       mark_all_as_read: "Отметить все как прочитанные"
       notifications: "Уведомления"
+    liked: "понравилось Ваше сообщение"
     mentioned: "упомянул вас в"
     new_request: "предлагает поделиться с вами."
     post: "сообщение."
@@ -283,6 +284,10 @@ ru:
       subject: "%{name} прокомментировал ваше сообщение."
     diaspora: "почтовый робот Диаспоры"
     hello: "Привет %{name}!"
+    liked: 
+      liked: "%{name} понравилось Ваше сообщение:"
+      sign_in: "Войдите в систему, чтобы увидеть это"
+      subject: "%{name} понравилось Ваше сообщение"
     love: "С уважением,"
     manage_your_email_settings: "администрировать настройки электронной почты"
     mentioned: 
@@ -538,8 +543,9 @@ ru:
     reshare: 
       reshare: "Поделиться повторно"
     stream_element: 
-      dislike: "Мне это не нравится"
-      like: "Мне это нравится "
+      dislike: "Не нравится"
+      like: "Нравится"
+      unlike: "В отличие от"
   status_messages: 
     create: 
       success: "Успешно упомянут: %{names}"
@@ -578,6 +584,7 @@ ru:
       download_xml: "Скачать мою информацию в xml"
       edit_account: "Редактировать аккаунт"
       export_data: "Экспорт информации"
+      liked: "... кому-нибудь нравится ваше сообщение?"
       mentioned: "... Вы упомянуты в сообщении?"
       new_password: "Новый пароль"
       private_message: "... Вы получаете личное сообщение?"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 0254aca0b..f818d3827 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -267,6 +267,7 @@ sk:
       and_others: "and %{number} others"
       mark_all_as_read: "Všetko označiť ako prečítané"
       notifications: "Notifikácie"
+    liked: "has just liked your post"
     mentioned: "ťa spomenuli v ich"
     new_request: "offered to share with you."
     post: "príspevok"
@@ -283,6 +284,10 @@ sk:
       subject: "Užívateľ %{name} komentoval Váš príspevok."
     diaspora: "e-mail robot Diaspory"
     hello: "Ahoj %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "miluje,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
@@ -540,6 +545,7 @@ sk:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -578,6 +584,7 @@ sk:
       download_xml: "stiahnuť moje xml"
       edit_account: "Upraviť účet"
       export_data: "Exportovať dáta"
+      liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "Nové heslo"
       private_message: "...you receive a private message?"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 1cb1d22d3..f1c949776 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -267,6 +267,7 @@ sl:
       and_others: "and %{number} others"
       mark_all_as_read: "Označi vse kot prebrano"
       notifications: "Sporočila"
+    liked: "has just liked your post"
     mentioned: "bili ste omenjeni v objavi"
     new_request: "nekdo želi deliti z vami."
     post: "prispevek"
@@ -283,6 +284,10 @@ sl:
       subject: "Oseba %{name} je komentirala vašo objavo."
     diaspora: "diaspora email robot"
     hello: "Pozdravljeni %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "vas pozdravlja,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
@@ -540,6 +545,7 @@ sl:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -578,6 +584,7 @@ sl:
       download_xml: "prenesi v xml"
       edit_account: "Uredi uporabniški račun"
       export_data: "Izvozi podatke"
+      liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "Novo geslo"
       private_message: "...you receive a private message?"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 5aba71c97..557f01ffc 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -267,6 +267,7 @@ sv:
       and_others: "och %{number} andra"
       mark_all_as_read: "Markera alla som läst"
       notifications: "Notifieringar"
+    liked: "has just liked your post"
     mentioned: "har nämnt dig i deras"
     new_request: "erbjöd sig att dela med dig."
     post: "meddelande"
@@ -283,6 +284,10 @@ sv:
       subject: "%{name} har kommenterat ditt inlägg."
     diaspora: "Diasporas mailrobot"
     hello: "Hej %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "hälsningar,"
     manage_your_email_settings: "administrera dina epost-inställningar"
     mentioned: 
@@ -540,6 +545,7 @@ sv:
     stream_element: 
       dislike: "Jag ogillar dethär"
       like: "Jag gillar dethär"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Lyckades omnämna: %{names}"
@@ -578,6 +584,7 @@ sv:
       download_xml: "Ladda ner min xml"
       edit_account: "Ändra konto"
       export_data: "Exportera data"
+      liked: "...someone likes your post?"
       mentioned: "...du är omnämnd i en post?"
       new_password: "Nytt lösenord"
       private_message: "...du mottar ett privat meddelande?"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index c2d58bce1..777191fa4 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -267,6 +267,7 @@ tr:
       and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
+    liked: "has just liked your post"
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
@@ -283,6 +284,10 @@ tr:
       subject: "%{name} has commented on your post."
     diaspora: "Diaspora e-posta robotu"
     hello: "Merhaba %{name}!"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "love,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
@@ -540,6 +545,7 @@ tr:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -578,6 +584,7 @@ tr:
       download_xml: "xml dosyamı kaydet"
       edit_account: "Edit account"
       export_data: "Bilgilerimi Dışarı taşı"
+      liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "Yeni Şifre"
       private_message: "...you receive a private message?"
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 2103b78a6..246ef565e 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -267,6 +267,7 @@ zh-CN:
       and_others: "和其他%{number}个人"
       mark_all_as_read: "全部标示为已读"
       notifications: "消息"
+    liked: "has just liked your post"
     mentioned: "在他发布的内容中提到了你"
     new_request: "想要与您分享。"
     post: "日志。"
@@ -283,6 +284,10 @@ zh-CN:
       subject: "%{name} 评论了您发布的内容。"
     diaspora: "diaspora邮件机器人"
     hello: "您好 %{name}！"
+    liked: 
+      liked: "%{name} has just liked your post: "
+      sign_in: "Sign to view it"
+      subject: "%{name} has just liked your post"
     love: "衷心祝福，"
     manage_your_email_settings: "管理邮件设置"
     mentioned: 
@@ -540,6 +545,7 @@ zh-CN:
     stream_element: 
       dislike: "不喜欢"
       like: "喜欢"
+      unlike: "Unlike"
   status_messages: 
     create: 
       success: "成功推荐了: %{names}"
@@ -578,6 +584,7 @@ zh-CN:
       download_xml: "下载我的 xml"
       edit_account: "编辑帐号"
       export_data: "资料导出"
+      liked: "...someone likes your post?"
       mentioned: "……当贴文中提到您时？"
       new_password: "新密码"
       private_message: "……当收到私人信息时？"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index c70cfc523..508ee7745 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -36,7 +36,7 @@ zh-TW:
   all_aspects: "所有面向"
   application: 
     helper: 
-      diaspora_alpha: "DIASPORA* ALPHA"
+      diaspora_alpha: "DIASPORA* 預覽版"
       unknown_person: "不明聯絡人"
       video_title: 
         unknown: "影片標題不明"
@@ -236,23 +236,23 @@ zh-TW:
   likes: 
     likes: 
       people_dislike_this: 
-        few: "有%{count}個人說遜"
-        many: "有%{count}個人說遜"
-        one: "有1個人說遜"
-        other: "有%{count}個人說遜"
-        zero: "沒有人說遜"
+        few: "有%{count}個遜"
+        many: "有%{count}個遜"
+        one: "有%{count}個遜"
+        other: "有%{count}個遜"
+        zero: "沒有遜"
       people_like_this: 
-        few: "有%{count}個人說讚"
-        many: "有%{count}個人說讚"
-        one: "有1個人說讚"
-        other: "有%{count}個人說讚"
-        zero: "沒有人說讚"
+        few: "有%{count}個讚"
+        many: "有%{count}個讚"
+        one: "有%{count}個讚"
+        other: "有%{count}個讚"
+        zero: "沒有讚"
   more: "更多"
   next: "後面"
   no_results: "搜尋沒有結果"
   notifications: 
     also_commented: "也在別處發表了意見, 在 %{post_author} 的"
-    also_commented_deleted: "對已刪除的貼文發表意見"
+    also_commented_deleted: "對已刪除的貼文發表意見."
     comment_on_post: "發表了意見, 在你的"
     deleted: "已刪除"
     helper: 
@@ -267,9 +267,10 @@ zh-TW:
       and_others: "和其他%{number}個人"
       mark_all_as_read: "全部標示為已讀"
       notifications: "消息"
+    liked: "剛剛對你的貼文說讚"
     mentioned: "在貼文中提到了你"
     new_request: "想要跟你分享."
-    post: "貼文"
+    post: "貼文."
     private_message: "寫了一則訊息給你."
     request_accepted: "已同意和你分享."
   notifier: 
@@ -283,6 +284,10 @@ zh-TW:
       subject: "%{name} 對你的貼文發表意見."
     diaspora: "diaspora 電郵機器人"
     hello: "%{name}你好!"
+    liked: 
+      liked: "%{name}剛剛說你的貼文讚: "
+      sign_in: "登入來看看"
+      subject: "%{name}剛剛說你的貼文讚"
     love: "衷心祝福,"
     manage_your_email_settings: "管理電郵設定"
     mentioned: 
@@ -540,6 +545,7 @@ zh-TW:
     stream_element: 
       dislike: "遜"
       like: "讚"
+      unlike: "收回讚"
   status_messages: 
     create: 
       success: "成功推薦了: %{names}"
@@ -578,6 +584,7 @@ zh-TW:
       download_xml: "下載我的 xml"
       edit_account: "編輯帳號"
       export_data: "資料匯出"
+      liked: "...有人對你的貼文說讚時?"
       mentioned: "...當貼文中提到你時?"
       new_password: "新的密碼"
       private_message: "...當收到私人訊息時?"
diff --git a/config/locales/javascript/javascript.ar.yml b/config/locales/javascript/javascript.ar.yml
index 5495b261e..1f546f8ba 100644
--- a/config/locales/javascript/javascript.ar.yml
+++ b/config/locales/javascript/javascript.ar.yml
@@ -23,9 +23,9 @@ ar:
       minutes: "منذ %d دقائق"
       month: "منذ شهر"
       months: "منذ %d شهور"
-      prefixAgo: "منذ"
-      prefixFromNow: "منذ الآن"
-      seconds: "منذ أقل من دقيقة"
+      prefixAgo: ""
+      prefixFromNow: "من الآن"
+      seconds: "منذ ثواني"
       suffixAgo: ""
       suffixFromNow: ""
       year: "منذ عام"
@@ -34,4 +34,4 @@ ar:
       unknown: "نوع فيديو غير معروف"
       watch: "مشاهدة هذا الفيديو عبر {{provider}}"
     web_sockets: 
-      disconnected: "The websocket is closed; posts will no longer be streamed live."
+      disconnected: "الـ websocket مغلق; الرسائل لن تنشر بعد الآن"
diff --git a/config/locales/javascript/javascript.fi.yml b/config/locales/javascript/javascript.fi.yml
index 9e2aaf553..d251057f3 100644
--- a/config/locales/javascript/javascript.fi.yml
+++ b/config/locales/javascript/javascript.fi.yml
@@ -7,9 +7,9 @@ fi:
   javascripts: 
     confirm_dialog: "Oletko varma?"
     infinite_scroll: 
-      no_more: "No more posts."
+      no_more: "Ei enempää viestejä."
     publisher: 
-      at_least_one_aspect: "You must publish to at least one aspect"
+      at_least_one_aspect: "Sinun täytyy julkaista vähintään yhdelle näkymälle."
     search_for: "Etsi nimellä {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml
index f8a4f01dc..78361cc09 100644
--- a/config/locales/javascript/javascript.nl.yml
+++ b/config/locales/javascript/javascript.nl.yml
@@ -7,7 +7,7 @@ nl:
   javascripts: 
     confirm_dialog: "Weet je het zeker?"
     infinite_scroll: 
-      no_more: "No more posts."
+      no_more: "Geen posts meer."
     publisher: 
       at_least_one_aspect: "Je moet op zijn minst één aspect publiceren"
     search_for: "Zoek naar {{name}}"
@@ -34,4 +34,4 @@ nl:
       unknown: "Onbekend video type"
       watch: "Bekijk deze video op {{provider}}"
     web_sockets: 
-      disconnected: "The websocket is closed; posts will no longer be streamed live."
+      disconnected: "De websocket is gesloten; posts worden niet langer live gestreamd."
diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml
index 01c27fd3f..0a17e0656 100644
--- a/config/locales/javascript/javascript.zh-TW.yml
+++ b/config/locales/javascript/javascript.zh-TW.yml
@@ -34,4 +34,4 @@ zh-TW:
       unknown: "不明的影片類別"
       watch: "從 {{provider}} 看這部影片"
     web_sockets: 
-      disconnected: "The websocket is closed; posts will no longer be streamed live."
+      disconnected: "Websocket 已斷線; 貼文不會再即時更新了."
diff --git a/config/locales/rails-i18n/cs.rb b/config/locales/rails-i18n/cs.rb
index 8218b34a2..d36394d33 100644
--- a/config/locales/rails-i18n/cs.rb
+++ b/config/locales/rails-i18n/cs.rb
@@ -11,10 +11,10 @@ unless defined?(CzechLocaleI18n::ERROR_MESSAGES)
       :invalid             => "není platná hodnota",
       :confirmation        => "nebylo potvrzeno",
       :accepted            => "musí být potvrzeno",
-      :empty               => "nesmí být prázdný/é",
+      :empty               => "nesmí být prázdný/á/é",
       :blank               => "je povinná položka", # alternate formulation: "is required"
-      :too_long            => "je příliš dlouhá/ý (max. %{count} znaků)",
-      :too_short           => "je příliš krátký/á (min. %{count} znaků)",
+      :too_long            => "je příliš dlouhý/á/é (max. %{count} znaků)",
+      :too_short           => "je příliš krátký/á/é (min. %{count} znaků)",
       :wrong_length        => "nemá správnou délku (očekáváno %{count} znaků)",
       :not_a_number        => "není číslo",
       :greater_than        => "musí být větší než %{count}",
@@ -143,16 +143,16 @@ end
       :distance_in_words => {
         :half_a_minute => 'půl minutou',
         :less_than_x_seconds => {
-          :one => 'asi před sekundou',
-          :other => 'asi před %{count} sekundami'
+          :one => 'necelou sekundou',
+          :other => 'ani ne %{count} sekundami'
         },
         :x_seconds => {
           :one => 'sekundou',
           :other => '%{count} sekundami'
         },
         :less_than_x_minutes => {
-          :one => 'před necelou minutou',
-          :other => 'před ani ne %{count} minutami'
+          :one => 'necelou minutou',
+          :other => 'ani ne %{count} minutami'
         },
         :x_minutes => {
           :one => 'minutou',
@@ -179,12 +179,12 @@ end
           :other => 'asi %{count} roky'
         },
         :over_x_years => {
-          :one => 'více než před rokem',
+          :one => 'více než rokem',
           :other => 'více než %{count} roky'
         },
         :almost_x_years => {
-          :one => 'téměř před rokem',
-          :other => 'téměř před %{count} roky'
+          :one => 'téměř rokem',
+          :other => 'téměř %{count} roky'
         }
       }
     },