diff --git a/Gemfile.lock b/Gemfile.lock
index 845a64f4f001d20482b7492522891f40fe7867f2..4964285599d45398e1e9ae2ec5867889e0a39ba3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -310,7 +310,7 @@ GEM
       activesupport (= 3.0.11)
       bundler (~> 1.0)
       railties (= 3.0.11)
-    rails-i18n (0.3.0)
+    rails-i18n (0.4.0)
       i18n (~> 0.5)
     railties (3.0.11)
       actionpack (= 3.0.11)
diff --git a/config/locales/devise/devise.ko.yml b/config/locales/devise/devise.ko.yml
index b678e11dd6ad172ea1f092723a874d3f97852cf9..3265c38e5c348bf67ebe964913d817349622a1f5 100644
--- a/config/locales/devise/devise.ko.yml
+++ b/config/locales/devise/devise.ko.yml
@@ -20,7 +20,7 @@ ko:
       unauthenticated: "더 나아가려면 로그인하거나 가입해야 합니다."
       unconfirmed: "더 나아가기 전에 계정을 확인해야 합니다."
     invitations:
-      invitation_token_invalid: "초대장 토큰이 유효하지 않습니다!"
+      invitation_token_invalid: "죄송합니다! 초대장 토큰이 유효하지 않습니다."
       send_instructions: "초대장을 보냈습니다"
       updated: "암호를 성공적으로 바꾼 뒤 로그인했습니다."
     mailer:
diff --git a/config/locales/devise/devise.nl.yml b/config/locales/devise/devise.nl.yml
index 440109d422f5a0b7592bc965deb497ee89c8ca0d..5792c93e61aa6f17eb12438e26c4f675690e929e 100644
--- a/config/locales/devise/devise.nl.yml
+++ b/config/locales/devise/devise.nl.yml
@@ -20,7 +20,7 @@ nl:
       unauthenticated: "Log in of registreer om verder te gaan."
       unconfirmed: "Activeer je account om verder te gaan."
     invitations:
-      invitation_token_invalid: "De opgegeven uitnodigingstoken is ongeldig!"
+      invitation_token_invalid: "Onze excuses! Die uitnodigingstoken is ongeldig."
       send_instructions: "Je uitnodiging is verzonden."
       updated: "Wachtwoord succesvol veranderd. Je bent nu ingelogd."
     mailer:
@@ -34,13 +34,14 @@ nl:
         arrived: "Het sociale netwerk waar je op hebt gewacht is hier. Vernieuwd, veiliger, leuker, %{strong_diaspora} is laat je het web op een hele nieuwe manier delen en verkennen."
         be_yourself: "Wees jezelf"
         be_yourself_paragraph: "Het Internet heeft unieke nieuwe manieren mogelijk gemaakt om onszelf te uiten. %{strong_diaspora} laat jou jezelf zijn en laat jou delen hoe je dat wilt, met of zonder je echte naam."
-        displaying_correctly: "Ziet deze e-mail er niet goed uit? %{link} in jouw browser"
+        displaying_correctly: "Ziet deze e-mail er niet goed uit? %{link}"
         email_us: "Voor algemene vragen of hulp met je Diaspora account kun je een e-mail sturen naar %{email}."
         finally: "Eindelijk - het is er"
         friends_saying: "Wat je vrienden zeggen..."
         get_connected_paragraph: "Als internationale beweging met een gedeelde visie voor een beter web, is de community het belangrijkste kenmerk van %{strong_diaspora}. Ontmoet nieuwe mensen, connect met vrienden, en join the fun."
         have_fun: "Veel plezier"
         have_fun_paragraph: "%{strong_diaspora} draait helemaal om het online ontdekken van geweldige content en mensen. %{link}, 's werelds eerste %{strong_diaspora} toepassing is nog maar het begin. Verzamel en deel het web in al zijn glorie."
+        help_fund: "Help ons Diaspora te financieren."
         here: hier
         ignore: "Als je de uitnodiging niet wilt accepteren, negeer dan deze E-mail."
         join_team: "Sluit je aan bij ons Team"
@@ -52,7 +53,7 @@ nl:
         sign_up_now: "Meld je nu aan →"
         subject: "Je bent uitgenodigd om lid te worden van Diaspora!"
         unsubscribe: "Om je af te melden, klik %{link}."
-        view_in: "View in"
+        view_in: "Toon het in je browser."
       inviter:
         accept_at: "op %{url}, je kunt deze accepteren via onderstaande link."
         have_invited_you: "%{names} hebben je uitgenodigd om lid te worden van Diaspora"
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index b97c7fd1b341fab056e08d73f8e4ef35b0e3363d..363e86f494c238882de638e5e9142416bcb6f7ce 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -304,13 +304,6 @@ ar:
         other: "%{count} كرهو هذا"
         two: "%{count} كرها"
         zero: "لا أحد يكره هذا"
-      people_like_this:
-        few: "%{count} إعجابات"
-        many: "%{count} إعجابًا"
-        one: "إعجابٌ واحد"
-        other: "%{count} إعجابًا"
-        two: "%{count} إعجابان"
-        zero: "لا إعجابات"
       people_like_this_comment:
         few: "%{count} إعجابات"
         many: "%{count} إعجابًا"
@@ -318,6 +311,13 @@ ar:
         other: "%{count} إعجاب"
         two: "%{count} أعجبهما"
         zero: "لا إعجابات"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: محدود
   more: أكثر
   next: التالي
@@ -722,9 +722,7 @@ ar:
     stream_element:
       dislike: "لم يعجبني"
       hide_and_mute: "أخـفِ وأسكـتْ"
-      like: أعجبني
       shared_with: "مُشَارك مع: %{aspect_names}"
-      unlike: "إلغاء إعجابي"
       via: "بواسطة %{link}"
       viewable_to_anyone: "يستطيع أي شخص على الشابكة رؤية هذه المشاركة."
   status_messages:
@@ -753,8 +751,14 @@ ar:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       title: "Your Mentions"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     tags:
       contacts_title: "People who dig these tags"
   tag_followings:
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index 38d2351da83b9c85be3933a9f1677dea646dfcbc..b05bfad1cfd0027ec7a5e7c067a9c52d5dd71ff0 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -199,6 +199,8 @@ bg:
       many_people_are_you_sure: "Наистина ли желаете да започнете частен разговор с повече от %{suggested_limit} контакта? Публикация в аспекта е по-подходящ начин за свързване с толкова хора."
       my_contacts: "Моите контакти"
       no_contacts: "Изглежда трябва да добавите контакти!"
+      no_contacts_message: "Проверете %{community_spotlight}"
+      no_contacts_message_with_aspect: "Проверете %{community_spotlight} или %{add_to_aspect_link}"
       only_sharing_with_me: "Само споделящите с мен"
       remove_person_from_aspect: "Премахване на %{person_name} от \"%{aspect_name}\""
       start_a_conversation: "Начало на разговор"
@@ -301,6 +303,7 @@ bg:
       to: До
   layouts:
     application:
+      back_to_top: Нагоре
       powered_by: "Благодарение на DIASPORA*"
       public_feed: "Публична емисия от Diaspora за %{name}"
       toggle: "вкл./изкл. на мобилния изглед"
@@ -325,13 +328,6 @@ bg:
         other: "не е харесана %{count} пъти"
         two: "не е харесана %{count} пъти"
         zero: "всички са я харесали"
-      people_like_this:
-        few: "харесана %{count} пъти"
-        many: "харесана %{count} пъти"
-        one: "харесана %{count} път"
-        other: "харесана %{count} пъти"
-        two: "харесана %{count} пъти"
-        zero: "не е харесана"
       people_like_this_comment:
         few: "харесан %{count} пъти"
         many: "харесан %{count} пъти"
@@ -339,6 +335,13 @@ bg:
         other: "харесан %{count} пъти"
         two: "харесан %{count} пъти"
         zero: "не е харесан"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Ограничена
   more: Още
   next: следваща
@@ -567,12 +570,12 @@ bg:
       not_found: "За съжаление публикацията не може да бъде намерена."
       permalink: "постоянен адрес"
       photos_by:
-        few: "%{count} photos by %{author}"
-        many: "%{count} photos by %{author}"
-        one: "One photo by %{author}"
-        other: "%{count} photos by %{author}"
-        two: "Two photos by %{author}"
-        zero: "No photos by %{author}"
+        few: "%{count} снимки от %{author}"
+        many: "%{count} снимки от %{author}"
+        one: "1 снимка от %{author}"
+        other: "%{count} снимки от %{author}"
+        two: "2 снимки от %{author}"
+        zero: "Няма снимки от %{author}"
   previous: предишна
   privacy: Поверителност
   privacy_policy: "Декларация за поверителност"
@@ -760,10 +763,8 @@ bg:
       hide_and_mute: "Скриване и прекратяване на известяването за публикацията"
       ignore_user: "Игнориране на %{name}"
       ignore_user_description: "Игнориране и премахване на потребителя от всички аспекти?"
-      like: "Харесва ми"
       nsfw: "Публикацията Не е Подходяща за Работното Място (NSFW), според автора. %{link}"
       shared_with: "Споделена с: %{aspect_names}"
-      unlike: "Не ми харесва"
       via: "чрез %{link}"
       viewable_to_anyone: "Публикацията е видима за всеки"
   status_messages:
@@ -865,7 +866,6 @@ bg:
       wrong_password: "Въведената парола не съвпада с текущата парола на акаунта."
     edit:
       also_commented: "...някой коментира публикация на ваш контакт?"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: Промяна
       change_email: "Промяна на ел. поща"
       change_language: "Промяна на езика"
@@ -887,6 +887,7 @@ bg:
       edit_account: "Настройки на акаунта"
       email_awaiting_confirmation: "Изпратена е връзка за активиране до %{unconfirmed_email}. Докато не я активирате ще бъде ползвана старата ел. поща (%{email})."
       export_data: "Сваляне на..."
+      following: "Следните настройки"
       liked: "...някой хареса ваша публикация?"
       mentioned: "...бъдете споменат в публикация?"
       new_password: "Нова парола"
@@ -934,4 +935,7 @@ bg:
       settings_updated: "Настройките са обновени"
       unconfirmed_email_changed: "Ел. поща е променена. Необходимо е да я активирате."
       unconfirmed_email_not_changed: "Ел. поща не бе променена"
-  welcome: "Привет от Diaspora,"
\ No newline at end of file
+  welcome: "Привет от Diaspora,"
+  will_paginate:
+    next_label: "следваща »"
+    previous_label: "« предишна"
\ No newline at end of file
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 4b24389ceb5b004cb8a5d9889a4e1ec24526dce1..7106658bfaca727a58ba41b44cbdff45c44082e7 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -154,13 +154,6 @@ br:
         other: "%{count} den n'int ket bet plijet ganti"
         two: "%{count} dislikes"
         zero: "no people disliked this"
-      people_like_this:
-        few: "%{count} den zo bet plijet ganti"
-        many: "%{count} den zo bet plijet ganti"
-        one: "1 den zo bet plijet ganti"
-        other: "%{count} den zo bet plijet ganti"
-        two: "%{count} likes"
-        zero: "den ebet zo bet plijet ganti"
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -168,6 +161,13 @@ br:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   more: Muioc'h
   no_results: "Disoc'h Ebet"
   notifications:
@@ -433,7 +433,6 @@ br:
     stream_element:
       dislike: "Ne blij ket din"
       hide_and_mute: "Hide and Mute"
-      like: "Plij' ra din"
   status_messages:
     helper:
       no_message_to_display: "Kemennadenn ebet da ziskouez."
@@ -454,8 +453,14 @@ br:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       title: "Your Mentions"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     tags:
       contacts_title: "People who dig these tags"
   tag_followings:
@@ -489,6 +494,7 @@ br:
         what_we_delete: "We delete all of your posts, profile data, as soon as humanly possible. Your comments will hang around, but be associated with your Diaspora Handle."
       current_password: "Ho Ker-Kuzh"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
+      liked: "...someone likes your post?"
       new_password: "Ger-Kuzh Nevez"
       your_email: "Ho postel"
       your_handle: "Ho skor diaspora"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 07d4a686b603642deaca12a4257a98927c8d63f9..0e66cec8a9f79173099ea490d1cb3a27b1e832e3 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -298,13 +298,6 @@ cs:
         other: "%{count} lidem se to nelíbí"
         two: "%{count} dislikes"
         zero: "žádná záporná hodnocení"
-      people_like_this:
-        few: "%{count} lidem se to líbí"
-        many: "%{count} lidem se to líbí"
-        one: "1 osobě se to líbí"
-        other: "%{count} lidem se to líbí"
-        two: "%{count} likes"
-        zero: "žádná kladná hodnocení"
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -312,6 +305,13 @@ cs:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Omezený
   more: Více
   next: další
@@ -713,9 +713,7 @@ cs:
       dislike: "to se mi nelíbí"
       hide_and_mute: "Hide and Mute"
       ignore_user: "Ignorovat %{name}"
-      like: "to se mi líbí"
       shared_with: "Sdíleno s: %{aspect_names}"
-      unlike: "to se mi už nelíbí"
       via: "skrz %{link}"
       viewable_to_anyone: "Tento příspěvek je viditelný komukoli na webu"
   status_messages:
@@ -751,8 +749,14 @@ cs:
       add_a_tag: "Přidat štítek"
       title: "#Sledované štítky"
     followed_tags_stream: "#Sledované štítky"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       title: "Your Mentions"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     tags:
       contacts_title: "People who dig these tags"
   tag_followings:
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index fef594800c6825b36bac0675ed736abc3d7d0c46..bbf60da270aeafbf77018f6842f71278f37a8598 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -157,13 +157,6 @@ cy:
         other: "%{count} people disliked this"
         two: "%{count} dislikes"
         zero: "no people disliked this"
-      people_like_this:
-        few: "%{count} people liked this"
-        many: "%{count} people liked this"
-        one: "1 unigolyn yn hoffi hyn"
-        other: "%{count} pobl yn hoffi hyn"
-        two: "%{count} likes"
-        zero: "no people liked this"
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -171,6 +164,13 @@ cy:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Cyfyngedig
   next: nesaf
   notifications:
@@ -457,8 +457,6 @@ cy:
       connect_to_comment: "Cysylltu i ddefnyddiwr hwn i sylwi ar eu swydd"
       dislike: "'Dwi ddim yn hoffi hyn"
       hide_and_mute: "Hide and Mute"
-      like: "Dwi'n hoffi hyn"
-      unlike: "Dim hoffi"
       viewable_to_anyone: "Mae'r post hon yn weladwy i unrhyw un ar y we"
   status_messages:
     helper:
@@ -487,6 +485,9 @@ cy:
       add_a_tag: "Ychwanegu tag"
       title: "#Tagiau ddilynwyd"
     followed_tags_stream: "#Tagiau ddilynwyd"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       title: "Your Mentions"
     multi:
@@ -522,6 +523,7 @@ cy:
       download_xml: "llwytho i lawr fy xml"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Data Allforio"
+      liked: "...someone likes your post?"
       new_password: "Cyfrinair newydd "
       receive_email_notifications: "Receive email notificaions?"
       reshared: "...rhywun yn rhannu eich post?"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 853f340f2e0451ae31437f083e34ff35d12c782c..610bc50fa0f672918c57de0454d159cb83d27a9e 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -292,6 +292,7 @@ da:
     new:
       already_invited: "Følgende personer har ikke accepteret din invitation:"
       aspect: Aspekt
+      check_out_diaspora: "Check Diaspora ud!"
       comma_seperated_plz: "Du kan indtaste flere e-mailadresser adskilt med komma."
       if_they_accept_info: "hvis de accepterer, vil de blive tilføjet til det aspekt du inviterede dem til."
       invite_someone_to_join: "Invitér en person til Diaspora!"
@@ -324,13 +325,6 @@ da:
         other: "%{count} synes ikke om"
         two: "%{count} synes ikke om"
         zero: "ingen synes ikke om"
-      people_like_this:
-        few: "%{count} synes om"
-        many: "%{count} synes om"
-        one: "Én synes om"
-        other: "%{count} synes om"
-        two: "%{count} synes om"
-        zero: "ingen synes om"
       people_like_this_comment:
         few: "%{count} synes om"
         many: "%{count} synes om"
@@ -338,6 +332,13 @@ da:
         other: "%{count} synes om"
         two: "%{count} synes om"
         zero: "ingen synes om"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Begrænset
   more: Mere
   next: Næste
@@ -763,11 +764,9 @@ da:
       hide_and_mute: "Skjul indlægget og dets kommentarer"
       ignore_user: "Ignorer %{name}"
       ignore_user_description: "Ignorer og fjern bruger fra alle aspekter?"
-      like: "Synes om"
       nsfw: "Dette indlæg er markeret af forfatteren som 'uegnet til arbejdsvisning'. %{link}"
       shared_with: "Delt med: %{aspect_names}"
       show: vis
-      unlike: "Synes ikke om"
       viewable_to_anyone: "Dette indlæg er synlig for alle på internettet"
   status_messages:
     create:
@@ -816,8 +815,10 @@ da:
       contacts_title: "Personer der har nævnt dig"
       title: "Dine omtaler"
     multi:
-      contacts_title: "Personer i din Strøm"
-      title: Strøm
+      contacts_title: "Personer i din Udforskningsstrøm"
+      title: Udforsk
+    participate:
+      title: Deltag
     public:
       contacts_title: "Seneste indlæg"
       title: "Offentlig Aktivitet"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 1c48024e576cfb30421001f3dbb3c269575723a9..5d3ea19d6481a48cb5961cdd3609193246c24636 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -202,7 +202,7 @@ de:
       add_to_aspect: "Füge Kontakte zu %{name} hinzu"
       add_to_aspect_link: "füge Kontakte zu »%{name}« hinzu"
       all_contacts: "Alle Kontakte"
-      community_spotlight: Gemeinschafts-Schaukasten
+      community_spotlight: Gemeinschafts-Focus
       many_people_are_you_sure: "Bist du dir sicher, dass du eine private Unterhaltung mit mehr als %{suggested_limit} Kontakten beginnen möchtest? Einen Beitrag in diesen Aspekt zu schreiben könnte ein besserer Weg sein, um sie zu kontaktieren."
       my_contacts: "Meine Kontakte"
       no_contacts: "Sieht so aus, als müsstest du einige Kontakte hinzufügen!"
@@ -300,8 +300,9 @@ de:
     new:
       already_invited: "Die folgenden Personen haben deine Einladung nicht angenommen:"
       aspect: Aspekt
+      check_out_diaspora: "Erkunde Diaspora!"
       comma_seperated_plz: "Du kannst mehrere E-Mail-Adressen durch Trennen mit Kommata eintragen."
-      if_they_accept_info: "Wenn sie akzeptieren, werden sie zu dem Aspekt hinzugefügt, in den du sie eingeladen hast."
+      if_they_accept_info: "Wenn sie deine Einladung annehmen, werden sie zu dem Aspekt hinzugefügt, in den du sie eingeladen hast."
       invite_someone_to_join: "Lade jemanden zu Diaspora ein!"
       language: Sprache
       personal_message: "Persönliche Nachricht"
@@ -336,13 +337,6 @@ de:
         other: "%{count} Personen gefällt das nicht"
         two: "%{count} Personen gefällt das nicht"
         zero: "Keinem gefällt das nicht"
-      people_like_this:
-        few: "%{count} Personen gefällt das"
-        many: "%{count} Personen gefällt das"
-        one: "Einer Person gefällt das"
-        other: "%{count} Personen gefällt das"
-        two: "%{count} Personen gefällt das"
-        zero: "Keinem gefällt das"
       people_like_this_comment:
         few: "Gefällt %{count}"
         many: "Gefällt %{count}"
@@ -350,6 +344,13 @@ de:
         other: "Gefällt %{count}"
         two: "Gefällt %{count}"
         zero: "Gefällt niemandem"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Begrenzt
   more: Mehr
   next: Nächste
@@ -518,7 +519,7 @@ de:
       remove_contact: "Kontakt entfernen"
       remove_from: "%{name} aus %{aspect} entfernen?"
     show:
-      closed_account: "Dieser Konto wurde geschlossen."
+      closed_account: "Dieses Konto wurde geschlossen."
       does_not_exist: "Diese Person existiert nicht!"
       has_not_shared_with_you_yet: "%{name} hat bisher noch keine Beiträge mit dir geteilt!"
       ignoring: "Du ignorierst alle Beiträge von %{name}."
@@ -714,11 +715,11 @@ de:
   shared:
     add_contact:
       add_new_contact: "Einen neuen Kontakt hinzufügen"
-      create_request: "Finde mittels Diaspora ID"
+      create_request: "Mittels Diaspora-ID finden"
       diaspora_handle: diaspora@beispiel.org
-      enter_a_diaspora_username: "Gib einen Diaspora-Benutzernamen ein:"
+      enter_a_diaspora_username: "Gib bitte einen Diaspora-Benutzernamen ein:"
       know_email: "Du kennst die E-Mail-Adresse? Sende eine Einladung!"
-      your_diaspora_username_is: "Dein Diaspora Nutzername ist: %{diaspora_handle}"
+      your_diaspora_username_is: "Dein Diaspora-Nutzername ist: %{diaspora_handle}"
     aspect_dropdown:
       add_to_aspect: "Kontakt hinzufügen"
       toggle:
@@ -780,11 +781,9 @@ de:
       hide_and_mute: "Beitrag verbergen und stummschalten"
       ignore_user: "%{name} ignorieren"
       ignore_user_description: "Diesen Benutzer ignorieren und aus allen Aspekten entfernen?"
-      like: "Gefällt mir"
       nsfw: "Dieser Post wurde vom Autor als NSFW markiert. %{link}"
       shared_with: "Geteilt mit: %{aspect_names}"
       show: zeigen
-      unlike: "Gefällt mir nicht mehr"
       viewable_to_anyone: "Dieser Beitrag ist für jeden im Web sichtbar"
   status_messages:
     create:
@@ -818,7 +817,7 @@ de:
     comment_stream:
       contacts_title: "Leute, deren Beiträge du kommentiert hast"
       title: "Kommentierte Beiträge"
-    community_spotlight_stream: Gemeinschafts-Schaukasten
+    community_spotlight_stream: Gemeinschafts-Fokus
     followed_tag:
       add_a_tag: "Füge einen Tag hinzu"
       contacts_title: "Leute, denen diese Tags gefallen"
@@ -834,6 +833,9 @@ de:
       title: "@Erwähnungen"
     multi:
       contacts_title: "Personen in deinem Stream"
+      title: Stream
+    participate:
+      title: Teilnehmen
     public:
       contacts_title: "Aktuelle Poster"
       title: "Öffentliche Aktivität"
diff --git a/config/locales/diaspora/de_formal.yml b/config/locales/diaspora/de_formal.yml
index 60d4fa2b79e7758577b2d21ced4ed6cd51330c1d..a9b2a934017f2f994b4c4e04251e63c2f9466f87 100644
--- a/config/locales/diaspora/de_formal.yml
+++ b/config/locales/diaspora/de_formal.yml
@@ -329,13 +329,6 @@ de_formal:
         other: "%{count} Personen gefällt das nicht"
         two: "%{count} Personen gefällt das nicht"
         zero: "Keinem gefällt das nicht"
-      people_like_this:
-        few: "%{count} Personen gefällt das"
-        many: "%{count} Personen gefällt das"
-        one: "Einer Person gefällt das"
-        other: "%{count} Personen gefällt das"
-        two: "%{count} Personen gefällt das"
-        zero: "Keinem gefällt das"
       people_like_this_comment:
         few: "Gefällt %{count}"
         many: "Gefällt %{count}"
@@ -343,6 +336,13 @@ de_formal:
         other: "Gefällt %{count}"
         two: "%{count} Personen gefällt das"
         zero: "Gefällt niemandem"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Begrenzt
   more: Mehr
   next: Nächste
@@ -765,9 +765,7 @@ de_formal:
       hide_and_mute: "Verbergen und stummschalten"
       ignore_user: "%{name} ignorieren"
       ignore_user_description: "Benutzer ignorieren und aus allen Aspekten entfernen?"
-      like: "Gefällt mir"
       shared_with: "Geteilt mit: %{aspect_names}"
-      unlike: "Gefällt mir nicht mehr"
       viewable_to_anyone: "Dieser Beitrag ist für jeden im Web sichtbar"
   status_messages:
     create:
@@ -805,12 +803,16 @@ de_formal:
       follow: Folgen
       title: "#Gefolgte Tags"
     followed_tags_stream: "#Gefolgte Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Erwähnungen"
     mentions:
       contacts_title: "Personen, die Sie erwähnt haben"
       title: "Ihre Erwähnungen"
     multi:
       contacts_title: "Personen in Ihrem Stream"
+      title: Stream
     public:
       contacts_title: "Aktuelle Poster"
       title: "Öffentliche Aktivität"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 483eda7deddeb5e79ed86dd9fb2bdac35d754bc0..ad235423847b9255782022f40c82bdba7e10f2e3 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -320,13 +320,6 @@ el:
         other: "Δεν αρέσει σε %{count} άτομα"
         two: "δεν αρέσει σε %{count}"
         zero: "κανένας δεν ανέφερε ότι δεν του αρέσει"
-      people_like_this:
-        few: "Αρέσει σε %{count} άτομα"
-        many: "Αρέσει σε %{count} άτομα"
-        one: "Αρέσει σε 1 άτομο"
-        other: "Αρέσει σε %{count} άτομα"
-        two: "αρέσει σε %{count}"
-        zero: "δεν αρέσει σε κανέναν"
       people_like_this_comment:
         few: "Αρέσει σε %{count} χρήστες"
         many: "Αρέσει σε %{count} χρήστες"
@@ -334,6 +327,13 @@ el:
         other: "Αρέσει σε %{count} χρήστες"
         two: "αρέσει σε %{count}"
         zero: "Δεν αρέσει σε κανέναν "
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Περιορισμένο
   more: Περισσότερα
   next: επόμενο
@@ -760,11 +760,9 @@ el:
       hide_and_mute: "Απόκρυψη και σίγαση δημοσίευσης"
       ignore_user: "Αγνόηση %{name}"
       ignore_user_description: "Αγνόηση και αφαίρεση χρήστη από όλες τις πτυχές;"
-      like: "Μου αρέσει"
       nsfw: "Αυτή η δημοσίευση έχει σημανθεί ως μη ασφαλής για δουλειά από τον δημιουργό της. %{link}"
       shared_with: "Διαμοιρασμένο με: %{aspect_names}"
       show: εμφάνισε
-      unlike: "Δεν μου αρέσει"
       via: "μέσω %{link}"
       viewable_to_anyone: "Αυτή η δημοσίευση είναι εμφανής σε όλους στο διαδίκτυο"
   status_messages:
@@ -808,6 +806,7 @@ el:
     followed_tags_stream: "#Ετικέτες που ακολουθείτε"
     like_stream:
       contacts_title: "Χρήστες των οποίων αναρτήσεις σας αρέσουν"
+      title: "Like Stream"
     mentioned_stream: "@Αναφορές"
     mentions:
       contacts_title: "Άτομα που σας έχουν αναφέρει"
diff --git a/config/locales/diaspora/en_1337.yml b/config/locales/diaspora/en_1337.yml
index 0991f60149a8c98e4ec0a4966f39afa9655626bb..e69edf3d356892df7b93d6cd72a65c05f22786bc 100644
--- a/config/locales/diaspora/en_1337.yml
+++ b/config/locales/diaspora/en_1337.yml
@@ -297,13 +297,6 @@ en_1337:
         other: "%{count} </3"
         two: "%{count} </3"
         zero: "N0 </3"
-      people_like_this:
-        few: "%{count} <3"
-        many: "%{count} <3"
-        one: "%{count} <3"
-        other: "%{count} <3"
-        two: "%{count} <3"
-        zero: "N0 <3"
       people_like_this_comment:
         few: "%{count} <3"
         many: "%{count} <3"
@@ -311,6 +304,13 @@ en_1337:
         other: "%{count} <3"
         two: "%{count} <3"
         zero: "N0 <3"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: V1P
   more: M0R3
   next: N3X7
@@ -714,9 +714,7 @@ en_1337:
     stream_element:
       dislike: PWN
       hide_and_mute: "H1D3 4ND PWN"
-      like: <3
       shared_with: "5H4R3D W17H: %{aspect_names}"
-      unlike: </3
       via: "V14 %{link}"
       viewable_to_anyone: "7H15 5P4M 15 V13W4BL3 2 4NY0N3 1N 7H3 W3B!"
   status_messages:
@@ -745,9 +743,15 @@ en_1337:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       contacts_title: "N00B5 WH0 M3N710N3D U"
       title: "Y0UR M3N710N5"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     tags:
       contacts_title: "N00B5 WH0 D1G 7H353 74G5"
       title: "5P4M 74GG3D: %{tags}"
diff --git a/config/locales/diaspora/en_pirate.yml b/config/locales/diaspora/en_pirate.yml
index b15705d218f6e01d54a5ca14a0983a575cb584a9..17d3f012272bf7e6051cfc978d64d9af2d1d8559 100644
--- a/config/locales/diaspora/en_pirate.yml
+++ b/config/locales/diaspora/en_pirate.yml
@@ -113,13 +113,6 @@ en_pirate:
         other: "%{count} dislikes"
         two: "%{count} dislikes"
         zero: "no dislikes"
-      people_like_this:
-        few: "%{count} likes"
-        many: "%{count} likes"
-        one: "%{count} like"
-        other: "%{count} likes"
-        two: "%{count} likes"
-        zero: "no likes"
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -127,6 +120,13 @@ en_pirate:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   notifications:
     also_commented:
       few: "%{actors} also commented on %{post_author}'s %{post_link}."
@@ -320,8 +320,14 @@ en_pirate:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       title: "Your Mentions"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     tags:
       contacts_title: "People who dig these tags"
   tag_followings:
@@ -336,6 +342,7 @@ en_pirate:
       auto_follow_back: "Automatically follow back if a someone follows you"
       close_account:
         what_we_delete: "We delete all of your posts, profile data, as soon as humanly possible. Your comments will hang around, but be associated with your Diaspora Handle."
+      liked: "...someone likes your post?"
       your_handle: "Your diaspora id"
     getting_started:
       what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
\ No newline at end of file
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 0ffd3dac331bfe54f7c705de1bc24a34e16ee0bb..66a1fd9ec99cdc2b61b9326ced334c0ad1c9e21e 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -267,13 +267,6 @@ en_shaw:
         other: "%{count} 𐑛𐑦𐑕𐑤𐑲𐑒𐑕"
         two: "%{count} dislikes"
         zero: "𐑯𐑴 𐑛𐑦𐑕𐑤𐑲𐑒𐑕"
-      people_like_this:
-        few: "%{count} 𐑤𐑲𐑒𐑕"
-        many: "%{count} 𐑤𐑲𐑒𐑕"
-        one: "%{count} 𐑤𐑲𐑒"
-        other: "%{count} 𐑤𐑲𐑒𐑕"
-        two: "%{count} likes"
-        zero: "𐑯𐑴 𐑤𐑲𐑒𐑕"
       people_like_this_comment:
         few: "%{count} 𐑤𐑲𐑒𐑕"
         many: "%{count} 𐑤𐑲𐑒𐑕"
@@ -281,6 +274,13 @@ en_shaw:
         other: "%{count} 𐑤𐑲𐑒𐑕"
         two: "%{count} likes"
         zero: "𐑯𐑴 𐑤𐑲𐑒𐑕"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: 𐑤𐑦𐑥𐑦𐑑𐑩𐑛
   more: 𐑥𐑹
   next: 𐑯𐑧𐑒𐑕𐑑
@@ -670,9 +670,7 @@ en_shaw:
     stream_element:
       dislike: 𐑛𐑦𐑕𐑤𐑲𐑒
       hide_and_mute: "Hide and Mute"
-      like: 𐑤𐑲𐑒
       shared_with: "𐑖𐑺𐑛 𐑢𐑦𐑞: %{aspect_names}"
-      unlike: 𐑩𐑯𐑤𐑲𐑒
       via: "𐑝𐑾 %{link}"
       viewable_to_anyone: "𐑞𐑦𐑕 𐑐𐑴𐑕𐑑 𐑦𐑟 𐑝𐑿𐑩𐑚𐑩𐑤 𐑑 𐑧𐑯𐑦𐑢𐑩𐑯 𐑪𐑯 𐑞 𐑢𐑧𐑚"
   status_messages:
@@ -701,8 +699,14 @@ en_shaw:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       title: "Your Mentions"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     tags:
       contacts_title: "People who dig these tags"
   tag_followings:
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 3d499e49fb1b501829226c722cb6b3765953cc3c..f38a6dc77f0579402220aa109b933001d675625f 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -327,13 +327,6 @@ eo:
         other: "%{count} malŝatantoj"
         two: "%{count} malŝatadoj"
         zero: "neniuj ŝatantoj"
-      people_like_this:
-        few: "%{count} ŝatantoj"
-        many: "%{count} ŝatantoj"
-        one: "%{count} ŝatanto"
-        other: "%{count} ŝatantoj"
-        two: "%{count} ŝatadoj"
-        zero: "neniuj ŝatantoj"
       people_like_this_comment:
         few: "%{count} ŝatadoj"
         many: "%{count} ŝatadoj"
@@ -341,6 +334,13 @@ eo:
         other: "%{count} ŝatadoj"
         two: "%{count} ŝatadoj"
         zero: "neniu ŝatado"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Limita
   more: Pli
   next: sekva
@@ -765,9 +765,7 @@ eo:
       hide_and_mute: "Kaŝi kaj muti afiŝon"
       ignore_user: "Ignori %{name}"
       ignore_user_description: "Ignori kaj forigi uzanton de ĉiuj aspektoj?"
-      like: Åœati
       shared_with: "Partoprenita kun: %{aspect_names}"
-      unlike: "Ne plu ŝati"
       via: "per %{link}"
       viewable_to_anyone: "Tiu ĉi afiŝo videblas de iu ajn en la reto"
   status_messages:
@@ -806,6 +804,9 @@ eo:
       follow: Sekvi
       title: "#Sekvataj etikedoj"
     followed_tags_stream: "#Sekvataj etikedoj"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mencioj"
     mentions:
       contacts_title: "Homoj, kiuj menciis vin"
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index 2950cb90cd5574f8ec118f7b19903547e35c333c..e46d60128ce1d02a6b6204f9947969b159ee8989 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -331,13 +331,6 @@ es-AR:
         other: "%{count} les disgusta"
         two: "a %{count} no les gusta"
         zero: "a nadie le disgusta"
-      people_like_this:
-        few: "%{count} les gusta"
-        many: "%{count} les gusta"
-        one: "%{count} le gusta"
-        other: "%{count} les gusta"
-        two: "a %{count} les gusta"
-        zero: "a nadie le gusta"
       people_like_this_comment:
         few: "a %{count} le gusta"
         many: "a %{count} le gusta"
@@ -345,6 +338,13 @@ es-AR:
         other: "a %{count} le gusta"
         two: "a %{count} les gusta"
         zero: "a nadie le gusta esto"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Limitado
   more: Más
   next: siguiente
@@ -770,9 +770,7 @@ es-AR:
       hide_and_mute: "Ignorar la publicación"
       ignore_user: "Ignorar a %{name}"
       ignore_user_description: "¿Ignorar y quitar al usuario de todos los aspectos?"
-      like: "Me gusta"
       shared_with: "Compartido con: %{aspect_names}"
-      unlike: "No me gusta"
       via: "vía %{link}"
       viewable_to_anyone: "Esta publicación puede ser vista por cualquiera en la web"
   status_messages:
@@ -823,6 +821,7 @@ es-AR:
       title: "@Menciones"
     multi:
       contacts_title: "Personas en tu Stream"
+      title: Stream
     public:
       contacts_title: "Autores recientes"
       title: "Actividad Pública"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 6ab1f9a43a8f27fd5ee3dc963f96ccdb3cfea85b..9fb00b602ae9d91f6a98351ed7c4c1cda9a6089e 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -323,13 +323,6 @@ es-CL:
         other: "%{count} personas no les gusta esto"
         two: "%{count} no me gusta"
         zero: "a ninguna persona le disgusta esto"
-      people_like_this:
-        few: "%{count} personas les gusta esto"
-        many: "%{count} personas les gusta esto"
-        one: "1 persona le gusta esto"
-        other: "%{count} personas les gusta esto"
-        two: "%{count} likes"
-        zero: "a nadie le gusta esto aun"
       people_like_this_comment:
         few: "a %{count} les gusta esto"
         many: "a %{count} les gusta esto"
@@ -337,6 +330,13 @@ es-CL:
         other: "a %{count} les gusta esto"
         two: "%{count} me gusta"
         zero: "a nadie le gusta esto aun"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Restringido
   more: Más
   next: Siguiente
@@ -760,9 +760,7 @@ es-CL:
       hide_and_mute: "Ignorar este post"
       ignore_user: "Ignorar a %{name}"
       ignore_user_description: "Ignorar y remover al usuario de todos tus aspectos?"
-      like: "Me gusta esto"
       shared_with: "Compartir con: %{aspect_names}"
-      unlike: "No me gusta"
       viewable_to_anyone: "Este post es visible para cualquiera en la web"
   status_messages:
     create:
@@ -812,6 +810,7 @@ es-CL:
       title: "@Menciones"
     multi:
       contacts_title: "Gente en tu Stream"
+      title: Stream
     public:
       contacts_title: "Posters recientes"
       title: "Actividad publica"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 5d323523e2567d00a07abcf406bde38620af1ec3..f07275e68b8ada33d94990c4e1e2a0f8fd920f4b 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -201,6 +201,7 @@ es:
     index:
       add_a_new_aspect: "Añade un nuevo aspecto"
       add_to_aspect: "añade contactos a %{name}"
+      add_to_aspect_link: "añadir contactos a %{name}"
       all_contacts: "Todos los contactos"
       community_spotlight: "Comunidad Creativa"
       many_people_are_you_sure: "¿Estás seguro que quieres comenzar una conversación privada con más de %{suggested_limit} contactos? Publicar en sus aspectos podría ser mejor para contactar con ellos."
@@ -328,26 +329,26 @@ es:
   likes:
     likes:
       people_dislike_this:
-        few: "A %{count} no les gusta"
-        many: "A %{count} no les gusta"
-        one: "A 1 persona no le gusta"
-        other: "A %{count} no les gusta"
-        two: "A %{count} personas no les gusta"
-        zero: "A nadie le disgusta"
-      people_like_this:
-        few: "A %{count} les gusta"
-        many: "A %{count} les gusta"
-        one: "A 1 persona le gusta"
-        other: "A %{count} les gusta"
-        two: "A %{count} personas les gusta"
-        zero: "A nadie le gusta"
+        few: "%{count} no quisieron marcarla"
+        many: "%{count} no quisieron marcarla"
+        one: "1 persona no quiso marcarla"
+        other: "%{count} no quieron marcarla"
+        two: "%{count} no quieron marcarla"
+        zero: "No quieron marcarla"
       people_like_this_comment:
-        few: "A %{count} personas les gusta"
-        many: "A %{count} personas les gusta"
-        one: "A %{count} persona le gusta"
-        other: "A %{count} personas les gusta"
-        two: "A %{count} personas les gusta"
-        zero: "sin votos"
+        few: "%{count} personas lo marcaron"
+        many: "%{count} personas lo marcaron"
+        one: "%{count} persona lo marcó"
+        other: "%{count} personas lo marcaron"
+        two: "%{count} personas lo marcaron"
+        zero: "Nadie lo marcó"
+      people_pin_this:
+        few: "%{count} marcas"
+        many: "%{count} marcas"
+        one: "%{count} marca"
+        other: "%{count} marcas"
+        two: "%{count} marcas"
+        zero: "ninguna marca"
   limited: Restringido
   more: Más
   next: siguiente
@@ -394,19 +395,19 @@ es:
       mark_all_as_read: "Marcar todo como leído"
       notifications: Notificaciones
     liked:
-      few: "A %{actors} les gustó tu %{post_link}."
-      many: "A %{actors} les gustó tu %{post_link}."
-      one: "A %{actors} le gustó tu %{post_link}."
-      other: "A %{actors} les gustó tu %{post_link}."
-      two: "A %{actors} les gustó tu %{post_link}."
-      zero: "A %{actors} le gustó tu %{post_link}."
+      few: "%{actors} marcaron tu %{post_link}."
+      many: "%{actors} marcaron tu %{post_link}."
+      one: "%{actors} marcó tu %{post_link}."
+      other: "%{actors} marcaron tu %{post_link}."
+      two: "%{actors} marcaron tu %{post_link}."
+      zero: "%{actors} marcaron tu %{post_link}."
     liked_post_deleted:
-      few: "%{actors} les gustó una publicación eliminada."
-      many: "%{actors} les gustó una publicación eliminada."
-      one: "%{actors} le gustó una publicación eliminada."
-      other: "%{actors} les gustó una publicación eliminada."
-      two: "%{actors} le gusta tu publicación eliminada."
-      zero: "%{actors} le gustó una publicación eliminada."
+      few: "%{actors} marcaron una publicación eliminada."
+      many: "%{actors} marcaron una publicación eliminada."
+      one: "%{actors} marcó una publicación eliminada."
+      other: "%{actors} marcaron una publicación eliminada."
+      two: "%{actors} marcaron una publicación eliminada."
+      zero: "%{actors} marcó una publicación eliminada."
     mentioned:
       few: "%{actors} te han mencionado en una %{post_link}."
       many: "%{actors} te han mencionado en una %{post_link}."
@@ -461,7 +462,7 @@ es:
     email_sent_by_diaspora: "Este email fue enviado por Diaspora*. Si te gustaría dejar de recibir emails como este,"
     hello: "¡Hola %{name}!"
     liked:
-      liked: "a %{name} le gustó tu publicación"
+      liked: "%{name} marcó tu publicación"
       view_post: "Ver comentario >"
     mentioned:
       mentioned: "te mencionó en una publicación:"
@@ -742,7 +743,7 @@ es:
     notification:
       new: "Nuevo %{type} de %{from}"
     public_explain:
-      atom_feed: "fuentes Atom"
+      atom_feed: "canal Atom"
       control_your_audience: "Controla tu Audiencia"
       logged_in: "conectado a %{service}"
       manage: "gestión de servicios conectados"
@@ -777,11 +778,11 @@ es:
       hide_and_mute: "Ignorar la publicación"
       ignore_user: "Ignorar a %{name}"
       ignore_user_description: "¿Ignorar y quitar a esa persona de todos los aspectos?"
-      like: "Me gusta"
       nsfw: "Esta publicación es considerada por su autor como no segura para ciertos entornos de trabajo (#NSFW - Not safe for work). %{link}"
+      pin: Marca
       shared_with: "Compartido con: %{aspect_names}"
       show: mostrar
-      unlike: "No me gusta"
+      unpin: Desmarcar
       via: "vía %{link}"
       viewable_to_anyone: "Esta publicación podrá verla cualquiera en internet"
   status_messages:
@@ -824,7 +825,7 @@ es:
       title: "#Etiquetas"
     followed_tags_stream: "#Etiquetas seguidas"
     like_stream:
-      contacts_title: "Gente cuyas publicaciones te gustan"
+      contacts_title: "Gente cuyas publicaciones marcaste"
       title: "Me gusta"
     mentioned_stream: "@Menciones"
     mentions:
@@ -833,6 +834,8 @@ es:
     multi:
       contacts_title: "Gente en tu Entrada"
       title: Entrada
+    participate:
+      title: Participar
     public:
       contacts_title: "Publicadores recientes"
       title: "Actividad Pública"
@@ -908,7 +911,7 @@ es:
       export_data: "Exportar datos"
       following: "Ajustes de Seguimiento"
       getting_started: "Preferencias del Nuevo Usuario"
-      liked: "...a alguien le gusta tu publicación?"
+      liked: "...alguien marcó tu publicación?"
       mentioned: "...eres mencionad@ en una publicación?"
       new_password: "Nueva contraseña"
       photo_export_unavailable: "Exportar fotos no está disponible actualmente"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 14531f93d6573d859b6406198bf47273f46a4c43..f0deb8f3410b2db8f3caaf35b77dc0e2747c4d8e 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -327,13 +327,6 @@ eu:
         other: "%{count} pertsonek ez dute hau gustuko"
         two: "%{count} dislikes"
         zero: "gustuko ez duen pertsonarik ez"
-      people_like_this:
-        few: "%{count} pertsonek gustuko dute hau"
-        many: "%{count} pertsonek gustuko dute hau"
-        one: "%{count}ek du gustuko"
-        other: "%{count} pertsonek gustuko dute hau"
-        two: "%{count}(e)k gustuko dute"
-        zero: "oraindik ez du inork gustuko"
       people_like_this_comment:
         few: "%{count}(e)k gustuko dute"
         many: "%{count}(e)k gustuko dute"
@@ -341,6 +334,13 @@ eu:
         other: "%{count}(e)k gustuko dute"
         two: "%{count}(e)k gustuko dute"
         zero: "inork ez du gustuko"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Mugatua
   more: Gehiago
   next: hurrengoa
@@ -769,11 +769,9 @@ eu:
       hide_and_mute: "Ezkutatu eta isildu mezua"
       ignore_user: "Sahiestu %{name}"
       ignore_user_description: "Sahiestu eta ezabatu erabiltzailea arlo guztietatik?"
-      like: "Gustoko dut"
       nsfw: "Mezu hau NSFW gisa markatu du egileak. %{link}"
       shared_with: "%{aspect_names}(r)kin partekatua"
       show: erakutsi
-      unlike: "Ez dut gustuko"
       via: "%{link}(r)en bidez"
       viewable_to_anyone: "Mezu hau edonork ikusi dezake Interneten"
   status_messages:
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index e71389ffd31d1403320b59e64d2903a12d4ad554..31977576440f396f9b8ace95bf0968baf7b4956c 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -328,13 +328,6 @@ fi:
         other: "%{count} ei tykkää"
         two: "%{count} ei tykkää"
         zero: "no people disliked this"
-      people_like_this:
-        few: "%{count} tykkää"
-        many: "%{count} tykkää"
-        one: "%{count} tykkää"
-        other: "%{count} tykkää"
-        two: "%{count} tykkää"
-        zero: "ei tykkäyksiä"
       people_like_this_comment:
         few: "%{count} tykkää"
         many: "%{count} tykkää"
@@ -342,6 +335,13 @@ fi:
         other: "%{count} tykkää"
         two: "%{count} tykkää"
         zero: "ei tykkäyksiä"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Rajoitettu
   more: Lisää
   next: seuraava
@@ -761,10 +761,8 @@ fi:
       hide_and_mute: "Piilota ja vaimenna viesti"
       ignore_user: "Sivuuta %{name}"
       ignore_user_description: "Sivuuta käyttäjä ja poista hänet kaikista näkymistä?"
-      like: Tykkää
       shared_with: "Jaettu heidän kanssaan: %{aspect_names}"
       show: näytä
-      unlike: "Peru tykkäys"
       via: "%{link} kautta"
       viewable_to_anyone: "Kuka tahansa verkossa näkee tämän viestin"
   status_messages:
diff --git a/config/locales/diaspora/fil.yml b/config/locales/diaspora/fil.yml
index f90908f7999abf89913a32d7a9f244fbbf87d91b..24f45af3c0f8d2c55cf694fdc6b0e7be7727ba45 100644
--- a/config/locales/diaspora/fil.yml
+++ b/config/locales/diaspora/fil.yml
@@ -147,13 +147,6 @@ fil:
         other: "%{count} dislikes"
         two: "%{count} dislikes"
         zero: "no dislikes"
-      people_like_this:
-        few: "%{count} likes"
-        many: "%{count} likes"
-        one: "%{count} like"
-        other: "%{count} likes"
-        two: "%{count} likes"
-        zero: "no likes"
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -161,6 +154,13 @@ fil:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Limitado
   notifications:
     also_commented:
@@ -368,8 +368,14 @@ fil:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       title: "Your Mentions"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     tags:
       contacts_title: "People who dig these tags"
   tag_followings:
@@ -383,6 +389,7 @@ fil:
     edit:
       close_account:
         what_we_delete: "We delete all of your posts, profile data, as soon as humanly possible. Your comments will hang around, but be associated with your Diaspora Handle."
+      liked: "...someone likes your post?"
       your_handle: "Your diaspora id"
     getting_started:
       what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index aa3ce1964b7537f5918f190722c6d9e6dd611dde..4b135bb08f1ffa440cc7397cae816276c8c3dc14 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -195,10 +195,14 @@ fr:
     index:
       add_a_new_aspect: "Ajouter un nouvel aspect"
       add_to_aspect: "ajouter les contacts à %{name}"
+      add_to_aspect_link: "ajoutez les contacts à %{name}"
       all_contacts: "Tous les contacts"
+      community_spotlight: "Actualités de la communauté"
       many_people_are_you_sure: "Êtes-vous sûr de vouloir commencer une conversation privée avec plus de %{suggested_limit} contacts? Envoyer des messages à cet aspect peut être un meilleur moyen de les contacter."
       my_contacts: "Mes Contacts"
       no_contacts: "On dirait que vous avez besoin d'ajouter quelques contacts !"
+      no_contacts_message: "Consultez %{community_spotlight}"
+      no_contacts_message_with_aspect: "Consultez %{community_spotlight} ou %{add_to_aspect_link}"
       only_sharing_with_me: "Partage uniquement avec moi"
       remove_person_from_aspect: "Enlever %{person_name} de \"%{aspect_name}\""
       start_a_conversation: "Démarrer une conversation"
@@ -289,6 +293,7 @@ fr:
       your_account_awaits: "Votre compte vous attend !"
     new:
       already_invited: "Les personnes suivantes n'ont pas accepté votre invitation :"
+      check_out_diaspora: "Essayez Diaspora !"
       comma_seperated_plz: "Vous pouvez entrer plusieurs adresses de courrier électronique séparées par des virgules."
       if_they_accept_info: "s'ils acceptent, ils seront ajoutés à l'aspect dans lequel vous les avez invités."
       invite_someone_to_join: "Inviter quelqu'un à rejoindre Diaspora !"
@@ -322,13 +327,6 @@ fr:
         other: "%{count} personnes n'aiment pas"
         two: "%{count} n'aiment pas"
         zero: "Personne n'aime pas"
-      people_like_this:
-        few: "%{count} personnes aiment"
-        many: "%{count} personnes aiment"
-        one: "%{count} personne aime"
-        other: "%{count} personnes aiment"
-        two: "%{count} aiment"
-        zero: "Personne n'aime ça"
       people_like_this_comment:
         few: "%{count} aiment"
         many: "%{count} aiment"
@@ -336,6 +334,13 @@ fr:
         other: "%{count} aiment"
         two: "%{count} aiment"
         zero: "personne n'aime"
+      people_pin_this:
+        few: "Épinglé %{count} fois"
+        many: "Épinglé %{count} fois"
+        one: "Épinglé %{count} fois"
+        other: "Épinglé %{count} fois"
+        two: "Épinglé %{count} fois"
+        zero: "Pas encore épinglé"
   limited: Limité
   more: Plus
   next: suivant
@@ -381,19 +386,19 @@ fr:
         zero: "et personne d'autre"
       mark_all_as_read: "Tout marquer comme lu"
     liked:
-      few: "%{actors} ont aimé votre %{post_link}."
-      many: "%{actors} ont aimé votre %{post_link}."
-      one: "%{actors} a aimé votre %{post_link}."
-      other: "%{actors} ont aimé votre %{post_link}."
-      two: "%{actors} ont aimé votre %{post_link}."
-      zero: "%{actors} n'a aimé votre %{post_link}."
+      few: "%{actors} ont épinglé votre %{post_link}."
+      many: "%{actors} ont épinglé votre %{post_link}."
+      one: "%{actors} a épinglé votre %{post_link}."
+      other: "%{actors} ont épinglé votre %{post_link}."
+      two: "%{actors} ont épinglé votre %{post_link}."
+      zero: "%{actors} n'a épinglé votre %{post_link}."
     liked_post_deleted:
-      few: "%{actors} ont aimé votre message supprimé."
-      many: "%{actors} ont aimé votre message supprimé."
-      one: "%{actors} a aimé votre message supprimé."
-      other: "%{actors} a/ont aimé votre message supprimé."
-      two: "%{actors} aiment le message que vous avez supprimé."
-      zero: "%{actors} a/ont aimé votre message supprimé."
+      few: "%{actors} ont épinglé votre message supprimé."
+      many: "%{actors} ont épinglé votre message supprimé."
+      one: "%{actors} a épinglé votre message supprimé."
+      other: "%{actors} a/ont épinglé votre message supprimé."
+      two: "%{actors} ont épinglé le message que vous avez supprimé."
+      zero: "%{actors} a/ont épinglé votre message supprimé."
     mentioned:
       few: "%{actors} vous ont mentionné(e) dans un %{post_link}."
       many: "%{actors} vous ont mentionné(e) dans un %{post_link}."
@@ -448,7 +453,7 @@ fr:
     email_sent_by_diaspora: "Ce courriel a été envoyé par Diaspora. Si vous ne souhaitez plus recevoir des courriels de ce genre,"
     hello: "Bonjour %{name} !"
     liked:
-      liked: "%{name} aime votre message"
+      liked: "%{name} a épinglé votre message"
       view_post: "Voir le message >"
     mentioned:
       mentioned: "vous a mentionné(e) dans un message :"
@@ -727,6 +732,7 @@ fr:
     notification:
       new: "Nouveau/nouvelle %{type} de %{from}"
     public_explain:
+      atom_feed: "Flux Atom"
       control_your_audience: "Contrôlez votre audience"
       logged_in: "connecté(e) à %{service}"
       manage: "gérer les services connectés"
@@ -761,11 +767,11 @@ fr:
       hide_and_mute: "Masquer et mettre le message en sourdine"
       ignore_user: "Ignorez %{name}"
       ignore_user_description: "Ignorez et supprimer l'utilisateur de tous les aspects ?"
-      like: J'aime
       nsfw: "Le message a été marqué par son auteur comme étant EXPLICITE. %{link}"
+      pin: Épingler
       shared_with: "Partagé avec : %{aspect_names}"
       show: montrer
-      unlike: "Je n'aime plus"
+      unpin: "Ne plus épingler"
       viewable_to_anyone: "Publication visible par n'importe qui sur le web"
   status_messages:
     create:
@@ -806,13 +812,15 @@ fr:
       title: "#Tags Suivis"
     followed_tags_stream: "#Tags Suivis"
     like_stream:
-      contacts_title: "Personnes dont vous aimez les commentaires"
-      title: "Flux de \"J'aime\""
+      contacts_title: "Personnes dont vous avec épinglé les commentaires"
+      title: "Flux des éléments épinglés"
     mentions:
       contacts_title: "Personnes qui vous ont mentionné"
     multi:
-      contacts_title: "Personnes dans votre flux"
-      title: Flux
+      contacts_title: "Personnes dans votre flux d'exploration"
+      title: Explorer
+    participate:
+      title: Participer
     public:
       contacts_title: "Posteurs récents"
       title: "Activité publique"
@@ -887,7 +895,7 @@ fr:
       export_data: "Exporter des données"
       following: "Paramètres de suivi"
       getting_started: "Préférences de nouvel utilisateur"
-      liked: "... quelqu'un aime votre message ?"
+      liked: "... quelqu'un a épinglé votre message ?"
       mentioned: "…vous êtes mentionné(e) dans une publication ?"
       new_password: "Nouveau mot de passe"
       photo_export_unavailable: "L'exportation des photos est actuellement indisponible"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 152060496f5489f902fe57c35383e403bd0af176..d1185459f115d3becf5d4aaef1637222bc2dda02 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -174,13 +174,6 @@ ga:
         other: "%{count} people disliked this"
         two: "%{count} dislikes"
         zero: "no people disliked this"
-      people_like_this:
-        few: "%{count} people liked this"
-        many: "%{count} people liked this"
-        one: "1 person liked this"
-        other: "%{count} people liked this"
-        two: "%{count} likes"
-        zero: "no people liked this"
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -188,6 +181,13 @@ ga:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   next: "ar aghaidh"
   notifications:
     also_commented:
@@ -506,7 +506,6 @@ ga:
     stream_element:
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
-      like: "I like this"
   status_messages:
     helper:
       no_message_to_display: "Níl aon teachtaireacht chun taispeáint."
@@ -527,8 +526,14 @@ ga:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       title: "Your Mentions"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     tags:
       contacts_title: "People who dig these tags"
   tag_followings:
@@ -559,6 +564,7 @@ ga:
       edit_account: "Athraigh cúntas"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Easpórtáil Sonraí"
+      liked: "...someone likes your post?"
       new_password: "Pasfhocal nua"
       receive_email_notifications: "Fháil fógraí ríomhphost?"
       your_email: "Do seola ríomhphost"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 4feb69231a1b4473ec67628fd1101f03bf7dd3a6..f16fd0bd431e35da26bce688f7788ad6abe85fcc 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -337,13 +337,6 @@ he:
         other: "%{count} אנשים לא אוהבים את זה"
         two: "%{count} לא מתעניין"
         zero: "אין אנשים שלא אהבו את זה"
-      people_like_this:
-        few: "%{count} אנשים אהבו את זה"
-        many: "%{count} אנשים אהבו את זה"
-        one: "אדם אחד אהב את זה"
-        other: "%{count} אנשים אהבו את זה"
-        two: "%{count} מתעניין"
-        zero: "אף אחד לא אהב את זה"
       people_like_this_comment:
         few: "%{count} אהבו זאת"
         many: "%{count} אהבו זאת"
@@ -351,6 +344,13 @@ he:
         other: "%{count} אהבו"
         two: "%{count} מתעניין"
         zero: "אף אחד לא אהב"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: מוגבל
   more: המשך
   next: הבאה
@@ -785,11 +785,9 @@ he:
       hide_and_mute: "הסתר והשתק"
       ignore_user: " %{name} התעלם"
       ignore_user_description: "?התעלם והסר את המשתמש מכל תחומי העניין"
-      like: אהבתי
       nsfw: "%{link}על ידי הכותב NSFW הרשומה הזאת סומנה כ"
       shared_with: "משותף עם: %{aspect_names}"
       show: הצג
-      unlike: "לא אהבתי"
       via: "באמצעות %{link}"
       viewable_to_anyone: "רשומה זו ניתנת לצפייה לכל גולשי הרשת"
   status_messages:
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index e6f387e7ab1a992eaaa31cf0387eb4b96660766d..82cd7f665fc07dceaf3a5b1ef297b6017bb83b2a 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -48,6 +48,7 @@ hu:
       video_title:
         unknown: "Ismeretlen videó cím"
   are_you_sure: "Biztos vagy benne?"
+  are_you_sure_delete_account: "Biztos, hogy le akarod zárni a fiókodat?"
   aspect_memberships:
     destroy:
       failure: "Személy törlése a csoportból sikertelen"
@@ -199,10 +200,14 @@ hu:
     index:
       add_a_new_aspect: "Új csoport"
       add_to_aspect: "Kapcsolatok hozzáadása %{name}"
+      add_to_aspect_link: "ismerősök hozzáadása: %{name}"
       all_contacts: "Összes ismerős"
+      community_spotlight: "Közösségi Reflektorfény"
       many_people_are_you_sure: "Biztos, hogy privát beszélgetést akarsz kezdeményezni több mint %{suggested_limit} személlyel? Talán jobb lenne, ha bejegyzést írnál ennek a csoportnak."
       my_contacts: Kapcsolataim
       no_contacts: "Nincs ismerősöd."
+      no_contacts_message: "Csekkold le ezt is: %{community_spotlight}"
+      no_contacts_message_with_aspect: "Csekkold le ezt is %{community_spotlight} vagy ezt %{add_to_aspect_link}"
       only_sharing_with_me: "Csak velem oszt meg"
       remove_person_from_aspect: "%{person_name} eltávolítása a(z) \"%{aspect_name}\" csoportból."
       start_a_conversation: "Beszélgetés indítása"
@@ -303,6 +308,7 @@ hu:
       to: Címzett
   layouts:
     application:
+      back_to_top: "Vissza az elejére"
       powered_by: "DIASPORA* fordította ADAMEX"
       public_feed: "Nyílvános Diaspora hírfolyam neki: %{name}"
       toggle: "mobil változat"
@@ -326,13 +332,6 @@ hu:
         other: "%{count} nem kedveli"
         two: "%{count} embernek nem tetszik"
         zero: "nincs negatív visszajelzés"
-      people_like_this:
-        few: "%{count} személy kedveli"
-        many: "%{count} személy kedveli"
-        one: "1 személy kedveli"
-        other: "%{count} személy kedveli"
-        two: "%{count} ember kedveli"
-        zero: "senki nem kedveli"
       people_like_this_comment:
         few: "%{count} kedveli"
         many: "%{count} kedveli"
@@ -340,6 +339,13 @@ hu:
         other: "%{count} tetszik"
         two: "%{count} ember kedveli"
         zero: "nincs 'tetszik'"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Korlátozott
   more: BÅ‘vebben
   next: következő
@@ -509,6 +515,7 @@ hu:
       remove_contact: "kapcsolat törlése"
       remove_from: "Törlöd %{name}-t a %{aspect} csoportból?"
     show:
+      closed_account: "Ez a fiók zárolva lett."
       does_not_exist: "Személy nem létezik!"
       has_not_shared_with_you_yet: "%{name} még nem oszt meg veled semmit."
       ignoring: "Figyelmen kívül hagyod az összes bejegyzést tőle: %{name}."
@@ -569,12 +576,13 @@ hu:
       destroy: Töröl
       not_found: "Bocsi, de nem találjuk a bejegyzést."
       photos_by:
-        few: "%{count} photos by %{author}"
-        many: "%{count} photos by %{author}"
-        one: "One photo by %{author}"
-        other: "%{count} photos by %{author}"
-        two: "Two photos by %{author}"
-        zero: "No photos by %{author}"
+        few: "%{count} fénykép tőle: %{author}"
+        many: "%{count} fénykép tőle: %{author}"
+        one: "Egy fénykép tőle: %{author}"
+        other: "%{count} fénykép tőle: %{author}"
+        two: "Két fénykép tőle: %{author}"
+        zero: "Nincs fénykép tőle: %{author}"
+      reshare_by: "Újraosztva általa: %{author}"
   previous: előző
   privacy: Adatvédelem
   privacy_policy: Adatvédelem
@@ -768,9 +776,9 @@ hu:
       hide_and_mute: "Bejegyzés elrejtése és némítása"
       ignore_user: "Mellőz: %{name}"
       ignore_user_description: "A felhasználó eltávolítása és mellőzése az összes körből?"
-      like: Tetszik
+      nsfw: "Ez a bejegyzés \"nem biztonságos\" jelölést kapott a szerzőjétől. %{link}"
       shared_with: "Megosztva vele: %{aspect_names}"
-      unlike: "Nem tetszik"
+      show: megmutat
       via: "ezen keresztül: %{link}"
       viewable_to_anyone: "Ez a bejegyzés bárki számára megtekinthető az interneten."
   status_messages:
@@ -812,7 +820,10 @@ hu:
       follow: Követ
       title: "#követett címkék"
     followed_tags_stream: "#Követett címkék"
-    mentioned_stream: "@említéses"
+    like_stream:
+      contacts_title: "Ismerősök, akiknek kedveled a bejegyzéseit"
+      title: Kedveled
+    mentioned_stream: "@említések"
     mentions:
       contacts_title: "Emberek, akik megemlítettek"
       title: "@Megemlítettek"
@@ -829,6 +840,7 @@ hu:
   tag_followings:
     create:
       failure: "#%{name} követése nem sikerült. Talán már eddig is követted?"
+      none: "Nem követhetsz egy üres címkét!"
       success: "Hurrá! Figyelemmel követed #%{name} dolgait."
     destroy:
       failure: "Hiba #%{name} követésének leállításakor. Talán már nem is követed őt? "
@@ -843,6 +855,7 @@ hu:
       people_tagged_with: "Személy felcímkézve: %{tag}"
       posts_tagged_with: "Bejegyzések felcímkézve: #%{tag}"
       stop_following: "Címke-követés leállítása #%{tag}"
+  terms_and_conditions: "Felhasználási feltételek"
   tokens:
     show:
       connect_to_cubbies: "Csatlakozás ehhez: Cubbi.es"
@@ -866,12 +879,22 @@ hu:
       wrong_password: "A megadott jelszó nem felel meg."
     edit:
       also_commented: "...más is hozzászólt az ismerősöd bejegyzéséhez?"
+      auto_follow_aspect: "Csoport az automatikusan követett felhasználóknak:"
+      auto_follow_back: "Automatikusan követsz valakit, ha ő követ téged"
       change: Módosítás
       change_email: "Email megváltoztatása"
       change_language: "Nyelv megváltoztatása"
       change_password: "Jelszó módosítása"
       close_account:
-        what_we_delete: "We delete all of your posts, profile data, as soon as humanly possible. Your comments will hang around, but be associated with your Diaspora Handle."
+        dont_go: "Hé, kérlek ne menj!"
+        if_you_want_this: "Ha tényleg ezt akarod, írd be a jelszavad és kattints a \"Fiók bezárása\" gombra."
+        lock_username: "Le tudod védeni a felhasználóneved, ha esetleg mégis úgy döntenél, hogy újra regisztrálsz."
+        locked_out: "Ki leszel léptetve."
+        make_diaspora_better: "Ha el akarod hagyni az oldalt, kérlek olvasd el mi fog következni."
+        mr_wiggles: "Vuk szomorú lesz, mert lát téged elmenni."
+        no_turning_back: "Nincs visszaút."
+        what_we_delete: "Töröljük az összes bejegyzésedet és profil adataidat amint tudjuk. A kommentjeid megmaradnak."
+      close_account_text: "Fiók bezárása"
       comment_on_post: "...valaki hozzászólt egy bejegyzésedhez?"
       current_password: "Jelenlegi jelszó"
       download_photos: "Képeim letöltése"
@@ -879,6 +902,7 @@ hu:
       edit_account: "Fiók szerkesztése"
       email_awaiting_confirmation: "Aktivációs link elküldve ide: %{unconfirmed_email}. Amíg nem erősíted meg az új címed, addig a régit használjuk: %{email}."
       export_data: "Adatok exportálása"
+      following: "Követési beállítások"
       getting_started: "Új felhasználó beállítások"
       liked: "... valakinek tetszik a bejegyzésed?"
       mentioned: "...meg vagy említve egy bejegyzésben?"
@@ -919,6 +943,8 @@ hu:
       does_not_exist: "%{username} nem létezik!"
     update:
       email_notifications_changed: "E-mail értesítések módosítva"
+      follow_settings_changed: "Követési beállítások megváltoztak"
+      follow_settings_not_changed: "Követési beállítások megváltoztatása sikertelen."
       language_changed: "Nyelv megváltozott"
       language_not_changed: "Nyelv megváltoztatása nem sikerült"
       password_changed: "A jelszó megváltozott, már bejelentkezhetsz az új jelszóval."
@@ -933,4 +959,7 @@ hu:
     no_person_constructed: "Ebből a hCard névjegyből nem lehet személyt létrehozni."
     not_enabled: "a webfinger nincs engedélyezve %{account} kiszolgálóján"
     xrd_fetch_failed: "%{account} fiókjából nem sikerült az XRD kiolvasása"
-  welcome: Ãœdv!
\ No newline at end of file
+  welcome: Ãœdv!
+  will_paginate:
+    next_label: "következő &raquo;"
+    previous_label: "&laquo; előző"
\ No newline at end of file
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index cd619de8d43b3520d5a2bfb6fa73e377d904d886..8b77d01d1e06850a61bf634b7b44e63344c150f5 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -137,13 +137,6 @@ id:
         other: "%{count} people disliked this"
         two: "%{count} dislikes"
         zero: "no people disliked this"
-      people_like_this:
-        few: "%{count} people liked this"
-        many: "%{count} people liked this"
-        one: "1 person liked this"
-        other: "%{count} people liked this"
-        two: "%{count} likes"
-        zero: "no people liked this"
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -151,6 +144,13 @@ id:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   notifications:
     also_commented:
       few: "%{actors} also commented on %{post_author}'s %{post_link}."
@@ -389,7 +389,6 @@ id:
     stream_element:
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
-      like: "I like this"
   status_messages:
     helper:
       no_message_to_display: "Tidak ada pesan yang dapat ditampilkan."
@@ -410,8 +409,14 @@ id:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       title: "Your Mentions"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     tags:
       contacts_title: "People who dig these tags"
   tag_followings:
@@ -438,6 +443,7 @@ id:
       download_photos: "Unduh foto-fotoku"
       download_xml: "Unduh xmlku"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
+      liked: "...someone likes your post?"
       new_password: "New Password"
       receive_email_notifications: "Receive email notificaions?"
       your_handle: "Your diaspora handle"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 32d08c696e0833af0b749f39caac86f6f6e19448..6608c07a9022577d325391c51eb873e0e09811dd 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -210,13 +210,6 @@ is:
         other: "%{count} people disliked this"
         two: "%{count} dislikes"
         zero: "no people disliked this"
-      people_like_this:
-        few: "%{count} people liked this"
-        many: "%{count} people liked this"
-        one: "1 person liked this"
-        other: "%{count} people liked this"
-        two: "%{count} likes"
-        zero: "no people liked this"
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -224,6 +217,13 @@ is:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   more: Meira
   next: næsta
   notifications:
@@ -561,7 +561,6 @@ is:
     stream_element:
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
-      like: "I like this"
   status_messages:
     destroy:
       failure: "Ekki tókst að eyða færslu"
@@ -584,8 +583,14 @@ is:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       title: "Your Mentions"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     tags:
       contacts_title: "People who dig these tags"
   tag_followings:
@@ -614,6 +619,7 @@ is:
       current_password: "Núverandi lykilorð"
       edit_account: "Breyta notandastillingum"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
+      liked: "...someone likes your post?"
       new_password: "Nýtt lykilorð"
       receive_email_notifications: "Fá tilkynningar í tölvupósti?"
       your_email: "Netfangið þitt"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index b732fb2eaf2a0e69433140b5ee46453cfc33ce49..df18b0a34e2488d39fa9cfea71f14b0c795069bd 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -121,7 +121,7 @@ it:
         title: "Saluta i nuovi arrivati"
       no_contacts: "Nessun contatto"
       no_tags: "+ Cerca tag da seguire"
-      people_sharing_with_you: "Persone in condivisione con te"
+      people_sharing_with_you: "Persone che condividono con te"
       post_a_message: "invia un messaggio >>"
       services:
         content: "Puoi collegare i seguenti servizi a Diaspora:"
@@ -198,10 +198,14 @@ it:
     index:
       add_a_new_aspect: "Aggiungi un aspetto"
       add_to_aspect: "aggiungi i contatti a %{name}"
+      add_to_aspect_link: "aggiungi contatti a %{name}"
       all_contacts: "Tutti i contatti"
+      community_spotlight: "in evidenza"
       many_people_are_you_sure: "Stai inviando un messaggio privato a più di %{suggested_limit} contatti. Vuoi farlo davvero? Forse potrebbe essere più opportuno pubblicarlo su un aspetto!"
       my_contacts: "I miei contatti"
       no_contacts: "Probabilmente devi aggiungere qualche contatto!"
+      no_contacts_message: "Guarda gli utenti %{community_spotlight}"
+      no_contacts_message_with_aspect: "Guarda gli utenti %{community_spotlight} oppure %{add_to_aspect_link}"
       only_sharing_with_me: "Condividono con me"
       remove_person_from_aspect: "Rimuovi %{person_name} da \"%{aspect_name}\""
       start_a_conversation: "Inizia una conversazione"
@@ -293,6 +297,7 @@ it:
     new:
       already_invited: "Le seguenti persone non hanno accettato il tuo invito:"
       aspect: Aspetto
+      check_out_diaspora: "Prova Diaspora!"
       comma_seperated_plz: "Puoi inserire più indirizzi email separati da virgole."
       if_they_accept_info: "se accettano, saranno aggiunti all'aspetto in cui li hai invitati."
       invite_someone_to_join: "Invita qualcuno ad entrare in Diaspora!"
@@ -304,6 +309,7 @@ it:
       to: A
   layouts:
     application:
+      back_to_top: "Torna all'inizio"
       powered_by: "CREATO CON DIASPORA*"
       public_feed: "Feed pubblici Diaspora di %{name}"
       toggle: "attiva/disattiva versione mobile"
@@ -326,13 +332,6 @@ it:
         other: "%{count} Non mi piace"
         two: "%{count} non mi piace"
         zero: "0 Non mi piace"
-      people_like_this:
-        few: "%{count} Mi piace"
-        many: "%{count} Mi piace"
-        one: "%{count} Mi piace"
-        other: "%{count} Mi piace"
-        two: "%{count} mi piace"
-        zero: "0 Mi piace"
       people_like_this_comment:
         few: "%{count} mi piace"
         many: "%{count} mi piace"
@@ -340,6 +339,13 @@ it:
         other: "%{count} mi piace"
         two: "%{count} mi piace"
         zero: "0 mi piace"
+      people_pin_this:
+        few: "%{count} annota"
+        many: "%{count} annota"
+        one: "%{count} annota"
+        other: "%{count} annota"
+        two: "%{count} annota"
+        zero: "0 annota"
   limited: "Non pubblico"
   more: Altro
   next: successivo
@@ -386,19 +392,19 @@ it:
       mark_all_as_read: "Segna come lette"
       notifications: Notifiche
     liked:
-      few: "A %{actors} piace il tuo %{post_link}."
-      many: "A %{actors} piace il tuo %{post_link}."
-      one: "A %{actors} piace il tuo %{post_link}."
-      other: "A %{actors} piace il tuo %{post_link}."
-      two: "A %{actors} piace il tuo %{post_link}."
-      zero: "A %{actors} piace il tuo %{post_link}."
+      few: "%{actors} hanno annotato il tuo %{post_link}."
+      many: "%{actors} hanno annotato il tuo %{post_link}."
+      one: "%{actors} ha annotato il tuo %{post_link}."
+      other: "%{actors} hanno annotato il tuo %{post_link}."
+      two: "%{actors} hanno annotato il tuo %{post_link}."
+      zero: "%{actors} hanno annotato il tuo %{post_link}."
     liked_post_deleted:
-      few: "A %{actors} piaceva il messaggio che hai eliminato."
-      many: "A %{actors} piaceva il messaggio che hai eliminato."
-      one: "A %{actors} piaceva il messaggio che hai eliminato."
-      other: "A %{actors} piaceva il messaggio che hai eliminato."
-      two: "A %{actors} piaceva il post che hai eliminato."
-      zero: "A %{actors} piaceva il messaggio che hai eliminato."
+      few: "%{actors} avevano annotato il post che hai eliminato."
+      many: "%{actors} avevano annotato il post che hai eliminato."
+      one: "%{actors} aveva annotato il post che hai eliminato."
+      other: "%{actors} avevano annotato il post che hai eliminato."
+      two: "%{actors} avevano annotato il post che hai eliminato."
+      zero: "%{actors} avevano annotato il post che hai eliminato."
     mentioned:
       few: "%{actors} ti hanno menzionato in un %{post_link}."
       many: "%{actors} ti hanno menzionato in un %{post_link}."
@@ -452,7 +458,7 @@ it:
     email_sent_by_diaspora: "Questo messaggio è stato spedito da Diaspora.  Se preferisci smettere di ricevere questo tipo di email,"
     hello: "Ciao %{name}!"
     liked:
-      liked: "A %{name} piace il tuo post"
+      liked: "%{name} ha annotato un tuo post"
       view_post: "Leggi il post >"
     mentioned:
       mentioned: "ti ha menzionato in un post:"
@@ -471,6 +477,7 @@ it:
       view_profile: "Guarda il profilo di %{name}"
     thanks: "Grazie,"
     to_change_your_notification_settings: "per cambiare le opzioni delle notifiche"
+  nsfw: "NSFW (non adatto ad un luogo di lavoro)"
   or: o
   password_confirmation: "Conferma password"
   people:
@@ -583,6 +590,8 @@ it:
       first_name: Nome
       last_name: Cognome
       update_profile: "Aggiorna Profilo"
+      you_are_nsfw: "Hai impostato tutti i tuoi messaggi come non adatti ad un luogo di lavoro (NSFW), i tuoi contenuti non compariranno alle persone che non vogliono ricevere materiale sconveniente."
+      you_are_safe_for_work: "Hai impostato il tuo utente come \"sicuro\", cioè i contenuti che invierai rispetteranno le linee guida della comunità."
       your_bio: "La tua biografia"
       your_birthday: "Il tuo compleanno"
       your_gender: Sesso
@@ -763,11 +772,11 @@ it:
       hide_and_mute: "Nascondi il post e disattiva le notifiche"
       ignore_user: "Ignora %{name}"
       ignore_user_description: "Vuoi ignorare questo utente e rimuoverlo da tutti gli aspetti?"
-      like: "Mi piace"
-      nsfw: "Questo post è stato marcato dall'autore come non adatto a un luogo di lavoro (NSFW). %{link}"
+      nsfw: "Questo post è stato dichiarato dal suo autore non adatto a un luogo di lavoro (NSFW). %{link}"
+      pin: Annota
       shared_with: "Condiviso con: %{aspect_names}"
       show: mostra
-      unlike: Annulla
+      unpin: "Non annotare"
       viewable_to_anyone: "Questo post è visibile a tutti sul web"
   status_messages:
     create:
@@ -809,14 +818,17 @@ it:
       title: "#Tag che segui"
     followed_tags_stream: "#Tag che segui"
     like_stream:
-      contacts_title: "Persone di cui ti piacciono i post"
-      title: "Post preferiti"
+      contacts_title: "Autori dei post annotati"
+      title: "Post annotati"
     mentioned_stream: "@Menzioni"
     mentions:
       contacts_title: "Persone che ti hanno menzionato"
       title: "@Menzioni"
     multi:
-      contacts_title: "Persone nel tuo stream"
+      contacts_title: "Persone in Esplora"
+      title: Esplora
+    participate:
+      title: Partecipa
     public:
       contacts_title: "Chi ha postato di recente"
       title: "Attività pubblica"
@@ -891,7 +903,7 @@ it:
       export_data: "Esporta Dati"
       following: "Impostazioni dei contatti"
       getting_started: "Preferenze nuovo utente"
-      liked: "...a qualcuno piace un tuo post?"
+      liked: "...qualcuno annota un tuo post?"
       mentioned: "...sei menzionato in un post?"
       new_password: "Nuova password"
       photo_export_unavailable: "Al momento l'esportazione delle foto non è disponibile "
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index 826c6fa6349e33e10867763dfede42ee1e944375..375038672ef4784f1364c61d000cd697f55eec26 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -243,13 +243,6 @@ ja:
         other: "これが嫌いな人：%{count}人"
         two: "%{count} dislikes"
         zero: これが嫌いな人：0人
-      people_like_this:
-        few: "これが好きな人：%{count}人"
-        many: "これが好きな人：%{count}人"
-        one: これが好きな人：1人
-        other: "これが好きな人：%{count}人"
-        two: "%{count} likes"
-        zero: これが好きな人：0人
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -257,6 +250,13 @@ ja:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   more: 続き
   next: 次へ
   no_results: 詮索結果はありません
@@ -623,8 +623,6 @@ ja:
     stream_element:
       dislike: これ嫌い！
       hide_and_mute: "Hide and Mute"
-      like: これ好き！
-      unlike: これ好き！を取り消す
   status_messages:
     create:
       success: "%{names}を参照するのに成功しました。"
@@ -651,8 +649,14 @@ ja:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       title: "Your Mentions"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     tags:
       contacts_title: "People who dig these tags"
   tag_followings:
@@ -692,6 +696,7 @@ ja:
       edit_account: アカウント編集
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: データ出力
+      liked: "...someone likes your post?"
       mentioned: 投稿に自分がメンションされたとき
       new_password: 新しいパスワード
       private_message: 非公開メッセージが届いたとき
diff --git a/config/locales/diaspora/ka.yml b/config/locales/diaspora/ka.yml
index b245363beaa0b979cdf2c6a8136f62fed239b752..f9de9c9bee4699f779ccc18e49f76b53f1f99cb9 100644
--- a/config/locales/diaspora/ka.yml
+++ b/config/locales/diaspora/ka.yml
@@ -83,13 +83,6 @@ ka:
         other: "%{count} dislikes"
         two: "%{count} dislikes"
         zero: "no dislikes"
-      people_like_this:
-        few: "%{count} likes"
-        many: "%{count} likes"
-        one: "%{count} like"
-        other: "%{count} likes"
-        two: "%{count} likes"
-        zero: "no likes"
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -97,6 +90,13 @@ ka:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   notifications:
     also_commented:
       few: "%{actors} also commented on %{post_author}'s %{post_link}."
@@ -191,6 +191,9 @@ ka:
       other: "%{actors} started sharing with you."
       two: "%{actors} started sharing with you."
       zero: "%{actors} started sharing with you."
+  notifier:
+    liked:
+      liked: "%{name} liked your post"
   people:
     few: "%{count} people"
     many: "%{count} people"
@@ -260,11 +263,19 @@ ka:
       other: "Show %{count} more comments"
       two: "Show two more comments"
       zero: "No more comments"
+  streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
   users:
     edit:
       change_language: "ენის შეცვლა"
       close_account:
         what_we_delete: "We delete all of your posts, profile data, as soon as humanly possible. Your comments will hang around, but be associated with your Diaspora Handle."
+      liked: "...someone likes your post?"
       your_handle: "Your diaspora id"
     update:
       language_changed: "ენა შიეცვალა"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index 22fc5a094af9e7aa4320804e53c839064b11b968..d8f4c5d24070c0b44d41bf244bf798d4eb322170 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -301,6 +301,7 @@ ko:
     new:
       already_invited: "내 초대를 수락하지 않은 사람들:"
       aspect: 애스펙
+      check_out_diaspora: "디아스포라를 써보세요!"
       comma_seperated_plz: "쉼표로 구분하여 여러 이메일 주소를 넣을 수 있습니다."
       if_they_accept_info: "수락한 친구는 초대했던 애스펙에 추가됩니다."
       invite_someone_to_join: "다이스포라에 친구를 초대하세요!"
@@ -337,13 +338,6 @@ ko:
         other: "%{count}명이 싫어합니다"
         two: "싪어요 %{count}개"
         zero: "아무도 싫어하지 않습니다"
-      people_like_this:
-        few: "%{count}명이 좋아합니다"
-        many: 컨택
-        one: "한 명이 좋아합니다"
-        other: "%{count}명이 좋아합니다"
-        two: "좋아요 %{count}개"
-        zero: "아무도 좋아하지 않습니다"
       people_like_this_comment:
         few: "%{count}명이 좋아합니다"
         many: "%{count}명이 좋아합니다"
@@ -351,6 +345,13 @@ ko:
         other: "%{count}명이 좋아합니다"
         two: "좋아요 %{count}개"
         zero: "아무도 좋아하지 않습니다"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: 제한됨
   more: 더
   next: 다음
@@ -780,11 +781,9 @@ ko:
       hide_and_mute: "게시물을 숨기고 알림 끄기"
       ignore_user: "%{name}님 무시하기"
       ignore_user_description: "이 사용자를 무시한 뒤 모든 애스펙에서 지우시겠습니까?"
-      like: 좋아요
       nsfw: "이 게시물은 게시인이 유해매체로 지정했습니다. %{link}"
       shared_with: "공유된 애스펙: %{aspect_names}"
       show: 보기
-      unlike: "좋아요 취소"
       viewable_to_anyone: "이 게시물은 웹의 누구든지 볼 수 있습니다"
   status_messages:
     create:
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 61f73506e1653b26e08ce4e4aaa7a3d606c4463a..114170015e6b5ad6750c0cec938f82c4fd83ccce 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -162,13 +162,6 @@ lt:
         other: "%{count} people disliked this"
         two: "%{count} dislikes"
         zero: "no people disliked this"
-      people_like_this:
-        few: "%{count} people liked this"
-        many: "%{count} people liked this"
-        one: "1 person liked this"
-        other: "%{count} people liked this"
-        two: "%{count} likes"
-        zero: "no people liked this"
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -176,6 +169,13 @@ lt:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   notifications:
     also_commented:
       few: "%{actors} also commented on %{post_author}'s %{post_link}."
@@ -475,7 +475,6 @@ lt:
     stream_element:
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
-      like: "I like this"
   status_messages:
     helper:
       no_message_to_display: "Žinučių nėra."
@@ -496,8 +495,14 @@ lt:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       title: "Your Mentions"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     tags:
       contacts_title: "People who dig these tags"
   tag_followings:
@@ -526,6 +531,7 @@ lt:
       download_xml: "atsisiųsti mano duomenis xml formatu"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Eksportuoti duomenis"
+      liked: "...someone likes your post?"
       new_password: "Naujas slaptažodis"
       receive_email_notifications: "Receive email notificaions?"
       your_email: "Tavo el. pašto adresas"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 14651d7be8d39f5ee4d5d3ca9ea0e0de5297ee94..68af5ab5cf10fec7530ad90c321d7ff406437f82 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -159,13 +159,6 @@ mk:
         other: "%{count} people disliked this"
         two: "%{count} dislikes"
         zero: "no people disliked this"
-      people_like_this:
-        few: "%{count} people liked this"
-        many: "%{count} people liked this"
-        one: "1 person liked this"
-        other: "%{count} people liked this"
-        two: "%{count} likes"
-        zero: "no people liked this"
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -173,6 +166,13 @@ mk:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   notifications:
     also_commented:
       few: "%{actors} also commented on %{post_author}'s %{post_link}."
@@ -464,7 +464,6 @@ mk:
     stream_element:
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
-      like: "I like this"
   status_messages:
     helper:
       no_message_to_display: "Нема пораки за прикажување."
@@ -485,8 +484,14 @@ mk:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       title: "Your Mentions"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     tags:
       contacts_title: "People who dig these tags"
   tag_followings:
@@ -515,6 +520,7 @@ mk:
       download_xml: "симни го мојот xml"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Изнеси податоци"
+      liked: "...someone likes your post?"
       new_password: "Нова лозинка"
       receive_email_notifications: "Receive email notificaions?"
       your_email: "Вашиот е-маил"
diff --git a/config/locales/diaspora/ml.yml b/config/locales/diaspora/ml.yml
index a3adcf69edba015ca3f9c34a6afa627bd30df78f..2d539f5a338fddce95530c01b17c1b317d327b7e 100644
--- a/config/locales/diaspora/ml.yml
+++ b/config/locales/diaspora/ml.yml
@@ -301,6 +301,7 @@ ml:
     new:
       already_invited: "The following people have not accepted your invitation:"
       aspect: പരിചയം
+      check_out_diaspora: "Check out Diaspora!"
       comma_seperated_plz: "താങ്കള്‍ക്ക് കോമാ ഉപയോഗിച്ച് ഒന്നില്‍ കൂടൂതല്‍ ഇമെയില്‍ വിലാസങ്ങള്‍ ചേര്‍ക്കാം."
       if_they_accept_info: "അവര്‍ അംഗീകരിക്കുകയാണെങ്കില്‍, അവരെ താങ്കള്‍ ക്ഷണിച്ച പരിചയത്തിലേയ്ക്ക് ചേര്‍ക്കും."
       invite_someone_to_join: "ഡയസ്പോറയില്‍ ചേരാന്‍ ആരെയെങ്കിലും ക്ഷണിക്കു!"
@@ -337,13 +338,6 @@ ml:
         other: "%{count} പേര്‍ ഇത് ഇഷ്ടപ്പെടുന്നില്ല"
         two: "%{count} dislikes"
         zero: "ആരും ഇത് ഇഷ്ടപ്പെടുന്നില്ല"
-      people_like_this:
-        few: "%{count} ആളുകള്‍ ഇത് ഇഷ്ടപ്പെടുന്നു"
-        many: "%{count} ആളുകള്‍ ഇത് ഇഷ്ട്പ്പെടുന്നു"
-        one: "ഒരാള്‍ ഇത് ഇഷ്ടപ്പെടുന്നു"
-        other: "%{count} ആളുകള്‍ ഇത് ഇഷ്ടപ്പെടുന്നു"
-        two: "%{count} likes"
-        zero: "ആരും ഇതു ഇഷ്ടപ്പെടുന്നില്ല."
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -351,6 +345,13 @@ ml:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: "Limited"
   more: കൂടുതല്‍
   next: അടുത്തത്
@@ -483,6 +484,7 @@ ml:
       view_profile: "View %{name}'s profile"
     thanks: "നന്ദിയോടെ,"
     to_change_your_notification_settings: "to change your notification settings"
+  nsfw: "NSFW"
   ok: ശരി
   or: അല്ലെങ്കില്‍
   password: അടയാളവാക്ക്
@@ -600,6 +602,8 @@ ml:
       first_name: "ആദ്യ പേര്"
       last_name: "അവസാന പേര്"
       update_profile: "പ്രൊഫൈല്‍ പുതുക്കുക"
+      you_are_nsfw: "You have marked yourself not safe for work, your content will not show up in people who have opted out of seeing objectionable content's streams."
+      you_are_safe_for_work: "You have marked yourself as safe for work, this means you agree the content you post will agree with the community guidelines."
       your_bio: "നിങ്ങളുടെ സ്വയം വിവരണം"
       your_birthday: "താങ്കളുടെ ജന്മദിനം"
       your_gender: "താങ്കളുടെ ലിംഗം"
@@ -782,11 +786,11 @@ ml:
       hide_and_mute: "Hide and mute post"
       ignore_user: "Ignore %{name}"
       ignore_user_description: "Ignore and remove user from all aspects?"
-      like: ഇഷ്ടപ്പെടുന്നു
       nsfw: "This post has been flagged as NSFW by its author. %{link}"
+      pin: "Pin"
       shared_with: "Shared with: %{aspect_names}"
       show: "show"
-      unlike: "Unlike"
+      unpin: "Unpin"
       via: "via %{link}"
       viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages:
@@ -838,6 +842,8 @@ ml:
     multi:
       contacts_title: "People in your Stream"
       title: "Stream"
+    participate:
+      title: "Participate"
     public:
       contacts_title: "Recent Posters"
       title: "Public Activity"
diff --git a/config/locales/diaspora/ms.yml b/config/locales/diaspora/ms.yml
index c57d5f999c4d3868d76f4ed0bcee72d8d8cebff0..a6f8a70af55afd6595309142a66a04f073c244dc 100644
--- a/config/locales/diaspora/ms.yml
+++ b/config/locales/diaspora/ms.yml
@@ -204,13 +204,6 @@ ms:
         other: "%{count} dislikes"
         two: "%{count} dislikes"
         zero: "no dislikes"
-      people_like_this:
-        few: "%{count} likes"
-        many: "%{count} suka"
-        one: "%{count} suka"
-        other: "%{count} suka"
-        two: "%{count} suka"
-        zero: "tiada suka"
       people_like_this_comment:
         few: "%{count} suka"
         many: "%{count} suka"
@@ -218,6 +211,13 @@ ms:
         other: "%{count} suka"
         two: "%{count} likes"
         zero: "tiada suka"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Terhad
   more: "lebih banyak"
   next: seterusnya
@@ -322,6 +322,8 @@ ms:
   notifier:
     a_post_you_shared: pos.
     click_here: "klik di sini"
+    liked:
+      liked: "%{name} liked your post"
     to_change_your_notification_settings: "untuk menukar tetapan pemberitahuan anda"
   or: atau
   password: "kata laluan"
@@ -422,8 +424,16 @@ ms:
       other: "Show %{count} more comments"
       two: "Show two more comments"
       zero: "No more comments"
+  streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
   users:
     edit:
       close_account:
         what_we_delete: "We delete all of your posts, profile data, as soon as humanly possible. Your comments will hang around, but be associated with your Diaspora Handle."
+      liked: "...someone likes your post?"
       your_handle: "Your diaspora id"
\ No newline at end of file
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index dba11aaf60258027f4d22afcebb07f89a94a3d2a..8582ab1c21d3849051d8d28f5750c5a6904fab2c 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -293,13 +293,6 @@ nb:
         other: "%{count} personer misliker dette"
         two: "%{count} misliker dette"
         zero: "ingen misliker dette"
-      people_like_this:
-        few: "%{count} personer liker dette"
-        many: "%{count} personer liker dette"
-        one: "1 person liker dette"
-        other: "%{count} personer liker dette"
-        two: "%{count} liker dette"
-        zero: "ingen liker dette"
       people_like_this_comment:
         few: "%{count} liker"
         many: "%{count} liker"
@@ -307,6 +300,13 @@ nb:
         other: "%{count} liker"
         two: "%{count} liker dette"
         zero: "ingen liker"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Begrenset
   more: Mer
   next: neste
@@ -717,9 +717,7 @@ nb:
       hide_and_mute: "Hide and Mute"
       ignore_user: "Ignorér %{name}"
       ignore_user_description: "Ignorér og fjern bruker fra alle aspekter?"
-      like: Liker
       shared_with: "Delt med: %{aspect_names}"
-      unlike: "Liker ikke"
       viewable_to_anyone: "Denne posten er synlig for alle på Internett"
   status_messages:
     create:
@@ -753,9 +751,13 @@ nb:
       follow: Følg
     like_stream:
       contacts_title: "Personer hvis poster du liker"
+      title: "Like Stream"
     mentions:
       contacts_title: "Folk som har nevnt deg"
       title: "Your Mentions"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     public:
       title: "Offentlig aktivitet"
     tags:
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 7c22735dc449464557a9a96350540eec7598f794..706b37773f7f573075f6b5d7308a46302fb2563c 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -191,10 +191,13 @@ nl:
     index:
       add_a_new_aspect: "Voeg een aspect toe"
       add_to_aspect: "voeg contacten toe aan %{name}"
+      add_to_aspect_link: "contacten toevoegen aan %{name}"
       all_contacts: "Alle Contacten"
       many_people_are_you_sure: "Weet je zeker dat je een privégesprek wil starten met meer dan %{suggested_limit} contacten? Een bericht plaatsen in dit aspect is waarschijnlijk een betere manier om met hen te communiceren."
       my_contacts: "Mijn Contacten"
       no_contacts: "Voeg wat contacten toe!"
+      no_contacts_message: "Bekijk %{community_spotlight} eens"
+      no_contacts_message_with_aspect: "Bekijk %{community_spotlight} eens, of %{add_to_aspect_link}"
       only_sharing_with_me: "Delen alleen met mij"
       remove_person_from_aspect: "Verwijder %{person_name} uit \"%{aspect_name}\""
       start_a_conversation: "Start een conversatie"
@@ -279,6 +282,7 @@ nl:
       your_account_awaits: "Jou account wacht op je!"
     new:
       already_invited: "De volgende mensen hebben je uitnodiging niet geaccepteerd:"
+      check_out_diaspora: "Kijk eens naar Diaspora!"
       comma_seperated_plz: "Je kunt meerdere e-mailadressen invullen, gescheiden door komma's."
       if_they_accept_info: "als hij of zij accepteert zal hij of zij toegevoegd worden aan het aspect waarvoor je hem of haar uitgenodigd hebt."
       invite_someone_to_join: "Nodig iemand uit om lid te worden op Diaspora!"
@@ -311,13 +315,6 @@ nl:
         other: "%{count} mensen vinden dit niet leuk"
         two: "%{count} niet leuk"
         zero: "niemand vindt dit niet leuk"
-      people_like_this:
-        few: "%{count} mensen vinden dit leuk"
-        many: "%{count} mensen vinden dit leuk"
-        one: "%{count} persoon vindt dit leuk"
-        other: "%{count} mensen vinden dit leuk"
-        two: "%{count} leuk"
-        zero: "niemand vindt dit leuk"
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -325,6 +322,13 @@ nl:
         other: "%{count} likes"
         two: "%{count} leuk"
         zero: "geen likes"
+      people_pin_this:
+        few: "%{count} keer vastgeprikt"
+        many: "%{count} keer vastgeprikt"
+        one: "%{count} keer vastgeprikt"
+        other: "%{count} keer vastgeprikt"
+        two: "%{count} keer vastgeprikt"
+        zero: "niet vastgeprikt"
   limited: Beperkt
   more: Meer
   next: volgende
@@ -371,19 +375,19 @@ nl:
       mark_all_as_read: "Markeer alles gelezen"
       notifications: Notificaties
     liked:
-      few: "%{actors} vinden jouw %{post_link} leuk."
-      many: "%{actors} vinden jouw %{post_link} leuk."
-      one: "%{actors} vindt jouw %{post_link} leuk."
-      other: "%{actors} vinden jouw %{post_link} leuk."
-      two: "%{actors} vinden jouw %{post_link} leuk."
-      zero: "%{actors} vinden jouw %{post_link} leuk."
+      few: "%{actors} hebben je %{post_link} vastgeprikt."
+      many: "%{actors} hebben je %{post_link} vastgeprikt."
+      one: "%{actors} heeft je %{post_link} vastgeprikt."
+      other: "%{actors} hebben je %{post_link} vastgeprikt."
+      two: "%{actors} hebben je %{post_link} vastgeprikt."
+      zero: "%{actors} heeft je %{post_link} vastgeprikt."
     liked_post_deleted:
-      few: "%{actors} vonden jouw verwijderde post leuk."
-      many: "%{actors} vonden jouw verwijderde post leuk."
-      one: "%{actors} vond jouw verwijderde post leuk."
-      other: "%{actors} vonden jouw verwijderde post leuk."
-      two: "%{actors} vonden jou verwijderde post leuk."
-      zero: "%{actors} vond jouw verwijderde post leuk."
+      few: "%{actors} hadden je verwijderde post vastgeprikt."
+      many: "%{actors} hadden je verwijderde post vastgeprikt."
+      one: "%{actors} had je verwijderde post vastgeprikt."
+      other: "%{actors} hadden je verwijderde post vastgeprikt."
+      two: "%{actors} hadden je verwijderde vastgeprikt."
+      zero: "%{actors} had je verwijderde post vastgeprikt."
     mentioned:
       few: "%{actors} hebben je genoemd in een %{post_link}."
       many: "%{actors} hebben je genoemd in een %{post_link}."
@@ -437,7 +441,7 @@ nl:
     email_sent_by_diaspora: "Deze mail is gestuurd door Diaspora.  Als je dit soort email's niet meer wilt ontvangen,"
     hello: "Hoi %{name}!"
     liked:
-      liked: "%{name} vindt je post leuk"
+      liked: "%{name} heeft je post vastgeprikt"
       view_post: "Bekijk post >"
     mentioned:
       mentioned: "heeft jou genoemd in een post:"
@@ -552,13 +556,15 @@ nl:
       destroy: Verwijder
       not_found: "Sorry, die post konden we niet vinden."
       photos_by:
-        few: "%{count} photos by %{author}"
-        many: "%{count} photos by %{author}"
-        one: "One photo by %{author}"
-        other: "%{count} photos by %{author}"
-        two: "Two photos by %{author}"
-        zero: "No photos by %{author}"
+        few: "%{count} foto's door %{author}"
+        many: "%{count} foto's door %{author}"
+        one: "Eén foto door %{author}"
+        other: "%{count} foto's door %{author}"
+        two: "Twee foto's door %{author}"
+        zero: "Geen foto's van %{author}"
+      reshare_by: "Doorgegeven door %{author}"
   previous: vorige
+  privacy_policy: Privacybeleid
   profile: Profiel
   profiles:
     edit:
@@ -746,11 +752,11 @@ nl:
       hide_and_mute: "Verberg en blokkeer bericht"
       ignore_user: "Negeer %{name}"
       ignore_user_description: "Gebruiker negeren en hem uit alle aspecten verwijderen?"
-      like: "Vind ik leuk"
       nsfw: "Dit bericht is geflagd als NSFW door de auteur.  %{link}"
+      pin: Vastprikken
       shared_with: "Gedeeld met: %{aspect_names}"
       show: "laat zien"
-      unlike: "vind ik niet meer leuk"
+      unpin: Losprikken
       viewable_to_anyone: "Deze post is zichtbaar voor iedereen op het internet"
   status_messages:
     create:
@@ -771,16 +777,19 @@ nl:
   stream_helper:
     hide_comments: "Verberg alle reacties"
     show_comments:
-      few: "Show %{count} more comments"
-      many: "Show %{count} more comments"
-      one: "Show one more comment"
-      other: "Show %{count} more comments"
-      two: "Show two more comments"
-      zero: "No more comments"
+      few: "Toon nog %{count} andere reacties."
+      many: "Toon nog %{count} andere reacties."
+      one: "Toon nog één andere reactie."
+      other: "Toon nog %{count} andere reacties"
+      two: "Toon nog twee andere reacties."
+      zero: "Geen andere reacties meer"
   streams:
     aspects:
       title: "Jouw Aspecten"
     aspects_stream: Aspecten
+    comment_stream:
+      contacts_title: "Mensen op wiens posts je hebt gereageerd"
+      title: "Reacties op je posts"
     followed_tag:
       add_a_tag: "Voeg een tag toe"
       contacts_title: "Personen die deze tag leuk vinden"
@@ -788,19 +797,23 @@ nl:
       title: "#Gevolgde Tags"
     followed_tags_stream: "#Gevolgde Tags"
     like_stream:
-      contacts_title: "Personen wiens berichten je leuk vindt"
-      title: "Vind ik leuk Stream"
+      contacts_title: "Mensen wiens posts je hebt vastgeprikt"
+      title: Prikbord
     mentioned_stream: "@Vermeldingen"
     mentions:
       contacts_title: "Mensen die jou hebben genoemd"
       title: "@Mij"
     multi:
-      contacts_title: "Gebuikers in je Stream"
+      contacts_title: "Volk in je Verkenstream"
+      title: Verkennen
+    participate:
+      title: Deelnemen
     public:
       contacts_title: "Recente Posters"
       title: "Publieke activiteit"
     tags:
       contacts_title: "Mensen die deze tag cool vinden"
+      tag_prefill_text: "Over %{tag_name} gesproken, ... "
       title: "Posts getagged: %{tags}"
   tag_followings:
     create:
@@ -866,8 +879,9 @@ nl:
       edit_account: "Bewerk account"
       email_awaiting_confirmation: "We hebben een activatielink verzonden naar %{unconfirmed_email}. Totdat je het adres geactiveerd hebt zullen we je originele adress blijven gebruiken %{email}."
       export_data: "Exporteer data"
+      following: Volgvoorkeuren
       getting_started: "Nieuwe Gebruikers Voorkeuren"
-      liked: "... iemand je post leuk vind?"
+      liked: "...iemand prikt je post vast?"
       mentioned: "...je genoemd word in een post?"
       new_password: "Nieuw wachtwoord"
       photo_export_unavailable: "Foto's exporteren is op dit moment niet beschikbaar"
@@ -890,7 +904,7 @@ nl:
       we_can_speed_things_up: "We kunnen het wat sneller maken door"
       well_hello_there: "O, hallo daar!"
       what_are_you_in_to: "Wat interesseert je?"
-      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      what_facebook_does: "met Diaspora. Je naam en foto worden dan overgezet, en je kan heen en weer posten."
       who_are_you: "Wie ben je?"
     logged_out:
       go_mobile: "Ga nu mobile."
@@ -906,6 +920,8 @@ nl:
       does_not_exist: "Gebruiker %{username} bestaat niet!"
     update:
       email_notifications_changed: "E-mailnotificaties gewijzigd"
+      follow_settings_changed: "Volgvoorkeuren aangepast"
+      follow_settings_not_changed: "Aanpassing aan de volgvoorkeuren is mislukt."
       language_changed: "Taal gewijzigd"
       language_not_changed: "Taal wijzigen mislukt"
       password_changed: "Wachtwoord gewijzigd. Je kunt nu inloggen met je nieuwe wachtwoord."
diff --git a/config/locales/diaspora/nn.yml b/config/locales/diaspora/nn.yml
index f9d21afb012d3e2fd63b79115f60e58fa1518adb..395ad06bc488a310f1711e051103d220abf99d02 100644
--- a/config/locales/diaspora/nn.yml
+++ b/config/locales/diaspora/nn.yml
@@ -276,13 +276,6 @@ nn:
         other: "%{count} dislikes"
         two: "%{count} dislikes"
         zero: "no dislikes"
-      people_like_this:
-        few: "%{count} likes"
-        many: "%{count} likes"
-        one: "%{count} like"
-        other: "%{count} likes"
-        two: "%{count} likes"
-        zero: "no likes"
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -290,6 +283,13 @@ nn:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Avgrensa
   next: neste
   no_results: "Fann ingen resultat"
@@ -687,9 +687,7 @@ nn:
     stream_element:
       dislike: Mislik
       hide_and_mute: "Gøym og demp"
-      like: Lik
       shared_with: "Delt med: %{aspect_names}"
-      unlike: "Lik ikkje lenger"
       viewable_to_anyone: "Alle kan sjå dette innlegget"
   status_messages:
     create:
@@ -717,8 +715,14 @@ nn:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       title: "@Nemningar"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     tags:
       contacts_title: "Personar som elskar denne etiketten"
   tag_followings:
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 1da04ce4f37f8cee919b253be4d7e8ea84d46f89..ddac846b61422fb8bbd7023e877d99538bda9923 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -121,13 +121,6 @@ pa:
         other: "%{count} people disliked this"
         two: "%{count} dislikes"
         zero: "no people disliked this"
-      people_like_this:
-        few: "%{count} people liked this"
-        many: "%{count} people liked this"
-        one: "1 person liked this"
-        other: "%{count} people liked this"
-        two: "%{count} likes"
-        zero: "no people liked this"
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -135,6 +128,13 @@ pa:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   more: ਹੋਰ
   next: ਅੱਗੇ
   notifications:
@@ -366,7 +366,6 @@ pa:
     stream_element:
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
-      like: "I like this"
   status_messages:
     helper:
       no_message_to_display: "ਵੇਖਾਉਣ ਲਈ ਕੋਈ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ।"
@@ -387,8 +386,14 @@ pa:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       title: "Your Mentions"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     tags:
       contacts_title: "People who dig these tags"
   tag_followings:
@@ -414,6 +419,7 @@ pa:
       close_account:
         what_we_delete: "We delete all of your posts, profile data, as soon as humanly possible. Your comments will hang around, but be associated with your Diaspora Handle."
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
+      liked: "...someone likes your post?"
       new_password: "New Password"
       receive_email_notifications: "Receive email notificaions?"
       your_handle: "Your diaspora handle"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index eb41664d5f5293db742d1293e119822ffdbef635..637bdd0e660c0e446970b41033b0a6c7ebe9f275 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -201,10 +201,14 @@ pl:
     index:
       add_a_new_aspect: "Dodaj aspekt"
       add_to_aspect: "dodaj kontakty do %{name}"
+      add_to_aspect_link: "dodaj kontakty do %{name}"
       all_contacts: "Wszystkie kontakty"
+      community_spotlight: "W centrum uwagi"
       many_people_are_you_sure: "Czy na pewno chcesz rozpocząć prywatną rozmowę z więcej niż %{suggested_limit} osobami? Możesz po prostu opublikować swoją wiadomość w tej grupie. "
       my_contacts: "Moje kontakty"
       no_contacts: "Wygląda na to, że musisz dodać kilka kontaktów!"
+      no_contacts_message: "Sprawdź kto jest %{community_spotlight}"
+      no_contacts_message_with_aspect: "Sprawdź kto jest w %{community_spotlight} lub %{add_to_aspect_link}"
       only_sharing_with_me: "Udostępniający tylko mnie"
       remove_person_from_aspect: "Usuń %{person_name} z aspektu \"%{aspect_name}\""
       start_a_conversation: "Rozpocznij rozmowÄ™"
@@ -297,6 +301,7 @@ pl:
     new:
       already_invited: "Te osoby nie zaakceptowały jeszcze Twojego zaproszenia:"
       aspect: Aspekt
+      check_out_diaspora: "Wypróbuj Diasporę!"
       comma_seperated_plz: "Możesz podać kilka adresów e-mail, oddzielając je przecinkami."
       if_they_accept_info: "Jeśli wybrana osoba przyjmie zaproszenie, zostanie dodana do aspektów, do których ją zapros@{m:iłeś|f:iłaś|n:zono}."
       invite_someone_to_join: "ZaproÅ› kogoÅ› do Diaspory!"
@@ -332,13 +337,6 @@ pl:
         other: "%{count} os. tego nie lubi"
         two: "%{count} os. tego nie lubi"
         zero: "nikt tego nie nielubi"
-      people_like_this:
-        few: "%{count} os. to lubi"
-        many: "%{count} os. to lubi"
-        one: "1 osoba to polubiła"
-        other: "%{count} os. to lubi"
-        two: "%{count} osoby to lubiÄ…"
-        zero: "nikt tego nie polubił"
       people_like_this_comment:
         few: "%{count} os. to lubi"
         many: "%{count} os. to lubi"
@@ -346,6 +344,13 @@ pl:
         other: "%{count} os. to lubi"
         two: "%{count} ososby to lubiÄ…"
         zero: "nikt nie lubi"
+      people_pin_this:
+        few: "%{count} przypięć"
+        many: "%{count} przypięć"
+        one: "%{count} przypięcie"
+        other: "%{count} przypięcia"
+        two: "%{count} przypięcia"
+        zero: "brak przypięć"
   limited: Ograniczone
   more: Więcej
   next: dalej
@@ -392,19 +397,19 @@ pl:
       mark_all_as_read: "Oznacz wszystkie jako przeczytane"
       notifications: Powiadomienia
     liked:
-      few: "%{actors} polubili Twój %{post_link}."
-      many: "%{actors} polubili Twój %{post_link}."
-      one: "%{actors} polubi@{m:ł|f:ła|n:ł} Twój %{post_link}."
-      other: "%{actors} polubi@{m:ł|f:ła|n:ł} Twój %{post_link}."
-      two: "%{actors} polubili Twój %{post_link}."
-      zero: "%{actors} polubi@{m:ł|f:ła|n:ło} Twój wpis."
+      few: "%{actors} przypięło Twój %{post_link}."
+      many: "%{actors} przypięło Twój %{post_link}."
+      one: "%{actors} przypi@{m:ął|f:ęła|n:ął/ęła} Twój %{post_link}."
+      other: "%{actors} przypięli Twój %{post_link}."
+      two: "%{actors} przypięły Twój %{post_link}."
+      zero: "%{actors} przypi@{m:ął|f:ęła|n:ął/ęła} Twój wpis."
     liked_post_deleted:
-      few: "%{actors} polubili Twój usunięty wpis."
-      many: "%{actors} lubią twój już usunięty wpis."
-      one: "%{actors} polubi@{m:ł|f:ła|n:ło} Twój usunięty wpis."
-      other: "%{actors} polubi@{m:ł|f:ła|n:ło} Twój usunięty wpis."
-      two: "%{actors} polubili Twój usunięty wpis."
-      zero: "%{actors} polubi@{m:ł|f:ła|n:ło} Twój usunięty wpis."
+      few: "%{actors} przypięli Twój usunięty wpis."
+      many: "%{actors} przypięło Twój usunięty wpis."
+      one: "%{actors} przypi@{m:ął|f:ęła|n:ął/ęła} Twój usunięty wpis."
+      other: "%{actors} przypi@{m:ął|f:ęła|n:ął/ęła} Twój usunięty wpis."
+      two: "%{actors} przypięli Twój usunięty wpis."
+      zero: "%{actors} przypię@{m:ło|f:ła|n:ło/ła} Twój usunięty wpis."
     mentioned:
       few: "%{actors} wspomnieli o Tobie w %{post_link}."
       many: "%{actors} wspomnieli o Tobie w %{post_link}."
@@ -459,7 +464,7 @@ pl:
     email_sent_by_diaspora: "Ta wiadomość została wysłana przez Diasporę. Jeśli nie chcesz otrzymywać takich wiadomości,"
     hello: "Cześć %{name}!"
     liked:
-      liked: "%{name} polubi@{m:ł|f:ła|n:ł} Twój wpis"
+      liked: "%{name} przypi@{m:ął|f:ęła|n:ł} Twój wpis"
       view_post: "Wyświetl wpis >"
     mentioned:
       mentioned: "wspomniał(a) o Tobie we wpisie:"
@@ -593,6 +598,8 @@ pl:
       first_name: ImiÄ™
       last_name: Nazwisko
       update_profile: "Aktualizacja profilu"
+      you_are_nsfw: "Oznaczyłeś/aś siebie jako NSFW, wszystkie dodane przez Ciebie treści nie będą wyświetlane osobom, które zrezygnowały z wyświetlania dyskusyjnych treści w strumieniach."
+      you_are_safe_for_work: "Oznaczyłeś/aś siebie jako osobę udostępniającą treści, które można bez problemu oglądać w pracy, oznacza to, że publikowane przez Ciebie treści są zgodne z zasadami panującymi w społeczności."
       your_bio: "O Tobie"
       your_birthday: "Twoje urodziny"
       your_gender: "Twoja płeć"
@@ -682,7 +689,7 @@ pl:
     failure:
       error: "wystąpił błąd podczas łączenia z tą usługą"
     finder:
-      fetching_contacts: "Diaspora zaprasza Twoich znajomych z  %{service}, wróć ponownie za kilka minut."
+      fetching_contacts: "Diaspora zaprasza Twoich znajomych z %{service}, wróć ponownie za kilka minut."
       no_friends: "Nie znaleziono znajomych z Facebooka."
       service_friends: "Znajomi z %{service} "
     index:
@@ -739,6 +746,7 @@ pl:
     notification:
       new: "Nowy(-a,-e) %{type} od %{from}"
     public_explain:
+      atom_feed: "Kanał Atom"
       control_your_audience: "Dostosuj swoją publiczność"
       logged_in: "zalogowano do %{service}"
       manage: "zarządzaj powiązanymi usługami"
@@ -773,11 +781,11 @@ pl:
       hide_and_mute: "Ukryj i wycisz wpis"
       ignore_user: "Ignoruj - %{name}"
       ignore_user_description: "Dodać użytkownika do listy ignorowanych i usunąć ze wszystkich aspektów?"
-      like: LubiÄ™
       nsfw: "Ten wpis został oznaczony przez jego autora jako NSFW (Not suitable/safe for work). %{link}"
+      pin: Przypnij
       shared_with: "Opublikowano w: %{aspect_names}"
       show: wyświetl
-      unlike: "Nie lubiÄ™"
+      unpin: Odepnij
       via: "przez %{link}"
       viewable_to_anyone: "Ten wpis jest widoczny dla każdego"
   status_messages:
@@ -820,15 +828,17 @@ pl:
       title: "#Obserwowane znaczniki"
     followed_tags_stream: "#Obserwowane znaczniki"
     like_stream:
-      contacts_title: "Osoby których wpisy lubisz"
-      title: "Strumień ulubionych"
+      contacts_title: "Osoby, których wpisy przypi@{m:ąłeś|f:ęłaś|n:ąłeś/ęłaś}"
+      title: "Strumień przypiętych"
     mentioned_stream: "@Wzmianki"
     mentions:
       contacts_title: "Wspomnieli o Tobie"
       title: "@Wzmianki"
     multi:
-      contacts_title: "Osoby w Twoim Strumieniu"
-      title: Strumień
+      contacts_title: "Osoby w Strumieniu Poznawania"
+      title: Poznawaj
+    participate:
+      title: "Przyłącz się"
     public:
       contacts_title: "Ostatnio dodawali"
       title: "Działalność publiczna"
@@ -904,7 +914,7 @@ pl:
       export_data: "Eksport danych"
       following: "Ustawienia obserwowania"
       getting_started: "Preferencje nowego użytkownika"
-      liked: "...ktoś polubił mój wpis"
+      liked: "...ktoś przypiął mój wpis"
       mentioned: "...ktoś o mnie wspomniał we wpisie"
       new_password: "Nowe hasło"
       photo_export_unavailable: "Eksportowanie zdjęć jest aktualnie niedostępne"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 0f241b7f6f5958fad0a841250886272edc7789f0..e0d3cc0e9724969aae61d41faf3ff6558ba2c71f 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -328,13 +328,6 @@ pt-BR:
         other: "%{count} não curtiram."
         two: "%{count} não curtiram"
         zero: "ninguém curtiu."
-      people_like_this:
-        few: "%{count} curtiram"
-        many: "%{count} curtiram"
-        one: "1 curtiu"
-        other: "%{count} curtiram"
-        two: "%{count} curtiram"
-        zero: "ninguém curtiu"
       people_like_this_comment:
         few: "%{count} curtiram"
         many: "%{count} curtiram"
@@ -342,6 +335,13 @@ pt-BR:
         other: "%{count} curtiram"
         two: "%{count} curtiram"
         zero: "ninguém curtiu"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Limitado
   more: Mais
   next: Próximo
@@ -768,11 +768,9 @@ pt-BR:
       hide_and_mute: Ocultar
       ignore_user: "Ignorar %{name}"
       ignore_user_description: "Ignorar e remover usuário de todos os aspectos?"
-      like: Curtir
       nsfw: "Esse post foi censurado (NSFW) por seu autor. %{link}"
       shared_with: "Compartilhado com: %{aspect_names}"
       show: mostrar
-      unlike: Descurtir
       viewable_to_anyone: "Essa postagem é visível para qualquer pessoa na internet"
   status_messages:
     create:
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index c125d7be41dd97fa442a5f6796a43dd6ef2d9eed..c3ded8bb12e65d09c07fa2199878d765400163c5 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -9,7 +9,7 @@ pt-PT:
   _comments: Comentários
   _contacts: Contactos
   _home: Início
-  _photos: fotos
+  _photos: Fotografias
   _services: Serviços
   account: Conta
   activerecord:
@@ -102,7 +102,7 @@ pt-PT:
         content_2: "Dê-a a alguém para que o encontre no Diaspora."
         heading: "Identificação do Diaspora"
       donate: Doar
-      handle_explanation: "Esta é a sua identificação do Diaspora. Tal como um endereço de email, pode dá-la a quem deseja que o contacte."
+      handle_explanation: "Esta é a sua identificação na Diaspora. Tal como um endereço de email, pode dá-la a quem desejar que o contacte."
       help:
         do_you: "Quer:"
         email_feedback: "%{link} o teu feedback, se preferires"
@@ -198,10 +198,14 @@ pt-PT:
     index:
       add_a_new_aspect: "Adicionar um novo aspecto"
       add_to_aspect: "Adicionar contactos a %{name}"
+      add_to_aspect_link: "adicionar contactos a %{name}"
       all_contacts: "Todos os Contactos"
+      community_spotlight: "Destaques da comunidade"
       many_people_are_you_sure: "Tem a certeza de que deseja começar um conversa privada com mais de %{suggested_limit} contactos? Publicar para este aspecto pode ser uma forma melhor de os contactar."
       my_contacts: "Os Meus Contactos"
       no_contacts: "Parece que precisa de adicionar alguns contactos."
+      no_contacts_message: "Descobre %{community_spotlight}"
+      no_contacts_message_with_aspect: "Descobre %{community_spotlight} ou %{add_to_aspect_link}"
       only_sharing_with_me: "Apenas a partilhar comigo"
       remove_person_from_aspect: "Remover %{person_name} de \"%{aspect_name}\""
       start_a_conversation: "Iniciar um conversa"
@@ -293,6 +297,7 @@ pt-PT:
     new:
       already_invited: "As pessoas seguintes não aceitaram o seu convite:"
       aspect: Aspecto
+      check_out_diaspora: "Descobre a Diaspora*!"
       comma_seperated_plz: "Pode inserir vários endereços de email separados por vírgulas."
       if_they_accept_info: "se aceitarem, serão adicionados ao aspecto para o qual os convidou."
       invite_someone_to_join: "Convide alguém para se juntar ao Diaspora!"
@@ -304,6 +309,7 @@ pt-PT:
       to: Para
   layouts:
     application:
+      back_to_top: "Voltar ao topo"
       public_feed: "Fonte Pública do Diaspora para %{name}"
       toggle: "ligar modo móvel"
       whats_new: "O que há de novo?"
@@ -327,13 +333,6 @@ pt-PT:
         other: "%{count} pessoa não gosta"
         two: "%{count} não gostam"
         zero: "nenhuma pessoa não gosta disto"
-      people_like_this:
-        few: "%{count} pessoas gostam"
-        many: "%{count} pessoas não gostam"
-        one: "%{count} pessoa gosta"
-        other: "%{count} pessoas gostam"
-        two: "%{count} gostam"
-        zero: "ninguém gosta"
       people_like_this_comment:
         few: "%{count} gostos"
         many: "%{count} gostos"
@@ -341,6 +340,13 @@ pt-PT:
         other: "%{count} gostos"
         two: "%{count} gostam"
         zero: "não há gostos"
+      people_pin_this:
+        few: "%{count} marcaram"
+        many: "%{count} marcaram"
+        one: "%{count} marcou"
+        other: "%{count} marcaram"
+        two: "%{count} marcaram"
+        zero: "Sem marcas"
   limited: Limitado
   more: Mais
   next: próximo
@@ -387,19 +393,19 @@ pt-PT:
       mark_all_as_read: "Marcar Tudo como Lido"
       notifications: Notificações
     liked:
-      few: "%{actors} gostaram da sua %{post_link}."
-      many: "%{actors} gostam da sua %{post_link}."
-      one: "%{actors} gostou da sua %{post_link}."
-      other: "%{actors} gostam da sua %{post_link}."
-      two: "%{actors} gostaram do seu %{post_link}."
-      zero: "%{actors} gostaram da sua %{post_link}."
+      few: "%{actors} marcaram o seu %{post_link}."
+      many: "%{actors} marcaram o seu %{post_link}."
+      one: "%{actors} marcou o seu %{post_link}."
+      other: "%{actors} marcaram o seu %{post_link}."
+      two: "%{actors} marcaram o seu %{post_link}."
+      zero: "%{actors} marcaram o seu %{post_link}."
     liked_post_deleted:
-      few: "%{actors} gostam da sua publicação apagada."
-      many: "%{actors} gostam da sua publicação apagada."
-      one: "%{actors} gosta da sua publicação apagada."
-      other: "%{actors} gostam da sua publicação apagada."
-      two: "%{actors} gostou da sua publicação apagada."
-      zero: "%{actors} gostam da sua publicação apagada."
+      few: "%{actors} marcaram o seu artigo eliminado."
+      many: "%{actors} marcaram o seu artigo eliminado"
+      one: "%{actors} marcou o seu artigo eliminado."
+      other: "%{actors} marcaram o seu artigo eliminado."
+      two: "%{actors} marcaram o seu artigo eliminado."
+      zero: "%{actors} marcaram o seu artigo eliminado."
     mentioned:
       few: "%{actors} mencionou-o(a) numa %{post_link}."
       many: "%{actors} mencionou-o(a) numa %{post_link}."
@@ -454,7 +460,7 @@ pt-PT:
     email_sent_by_diaspora: "Este email foi enviado pelo Diaspora.  Se deseja deixar de receber emails deste tipo,"
     hello: "Olá %{name}!"
     liked:
-      liked: "%{name} gostou da sua publicação"
+      liked: "%{name} marcou o seu artigo"
       view_post: "Ver a publicação >"
     mentioned:
       mentioned: "mencionou-o numa publicação:"
@@ -487,7 +493,7 @@ pt-PT:
       results_for: "resultados para %{params}"
     index:
       couldnt_find_them_send_invite: "Não conseguiu encontrá-los? Envie um convite!"
-      looking_for: "À procura de posts com a etiqueta %{tag_link}?"
+      looking_for: "À procura de publicações com a etiqueta %{tag_link}?"
       no_one_found: "...e ninguém foi encontrado."
       no_results: "Hei! Precisa pesquisar por alguma coisa."
       results_for: "resultados da pesquisa para"
@@ -570,12 +576,13 @@ pt-PT:
       destroy: Apagar
       not_found: "Lamentamos muito, mas não foi possível encontrar essa publicação."
       photos_by:
-        few: "%{count} photos by %{author}"
-        many: "%{count} photos by %{author}"
-        one: "One photo by %{author}"
-        other: "%{count} photos by %{author}"
-        two: "Two photos by %{author}"
-        zero: "No photos by %{author}"
+        few: "%{count} fotografias de %{author}"
+        many: "%{count} fotografias de %{author}"
+        one: "Uma fotografia de %{author}"
+        other: "%{count} fotografias de %{author}"
+        two: "Duas fotografias de %{author}"
+        zero: "Nenhuma fotografia de %{author}"
+      reshare_by: "Partilhado por %{author}"
   previous: anterior
   privacy: Privacidade
   privacy_policy: "Política de Privacidade"
@@ -733,6 +740,7 @@ pt-PT:
     notification:
       new: "Novo %{type} de %{from}"
     public_explain:
+      atom_feed: "Feed Atom"
       control_your_audience: "Controle o seu Público"
       logged_in: "Sessão iniciada em %{service}"
       manage: "gerir serviços conectados"
@@ -767,9 +775,11 @@ pt-PT:
       hide_and_mute: "Ocultar e Silenciar"
       ignore_user: "Ignorar %{name}"
       ignore_user_description: "Ignorar e remover o utilizador de todos os aspectos?"
-      like: Gosto
+      nsfw: "Este artigo foi marcado pelo seu autor como tendo conteúdo impróprio. %{link}"
+      pin: Marcar
       shared_with: "Partilhado com: %{aspect_names}"
-      unlike: "Não Gosto"
+      show: Mostrae
+      unpin: "Desmarcar "
       viewable_to_anyone: "Esta publicação é visível para todos na internet"
   status_messages:
     create:
@@ -801,7 +811,7 @@ pt-PT:
       title: "Os Teus Aspectos"
     aspects_stream: Aspectos
     comment_stream:
-      contacts_title: "Pessoas cujos os posts você comentou"
+      contacts_title: "Pessoas cujas publicações você comentou"
       title: "Posts Comentados"
     community_spotlight_stream: "Destaque da Comunidade"
     followed_tag:
@@ -811,14 +821,16 @@ pt-PT:
       title: "Etiquetas #Seguidas"
     followed_tags_stream: "Etiquetas #Seguidas"
     like_stream:
-      contacts_title: "Pessoas cujos posts você gosta"
-      title: "Gosto do Fluxo"
+      contacts_title: "Pessoas cujas publicações você marcou"
+      title: "Artigos marcados"
     mentions:
       contacts_title: "Pessoas que o mencionaram"
       title: "Suas Menções"
     multi:
       contacts_title: "Pessoas no seu Fluxo"
       title: Fluxo
+    participate:
+      title: Participar
     public:
       contacts_title: "Cartazes Recentes"
       title: "Actividade Geral"
@@ -870,7 +882,8 @@ pt-PT:
       wrong_password: "A palavra-passe digitada não corresponde à sua palavra-passe actual."
     edit:
       also_commented: "...alguém também comenta na publicação do seu contacto?"
-      auto_follow_back: "Automatically follow back if a someone follows you"
+      auto_follow_aspect: "Aspecto para utilizadores automaticamente seguidos:"
+      auto_follow_back: "Seguir automaticamente quem o seguir a si"
       change: Alterar
       change_email: "Mudar de email"
       change_language: "Mudar de idioma"
@@ -883,7 +896,7 @@ pt-PT:
         make_diaspora_better: "Queremos que nos ajude a fazer a Diaspora melhor, logo deveria ajudar-nos  em vez de se ir embora. Se você quer deixar-nos, nós queremos que saiba o que acontece depois."
         mr_wiggles: "Mr Wiggles ficará triste de o(a) ver partir"
         no_turning_back: "Actualmente, não há como voltar atrás.\n"
-        what_we_delete: "Iremos apagar todos os seus posts, os dados do perfil, assim que for humanamente possível. Os seus comentários permanecerão por cá, mas serão associados com o seu nome de utilizador da Diáspora.\n"
+        what_we_delete: "Iremos apagar todas as suas publicações, os dados do perfil, assim que for humanamente possível. Os seus comentários permanecerão por cá, mas serão associados com o seu nome de utilizador da Diaspora.\n"
       close_account_text: "Fechar Conta"
       comment_on_post: "...alguém comenta as suas publicações?"
       current_password: "Palavra-passe actual"
@@ -892,6 +905,7 @@ pt-PT:
       edit_account: "Editar conta"
       email_awaiting_confirmation: "Enviámos-lhe uma hiperligação de activação para %{unconfirmed_email}. Até que siga esta hiperligação e active o novo endereço, continuaremos a utilizar o seu endereço original %{email}."
       export_data: "Exportar Dados"
+      following: "Definições de seguidores"
       getting_started: "Novas Preferências de Utilizador"
       liked: "...alguém gosta da sua publicação?"
       mentioned: "...é mencionado numa publicação?"
@@ -905,7 +919,7 @@ pt-PT:
       started_sharing: "...alguém começa a partilhar consigo?"
       stream_preferences: "Preferências de Fluxo"
       your_email: "O seu endereço de email"
-      your_handle: "A sua identificação do Diaspora"
+      your_handle: "A sua identificação na Diaspora"
     getting_started:
       awesome_take_me_to_diaspora: "Excelente! Quero ir para o Diaspora*"
       community_welcome: "A comunidade do Diaspora está feliz por o ter consigo!"
@@ -932,6 +946,8 @@ pt-PT:
       does_not_exist: "O utilizador %{username} não existe!"
     update:
       email_notifications_changed: "As notificações por email foram alteradas"
+      follow_settings_changed: "Definições alteradas"
+      follow_settings_not_changed: "Falha na alteração das definições"
       language_changed: "O idioma foi alterado"
       language_not_changed: "Falha ao alterar o idioma"
       password_changed: "A palavra-passe foi alterada. Já pode iniciar sessão com a sua nova palavra-passe."
@@ -946,4 +962,7 @@ pt-PT:
     no_person_constructed: "Nenhuma pessoa pôde ser construída através deste hcard."
     not_enabled: "webfinger parece não estar activado para o anfitrião de %{account}"
     xrd_fetch_failed: "ocorreu um erro ao obter o xrd da conta %{account}"
-  welcome: Bem-vindo(a)!
\ No newline at end of file
+  welcome: Bem-vindo(a)!
+  will_paginate:
+    next_label: "seguinte &raquo;"
+    previous_label: "&laquo; anterior"
\ No newline at end of file
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 1e9b11ec65789a1cecaeaa795e36fcb68041eeff..fc0fb1308d10c44a60fc4fd9562d090164ebb0d8 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -249,13 +249,6 @@ ro:
         other: "%{count} people disliked this"
         two: "%{count} dislikes"
         zero: "no people disliked this"
-      people_like_this:
-        few: "%{count} people liked this"
-        many: "%{count} people liked this"
-        one: "1 person liked this"
-        other: "%{count} people liked this"
-        two: "%{count} likes"
-        zero: "no people liked this"
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -263,6 +256,13 @@ ro:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Limitat
   more: "Mai mult"
   next: următorul
@@ -639,8 +639,6 @@ ro:
     stream_element:
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
-      like: "I like this"
-      unlike: "Nu È‹mi place"
       viewable_to_anyone: "Aceasta publicatie este vizibila oricui"
   status_messages:
     destroy:
@@ -664,8 +662,14 @@ ro:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       title: "Your Mentions"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     tags:
       contacts_title: "People who dig these tags"
   tag_followings:
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index fa443a07189ecb5dae634c9c6691823793973393..c59892a70b6ccb73885c4915be1cff51c73f5993 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -198,10 +198,14 @@ ru:
     index:
       add_a_new_aspect: "Новый аспект"
       add_to_aspect: "добавить контакты в %{name}"
+      add_to_aspect_link: "добавить контакты в аспект %{name}"
       all_contacts: "Все контакты"
+      community_spotlight: "В центре внимания"
       many_people_are_you_sure: "Вы уверены, что хотите начать приватную беседу с числом контактов более %{suggested_limit}? Возможно, лучше просто написать сообщение в этот аспект."
       my_contacts: "Мои контакты"
       no_contacts: "Похоже, вам надо добавить несколько контактов!"
+      no_contacts_message: "Загляните в %{community_spotlight}"
+      no_contacts_message_with_aspect: "Загляните в %{community_spotlight} или %{add_to_aspect_link}"
       only_sharing_with_me: "Только делящиеся со мной"
       remove_person_from_aspect: "Удалить %{person_name} из \"%{aspect_name}\""
       start_a_conversation: "Начать беседу"
@@ -292,6 +296,7 @@ ru:
     new:
       already_invited: "Следующие люди не приняли ваше приглашение:"
       aspect: Аспект
+      check_out_diaspora: "Попробуйте Диаспору!"
       comma_seperated_plz: "Вы можете ввести несколько адресов электронной почты через запятую."
       if_they_accept_info: "после согласия с их стороны, они будут добавлены в предложенный вами аспект."
       invite_someone_to_join: "Пригласить кого-либо в Диаспору!"
@@ -328,13 +333,6 @@ ru:
         other: "%{count} не понравилось "
         two: "%{count} не понравилось"
         zero: "никому не понравилось"
-      people_like_this:
-        few: "%{count} понравилось"
-        many: "%{count} понравилось"
-        one: "%{count} понравилось"
-        other: "%{count} понравилось"
-        two: "%{count} понравилось"
-        zero: "никому не понравилось"
       people_like_this_comment:
         few: "%{count} понравилось"
         many: "%{count} понравилось"
@@ -342,6 +340,13 @@ ru:
         other: "%{count} понравилось"
         two: "%{count} понравилось"
         zero: "не понравилось никому"
+      people_pin_this:
+        few: "Прикололи: %{count}"
+        many: "Прикололи: %{count}"
+        one: "Прикололи: %{count}"
+        other: "Прикололи: %{count}"
+        two: "Прикололи: %{count}"
+        zero: "Прикололи: 0"
   limited: Ограниченная
   more: Еще
   next: далее
@@ -737,6 +742,7 @@ ru:
     notification:
       new: "Новый %{type} из %{from}"
     public_explain:
+      atom_feed: Atom-лента
       control_your_audience: "Выбирайте свою аудиторию"
       logged_in: "вошли в %{service}"
       manage: "управление подключенными сервисами"
@@ -771,11 +777,11 @@ ru:
       hide_and_mute: "Скрыть и отключить уведомления"
       ignore_user: "Блокировать пользователя %{name}"
       ignore_user_description: "Блокировать и удалить пользователя из всех аспектов?"
-      like: "Мне нравится"
       nsfw: "Автор пометил эту запись как \"только для взрослых\". %{link}"
+      pin: Приколоть
       shared_with: "Для аспектов: %{aspect_names}"
       show: показать
-      unlike: "Не нравится"
+      unpin: Открепить
       via: "через %{link}"
       viewable_to_anyone: "Эту запись может видеть любой в интернете"
   status_messages:
@@ -826,7 +832,9 @@ ru:
       title: "@Упоминания"
     multi:
       contacts_title: "В вашем потоке"
-      title: Поток
+      title: Исследуйте
+    participate:
+      title: Участвовать
     public:
       contacts_title: "Последние публиковавшие"
       title: "Публичная активность"
@@ -875,7 +883,7 @@ ru:
       success: "Ваша учетная запись заблокирована. На полное закрытие вашей учетной записи может уйти до 20 минут. Спасибо, что были вместе с нами."
       wrong_password: "Введенный вами пароль не совпадает с вашим текущим паролем."
     edit:
-      also_commented: "... кто-то комментировал сообщения ваших контактов?"
+      also_commented: "...кто-то прокомментировал сообщения ваших контактов."
       auto_follow_aspect: "Помещать этих пользователей в аспект:"
       auto_follow_back: "Автоматически подписываться в ответ, если кто-то начинает следить за вашими записями"
       change: Изменить
@@ -892,7 +900,7 @@ ru:
         no_turning_back: "На данный момент обратного пути нет."
         what_we_delete: "Мы удаляем все ваши записи и данные профиля так быстро, как только можем. Ваши комментарии будут по-прежнему доступны, но они не будут привязаны к вашему идентификатору в Диаспоре."
       close_account_text: "Закрыть аккаунт"
-      comment_on_post: "... кто-то прокомментировал вашу запись?"
+      comment_on_post: "...кто-то прокомментировал вашу запись."
       current_password: "Текущий пароль"
       download_photos: "Скачать мои фотографии"
       download_xml: "Скачать мою информацию в xml"
@@ -901,16 +909,16 @@ ru:
       export_data: "Экспорт информации"
       following: "Настройки подписок"
       getting_started: "Новые пользовательские настройки"
-      liked: "...кому-нибудь нравится ваше сообщение?"
-      mentioned: "... вы упомянуты в сообщении?"
+      liked: "...кому-то понравилось ваше сообщение."
+      mentioned: "...вы были упомянуты в сообщении."
       new_password: "Новый пароль"
       photo_export_unavailable: "Экспорт фотографий сейчас недоступен"
-      private_message: "... вы получаете личное сообщение?"
+      private_message: "...вы получили личное сообщение."
       receive_email_notifications: "Получать уведомление по электронной почте, когда..."
       reshared: "...кто-то делится вашей записью?"
       show_community_spotlight: "Показывать рекомендуемых пользователей в потоке?"
       show_getting_started: "Вернуть информацию для начинающих"
-      started_sharing: "...кто-то начинает делиться с вами?"
+      started_sharing: "...кто-то начал делиться с вами."
       stream_preferences: "Настройки потока"
       your_email: "Ваш адрес электронной почты"
       your_handle: "Ваш идентификатор в Диаспоре"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index db1074f14abfc85d9d5b0e732f4fa814b506c1e7..7860a8efb955a1d535d2675be4bf456301b5e184 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -200,10 +200,14 @@ sk:
     index:
       add_a_new_aspect: "Pridať novú kategóriu"
       add_to_aspect: "Pridať kontakty do kategórie %{name}"
+      add_to_aspect_link: "pridať kontakt do %{name}"
       all_contacts: "VÅ¡etky kontakty"
+      community_spotlight: "V centre pozornosti komunity"
       many_people_are_you_sure: "Určite chcete začať súkromný rozhovor s viac ako %{suggested_limit} ľuďmi? Poslanie príspevku do tejto kategórie môže byť lepší spôsob, ako sa s nimi spojiť."
       my_contacts: "Moje kontakty"
       no_contacts: "Zdá sa, že treba pridať pár kontaktov!"
+      no_contacts_message: "Pozrite si %{community_spotlight}"
+      no_contacts_message_with_aspect: "Pozrite si %{community_spotlight} alebo %{add_to_aspect_link}"
       only_sharing_with_me: "Tí, ktorí sa delia iba  so mnou"
       remove_person_from_aspect: "Odstrániť použ. %{person_name} z kategórie %{aspect_name}"
       start_a_conversation: "Začať rozhovor"
@@ -296,6 +300,7 @@ sk:
     new:
       already_invited: "Títo ľudia neprijali vaše pozvanie:"
       aspect: Kategória
+      check_out_diaspora: "Vyskúšajte Diasporu!"
       comma_seperated_plz: "Môžete vložiť viacero adries; oddeľte ich čiarkou."
       if_they_accept_info: "Po odsúhlasení budú pozvaní používatelia pridaní  do príslušnej kategórie."
       invite_someone_to_join: "Pozvite niekoho na Diasporu*!"
@@ -332,13 +337,6 @@ sk:
         other: "%{count} ľuďom sa to nepáči"
         two: "%{count} ľuďom sa to nepáči"
         zero: "nie sú takí, ktorým sa to nepáči"
-      people_like_this:
-        few: "%{count} ľudom sa to páči"
-        many: "%{count} ľuďom sa to páči"
-        one: "1 človeku sa to páči"
-        other: "%{count} ľuďom sa to páči"
-        two: "%{count} ľuďom sa to páči"
-        zero: "žiadne ohlasy"
       people_like_this_comment:
         few: "%{count} ľuďom sa to páči"
         many: "%{count} ľuďom sa to páči"
@@ -346,6 +344,13 @@ sk:
         other: "%{count} ľuďom sa to páči"
         two: "%{count} ľuďom sa to páči"
         zero: "žiadne ohlasy"
+      people_pin_this:
+        few: "%{count} špendlíkov"
+        many: "%{count} špendlíkov"
+        one: "%{count} špendlík"
+        other: "%{count} špendlíkov"
+        two: "%{count} špendlíky"
+        zero: "žiadne špendlíky"
   limited: Obmedzený
   more: Viac
   next: ďalej
@@ -392,19 +397,19 @@ sk:
       mark_all_as_read: "Všetky označiť ako prečítané"
       notifications: Oznamy
     liked:
-      few: "%{actors} označili, že sa im páči %{post_link}."
-      many: "%{actors} označili, že sa im páči %{post_link}."
-      one: "%{actors} označil(a), že sa mu (jej) páči %{post_link}."
-      other: "%{actors} označil(a), že sa mu (jej) páči %{post_link}."
-      two: "%{actors} práve označili, že sa im páči %{post_link}."
-      zero: "%{actors} označilo, že sa im páči %{post_link}."
+      few: "%{actors} ľudia pridali špendlíky na %{post_link}."
+      many: "%{actors} ľudia pridali špendlíky na %{post_link}."
+      one: "%{actors} pridal(a) špendlíky na %{post_link}."
+      other: "%{actors} pridal(a) špendlíky na %{post_link}."
+      two: "%{actors} ľudia práve pridali špendlíky na %{post_link}."
+      zero: "%{actors} ľudia pridali špendlíky na %{post_link}."
     liked_post_deleted:
-      few: "%{actors} ľuďom sa páčil váš vymazaný príspevok."
-      many: "%{actors} ľuďom sa páčil váš vymazaný príspevok."
-      one: "%{actors} človeku sa páčil váš vymazaný príspevok."
-      other: "%{actors} ľuďom sa páčil váš vymazaný príspevok."
-      two: "%{actors} ľuďom sa páčil váš vymazaný príspevok."
-      zero: "%{actors} ľuďom sa páčil váš vymazaný príspevok."
+      few: "%{actors} ľudia pridali špendlíky na váš vymazaný príspevok."
+      many: "%{actors} ľudia pridali špendlíky na váš vymazaný príspevok."
+      one: "%{actors} človek pridal špendlík na váš vymazaný príspevok."
+      other: "%{actors} ľudia pridali špendlíky na váš vymazaný príspevok."
+      two: "%{actors} ľudia pridali špendlíky na váš vymazaný príspevok."
+      zero: "%{actors} ľudia pridali špendlíky na váš vymazaný príspevok."
     mentioned:
       few: "%{actors} vás spomenul(a) v %{post_link}."
       many: "%{actors} vás spomenuli v príspevku %{post_link}."
@@ -459,7 +464,7 @@ sk:
     email_sent_by_diaspora: "Tento e-mail poslala Diaspora. Ak nechcete dostávať takéto e-maily,"
     hello: "Ahoj %{name}!"
     liked:
-      liked: "%{name} označil(a), že sa mu/jej páči váš príspevok"
+      liked: "%{name} pridal(a) špendlík na váš príspevok"
       view_post: "Zobraziť príspevok >"
     mentioned:
       mentioned: "vás spomenul(a) v príspevku:"
@@ -740,6 +745,7 @@ sk:
     notification:
       new: "Nový %{type} od použ. %{from}"
     public_explain:
+      atom_feed: "Zdroj RSS Atom"
       control_your_audience: "Kontrolovať publikum"
       logged_in: "Prihlásenie na %{service}"
       manage: "Spravovať prepojené služby"
@@ -774,11 +780,11 @@ sk:
       hide_and_mute: "Schovať príspevok  a vypnúť oznamy"
       ignore_user: "Ignorovať použ. %{name}"
       ignore_user_description: "Ignorovať použ. a odstrániť ho (ju)  zo všetkých kategórií?"
-      like: "Páči sa mi to"
       nsfw: "Autor(ka) označil(a) tento príspevok za nevhodný v práci. %{link}"
+      pin: Špendlík
       shared_with: "Na vedomie: %{aspect_names}"
       show: Zobraziť
-      unlike: Odznačiť
+      unpin: "Odobrať špendlík"
       via: "na %{link}"
       viewable_to_anyone: "Tento príspevok si môže pozrieť každý na webe"
   status_messages:
@@ -821,15 +827,17 @@ sk:
       title: "#Značky, ktoré sledujete"
     followed_tags_stream: "#Značky, ktoré sledujete"
     like_stream:
-      contacts_title: "Ľudia, ktorých príspevky sa vám páčia"
-      title: "Nástenka „Páči sa mi“"
+      contacts_title: "Ľudia, ktorých príspevky ste pripli špendlíkom"
+      title: Špendlíky
     mentioned_stream: "@Zmienky"
     mentions:
       contacts_title: "Ľudia, ktorí vás spomenuli"
       title: "@Zmienky"
     multi:
-      contacts_title: "Ľudia na vašej nástenke"
-      title: Nástenka
+      contacts_title: "Ľudia vo vašom prehľadávaní"
+      title: Prehľadávať
+    participate:
+      title: Účasť
     public:
       contacts_title: "Autori najnovších príspevkov"
       title: "Verejná aktivita"
@@ -905,7 +913,7 @@ sk:
       export_data: "Exportovať dáta"
       following: "Nastavenia sledovania"
       getting_started: "Nové nastavenia používateľa"
-      liked: "...sa niekomu páči váš príspevok?"
+      liked: "...niekto pridá špendlík na váš príspevok?"
       mentioned: "...vás spomenuli v príspevku?"
       new_password: "Nové heslo"
       photo_export_unavailable: "Momentálne sa fotky nedajú exportovať"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index aa14aa919ac41e0fa51757d6e7396a354f420da5..1d8f49f15d6ccee9a86d2564622fc7f8485dca95 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -322,13 +322,6 @@ sl:
         other: "%{count} oseb ne mara"
         two: "%{count} osebi ne marata"
         zero: "ni osebe, ki ne mara"
-      people_like_this:
-        few: "%{count} osebam je všeč"
-        many: "% {Count} osebam je všeč"
-        one: "1 osebi je všeč"
-        other: "%{count} osebam je všeč"
-        two: "%{count} osebama je všeč"
-        zero: "nobenemu ni všeč"
       people_like_this_comment:
         few: "%{count} osebam je všeč"
         many: "%{count} osebam je všeč"
@@ -336,6 +329,13 @@ sl:
         other: "%{count} osebam je všeč."
         two: "%{count} osebama je všeč"
         zero: "nobenemu ni všeč"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Omejeno
   more: Več
   next: naslednja
@@ -760,11 +760,9 @@ sl:
       hide_and_mute: "Skrij in utišaj objavo"
       ignore_user: "Ignoriraj osebo %{name}"
       ignore_user_description: "Ignoriraj in odstrani osebo iz vseh pogledov?"
-      like: "Več mi je"
       nsfw: "To objavo je avtor označil kot neprimerno za delo. %{link}"
       shared_with: "Deljeno z: %{aspect_names}"
       show: prikaži
-      unlike: "Ni mi všeč"
       via: "preko %{link}"
       viewable_to_anyone: "Ta objava je vidna vsakomur na spletu"
   status_messages:
diff --git a/config/locales/diaspora/sq.yml b/config/locales/diaspora/sq.yml
index 71af4c2e178e990f5cdcbd52eff7a95478b50606..e552394af0382e2f6d4724d47e2fd62806c32c6b 100644
--- a/config/locales/diaspora/sq.yml
+++ b/config/locales/diaspora/sq.yml
@@ -310,13 +310,6 @@ sq:
         other: "%{count} mospëlqime"
         two: "%{count} mospëlqime"
         zero: "pa mospëlqime"
-      people_like_this:
-        few: "%{count} pëlqime"
-        many: "%{count} pëlqime"
-        one: "%{count} pëlqim"
-        other: "%{count} pëlqime"
-        two: "%{count} pëlqime"
-        zero: "pa pëlqime"
       people_like_this_comment:
         few: "%{count} pëlqime"
         many: "%{count} pëlqime"
@@ -324,6 +317,13 @@ sq:
         other: "%{count} pëlqime"
         two: "%{count} pëlqime"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: "E kufizuar"
   more: "Më tepër"
   next: pasuesja
@@ -635,6 +635,13 @@ sq:
       other: "Show %{count} more comments"
       two: "Show two more comments"
       zero: "No more comments"
+  streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
   terms_and_conditions: "Terma dhe Kushte"
   undo: "Të zhbëhet?"
   username: "Emër përdoruesi"
@@ -642,5 +649,6 @@ sq:
     edit:
       close_account:
         what_we_delete: "We delete all of your posts, profile data, as soon as humanly possible. Your comments will hang around, but be associated with your Diaspora Handle."
+      liked: "...someone likes your post?"
       your_handle: "Your diaspora id"
   welcome: "Mirë se vini!"
\ No newline at end of file
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index bd2dc13797bc7fae3c49ce1318a7cc640a963f13..efe837598fbb7cefd73ff0fed5460f7b4cdd013f 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -322,13 +322,6 @@ sv:
         other: "%{count} personer ogillar det här"
         two: "Två personer gillar inte"
         zero: "inga personer ogillar det här"
-      people_like_this:
-        few: "%{count} personer gillar det här"
-        many: "%{count} personer gillar det här"
-        one: "1 person gillar det här"
-        other: "%{count} personer gillar det här"
-        two: "Två personer gillar"
-        zero: "inga personer gillar det här"
       people_like_this_comment:
         few: "%{count} gillar"
         many: "%{count} gillar"
@@ -336,6 +329,13 @@ sv:
         other: "%{count} gillar"
         two: "Två personer gillar"
         zero: "Ingen gillar"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Begränsad
   more: Mer
   next: nästa
@@ -758,11 +758,9 @@ sv:
       hide_and_mute: "Dölj och ignorera"
       ignore_user: "Ignorera %{name}"
       ignore_user_description: "Ignorera och ta bort användaren från alla aspekter?"
-      like: "Jag gillar det här"
       nsfw: "Detta inlägg har blivit flaggat som NSFW av författaren . %{link}"
       shared_with: "Delas med: %{aspect_names}"
       show: visa
-      unlike: "Sluta gilla"
       viewable_to_anyone: "Detta inlägg är synligt för alla på nätet"
   status_messages:
     create:
diff --git a/config/locales/diaspora/te.yml b/config/locales/diaspora/te.yml
index 2cd3a122fc990fd590d31606aab0b07752c24124..ab570e5bcf2145a765860114ed5a625345a91542 100644
--- a/config/locales/diaspora/te.yml
+++ b/config/locales/diaspora/te.yml
@@ -99,13 +99,6 @@ te:
         other: "%{count} dislikes"
         two: "%{count} dislikes"
         zero: "no dislikes"
-      people_like_this:
-        few: "%{count} likes"
-        many: "%{count} likes"
-        one: "%{count} like"
-        other: "%{count} likes"
-        two: "%{count} likes"
-        zero: "no likes"
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -113,6 +106,13 @@ te:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: పరిమితం
   notifications:
     also_commented:
@@ -211,6 +211,8 @@ te:
       zero: "%{actors} started sharing with you."
   notifier:
     click_here: "ఇక్కడ నొక్కండి"
+    liked:
+      liked: "%{name} liked your post"
   ok: సరే
   or: లేదా
   password: సంకేతపదం
@@ -313,6 +315,13 @@ te:
       other: "Show %{count} more comments"
       two: "Show two more comments"
       zero: "No more comments"
+  streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
   terms_and_conditions: "నియమాలు మరియు నిబంధనలు"
   users:
     edit:
@@ -323,6 +332,7 @@ te:
         what_we_delete: "We delete all of your posts, profile data, as soon as humanly possible. Your comments will hang around, but be associated with your Diaspora Handle."
       close_account_text: "ఖాతా మూసివేత"
       current_password: "ప్రస్తుత సంకేతపదం"
+      liked: "...someone likes your post?"
       new_password: "కొత్త సంకేతపదం"
       your_email: "మీ ఈమెయిలు"
       your_handle: "మీ డయస్పోరా గుర్తింపు"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 15bd800e2b4fa2f271bb559c63230d68ca21fe46..590c4d7107105f2e28c448f5494c0c2a17bc7136 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -202,10 +202,14 @@ tr:
     index:
       add_a_new_aspect: "Yeni yön ekle"
       add_to_aspect: "%{name} unsuruna kiÅŸi ekle"
+      add_to_aspect_link: "kişileri %{name} yönüne ekle"
       all_contacts: "Tüm Kişiler"
+      community_spotlight: "Topluluk Haberleri"
       many_people_are_you_sure: "%{suggested_limit} sayısından yüksek kişiyle özel görüşme başlatmak istediğinden emin misin? Bu yöne gönderi yapmak onlarla iletişime geçmek için daha iyi bir yol olabilir."
       my_contacts: KiÅŸilerim
       no_contacts: "Birkaç kişi eklemen gerekir gibi görünüyor!"
+      no_contacts_message: "%{community_spotlight}'ni ziyaret et"
+      no_contacts_message_with_aspect: "%{community_spotlight}'ni ziyaret et ya da %{add_to_aspect_link}"
       only_sharing_with_me: "Benimle paylaşım yapan"
       remove_person_from_aspect: "%{person_name} kişisini \"%{aspect_name}\" yönünden kaldır"
       start_a_conversation: "Bir iletişim başlatın"
@@ -293,6 +297,7 @@ tr:
     new:
       already_invited: "Aşağıdaki kişiler davetinizi kabul etmedi:"
       aspect: Yön
+      check_out_diaspora: "Diaspora'yı deneyin!"
       comma_seperated_plz: "Virgülle ayırarak birden fazla e-posta adresi girebilirsin."
       if_they_accept_info: "kabul ederseler, yönünüze eklenecekler."
       invite_someone_to_join: "Diaspora'ya birilerini davet et!"
@@ -304,6 +309,7 @@ tr:
       to: Kime
   layouts:
     application:
+      back_to_top: "Sayfa başına dön"
       powered_by: "GELÄ°ÅžTÄ°RÄ°CÄ° DIASPORA*"
       public_feed: " %{name} için Genel Diaspora Beslemesi"
       toggle: "mobil site"
@@ -327,13 +333,6 @@ tr:
         other: "%{count} kiÅŸi beÄŸenmedi"
         two: "%{count} beÄŸenmeme"
         zero: "beÄŸenmeyen yok"
-      people_like_this:
-        few: "%{count} kiÅŸi beÄŸendi"
-        many: "%{count} kiÅŸi beÄŸendi"
-        one: "1 kiÅŸi beÄŸendi"
-        other: "%{count} kiÅŸi beÄŸendi"
-        two: "%{count} kiÅŸi beÄŸendi"
-        zero: "beÄŸenme yok"
       people_like_this_comment:
         few: "%{count} kiÅŸi bunu beÄŸendi"
         many: "%{count} kiÅŸi bunu beÄŸendi!"
@@ -341,6 +340,13 @@ tr:
         other: "%{count} beÄŸenme"
         two: "%{count} kiÅŸi bunu beÄŸendi"
         zero: "beÄŸenen yok"
+      people_pin_this:
+        few: "%{count} kez iÄŸnelendi"
+        many: "%{count} kez iÄŸnelendi"
+        one: "%{count} kez iÄŸnelendi"
+        other: "%{count} kez iÄŸnelendi"
+        two: "%{count} kez iÄŸnelendi"
+        zero: "hiç iğnelenmemiş"
   limited: Sınırlı
   more: "Daha fazla"
   next: sonraki
@@ -387,19 +393,19 @@ tr:
       mark_all_as_read: "Tümünü okundu olarak işaretle"
       notifications: Bildirimler
     liked:
-      few: "%{actors} %{post_link} beÄŸendi."
-      many: "%{actors} %{post_link} beÄŸendi."
-      one: "%{actors} %{post_link} beÄŸendi."
-      other: "%{actors} %{post_link} gönderini beğendi."
-      two: "%{actors} %{post_link}yi beÄŸendi."
-      zero: "%{actors} %{post_link} beÄŸendi."
+      few: "%{actors} senin %{post_link} unsurunu iÄŸneledi."
+      many: "%{actors} senin %{post_link} unsurunu iÄŸneledi."
+      one: "%{actors} senin %{post_link} unsurunu iÄŸneledi."
+      other: "%{actors} senin %{post_link} unsurunu iÄŸneledi."
+      two: "%{actors} senin %{post_link} unsurunu iÄŸneledi."
+      zero: "%{actors} senin %{post_link} unsurunu iÄŸneledi."
     liked_post_deleted:
-      few: "%{actors} silinmiş gönderinizi beğendi."
-      many: "%{actors} silinmiş gönderinizi beğendi."
-      one: "%{actors} silinmiş gönderinizi beğendi."
-      other: "%{actors} silinmiş gönderinizi beğendi."
-      two: "%{actors} silinen gönderiyi beğendi."
-      zero: "%{actors} silinmiş gönderinizi beğendi."
+      few: "%{actors} silinmiş gönderinizi iğneledi."
+      many: "%{actors} silinmiş gönderinizi iğneledi."
+      one: "%{actors} silinmiş gönderinizi iğneledi."
+      other: "%{actors} silinmiş gönderinizi iğneledi."
+      two: "%{actors} silinen gönderiyi iğneledi."
+      zero: "%{actors} silinmiş gönderinizi iğnelemedi."
     mentioned:
       few: "%{actors} %{post_link} senden bahsetti."
       many: "%{actors} %{post_link} senden bahsetti."
@@ -454,7 +460,7 @@ tr:
     email_sent_by_diaspora: "Bu e-posta Diaspora tarafından gönderildi. Bu gibi e-postalar almak istemiyorsanız,"
     hello: "Merhaba %{name}!"
     liked:
-      liked: "%{name} gönderinizi beğendi."
+      liked: "%{name} gönderini iğneledi."
       view_post: "Gönderiyi görüntüle >"
     mentioned:
       mentioned: "gönderisinde senden bahsetti:"
@@ -736,6 +742,7 @@ tr:
     notification:
       new: "%{from}'den yeni %{type}"
     public_explain:
+      atom_feed: "Atom beslemesi"
       control_your_audience: "Hedef Kitle Kontrolü"
       logged_in: "%{service} servisine bağlandınız."
       manage: "bağlı servisleri yönetin"
@@ -770,11 +777,11 @@ tr:
       hide_and_mute: "Gönderiyi gizle ve sustur"
       ignore_user: "%{name} isimli kullanıcıyı görmezden gel"
       ignore_user_description: "Kullanıcı görmezden gelinip tüm yönlerden kaldırılsın mı?"
-      like: BeÄŸen
       nsfw: "Bu gönderi yazarı tarafından NSFW ile etiketlenmiştir. %{link}"
+      pin: Ä°ÄŸnele
       shared_with: "%{aspect_names} ile paylaşıldı"
       show: göster
-      unlike: BeÄŸenme
+      unpin: "İğnelemeyi kaldır"
       via: "%{link} ile"
       viewable_to_anyone: "Bu gönderi web üzerindeki herkes tarafından görünebilir."
   status_messages:
@@ -817,15 +824,17 @@ tr:
       title: "#Takip Edilen Etiketler"
     followed_tags_stream: "#Takip Edilen Etiketler"
     like_stream:
-      contacts_title: "Gönderilerini beğendiğin kişiler"
-      title: "Beğenilenler akışı"
+      contacts_title: "Gönderilerini iğnelediğin kişiler"
+      title: "İğnelenenler akışı"
     mentioned_stream: "@Bahsedenler"
     mentions:
       contacts_title: "Senden Bahsedenler"
       title: "@Bahsedenler"
     multi:
-      contacts_title: KiÅŸiler
-      title: Akış
+      contacts_title: "Göz atma akışındaki kişiler"
+      title: "Göz at"
+    participate:
+      title: Katıl
     public:
       contacts_title: "Yeni Düzen"
       title: "Genel Aktiviteler"
@@ -901,7 +910,7 @@ tr:
       export_data: "Bilgilerimi Dışarı taşı"
       following: "İzleme ayarları"
       getting_started: "Yeni Kullanıcı Tercihleri"
-      liked: "...birisi gönderimi beğendiğinde?"
+      liked: "...birisi gönderimi iğnelediğinde?"
       mentioned: "...benden bahsedildiÄŸinde?"
       new_password: "Yeni parola"
       photo_export_unavailable: "Fotoğraf aktarma şu anda kullanılamıyor"
@@ -929,7 +938,7 @@ tr:
     logged_out:
       go_mobile: "Åžimdi mobil olun."
       on_your_mobile_device: "mobil cihazınız üzerinden diaspora* mobile erişim."
-      signed_out: "Diaspora'dan çıkış yaptınız*"
+      signed_out: "Diaspora'dan çıkış yaptın"
       simply_visit: "Basitçe ziyaret"
       works_on_modern: "Tüm modern akıllı telefonlarda çalışır"
     privacy_settings:
diff --git a/config/locales/diaspora/uk.yml b/config/locales/diaspora/uk.yml
index c2ee6f516d1bf2c969cd421a0f78c0d76720a06a..c0241572fb9b4341ecbacfdac60fc5a08eae3ab7 100644
--- a/config/locales/diaspora/uk.yml
+++ b/config/locales/diaspora/uk.yml
@@ -323,13 +323,6 @@ uk:
         other: "%{count} не сподобалося"
         two: "%{count} не сподобалося"
         zero: "нікому не сподобалося"
-      people_like_this:
-        few: "%{count} сподобалося"
-        many: "%{count} сподобалося"
-        one: "%{count} сподобалося"
-        other: "%{count} сподобалося"
-        two: "%{count} сподобалося"
-        zero: "нікому не сподобалося"
       people_like_this_comment:
         few: "%{count} сподобалося"
         many: "%{count} сподобалося"
@@ -337,6 +330,13 @@ uk:
         other: "%{count} сподобалося"
         two: "%{count} сподобалося"
         zero: "не сподобалося нікому"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: Обмежена
   more: Ще
   next: далі
@@ -765,11 +765,9 @@ uk:
       hide_and_mute: "Приховати і відключити повідомлення"
       ignore_user: "Блокувати користувача %{name}"
       ignore_user_description: "Блокувати та видалити користувача з усіх аспектів?"
-      like: "Мені подобається"
       nsfw: "Автор помітив цей запис як тільки для дорослих\". %{link}"
       shared_with: "Для аспектів: %{aspect_names}"
       show: показати
-      unlike: "Не подобається"
       via: "через %{link}"
       viewable_to_anyone: "Цей запис може бачити будь-хто в Інтернеті"
   status_messages:
diff --git a/config/locales/diaspora/ur-PK.yml b/config/locales/diaspora/ur-PK.yml
index bd2ed7f5caf736332307f9c6db6985ca23afcda0..46f31d499c53bf082eac321cd0648026bfdc27d5 100644
--- a/config/locales/diaspora/ur-PK.yml
+++ b/config/locales/diaspora/ur-PK.yml
@@ -190,13 +190,6 @@ ur-PK:
         other: "%{count} dislikes"
         two: "%{count} dislikes"
         zero: "no dislikes"
-      people_like_this:
-        few: "%{count} likes"
-        many: "%{count} likes"
-        one: "%{count} like"
-        other: "%{count} likes"
-        two: "%{count} likes"
-        zero: "no likes"
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -204,6 +197,13 @@ ur-PK:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   notifications:
     also_commented:
       few: "%{actors} also commented on %{post_author}'s %{post_link}."
@@ -385,8 +385,14 @@ ur-PK:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       title: "Your Mentions"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     tags:
       contacts_title: "People who dig these tags"
   tag_followings:
@@ -401,6 +407,7 @@ ur-PK:
       auto_follow_back: "Automatically follow back if a someone follows you"
       close_account:
         what_we_delete: "We delete all of your posts, profile data, as soon as humanly possible. Your comments will hang around, but be associated with your Diaspora Handle."
+      liked: "...someone likes your post?"
       your_handle: "Your diaspora id"
     getting_started:
       what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
\ No newline at end of file
diff --git a/config/locales/diaspora/vi.yml b/config/locales/diaspora/vi.yml
index b28542babf35863d656cf824a96cb709dda9993a..ba13153fa821d0e9ff1fa7108dda58d3a60a5892 100644
--- a/config/locales/diaspora/vi.yml
+++ b/config/locales/diaspora/vi.yml
@@ -302,13 +302,6 @@ vi:
         other: "%{count} người không thích"
         two: "%{count} người không thích"
         zero: "chưa có người không thích"
-      people_like_this:
-        few: "%{count} người thích"
-        many: "%{count} người thích"
-        one: "%{count} người thích"
-        other: "%{count} người thích"
-        two: "%{count} người thích"
-        zero: "không có người thích"
       people_like_this_comment:
         few: "%{count} người thích"
         many: "%{count} người thích"
@@ -316,6 +309,13 @@ vi:
         other: "%{count} người thích"
         two: "%{count} người thích"
         zero: "không có người thích"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: "Bị giới hạn"
   next: "tiếp theo"
   no_results: "Không tìm thấy kết quả"
@@ -535,8 +535,14 @@ vi:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       title: "Tin của bạn"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     tags:
       contacts_title: "People who dig these tags"
   tag_followings:
@@ -568,6 +574,7 @@ vi:
       email_awaiting_confirmation: "Chúng tôi đã gửi đường dẫn kích hoạt đến %{unconfirmed_email}. Chúng tôi vẫn dùng địa chỉ gốc của bạn %{email} cho đến khi bạn xác nhận địa chỉ mới."
       export_data: "Xuất dữ liệu"
       getting_started: "Tuỳ chỉnh người dùng mới"
+      liked: "...someone likes your post?"
       new_password: "Mật khẩu mới"
       photo_export_unavailable: "Chức năng xuất ảnh hiện chưa hoạt động"
       private_message: "...bạn nhận được một tin nhắn cá nhân?"
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 4c154ef0c07f7ba851dbefdbdf6db91ee2bc99d8..e06e054f1778941cef31b60aa1b7df968e275da0 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -255,13 +255,6 @@ zh-CN:
         other: "有%{count}个人觉得不好"
         two: "%{count} dislikes"
         zero: 没有人觉得不好
-      people_like_this:
-        few: "有%{count}个人觉得好"
-        many: "有%{count}个人觉得好"
-        one: 有1个人觉得好
-        other: "有%{count}个人觉得好"
-        two: "%{count} likes"
-        zero: 没有人觉得好
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
@@ -269,6 +262,13 @@ zh-CN:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   more: 更多
   next: 下一步
   no_results: 没有找到符合条件的内容
@@ -639,8 +639,6 @@ zh-CN:
     stream_element:
       dislike: 不喜欢
       hide_and_mute: "Hide and Mute"
-      like: 喜欢
-      unlike: 不喜欢
       via: "通过 %{link}"
   status_messages:
     create:
@@ -668,8 +666,14 @@ zh-CN:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentions:
       title: "Your Mentions"
+    multi:
+      contacts_title: "People in your Stream"
+      title: Stream
     tags:
       contacts_title: "People who dig these tags"
   tag_followings:
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 764eff428f2ee6bf72d2cd5c7d6744464ffa3f42..ae15ed1e36dd0419c5fad65941d510da37598aaa 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -331,13 +331,6 @@ zh-TW:
         other: "有%{count}個遜"
         two: "%{count}個遜"
         zero: 沒有遜
-      people_like_this:
-        few: "有%{count}個讚"
-        many: "有%{count}個讚"
-        one: "有%{count}個讚"
-        other: "有%{count}個讚"
-        two: "%{count}個讚"
-        zero: 沒有讚
       people_like_this_comment:
         few: "有%{count}個人說讚"
         many: "有%{count}個人說讚"
@@ -345,6 +338,13 @@ zh-TW:
         other: "有%{count}個人說讚"
         two: "%{count}個讚"
         zero: 沒人說讚
+      people_pin_this:
+        few: "%{count} pins"
+        many: "%{count} pins"
+        one: "%{count} pin"
+        other: "%{count} pins"
+        two: "%{count} pins"
+        zero: "no pins"
   limited: 限制
   more: 更多
   next: 後面
@@ -773,9 +773,7 @@ zh-TW:
       hide_and_mute: 隱藏貼文並消音
       ignore_user: "忽視 %{name}"
       ignore_user_description: "是否要忽視該使用者, 並將其從所有面向中移除?"
-      like: 讚
       shared_with: "分享給: %{aspect_names}"
-      unlike: 收回讚
       via: "經由%{link}"
       viewable_to_anyone: 任何網頁使用者都能看到這則貼文
   status_messages:
diff --git a/config/locales/javascript/javascript.ar.yml b/config/locales/javascript/javascript.ar.yml
index 1e4febbc1433c3d5f28f8b33dd1dbad62673ff4c..f1988b3faad016dd9e736f102e2667d7f0480620 100644
--- a/config/locales/javascript/javascript.ar.yml
+++ b/config/locales/javascript/javascript.ar.yml
@@ -28,6 +28,8 @@ ar:
     getting_started:
       hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "لا توجد أية رسائل أخرى"
     publisher:
@@ -39,6 +41,7 @@ ar:
     search_for: "إبحث عن {{name}}"
     show_more: المزيد
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -60,6 +63,7 @@ ar:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
diff --git a/config/locales/javascript/javascript.bg.yml b/config/locales/javascript/javascript.bg.yml
index 3fa727d406aa196b7960217f035585ac238eb4dc..dcc1b58844a79a245ff2d69be7ded6da2fd15292 100644
--- a/config/locales/javascript/javascript.bg.yml
+++ b/config/locales/javascript/javascript.bg.yml
@@ -18,7 +18,7 @@ bg:
         many: "В <%= count %> аспекта"
         one: "В <%= count %> аспект"
         other: "В <%= count %> аспекта"
-        two: "В {{count}} аспекта"
+        two: "В <%= count %> аспекта"
         zero: "Избиране на аспект(и)"
     aspect_navigation:
       deselect_all: Никой
@@ -46,7 +46,7 @@ bg:
       notifications: Известия
       profile: Профил
       recent_notifications: Скорошни
-      search: "Намеретр хора или #диез-марки"
+      search: "Намерете хора или #диез-марки"
       settings: Настройки
       view_all: "Покажи всички"
     ignore: Игнориране
@@ -65,6 +65,7 @@ bg:
     stream:
       comment: Коментиране
       hide: Скриване
+      like: "Харесва ми"
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -72,6 +73,7 @@ bg:
         other: "<%= count %> Likes"
         two: "<%= count %> Likes"
         zero: "<%= count %> Likes"
+      limited: Ограничено
       more_comments:
         few: "Покажи останалите <%= count %> коментара"
         many: "Покажи останалите <%= count %> коментара"
@@ -81,6 +83,7 @@ bg:
         zero: "Покажи осталите <%= count %> коментара"
       nsfw: "Публикацията Не е Подходяща за Работното Място (NSFW), според автора."
       original_post_deleted: "Авторът на оригиналната публикация я е изтрил."
+      public: Публично
       reshare: Споделяне
       reshares:
         few: "<%= count %> споделяния"
@@ -90,6 +93,7 @@ bg:
         two: "<%= count %> Reshares"
         zero: "<%= count %> споделяния"
       show: Показване
+      unlike: "Не ми харесва"
     tags:
       wasnt_that_interesting: "Е, вероятно марката #<%= tagName %> не е чак толкова интересна..."
     timeago:
diff --git a/config/locales/javascript/javascript.br.yml b/config/locales/javascript/javascript.br.yml
index cfecebfefe9864b8e06eca056a773a52995c5f11..935c3592ade3c4096f3917a754a68f69099767f7 100644
--- a/config/locales/javascript/javascript.br.yml
+++ b/config/locales/javascript/javascript.br.yml
@@ -19,15 +19,19 @@ br:
         two: "In <%= count %> aspects"
         zero: "Add to aspect"
     confirm_dialog: "Emaoc'h sur?"
+    failed_to_like: "Failed to like!"
     getting_started:
       hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
+    header:
+      search: "Find people or #tags"
     publisher:
       at_least_one_aspect: "Dav eo deoc'h embann un arvez da'n nebeutañ"
     reshares:
       duplicate: "You've already reshared that post!"
     search_for: "Klask war-lerc'h {{name}}"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -49,6 +53,7 @@ br:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
diff --git a/config/locales/javascript/javascript.cs.yml b/config/locales/javascript/javascript.cs.yml
index d5e572b93b38c244960166dce06598451799cd56..ad90af36edf0d7335879e86dff1d98c719a4e443 100644
--- a/config/locales/javascript/javascript.cs.yml
+++ b/config/locales/javascript/javascript.cs.yml
@@ -28,6 +28,8 @@ cs:
     getting_started:
       hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "Žádné další příspěvky."
     publisher:
@@ -39,6 +41,7 @@ cs:
     search_for: "Hledat {{name}}"
     show_more: "zobrazit více"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -60,6 +63,7 @@ cs:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
diff --git a/config/locales/javascript/javascript.cy.yml b/config/locales/javascript/javascript.cy.yml
index ba885da76d666fdffc2b43919517123caae34a25..7ac0c71a0713df2d336fc81c85e4d867ff74f243 100644
--- a/config/locales/javascript/javascript.cy.yml
+++ b/config/locales/javascript/javascript.cy.yml
@@ -35,6 +35,8 @@ cy:
       hey: "Hei, {{name}}!"
       no_tags: "Hei, dydych chi ddim yn dilyn unrhyw tagiau! Dal ymlaen beth bynnag?"
       preparing_your_stream: "Preparing your personalised stream..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "Dim mwy o swyddi."
     photo_uploader:
@@ -44,6 +46,7 @@ cy:
     search_for: "Chwilio am {{name}}"
     show_more: "dangos mwy"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -65,6 +68,7 @@ cy:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, mae'n debyg nid yw #{{tagName}} yn ddiddorol iawn..."
     timeago:
diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml
index b7e827b0b414c0512a4ca8abb0e934b2c75c574e..9fe613b5cdfa94698e7e3fff0e6e293d65d9261a 100644
--- a/config/locales/javascript/javascript.da.yml
+++ b/config/locales/javascript/javascript.da.yml
@@ -9,16 +9,16 @@ da:
     aspect_dropdown:
       add_to_aspect: "Tilføj kontakt"
       all_aspects: "Alle aspekter"
-      error: "Kunne ikke begynde at dele med {{name}}.  Ignorerer du vedkommende?"
+      error: "Kunne ikke begynde at dele med <%= name %>.  Ignorerer du vedkommende?"
       select_aspects: "Vælg aspekter"
-      started_sharing_with: "Du er begyndt at dele med {{name}}!"
-      stopped_sharing_with: "Du deler ikke længere med {{name}}."
+      started_sharing_with: "Du er begyndt at dele med <%= name %>!"
+      stopped_sharing_with: "Du deler ikke længere med <%= name %>."
       toggle:
-        few: "I {{count}} aspekter"
-        many: "I {{count}} aspekter"
-        one: "I {{count}} aspekt"
-        other: "I {{count}} aspekter"
-        two: "I {{count}} aspekter"
+        few: "I <%= count %> aspekter"
+        many: "I <%= count %> aspekter"
+        one: "I <%= count %> aspekt"
+        other: "I <%= count %> aspekter"
+        two: "I <%= count %> aspekter"
         zero: "Vælg aspekter"
     aspect_navigation:
       deselect_all: "Fravælg alle"
@@ -28,11 +28,12 @@ da:
       hide: "Skjul kommentarer"
       show: "Vis alle kommentarer"
     confirm_dialog: "Er du sikker?"
+    delete: Slet
     failed_to_like: "Kunne ikke synes om!"
     failed_to_post_message: "Kunne ikke indsende besked!"
     getting_started:
       alright_ill_wait: "Okay, jeg venter."
-      hey: "Hej {{name}}!"
+      hey: "Hej <%= name %>!"
       no_tags: "Du har ikke fulgt nogen tags! Vil du fortsætte alligevel?"
       preparing_your_stream: "Forbereder din personlige strøm..."
     header:
@@ -58,10 +59,12 @@ da:
       public: "Offentlig - dit indlæg vil være synligt for alle og kan findes af søgemaskiner"
     reshares:
       duplicate: "Du har allerede delt indlægget!"
-    search_for: "Søg efter {{name}}"
+    search_for: "Søg efter <%= name %>"
     show_more: "Vis mere"
     stream:
+      comment: Kommentér
       hide: Skjul
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -73,21 +76,25 @@ da:
       more_comments:
         few: "Show <%= count %> flere kommentarer"
         many: "Show <%= count %> flere kommentarer"
-        one: "Show <%= count %> more comment"
-        other: "Show <%= count %> more comments"
-        two: "Show <%= count %> more comments"
-        zero: "Show <%= count %> more comments"
+        one: "Vis <%= count %> ekstra kommentar"
+        other: "Vis <%= count %> ekstra kommentarer"
+        two: "Vis <%= count %> ekstra kommentarer"
+        zero: "Vis <%= count %> ekstra kommentarer"
+      nsfw: "Dette indlæg er markeret som uegnet til arbejdsvisning af forfatteren."
+      original_post_deleted: "Originalt indlæg er slettet af forfatteren."
       public: Offentlig
+      reshare: Videredel
       reshares:
-        few: "<%= count %> Reshares"
-        many: "<%= count %> Reshares"
-        one: "<%= count %> Reshare"
-        other: "<%= count %> Reshares"
-        two: "<%= count %> Reshares"
-        zero: "<%= count %> Reshares"
+        few: "<%= count %> videredelinger"
+        many: "<%= count %> videredelinger"
+        one: "<%= count %> videredeling"
+        other: "<%= count %> videredelinger"
+        two: "<%= count %> videredelinger"
+        zero: "<%= count %> videredelinger"
       show: Vis
+      unlike: Unlike
     tags:
-      wasnt_that_interesting: "OK, jeg formoder #{{tagName}} ikke var så spændende igen..."
+      wasnt_that_interesting: "OK, jeg formoder #<%= tagName %> ikke var så spændende igen..."
     timeago:
       day: "en dag"
       days: "%d dage"
@@ -106,4 +113,4 @@ da:
       years: "%d år"
     videos:
       unknown: "Ukendt videotype"
-      watch: "Se denne video på {{provider}}"
\ No newline at end of file
+      watch: "Se denne video på <%= provider %>"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.de_formal.yml b/config/locales/javascript/javascript.de_formal.yml
index 6dcca79aeccaf8a363f28efbe434dc595a50eb5c..1e9e823f6cbef4e5411b75c469b9b5a037352029 100644
--- a/config/locales/javascript/javascript.de_formal.yml
+++ b/config/locales/javascript/javascript.de_formal.yml
@@ -35,6 +35,8 @@ de_formal:
       hey: "Hey, {{name}}!"
       no_tags: "Hey, Sie folgen noch keinen Tags! Trotzdem weitermachen?"
       preparing_your_stream: "Ihr personalisierter Stream wird zusammengestellt..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "Keine weiteren Beiträge."
     photo_uploader:
@@ -48,6 +50,7 @@ de_formal:
     search_for: "Nach {{name}} suchen"
     show_more: "Mehr zeigen"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -69,6 +72,7 @@ de_formal:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, ich nehme an, #{{tagName}} war nicht so interessant..."
     timeago:
diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml
index c9a416f6fa7b11f5db0829aae0d0ccda39cbc83d..1944d2b67ae849103b80801c78931212637032e0 100644
--- a/config/locales/javascript/javascript.el.yml
+++ b/config/locales/javascript/javascript.el.yml
@@ -35,6 +35,8 @@ el:
       hey: "Γεια σου, {{name}}!"
       no_tags: "Γεια, δεν ακολουθείς ακόμα καμία ετικέτα! Συνεχίζουμε παρ' όλ' αυτά;"
       preparing_your_stream: "Ετοιμάζεται η προσωπική σας ροή..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "Δεν υπάρχουν άλλες δημοσιεύσεις."
     photo_uploader:
@@ -48,6 +50,7 @@ el:
     search_for: "Αναζήτηση για {{name}}"
     show_more: "Προβολή περισσότερων"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -69,6 +72,7 @@ el:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, φαντάζομαι πως το #{{tagName}} δεν ήταν και τόσο ενδιαφέρον τελικά..."
     timeago:
diff --git a/config/locales/javascript/javascript.en_1337.yml b/config/locales/javascript/javascript.en_1337.yml
index 510d55f4792c7f51620ecdf09681852e6980012a..c07d7517560958eec572c28d4c5887ef92be5a74 100644
--- a/config/locales/javascript/javascript.en_1337.yml
+++ b/config/locales/javascript/javascript.en_1337.yml
@@ -32,6 +32,8 @@ en_1337:
     getting_started:
       hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: EOF
     publisher:
@@ -43,6 +45,7 @@ en_1337:
     search_for: "S34RCH F0R {{name}}"
     show_more: "5H0W M0R3!"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -64,6 +67,7 @@ en_1337:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
diff --git a/config/locales/javascript/javascript.en_pirate.yml b/config/locales/javascript/javascript.en_pirate.yml
index 6772fd614f36131d6de13f65d70a5c40fb13b18b..97c8f601661ecd1f0e9ea5a94d77780b9cce5d8f 100644
--- a/config/locales/javascript/javascript.en_pirate.yml
+++ b/config/locales/javascript/javascript.en_pirate.yml
@@ -18,13 +18,17 @@ en_pirate:
         other: "In {{count}} aspects"
         two: "In <%= count %> aspects"
         zero: "Add to aspect"
+    failed_to_like: "Failed to like!"
     getting_started:
       hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
+    header:
+      search: "Find people or #tags"
     reshares:
       duplicate: "You've already reshared that post!"
     search_for: "Search for {{name}}"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -46,6 +50,7 @@ en_pirate:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     videos:
diff --git a/config/locales/javascript/javascript.en_shaw.yml b/config/locales/javascript/javascript.en_shaw.yml
index 7f2519ee1c80deb35a6e19bb7bcbeb59ebff47ef..2e2c8156880eaceeed3fdc0ce83ed8bef737d6a8 100644
--- a/config/locales/javascript/javascript.en_shaw.yml
+++ b/config/locales/javascript/javascript.en_shaw.yml
@@ -27,6 +27,8 @@ en_shaw:
     getting_started:
       hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "𐑯𐑴 𐑥𐑹 𐑐𐑴𐑕𐑑𐑕."
     publisher:
@@ -36,6 +38,7 @@ en_shaw:
     search_for: "𐑕𐑻𐑗 𐑓𐑹 {{name}}"
     show_more: "𐑖𐑴 𐑥𐑹"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -57,6 +60,7 @@ en_shaw:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
diff --git a/config/locales/javascript/javascript.eo.yml b/config/locales/javascript/javascript.eo.yml
index 22d5f0be89426036441e953d5d8a96b9efb22193..fc37f86f67fce0ee901a3f8859df66742ec0c2cd 100644
--- a/config/locales/javascript/javascript.eo.yml
+++ b/config/locales/javascript/javascript.eo.yml
@@ -35,6 +35,8 @@ eo:
       hey: "Hej, {{name}}!"
       no_tags: "Hej, vi ne sekvas iun etikedon! Ĉu tamen daŭrigi?"
       preparing_your_stream: "Preparante vian personan torenton..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "Neniu plua afiŝo."
     photo_uploader:
@@ -48,6 +50,7 @@ eo:
     search_for: "Serĉi por {{name}}"
     show_more: "vidi plu"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -69,6 +72,7 @@ eo:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "Nu, mi supozas, ke #{{tagName}} ne estis tiel interese..."
     timeago:
diff --git a/config/locales/javascript/javascript.es-AR.yml b/config/locales/javascript/javascript.es-AR.yml
index cd488e1386ee38af281da37e2b5788117a115162..637ccaf029f5535f64817a47465f8360b0aa7dd8 100644
--- a/config/locales/javascript/javascript.es-AR.yml
+++ b/config/locales/javascript/javascript.es-AR.yml
@@ -35,6 +35,8 @@ es-AR:
       hey: "Che, {{name}}!"
       no_tags: "¡Che, no estás siguiendo ningún tag! ¿Continuar de todos modos?"
       preparing_your_stream: "Preparando tu stream personalizado..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "No hay más publicaciones."
     photo_uploader:
@@ -48,6 +50,7 @@ es-AR:
     search_for: "Buscar a {{name}}"
     show_more: "mostrar más"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -69,6 +72,7 @@ es-AR:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, supongamos que #{{tagName}} no era tan interesante..."
     timeago:
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index 8c023a24f7ba441b83c7d0e0113abd4d222578a3..0bbd26c50a145902ef78b37de079e8bba3e94eb3 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -29,7 +29,7 @@ es:
       show: "ver todos los comentarios"
     confirm_dialog: "¿Estás seguro?"
     delete: Borrar
-    failed_to_like: "¡Ha fallado tu aprobación!"
+    failed_to_like: "¡Ha fallado tu intento de marcar la publicación!"
     failed_to_post_message: "¡Fallo al publicar el mensaje!"
     getting_started:
       alright_ill_wait: "Está bien, esperaré."
@@ -65,14 +65,14 @@ es:
     stream:
       comment: Comentar
       hide: Ocultar
-      like: "Me gusta"
+      like: Marcar
       likes:
-        few: "le gusta a <%= count %> personas"
-        many: "le gusta a <%= count %> personas"
-        one: "le gusta a <%= count %> persona"
-        other: "le gusta a <%= count %> personas"
-        two: "le gusta a <%= count %> personas"
-        zero: "le gusta a <%= count %> personas"
+        few: "ha sido marcada por <%= count %> personas"
+        many: "ha sido marcada por <%= count %> personas"
+        one: "ha sido marcada por <%= count %> persona"
+        other: "ha sido marcada por <%= count %> personas"
+        two: "ha sido marcada por <%= count %> personas"
+        zero: "ha sido marcada por <%= count %> personas"
       limited: Restringido
       more_comments:
         few: "Mostrar <%= count %> comentarios más"
@@ -93,7 +93,7 @@ es:
         two: "Compartido <%= count %> veces"
         zero: "Comparido <%= count %> veces"
       show: Mostrar
-      unlike: "No me gusta"
+      unlike: Desmarcar
     tags:
       wasnt_that_interesting: "OK, supongo que #<%= tagName %> no era tan interesante..."
     timeago:
diff --git a/config/locales/javascript/javascript.fi.yml b/config/locales/javascript/javascript.fi.yml
index e5b9e1d2979628b55879c7e04e6aeb66d0a7490c..210f78bd074fd5f05a26bd444cf4731bdac4b5e7 100644
--- a/config/locales/javascript/javascript.fi.yml
+++ b/config/locales/javascript/javascript.fi.yml
@@ -93,6 +93,7 @@ fi:
         two: "<%= count %> uudelleenjakoa"
         zero: "<%= count %> uudelleenjakoa"
       show: Näytä
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, #<%= tagName %> ei tainnut ollakaan kovin kiinnostava aihe..."
     timeago:
diff --git a/config/locales/javascript/javascript.he.yml b/config/locales/javascript/javascript.he.yml
index 624a5fcc234e81374b1d49a221fbe684e8f772f5..8dc7290ed04082983342210e3aef9733e1774456 100644
--- a/config/locales/javascript/javascript.he.yml
+++ b/config/locales/javascript/javascript.he.yml
@@ -35,6 +35,8 @@ he:
       hey: "שלום, {{name}}!"
       no_tags: "?היי, לא עקבת אחרי אף תגית! לאן אתה רוצה להמשיך"
       preparing_your_stream: "החדשות האישיות שלך בשלבי הכנה"
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "אין רשומות נוספות"
     photo_uploader:
@@ -48,6 +50,7 @@ he:
     search_for: " {{name}}חיפוש אחר"
     show_more: "הצגת עוד"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -69,6 +72,7 @@ he:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "...זה לא היה כל כך מעניין#{{tagName}} אוקיי, אני מניח "
     timeago:
diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml
index 76a89ef476f65fc2c074313d7619fa23a1bbf5ea..59005623c382bb5cdf92af0bf8aff78be7a16125 100644
--- a/config/locales/javascript/javascript.hu.yml
+++ b/config/locales/javascript/javascript.hu.yml
@@ -9,16 +9,16 @@ hu:
     aspect_dropdown:
       add_to_aspect: "Hozzáadás a csoporthoz"
       all_aspects: "Összes csoport"
-      error: "Nem indult el a megosztás vele: {{name}}. Visszavonod?"
+      error: "Nem indult el a megosztás vele: <%= name %>. Visszavonod?"
       select_aspects: "Csoportok kiválasztása"
-      started_sharing_with: "Mostantól megosztassz vele: {{name}}!"
-      stopped_sharing_with: "Nem osztassz meg többé vele: {{name}}."
+      started_sharing_with: "Mostantól megosztassz vele: <%= name %>!"
+      stopped_sharing_with: "Nem osztassz meg többé vele: <%= name %>."
       toggle:
-        few: "{{count}} csoportban"
-        many: "{{count}} csoportban"
-        one: "{{count}} csoportban"
-        other: "{{count}} csoportban"
-        two: "{{count}} csoportban"
+        few: "<%= count %> csoportban"
+        many: "<%= count %> csoportban"
+        one: "<%= count %> csoportban"
+        other: "<%= count %> csoportban"
+        two: "<%= count %> csoportban"
         zero: "Csoportok kiválasztása"
     aspect_navigation:
       deselect_all: "Összes kijelölés megszüntetése"
@@ -28,13 +28,27 @@ hu:
       hide: "hozzászólások elrejtése"
       show: "összes hozzászólás"
     confirm_dialog: "Biztos vagy benne?"
+    delete: Töröl
     failed_to_like: Hiba
     failed_to_post_message: "Üzenet elküldése sikertelen!"
     getting_started:
       alright_ill_wait: "Rendben, várok!"
-      hey: "Szia {{name}}!"
+      hey: "Szia <%= name %>!"
       no_tags: "Hékás, nem követtél egy #címkét sem! Így is folytatod?"
       preparing_your_stream: "Személyre szabott hírfolyamod előkészítése..."
+    header:
+      contacts: Ismerősök
+      home: Kezdőlap
+      log_out: Kijelentkezés
+      mark_all_as_read: "Összes olvasottnak jelölése"
+      messages: Ãœzenetek
+      notifications: Értesítések
+      profile: Profil
+      recent_notifications: "Friss értesítések"
+      search: "Ismerős vagy #címke keresése"
+      settings: Beállítások
+      view_all: Összes
+    ignore: Elutasít
     infinite_scroll:
       no_more: "Nincs több bejegyzés."
     photo_uploader:
@@ -45,32 +59,42 @@ hu:
       public: "Nyilvános - ezt a bejegyzést bárki láthatja az interneten."
     reshares:
       duplicate: "Jó mi? De már egyszer megosztottad ezt a bejegyzést!"
-    search_for: "{{name}} keresése."
+    search_for: "<%= name %> keresése."
     show_more: tovább
     stream:
+      comment: Hozzászólás
+      hide: Elrejt
+      like: Tetszik
       likes:
-        few: "<%= count %> Likes"
-        many: "<%= count %> Likes"
-        one: "<%= count %> Like"
-        other: "<%= count %> Likes"
-        two: "<%= count %> Likes"
-        zero: "<%= count %> Likes"
+        few: "<%= count %> kedveli"
+        many: "<%= count %> kedveli"
+        one: "<%= count %> kedveli"
+        other: "<%= count %> kedveli"
+        two: "<%= count %> kedveli"
+        zero: "<%= count %> kedveli"
+      limited: Korlátozott
       more_comments:
-        few: "Show <%= count %> more comments"
-        many: "Show <%= count %> more comments"
-        one: "Show <%= count %> more comment"
-        other: "Show <%= count %> more comments"
-        two: "Show <%= count %> more comments"
-        zero: "Show <%= count %> more comments"
+        few: "Mutasd a többi <%= count %> hozzászólást"
+        many: "Mutasd a további <%= count %> hozzászólást"
+        one: "Mutasd a többi <%= count %> hozzászólást"
+        other: "Mutasd a többi <%= count %> hozzászólást"
+        two: "Mutasd a többi <%= count %> hozzászólást"
+        zero: "Mutasd a többi <%= count %> hozzászólást"
+      nsfw: "A bejegyzés \"nem biztonságosnak\" lett jelölve a szerzője által."
+      original_post_deleted: "Eredeti bejegyzés törölve a szerzője által."
+      public: Publikus
+      reshare: Megosztás
       reshares:
-        few: "<%= count %> Reshares"
-        many: "<%= count %> Reshares"
-        one: "<%= count %> Reshare"
-        other: "<%= count %> Reshares"
-        two: "<%= count %> Reshares"
-        zero: "<%= count %> Reshares"
+        few: "<%= count %> megosztás"
+        many: "<%= count %> megosztás"
+        one: "<%= count %> megosztás"
+        other: "<%= count %> megosztás"
+        two: "<%= count %> megosztás"
+        zero: "<%= count %> megosztás"
+      show: Megmutat
+      unlike: "Nem tetszik"
     tags:
-      wasnt_that_interesting: "Oké, azt hiszem a #{{tagName}} nem volt annyira érdekes."
+      wasnt_that_interesting: "Oké, azt hiszem a #<%= tagName %> nem volt annyira érdekes."
     timeago:
       day: "egy nappal"
       days: "%d nappal"
@@ -87,4 +111,4 @@ hu:
       years: "%d évvel"
     videos:
       unknown: "Ismeretlen videó tipus"
-      watch: "Videó megtekintése itt: {{provider}}"
\ No newline at end of file
+      watch: "Videó megtekintése itt: <%= provider %>"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.id.yml b/config/locales/javascript/javascript.id.yml
index 5b2a0429d431a42800159e11413e2817026db881..07fd51373ac2e72f387b4293fcf0d628fa601874 100644
--- a/config/locales/javascript/javascript.id.yml
+++ b/config/locales/javascript/javascript.id.yml
@@ -18,13 +18,17 @@ id:
         other: "In {{count}} aspects"
         two: "In <%= count %> aspects"
         zero: "Add to aspect"
+    failed_to_like: "Failed to like!"
     getting_started:
       hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
+    header:
+      search: "Find people or #tags"
     reshares:
       duplicate: "You've already reshared that post!"
     search_for: "Search for {{name}}"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -46,6 +50,7 @@ id:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
diff --git a/config/locales/javascript/javascript.is.yml b/config/locales/javascript/javascript.is.yml
index 3ecb65cd09049afa55f42a992aefe90c838dd066..97d8d79cd1e9592ef29b7a8bb8896364f16bcf62 100644
--- a/config/locales/javascript/javascript.is.yml
+++ b/config/locales/javascript/javascript.is.yml
@@ -19,13 +19,17 @@ is:
         two: "In <%= count %> aspects"
         zero: "Add to aspect"
     confirm_dialog: "Ertu viss?"
+    failed_to_like: "Failed to like!"
     getting_started:
       hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
+    header:
+      search: "Find people or #tags"
     reshares:
       duplicate: "You've already reshared that post!"
     search_for: "Search for {{name}}"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -47,6 +51,7 @@ is:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
diff --git a/config/locales/javascript/javascript.it.yml b/config/locales/javascript/javascript.it.yml
index 4824f53e7330ccdf49666bbcb8c3ef0c84bbbb5a..ad7f1e6ee0bd4a1c40c24e90a20a10e3c62207db 100644
--- a/config/locales/javascript/javascript.it.yml
+++ b/config/locales/javascript/javascript.it.yml
@@ -29,7 +29,8 @@ it:
       show: "mostra tutti i commenti"
     confirm_dialog: "Sei sicuro?"
     delete: Elimina
-    failed_to_like: "Valutazione fallita!"
+    explore: Esplora
+    failed_to_like: "Errore, non è stato possibile annotare!"
     failed_to_post_message: "Invio messaggio fallito!"
     getting_started:
       alright_ill_wait: "Perfetto, aspetterò."
@@ -45,12 +46,13 @@ it:
       notifications: Notifiche
       profile: Profilo
       recent_notifications: "Notifiche recenti"
-      search: "Cerca persone o #tag"
+      search: Cerca
       settings: Impostazioni
       view_all: "Vedi tutti"
     ignore: Ignora
     infinite_scroll:
       no_more: "Non ci sono altri post."
+    participate: Partecipa
     photo_uploader:
       looking_good: "Accidenti, sei in splendida forma!"
     publisher:
@@ -64,14 +66,14 @@ it:
     stream:
       comment: Commenta
       hide: Nascondi
-      like: "Mi piace"
+      like: Annota
       likes:
-        few: "<%= count %> Mi piace"
-        many: "<%= count %> Mi piace"
-        one: "<%= count %> Mi piace"
-        other: "<%= count %> Mi piace"
-        two: "<%= count %> Mi piace"
-        zero: "<%= count %> Mi piace"
+        few: "<%= count %> annota"
+        many: "<%= count %> annota"
+        one: "<%= count %> annota"
+        other: "<%= count %> annota"
+        two: "<%= count %> annota"
+        zero: "<%= count %> annota"
       limited: "Non pubblico"
       more_comments:
         few: "Mostra gli altri <%= count %> commenti"
@@ -80,7 +82,7 @@ it:
         other: "Mostra gli altri <%= count %> commenti"
         two: "Mostra gli altri <%= count %> commenti"
         zero: "Mostra gli altri <%= count %> commenti"
-      nsfw: "Questo post è stato marcato come NSFW (non adatto ad un luogo di lavoro) dal suo autore."
+      nsfw: "Questo post è stato dichiarato dal suo autore non adatto a un luogo di lavoro (NSFW)."
       original_post_deleted: "Il post originale è stato rimosso dall'autore."
       public: Pubblico
       reshare: Condividi
@@ -92,7 +94,7 @@ it:
         two: "<%= count %> Condivisioni"
         zero: "<%= count %> Condivisioni"
       show: Mostra
-      unlike: "Non mi piace più"
+      unlike: "Non annotare"
     tags:
       wasnt_that_interesting: "OK, immagino che #<%= tagName %> non fosse così interessante..."
     timeago:
diff --git a/config/locales/javascript/javascript.ja.yml b/config/locales/javascript/javascript.ja.yml
index e440b4ee5c93a5a8b6bd69e410e04ff1c9e29130..545fdb12f6f283d933097f3bd4d2daf45c73da70 100644
--- a/config/locales/javascript/javascript.ja.yml
+++ b/config/locales/javascript/javascript.ja.yml
@@ -19,9 +19,12 @@ ja:
         two: "In <%= count %> aspects"
         zero: "Add to aspect"
     confirm_dialog: 本当にいいですか。
+    failed_to_like: "Failed to like!"
     getting_started:
       hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: 投稿はこれ以上ありません。
     publisher:
@@ -30,6 +33,7 @@ ja:
       duplicate: "You've already reshared that post!"
     search_for: "{{name}}を検索する"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -51,6 +55,7 @@ ja:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
diff --git a/config/locales/javascript/javascript.ka.yml b/config/locales/javascript/javascript.ka.yml
index 5c5fcecf04a4b0484520b7bed546bdeaaeb77d74..6540744f0d9799a00d42c781a29989ebf122f4f0 100644
--- a/config/locales/javascript/javascript.ka.yml
+++ b/config/locales/javascript/javascript.ka.yml
@@ -35,6 +35,8 @@ ka:
       hey: "ჰეი, {{name}}!"
       no_tags: "ჰეი, თქვენ არ მიყვებით არცერთ ტეგს! მაინც გსურთ გაგრძელება?"
       preparing_your_stream: "თქვენი პერსონალიზებული ნაკადი მზადდება..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "მეტი პოსტი არ არის."
     photo_uploader:
@@ -48,6 +50,7 @@ ka:
     search_for: "ძებნა {{name}}"
     show_more: "მეტის ჩვენება"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -69,6 +72,7 @@ ka:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "კარგი, მე ვფიქრობ რომ #{{tagName}} არც ისე საინტერესო იყო..."
     timeago:
diff --git a/config/locales/javascript/javascript.ko.yml b/config/locales/javascript/javascript.ko.yml
index 2c3edb70eccbd153564bfe42416439525f06f8f1..2118bc5b84ca6aff9185a4ab501f4eb9dde1d61c 100644
--- a/config/locales/javascript/javascript.ko.yml
+++ b/config/locales/javascript/javascript.ko.yml
@@ -7,19 +7,19 @@
 ko:
   javascripts:
     aspect_dropdown:
-      add_to_aspect: "애스펙에 넣기"
+      add_to_aspect: "컨택 추가"
       all_aspects: "모든 에스팩"
-      error: "{{name}}님과 공유를 시작할 수 없습니다. 혹시 무시하고 있습니까?"
+      error: "<%= name %>님과 공유를 시작할 수 없습니다. 혹시 무시하고 있습니까?"
       select_aspects: "에스팩 선택"
-      started_sharing_with: "{{name}}님과의 공유를 시작합니다!"
-      stopped_sharing_with: "{{name}}님과의 공유를 멈췄습니다."
+      started_sharing_with: "<%= name %>님과 공유를 시작합니다!"
+      stopped_sharing_with: "<%= name %>님과의 공유를 멈췄습니다."
       toggle:
-        few: "애스펙 {{count}}개 안에 있습니다"
-        many: "애스펙 {{count}}개 안에 있습니다"
-        one: "애스펙 한 개 안에 있습니다"
-        other: "애스펙 {{count}}개 안에 있습니다"
-        two: "{{count}}개의 에스팩에서"
-        zero: "애스펙에 넣기"
+        few: "애스펙 <%= count %>개"
+        many: "애스펙 <%= count %>개"
+        one: "애스펙 하나"
+        other: "애스펙 <%= count %>개"
+        two: "애스펙 <%= count %>개"
+        zero: "애스펙 고르기"
     aspect_navigation:
       deselect_all: "선택 해제"
       no_aspects: "에스팩이 선택되지 않았음"
@@ -28,12 +28,28 @@ ko:
       hide: "댓글 감추기"
       show: "모든 댓글 보기"
     confirm_dialog: 확실합니까?
+    delete: 지우기
     failed_to_like: "좋아요를 실패했습니다!"
     failed_to_post_message: "메시지 게시를 실패하였습니다!"
     getting_started:
-      hey: "{{name}}님 안녕하세요?"
+      alright_ill_wait: 기다릴게요.
+      hey: "<%= name %>님 안녕하세요?"
       no_tags: "태그를 팔로우하지 않았습니다. 그래도 계속하시겠습니까?"
-      preparing_your_stream: "개인화 스트림 준비중···"
+      preparing_your_stream: "개인 스트림을 준비하고있습니다···"
+    header:
+      admin: 관리
+      contacts: 컨택
+      home: 처음
+      log_out: 로그아웃
+      mark_all_as_read: "읽음으로 표시"
+      messages: 쪽지
+      notifications: 알림
+      profile: 프로필
+      recent_notifications: "최근 알림"
+      search: "사람이나 #태그 를 찾으세요"
+      settings: 설정
+      view_all: "모두 보기"
+    ignore: 무시하기
     infinite_scroll:
       no_more: "게시물이 더 없습니다."
     photo_uploader:
@@ -44,32 +60,42 @@ ko:
       public: "공개 - 내 게시물을 누구나 볼 수 있고 검색 엔진으로 찾을 수 있습니다"
     reshares:
       duplicate: "이미 재공유된 게시물입니다!"
-    search_for: "{{name}} 검색"
+    search_for: "<%= name %> 검색"
     show_more: "더 보기"
     stream:
+      comment: 댓글
+      hide: 숨기기
+      like: 좋아요
       likes:
-        few: "<%= count %> Likes"
-        many: "<%= count %> Likes"
-        one: "<%= count %> Like"
-        other: "<%= count %> Likes"
-        two: "<%= count %> Likes"
-        zero: "<%= count %> Likes"
+        few: "<%= count %>명이 좋아합니다"
+        many: "<%= count %>명이 좋아합니다"
+        one: "한 명이 좋아합니다"
+        other: "<%= count %>명이 좋아합니다"
+        two: "<%= count %>명이 좋아합니다"
+        zero: "<%= count %>명이 좋아합니다"
+      limited: 제한됨
       more_comments:
-        few: "Show <%= count %> more comments"
-        many: "Show <%= count %> more comments"
-        one: "Show <%= count %> more comment"
-        other: "Show <%= count %> more comments"
-        two: "Show <%= count %> more comments"
-        zero: "Show <%= count %> more comments"
+        few: "댓글 <%= count %>개 더 보기"
+        many: "댓글 <%= count %>개 더 보기"
+        one: "댓글 한 개 더 보기"
+        other: "댓글 <%= count %>개 더 보기"
+        two: "댓글 <%= count %>개 더 보기"
+        zero: "댓글이 더 없습니다"
+      nsfw: "작성자가 이 게시물을 유해매체로 표시했습니다."
+      original_post_deleted: "작성자가 원본을 지웠습니다."
+      public: 공개
+      reshare: 재공유
       reshares:
-        few: "<%= count %> Reshares"
-        many: "<%= count %> Reshares"
-        one: "<%= count %> Reshare"
-        other: "<%= count %> Reshares"
-        two: "<%= count %> Reshares"
-        zero: "<%= count %> Reshares"
+        few: "<%= count %>명이 재공유했습니다."
+        many: "<%= count %>명이 재공유했습니다."
+        one: "한 명이 재공유했습니다."
+        other: "<%= count %>명이 재공유했습니다."
+        two: "<%= count %>명이 재공유했습니다"
+        zero: "아무도 재공유하지 않았습니다."
+      show: 보이기
+      unlike: "좋아하지 않아요"
     tags:
-      wasnt_that_interesting: "처리했습니다. #{{tagName}} 태그는 흥미롭지 않았군요?"
+      wasnt_that_interesting: "알겠습니다. #<%= tagName %> 태그는 흥미롭지 않았군요?"
     timeago:
       day: 하루
       days: "%d일"
@@ -87,4 +113,4 @@ ko:
       years: "%dë…„"
     videos:
       unknown: "알 수 없는 동영상 형식"
-      watch: "동영상을 {{provider}}에서 보기"
\ No newline at end of file
+      watch: "동영상을 <%= provider %>에서 보기"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.ml.yml b/config/locales/javascript/javascript.ml.yml
index 8a1100276390ee1bc9963f72a9b18d0c39d61c9b..d56e9fde925834a43aecaa7badd1b4a964803c77 100644
--- a/config/locales/javascript/javascript.ml.yml
+++ b/config/locales/javascript/javascript.ml.yml
@@ -28,6 +28,7 @@ ml:
       show: "show all comments"
     confirm_dialog: "താങ്കള്‍ക്ക് ഉറപ്പാണോ?"
     delete: "Delete"
+    explore: "Explore"
     failed_to_like: "Failed to like!"
     failed_to_post_message: "Failed to post message!"
     getting_started:
@@ -51,6 +52,7 @@ ml:
     ignore: "Ignore"
     infinite_scroll:
       no_more: "കൂടുതല്‍ പോസ്റ്റുകളൊന്നുമില്ല."
+    participate: "Participate"
     photo_uploader:
       looking_good: "OMG, you look awesome!"
     publisher:
diff --git a/config/locales/javascript/javascript.ms.yml b/config/locales/javascript/javascript.ms.yml
index c8d410accef65c3b4360154aa7ca51cb4403dc0f..2a3c3dd99cacd60141f0fbda14f87ddd976bc546 100644
--- a/config/locales/javascript/javascript.ms.yml
+++ b/config/locales/javascript/javascript.ms.yml
@@ -35,6 +35,8 @@ ms:
       hey: "Hei, {{name}}!"
       no_tags: "Hei, anda tidak mengikuti mana-mana tag! Teruskan juga?"
       preparing_your_stream: "Menyediakan strim peribadi anda..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "Tiada lagi pos."
     photo_uploader:
@@ -48,6 +50,7 @@ ms:
     search_for: "Mencari {{name}}"
     show_more: "tunjuk lagi"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -69,6 +72,7 @@ ms:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, saya mengandaikan # {{tagName}} tidak semua yang menarik..."
     timeago:
diff --git a/config/locales/javascript/javascript.nb.yml b/config/locales/javascript/javascript.nb.yml
index ecef2bcdf3b0ebf2fd42ac2e6d51d6176b52db7b..9498d12b16f165ece321d58f20e296d7baa2ce84 100644
--- a/config/locales/javascript/javascript.nb.yml
+++ b/config/locales/javascript/javascript.nb.yml
@@ -35,6 +35,8 @@ nb:
       hey: "Hei, {{name}}!"
       no_tags: "Hei, du har ikke fulgt noen tagger! Fortsett likevel?"
       preparing_your_stream: "Preparing your personialized stream..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "Ingen flere innlegg."
     photo_uploader:
@@ -48,6 +50,7 @@ nb:
     search_for: "Søk etter {{name}}"
     show_more: "vis mer"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -69,6 +72,7 @@ nb:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, jeg skjønner at #{{tagName}} ikke var så spennende likevel..."
     timeago:
diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml
index 084989ee166e86a642c8dd0a5a1bd9fea0e6ad22..416acb67641cae851f86f3ef64684831fa1f0d48 100644
--- a/config/locales/javascript/javascript.nl.yml
+++ b/config/locales/javascript/javascript.nl.yml
@@ -9,17 +9,17 @@ nl:
     aspect_dropdown:
       add_to_aspect: "Voeg contact toe"
       all_aspects: "Alle aspecten"
-      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      error: "Je kan niet delen met <%= name %>.  Negeer je hem?"
       select_aspects: "Selecteer aspecten"
-      started_sharing_with: "You have started sharing with {{name}}!"
-      stopped_sharing_with: "You have stopped sharing with {{name}}."
+      started_sharing_with: "Je deelt nu met <%= name %>!"
+      stopped_sharing_with: "Je deelt niet meer met <%= name %>."
       toggle:
-        few: "In {{count}} aspecten"
-        many: "In {{count}} aspecten"
-        one: "In {{count}} aspect"
-        other: "In {{count}} aspecten"
-        two: "In {{count}} aspecten"
-        zero: "Voeg toe aan aspect"
+        few: "In <%= count %> aspecten"
+        many: "In <%= count %> aspecten"
+        one: "In <%= count %> aspect"
+        other: "In <%= count %> aspecten"
+        two: "In <%= count %> aspecten"
+        zero: "Aspecten selecteren"
     aspect_navigation:
       deselect_all: "Alles deselecteren"
       no_aspects: "Geen aspecten geselecteerd"
@@ -29,13 +29,12 @@ nl:
       show: "laat reacties zien"
     confirm_dialog: "Weet je het zeker?"
     delete: Verwijder
-    failed_to_like: "Leuk vinden mislukt!"
+    failed_to_like: "Vastprikken mislukt!"
     failed_to_post_message: "Bericht plaatsen mislukt!"
     getting_started:
       alright_ill_wait: "Prima, ik wacht wel."
-      hey: "Hey, {{name}}!"
       no_tags: "Hey, je volgt geen tags! Toch doorgaan?"
-      preparing_your_stream: "Preparing your personialized stream..."
+      preparing_your_stream: "Je gepersonaliseerde stream klaarmaken..."
     header:
       contacts: Contacten
       log_out: "Log uit"
@@ -57,20 +56,20 @@ nl:
       limited: "Gelimiteerd - je post is alleen zichtbaar voor de mensen waarmee je hem deelt"
       public: "Openbaar - je post is zichtbaar voor iedereen en kan gevonden worden door zoekmachines"
     reshares:
-      duplicate: "Je hebt deze post al doorgegeven!"
-    search_for: "Zoek naar {{name}}"
+      duplicate: "Je hebt deze post al doorgegeven! Is hij echt zo goed?"
+    search_for: "Zoek naar <%= name %>"
     show_more: "laat meer zien"
     stream:
       comment: Reageer
       hide: Verberg
-      like: "Vind ik leuk"
+      like: Vastprikken
       likes:
-        few: "<%= count %> mensen vinden dit leuk"
-        many: "<%= count %> mensen vinden dit leuk"
-        one: "<%= count %> mensen vinden dit leuk"
-        other: "<%= count %> mensen vinden dit leuk"
-        two: "<%= count %> mensen vinden dit leuk"
-        zero: "<%= count %> mensen vinden dit leuk"
+        few: "<%= count %> keer vastgeprikt"
+        many: "<%= count %> keer vastgeprikt"
+        one: "<%= count %> keer vastgeprikt"
+        other: "<%= count %> keer vastgeprikt"
+        two: "<%= count %> keer vastgeprikt"
+        zero: "<%= count %> keer vastgeprikt"
       limited: "Beperkt zichtbaar"
       more_comments:
         few: "Toon nog <%= count %> reacties"
@@ -91,9 +90,9 @@ nl:
         two: "<%= count %> Doorgaven"
         zero: "<%= count %> doorgaven"
       show: Toon
-      unlike: "Vind ik niet meer leuk"
+      unlike: Losprikken
     tags:
-      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
+      wasnt_that_interesting: "#<%= tagName %> zal dan toch niet zo interessant geweest zijn..."
     timeago:
       day: "een dag"
       days: "%d dagen"
@@ -110,4 +109,4 @@ nl:
       years: "%d jaar"
     videos:
       unknown: "Onbekend video type"
-      watch: "Bekijk deze video op {{provider}}"
\ No newline at end of file
+      watch: "Bekijk deze video op <%= provider %>"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.nn.yml b/config/locales/javascript/javascript.nn.yml
index 5b8be98dad5c459c29108764d8aef3cb54c357d2..974cf02c33a495e9fd4ff89a881abc439a324e19 100644
--- a/config/locales/javascript/javascript.nn.yml
+++ b/config/locales/javascript/javascript.nn.yml
@@ -35,6 +35,8 @@ nn:
       hey: "Hei, {{name}}!"
       no_tags: "Du har ikkje følgt nokon etikett. Vil du likevel halda fram?"
       preparing_your_stream: "Lagar den tilpassa straumen din …"
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "Ingen fleire meldingar."
     photo_uploader:
@@ -48,6 +50,7 @@ nn:
     search_for: "Leit etter {{name}}"
     show_more: "syn meir"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -69,6 +72,7 @@ nn:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "Greitt, #{{tagName}} var vel kanskje ikkje så interessant …"
     timeago:
diff --git a/config/locales/javascript/javascript.pl.yml b/config/locales/javascript/javascript.pl.yml
index 96df459bce203760e2f7e127e4ee12ca81002d2f..ccc4a813e9fdd3787a6e1b441f30c33c27f3f0e2 100644
--- a/config/locales/javascript/javascript.pl.yml
+++ b/config/locales/javascript/javascript.pl.yml
@@ -29,7 +29,8 @@ pl:
       show: "wyświetl wszystkie komentarze"
     confirm_dialog: "Czy @{m,f:jesteÅ›|n:na}{ pew}{m:ien|f:na|n:no}?"
     delete: Usuń
-    failed_to_like: "Nie udało się polubić!"
+    explore: Odkryj
+    failed_to_like: "Nie udało się przypiąć!"
     failed_to_post_message: "Nie można wysłać wiadomości!"
     getting_started:
       alright_ill_wait: "Dobrze, poczekam."
@@ -46,12 +47,13 @@ pl:
       notifications: Powiadomienia
       profile: Profil
       recent_notifications: "Ostatnie powiadomienia"
-      search: "Szukaj osób luz #znaczników"
+      search: Szukaj
       settings: Ustawienia
       view_all: "Wyświetl wszystko"
     ignore: Ignoruj
     infinite_scroll:
       no_more: "Nie ma więcej wpisów."
+    participate: "Udzielaj siÄ™"
     photo_uploader:
       looking_good: "O rety! Åšwietnie wyglÄ…dasz!"
     publisher:
@@ -65,14 +67,14 @@ pl:
     stream:
       comment: Skomentuj
       hide: Ukryj
-      like: "LubiÄ™ to!"
+      like: Przypnij
       likes:
-        few: "Polubiono: <%= count %>"
-        many: "Polubiono: <%= count %>"
-        one: "<%= count %> lubi"
-        other: "<%= count %> os. to lubi"
-        two: "<%= count %> osoby to lubiÄ…"
-        zero: "<%= count %> osób to lubi"
+        few: "Przypięć: <%= count %>"
+        many: "Przypięć: <%= count %>"
+        one: "<%= count %> przypięcie"
+        other: "<%= count %> przypięć"
+        two: "<%= count %> przypięcia"
+        zero: "<%= count %> przypięć"
       limited: Ograniczone
       more_comments:
         few: "Wyświetl <%= count %> więcej komentarzy"
@@ -93,7 +95,7 @@ pl:
         two: "<%= count %> razy przekazano dalej"
         zero: "<%= count %> razy przekazano dalej"
       show: Wyświetl
-      unlike: "Nie lubiÄ™"
+      unlike: Odepnij
     tags:
       wasnt_that_interesting: "OK, przypuszczam, że #<%= tagName %> nie był, aż tak interesujący..."
     timeago:
diff --git a/config/locales/javascript/javascript.pt-BR.yml b/config/locales/javascript/javascript.pt-BR.yml
index b5c08d6956b0f390fb8a62d6fd691d565db155e5..1ba7d6b6b60252f9389148edae804bb3a5388676 100644
--- a/config/locales/javascript/javascript.pt-BR.yml
+++ b/config/locales/javascript/javascript.pt-BR.yml
@@ -35,6 +35,8 @@ pt-BR:
       hey: "Ei, {{name}}!"
       no_tags: "Ei, você não está seguindo todas as tags! Continuar assim mesmo?"
       preparing_your_stream: "Preparando seu fluxo personalizado..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "Não há mais postagem."
     photo_uploader:
@@ -48,6 +50,7 @@ pt-BR:
     search_for: "Procurar por {{name}}"
     show_more: "mostrar mais"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -69,6 +72,7 @@ pt-BR:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "Ok, eu acho que #{{tagName}} não era tão interessante..."
     timeago:
diff --git a/config/locales/javascript/javascript.pt-PT.yml b/config/locales/javascript/javascript.pt-PT.yml
index a8b664fdfd5ab728e8a0c04efe5919af25501ebd..958aeb6c380c511a387ed9cfd2f4598362fb65db 100644
--- a/config/locales/javascript/javascript.pt-PT.yml
+++ b/config/locales/javascript/javascript.pt-PT.yml
@@ -28,13 +28,27 @@ pt-PT:
       hide: "ocultar comentários"
       show: "mostrar todos os comentários"
     confirm_dialog: "Tem a certeza?"
-    failed_to_like: "Falhou ao gostar!"
+    delete: Eliminar
+    failed_to_like: "Falhou em marcar!"
     failed_to_post_message: "Falhou ao publicar a mensagem!"
     getting_started:
       alright_ill_wait: "Tudo bem, eu esperarei."
       hey: "Ei, {{name}}!"
       no_tags: "Ei, não está a seguir nenhuma etiqueta! Continuar mesmo assim?"
       preparing_your_stream: "A preparar o seu Stream personalizado..."
+    header:
+      contacts: "Contactos "
+      home: "Inicio "
+      log_out: Sair
+      mark_all_as_read: "Marcar tudo como lido"
+      messages: Mensagens
+      notifications: Notificações
+      profile: Perfil
+      recent_notifications: "Últimas Notificações"
+      search: "Encontrar pessoas ou #tags"
+      settings: Definições
+      view_all: "Ver tudo"
+    ignore: Ignorar
     infinite_scroll:
       no_more: "Não há mais publicações."
     photo_uploader:
@@ -48,27 +62,37 @@ pt-PT:
     search_for: "Procurar por {{name}}"
     show_more: "mostrar mais"
     stream:
+      comment: Comentar
+      hide: Ocultar
+      like: Marcar
       likes:
-        few: "<%= count %> Likes"
-        many: "<%= count %> Likes"
-        one: "<%= count %> Like"
-        other: "<%= count %> Likes"
+        few: "<%= count %> Marcados"
+        many: "<%= count %> Marcados"
+        one: "<%= count %> Marcado"
+        other: "<%= count %> Marcados"
         two: "<%= count %> Likes"
-        zero: "<%= count %> Likes"
+        zero: "<%= count %> Marcados"
+      limited: Limitado
       more_comments:
-        few: "Show <%= count %> more comments"
-        many: "Show <%= count %> more comments"
-        one: "Show <%= count %> more comment"
-        other: "Show <%= count %> more comments"
-        two: "Show <%= count %> more comments"
-        zero: "Show <%= count %> more comments"
+        few: "Mostrar <%= count %> mais comentários"
+        many: "Mostrar <%= count %> mais comentários"
+        one: "Mostras <%= count %> mais comentários"
+        other: "Mostrar <%= count %> mais comentários"
+        two: "Mostrar <%= count %> mais comentários"
+        zero: "Mostrar <%= count %> mais comentários"
+      nsfw: "Este artigo foi marcado pelo seu autor como tendo conteúdo impróprio"
+      original_post_deleted: "Publicação original eliminada pelo autor."
+      public: Publico
+      reshare: Partilhar
       reshares:
-        few: "<%= count %> Reshares"
-        many: "<%= count %> Reshares"
-        one: "<%= count %> Reshare"
-        other: "<%= count %> Reshares"
-        two: "<%= count %> Reshares"
-        zero: "<%= count %> Reshares"
+        few: "<%= count %> Partilhas"
+        many: "<%= count %> Partilhas"
+        one: "<%= count %> Partilha"
+        other: "<%= count %> Partilhas"
+        two: "<%= count %> Partilhas"
+        zero: "<%= count %> Partilhas"
+      show: Mostrar
+      unlike: Desmarcar
     tags:
       wasnt_that_interesting: "OK, suponho que #{{tagName}} não era assim tão interessante..."
     timeago:
@@ -89,4 +113,4 @@ pt-PT:
       years: "%d anos"
     videos:
       unknown: "Formato de vídeo desconhecido"
-      watch: "Visualize este vídeo no {{provider}}"
\ No newline at end of file
+      watch: "Veja este vídeo no {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.ro.yml b/config/locales/javascript/javascript.ro.yml
index 0c58e17639c00e28ebbcf2a17987c544ddbf4d03..ffc01b7b6f6b49f9714ddbd7b29b851081beb18e 100644
--- a/config/locales/javascript/javascript.ro.yml
+++ b/config/locales/javascript/javascript.ro.yml
@@ -35,6 +35,8 @@ ro:
       hey: "Salutare, {{name}}!"
       no_tags: "Hopa, nu urmati nicio eticheta! Continuati si asa ?"
       preparing_your_stream: "Se pregateste fluxul personalizat pentru dvs..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "Nu mai sunt posturi."
     photo_uploader:
@@ -47,6 +49,7 @@ ro:
     search_for: "Caută {{name}}"
     show_more: "arată mai mult"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -68,6 +71,7 @@ ro:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "Bine, presupun ca #{{tagName}} nu a fost chiar atat de interesant..."
     timeago:
diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml
index 60eef448e33697746e1a5e6615a81c0fe131945d..c96bab1a97f17030c21dc088e354269acc410029 100644
--- a/config/locales/javascript/javascript.ru.yml
+++ b/config/locales/javascript/javascript.ru.yml
@@ -75,12 +75,12 @@ ru:
         zero: "Понравилось: <%= count %>"
       limited: Ограниченная
       more_comments:
-        few: "Показать остальные комментарии (<%= count %>)"
-        many: "Показать остальные комментарии (<%= count %>)"
-        one: "Показать остальные комментарии (<%= count %>)"
-        other: "Показать остальные комментарии (<%= count %>)"
-        two: "Показать остальные комментарии (<%= count %>)"
-        zero: "Показать остальные комментарии (<%= count %>)"
+        few: "Остальные комментарии (<%= count %>)"
+        many: "Остальные комментарии (<%= count %>)"
+        one: "Остальные комментарии (<%= count %>)"
+        other: "Остальные комментарии (<%= count %>)"
+        two: "Остальные комментарии (<%= count %>)"
+        zero: "Остальные комментарии (<%= count %>)"
       nsfw: "Эта запись была помечена автором как \"18+\"."
       original_post_deleted: "Исходная запись удалена автором."
       public: Публичная
diff --git a/config/locales/javascript/javascript.sk.yml b/config/locales/javascript/javascript.sk.yml
index c54dfa6698a2957a7542ef2d98735ef79e905ae0..e3eb7d5d9c6cb7bf43c6e24cc7c28daef0ebcb2e 100644
--- a/config/locales/javascript/javascript.sk.yml
+++ b/config/locales/javascript/javascript.sk.yml
@@ -29,7 +29,7 @@ sk:
       show: "Zobraziť všetky komentáre"
     confirm_dialog: Určite?
     delete: Odstrániť
-    failed_to_like: "Nepodarilo sa označiť, že sa vám to páči!"
+    failed_to_like: "Nepodarilo sa pridať špendlík!"
     failed_to_post_message: "Správu sa nepodarilo poslať!"
     getting_started:
       alright_ill_wait: "V poriadku, počkám."
@@ -65,14 +65,14 @@ sk:
     stream:
       comment: Okomentovať
       hide: Schovať
-      like: "Páči sa mi to"
+      like: "Pridať špendlík"
       likes:
-        few: "<%= count %> ľuďom sa to páči"
-        many: "<%= count %> ľuďom sa to páči"
-        one: "<%= count %> človeku sa to páči"
-        other: "<%= count %> ľuďom sa to páči"
-        two: "<%= count %> ľuďom sa to páči"
-        zero: "<%= count %> ľuďom sa to páči"
+        few: "<%= count %> špendlíkov"
+        many: "<%= count %> špendlíkov"
+        one: "<%= count %> špendlík"
+        other: "<%= count %> špendlíkov"
+        two: "<%= count %> špendlíky"
+        zero: "<%= count %> špendlíkov"
       limited: Súkromný
       more_comments:
         few: "Zobraziť ďalšie <%= count %> komentáre"
@@ -93,7 +93,7 @@ sk:
         two: "<%= count %> opätovné zdieľania"
         zero: "<%= count %> opätovných zdieľaní"
       show: Zobraziť
-      unlike: "Už sa mi to nepáči"
+      unlike: "Odobrať špendlík"
     tags:
       wasnt_that_interesting: "OK, značka #<%= tagName %> asi vôbec nebola zaujímavá..."
     timeago:
diff --git a/config/locales/javascript/javascript.sl.yml b/config/locales/javascript/javascript.sl.yml
index 6dae6a027315b9ca74574951fae1def2217e509f..034f1accafa5d51dd06a99b149e91f1f0136767f 100644
--- a/config/locales/javascript/javascript.sl.yml
+++ b/config/locales/javascript/javascript.sl.yml
@@ -35,6 +35,8 @@ sl:
       hey: "Hej, {{name}}!"
       no_tags: "Hej, niste sledili nobeni oznaki! Vseeno nadaljuj?"
       preparing_your_stream: "Pripravljanje vašega osebnega toka ..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "Konec objav."
     photo_uploader:
@@ -48,6 +50,7 @@ sl:
     search_for: "Išči {{name}}"
     show_more: "pokaži več"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -69,6 +72,7 @@ sl:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "Vredu, mislim, da zaznamek #{{tagName}} ni bil tako zanimiv ..."
     timeago:
diff --git a/config/locales/javascript/javascript.sq.yml b/config/locales/javascript/javascript.sq.yml
index e0978836ec7c54f48c8a08592f48af641e7d6299..c222b99d455edd96ca268c67974bde5fd0779638 100644
--- a/config/locales/javascript/javascript.sq.yml
+++ b/config/locales/javascript/javascript.sq.yml
@@ -35,6 +35,8 @@ sq:
       hey: "Hej, {{name}}!"
       no_tags: "Hej, nuk jeni duke ndjekur ndonjë etiketë!  Të vazhdohet, sido qoftë?"
       preparing_your_stream: "Po përgatitet rrëkeja juaj e personalizuar..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "Nuk ka më postime."
     photo_uploader:
@@ -48,6 +50,7 @@ sq:
     search_for: "Kërkoni për {{name}}"
     show_more: "shfaq më tepër"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -69,6 +72,7 @@ sq:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, Them se #{{tagName}} nuk qe kushedi se çë interesant..."
     timeago:
diff --git a/config/locales/javascript/javascript.te.yml b/config/locales/javascript/javascript.te.yml
index 1d2a2f56712ea2dca64a0d591b04c28260178749..f483a2988c4c0b83115f3d8b198f3ed655ba0394 100644
--- a/config/locales/javascript/javascript.te.yml
+++ b/config/locales/javascript/javascript.te.yml
@@ -22,8 +22,11 @@ te:
     comments:
       hide: "వ్యాఖ్యలను దాచు"
       show: "అన్ని వ్యాఖ్యలను చూపించు"
+    failed_to_like: "Failed to like!"
     getting_started:
       hey: "ఓయ్, {{name}}!"
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "ఇంక టపాలు లేవు."
     reshares:
@@ -31,6 +34,7 @@ te:
     search_for: "{{name}} కోసం వెతకండి"
     show_more: "మరిన్ని చూపించు"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -52,6 +56,7 @@ te:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
diff --git a/config/locales/javascript/javascript.tr.yml b/config/locales/javascript/javascript.tr.yml
index ae4cd1e6df72d4f712663273e524be8568d21218..9d312d131a99c67d5e505d137478b10c27fb5d0d 100644
--- a/config/locales/javascript/javascript.tr.yml
+++ b/config/locales/javascript/javascript.tr.yml
@@ -35,6 +35,8 @@ tr:
       hey: "Merhaba, {{name}}!"
       no_tags: "Hey, hiç etiket takip etmiyorsunuz! Gerçekten devam etmek istiyor musun?"
       preparing_your_stream: "Kişiselleştirilmiş akışınız hazırlanıyor..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "Daha fazla gönderi yok."
     photo_uploader:
@@ -48,6 +50,7 @@ tr:
     search_for: "{{name}} Ara"
     show_more: "daha fazlasını göster"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -69,6 +72,7 @@ tr:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "Tamam, benim #{{tagName}} o kadar da ilginç değil..."
     timeago:
diff --git a/config/locales/javascript/javascript.uk.yml b/config/locales/javascript/javascript.uk.yml
index 994dbbdf15d9bc7963adf82e153b5278709a159c..dd8f81fc83e6798d6420818b573c55e350476ae8 100644
--- a/config/locales/javascript/javascript.uk.yml
+++ b/config/locales/javascript/javascript.uk.yml
@@ -35,6 +35,8 @@ uk:
       hey: "Привіт, {{name}}!"
       no_tags: "Ви не стежите ні за однією міткою! Все одно продовжити?"
       preparing_your_stream: "Підготовка вашого особистого потоку..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "Повідомлень більше немає."
     photo_uploader:
@@ -48,6 +50,7 @@ uk:
     search_for: "Шукати {{name}}"
     show_more: "показати більше"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -69,6 +72,7 @@ uk:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, мабуть, стежити за міткою #{{tagName}} було не так вже цікаво..."
     timeago:
diff --git a/config/locales/javascript/javascript.vi.yml b/config/locales/javascript/javascript.vi.yml
index c1cea6b076498814d1618ed4b3c75441f32fcb32..1cf5c3416ff8199c16e34016079f55bd89ef98d2 100644
--- a/config/locales/javascript/javascript.vi.yml
+++ b/config/locales/javascript/javascript.vi.yml
@@ -35,6 +35,8 @@ vi:
       hey: "Này, {{name}}!"
       no_tags: "Bạn chưa theo dõi thẻ nào cả! Tiếp tục?"
       preparing_your_stream: "Đang chuẩn bị luồng cho bạn..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: "Không còn bài đăng nào nữa."
     photo_uploader:
@@ -48,6 +50,7 @@ vi:
     search_for: "Tìm {{name}}"
     show_more: "hiện thêm"
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -69,6 +72,7 @@ vi:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "Tôi cho rằng #{{tagName}} không thú vị..."
     timeago:
diff --git a/config/locales/javascript/javascript.zh-CN.yml b/config/locales/javascript/javascript.zh-CN.yml
index cfb384dcc5a54e7f5fff2bf46af5a8e6f99e13a5..dddc0f01a60d93580f91512670717e6fcc9ece0b 100644
--- a/config/locales/javascript/javascript.zh-CN.yml
+++ b/config/locales/javascript/javascript.zh-CN.yml
@@ -27,6 +27,8 @@ zh-CN:
     getting_started:
       hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: 没有更多的内容了。
     publisher:
@@ -36,6 +38,7 @@ zh-CN:
     search_for: "搜索 {{name}}"
     show_more: 查看更多
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -57,6 +60,7 @@ zh-CN:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml
index 94dbaed020a561e6b86f729e2aa598ba353b6b1a..33b73aadc37cb0859b1309abbd0e59684039ff91 100644
--- a/config/locales/javascript/javascript.zh-TW.yml
+++ b/config/locales/javascript/javascript.zh-TW.yml
@@ -35,6 +35,8 @@ zh-TW:
       hey: "嘿, {{name}}!"
       no_tags: "嘿, 你還沒有追蹤任何標籤! 要往下一步嗎?"
       preparing_your_stream: 整理你個人的流水帳中...
+    header:
+      search: "Find people or #tags"
     infinite_scroll:
       no_more: 沒有貼文了.
     photo_uploader:
@@ -48,6 +50,7 @@ zh-TW:
     search_for: "搜尋 {{name}}"
     show_more: 顯示更多
     stream:
+      like: Like
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -69,6 +72,7 @@ zh-TW:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      unlike: Unlike
     tags:
       wasnt_that_interesting: "OK, 我想 #{{tagName}} 大概沒那麼有趣..."
     timeago: