updated 55 locale files [ci skip]

55 files changed, 993 insertions, 513 deletions

diff --git a/config/locales/devise/devise.el.yml b/config/locales/devise/devise.el.yml
index 095418b22..51958a60e 100644
--- a/config/locales/devise/devise.el.yml
+++ b/config/locales/devise/devise.el.yml
@@ -88,11 +88,11 @@ el:
       updated: "Έχετε ενημερώσει το λογαριασμό σας με επιτυχία."
     sessions:
       new:
-        alpha_software: "Επρόκειτο να χρησιμοποιήσετε λογισμικό σε δοκιμαστική (alpha) φάση."
+        alpha_software: "Πρόκειται να χρησιμοποιήσετε λογισμικό σε δοκιμαστική (alpha) φάση."
         bugs_and_feedback: "Να γνωρίζετε ότι θα αντιμετωπίσετε σφάλματα. Σας ενθαρρύνουμε να χρησιμοποιήσετε το κουμπί \"Feedback\" στη δεξιά πλευρά του browser σας για να αναφέρετε οποιοδήποτε σφάλμα! Θα εργαστούμε όσο πιο γρήγορα μπορούμε για να την επίλυση οποιουδήποτε ζητήματος μας πείτε."
         bugs_and_feedback_mobile: "Σας συμβουλεύουμε, θα συναντήσετε σφάλματα. Σας ενθαρρύνουμε να αναφέρετε οποιοδήποτε πρόβλημα! Θα δουλέψουμε όσο πιο γρήγορα γίνεται για να λύσουμε όποιο θέμα αναφέρετε."
         login: "Είσοδος"
-        modern_browsers: "Υποστηρίζει μόνο σύγχρονα προγράμματα περιήγησης ιστού."
+        modern_browsers: "υποστηρίζει μόνο σύγχρονα προγράμματα περιήγησης ιστού."
         password: "Κωδικός"
         remember_me: "Να με θυμάσαι!"
         sign_in: "Συνδεθείτε"
diff --git a/config/locales/devise/devise.fi.yml b/config/locales/devise/devise.fi.yml
index d9158949c..3397c2181 100644
--- a/config/locales/devise/devise.fi.yml
+++ b/config/locales/devise/devise.fi.yml
@@ -30,32 +30,32 @@ fi:
       hello: "Hei, %{email}!"
       invitation_instructions:
         accept: "Hyväksy kutsu"
-        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
-        be_yourself: "Be Yourself"
-        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        arrived: "Odottamasi sosiaalinen verkosto on täällä. Uudistettu, entistä turvallisempi ja hauskempi %{strong_diaspora} auttaa sinua kokemaan ja jakamaan internetin kokonaan uudella tavalla."
+        be_yourself: "Ole oma itsesi"
+        be_yourself_paragraph: "Internet on luonut uusia, ainutlaatuisia tapoja ilmaista itseämme. %{strong_diaspora}ssa voit olla oma itsesi ja jakaa sisältöä kuten haluat, omalla nimelläsi tai ilman."
         cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
         email_address: questions@joindiaspora.com
-        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
-        finally: "Finally - it's here"
-        friends_saying: "What your friends are saying..."
-        get_connected: "Get Connected"
-        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
-        have_fun: "Have Fun"
-        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
-        help_fund: "help fund Diaspora"
-        here: "here"
+        email_us: "Voit lähettää yleisluontoiset Diaspora-tiliisi liittyvät tiedustelut ja tukipyynnöt osoitteeseen %{email}."
+        finally: "Vihdoinkin – se on täällä"
+        friends_saying: "Mitä ystäväsi sanovat..."
+        get_connected: "Liity mukaan"
+        get_connected_paragraph: "%{strong_diaspora} on kansainvälinen liike, jolla on näkemys paremmasta internetistä, ja sen ykkösominaisuus on sen yhteisö. Tapaa uusia ihmisiä, pidä yhteyttä ystäviisi ja nauti."
+        have_fun: "Pidä hauskaa"
+        have_fun_paragraph: "%{strong_diaspora} on uusien ja ihmeellisten sisältöjen ja ihmisten paikka. %{link}, maailman ensimmäinen %{strong_diaspora}-sovellus on vain alkua. Kerää ja jaa webin sisältöä."
+        help_fund: "tue Diasporaa lahjoituksella"
+        here: "tästä"
         ignore: "Mikäli et halua hyväksyä kutsua, voit jättää tämän viestin huomioimatta."
-        join_team: "Join our Team"
-        love: "Love,"
-        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
-        more_people: "Even more people are excited to see you!"
+        join_team: "Liity mukaan"
+        love: "Rakkaudella,"
+        made_by_people: "%{strong_diaspora}n ovat tehneet ihmiset, jotka rakastavat internetiä yhtä paljon kuin sinä. %{jointeam} tai %{helpfund}!"
+        more_people: "Useammat ihmiset odottavat näkevänsä sinut!"
         no_account_till: "Käyttäjätilisi luodaan vasta, kun rekisteröidyt yllä olevan linkin kautta. "
         or: "tai"
-        sign_up_now: "Sign up now →"
+        sign_up_now: "Rekisteröidy heti →"
         subject: "Sinut on kutsuttu käyttämään Diasporaa!"
-        team_diaspora: "Team Diaspora"
-        unsubscribe: "To unsubscribe please click %{link}."
+        team_diaspora: Diaspora-tiimi
+        unsubscribe: "Voit poistua postituslistalta napsauttamalla %{link}."
         view_in: "View in"
       inviter:
         accept_at: "osoitteessa %{url}, hyväksyminen alla olevasta linkistä."
diff --git a/config/locales/devise/devise.sk.yml b/config/locales/devise/devise.sk.yml
index 1f35aee75..def9905c2 100644
--- a/config/locales/devise/devise.sk.yml
+++ b/config/locales/devise/devise.sk.yml
@@ -19,7 +19,7 @@ sk:
       unauthenticated: "Ak chcete pokračovať, musíte sa prihlásiť, alebo zaregistrovať."
       unconfirmed: "Predtým, ako budete môcť pokračovať, musíte potvrdiť svoj účet."
     invitations:
-      invitation_token_invalid: "Vami zadaný token je neplatný!"
+      invitation_token_invalid: "Ospravedlňujeme sa. Táto pozývacia značka nie je platná."
       send_instructions: "Vaša pozvánka bola odoslaná."
       updated: "Vaše heslo bolo úspešné zmenené. Teraz ste prihlásený."
     mailer:
@@ -34,7 +34,7 @@ sk:
         be_yourself: "Buďte sami sebou"
         be_yourself_paragraph: "Internet pre nás vytvoril jedinečné nové spôsoby na sebaprezentáciu.  %{strong_diaspora} vám umožňuje, aby ste boli sami sebou a podelili sa s hocičím, s čím chcete pod svojím skutočným menom alebo bez neho."
         cubbies: Cubbi.es
-        displaying_correctly: "Nezobrazuje sa e-mail správne? %{link} vo vašom prehliadači"
+        displaying_correctly: "Nezobrazuje sa e-mail správne? %{link}"
         email_address: questions@joindiaspora.com
         email_us: "So všeobecnými otázkami alebo žiadosťami o technickú podporu vášho účtu na Diaspore nám, prosím, napíšte na %{email}."
         finally: "Napokon – je to tu"
@@ -56,7 +56,7 @@ sk:
         subject: "Pozvali vás na Diasporu!"
         team_diaspora: "Tím Diaspory"
         unsubscribe: "Ak už nechcete dostávať e-maily, kliknite %{link}."
-        view_in: "Zobraziť v"
+        view_in: "Pozrite si ho v svojom internetovom prehliadači."
       inviter:
         accept_at: "Kliknutím na odkaz na stránku %{url} ho môžete prijať."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.vi.yml b/config/locales/devise/devise.vi.yml
index 339c23030..6e4d93abd 100644
--- a/config/locales/devise/devise.vi.yml
+++ b/config/locales/devise/devise.vi.yml
@@ -11,17 +11,17 @@ vi:
         resend_confirmation: "Resend confirmation instructions"
       send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
     failure:
-      inactive: "Your account was not activated yet."
-      invalid: "Invalid username or password."
-      invalid_token: "Invalid authentication token."
-      locked: "Your account is locked."
-      timeout: "Your session expired, please sign in again to continue."
-      unauthenticated: "You need to sign in or sign up before continuing."
-      unconfirmed: "You have to confirm your account before continuing."
+      inactive: "Tài khoản của bạn chưa được kích hoạt."
+      invalid: "Tên người dùng hoặc mật khẩu không đúng."
+      invalid_token: "Khoá xác thực không hợp lệ."
+      locked: "Tài khoản của bạn bị khoá."
+      timeout: "Phiên đăng nhập đã hết hạn, hãy đăng nhập lại để tiếp tục."
+      unauthenticated: "Bạn cần đăng nhập hoặc đăng kí để tiếp tục."
+      unconfirmed: "Bạn cần phải xác nhận tài khoản trước khi tiếp tục."
     invitations:
       invitation_token_invalid: "The invitation token provided is not valid!"
-      send_instructions: "Your invitation has been sent."
-      updated: "Your password was set successfully. You are now signed in."
+      send_instructions: "Lời mời của bạn đã được gửi."
+      updated: "Thiết lập mật khẩu thành công. Bạn đã đăng nhập."
     mailer:
       confirmation_instructions:
         confirm: "Confirm my account"
@@ -37,7 +37,7 @@ vi:
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
         email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
-        finally: "Finally - it's here"
+        finally: "Cuối cùng - nó đây"
         friends_saying: "What your friends are saying..."
         get_connected: "Get Connected"
         get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
@@ -48,14 +48,14 @@ vi:
         ignore: "If you don't want to accept the invitation, please ignore this email."
         join_team: "Join our Team"
         love: "Love,"
-        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        made_by_people: "%{strong_diaspora} được tạo ra bởi những người yêu Internet như bạn. %{jointeam}, hay %{helpfund}!"
         more_people: "Even more people are excited to see you!"
         no_account_till: "Your account won't be created until you access the link above and sign up."
         or: "or"
         sign_up_now: "Sign up now →"
         subject: "You've been invited to join Diaspora!"
-        team_diaspora: "Team Diaspora"
-        unsubscribe: "To unsubscribe please click %{link}."
+        team_diaspora: "Đội Diaspora"
+        unsubscribe: "Không nhận thư nữa, vui lòng nhấn %{link}."
         view_in: "View in"
       inviter:
         accept_at: "at %{url}, you can accept it through the link below."
@@ -68,47 +68,47 @@ vi:
         subject: "Reset password instructions"
         wont_change: "Your password won't change until you access the link above and create a new one."
       unlock_instructions:
-        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
-        click_to_unlock: "Click the link below to unlock your account:"
-        subject: "Unlock Instructions"
-        unlock: "Unlock my account"
+        account_locked: "Tài khoản của bạn bị khoá do đăng nhập thất bại quá số lần quy định."
+        click_to_unlock: "Nhấn vào liên kết bên dưới để mở khoá tài khoản:"
+        subject: "Chỉ dẫn mở khoá"
+        unlock: "Mở khoá tài khoản"
       welcome: "Welcome %{email}!"
     passwords:
       edit:
-        change_password: "Change my password"
+        change_password: "Đổi mật khẩu"
       new:
-        forgot_password: "Forgot your password?"
-        no_account: "No account with this email exists.  If you are waiting for an invite, we are rolling them out as soon as possible"
-        send_password_instructions: "Send me reset password instructions"
-      send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
-      updated: "Your password was changed successfully. You are now signed in."
+        forgot_password: "Quên mật khẩu?"
+        no_account: "Không có tài khoản nào với địa chỉ thư điện tử này. Nếu bạn đang chờ để được mời, chúng tôi sẽ cố gắng sớm nhất có thể"
+        send_password_instructions: "Gửi cho tôi hướng dẫn thiết đặt lại mật khẩu"
+      send_instructions: "Bạn sẽ nhận được thư chứa chỉ dẫn cách thiết lập lại mật khẩu trong ít phút nữa."
+      updated: "Đã đổi mật khẩu. Bạn đã đăng nhập."
     registrations:
       destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
-      signed_up: "You have signed up successfully. If enabled, a confirmation was sent to your e-mail."
-      updated: "You updated your account successfully."
+      signed_up: "Bạn đã đăng nhập thành công. Nếu được bật, một thư xác nhận sẽ được gửi cho bạn."
+      updated: "Bạn đã cập nhật tài khoản thành công."
     sessions:
       new:
-        alpha_software: "You are about to use alpha software."
+        alpha_software: "Bạn sẽ sử dụng phần mềm không ổn định."
         bugs_and_feedback: "Be advised, you will experience bugs.  We encourage you to use the Feedback button on the right hand side of your browser to report any hiccups!  We will work as fast as we can to resolve any issues you report."
         bugs_and_feedback_mobile: "Be advised, you will experience bugs.  We encourage you to report any hiccups!  We will work as fast as we can to resolve any issues you report."
-        login: "Login"
-        modern_browsers: "only supports modern browsers."
-        password: "Password"
-        remember_me: "Remember me"
-        sign_in: "Sign in"
-        username: "Username"
-      signed_in: "Signed in successfully."
-      signed_out: "Signed out successfully."
+        login: "Đăng nhập"
+        modern_browsers: "chỉ hỗ trợ những trình duyệt hiện đại."
+        password: "Mật khẩu"
+        remember_me: "Ghi nhớ"
+        sign_in: "Đăng nhập"
+        username: "Tên người dùng"
+      signed_in: "Đăng nhập thành công."
+      signed_out: "Đăng xuất thành công."
     shared:
       links:
-        forgot_your_password: "Forgot your password?"
-        receive_confirmation: "Didn't receive confirmation instructions?"
-        receive_unlock: "Didn't receive unlock instructions?"
-        sign_in: "Sign in"
-        sign_up: "Sign up"
+        forgot_your_password: "Quên mật khẩu?"
+        receive_confirmation: "Không nhận được chỉ dẫn xác nhận?"
+        receive_unlock: "Không nhận được chỉ dẫn mở khoá?"
+        sign_in: "Đăng nhập"
+        sign_up: "Đăng kí"
         sign_up_closed: "Open signups are closed at this time."
       mail_signup_form:
-        sign_up_for_an_invite: "Sign up for an invite!"
+        sign_up_for_an_invite: "Đăng kí nhận lời mời!"
     unlocks:
       new:
         resend_unlock: "Resend unlock instructions"
@@ -116,6 +116,6 @@ vi:
       unlocked: "Your account was successfully unlocked. You are now signed in."
   errors:
     messages:
-      already_confirmed: "was already confirmed"
-      not_found: "not found"
-      not_locked: "was not locked"
+      already_confirmed: "đã được xác nhận"
+      not_found: "không tìm thấy"
+      not_locked: "không khoá"
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 67e135c7f..d98872ff8 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -578,6 +578,7 @@ ar:
       permalink: "رابط دائم"
   previous: "السابق"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "الصفحة الشخصية"
   profiles:
     edit:
@@ -801,6 +802,9 @@ ar:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ ar:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
@@ -828,6 +835,7 @@ ar:
   tag_followings:
     create:
       failure: "فشل في متابعة: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "بدأت بنجاح متابعة: #%{name}"
     destroy:
       failure: "فشل في إيقاف متابعة: #%{name}"
@@ -838,9 +846,11 @@ ar:
       followed_by: "followed by"
       following: "أنت تتابع #%{tag}"
       nobody_talking: "لم يتحدث أحدٌ عن %{tag} بعد"
+      none: "The empty tag does not exist!"
       people_tagged_with: "أشخاص موسومون بـ %{tag}"
       posts_tagged_with: "مشاركات موسومة بـ #%{tag}"
       stop_following: "أوقف متابعة #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "صِل حسابك بـ Cubbi.es"
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index b374b8542..959a75662 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -105,9 +105,9 @@ bg:
       help:
         do_you: "Вие:"
         email_feedback: "Ако предпочитате изпратете отзив по ел. поща (%{link})"
-        feature_suggestion: "... имате предложение за нова функция (%{link})?"
+        feature_suggestion: "... имате предложение за нова %{link}?"
         find_a_bug: "... сте открили грешка (%{link})?"
-        have_a_question: "... имате въпрос (%{link})?"
+        have_a_question: "... имате %{link}?"
         here_to_help: "Общността е готова да помогне!"
         need_help: "Нуждаете се от помощ?"
         satisfaction: "%{link}: Поддръжка осигурена от общността"
@@ -301,7 +301,7 @@ bg:
       comma_seperated_plz: "Можете да въведете повече от една ел. поща като ги разделяте със запетаи."
       if_they_accept_info: "ако приемат поканата ще бъдат добавени към аспекта в който сте ги поканили."
       invite_someone_to_join: "Поканете някой в Diaspora!"
-      language: "Език"
+      language: "Език за поканата"
       personal_message: "Лично съобщение"
       resend: "Повторно изпращане"
       send_an_invitation: "Изпращане на поканата"
@@ -577,12 +577,13 @@ bg:
       not_found: "За съжаление публикацията не може да бъде намерена."
       permalink: "постоянен адрес"
   previous: "предишна"
-  privacy: "Privacy"
+  privacy: "Поверителност"
+  privacy_policy: "Privacy Policy"
   profile: "Профил"
   profiles:
     edit:
       allow_search: "Разрешете търсенето в Diaspora за вас"
-      edit_profile: "Редактиране на профила"
+      edit_profile: "Настройки на профила"
       first_name: "Собствено име"
       last_name: "Фамилно име"
       update_profile: "Обновяване на профила"
@@ -683,7 +684,7 @@ bg:
       connect_to_tumblr: "Свързване с tumblr"
       connect_to_twitter: "Свързване с twitter"
       disconnect: "изключване"
-      edit_services: "Редактиране на услугите"
+      edit_services: "Настройки на услугите"
       logged_in_as: "вписани сте като"
       no_services: "Все още не сте свързали нито една услуга."
       really_disconnect: "Наистина ли желаете свързаността с %{service} да бъде изключена?"
@@ -801,6 +802,9 @@ bg:
     aspects:
       title: "Вашите аспекти"
     aspects_stream: "От вашите аспекти"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "коментирани"
     community_spotlight_stream: "От \"В центъра на вниманието\""
     followed_tag:
@@ -809,6 +813,9 @@ bg:
       follow: "Добавяне"
       title: "#Марки, които следите"
     followed_tags_stream: "От #Марка, която следите"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Кой ви спомена"
     mentions:
       contacts_title: "Хора, които са ви споменали"
@@ -828,6 +835,7 @@ bg:
   tag_followings:
     create:
       failure: "Не започнахте да следите \"#%{name}\". Да не би вече да следите марката?"
+      none: "You cannot follow a blank tag!"
       success: "Ура! Започнахте да следите \"#%{name}\"."
     destroy:
       failure: "Следенето на \"#%{name}\" не е прекратено."
@@ -838,9 +846,11 @@ bg:
       followed_by: "се следи от"
       following: "Следите #%{tag}"
       nobody_talking: "Никой не е говорил за %{tag}."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Хора маркирани с %{tag}"
       posts_tagged_with: "Публикации с марка #%{tag}"
       stop_following: "Прекратяване следването на #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Свързване с Cubbi.es"
@@ -874,7 +884,7 @@ bg:
       current_password: "Текуща парола"
       download_photos: "снимките ви"
       download_xml: "данните ви (XML формат)"
-      edit_account: "Редактиране на акаунта"
+      edit_account: "Настройки на акаунта"
       email_awaiting_confirmation: "Изпратена е връзка за активиране до %{unconfirmed_email}. Докато не я активирате ще бъде ползвана старата ел. поща (%{email})."
       export_data: "Сваляне на..."
       getting_started: "New User Prefrences"
@@ -912,7 +922,7 @@ bg:
     privacy_settings:
       ignored_users: "Игнорирани потребители"
       stop_ignoring: "Прекратяване на игнорирането"
-      title: "Privacy Settings"
+      title: "Настройки за поверителност"
     public:
       does_not_exist: "Потребителят %{username} не съществува!"
     update:
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index af96621fd..ea2e527e4 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -578,6 +578,7 @@ br:
       permalink: "permalink"
   previous: war-raok
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "Patrom"
   profiles:
     edit:
@@ -801,6 +802,9 @@ br:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ br:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
@@ -828,6 +835,7 @@ br:
   tag_followings:
     create:
       failure: "Failed to follow: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "Successfully following: #%{name}"
     destroy:
       failure: "Failed to stop following: #%{name}"
@@ -838,9 +846,11 @@ br:
       followed_by: "followed by"
       following: "Following #%{tag}"
       nobody_talking: "Den ebet zo o kaozeal diwar-benn %{tag} c'hoazh."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Tud bet merket gant %{tag}"
       posts_tagged_with: "Skridoù bet merket gant #%{tag}"
       stop_following: "Stop Following #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Connect to Cubbi.es"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 9ed2b3564..33aef4150 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -578,6 +578,7 @@ cs:
       permalink: "trvalý odkaz"
   previous: "předchozí"
   privacy: "Soukromí"
+  privacy_policy: "Privacy Policy"
   profile: "Profil"
   profiles:
     edit:
@@ -801,6 +802,9 @@ cs:
     aspects:
       title: "Vaše aspekty"
     aspects_stream: "Aspekty"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ cs:
       follow: "Follow"
       title: "#Sledované štítky"
     followed_tags_stream: "#Sledované štítky"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
@@ -828,6 +835,7 @@ cs:
   tag_followings:
     create:
       failure: "Nepodařilo se následovat: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "Začal jste sledovat: #%{name}"
     destroy:
       failure: "Nepodařilo se ukončit sledování: #%{name}"
@@ -838,9 +846,11 @@ cs:
       followed_by: "sleduje"
       following: "Sledujete #%{tag}"
       nobody_talking: "Nikdo dosud nemluví o %{tag}."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Lidé označení %{tag}"
       posts_tagged_with: "Příspěvky označené #%{tag}"
       stop_following: "Přestat sledovat #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Připojit na Cubbi.es"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 89824ef4d..68b863a58 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -578,6 +578,7 @@ cy:
       permalink: "permalink"
   previous: "blaenorol"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "Proffil"
   profiles:
     edit:
@@ -801,6 +802,9 @@ cy:
     aspects:
       title: "Eich Agweddau"
     aspects_stream: "Agweddau"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "wedi sylwad arno"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ cy:
       follow: "Follow"
       title: "#Tagiau ddilynwyd"
     followed_tags_stream: "#Tagiau ddilynwyd"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
@@ -828,6 +835,7 @@ cy:
   tag_followings:
     create:
       failure: "Failed to follow: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "Successfully following: #%{name}"
     destroy:
       failure: "Failed to stop following: #%{name}"
@@ -838,9 +846,11 @@ cy:
       followed_by: "followed by"
       following: "Following #%{tag}"
       nobody_talking: "Does neb yn siarad am %{tag} eto."
+      none: "The empty tag does not exist!"
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       stop_following: "Stop Following #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Connect to Cubbi.es"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 45571290d..3af632b09 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -578,6 +578,7 @@ da:
       permalink: "permalink"
   previous: "Forrige"
   privacy: "Privatindstillinger"
+  privacy_policy: "Privacy Policy"
   profile: "Profil"
   profiles:
     edit:
@@ -801,6 +802,9 @@ da:
     aspects:
       title: "Dine aspekter"
     aspects_stream: "Aspekter"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "kommenteret"
     community_spotlight_stream: "Kreative medlemmer"
     followed_tag:
@@ -809,6 +813,9 @@ da:
       follow: "Følg"
       title: "#Fulgte tags"
     followed_tags_stream: "#Fulgte tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Omtaler"
     mentions:
       contacts_title: "Personer der har nævnt dig"
@@ -828,6 +835,7 @@ da:
   tag_followings:
     create:
       failure: "Det lykkedes ikke at følge: #%{name}. Følger du allerede tag'et?"
+      none: "You cannot follow a blank tag!"
       success: "Du følger nu #%{name}."
     destroy:
       failure: "Fejlede med at holde op med at følge #%{name}. Måske har du allerede valgt ikke at følge tag'et?"
@@ -838,9 +846,11 @@ da:
       followed_by: "fulgt af"
       following: "Følger #%{tag}"
       nobody_talking: "Ingen har talt om %{tag} endnu."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Personer tagged med %{tag}"
       posts_tagged_with: "Indlæg tagged med #%{tag}"
       stop_following: "Hold op med at følge #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Forbind til Cubbi.es"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 460b128c1..ad4e97209 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -578,6 +578,7 @@ de:
       permalink: "Permanentlink"
   previous: "Vorherige"
   privacy: "Privatsphäre"
+  privacy_policy: "Privacy Policy"
   profile: "Profil"
   profiles:
     edit:
@@ -801,6 +802,9 @@ de:
     aspects:
       title: "Deine Aspekte"
     aspects_stream: "Aspekte"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "kommentiert"
     community_spotlight_stream: Gemeinschafts-Schaukasten
     followed_tag:
@@ -809,6 +813,9 @@ de:
       follow: "Folgen"
       title: "#Tags, denen du folgst"
     followed_tags_stream: "#Tags, denen du folgst"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Erwähnungen"
     mentions:
       contacts_title: "Personen, die dich erwähnt haben"
@@ -828,6 +835,7 @@ de:
   tag_followings:
     create:
       failure: "Fehler beim Folgen von: #%{name}. Folgst du #%{name} bereits?"
+      none: "You cannot follow a blank tag!"
       success: "Hurra! Du folgst nun: #%{name}"
     destroy:
       failure: "Fehler beim Beenden des Folgens von: #%{name}. Vielleicht hast du schon aufgehört zu folgen?"
@@ -838,9 +846,11 @@ de:
       followed_by: "gefolgt von"
       following: "#%{tag} folgen"
       nobody_talking: "Niemand hat bisher etwas über %{tag} gesagt."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Personen, die mit %{tag} getaggt sind"
       posts_tagged_with: "Beiträge, die mit #%{tag} getaggt sind"
       stop_following: "#%{tag} nicht mehr folgen"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Mit Cubbi.es verbinden"
diff --git a/config/locales/diaspora/de_formal.yml b/config/locales/diaspora/de_formal.yml
index d76b7a41c..7c608c77b 100644
--- a/config/locales/diaspora/de_formal.yml
+++ b/config/locales/diaspora/de_formal.yml
@@ -578,6 +578,7 @@ de_formal:
       permalink: "Permanentlink"
   previous: "Vorherige"
   privacy: "Privatsphäre"
+  privacy_policy: "Privacy Policy"
   profile: "Profil"
   profiles:
     edit:
@@ -801,6 +802,9 @@ de_formal:
     aspects:
       title: "Ihre Aspekte"
     aspects_stream: "Aspekte"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "kommentiert"
     community_spotlight_stream: Gemeinschafts-Schaukasten
     followed_tag:
@@ -809,6 +813,9 @@ 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"
@@ -828,6 +835,7 @@ de_formal:
   tag_followings:
     create:
       failure: "Fehler beim Folgen von: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "Sie folgen nun: #%{name}"
     destroy:
       failure: "Fehler beim Beenden des Folgens von: #%{name}"
@@ -838,9 +846,11 @@ de_formal:
       followed_by: "gefolgt von"
       following: "#%{tag} folgen"
       nobody_talking: "Niemand hat bisher etwas über %{tag} gesagt."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Personen, die mit %{tag} getagt sind"
       posts_tagged_with: "Beiträge, die mit #%{tag} getagt sind"
       stop_following: "#%{tag} nicht mehr folgen"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Mit Cubbi.es verbinden"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index d29e707b9..af8d88cc9 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -29,7 +29,7 @@ el:
         reshare:
           attributes:
             root_guid:
-              taken: "You've already reshared that post!"
+              taken: "Έχετε ήδη μοιραστεί αυτή την ανάρτηση!"
         user:
           attributes:
             email:
@@ -61,12 +61,12 @@ el:
       done_editing: "ολοκλήρωση επεξεργασίας"
     aspect_listings:
       add_an_aspect: "+ Προσθέστε μια πτυχή"
-      deselect_all: "Deselect all"
+      deselect_all: "Αποεπιλογή όλων"
       edit_aspect: "Επεξεργασία %{name}"
-      select_all: "Select all"
+      select_all: "Επιλογή όλων"
     aspect_stream:
       stay_updated: "Μείνετε ενημερωμένος/η"
-      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
+      stay_updated_explanation: "Η κεντρική σας ροή απαρτίζεται από όλες τις επαφές σας, ετικέτες που ακολουθείτε, και αναρτήσεις από μερικά ενεργά μέλη της κοινότητας."
     contacts_not_visible: "Οι επαφές σ' αυτήν την πτυχή δεν θα μπορούν να δουν ο ένας τον άλλον."
     contacts_visible: "Οι επαφές σ' αυτήν την πτυχή θα μπορούν να δουν ο ένας τον άλλον."
     create:
@@ -104,27 +104,27 @@ el:
       handle_explanation: "Αυτό είναι το αναγνωριστικό σας στο Diaspora (ID). Όπως και με μια διεύθυνση ηλεκτρονικού ταχυδρομείου, μπορείτε να το δώσετε σε άλλους για να σας βρουν."
       help:
         do_you: Μήπως..
-        email_feedback: "%{link} your feedback, if you prefer"
+        email_feedback: "%{link} το σχόλιό σας, αν προτιμάτε"
         feature_suggestion: "... έχεις μια %{link} πρόταση?"
         find_a_bug: "... βρες %{link}?"
         have_a_question: "... έχεις ένα %{link}?"
         here_to_help: "Η κοινότητα του Diaspora είναι εδώ για να σε βοηθήσει!"
         need_help: "Χρειάζεστε βοήθεια;"
-        satisfaction: "%{link}: Community-powered support"
-        tag_bug: "#bug"
-        tag_feature: "#feature"
-        tag_question: "#question"
+        satisfaction: "%{link}: Υποστήριξη από την κοινότητα"
+        tag_bug: "bug"
+        tag_feature: "feature"
+        tag_question: "question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "Αυτή είναι η Ροή σας. Μπείτε και συστηθείτε."
       keep_us_running: "Διατηρείστε τη καλή λειτουργία του %{pod}, παρέχοντας στους servers μας τη καφείνη τους!"
       new_here:
-        follow: "Follow %{link} and welcome new users to Diaspora*!"
-        learn_more: "Learn more"
-        title: "Welcome New Users"
+        follow: "Ακολουθήστε τη %{link} και καλωσορίστε νέους χρήστες στο Diaspora*!"
+        learn_more: "Μάθετε περισσότερα"
+        title: "Καλωσήλθατε Νέοι Χρήστες"
       no_contacts: "Καμία επαφή"
       no_tags: "+ Βρείτε μια ετικέτα να ακολουθείτε"
       people_sharing_with_you: "Άτομα που μοιράζονται μαζί σας"
-      post_a_message: "δημοσιεύστε ένα μήνυμα >>"
+      post_a_message: "αναρτήστε ένα μήνυμα >>"
       services:
         content: "Μπορείτε να συνδέσετε τις παρακάτω υπηρεσίες στο Diaspora:"
         heading: "Συνδέστε Υπηρεσίες"
@@ -140,9 +140,9 @@ el:
       create: "Δημιουργία"
       name: "Όνομα (εμφανίζετε μόνο σε εσάς)"
     no_contacts_message:
-      community_spotlight: "community spotlight"
-      or_spotlight: "Or you can share with %{link}"
-      try_adding_some_more_contacts: "Μπορείτε να ψάξετε (επάνω) ή να προσκαλέσετε (δεξιά) περισσότερες επαφές."
+      community_spotlight: "δημοσιεύσεις κοινότητας"
+      or_spotlight: "Η μπορείτε να το μοιραστείτε με %{link}"
+      try_adding_some_more_contacts: "Μπορείτε να ψάξετε ή να προσκαλέσετε περισσότερες επαφές."
       you_should_add_some_more_contacts: "Πρέπει να προσθέσετε περισσότερες επαφές!"
     no_posts_message:
       start_talking: "Κανένας δεν έχει δημοσιεύσει κάτι ακόμα!"
@@ -156,7 +156,7 @@ el:
     selected_contacts:
       manage_your_aspects: "Διαχείριση των πτυχών."
       no_contacts: "Δεν έχετε ακόμα κάποια επαφή εδώ."
-      view_all_community_spotlight: "See all community spotlight"
+      view_all_community_spotlight: "Εμφάνιση όλων των δημοσιεύσεων κοινότητας"
       view_all_contacts: "Προβολή όλων των επαφών"
     show:
       edit_aspect: "επεξεργασία πτυχής"
@@ -172,17 +172,17 @@ el:
   back: "Πίσω"
   blocks:
     create:
-      failure: "I couldn't ignore that user.  #evasion"
-      success: "Alright, you won't see that user in your stream again. #silencio!"
+      failure: "Δεν μπόρεσα να αγνοήσω αυτόν τον χρήστη.  #evasion"
+      success: "Εντάξει, δεν θα ξαναδείτε αυτό το χρήστη στη ροή σας. #σίγαση!"
     destroy:
-      failure: "I couldn't stop ignoring that user.  #evasion"
-      success: "Let's see what they have to say! #sayhello"
+      failure: "Δεν μπόρεσα να σταματήσω να αγνοώ αυτό το χρήστη. #evasion"
+      success: "Για να δούμε τι έχουν να πουν! #sayhello"
   bookmarklet:
     explanation: "Δημοσιεύστε στο Diaspora από οπουδήποτε προσθέτοντας %{link}."
     explanation_link_text: "αυτόν τον σύνδεσμο"
     heading: "Bookmarklet"
-    post_something: "Δημοσιεύστε κάτι στο Diaspora"
-    post_success: "Δημοσιεύτηκε! Κλείνει!"
+    post_something: "Αναρτήστε κάτι στο Diaspora"
+    post_success: "Αναρτήθηκε! Κλείνει!"
   cancel: "Ακύρωση"
   comments:
     few: "%{count} σχόλια"
@@ -202,7 +202,7 @@ el:
       add_a_new_aspect: "Προσθέστε μια νέα πτυχή"
       add_to_aspect: "Προσθέστε επαφές στο %{name}"
       all_contacts: "Όλες οι Επαφές"
-      check_out: "Check out"
+      check_out: "Ρίξε μια ματιά"
       many_people_are_you_sure: "Είστε σίγουρος/η ότι θέλετε να ξεκινήσετε μια ιδιωτική συνομιλία με περισσότερες από %{suggested_limit} επαφές? Η δημοσίευση σε αυτή την πτυχή ίσως είναι ένας καλύτερος τρόπος για να επικοινωνήσετε μαζί τους."
       my_contacts: "Οι Επαφές μου"
       no_contacts: "Φαίνεται πως χρειάζεται να προσθέσετε μερικές επαφές! "
@@ -217,7 +217,7 @@ el:
     sharing:
       people_sharing: "Άτομα που διαμοιράζονται μαζί σας: "
     spotlight:
-      community_spotlight: "Community Spotlight"
+      community_spotlight: "Δημοσιεύσεις Κοινότητας"
     two: "%{count} επαφές"
     zero: "επαφές"
   conversations:
@@ -301,7 +301,7 @@ el:
       comma_seperated_plz: "Μπορείτε να εισάγετε πολλαπλές διευθύνσεις ηλεκτρονικού ταχυδρομείου διαχωρισμένες με κόμμα."
       if_they_accept_info: "αν δεχτούν, θα προστεθούν στην πτυχή που τους πρασκαλέσατε. "
       invite_someone_to_join: "Προσκαλέστε κάποιον στο Diaspora!"
-      language: "Language"
+      language: "Γλώσσα"
       personal_message: "Προσωπικό μήνυμα"
       resend: "Αποστολή ξανά"
       send_an_invitation: "Στείλτε μια πρόσκληση"
@@ -319,10 +319,10 @@ el:
       blog: "blog"
       code: "κώδικας"
       login: "Είσοδος"
-      logout: "αποσύνδεση"
-      profile: "προφίλ"
+      logout: "Αποσύνδεση"
+      profile: "Προφίλ"
       recent_notifications: "Πρόσφατες ειδοποιήσεις"
-      settings: "ρυθμίσεις"
+      settings: "Ρυθμίσεις"
       view_all: "Προβολή όλων"
   likes:
     likes:
@@ -401,10 +401,10 @@ el:
       zero: "Η %{post_link} άρεσε στους χρήστες %{actors}."
     liked_post_deleted:
       few: "Η διαγεγραμμένη δημοσίευσή σας άρεσε στους χρήστες %{actors}."
-      many: "Η διαγεγραμμένη δημοσίευσή σας άρεσε στους χρήστες %{actors}."
+      many: "Η διαγραμμένη ανάρτησή σας άρεσε στους χρήστες %{actors}."
       one: "Η διαγεγραμμένη δημοσίευσή σας άρεσε στον χρήστη %{actors}."
       other: "Η διαγεγραμμένη δημοσίευσή σας άρεσε στον χρήστη %{actors}."
-      two: "Στους χρήστες %{actors} άρεσε η διαγεγραμμένη δημοσίευσή σας."
+      two: "Στους χρήστες %{actors} άρεσε η διαγραμμένη ανάρτησή σας."
       zero: "Η διαγεγραμμένη δημοσίευσή σας άρεσε στον χρήστη %{actors}."
     mentioned:
       few: "Οι χρήστες %{actors} σας ανέφεραν στη %{post_link}."
@@ -420,7 +420,7 @@ el:
       other: "Οι χρήστες %{actors} σας ανέφεραν σε μια διαγεγραμμένη δημοσίευση."
       two: "Οι χρήστες %{actors} σας ανέφεραν σε μια διαγεγραμμένη δημοσίευση. "
       zero: "Οι χρήστες %{actors} σας ανέφεραν σε μια διαγεγραμμένη δημοσίευση."
-    post: "δημοσίευση"
+    post: "ανάρτηση"
     private_message:
       few: "Οι χρήστες %{actors} σας έστειλαν ένα μήνυμα."
       many: "Οι χρήστες %{actors} σας έστειλαν ένα μήνυμα. "
@@ -429,19 +429,19 @@ el:
       two: "Οι χρήστες %{actors} σας έστειλαν ένα μήνυμα."
       zero: "Ο χρήστης %{actors} σας έστειλε ένα μήνυμα."
     reshared:
-      few: "Οι χρήστες %{actors} κοινοποίησαν τη %{post_link}."
-      many: "Οι χρήστες %{actors} κοινοποίησαν τη %{post_link}."
-      one: "Ο χρήστης %{actors} κοινοποίησε τη %{post_link}."
-      other: "Οι χρήστες %{actors} κοινοποίησαν τη %{post_link}."
-      two: "Οι χρήστες %{actors} κοινοποίησαν τη %{post_link}."
-      zero: "Οι χρήστες %{actors} κοινοποίησαν τη %{post_link}."
+      few: "Οι χρήστες %{actors} μοιράστηκαν τη %{post_link}."
+      many: "Οι χρήστες %{actors} μοιράστηκαν τη %{post_link}."
+      one: "Ο χρήστης %{actors} μοιράστηκε τη %{post_link}."
+      other: "Οι χρήστες %{actors} μοιράστηκαν τη %{post_link}."
+      two: "Οι χρήστες %{actors} μοιράστηκαν τη %{post_link}."
+      zero: "Οι χρήστες %{actors} μοιράστηκαν τη %{post_link}."
     reshared_post_deleted:
-      few: "Οι χρήστες %{actors} κοινοποίησαν τη διαγεγραμμένη δημοσίευση. "
-      many: "Οι χρήστες %{actors} κοινοποίησαν τη διαγεγραμμένη δημοσίευση."
-      one: "Ο χρήστης %{actors} κοινοποίησε τη διαγεγραμμένη δημοσίευσή σας.  "
-      other: "Ο χρήστης %{actors} κοινοποίησε τη διαγεγραμμένη δημοσίευσή σας. "
-      two: "Οι χρήστες %{actors} κοινοποίησαν μια διαγεγραμμένη δημοσίευση."
-      zero: "Ο χρήστης %{actors} κοινοποίησε τη διαγεγραμμένη δημοσίευσή σας."
+      few: "Οι χρήστες %{actors} μοιράστηκαν τη διαγραμμένη ανάρτησή σας. "
+      many: "Οι χρήστες %{actors} μοιράστηκαν τη διαγραμμένη ανάρτησή σας."
+      one: "Ο χρήστης %{actors} μοιράστηκε τη διαγραμμένη ανάρτησή σας.  "
+      other: "Ο χρήστης %{actors} μοιράστηκε τη διαγραμμένη ανάρτησή σας. "
+      two: "Οι χρήστες %{actors} μοιράστηκαν μια διαγεγραμμένη δημοσίευση."
+      zero: "Ο χρήστης %{actors} μοιράστηκε τη διαγραμμένη ανάρτησή σας."
     started_sharing:
       few: "Οι χρήστες %{actors} άρχισαν να διαμοιράζονται μαζί σας."
       many: "Οι χρήστες %{actors} άρχισαν να διαμοιράζονται μαζί σας."
@@ -450,10 +450,10 @@ el:
       two: "Οι χρήστες %{actors} άρχισαν να διαμοιράζονται μαζί σας. "
       zero: "Ο χρήστης %{actors} άρχισε να διαμοιράζεται μαζί σας."
   notifier:
-    a_post_you_shared: "μια δημοσίευση."
+    a_post_you_shared: "μια ανάρτηση."
     click_here: "πατήστε εδώ"
     comment_on_post:
-      reply: "Απαντήστε ή δείτε τη δημοσίευση του χρήστη %{name} >"
+      reply: "Απαντήστε ή δείτε την ανάρτηση του χρήστη %{name} >"
     confirm_email:
       click_link: "Για να ενεργοποιήσετε την καινούρια διεύθυνση ηλεκτρονικού ταχυδρομείου %{unconfirmed_email}, παρακαλούμε πατήστε στο παρακάτω σύνδεσμο: "
       subject: "Παρακαλούμε ενεργοποιήστε την καινούρια διεύθυνση ηλεκτρονικού ταχυδρομείου %{unconfirmed_email}"
@@ -461,15 +461,15 @@ el:
     hello: "Γειά σου %{name}!"
     liked:
       liked: "στο χρήστη %{name} αρέσει η δημοσίευση σας"
-      view_post: "Δείτε τη δημοσίευση >"
+      view_post: "Δείτε την ανάρτηση >"
     mentioned:
       mentioned: "αναφέρεται σε σας σε μια δημοσίευση:"
       subject: "Ο/Η %{name} σας αναφέρει στο Diaspora*"
     private_message:
       reply_to_or_view: "Απαντήστε ή δείτε τη συζήτηση >"
     reshared:
-      reshared: "ο χρήστης %{name} μόλις κοινοποίησε τη δημοσίευση σας"
-      view_post: "Δείτε τη δημοσίευση >"
+      reshared: "ο χρήστης %{name} κοινοποίησε τη δημοσίευση σας"
+      view_post: "Δείτε την ανάρτηση >"
     single_admin:
       admin: "Ο διαχειριστής του Diaspora σας"
       subject: "Μήνυμα για τον Diaspora λογαριασμό σας:"
@@ -494,7 +494,7 @@ el:
       results_for: "αποτελέσματα για %{params}"
     index:
       couldnt_find_them_send_invite: "Δεν τους βρήκατε; Στείλτε μια πρόσκληση!"
-      looking_for: "Looking for posts tagged %{tag_link}?"
+      looking_for: "Ψάχνετε για αναρτήσεις με την ετικέτα %{tag_link};"
       no_one_found: "...κανένας δεν βρέθηκε. "
       no_results: "Επ! Χρειάζεται να ψάξετε για κάτι."
       results_for: "αποτελέσματα αναζήτησης για"
@@ -518,13 +518,13 @@ el:
     show:
       does_not_exist: "Ο/Η χρήστης δεν υπάρχει!"
       has_not_shared_with_you_yet: "Ο χρήστης %{name} δεν μοιράζεται ακόμα κάποια δημοσίευση μαζί σας!"
-      ignoring: "You are ignoring all posts from %{name}."
+      ignoring: "Αγνοείτε όλες τις αναρτήσεις από %{name}."
       incoming_request: "Ο/Η %{name} θέλει να μοιραστεί μαζί σας"
       mention: "Αναφορά"
       message: "Μήνυμα"
       not_connected: "Δεν είστε συνδεδεμένος με αυτόν τον χρήστη "
-      recent_posts: "Πρόσφατες δημοσιεύσεις"
-      recent_public_posts: "Πρόσφατες Δημόσιες Δημοσιεύσεις"
+      recent_posts: "Πρόσφατες Αναρτήσεις"
+      recent_public_posts: "Πρόσφατες Δημόσιες Αναρτήσεις"
       return_to_aspects: "Επιστροφή στη σελίδα με τις πτυχές σας"
       see_all: "Εμφάνιση όλων"
       start_sharing: "ξεκινήσετε την κοινή χρήση"
@@ -550,13 +550,13 @@ el:
     new:
       back_to_list: "Επιστροφή στη Λίστα"
       new_photo: "Νέα φωτογραφία"
-      post_it: "δημοσίευσε το!"
+      post_it: "ανάρτησέ το!"
     new_photo:
       empty: "{file} είναι κενό, επιλέξτε και πάλι τα αρχεία χωρίς αυτό."
       invalid_ext: "{file} δεν έχει έγκυρη τύπο αρχείου. Μόνο τύποι αρχείου {extensions} επιτρέπονται."
       size_error: "{file} είναι πολύ μεγάλο, το μέγιστο μέγεθος αρχείου είναι {sizeLimit}."
     new_profile_photo:
-      or_select_one_existing: "or select one from your already existing %{photos}"
+      or_select_one_existing: "ή επιλέξτε μια από τις ήδη υπάρχουσες %{photos}"
       upload: "Μεταφορτώστε μια νέα φωτογραφία προφίλ!"
     photo:
       view_all: "δες όλες τις φωτογραφίες του χρήστη %{name}"
@@ -566,7 +566,7 @@ el:
       edit: "Επεξεργασία"
       edit_delete_photo: "Επεξεργασία περιγραφής φωτογραφίας / διαγραφή φωτογραφίας"
       make_profile_photo: "ορισμός ως φωτογραφίας προφίλ"
-      show_original_post: "Προβολή αρχικής δημοσίευσης"
+      show_original_post: "Προβολή αρχικής ανάρτησης"
       update_photo: "Ενημέρωση Φωτογραφίας"
     update:
       error: "Αποτυχία επεξεργασίας φωτογραφίας."
@@ -574,10 +574,11 @@ el:
   posts:
     show:
       destroy: "Διαγραφή"
-      not_found: "Λυπούμαστε, δεν καταφέραμε να βρούμε αυτή τη δημοσίευση."
+      not_found: "Λυπούμαστε, δεν καταφέραμε να βρούμε αυτή την ανάρτηση."
       permalink: "permalink"
   previous: "προηγούμενο"
-  privacy: "Privacy"
+  privacy: "Απόρρητο"
+  privacy_policy: "Privacy Policy"
   profile: "Προφίλ"
   profiles:
     edit:
@@ -619,7 +620,7 @@ el:
       unhappy: "Δεν είσαι ικανοποιημένος/η;"
       update: "Ενημέρωση"
     new:
-      create_my_account: "Δημιουργία του λογαριασμού μου"
+      create_my_account: "Δημιουργία λογαριασμού!"
       enter_email: "Εισάγετε μια διεύθυνση ηλεκτρονικού ταχυδρομείου"
       enter_password: "Εισάγετε έναν κωδικό"
       enter_password_again: "Εισάγετε τον ίδιο κωδικό πάλι"
@@ -667,7 +668,7 @@ el:
   search: "Αναζήτηση"
   services:
     create:
-      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      already_authorized: "Ένας χρήστης με diaspora αναγνωριστικό %{diaspora_id} έχει ήδη εξουσιοδοτήσει αυτόν τον %{service_name} λογαριασμό."
       failure: "Αποτυχία πιστοποίησης."
       success: "Επιτυχής έλεγχος ταυτότητας."
     destroy:
@@ -675,7 +676,7 @@ el:
     failure:
       error: "εμφανίστηκε ένα σφάλμα κατά τη σύνδεση με αυτή την υπηρεσία"
     finder:
-      fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes."
+      fetching_contacts: "Το Diaspora ανακτά τους %{service} φίλους σας παρακαλώ επανέλθετε σε μερικά λεπτά."
       no_friends: "Δεν βρέθηκαν φίλοι στο Facebook. "
       service_friends: "%{service} Φίλοι"
     index:
@@ -697,8 +698,8 @@ el:
   settings: "Ρυθμίσεις"
   share_visibilites:
     update:
-      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
-      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
+      post_hidden_and_muted: "Οι δημοσιεύσεις του χρήστη %{name} έχουν κρυφτεί, και οι ειδοποιήσεις έχουν απενεργοποιηθεί."
+      see_it_on_their_profile: "Αν θέλετε να δείτε ενημερώσεις για αυτή τη δημοσίευση, επισκεφτείτε το προφίλ του χρήστη %{name}."
   shared:
     add_contact:
       add_new_contact: "Προσθέστε μια νέα επαφή"
@@ -740,17 +741,17 @@ el:
       outside: "Τα δημόσια μηνύματα θα είναι διαθέσιμα και σε χρήστες εκτός του δικτύου Diaspora"
       share: "Μοιραστείτε"
       title: "Ρύθμιση συνδεδεμένων υπηρεσιών"
-      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
+      visibility_dropdown: "Χρησιμοποιήστε αυτό το αναδυόμενο μενού για να αλλάξτε την ορατότητα της ανάρτησης σας. (Προτείνουμε να κάνετε αυτή τη πρώτη δημόσια.)"
     publisher:
       all: "όλα"
       all_contacts: "όλες οι επαφές"
-      discard_post: "Απομάκρυνση δημοσίευσης"
+      discard_post: "Απόρριψη ανάρτησης"
       make_public: "Δημοσιοποίησε το"
       new_user_prefill:
         hello: "Γεια σε όλους, είμαι #%{new_user_tag}. "
         i_like: "Με ενδιαφέρουν οι ετικέτες %{tags}."
-        invited_by: "Thanks for the invite, "
-        newhere: "NewHere"
+        invited_by: "Ευχαριστώ για την πρόσκληση, "
+        newhere: "ΝέοςΕδώ"
       post_a_message_to: "Αναρτήστε ένα μήνυμα στην πτυχή %{aspect}"
       posting: Ανάρτηση...
       publishing_to: "δημοσίευση στο: "
@@ -761,8 +762,8 @@ el:
     reshare:
       reshare: "Μοιράσου και πάλι"
     stream_element:
-      connect_to_comment: "Connect to this user to comment on their post"
-      currently_unavailable: "commenting currently unavailable"
+      connect_to_comment: "Συνδεθείτε με αυτόν τον χρήστη για να σχολιάσετε στην ανάρτησή του"
+      currently_unavailable: "ο σχολιασμός αυτή τη στιγμή δεν είναι διαθέσιμος"
       dislike: "Δεν μ' αρέσει"
       hide_and_mute: "Απόκρυψη και Σίγαση "
       ignore_user: "Αγνόηση %{name}"
@@ -791,46 +792,53 @@ el:
   stream_helper:
     hide_comments: "Απόκρυψη όλων των σχολίων"
     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: "Εμφάνιση %{count} ακόμα σχολίων"
+      many: "Εμφάνιση %{count} ακόμα σχολίων"
+      one: "Εμφάνιση ενός ακόμα σχολίου"
+      other: "Εμφάνιση %{count} ακόμα σχολίων"
+      two: "Εμφάνιση δυο ακόμα σχολίων"
+      zero: "Δεν υπάρχουν άλλα σχόλια"
   streams:
     aspects:
-      title: "Your Aspects"
+      title: "Οι Πτυχές σας"
     aspects_stream: "Πτυχές"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "σχολιάστηκε"
-    community_spotlight_stream: "Community Spotlight"
+    community_spotlight_stream: "Αναρτήσεις Κοινότητας"
     followed_tag:
-      add_a_tag: "Add a tag"
+      add_a_tag: "Προσθήκη μιας ετικέτας"
       contacts_title: "Άτομα που έψαξαν αυτές τις ετικέτες"
-      follow: "Follow"
+      follow: "Ακολουθήστε"
       title: "#Ετικέτες που ακολουθείτε"
     followed_tags_stream: "#Ετικέτες που ακολουθείτε"
-    mentioned_stream: "@Mentions"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
+    mentioned_stream: "@Αναφορές"
     mentions:
       contacts_title: "Άτομα που σας έχουν αναφέρει"
       title: "@Αναφορές"
     multi:
       contacts_title: "Άτομα στη Ροή σας"
       title: "Ροή"
-    posted: "δημοσιεύτηκε"
+    posted: "αναρτήθηκε"
     public:
       contacts_title: "Πρόσφατες Αφίσες"
       title: "Δημόσια Δραστηριότητα"
     recently: "πρόσφατα:"
     tags:
       contacts_title: "Άτομα που τους αρέσουν αυτές οι ετικέτες"
-      tag_prefill_text: "The thing about %{tag_name} is... "
+      tag_prefill_text: "Αυτό που σκέφτομαι για %{tag_name} είναι... "
       title: "Δημοσιοποιήσεις με ετικέτα: %{tags}"
   tag_followings:
     create:
-      failure: "Η προσπάθεια σας να ακολουθήσετε την ετικέτα #%{name} απέτυχε. "
-      success: "Ακολουθείτε επιτυχώς την ετικέτα: #%{name}"
+      failure: "Η προσπάθεια σας να ακολουθήσετε την ετικέτα #%{name} απέτυχε. Μήπως την ακολουθείτε ήδη;"
+      none: "You cannot follow a blank tag!"
+      success: "Γιούπι! Ακολουθείτε επιτυχώς την ετικέτα #%{name}."
     destroy:
-      failure: "Η προσπάθεια σας να σταματήσετε να ακολουθείτε την ετικέτα #%{name} απέτυχε"
+      failure: "Η προσπάθεια σας να σταματήσετε να ακολουθείτε την ετικέτα #%{name} απέτυχε. Μήπως έχετε ήδη σταματήσει να την ακολουθείτε;"
       success: "Σταματήσατε επιτυχώς να ακολουθείτε την ετικέτα: #%{name}"
   tags:
     show:
@@ -838,9 +846,11 @@ el:
       followed_by: "ακολουθείται από"
       following: "Ακολουθείτε την ετικέτα #%{tag}"
       nobody_talking: "Κανένας δεν μιλάει ακόμα για την ετικέτα %{tag}."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Άτομα με την ετικέτα %{tag}"
-      posts_tagged_with: "Δημοσιεύσεις με την ετικέτα #%{tag}"
+      posts_tagged_with: "Αναρτήσεις με την ετικέτα #%{tag}"
       stop_following: "Σταματήσατε να ακολουθείτε την ετικέτα #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Σύνδεση με Cubbi.es"
@@ -860,9 +870,9 @@ el:
       email_confirmed: "Η διεύθυνση ηλεκτρονικού ταχυδρομείου %{email} ενεργοποιήθηκε"
       email_not_confirmed: "Η διεύθυνση ηλεκτρονικού ταχυδρομείου δεν ενεργοποιήθηκε. Μήπως ήταν λάθος ο σύνδεσμος;"
     destroy:
-      no_password: "Please enter your current password to close your account."
-      success: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
-      wrong_password: "The entered password didn't match your current password."
+      no_password: "Παρακαλώ εισάγετε τον τωρινό κωδικό σας για να κλείσει ο λογαριασμός σας."
+      success: "Ο λογαριασμός σας έχει κλειδωθεί. Μπορεί να πάρει 20 λεπτά για να ολοκληρώσουμε το κλείσιμο του λογαριασμού σας. Ευχαριστούμε που δοκιμάσατε το Diaspora."
+      wrong_password: "Ο κωδικός που εισάγατε δεν ταιριάζει με τον τωρινό κωδικό σας."
     edit:
       also_commented: "...κάποιος επίσης σχολίασε σε δημοσίευση επαφής σας;"
       change: "Αλλαγή"
@@ -870,39 +880,39 @@ el:
       change_language: "Αλλαγή Γλώσσας"
       change_password: "Αλλαγή κωδικού πρόσβασης"
       close_account: "Κλείσιμο Λογαριασμού"
-      comment_on_post: "...κάποιος σχολίασε την δημοσίευση σας?"
+      comment_on_post: "...κάποιος σχολίασε την ανάρτησή σας?"
       current_password: "Τρέχον κωδικός πρόσβασης"
       download_photos: "κατέβασε τις φωτογραφίες μου"
       download_xml: "κατέβασε το xml μου"
       edit_account: "Επεξεργασία λογαριασμού"
       email_awaiting_confirmation: "Σας στείλαμε έναν σύνδεσμο ενεργοποίησης στο %{unconfirmed_email}. Μέχρι να ακολουθήσετε αυτόν τον σύνδεσμο και να ενεργοποιήσετε τη νέα διεύθυνση, θα συνεχίσουμε να χρησιμοποιούμε την αρχική σας %{email}."
       export_data: "Εξαγωγή Δεδομένων"
-      getting_started: "New User Prefrences"
+      getting_started: "Προτιμήσεις Νέου Χρήστη"
       liked: "...σε κάποιον αρέσει η δημοσίευση σας;"
       mentioned: "...επισημανθήκατε σε μία φωτογραφία?"
       new_password: "Νέος κωδικός πρόσβασης"
-      photo_export_unavailable: "Photo exporting currently unavailable"
+      photo_export_unavailable: "Η εξαγωγή φωτογραφίας αυτή τη στιγμή δεν είναι διαθέσιμη"
       private_message: "...μόλις λάβατε μία προσωπική ειδοποίηση?"
       receive_email_notifications: "Να λαμβάνετε ειδοποιήσεις στο ηλεκτρονικό σας ταχυδρομείο όταν..."
       reshared: "...κάποιος κοινοποίησε τη δημοσίευση σας?"
-      show_community_spotlight: "Show Community Spotlight in Stream?"
-      show_getting_started: "Re-enable Getting Started"
+      show_community_spotlight: "Εμφάνιση Δημοσιεύσεων Κοινότητας στη Ροή σας;"
+      show_getting_started: "Επανενεργοποιήση Getting Started"
       started_sharing: "...κάποιος άρχισε να διαμοιράζεται μαζί σας?"
       stream_preferences: "Προτιμήσεις Ροής"
       your_email: "Το email σας"
       your_handle: "Το αναγνωριστικό σας στο diaspora"
     getting_started:
-      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
+      awesome_take_me_to_diaspora: "Εξαιρετικά! Πήγαινέ με στο Diaspora*"
       community_welcome: "Η κοινότητα του Diaspora είναι χαρούμενη να σας έχει μαζί!"
       hashtag_explanation: "Τα hashtags σας επιτρέπουν να συζητάτε και να ακολουθείτε συγκεκριμένα ενδιαφέροντα. Είναι ακόμα ένας ωραίος τρόπος για να γνωρίσετε νέα άτομα στο Diaspora."
-      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
-      hooking_up_fb: "hooking up your Facebook account"
-      saved: Saved!
-      we_can_speed_things_up: "We can speed things up a bit by"
-      well_hello_there: "Well, hello there!"
-      what_are_you_in_to: "What are you into?"
-      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
-      who_are_you: "Who are you?"
+      hashtag_suggestions: "Δοκιμάστε να ακολουθήστε ετικέτες όπως #τέχνη, #ταινίες, #music, κτλ."
+      hooking_up_fb: "σύνδεση του Facebook λογαριασμού σας"
+      saved: Αποθηκεύτηκε!
+      we_can_speed_things_up: "Μπορούμε να επιταχύνουμε τα πράγματα με"
+      well_hello_there: "Λοιπόν, γεια σας!"
+      what_are_you_in_to: "Με τι ασχολείστε?"
+      what_facebook_does: "στο Diaspora. Θα πάρει το όνομα και τη φωτογραφία σας, και θα επιτρέψει την ανταλλαγή δημοσιεύσεων μεταξύ τους (cross-posting)."
+      who_are_you: "Ποιός είστε;"
     logged_out:
       go_mobile: "Εναλλαγή σε κινητό."
       on_your_mobile_device: "στη κινητή συσκευή σας για να έχετε πρόσβαση στη κινητή έκδοση του Diaspora*."
@@ -911,8 +921,8 @@ el:
       works_on_modern: "Δουλεύει σε όλα τα μοντέρνα smartphones"
     privacy_settings:
       ignored_users: "Αγνοημένοι Χρήστες"
-      stop_ignoring: "Stop ignoring"
-      title: "Privacy Settings"
+      stop_ignoring: "Διακοπή Αγνόησης"
+      title: "Ρυθμίσεις Απορρήτου"
     public:
       does_not_exist: "Ο χρήστης %{username} δεν υπάρχει!"
     update:
diff --git a/config/locales/diaspora/en_1337.yml b/config/locales/diaspora/en_1337.yml
index d8266e193..22fadb604 100644
--- a/config/locales/diaspora/en_1337.yml
+++ b/config/locales/diaspora/en_1337.yml
@@ -578,6 +578,7 @@ en_1337:
       permalink: "P3RM4L1NK"
   previous: "PR3V10U5"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "PR0F1L3"
   profiles:
     edit:
@@ -801,6 +802,9 @@ en_1337:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ en_1337:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "N00B5 WH0 M3N710N3D U"
@@ -828,6 +835,7 @@ en_1337:
   tag_followings:
     create:
       failure: "F41L3D 2 F0LL0W: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "5UCC35FULLY F0LL0W1NG: #%{name}"
     destroy:
       failure: "F41L3D 2 570P F0LL0W1NG: #%{name}"
@@ -838,9 +846,11 @@ en_1337:
       followed_by: "followed by"
       following: "F0LL0W1NG #%{tag}"
       nobody_talking: "N0B0DY 5P4MM3D 4B0U7 %{tag} Y37!"
+      none: "The empty tag does not exist!"
       people_tagged_with: "N00B5 74GG3D W17H %{tag}"
       posts_tagged_with: "5P4M 74GG3D W17H #%{tag}"
       stop_following: "570P F0LL0W1NG #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "C0NN3C7 2 CUBB1.35!"
diff --git a/config/locales/diaspora/en_pirate.yml b/config/locales/diaspora/en_pirate.yml
index f25225c20..32d6bd55f 100644
--- a/config/locales/diaspora/en_pirate.yml
+++ b/config/locales/diaspora/en_pirate.yml
@@ -578,6 +578,7 @@ en_pirate:
       permalink: "permalink"
   previous: "previous"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "Profile"
   profiles:
     edit:
@@ -801,6 +802,9 @@ en_pirate:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ en_pirate:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
@@ -828,6 +835,7 @@ en_pirate:
   tag_followings:
     create:
       failure: "Failed to follow: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "Successfully following: #%{name}"
     destroy:
       failure: "Failed to stop following: #%{name}"
@@ -838,9 +846,11 @@ en_pirate:
       followed_by: "followed by"
       following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
+      none: "The empty tag does not exist!"
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       stop_following: "Stop Following #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Connect to Cubbi.es"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 427fcd2c6..1a9bed9a2 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -578,6 +578,7 @@ en_shaw:
       permalink: "𐑐𐑻𐑥𐑩𐑤𐑦𐑙𐑒"
   previous: "𐑐𐑮𐑰𐑝𐑾𐑕"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "𐑐𐑮𐑴𐑓𐑲𐑤"
   profiles:
     edit:
@@ -801,6 +802,9 @@ en_shaw:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ en_shaw:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
@@ -828,6 +835,7 @@ en_shaw:
   tag_followings:
     create:
       failure: "𐑓𐑱𐑤𐑛 𐑑 𐑓𐑪𐑤𐑴: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑓𐑪𐑤𐑴𐑦𐑙: #%{name}"
     destroy:
       failure: "𐑓𐑱𐑤𐑛 𐑑 𐑕𐑑𐑪𐑐 𐑓𐑪𐑤𐑴𐑦𐑙: #%{name}"
@@ -838,9 +846,11 @@ en_shaw:
       followed_by: "followed by"
       following: "𐑓𐑪𐑤𐑴𐑦𐑙 #%{tag}"
       nobody_talking: "𐑯𐑴𐑚𐑩𐑛𐑦 𐑦𐑟 𐑑𐑷𐑒𐑦𐑙 𐑩𐑚𐑬𐑑 %{tag} 𐑘𐑧𐑑."
+      none: "The empty tag does not exist!"
       people_tagged_with: "𐑐𐑰𐑐𐑩𐑤 𐑑𐑨𐑜𐑛 𐑢𐑦𐑞 %{tag}"
       posts_tagged_with: "𐑐𐑴𐑕𐑑𐑕 𐑑𐑨𐑜𐑛 𐑢𐑦𐑞 #%{tag}"
       stop_following: "𐑕𐑑𐑪𐑐 𐑓𐑪𐑤𐑴𐑦𐑙 #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑑 Cubbi.es"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index ac22676d1..bb44db215 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -578,6 +578,7 @@ eo:
       permalink: "malŝanĝantligilo"
   previous: "antaŭa"
   privacy: "Privateco"
+  privacy_policy: "Privacy Policy"
   profile: "Profilo"
   profiles:
     edit:
@@ -801,6 +802,9 @@ eo:
     aspects:
       title: "Viaj Aspektoj"
     aspects_stream: "Aspektoj"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "komentis pri"
     community_spotlight_stream: "Komunuma Reflektoro"
     followed_tag:
@@ -809,6 +813,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"
@@ -828,6 +835,7 @@ eo:
   tag_followings:
     create:
       failure: "Malsukcesis aboni je #%{name}. Ĉu vi jam sekvas ĝin?"
+      none: "You cannot follow a blank tag!"
       success: "Hura! Vi nun sekvas je #%{name}."
     destroy:
       failure: "Ne povis malaboni je #%{name}. Ĉu eble vi jam malabonis?"
@@ -838,9 +846,11 @@ eo:
       followed_by: "sekvata de"
       following: "Abonita al #%{tag}"
       nobody_talking: "Ankoraŭ neniu parolas pri %{tag}."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Personoj etikediĝis kun %{tag}"
       posts_tagged_with: "Afiŝoj etikediĝis kun #%{tag}"
       stop_following: "Malaboni de #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Konekti al Cubbi.es"
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index 7e84a4673..6b686ab2c 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -578,6 +578,7 @@ es-AR:
       permalink: "permalink"
   previous: "anterior"
   privacy: "Privacidad"
+  privacy_policy: "Privacy Policy"
   profile: "Perfil"
   profiles:
     edit:
@@ -801,6 +802,9 @@ es-AR:
     aspects:
       title: "Aspectos"
     aspects_stream: "Aspectos"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "comentado"
     community_spotlight_stream: "Comunidad Creativa"
     followed_tag:
@@ -809,6 +813,9 @@ es-AR:
       follow: "Seguir"
       title: "#Tags"
     followed_tags_stream: "#Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Menciones"
     mentions:
       contacts_title: "Gente que te mencionó"
@@ -828,6 +835,7 @@ es-AR:
   tag_followings:
     create:
       failure: "No has podido seguir a #%{name}. Tal vez ya lo hagas..."
+      none: "You cannot follow a blank tag!"
       success: "Ahora estás siguiendo a #%{name}."
     destroy:
       failure: "No has podido dejar de seguir a: #%{name}. Tal vez ya lo hiciste..."
@@ -838,9 +846,11 @@ es-AR:
       followed_by: "seguido por"
       following: "Siguiendo #%{tag}"
       nobody_talking: "Nadie está hablado sobre %{tag} todavía."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Personas etiquetadas con %{tag}"
       posts_tagged_with: "Publicaciones etiquetadas con #%{tag}"
       stop_following: "Dejar de seguir #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Conectar a Cubbi.es"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index abfd6a7c0..af117dcce 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -65,8 +65,8 @@ es-CL:
       edit_aspect: "Editar %{name}"
       select_all: "Marcar todo"
     aspect_stream:
-      stay_updated: "Stay Updated"
-      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
+      stay_updated: "Mantente Actualizado"
+      stay_updated_explanation: "Tu corriente principal está llena con todos tus contactos, tags que sigues, y posts de algunos miembros creativos de la comunidad."
     contacts_not_visible: "Los contactos en este Aspecto no se podrán ver entre ellos."
     contacts_visible: "Los contactos en este Aspecto se podrán ver entre ellos."
     create:
@@ -114,13 +114,13 @@ es-CL:
         tag_bug: "bug"
         tag_feature: "idea"
         tag_question: "pregunta"
-        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
-      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Tutoriales hechos por la comunidad, how-to, y noticias"
+      introduce_yourself: "Esta es tu corriente. Entra y preséntate."
       keep_us_running: "Mantén %{pod} rápido, !compra a nuestros servidores su dosis mensual de café!"
       new_here:
-        follow: "Follow %{link} and welcome new users to Diaspora*!"
-        learn_more: "Learn more"
-        title: "Welcome New Users"
+        follow: "Sigue %{link} y bienvenido nuevo usuario de Diaspora*!"
+        learn_more: "Aprende más"
+        title: "Bienvenidos Nuevos Usuarios"
       no_contacts: "No hay contactos"
       no_tags: "+ Busca un tag para seguir"
       people_sharing_with_you: "Personas compartiendo contigo"
@@ -129,7 +129,7 @@ es-CL:
         content: "Puedes enlazar los siguientes servicios a Diaspora:"
         heading: "Servicios que puedes enlazar"
       unfollow_tag: "Dejar de seguir #%{tag}"
-      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
+      welcome_to_diaspora: "Bienvenido a Diaspora, %{name}!"
       your_aspects: "Tus Aspectos"
     many: "%{count} aspectos"
     move_contact:
@@ -140,7 +140,7 @@ es-CL:
       create: "Crear"
       name: "Nombre(solo visible para ti)"
     no_contacts_message:
-      community_spotlight: "comunidad creativa"
+      community_spotlight: "foco de atención de la comunidad"
       or_spotlight: "O puedes compartir con %{link}"
       try_adding_some_more_contacts: "Puedes buscar o invitar a más contactos."
       you_should_add_some_more_contacts: "Deberías añadir mas contactos!"
@@ -156,7 +156,7 @@ es-CL:
     selected_contacts:
       manage_your_aspects: "Organiza tus aspectos."
       no_contacts: "Todavía no tienes ningún contacto aquí."
-      view_all_community_spotlight: "See all community spotlight"
+      view_all_community_spotlight: "Ver todos los focos de atención de la comunidad"
       view_all_contacts: "Ver todos los contactos"
     show:
       edit_aspect: "editar aspecto"
@@ -172,11 +172,11 @@ es-CL:
   back: "Atrás"
   blocks:
     create:
-      failure: "I couldn't ignore that user.  #evasion"
-      success: "Alright, you won't see that user in your stream again. #silencio!"
+      failure: "No pude ignorar ese usuario. #evasión"
+      success: "De acuerdo, no quieres ver a ese usuario en tu corriente de nuevo. #silencio!"
     destroy:
-      failure: "I couldn't stop ignoring that user.  #evasion"
-      success: "Let's see what they have to say! #sayhello"
+      failure: "No pude para de ignorar ese usuario. #evasión"
+      success: "Veamos que tienen para decir! #dihola"
   bookmarklet:
     explanation: "%{link} donde sea agregando a marcadores este link."
     explanation_link_text: "Postea en Diaspora"
@@ -301,7 +301,7 @@ es-CL:
       comma_seperated_plz: "Puedes escribir varias direcciones de correo separadas por comas."
       if_they_accept_info: "Si aceptan, ellos se agregarán al aspecto que los invitaste."
       invite_someone_to_join: "¡Invita a alguien a unirse a Diaspora!"
-      language: "Language"
+      language: "Idioma"
       personal_message: "Mensaje personal"
       resend: "Reenviar"
       send_an_invitation: "Enviar una invitación"
@@ -494,7 +494,7 @@ es-CL:
       results_for: "resultados para %{params}"
     index:
       couldnt_find_them_send_invite: "¿No los puedes encontrar? ¡Envíales una invitación!"
-      looking_for: "Looking for posts tagged %{tag_link}?"
+      looking_for: "Buscando post etiquetados con %{tag_link}?"
       no_one_found: "...y nadie fue encontrado."
       no_results: "¡Oye! Tienes que buscar algo."
       results_for: "resultados de búsqueda para"
@@ -518,7 +518,7 @@ es-CL:
     show:
       does_not_exist: "¡La persona no existe!"
       has_not_shared_with_you_yet: "%{name} todavía no ha compartido ningún post contigo!"
-      ignoring: "You are ignoring all posts from %{name}."
+      ignoring: "Estas ignorando todos los post de %{name}."
       incoming_request: "Tienes una solicitud pendiente de %{name}"
       mention: "Mencionar"
       message: "Mensaje"
@@ -556,7 +556,7 @@ es-CL:
       invalid_ext: "{file} tiene una extensión no válida. Solo están permitidas {extensions}."
       size_error: "{file} es demasiado grande, el tamaño máximo por archivo es {sizeLimit}."
     new_profile_photo:
-      or_select_one_existing: "or select one from your already existing %{photos}"
+      or_select_one_existing: "o selecciona una de las fotos(%{photos}) existentes"
       upload: "¡Sube una nueva foto de perfil!"
     photo:
       view_all: "ver todas las fotos de %{name}"
@@ -577,7 +577,8 @@ es-CL:
       not_found: "Lo sentimos, no pudimos encontrar ese post."
       permalink: "permalink"
   previous: "Anterior"
-  privacy: "Privacy"
+  privacy: "Privacidad"
+  privacy_policy: "Privacy Policy"
   profile: "Perfil"
   profiles:
     edit:
@@ -667,15 +668,15 @@ es-CL:
   search: "Buscar"
   services:
     create:
-      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
-      failure: "Authentication failed."
+      already_authorized: "Un usuario con la id %{diaspora_id} ya autorizó esa cuenta en %{service_name}."
+      failure: "Fallo al autenticarse."
       success: "Autenticación correcta."
     destroy:
       success: "Autenticación eliminada correctamente."
     failure:
       error: "ocurrió un error al conectarse con ese servicio"
     finder:
-      fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes."
+      fetching_contacts: "Diaspora se está llenando de tus amigos de %{service} por favor regresa en unos minutos."
       no_friends: "Ningún amigo de Facebook encontrado."
       service_friends: "Contactos de %{service}"
     index:
@@ -697,8 +698,8 @@ es-CL:
   settings: "Configuración"
   share_visibilites:
     update:
-      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
-      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
+      post_hidden_and_muted: "Los post de %{name} se han escondido, y las notificaciones se han silenciado."
+      see_it_on_their_profile: "Si quieres ver las actualizaciones en este post, visita la página de perfil de %{name}."
   shared:
     add_contact:
       add_new_contact: "Agregar un nuevo contacto"
@@ -733,14 +734,14 @@ es-CL:
     notification:
       new: "Nuevo %{type} de %{from}"
     public_explain:
-      control_your_audience: "Control your Audience"
+      control_your_audience: "Controla tu público"
       logged_in: "entrar a %{service}"
       manage: "manejar los servicios conectados"
-      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
+      new_user_welcome_message: "Usa los #hashtags para clasificar tus posts y encontrar personas que compartan tus intereses. Comunícate con personas asombrosas usando las @Menciones"
       outside: "Los mensajes públicos estarán disponibles para que otros fuera de Diaspora los puedan ver."
-      share: "Share"
+      share: "Compartir"
       title: "Configurar los servicios conectados"
-      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
+      visibility_dropdown: "Usa este menú desplegable para cambiar la visibilidad de tu post. (Te sugerimos hacer el primer post público.)"
     publisher:
       all: "todo"
       all_contacts: "todos los contactos"
@@ -749,7 +750,7 @@ es-CL:
       new_user_prefill:
         hello: "Hola a todo el mundo, esta es mi #%{new_user_tag}."
         i_like: "Tengo interés en %{tags}."
-        invited_by: "Thanks for the invite, "
+        invited_by: "Gracias por la invitación,"
         newhere: "PrimeraPublicación"
       post_a_message_to: "Postear un mensaje a %{aspect}"
       posting: Posteando...
@@ -761,12 +762,12 @@ es-CL:
     reshare:
       reshare: "Compartir de nuevo"
     stream_element:
-      connect_to_comment: "Connect to this user to comment on their post"
-      currently_unavailable: "commenting currently unavailable"
+      connect_to_comment: "Conéctate con este usuario para comentar en sus post"
+      currently_unavailable: "comentarios actualmente inaccesibles"
       dislike: "No me gusta esto"
       hide_and_mute: "Ignorar este post"
-      ignore_user: "Ignore %{name}"
-      ignore_user_description: "Ignore and remove user from all aspects?"
+      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"
@@ -791,24 +792,30 @@ es-CL:
   stream_helper:
     hide_comments: "ocultar todos los comentarios"
     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: "Mostrar %{count} comentarios más"
+      many: "Mostrar %{count} comentarios más"
+      one: "Mostrar un comentario más"
+      other: "Mostrar %{count} comentarios más"
+      two: "Mostrar 2 comentarios más"
+      zero: "No más comentarios"
   streams:
     aspects:
       title: "Aspectos"
     aspects_stream: "Aspectos"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "comentado"
     community_spotlight_stream: "Comunidad Creativa"
     followed_tag:
-      add_a_tag: "Add a tag"
+      add_a_tag: "Añadir un tag"
       contacts_title: "Gente con esos tags"
-      follow: "Follow"
+      follow: "Seguir"
       title: "#Tags"
     followed_tags_stream: "#Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Menciones"
     mentions:
       contacts_title: "Personas que te han mencionado"
@@ -823,11 +830,12 @@ es-CL:
     recently: "recientemente:"
     tags:
       contacts_title: "Gente que usa este tag"
-      tag_prefill_text: "The thing about %{tag_name} is... "
+      tag_prefill_text: "La cosa sobre %{tag_name} es... "
       title: "Posts con el tag: %{tags}"
   tag_followings:
     create:
       failure: "Error al seguir: #%{name}. Tal vez ya lo hiciste..."
+      none: "You cannot follow a blank tag!"
       success: "Bien, ahora sigues: #%{name}."
     destroy:
       failure: "Error al dejar de seguir: #%{name}. Tal vez ya lo hiciste..."
@@ -838,9 +846,11 @@ es-CL:
       followed_by: "seguido por"
       following: "Siguiendo a #%{tag}"
       nobody_talking: "Todavía nadie habla de %{tag}."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Personas etiquetadas en %{tag}"
       posts_tagged_with: "Posts etiquetados con #%{tag}"
       stop_following: "Dejar de seguir a #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Conectarse a Cubbi.es"
@@ -860,9 +870,9 @@ es-CL:
       email_confirmed: "E-Mail %{email} activado"
       email_not_confirmed: "El email no se pudo activar. Es la dirección correcta?"
     destroy:
-      no_password: "Please enter your current password to close your account."
-      success: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
-      wrong_password: "The entered password didn't match your current password."
+      no_password: "Por favor ingresa tu contraseña actual para cerrar tu cuenta."
+      success: "Tu cuenta ha sido bloqueada.  Puede llevarnos 20 minutos terminar de cerrar tu cuenta. Gracias por probar Diaspora."
+      wrong_password: "La contraseña ingresada no concuerda con la contraseña actual."
     edit:
       also_commented: "...alguien comenta en el post de tu amigo?"
       change: "Modificar"
@@ -877,32 +887,32 @@ es-CL:
       edit_account: "Editar cuenta"
       email_awaiting_confirmation: "Te enviamos un link de activación a %{unconfirmed_email}. Hasta que sigas ese link y actives la nueva dirección, nosotros seguiremos usando tu dirección original %{email}."
       export_data: "Exportar Datos"
-      getting_started: "New User Prefrences"
+      getting_started: "Preferencias del Nuevo Usuario"
       liked: "...a alguien le gusta tu post?"
       mentioned: "...te mencionan en un post?"
       new_password: "Nueva Contraseña"
-      photo_export_unavailable: "Photo exporting currently unavailable"
+      photo_export_unavailable: "Exportar fotos actualmente inaccesible"
       private_message: "...recibes un mensaje privado?"
       receive_email_notifications: "Recibir notificaciones por correo electrónico cuando..."
       reshared: "...alguien comparte tu post?"
       show_community_spotlight: "¿Mostras a la Comunidad Creativa en tu Stream?"
-      show_getting_started: "Re-enable Getting Started"
+      show_getting_started: "Re activar la guía de Primeros Pasos"
       started_sharing: "...alguien comienza a compartir contigo?"
       stream_preferences: "Preferencias de Stream"
       your_email: "Tu correo electrónico"
       your_handle: "Tu id de diaspora"
     getting_started:
-      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
+      awesome_take_me_to_diaspora: "Asombroso! Llévame a Diaspora*"
       community_welcome: "La comunidad de Diaspora esta feliz de tenerte abordo!"
       hashtag_explanation: "Los Hashtags te permiten hablar y seguir sobre tus intereses. También son una manera genial de encontrar nuevas personas en Diaspora."
-      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
-      hooking_up_fb: "hooking up your Facebook account"
-      saved: Saved!
-      we_can_speed_things_up: "We can speed things up a bit by"
-      well_hello_there: "Well, hello there!"
-      what_are_you_in_to: "What are you into?"
+      hashtag_suggestions: "Prueba siguiendo tags como #arte, #películas, #gif, etc."
+      hooking_up_fb: "conectar tu cuenta de Facebook"
+      saved: Guardado!
+      we_can_speed_things_up: "Podemos acelerar un poco las cosas"
+      well_hello_there: "Bueno, hola!"
+      what_are_you_in_to: "En que estas?"
       what_facebook_does: "con Diaspora. Esto mostrará tu nombre y foto, también activará la publicación cruzada."
-      who_are_you: "Who are you?"
+      who_are_you: "Quien eres tu?"
     logged_out:
       go_mobile: "Ahora desde tu celular"
       on_your_mobile_device: "desde tu celular para acceder a Diaspora* móvil."
@@ -910,9 +920,9 @@ es-CL:
       simply_visit: "Simplemente visita"
       works_on_modern: "Funciona en todos los smartphones modernos"
     privacy_settings:
-      ignored_users: "Ignored Users"
-      stop_ignoring: "Stop ignoring"
-      title: "Privacy Settings"
+      ignored_users: "Usuarios ignorados"
+      stop_ignoring: "Dejar de ignorar"
+      title: "Configuraciones de privacidad"
     public:
       does_not_exist: "¡El usuario %{username} no existe!"
     update:
@@ -921,8 +931,8 @@ es-CL:
       language_not_changed: "Error al cambiar de idioma"
       password_changed: "Contraseña Cambiada. Ahora puedes conectarte con la nueva contraseña."
       password_not_changed: "Error al cambiar la contraseña"
-      settings_not_updated: "Settings update failed"
-      settings_updated: "Settings updated"
+      settings_not_updated: "Error al actualizar la configuración"
+      settings_updated: "Configuración actualizada"
       unconfirmed_email_changed: "Se ha cambiado el email. Pero se requiere su activación."
       unconfirmed_email_not_changed: "Error al cambiar el email"
   webfinger:
@@ -931,4 +941,4 @@ es-CL:
     no_person_constructed: "Ninguna persona puede ser construida a partir de ésta hcard"
     not_enabled: "el webfinger parece no estar disponible para el host de %{account}"
     xrd_fetch_failed: "hubo un error al recibir el crd desde la cuenta %{account}"
-  welcome: Welcome!
+  welcome: Bienvenido!
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 2cdc6d582..f5fd3f4f9 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -578,6 +578,7 @@ es:
       permalink: "enlace permanente"
   previous: "anterior"
   privacy: "Privacidad"
+  privacy_policy: "Privacy Policy"
   profile: "Perfil"
   profiles:
     edit:
@@ -801,6 +802,9 @@ es:
     aspects:
       title: "Aspectos"
     aspects_stream: "Aspectos"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "comentado"
     community_spotlight_stream: "Comunidad Creativa"
     followed_tag:
@@ -809,6 +813,9 @@ es:
       follow: "Seguir"
       title: "#Etiquetas"
     followed_tags_stream: "#Etiquetas seguidas"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Menciones"
     mentions:
       contacts_title: "Gente que te mencionó"
@@ -828,6 +835,7 @@ es:
   tag_followings:
     create:
       failure: "Error al seguir a #%{name}. ¿Estás siguiéndolo ya?"
+      none: "You cannot follow a blank tag!"
       success: "¡Sí! Ahora sigues publicaciones sobre: #%{name}."
     destroy:
       failure: "Error al dejar de seguir #%{name}. ¿Tal vez ya lo hiciste?"
@@ -838,9 +846,11 @@ es:
       followed_by: "seguido por"
       following: "Siguiendo #%{tag}"
       nobody_talking: "Nadie esta hablando sobre %{tag} todavía."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Perfiles con %{tag}"
       posts_tagged_with: "Publicaciones con #%{tag}"
       stop_following: "Dejar de seguir #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Conecta con Cubbi.es"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 598adb4a0..dcb3e5534 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -578,6 +578,7 @@ eu:
       permalink: "permalink"
   previous: "aurrekoa"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "Profila"
   profiles:
     edit:
@@ -801,6 +802,9 @@ eu:
     aspects:
       title: "Zure Alderdiak"
     aspects_stream: "Alderdiak"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "iruzkindua"
     community_spotlight_stream: "Komunitateko Nabarmenenak"
     followed_tag:
@@ -809,6 +813,9 @@ eu:
       follow: "Jarraitu"
       title: "#Jarraitutako Etiketak"
     followed_tags_stream: "#Jarraitutako Etiketak"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Aipamenak"
     mentions:
       contacts_title: "Aipatu zaituzten jendea"
@@ -828,6 +835,7 @@ eu:
   tag_followings:
     create:
       failure: "Huts #%{name} jarraitzean. Jada jarraitzen ari zara?"
+      none: "You cannot follow a blank tag!"
       success: "Aupa! #%{name} jarraitzne ari zara."
     destroy:
       failure: "Huts #%{name} ez jarraitzean"
@@ -838,9 +846,11 @@ eu:
       followed_by: "hauek jarraitua:"
       following: "#%{tag} jarraitzen"
       nobody_talking: "Inor ez du %{tag}(r)i buruz hitz egin oraindik."
+      none: "The empty tag does not exist!"
       people_tagged_with: "%{tag} etiketadun jendea"
       posts_tagged_with: "#%{tag} etiketadun mezuak"
       stop_following: "Ez Jarraitu #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Cubbi.es-era lotu"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 2da7c1720..d92d6446a 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -436,12 +436,12 @@ fi:
       two: "%{actors} ovat jakaneet %{post_link}si uudelleen."
       zero: "%{actors} on jakanut %{post_link}si uudelleen."
     reshared_post_deleted:
-      few: "%{actors} reshared your deleted post."
-      many: "%{actors} reshared your deleted post."
-      one: "%{actors} reshared your deleted post."
-      other: "%{actors} reshared your deleted post."
-      two: "%{actors} reshared your deleted post."
-      zero: "%{actors} reshared your deleted post."
+      few: "%{actors} jakoivat poistamasi viestin uudelleen."
+      many: "%{actors} jakoivat poistamasi viestin uudelleen."
+      one: "%{actors} jakoi poistamasi viestin uudelleen."
+      other: "%{actors} jakoivat poistamasi viestin uudelleen."
+      two: "%{actors} jakoivat poistamasi viestin uudelleen."
+      zero: "%{actors} jakoivat poistamasi viestin uudelleen."
     started_sharing:
       few: "%{actors} on aloittanut jakamaan kanssasi."
       many: "%{actors} on aloittanut jakamaan kanssasi."
@@ -578,6 +578,7 @@ fi:
       permalink: "pysyvä linkki"
   previous: "edellinen"
   privacy: "Yksityisyys"
+  privacy_policy: "Privacy Policy"
   profile: "Profiili"
   profiles:
     edit:
@@ -801,6 +802,9 @@ fi:
     aspects:
       title: "Näkymäsi"
     aspects_stream: "Näkymät"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "kommentoidut"
     community_spotlight_stream: "Yhteisön valokeila"
     followed_tag:
@@ -809,6 +813,9 @@ fi:
       follow: "Seuraa"
       title: "#Seuratut tagit"
     followed_tags_stream: "#Seuratut tagit"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Maininnat"
     mentions:
       contacts_title: "Sinut maininneet ihmiset"
@@ -828,6 +835,7 @@ fi:
   tag_followings:
     create:
       failure: "Tagin #%{name} seuraamisen aloittaminen epäonnistui. Seuraatko sitä jo?"
+      none: "You cannot follow a blank tag!"
       success: "Hiphei! Seuraat nyt tagia #%{name}."
     destroy:
       failure: "Tagin #%{name} seuraamisen lopettaminen epäonnistui. Oletko jo lopettanut sen seuraamisen?"
@@ -838,9 +846,11 @@ fi:
       followed_by: "tagia seuraa"
       following: "Seurataan tagia #%{tag}"
       nobody_talking: "Kukaan ei vielä keskustele tagista %{tag}."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Tagilla %{tag} merkityt ihmiset"
       posts_tagged_with: "Tagilla #%{tag} merkityt viestit"
       stop_following: "Lopeta tagin #%{tag} seuraaminen"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Yhdistä kohteeseen Cubbi.es"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index f3d7d2dfd..85b0af77c 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -578,6 +578,7 @@ fr:
       permalink: "lien permanent"
   previous: "précédent"
   privacy: "Vie privée"
+  privacy_policy: "Privacy Policy"
   profile: "Profil"
   profiles:
     edit:
@@ -801,6 +802,9 @@ fr:
     aspects:
       title: "Vos aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commenté"
     community_spotlight_stream: "Actualités de la communauté"
     followed_tag:
@@ -809,6 +813,9 @@ fr:
       follow: "Suivre"
       title: "#Tags Suivis"
     followed_tags_stream: "#Tags Suivis"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "Personnes qui vous ont mentionné"
@@ -823,11 +830,12 @@ fr:
     recently: "récemment :"
     tags:
       contacts_title: "Personnes qui suivent ce tag"
-      tag_prefill_text: "Une chose que jaime à propos de %{tag_name} est... "
+      tag_prefill_text: "Une chose que j'aime à propos de %{tag_name} est... "
       title: "Messages tagués : %{tags}"
   tag_followings:
     create:
       failure: "Impossible de suivre #%{name}. Le suivez-vous déjà ?"
+      none: "You cannot follow a blank tag!"
       success: "Hourra ! Vous suivez maintenant #%{name}."
     destroy:
       failure: "Impossible de ne plus suivre #%{name}. Peut-être ne le suivez-vous déjà plus?"
@@ -838,9 +846,11 @@ fr:
       followed_by: "suivi par"
       following: "Suivre #%{tag}"
       nobody_talking: "Personne ne parle encore de %{tag}."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Personnes taguées avec %{tag}"
       posts_tagged_with: "Publications taguées avec #%{tag}"
       stop_following: "Arrêter de suivre #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Se connecter à Cubbi.es"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index aade8bd47..7da32accd 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -578,6 +578,7 @@ ga:
       permalink: "permalink"
   previous: "roimhhe"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "Próifíl"
   profiles:
     edit:
@@ -801,6 +802,9 @@ ga:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ ga:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
@@ -828,6 +835,7 @@ ga:
   tag_followings:
     create:
       failure: "Failed to follow: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "Successfully following: #%{name}"
     destroy:
       failure: "Failed to stop following: #%{name}"
@@ -838,9 +846,11 @@ ga:
       followed_by: "followed by"
       following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
+      none: "The empty tag does not exist!"
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       stop_following: "Stop Following #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Connect to Cubbi.es"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index e00e661e4..8faefb85e 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -578,6 +578,7 @@ he:
       permalink: "קישור קבוע"
   previous: "הקודמת"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "פרופיל"
   profiles:
     edit:
@@ -801,6 +802,9 @@ he:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ he:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
@@ -828,6 +835,7 @@ he:
   tag_followings:
     create:
       failure: "אירע כשל בעת המעקב: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "המעקב הוגדר בהצלחה אחר: #%{name}"
     destroy:
       failure: "אירע כשל בעצירת הבא: #%{name}"
@@ -838,9 +846,11 @@ he:
       followed_by: "followed by"
       following: "במעקב אחר #%{tag}"
       nobody_talking: "אף אחד עדיין לא דיבר על %{tag}."
+      none: "The empty tag does not exist!"
       people_tagged_with: "אנשים תויגו ב־%{tag}"
       posts_tagged_with: "אנשים תויגו ב־%{tag}"
       stop_following: "הפסקת המעקב אחר #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "התחברות ל־Cubbi.es"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index b0925eef9..04a4cc3fd 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -578,6 +578,7 @@ hu:
       permalink: "permalink"
   previous: "előző"
   privacy: "Adatvédelem"
+  privacy_policy: "Privacy Policy"
   profile: "Profil"
   profiles:
     edit:
@@ -803,6 +804,9 @@ hu:
     aspects:
       title: "Csoportjaid"
     aspects_stream: "Csoportok"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "hozzászólt"
     community_spotlight_stream: "Reflektorfényben"
     followed_tag:
@@ -811,6 +815,9 @@ hu:
       follow: "Követ"
       title: "#követett címkék"
     followed_tags_stream: "#Követett címkék"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@említéses"
     mentions:
       contacts_title: "Emberek, akik megemlítettek"
@@ -830,6 +837,7 @@ hu:
   tag_followings:
     create:
       failure: "#%{name} követése nem sikerült. Talán már eddig is követted?"
+      none: "You cannot follow a blank tag!"
       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? "
@@ -840,9 +848,11 @@ hu:
       followed_by: "figyelemmel kíséri"
       following: "Követed #%{tag}"
       nobody_talking: "Senki nem beszélt még erről: %{tag}."
+      none: "The empty tag does not exist!"
       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: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Csatlakozás ehhez: Cubbi.es"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index d247167ff..0ea53fd10 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -578,6 +578,7 @@ id:
       permalink: "permalink"
   previous: "previous"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "Profile"
   profiles:
     edit:
@@ -801,6 +802,9 @@ id:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ id:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
@@ -828,6 +835,7 @@ id:
   tag_followings:
     create:
       failure: "Failed to follow: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "Successfully following: #%{name}"
     destroy:
       failure: "Failed to stop following: #%{name}"
@@ -838,9 +846,11 @@ id:
       followed_by: "followed by"
       following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
+      none: "The empty tag does not exist!"
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       stop_following: "Stop Following #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Connect to Cubbi.es"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 39d29645d..86a87bbb8 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -578,6 +578,7 @@ is:
       permalink: "permalink"
   previous: "fyrra"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "Síðan mín"
   profiles:
     edit:
@@ -801,6 +802,9 @@ is:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ is:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
@@ -828,6 +835,7 @@ is:
   tag_followings:
     create:
       failure: "Failed to follow: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "Successfully following: #%{name}"
     destroy:
       failure: "Failed to stop following: #%{name}"
@@ -838,9 +846,11 @@ is:
       followed_by: "followed by"
       following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
+      none: "The empty tag does not exist!"
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       stop_following: "Stop Following #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Connect to Cubbi.es"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index a0c5c323a..bdd2b8fca 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -578,6 +578,7 @@ it:
       permalink: "permalink"
   previous: "precedente"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "Profilo"
   profiles:
     edit:
@@ -801,6 +802,9 @@ it:
     aspects:
       title: "I tuoi aspetti"
     aspects_stream: "Aspetti"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commenti"
     community_spotlight_stream: "In evidenza dalla comunità"
     followed_tag:
@@ -809,6 +813,9 @@ it:
       follow: "Segui"
       title: "#Tag che segui"
     followed_tags_stream: "#Tag che segui"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Menzioni"
     mentions:
       contacts_title: "Persone che ti hanno menzionato"
@@ -828,6 +835,7 @@ it:
   tag_followings:
     create:
       failure: "Errore nel tentativo di seguire: #%{name}. Lo stai già seguendo?"
+      none: "You cannot follow a blank tag!"
       success: "Fantastico! Hai iniziato a seguire #%{name}."
     destroy:
       failure: "Non è stato possibile smettere di seguire #%{name}. Avevi già smesso di seguirlo?"
@@ -838,9 +846,11 @@ it:
       followed_by: "seguito da"
       following: "Stai seguendo #%{tag}"
       nobody_talking: "Nessuno sta ancora parlando di %{tag}."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Persone con il tag %{tag}"
       posts_tagged_with: "Post con il tag #%{tag}"
       stop_following: "Smetti di seguire #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Connettiti a Cubbi.es"
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index b7db0de65..833058db1 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -578,6 +578,7 @@ ja:
       permalink: "permalink"
   previous: "前へ"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "プロフィール"
   profiles:
     edit:
@@ -801,6 +802,9 @@ ja:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ ja:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
@@ -828,6 +835,7 @@ ja:
   tag_followings:
     create:
       failure: "Failed to follow: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "Successfully following: #%{name}"
     destroy:
       failure: "Failed to stop following: #%{name}"
@@ -838,9 +846,11 @@ ja:
       followed_by: "followed by"
       following: "Following #%{tag}"
       nobody_talking: "%{tag}についての投稿はまだありません。"
+      none: "The empty tag does not exist!"
       people_tagged_with: "%{tag}とタグ付けられている人々"
       posts_tagged_with: "#%{tag}とタグ付けられている投稿"
       stop_following: "Stop Following #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Connect to Cubbi.es"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index 3efee11b7..75bc5f206 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -353,10 +353,10 @@ ko:
   no_results: "결과 없음"
   notifications:
     also_commented:
-      few: "%{actors}님 등도 %{post_author}님의 %{post_link}에 댓글을 달았습니다."
-      many: "%{actors}님 등도 %{post_author}님의 %{post_link}에 댓글을 달았습니다."
+      few: "%{actors}님도 %{post_author}님의 %{post_link}에 댓글을 달았습니다."
+      many: "%{actors}님도 %{post_author}님의 %{post_link}에 댓글을 달았습니다."
       one: "%{actors}님도 %{post_author}님의 %{post_link}에 댓글을 달았습니다."
-      other: "%{actors}님 등도 %{post_author}님의 %{post_link}에 댓글을 달았습니다."
+      other: "%{actors}님도 %{post_author}님의 %{post_link}에 댓글을 달았습니다."
       two: "%{actors}님도 %{post_author}님의 %{post_link} 공유물에 댓글을 달았습니다."
       zero: "%{actors}님도 %{post_author}님의 %{post_link}에 댓글을 달았습니다."
     also_commented_deleted:
@@ -578,6 +578,7 @@ ko:
       permalink: "영구 링크"
   previous: "이전"
   privacy: "개인정보보호"
+  privacy_policy: "Privacy Policy"
   profile: "프로필"
   profiles:
     edit:
@@ -801,6 +802,9 @@ ko:
     aspects:
       title: "내 애스펙"
     aspects_stream: "애스펙"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "댓글 달린 순"
     community_spotlight_stream: "커뮤니티 스포트라이트"
     followed_tag:
@@ -809,6 +813,9 @@ ko:
       follow: "팔로우"
       title: "#팔로우한 태그"
     followed_tags_stream: "#팔로우한 태그"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@멘션"
     mentions:
       contacts_title: "나를 멘션한 사람들"
@@ -828,6 +835,7 @@ ko:
   tag_followings:
     create:
       failure: "팔로우를 실패하였습니다: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "성공적으로 팔로우하였습니다: #%{name}"
     destroy:
       failure: "팔로우 멈추기를 실패하였습니다: #%{name}"
@@ -838,9 +846,11 @@ ko:
       followed_by: "팔로우한 사람들"
       following: "#%{tag} 태그 팔로우중"
       nobody_talking: "아직 %{tag} 태그가 달린 공유물이 없습니다."
+      none: "The empty tag does not exist!"
       people_tagged_with: "%{tag} 태그가 달린 사람들"
       posts_tagged_with: "#%{tag} 태그가 달린 공유물"
       stop_following: "#%{tag} 태그 팔로우 멈추기"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Cubbi.es에 연결하기"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index efb241dbc..9cd558f7d 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -578,6 +578,7 @@ lt:
       permalink: "permalink"
   previous: "previous"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "Profilis"
   profiles:
     edit:
@@ -801,6 +802,9 @@ lt:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ lt:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
@@ -828,6 +835,7 @@ lt:
   tag_followings:
     create:
       failure: "Failed to follow: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "Successfully following: #%{name}"
     destroy:
       failure: "Failed to stop following: #%{name}"
@@ -838,9 +846,11 @@ lt:
       followed_by: "followed by"
       following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
+      none: "The empty tag does not exist!"
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       stop_following: "Stop Following #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Connect to Cubbi.es"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index ac63b37bf..d053358b1 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -578,6 +578,7 @@ mk:
       permalink: "permalink"
   previous: "previous"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "Профил"
   profiles:
     edit:
@@ -801,6 +802,9 @@ mk:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ mk:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
@@ -828,6 +835,7 @@ mk:
   tag_followings:
     create:
       failure: "Failed to follow: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "Successfully following: #%{name}"
     destroy:
       failure: "Failed to stop following: #%{name}"
@@ -838,9 +846,11 @@ mk:
       followed_by: "followed by"
       following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
+      none: "The empty tag does not exist!"
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       stop_following: "Stop Following #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Connect to Cubbi.es"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index c01ee82ff..3a24337f1 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -578,6 +578,7 @@ nb:
       permalink: "permalink"
   previous: "forrige"
   privacy: "Personvern"
+  privacy_policy: "Privacy Policy"
   profile: "Profil"
   profiles:
     edit:
@@ -801,6 +802,9 @@ nb:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ nb:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "Folk som har nevnt deg"
@@ -828,6 +835,7 @@ nb:
   tag_followings:
     create:
       failure: "Failed to follow: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "Successfully following: #%{name}"
     destroy:
       failure: "Failed to stop following: #%{name}"
@@ -838,9 +846,11 @@ nb:
       followed_by: "fulgt av"
       following: "Following #%{tag}"
       nobody_talking: "Ingen snakker om %{tag} ennå."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Personer tagget med %{tag}"
       posts_tagged_with: "Innlegg tagget med #%{tag}"
       stop_following: "Stop Following #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Koble til Cubbi.es"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 12025b5ae..a6eb20a48 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -578,6 +578,7 @@ nl:
       permalink: "permalink"
   previous: "vorige"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "Profiel"
   profiles:
     edit:
@@ -801,6 +802,9 @@ nl:
     aspects:
       title: "Jouw Aspecten"
     aspects_stream: "Aspecten"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ nl:
       follow: "Volg"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "Mensen die jou hebben genoemd"
@@ -828,6 +835,7 @@ nl:
   tag_followings:
     create:
       failure: "Volgen mislukt: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "Volgen succesvol: #%{name}"
     destroy:
       failure: "Stoppen met volgen mislukt: #%{name}"
@@ -838,9 +846,11 @@ nl:
       followed_by: "gevolgd door"
       following: "Volgt #%{tag}"
       nobody_talking: "Nog niemand heeft het over %{tag}."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Personen gemerkt met %{tag}"
       posts_tagged_with: "Berichten gemerkt met #%{tag}"
       stop_following: "Stop met volgen van #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Verbind met Cubbi.es"
diff --git a/config/locales/diaspora/nn.yml b/config/locales/diaspora/nn.yml
index 3f7f1e205..227276dae 100644
--- a/config/locales/diaspora/nn.yml
+++ b/config/locales/diaspora/nn.yml
@@ -578,6 +578,7 @@ nn:
       permalink: "permlenkje"
   previous: "førre"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "Profil"
   profiles:
     edit:
@@ -801,6 +802,9 @@ nn:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ nn:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
@@ -828,6 +835,7 @@ nn:
   tag_followings:
     create:
       failure: "Klarte ikkje å følgja: #%{name}. Følgjer du allereie?"
+      none: "You cannot follow a blank tag!"
       success: "Bra! No følgjer du: #%{name}."
     destroy:
       failure: "Failed to stop following: #%{name}"
@@ -838,9 +846,11 @@ nn:
       followed_by: "followed by"
       following: "Følgjer #%{tag}"
       nobody_talking: "Det er enno ingen som taler om %{tag}."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Personar som er merka med %{tag}"
       posts_tagged_with: "Meldingar som er merka med #%{tag}"
       stop_following: "Følg ikkje #%{tag} lenger"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Kopla deg til Cubbi.es"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 879ddbdba..504b19b38 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -578,6 +578,7 @@ pa:
       permalink: "permalink"
   previous: ਪਿੱਛੇ
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "Profile"
   profiles:
     edit:
@@ -801,6 +802,9 @@ pa:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ pa:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
@@ -828,6 +835,7 @@ pa:
   tag_followings:
     create:
       failure: "Failed to follow: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "Successfully following: #%{name}"
     destroy:
       failure: "Failed to stop following: #%{name}"
@@ -838,9 +846,11 @@ pa:
       followed_by: "followed by"
       following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
+      none: "The empty tag does not exist!"
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       stop_following: "Stop Following #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Connect to Cubbi.es"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index ced326977..b23b6bdfe 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -578,6 +578,7 @@ pl:
       permalink: "permalink"
   previous: "poprzedni"
   privacy: "Prywatność"
+  privacy_policy: "Privacy Policy"
   profile: "Profil"
   profiles:
     edit:
@@ -801,6 +802,9 @@ pl:
     aspects:
       title: "Twoje Aspekty"
     aspects_stream: "Aspekty"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "komentowane"
     community_spotlight_stream: "W centrum uwagi społeczności"
     followed_tag:
@@ -809,6 +813,9 @@ pl:
       follow: "Obserwuj"
       title: "#Obserwowane znaczniki"
     followed_tags_stream: "#Obserwowane znaczniki"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Wzmianki"
     mentions:
       contacts_title: "Wspomnieli o Tobie"
@@ -828,6 +835,7 @@ pl:
   tag_followings:
     create:
       failure: "Nie udało się dodać do obserwowanych #%{name}. Może już to obserwujesz?"
+      none: "You cannot follow a blank tag!"
       success: "Brawo! Od teraz obserwujesz #%{name}."
     destroy:
       failure: "Nie udało się zatrzymać obserwowania: #% {name}. Może już tego nie obserwujesz?"
@@ -838,9 +846,11 @@ pl:
       followed_by: "obserwowane przez"
       following: "Obserwowanie #%{tag}"
       nobody_talking: "Nikt jeszcze nie rozmawia o %{tag}."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Osoby oznaczone jako #%{tag}"
       posts_tagged_with: "Wpisy oznaczone jako #%{tag}"
       stop_following: "Przestań obserwować #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Połącz z Cubbi.es"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 51f049169..296da5c4c 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -578,6 +578,7 @@ pt-BR:
       permalink: "link permanente"
   previous: "Anterior"
   privacy: "Privacidade"
+  privacy_policy: "Privacy Policy"
   profile: "Perfil"
   profiles:
     edit:
@@ -801,6 +802,9 @@ pt-BR:
     aspects:
       title: "Seus Grupos"
     aspects_stream: "Grupos"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "comentou sobre"
     community_spotlight_stream: "Foco de Comunidade"
     followed_tag:
@@ -809,6 +813,9 @@ pt-BR:
       follow: "Seguir"
       title: "#Seguindo Tags"
     followed_tags_stream: "#Seguindo Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Menções"
     mentions:
       contacts_title: "Pessoas que você mencionou"
@@ -828,6 +835,7 @@ pt-BR:
   tag_followings:
     create:
       failure: "Não foi possível seguir #%{name}. Tem certeza que ainda não o segue?"
+      none: "You cannot follow a blank tag!"
       success: "Sucesso! Você está seguindo #%{name}."
     destroy:
       failure: "Não foi possível parar de seguir #%{name}. Quem sabe você já tenha feito isso?"
@@ -838,9 +846,11 @@ pt-BR:
       followed_by: "seguido por"
       following: "Seguindo #%{tag}"
       nobody_talking: "Ninguém está falando sobre %{tag} ainda."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Pessoas marcadas com %{tag}"
       posts_tagged_with: "Postagens marcadas com #%{tag}"
       stop_following: "Parar de seguir #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Conectar-se em Cubbi.es"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 42dc360d1..7b3c9b0f8 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -578,6 +578,7 @@ pt-PT:
       permalink: "permalink"
   previous: "anterior"
   privacy: "Privacidade"
+  privacy_policy: "Privacy Policy"
   profile: "Perfil"
   profiles:
     edit:
@@ -801,6 +802,9 @@ pt-PT:
     aspects:
       title: "Os Teus Aspectos"
     aspects_stream: "Aspectos"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "comentou no"
     community_spotlight_stream: "Destaque da Comunidade"
     followed_tag:
@@ -809,6 +813,9 @@ pt-PT:
       follow: "Seguir"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "Pessoas que o mencionaram"
@@ -828,6 +835,7 @@ pt-PT:
   tag_followings:
     create:
       failure: "Falhou ao seguir: #%{name}. Você já está segui-lo?"
+      none: "You cannot follow a blank tag!"
       success: "Viva! Começou agora a seguir #%{name}."
     destroy:
       failure: "Falhou ao tentar deixar de seguir: #%{name}. Talvez você já deixou de segui-lo?"
@@ -838,9 +846,11 @@ pt-PT:
       followed_by: "seguido por"
       following: "A seguir #%{tag}"
       nobody_talking: "Ainda ninguém está a falar sobre %{tag}."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Pessoas com a %{tag}"
       posts_tagged_with: "Publicações com a tag #%{tag}"
       stop_following: "Deixar de Seguir #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Ligar ao Cubbi.es"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index c8b13fe94..28dd4c734 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -578,6 +578,7 @@ ro:
       permalink: "permalink"
   previous: "anterioare"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "Profil"
   profiles:
     edit:
@@ -801,6 +802,9 @@ ro:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ ro:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
@@ -828,6 +835,7 @@ ro:
   tag_followings:
     create:
       failure: "Failed to follow: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "Successfully following: #%{name}"
     destroy:
       failure: "Failed to stop following: #%{name}"
@@ -838,9 +846,11 @@ ro:
       followed_by: "followed by"
       following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
+      none: "The empty tag does not exist!"
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       stop_following: "Stop Following #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Conectarea la Cubbi.es"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 65bb2136a..15340b85a 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -578,6 +578,7 @@ ru:
       permalink: "постоянная ссылка"
   previous: "ранее"
   privacy: "Приватность"
+  privacy_policy: "Privacy Policy"
   profile: "Профиль"
   profiles:
     edit:
@@ -801,6 +802,9 @@ ru:
     aspects:
       title: "Аспекты"
     aspects_stream: "Аспекты"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "обсуждаемые"
     community_spotlight_stream: "В центре внимания"
     followed_tag:
@@ -809,6 +813,9 @@ ru:
       follow: "Следить"
       title: "#Метки"
     followed_tags_stream: "#Метки"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Упоминания"
     mentions:
       contacts_title: "Упоминавшие вас люди"
@@ -828,6 +835,7 @@ ru:
   tag_followings:
     create:
       failure: "Ошибка отслеживания метки #%{name}. Возможно, вы уже следите за ней?"
+      none: "You cannot follow a blank tag!"
       success: "Ура! Теперь вы следите за меткой #%{name}."
     destroy:
       failure: "Не вышло перестать следить за меткой #%{name}. Возможно, вы уже отписались от нее?"
@@ -838,9 +846,11 @@ ru:
       followed_by: "отслеживают"
       following: "Вы следите за меткой #%{tag}"
       nobody_talking: "Никто пока не говорил о %{tag}."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Люди с меткой %{tag}"
       posts_tagged_with: "Записи с меткой #%{tag}"
       stop_following: "Не следить за меткой #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Подключение к Cubbi.es"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 2cadf9ec0..bf04b24ba 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -578,6 +578,7 @@ sk:
       permalink: "trvalý odkaz"
   previous: "Predchádzajúce"
   privacy: "Ochrana súkromia"
+  privacy_policy: "Privacy Policy"
   profile: "Profil"
   profiles:
     edit:
@@ -801,6 +802,9 @@ sk:
     aspects:
       title: "Vaše kategórie"
     aspects_stream: "Kategórie"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "okomentované"
     community_spotlight_stream: "V centre pozornosti komunity"
     followed_tag:
@@ -809,6 +813,9 @@ sk:
       follow: "Sledovať"
       title: "#Sledované značky"
     followed_tags_stream: "#Značky, ktoré sledujete"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Zmienky"
     mentions:
       contacts_title: "Ľudia, ktorí vás spomenuli"
@@ -828,6 +835,7 @@ sk:
   tag_followings:
     create:
       failure: "Nedá sa sledovať použ. #%{name}. Nesledujte ho (ju) už?"
+      none: "You cannot follow a blank tag!"
       success: "Hurá! Teraz sledujete použ. #%{name}."
     destroy:
       failure: "Nepodarilo sa zrušiť sledovanie použ. #%{name}. Možno ste ho (ju) už prestali sledovať."
@@ -838,9 +846,11 @@ sk:
       followed_by: "sleduje"
       following: "Sledujete #%{tag}"
       nobody_talking: "Niekto ešte nehovorí o téme %{tag}."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Ľudia označení s %{tag}"
       posts_tagged_with: "Príspevky označené značkou #%{tag}"
       stop_following: "Prestať sledovať #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Pripojiť sa na Cubbi.es"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index aad8c0d75..a5541e335 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -580,6 +580,7 @@ sl:
       permalink: "permalink"
   previous: "prejšnja"
   privacy: "Zasebnost"
+  privacy_policy: "Privacy Policy"
   profile: "Profil"
   profiles:
     edit:
@@ -803,6 +804,9 @@ sl:
     aspects:
       title: "Vaši pogledi"
     aspects_stream: "Pogledi"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "komentiral na"
     community_spotlight_stream: "Vsebina skupnosti"
     followed_tag:
@@ -811,6 +815,9 @@ sl:
       follow: "Sledi"
       title: "#Sledene oznake"
     followed_tags_stream: "#Sledene oznake"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "Ljudje, ki so vas omenili"
@@ -830,6 +837,7 @@ sl:
   tag_followings:
     create:
       failure: "Sledenje #%{name} ni uspelo. Ali že sledite?"
+      none: "You cannot follow a blank tag!"
       success: "Hura! Sedaj sledite #%{name}."
     destroy:
       failure: "Ni mogoče prekiniti sledenja #%{name}. Mogoče ste že prekinili sledenje?"
@@ -840,9 +848,11 @@ sl:
       followed_by: "sledi"
       following: "Sledenje #%{tag}"
       nobody_talking: "Nihče še ni govoril o %{tag}."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Ljudje, označeni z %{tag}"
       posts_tagged_with: "Objave označene z #%{tag}"
       stop_following: "Prenehaj slediti #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Povežite se Cubbi.es"
diff --git a/config/locales/diaspora/sq.yml b/config/locales/diaspora/sq.yml
index 0c59f3fb5..5c97482c6 100644
--- a/config/locales/diaspora/sq.yml
+++ b/config/locales/diaspora/sq.yml
@@ -578,6 +578,7 @@ sq:
       permalink: "permalink"
   previous: "i mëparshëm"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "Profile"
   profiles:
     edit:
@@ -801,6 +802,9 @@ sq:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ sq:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
@@ -828,6 +835,7 @@ sq:
   tag_followings:
     create:
       failure: "Failed to follow: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "Successfully following: #%{name}"
     destroy:
       failure: "Failed to stop following: #%{name}"
@@ -838,9 +846,11 @@ sq:
       followed_by: "followed by"
       following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
+      none: "The empty tag does not exist!"
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       stop_following: "Stop Following #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Connect to Cubbi.es"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 2df71c8c5..5860f931e 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -111,9 +111,9 @@ sv:
         here_to_help: "Diaspora communityn finns här!"
         need_help: "Behöver du hjälp?"
         satisfaction: "%{link}: Support ifrån communityn"
-        tag_bug: "bugg"
-        tag_feature: "förslag"
-        tag_question: "fråga"
+        tag_bug: "bug"
+        tag_feature: "feature"
+        tag_question: "question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Gemenskapens handledning, guider och nyheter"
       introduce_yourself: "Det här är din ström. Hoppa in och presentera dig själv."
       keep_us_running: "Håll farten hos %{pod} uppe och köp kaffe till servrarna genom en månadsdonation!"
@@ -316,7 +316,7 @@ sv:
       your_aspects: "dina aspekter"
     header:
       admin: "admin"
-      blog: "Blogg"
+      blog: "blogg"
       code: "källkod"
       login: "Logga in"
       logout: "Logga ut"
@@ -578,6 +578,7 @@ sv:
       permalink: "permalänk"
   previous: "föregående"
   privacy: "Sekretess"
+  privacy_policy: "Privacy Policy"
   profile: "Profil"
   profiles:
     edit:
@@ -801,6 +802,9 @@ sv:
     aspects:
       title: "Dina Aspekter"
     aspects_stream: "Aspekter"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "kommenterade på"
     community_spotlight_stream: "Gemenskapens Rampljus"
     followed_tag:
@@ -809,6 +813,9 @@ sv:
       follow: "Följ"
       title: "#Följda Taggar"
     followed_tags_stream: "#Följda Taggar"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "Personer som omnämnt dig"
@@ -828,6 +835,7 @@ sv:
   tag_followings:
     create:
       failure: "Misslyckades med att följa #%{name}. Du kanske redan gör det?"
+      none: "You cannot follow a blank tag!"
       success: "Ja! Du följer nu #%{name}."
     destroy:
       failure: "Misslyckades att sluta följa #%{name}. Kanske har du redan slutat följa?"
@@ -838,9 +846,11 @@ sv:
       followed_by: "följs av"
       following: "Följer #%{tag}"
       nobody_talking: "Ingen talar om %{tag} än."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Personer taggade med %{tag}"
       posts_tagged_with: "Poster taggade med #%{tag}"
       stop_following: "Sluta följa #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Koppla till Cubbi.es"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 66f081fc3..dc37d0f0f 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -578,6 +578,7 @@ tr:
       permalink: "kalıcı bağlantı"
   previous: "önceki"
   privacy: "Gizlilik"
+  privacy_policy: "Privacy Policy"
   profile: "Profil"
   profiles:
     edit:
@@ -801,6 +802,9 @@ tr:
     aspects:
       title: "Yönleriniz"
     aspects_stream: "Yönler"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "yorumlanan"
     community_spotlight_stream: "Topluluk Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ tr:
       follow: "Takip Et"
       title: "#Takip Edilen Etiketler"
     followed_tags_stream: "#Takip Edilen Etiketler"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Bahsedenler"
     mentions:
       contacts_title: "Senden Bahsedenler"
@@ -828,6 +835,7 @@ tr:
   tag_followings:
     create:
       failure: "Takip etmek başarısız: #%{name}. Zaten onu takip eden var mı?"
+      none: "You cannot follow a blank tag!"
       success: "Başarıyla takip ediliyor: #%{name}"
     destroy:
       failure: "Takibi durdurmak başarısız oldu: #%{name}"
@@ -838,9 +846,11 @@ tr:
       followed_by: "takip edenler:"
       following: "#%{tag} takip ediliyor"
       nobody_talking: "%{tag} hakkında konuşan yok henüz."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Kişi etiketlendi %{tag}"
       posts_tagged_with: "#%{tag} ile etiketlenmiş gönderiler"
       stop_following: "Takibi Durdur #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Cubbi.es Bağlan"
diff --git a/config/locales/diaspora/uk.yml b/config/locales/diaspora/uk.yml
index 901537127..f1bd947d5 100644
--- a/config/locales/diaspora/uk.yml
+++ b/config/locales/diaspora/uk.yml
@@ -578,6 +578,7 @@ uk:
       permalink: "постiйне посилання"
   previous: "попередня"
   privacy: "Приватность"
+  privacy_policy: "Privacy Policy"
   profile: "Профіль"
   profiles:
     edit:
@@ -801,6 +802,9 @@ uk:
     aspects:
       title: "Ваші аспекти"
     aspects_stream: "Аспекти"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "обговорювані"
     community_spotlight_stream: "У центрі уваги"
     followed_tag:
@@ -809,6 +813,9 @@ uk:
       follow: "Cтежити"
       title: "#Відстежувані мітки"
     followed_tags_stream: "#Відстежувані мітки"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Згадування"
     mentions:
       contacts_title: "Люди, що згадали вас"
@@ -828,6 +835,7 @@ uk:
   tag_followings:
     create:
       failure: "Помилка відстежування #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "Ура! Тепер ви стежите за міткою #%{name}."
     destroy:
       failure: "Не вийшло перестати стежити за міткою #%{name}. Можливо, ви вже відписалися від неї?"
@@ -838,9 +846,11 @@ uk:
       followed_by: "Спостерігають"
       following: "Ви стежите за міткою #%{tag}"
       nobody_talking: "Ніхто доки не говорив про %{tag}."
+      none: "The empty tag does not exist!"
       people_tagged_with: "Люди з міткою %{tag}"
       posts_tagged_with: "Записи з міткою #%{tag}"
       stop_following: "Не стежити за міткою #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Підключення до Cubbi.es"
diff --git a/config/locales/diaspora/ur-PK.yml b/config/locales/diaspora/ur-PK.yml
index ba8e64a42..cd3ffdda7 100644
--- a/config/locales/diaspora/ur-PK.yml
+++ b/config/locales/diaspora/ur-PK.yml
@@ -578,6 +578,7 @@ ur-PK:
       permalink: "permalink"
   previous: "previous"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "Profile"
   profiles:
     edit:
@@ -801,6 +802,9 @@ ur-PK:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ ur-PK:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
@@ -828,6 +835,7 @@ ur-PK:
   tag_followings:
     create:
       failure: "Failed to follow: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "Successfully following: #%{name}"
     destroy:
       failure: "Failed to stop following: #%{name}"
@@ -838,9 +846,11 @@ ur-PK:
       followed_by: "followed by"
       following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
+      none: "The empty tag does not exist!"
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       stop_following: "Stop Following #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Connect to Cubbi.es"
diff --git a/config/locales/diaspora/vi.yml b/config/locales/diaspora/vi.yml
index c1a72ce4f..ee9aa0ab0 100644
--- a/config/locales/diaspora/vi.yml
+++ b/config/locales/diaspora/vi.yml
@@ -29,7 +29,7 @@ vi:
         reshare:
           attributes:
             root_guid:
-              taken: "Bạn đã chia sẻ lại bài viết!"
+              taken: "Bạn đã chia sẻ lại tin!"
         user:
           attributes:
             email:
@@ -40,7 +40,7 @@ vi:
               invalid: "không hợp lệ. Chỉ cho phép chữ cái, số, và dấu gạch dưới."
               taken: "đã được thực hiện."
   ago: "%{time} trước"
-  all_aspects: "All Aspects"
+  all_aspects: "Tất cả mối quan hệ"
   application:
     helper:
       diaspora_alpha: "DIASPORA* ALPHA"
@@ -50,67 +50,67 @@ vi:
   are_you_sure: "Bạn có chắc không?"
   aspect_memberships:
     destroy:
-      failure: "Failed to remove person from aspect"
-      no_membership: "Could not find the selected person in that aspect"
-      success: "Successfully removed person from aspect"
+      failure: "Thất bại khi loại bỏ người khỏi mối quan hệ"
+      no_membership: "Không thể tìm người đã chọn trong mối quan hệ đó"
+      success: "Đã loại bỏ người khỏi mối quan hệ"
   aspects:
     add_to_aspect:
-      failure: "Failed to add contact to aspect."
-      success: "Successfully added contact to aspect."
+      failure: "Thất bại khi thêm liên lạc vào mối quan hệ."
+      success: "Đã thêm liên lạc vào mối quan hệ."
     aspect_contacts:
       done_editing: "đã chỉnh sửa xong"
     aspect_listings:
-      add_an_aspect: "+ Add an aspect"
+      add_an_aspect: "+ Thêm một mối quan hệ"
       deselect_all: "Bỏ chọn tất cả"
       edit_aspect: "Sửa %{name}"
       select_all: "Chọn tất cả"
     aspect_stream:
-      stay_updated: "Stay Updated"
-      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
-    contacts_not_visible: "Contacts in this aspect will not be able to see each other."
-    contacts_visible: "Contacts in this aspect will be able to see each other."
+      stay_updated: "Vẫn còn cập nhật"
+      stay_updated_explanation: "Luồng chính của bạn hầu hết là từ các liên lạc, thẻ, và tin từ một vài thành viên trong cộng đồng."
+    contacts_not_visible: "Các liên lạc trong mối quan hệ này sẽ không thể nhìn thấy nhau."
+    contacts_visible: "Các liên lạc trong mối quan hệ này có thể nhìn thấy nhau."
     create:
-      failure: "Aspect creation failed."
-      success: "Your new aspect %{name} was created"
+      failure: "Tạo mối quan hệ thất bại."
+      success: "Mối quan hệ %{name} đã được tạo"
     destroy:
-      failure: "%{name} is not empty and could not be removed."
-      success: "%{name} was successfully removed."
+      failure: "%{name} không rỗng và không thể bị loại bỏ."
+      success: "%{name} đã bị loại bỏ."
     edit:
-      add_existing: "Add an existing contact"
+      add_existing: "Thêm một liên lạc đang có"
       aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
       aspect_list_is_visible: "aspect list is visible to others in aspect"
-      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
-      done: "Done"
+      confirm_remove_aspect: "Bạn có chắc là muốn xoá mối quan hệ này không?"
+      done: "Xong"
       make_aspect_list_visible: "make contacts in this aspect visible to each other?"
-      remove_aspect: "Delete this aspect"
-      rename: "rename"
+      remove_aspect: "Xoá mối quan hệ này"
+      rename: "đổi tên"
       update: "cập nhật"
       updating: "đang cập nhật"
-    few: "%{count} aspects"
+    few: "%{count} mối quan hệ"
     helper:
-      are_you_sure: "Are you sure you want to delete this aspect?"
-      aspect_not_empty: "Aspect not empty"
+      are_you_sure: "Bạn có chắc là muốn xoá mối quan hệ này không?"
+      aspect_not_empty: "Mối quan hệ không rỗng"
       remove: "loại bỏ"
     index:
       cubbies:
-        explanation: "Cubbi.es là ứng dụng đầu tiên của Diaspora được phát triển."
+        explanation: "Cubbi.es là ứng dụng được phát triển đầu tiên của Diaspora."
         heading: "Kết nối đến Cubbi.es"
         learn_more: "Tìm hiểu thêm"
       diaspora_id:
         content_1: "ID Diaspora của bạn:"
-        content_2: "Đưa nó cho bất kì ai và họ có thể tìm thấy bạn trên Diaspora."
-        heading: "ID Diaspora"
+        content_2: "Cho người khác biết và họ có thể tìm thấy bạn trên Diaspora."
+        heading: "Diaspora ID"
       donate: "Quyên góp"
       handle_explanation: "Đây là id diaspora của bạn. Giống như một địa chỉ thư điện tử, người khác có thể liên lạc với bạn thông qua nó."
       help:
-        do_you: "Do you:"
-        email_feedback: "%{link} your feedback, if you prefer"
-        feature_suggestion: "... have a %{link} suggestion?"
-        find_a_bug: "... find a %{link}?"
-        have_a_question: "... have a %{link}?"
-        here_to_help: "The Diaspora community is here!"
-        need_help: "Need Help?"
-        satisfaction: "%{link}: Community-powered support"
+        do_you: "Bạn:"
+        email_feedback: "%{link} phản hồi hoặc góp ý, nếu muốn"
+        feature_suggestion: "... có một đề nghị %{link}?"
+        find_a_bug: "... tìm thấy lỗi %{link}?"
+        have_a_question: "... có một %{link}?"
+        here_to_help: "Cộng đồng Diaspora!"
+        need_help: "Cần giúp đỡ?"
+        satisfaction: "%{link}: Hỗ trợ bởi cộng đồng"
         tag_bug: "#bug"
         tag_feature: "#feature"
         tag_question: "#question"
@@ -118,58 +118,58 @@ vi:
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast and buy servers their coffee fix with a monthly donation!"
       new_here:
-        follow: "Follow %{link} and welcome new users to Diaspora*!"
-        learn_more: "Learn more"
-        title: "Welcome New Users"
-      no_contacts: "No contacts"
-      no_tags: "+ Find a tag to follow"
-      people_sharing_with_you: "People sharing with you"
-      post_a_message: "post a message >>"
+        follow: "Theo dõi %{link} và chào đón người dùng mới đến với Diaspora*!"
+        learn_more: "Tìm hiểu thêm"
+        title: "Chào mừng người dùng mới"
+      no_contacts: "Không có liên lạc"
+      no_tags: "+ Tìm thẻ để theo dõi"
+      people_sharing_with_you: "Đang chia sẻ với bạn"
+      post_a_message: "đăng một tin >>"
       services:
-        content: "You can connect the following services to Diaspora:"
-        heading: "Connect Services"
-      unfollow_tag: "Stop following #%{tag}"
-      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
-      your_aspects: "Your Aspects"
-    many: "%{count} aspects"
+        content: "Bạn có thể kết nối những dịch vụ sau với Diaspora:"
+        heading: "Kết nối dịch vụ"
+      unfollow_tag: "Ngừng theo dõi #%{tag}"
+      welcome_to_diaspora: "Chào mừng đến với Diaspora, %{name}!"
+      your_aspects: "Các mối quan hệ"
+    many: "%{count} mối quan hệ"
     move_contact:
       error: "Lỗi khi dời liên lạc: %{inspect}"
       failure: "didn't work %{inspect}"
-      success: "Person moved to new aspect"
+      success: "Đã chuyển người sang mối quan hệ mới"
     new:
       create: "Tạo"
       name: "Tên (chỉ bạn nhìn thấy)"
     no_contacts_message:
       community_spotlight: "community spotlight"
-      or_spotlight: "Or you can share with %{link}"
-      try_adding_some_more_contacts: "You can search (top) or invite (right) more contacts."
+      or_spotlight: "Hoặc bạn có thể chia sẻ với %{link}"
+      try_adding_some_more_contacts: "Bạn có thể tìm kiếm hoặc mời thêm bạn."
       you_should_add_some_more_contacts: "Bạn có thể thêm một vài liên lạc!"
     no_posts_message:
-      start_talking: "Nobody has said anything yet!"
-    one: "1 aspect"
-    other: "%{count} aspects"
+      start_talking: "Chưa có ai nói gì!"
+    one: "1 mối quan hệ"
+    other: "%{count} mối quan hệ"
     seed:
       acquaintances: "Người quen"
       family: "Gia đình"
       friends: "Bạn bè"
-      work: "Công việc"
+      work: "Đồng nghiệp"
     selected_contacts:
-      manage_your_aspects: "Manage your aspects."
+      manage_your_aspects: "Quản lí các mối quan hệ."
       no_contacts: "Bạn chưa có liên lạc nào ở đây."
       view_all_community_spotlight: "See all community spotlight"
       view_all_contacts: "Xem tất cả liên lạc"
     show:
-      edit_aspect: "edit aspect"
-    two: "%{count} aspects"
+      edit_aspect: "chỉnh sửa mối quan hệ"
+    two: "%{count} mối quan hệ"
     update:
-      failure: "Your aspect, %{name}, had too long name to be saved."
-      success: "Your aspect, %{name}, has been successfully edited."
-    zero: "no aspects"
+      failure: "Mối quan hệ %{name} có tên quá dài, không thể lưu."
+      success: "Mối quan hệ %{name} đã được chỉnh sửa."
+    zero: "không có mối quan hệ"
   authorizations:
     index:
-      no_applications: "You haven't registered any applications yet."
-      revoke_access: "Revoke Access"
-  back: "Back"
+      no_applications: "Bạn chưa đăng kí bất kì ứng dụng nào."
+      revoke_access: "Thu hồi quyền truy cập"
+  back: "Trở lại"
   blocks:
     create:
       failure: "I couldn't ignore that user.  #evasion"
@@ -178,10 +178,10 @@ vi:
       failure: "I couldn't stop ignoring that user.  #evasion"
       success: "Let's see what they have to say! #sayhello"
   bookmarklet:
-    explanation: "Post to Diaspora from anywhere by bookmarking %{link}."
-    explanation_link_text: "this link"
-    heading: "Bookmarklet"
-    post_something: "Post something to Diaspora"
+    explanation: "Đăng tin lên Diaspora từ bất kì đâu bằng cách đánh dấu %{link}."
+    explanation_link_text: "liên kết này"
+    heading: "Đánh dấu"
+    post_something: "Đăng tin lên Diaspora"
     post_success: "Đã đăng! Đang đóng!"
   cancel: "Hủy bỏ"
   comments:
@@ -189,7 +189,7 @@ vi:
     many: "%{count} bình luận"
     new_comment:
       comment: "Bình luận"
-      commenting: "Bình luận..."
+      commenting: "Đang gửi bình luận..."
     one: "1 bình luận"
     other: "%{count} bình luận"
     two: "%{count} bình luận"
@@ -199,8 +199,8 @@ vi:
       failure: "Tạo liên lạc mới thất bại"
     few: "%{count} liên lạc"
     index:
-      add_a_new_aspect: "Add a new aspect"
-      add_to_aspect: "Add contacts to %{name}"
+      add_a_new_aspect: "Thêm mối quan hệ mới"
+      add_to_aspect: "thêm liên lạc vào %{name}"
       all_contacts: "Tất cả liên lạc"
       check_out: "Kiểm tra"
       many_people_are_you_sure: "Bạn có chắc là muốn trò chuyện với hơn %{suggested_limit} người khác? Posting to this aspect may be a better way to contact them."
@@ -208,36 +208,36 @@ vi:
       no_contacts: "Có vẻ như bạn cần thêm vài liên lạc!"
       only_sharing_with_me: "Chỉ chia sẻ với tôi"
       remove_person_from_aspect: "Loại bỏ %{person_name} khỏi \"%{aspect_name}\""
-      start_a_conversation: "Start a conversation"
-      title: "Contacts"
-      your_contacts: "Your Contacts"
-    many: "%{count} contacts"
-    one: "1 contact"
-    other: "%{count} contacts"
+      start_a_conversation: "Bắt đầu một cuộc trò chuyện"
+      title: "Liên lạc"
+      your_contacts: "Liên lạc của bạn"
+    many: "%{count} liên lạc"
+    one: "1 liên lạc"
+    other: "%{count} liên lạc"
     sharing:
-      people_sharing: "People sharing with you:"
+      people_sharing: "Người đang chia sẻ với bạn:"
     spotlight:
       community_spotlight: "Community Spotlight"
-    two: "%{count} contacts"
+    two: "%{count} liên lạc"
     zero: "contacts"
   conversations:
     create:
-      fail: "Invalid message"
-      sent: "Message sent"
+      fail: "Tin nhắn không hợp lệ"
+      sent: "Đã gửi tin nhắn"
     destroy:
-      success: "Conversation successfully removed"
+      success: "Đã loại bỏ cuộc hội thoại"
     helper:
       new_messages:
-        few: "%{count} new messages"
-        many: "%{count} new messages"
-        one: "1 new messages"
-        other: "%{count} new messages"
-        two: "%{count} new messages"
-        zero: "No new messages"
+        few: "%{count} tin nhắn mới"
+        many: "%{count} tin nhắn mới"
+        one: "1 tin nhắn mới"
+        other: "%{count} tin nhắn mới"
+        two: "%{count} tin nhắn mới"
+        zero: "Không có tin nhắn mới"
     index:
-      create_a_new_message: "tạo tin nhắn mới"
+      create_a_new_message: "viết tin nhắn mới"
       inbox: "Hộp thư đến"
-      message_inbox: "Message Inbox"
+      message_inbox: "Hộp tin nhắn"
       new_message: "Tin nhắn mới"
       no_conversation_selected: "không có cuộc trò chuyện nào được chọn"
       no_messages: "không có tin nhắn"
@@ -262,15 +262,15 @@ vi:
   email: "Thư điện tử"
   error_messages:
     helper:
-      correct_the_following_errors_and_try_again: "Correct the following errors and try again."
-      invalid_fields: "Invalid Fields"
-  fill_me_out: "Fill me out"
-  find_people: "Find people or #tags"
-  hide: "Hide"
+      correct_the_following_errors_and_try_again: "Sửa lỗi sau và thử lại."
+      invalid_fields: "Trường không hợp lệ"
+  fill_me_out: "Điền đầy đủ"
+  find_people: "Tìm người hoặc #tags"
+  hide: "Ẩn"
   home:
     show:
-      already_account: "already have an account?"
-      choice: "Choice"
+      already_account: "đã có tài khoản?"
+      choice: "Lựa chọn"
       choice_explanation: "Diaspora lets you sort your connections into groups called aspects. Unique to Diaspora, aspects ensure that your photos, stories and jokes are shared only with the people you intend."
       learn_about_host: "Learn about how to host your own Diaspora server."
       login_here: "log in here"
@@ -282,7 +282,7 @@ vi:
       tagline_first_half: "Share what you want,"
       tagline_second_half: "with whom you want."
   invitations:
-    a_facebook_user: "A Facebook user"
+    a_facebook_user: "Người dùng Facebook"
     check_token:
       not_found: "Invitation token not found"
     create:
@@ -299,54 +299,54 @@ vi:
       already_invited: "Những người sau không chấp nhận lời mời của bạn:"
       aspect: "Aspect"
       comma_seperated_plz: "Bạn có thể nhập nhiều địa chỉ thư điện tử và ngăn cách chúng bằng dấu phẩy."
-      if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
+      if_they_accept_info: "nếu chấp nhận, họ sẽ được thêm vào mối quan hệ mà bạn đã mời."
       invite_someone_to_join: "Mời người khác tham gia Diaspora!"
-      language: "Language"
+      language: "Ngôn ngữ"
       personal_message: "Tin nhắn cá nhân"
       resend: "Gửi lại"
-      send_an_invitation: "Gửi lời mời"
+      send_an_invitation: "Gửi một lời mời"
       send_invitation: "Gửi lời mời"
       to: "Đến"
   layouts:
     application:
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
-      toggle: "toggle mobile"
-      whats_new: "what's new?"
-      your_aspects: "your aspects"
+      toggle: "chuyển sang di động"
+      whats_new: "có gì mới?"
+      your_aspects: "mối quan hệ của bạn"
     header:
-      admin: "admin"
+      admin: "quản trị"
       blog: "blog"
-      code: "code"
-      login: "log in"
-      logout: "Log out"
-      profile: "Profile"
-      recent_notifications: "Recent notifications"
-      settings: "Settings"
-      view_all: "View all"
+      code: "mã nguồn"
+      login: "đăng nhập"
+      logout: "Đăng xuất"
+      profile: "Hồ sơ"
+      recent_notifications: "Thông báo gần đây"
+      settings: "Thiết lập"
+      view_all: "Xem tất cả"
   likes:
     likes:
       people_dislike_this:
-        few: "%{count} dislikes"
-        many: "%{count} dislikes"
-        one: "%{count} dislike"
-        other: "%{count} dislikes"
-        two: "%{count} không thích"
-        zero: "no dislikes"
+        few: "%{count} người không thích"
+        many: "%{count} người không thích"
+        one: "%{count} người không thích"
+        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} thích"
-        many: "%{count} thích"
-        one: "%{count} thích"
-        other: "%{count} thích"
-        two: "%{count} thích"
-        zero: "không thích"
+        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} thích"
-        many: "%{count} thích"
-        one: "%{count} thích"
-        other: "%{count} thích"
-        two: "%{count} thích"
-        zero: "không thích"
+        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"
   limited: "Bị giới hạn"
   more: "More"
   next: "tiếp theo"
@@ -360,19 +360,19 @@ vi:
       two: "%{actors} also commented on %{post_author}'s %{post_link}."
       zero: "%{actors} also commented on %{post_author}'s %{post_link}."
     also_commented_deleted:
-      few: "%{actors} commented on a deleted post."
-      many: "%{actors} commented on a deleted post."
-      one: "%{actors} commented on a deleted post."
-      other: "%{actors} commented on a deleted post."
-      two: "%{actors} commented on a deleted post."
-      zero: "%{actors} commented on a deleted post."
+      few: "%{actors} bình luận vào một tin đã bị xoá."
+      many: "%{actors} bình luận vào một tin đã bị xoá."
+      one: "%{actors} bình luận vào một tin đã bị xoá."
+      other: "%{actors} bình luận vào một tin đã bị xoá."
+      two: "%{actors} bình luận vào một tin đã bị xoá."
+      zero: "%{actors} bình luận vào một tin đã bị xoá."
     comment_on_post:
-      few: "%{actors} commented on your %{post_link}."
-      many: "%{actors} commented on your %{post_link}."
-      one: "%{actors} commented on your %{post_link}."
-      other: "%{actors} commented on your %{post_link}."
-      two: "%{actors} commented on your %{post_link}."
-      zero: "%{actors} commented on your %{post_link}."
+      few: "%{actors} đã bình luận tin %{post_link} của bạn."
+      many: "%{actors} đã bình luận tin %{post_link} của bạn."
+      one: "%{actors} đã bình luận tin %{post_link} của bạn."
+      other: "%{actors} đã bình luận tin %{post_link} của bạn."
+      two: "%{actors} đã bình luận tin %{post_link} của bạn."
+      zero: "%{actors} đã bình luận tin %{post_link} của bạn."
     helper:
       new_notifications:
         few: "%{count} thông báo mới"
@@ -422,26 +422,26 @@ vi:
       zero: "%{actors} mentioned you in a deleted post."
     post: "post"
     private_message:
-      few: "%{actors} sent you a message."
-      many: "%{actors} sent you a message."
-      one: "%{actors} sent you a message."
-      other: "%{actors} sent you a message."
-      two: "%{actors} sent you a message."
-      zero: "%{actors} sent you a message."
+      few: "%{actors} gửi cho bạn một tin nhắn."
+      many: "%{actors} gửi cho bạn một tin nhắn."
+      one: "%{actors} gửi cho bạn một tin nhắn."
+      other: "%{actors} gửi cho bạn một tin nhắn."
+      two: "%{actors} gửi cho bạn một tin nhắn."
+      zero: "%{actors} gửi cho bạn một tin nhắn."
     reshared:
-      few: "%{actors} has reshared your %{post_link}."
-      many: "%{actors} has reshared your %{post_link}."
+      few: "%{actors} đã chia sẻ lại tin %{post_link}."
+      many: "%{actors} đã chia sẻ lại tin %{post_link}."
       one: "%{actors} đã chia sẻ lại %{post_link}."
-      other: "%{actors} has reshared your %{post_link}."
-      two: "%{actors} has reshared your %{post_link}."
-      zero: "%{actors} has reshared your %{post_link}."
+      other: "%{actors} đã chia sẻ lại tin %{post_link}."
+      two: "%{actors} đã chia sẻ lại tin %{post_link}."
+      zero: "%{actors} đã chia sẻ lại tin %{post_link}."
     reshared_post_deleted:
-      few: "%{actors} đã chia sẻ lại bài đã xóa của bạn."
-      many: "%{actors} đã chia sẻ lại bài đã xóa của bạn."
-      one: "%{actors} đã chia sẻ lại bài đã xóa của bạn."
-      other: "%{actors} đã chia sẻ lại bài đã xóa của bạn."
-      two: "%{actors} reshared your deleted post."
-      zero: "%{actors} đã chia sẻ lại bài đã xóa của bạn."
+      few: "%{actors} đã chia sẻ lại tin đã xóa của bạn."
+      many: "%{actors} đã chia sẻ lại tin đã xóa của bạn."
+      one: "%{actors} đã chia sẻ lại tin đã xóa của bạn."
+      other: "%{actors} đã chia sẻ lại tin đã xóa của bạn."
+      two: "%{actors} đã chia sẻ lại tin đã xóa của bạn."
+      zero: "%{actors} đã chia sẻ lại tin đã xóa của bạn."
     started_sharing:
       few: "%{actors} đã bắt đầu chia sẻ với bạn."
       many: "%{actors} đã bắt đầu chia sẻ với bạn."
@@ -578,28 +578,29 @@ vi:
       permalink: "permalink"
   previous: "previous"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "Profile"
   profiles:
     edit:
       allow_search: "Allow for people to search for you within Diaspora"
-      edit_profile: "Edit profile"
-      first_name: "First name"
-      last_name: "Last name"
-      update_profile: "Update Profile"
-      your_bio: "Your bio"
-      your_birthday: "Your birthday"
-      your_gender: "Your gender"
-      your_location: "Your location"
-      your_name: "Your name"
-      your_photo: "Your photo"
-      your_private_profile: "Your private profile"
-      your_public_profile: "Your public profile"
-      your_tags: "Describe yourself in 5 words"
-      your_tags_placeholder: "like #movies #kittens #travel #teacher #newyork"
+      edit_profile: "Chỉnh sửa hồ sơ"
+      first_name: "Tên"
+      last_name: "Họ"
+      update_profile: "Cập nhật hồ sơ"
+      your_bio: "Tiểu sử"
+      your_birthday: "Ngày sinh"
+      your_gender: "Giới tính"
+      your_location: "Nơi sinh sống"
+      your_name: "Tên"
+      your_photo: "Ảnh"
+      your_private_profile: "Hồ sơ cá nhân"
+      your_public_profile: "Hồ sơ công khai"
+      your_tags: "Mo tả bản thân qua 5 từ"
+      your_tags_placeholder: "ví dụ: #movies #kittens #travel #teacher #newyork"
     update:
-      failed: "Failed to update profile"
-      updated: "Profile updated"
-  public: "Public"
+      failed: "Cập nhật hồ sơ thất bại"
+      updated: "Đã cập nhật hồ sơ"
+  public: "Công khai"
   reactions:
     few: "%{count} reactions"
     many: "%{count} reactions"
@@ -610,20 +611,20 @@ vi:
   registrations:
     closed: "Signups are closed on this Diaspora pod."
     create:
-      success: "You've joined Diaspora!"
+      success: "Bạn đã tham gia vào Diaspora!"
     edit:
-      cancel_my_account: "Cancel my account"
-      edit: "Edit %{name}"
-      leave_blank: "(leave blank if you don't want to change it)"
-      password_to_confirm: "(we need your current password to confirm your changes)"
+      cancel_my_account: "Huỷ tài khoản"
+      edit: "Chỉnh sửa %{name}"
+      leave_blank: "(để trống nếu bạn không muốn thay đổi)"
+      password_to_confirm: "(bạn cần cung cấp mật khẩu hiện tai để xác nhận thay đổi)"
       unhappy: Unhappy?
-      update: "Update"
+      update: "Cập nhật"
     new:
-      create_my_account: "Create my account"
-      enter_email: "Enter an email"
-      enter_password: "Enter a password"
-      enter_password_again: "Enter the same password as before"
-      enter_username: "Pick a username (only letters, numbers, and underscores)"
+      create_my_account: "Tạo tài khoản"
+      enter_email: "Nhập địa chỉ thư điện tử"
+      enter_password: "Nhập mật khẩu"
+      enter_password_again: "Nhập lại mật khẩu"
+      enter_username: "Tên người dùng (chỉ gồm chữ cái, số và dấu gạch dưới _)"
       join_the_movement: "Join the movement!"
       sign_up_message: "Social Networking with a <3"
   requests:
@@ -801,6 +802,9 @@ vi:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,10 +813,13 @@ vi:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
-      title: "Your Mentions"
+      title: "Tin của bạn"
     multi:
       contacts_title: "People in your Stream"
       title: "Stream"
@@ -827,20 +834,23 @@ vi:
       title: "Posts tagged: %{tags}"
   tag_followings:
     create:
-      failure: "Failed to follow: #%{name}"
-      success: "Successfully following: #%{name}"
+      failure: "Theo dõi thất bại: #%{name}"
+      none: "You cannot follow a blank tag!"
+      success: "Theo dõi thành công: #%{name}"
     destroy:
-      failure: "Failed to stop following: #%{name}"
-      success: "Successfully stopped following: #%{name}"
+      failure: "Dừng theo dõi #%{name} thất bại. Có lẽ bạn đã dừng theo dõi rồi?"
+      success: "Đã dừng theo dõi: #%{name}"
   tags:
     show:
       follow: "Follow #%{tag}"
       followed_by: "followed by"
       following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
+      none: "The empty tag does not exist!"
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
       stop_following: "Stop Following #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Connect to Cubbi.es"
@@ -857,42 +867,42 @@ vi:
   username: "Username"
   users:
     confirm_email:
-      email_confirmed: "Email %{email} activated"
-      email_not_confirmed: "Email could not be activated. Wrong link?"
+      email_confirmed: "Địa chỉ %{email} đã được kích hoạt"
+      email_not_confirmed: "Không thể kích hoạt địa chỉ thư điện tử. Sai địa chỉ?"
     destroy:
-      no_password: "Please enter your current password to close your account."
-      success: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
-      wrong_password: "The entered password didn't match your current password."
+      no_password: "Nhập mật khẩu hiện tại để đóng tài khoản."
+      success: "Tài khoản của bạn đã bị khoá. Có thể mất 20 phút để đóng tài khoản của bạn. Cám ơn vì đã dùng Diaspora."
+      wrong_password: "Mật khẩu đã nhập không khớp với mật khẩu hiện tại."
     edit:
       also_commented: "...someone also comments on your contact's post?"
-      change: "Change"
-      change_email: "Change email"
-      change_language: "Change language"
-      change_password: "Change password"
-      close_account: "Close Account"
+      change: "Thay đổi"
+      change_email: "Đổi địa chỉ thư điện tử"
+      change_language: "Đổi ngôn ngữ"
+      change_password: "Đổi mật khẩu"
+      close_account: "Đóng tài khoản"
       comment_on_post: "...someone comments on your post?"
-      current_password: "Current password"
-      download_photos: "download my photos"
-      download_xml: "download my xml"
-      edit_account: "Edit account"
-      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Until you follow this link and activate the new address, we will continue to use your original address %{email}."
-      export_data: "Export Data"
-      getting_started: "New User Prefrences"
+      current_password: "Mật khẩu hiện tại"
+      download_photos: "tải ảnh của tôi"
+      download_xml: "tải xml của tôi"
+      edit_account: "Chỉnh sửa tài khoản"
+      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?"
       mentioned: "...you are mentioned in a post?"
-      new_password: "New password"
-      photo_export_unavailable: "Photo exporting currently unavailable"
-      private_message: "...you receive a private message?"
-      receive_email_notifications: "Receive email notifications when..."
-      reshared: "...someone reshares 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?"
+      receive_email_notifications: "Nhận thư điện tử thông báo khi..."
+      reshared: "...ai đó chia sẻ lại tin của bạn?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
       show_getting_started: "Re-enable Getting Started"
-      started_sharing: "...someone starts sharing with you?"
-      stream_preferences: "Stream Preferences"
-      your_email: "Your email"
-      your_handle: "Your diaspora id"
+      started_sharing: "...ai đó bắt đầu chia sẻ với bạn?"
+      stream_preferences: "Tuỳ chỉnh luồng"
+      your_email: "Thư điện tử của bạn"
+      your_handle: "ID Diaspora của bạn"
     getting_started:
-      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
+      awesome_take_me_to_diaspora: "Tuyệt vời! Đưa tối đến Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
@@ -902,33 +912,33 @@ vi:
       well_hello_there: "Well, hello there!"
       what_are_you_in_to: "What are you into?"
       what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
-      who_are_you: "Who are you?"
+      who_are_you: "Bạn là ai?"
     logged_out:
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
-      signed_out: "You've signed out of Diaspora*"
+      signed_out: "Bạn đã đăng xuất khỏi Diaspora*"
       simply_visit: "Simply visit"
-      works_on_modern: "Works on all modern smartphones"
+      works_on_modern: "Hoạt động trên mọi điện thoại thông minh hiện đại"
     privacy_settings:
       ignored_users: "Ignored Users"
       stop_ignoring: "Stop ignoring"
-      title: "Privacy Settings"
+      title: "Thiết lập riêng tư"
     public:
-      does_not_exist: "User %{username} does not exist!"
+      does_not_exist: "Người dùng %{username} không tồn tại!"
     update:
-      email_notifications_changed: "Email notifications changed"
-      language_changed: "Language changed"
-      language_not_changed: "Language change failed"
-      password_changed: "Password changed.  You can now log in with your new password."
-      password_not_changed: "Password change failed"
-      settings_not_updated: "Settings update failed"
-      settings_updated: "Settings updated"
-      unconfirmed_email_changed: "Email changed. Needs activation."
-      unconfirmed_email_not_changed: "Email change failed"
+      email_notifications_changed: "Đã đổi thông báo qua thư điện tử"
+      language_changed: "Đã đổi ngôn ngữ"
+      language_not_changed: "Đổi ngôn ngữ thất bại"
+      password_changed: "Đã đổi mật khẩu. Bây giờ bạn có thể đăng nhập với mật khẩu mới."
+      password_not_changed: "Đổi mật khẩu thất bại"
+      settings_not_updated: "Cập nhật thiết lập thất bại"
+      settings_updated: "Đã cập nhật thiết lập"
+      unconfirmed_email_changed: "Đã đổi thư điện tử. Cần kích hoạt ngay."
+      unconfirmed_email_not_changed: "Đổi thư điện tử thất bại"
   webfinger:
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for %{account}"
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
-  welcome: Welcome!
+  welcome: "Chào mừng!"
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index aba1656e0..dead7f53d 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -578,6 +578,7 @@ zh-CN:
       permalink: "permalink"
   previous: "上一步"
   privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
   profile: "个人档案"
   profiles:
     edit:
@@ -801,6 +802,9 @@ zh-CN:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
@@ -809,6 +813,9 @@ zh-CN:
       follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "People who mentioned you"
@@ -828,6 +835,7 @@ zh-CN:
   tag_followings:
     create:
       failure: "Failed to follow: #%{name}"
+      none: "You cannot follow a blank tag!"
       success: "Successfully following: #%{name}"
     destroy:
       failure: "Failed to stop following: #%{name}"
@@ -838,9 +846,11 @@ zh-CN:
       followed_by: "followed by"
       following: "Following #%{tag}"
       nobody_talking: "尚还没有人在讨论 %{tag}。"
+      none: "The empty tag does not exist!"
       people_tagged_with: "标记为 %{tag} 的人"
       posts_tagged_with: "标记为 #%{tag} 的内容"
       stop_following: "Stop Following #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "Connect to Cubbi.es"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 1c3ecb0ba..f55287a05 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -578,6 +578,7 @@ zh-TW:
       permalink: "靜態連結"
   previous: "前面"
   privacy: "隱私"
+  privacy_policy: "Privacy Policy"
   profile: "個人檔案"
   profiles:
     edit:
@@ -801,6 +802,9 @@ zh-TW:
     aspects:
       title: "你的面向"
     aspects_stream: "面向"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
     commented_on: "有意見的"
     community_spotlight_stream: "社群焦點"
     followed_tag:
@@ -809,6 +813,9 @@ zh-TW:
       follow: "追蹤"
       title: "#追蹤中的標籤"
     followed_tags_stream: "#追蹤中的標籤"
+    like_stream:
+      contacts_title: "People whose posts you like"
+      title: "Like Stream"
     mentioned_stream: "@指指點點"
     mentions:
       contacts_title: "對你指指點點過的人"
@@ -828,6 +835,7 @@ zh-TW:
   tag_followings:
     create:
       failure: "追蹤 #%{name} 失敗. 是否已經在追蹤了?"
+      none: "You cannot follow a blank tag!"
       success: "喔耶! 你已經開始追蹤 #%{name} 了."
     destroy:
       failure: "停止追蹤標籤 #%{name} 失敗. 也許你已經沒在追蹤了?"
@@ -838,9 +846,11 @@ zh-TW:
       followed_by: "追蹤者:"
       following: "正在追蹤 #%{tag}"
       nobody_talking: "還沒有人在討論 %{tag}."
+      none: "The empty tag does not exist!"
       people_tagged_with: "標記為 %{tag} 的人"
       posts_tagged_with: "標記為 #%{tag} 的貼文"
       stop_following: "停止追蹤 #%{tag}"
+  terms_and_conditions: "Terms and Conditions"
   tokens:
     show:
       connect_to_cubbies: "與 Cubbi.es 連結"
diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml
index cbb6f9e3c..ea15dabf8 100644
--- a/config/locales/javascript/javascript.el.yml
+++ b/config/locales/javascript/javascript.el.yml
@@ -8,14 +8,14 @@ el:
     aspect_dropdown:
       add_to_aspect: "Προσθήκη επαφής"
       all_aspects: "Όλες οι πτυχές"
-      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      error: "Δεν μπορεί να ξεκινήσει ο διαμοιρασμός με το χρήστη {{name}}. Μήπως τον αγνοείτε;"
       select_aspects: "Επιλογή πτυχών"
       started_sharing_with: "Ξεκινήσατε να διαμοιράζεστε με τον χρήστη {{name}}!"
       stopped_sharing_with: "Σταματήσατε να διαμοιράζεστε με τον χρήστη {{name}}."
       toggle:
         few: "Σε {{count}} πτυχές"
         many: "Σε {{count}} πτυχές"
-        one: "Σε {{count}} πτυχές"
+        one: "Σε {{count}} πτυχή"
         other: "Σε {{count}} πτυχές"
         two: "Σε {{count}} πτυχές"
         zero: "Επιλέξτε πτυχές"
diff --git a/config/locales/javascript/javascript.ko.yml b/config/locales/javascript/javascript.ko.yml
index 039a37435..a5d4a9707 100644
--- a/config/locales/javascript/javascript.ko.yml
+++ b/config/locales/javascript/javascript.ko.yml
@@ -57,7 +57,7 @@ ko:
       minutes: "%d분"
       month: "약 한 달"
       months: "%d개월"
-      prefixAgo: "javascripts:timeago:prefixAgo"
+      prefixAgo: ""
       prefixFromNow: "지금부터"
       seconds: "방금"
       suffixAgo: "전"
diff --git a/config/locales/javascript/javascript.vi.yml b/config/locales/javascript/javascript.vi.yml
index 22008f946..63bb28dae 100644
--- a/config/locales/javascript/javascript.vi.yml
+++ b/config/locales/javascript/javascript.vi.yml
@@ -6,23 +6,23 @@
 vi:
   javascripts:
     aspect_dropdown:
-      add_to_aspect: "Add contact"
-      all_aspects: "All aspects"
-      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
-      select_aspects: "Select aspects"
+      add_to_aspect: "Thêm liên lạc"
+      all_aspects: "Tất cả mối quan hệ"
+      error: "Không thể bắt đầu chia sẻ với {{name}}.  Bạn có bỏ qua họ?"
+      select_aspects: "Chọn mối quan hệ"
       started_sharing_with: "Bạn đã bắt đầu chia sẻ với {{name}}!"
       stopped_sharing_with: "Bạn đã ngưng chia sẻ với {{name}}."
       toggle:
-        few: "In {{count}} aspects"
-        many: "In {{count}} aspects"
-        one: "In {{count}} aspect"
-        other: "In {{count}} aspects"
-        two: "In {{count}} aspects"
-        zero: "Select aspects"
+        few: "Trong {{count}} mối quan hệ"
+        many: "Trong {{count}} mối quan hệ"
+        one: "Trong {{count}} mối quan hệ"
+        other: "Trong {{count}} mối quan hệ"
+        two: "Trong {{count}} mối quan hệ"
+        zero: "Chọn mối quan hệ"
     aspect_navigation:
-      deselect_all: "Deselect all"
-      no_aspects: "No aspects selected"
-      select_all: "Select all"
+      deselect_all: "Bỏ chọn tất cả"
+      no_aspects: "Không có mối quan hệ được chọn"
+      select_all: "Chọn tất cả"
     comments:
       hide: "ẩn các bình luận"
       show: "hiện tất cả bình luận"
@@ -30,20 +30,20 @@ vi:
     failed_to_like: "Failed to like!"
     failed_to_post_message: "Đăng tin thất bại!"
     getting_started:
-      alright_ill_wait: "Alright, I'll wait."
+      alright_ill_wait: "Được rồi, tôi sẽ chờ."
       hey: "Này, {{name}}!"
-      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      no_tags: "Bạn chưa theo dõi thẻ nào cả! Tiếp tục?"
       preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll:
       no_more: "No more posts."
     photo_uploader:
-      looking_good: "OMG, you look awesome!"
+      looking_good: "Ôi, trông bạn thật tuyệt!"
     publisher:
-      at_least_one_aspect: "You must publish to at least one aspect"
-      limited: "Limited - your post will only be seen by people you are sharing with"
-      public: "Public - your post will be visible to everyone and found by search engines"
+      at_least_one_aspect: "Bạn phải công khai ít nhất một mối quan hệ"
+      limited: "Giới hạn - tin của bạn được những người chỉ định nhìn thấy"
+      public: "Công khai - tin của bạn được mọi người và máy tìm kiếm nhìn thấy"
     reshares:
-      duplicate: "That good, huh?  You've already reshared that post!"
+      duplicate: "Bạn đã chia sẻ lại tin đó!"
     search_for: "Tìm {{name}}"
     show_more: "hiện thêm"
     tags: