updated 80 locale files [ci skip]

80 files changed, 2266 insertions, 1241 deletions

diff --git a/config/locales/devise/devise.ml.yml b/config/locales/devise/devise.ml.yml
index 81814e826..9ed3df1e5 100644
--- a/config/locales/devise/devise.ml.yml
+++ b/config/locales/devise/devise.ml.yml
@@ -6,20 +6,20 @@
 ml:
   devise:
     confirmations:
-      confirmed: "താങ്കളുടെ അക്കൌണ്ട് വിജയകരമായി സ്ഥിതീകരിച്ചിരിക്കുന്നു. നിങ്ങള്‍ ഇപ്പൊള്‍ പ്രവേശിച്ചിരിക്കുന്നു."
+      confirmed: "താങ്കളുടെ അക്കൌണ്ട് വിജയകരമായി സ്ഥിരീകരിച്ചിരിക്കുന്നു. നിങ്ങള്‍ ഇപ്പൊള്‍ പ്രവേശിച്ചിരിക്കുന്നു."
       new:
         resend_confirmation: "സ്ഥിരീകരിക്കുവാനുള്ള വിവരങ്ങള്‍ വീണ്ടും അയയ്ക്കുക"
       send_instructions: "താങ്കളുടെ അക്കൌണ്ട് സ്ഥിരീകരിക്കുന്നതിന് ആവശ്യമായ വിവരങ്ങള്‍ അടങ്ങിയ ഇമെയില്‍ അല്പസമയത്തിനകം ലഭിക്കുന്നതാണ്."
     failure:
       inactive: "താങ്കളുടെ അക്കൌണ്ട് ഇതുവരെ ളപയോഗപ്രദമാക്കിയിട്ടില്ല."
-      invalid: "ഇമെയില്‍ അല്ലെങ്കില്‍ രഹസ്യവാക്ക് തെറ്റാണ്."
+      invalid: "ഇമെയില്‍ അല്ലെങ്കില്‍ രഹസ്യവാക്ക് സാധുവല്ല."
       invalid_token: "Invalid authentication token."
       locked: "നിങ്ങളുടെ അക്കൌണ്ട് പൂട്ടിയിരിക്കുന്നു."
       timeout: "അനുവദിച്ചിരിക്കുന്ന സമയം തീര്‍ന്നിരിക്കുന്നു. തുടരുന്നതിനായി വീണ്ടും പ്രവേശിക്കുക."
       unauthenticated: "തുടരുന്നതിന് മുമ്പ് നിങ്ങള്‍ അകത്ത് പ്രവേശിക്കുകയോ അംഗത്വം എടുക്കുകയോ ചെയ്യണം."
       unconfirmed: "തുടരുന്നതിന് മുന്‍പ് താങ്കള്‍ താങ്കളുടെ അക്കൌണ്ട് സ്ഥിരീകരിക്കേണ്ടതാണ്."
     invitations:
-      invitation_token_invalid: "The invitation token provided is not valid!"
+      invitation_token_invalid: "ക്ഷമിക്കണം. ക്ഷണത്തിന്റെ ടോക്കണ്‍ സാധുവല്ല."
       send_instructions: "താങ്കളുടെ ക്ഷണം അയച്ചു."
       updated: "താങ്കളുടെ രഹസ്യവാക്ക് വിജയകരമായി രേഖപ്പെടുത്തിയിരിക്കുന്നു. താങ്കള്‍ ഇപ്പോള്‍ പ്രവേശിച്ചിരിക്കുന്നു."
     mailer:
@@ -29,12 +29,12 @@ ml:
         you_can_confirm: "താഴെയുള്ള കണ്ണിയിലൂടെ താങ്കള്‍ക്ക് അക്കൌണ്ട് സ്ഥിരീകരിക്കാവുന്നതാണ്:"
       hello: "നമസ്ക്കാരം %{email}!"
       invitation_instructions:
-        accept: "Accept invitation"
+        accept: "ക്ഷണം സ്വീകരിക്കു"
         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."
         cubbies: Cubbi.es
-        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        displaying_correctly: "ഇമെയില്‍ ശരിക്ക് കാണുന്നില്ലേ? %{link}"
         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"
@@ -51,16 +51,16 @@ ml:
         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!"
         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!"
+        or: അല്ലെങ്കില്‍
+        sign_up_now: "ഇപ്പോള്‍ തന്നെ കയറു →"
+        subject: "ഡയസ്പോറയില്‍ ചേരാന്‍ താങ്കളെ ക്ഷണിച്ചിരിക്കുന്നു!"
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
-        view_in: "View in"
+        view_in: "ബ്രൌസറില്‍ കാണു:"
       inviter:
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
-        have_invited_you: "%{names} have invited you to join Diaspora"
+        have_invited_you: "%{names} എന്നിവര്‍ താങ്കളെ ഡയസ്പോറയില്‍ ചേരാന്‍ ക്ഷണിച്ചിരിക്കുന്നു"
       reset_password_instructions:
         change: "എന്റെ രഹസ്യവാക്ക് മാറ്റുക"
         ignore: "താങ്കള്‍ ഇത് ആവശ്യപ്പെട്ടിലെങ്കില്‍ ദയവായി അവഗണിക്കുക."
@@ -96,7 +96,7 @@ ml:
         password: രഹസ്യവാക്ക്
         remember_me: ഓര്‍മ്മിക്കു
         sign_in: പ്രവേശിക്കു
-        username: "Username"
+        username: ഉപയോക്തനാമം
       signed_in: "വിജയകരമായി പ്രവേശിച്ചിരിക്കുന്നു."
       signed_out: "വിജയകരമായി പുറത്ത് കടന്നു."
     shared:
diff --git a/config/locales/devise/devise.te.yml b/config/locales/devise/devise.te.yml
index 74b0663a0..3bcd65079 100644
--- a/config/locales/devise/devise.te.yml
+++ b/config/locales/devise/devise.te.yml
@@ -7,22 +7,22 @@
 te:
   devise:
     confirmations:
-      confirmed: "మీ ఖాతా విజయవంతంగా ధృవీకరించబడింది. ఇప్పుడు మీరు సైన్ ఇన్ అయ్యారు."
+      confirmed: "మీ ఖాతా విజయవంతంగా ధృవీకరించబడింది. ఇప్పుడు మీరు ప్రవేశించారు."
       new:
-        resend_confirmation: "నిర్ధారణ సూచనలు తిరిగి పంపండి"
+        resend_confirmation: "నిర్ధారణ సూచనలను మళ్ళీ పంపించు"
       send_instructions: "మీరు కొన్ని నిమిషాల్లో మీ ఖాతాను నిర్ధారించడానికి అవసరమైన సూచనలతో కూడిన ఇమెయిల్ను అందుకుంటారు."
     failure:
-      inactive: "మీ ఖాతా ఇంకా యాక్టివేట్ కాలేదు."
-      invalid: "చెల్లని యూజర్పేరు లేదా పాస్వర్డ్."
+      inactive: "మీ ఖాతా ఇంకా చేతనం కాలేదు."
+      invalid: "చెల్లని వాడుకరి పేరు లేదా సంకేతపదం."
       invalid_token: "చెల్లని ప్రమాణీకరణ టోకెన్."
       locked: "మీ ఖాతా లాక్ చెయ్యబడింది."
-      timeout: "మీ సెషన్ గడువు, కొనసాగించటానికి మళ్ళీ సైన్ ఇన్ చేయండి."
-      unauthenticated: "మీరు కొనసాగే ముందు సైన్ ఇన్ లేదా సైన్ అప్ అవసరం."
+      timeout: "మీ సెషన్ గడువు ముగిసింది, కొనసాగించటానికి మళ్ళీ ప్రవేశించండి."
+      unauthenticated: "మీరు కొనసాగే ముందు లోనికి ప్రవేశించాలి లేదా నమోదుచేసుకోండి."
       unconfirmed: "మీరు కొనసాగించే ముందు మీ ఖాతాను నిర్ధారించండి."
     invitations:
       invitation_token_invalid: "అందించబడిన ఆహ్వానాన్ని టోకెన్ చెల్లదు!"
-      send_instructions: "మీ ఆహ్వానం పంపబడింది."
-      updated: "మీ పాస్వర్డ్ విజయవంతంగా సెట్ చెయటం జరిగినది. ఇప్పుడు మీరు సైన్ ఇన్ అయ్యారు."
+      send_instructions: "మీ ఆహ్వానాన్ని పంపించాం."
+      updated: "మీ సంకేతపదాన్ని విజయవంతంగా అమర్చాం. ఇప్పుడు మీరు ప్రవేశించారు."
     mailer:
       confirmation_instructions:
         confirm: "నా ఖాతాను నిర్థారించండి"
@@ -30,75 +30,76 @@ te:
         you_can_confirm: "మీరు క్రింది లింకు ద్వారా మీ ఖాతాను నిర్ధారించవచ్చు:"
       hello: "హలో %{email}!"
       invitation_instructions:
-        accept: ""
+        accept: "ఆహ్వానాన్ని అంగీకరించండి"
         arrived: "మీరు పూర్తిగా కొత్త మార్గంలో వెబ్ పంచుకునేందుకు, పునరుద్దరించబడిన మరింత సురక్షితమైన మరియు మరింత ఆహ్లాదకరమైన %{strong_diaspora} సిద్ధంగా ఉంది."
-        displaying_correctly: "ఇమెయిల్ సరిగ్గా ప్రదర్శింపబడలేదా? మీ బ్రౌజర్ లో% {లింక్}"
-        email_us: "మీ డియాస్పోరా ఖాతాతో సాధారణ ప్రశ్నలకు లేదా మద్దతు కోసం, దయచేసి మాకు %{email} కు ఇమెయిల్ చెయ్యండి."
-        finally: "ఎట్టకేలకు - ఇది ఇక్కడ జరగబోతోంది"
-        friends_saying: "మీ స్నేహితులు ఏమి అనుకుంటున్నారు ..."
+        displaying_correctly: "ఇమెయిల్ సరిగ్గా ప్రదర్శింపబడలేదా? %{link}"
+        email_us: "మీ డయాస్పోరా ఖాతా గురించి సాధారణ ప్రశ్నలకు లేదా తోడ్పాటు కోసం, దయచేసి మాకు %{email} కు ఈమెయిల్ చెయ్యండి."
+        finally: "ఎట్టకేలకు - ఇదుగోండి"
+        friends_saying: "మీ స్నేహితులు ఏమి అంటున్నారు..."
         get_connected: "కనెక్ట్ అవ్వండి"
-        have_fun: ఆస్వాదించండి
-        help_fund: "డియాస్పోరా నిధికి సహాయం చెయ్యండి"
+        have_fun: ఆనందించండి
+        help_fund: "డయాస్పోరా నిధికి సహాయం చెయ్యండి"
         here: ఇక్కడ
         ignore: "మీకు ఆహ్వానాన్ని అంగీకరిండం ఇష్టం లేక పోతే, దయచేసి ఈ ఇమెయిల్ పట్టించుకోకండి."
-        join_team: "మా బృందం లో చేరండి"
-        love: "ప్రేమ,"
+        join_team: "మా బృందంలో చేరండి"
+        love: "ప్రేమతో,"
         more_people: "మరింత మంది మిమ్మల్ని చూడటానికి ఆత్రుతగా ఉన్నారు!"
-        no_account_till: "పై లింకును యాక్సెస్ చేసి సైన్ అప్ చేసే వరకు మీ ఖాతా సృష్టించబడదు."
+        no_account_till: "పై లంకెకు వెళ్ళి నమోదయ్యేవరకు మీ ఖాతా సృష్టించబడదు."
         or: లేక
-        sign_up_now: "ఇప్పుడు సైన్ అప్ అవ్వండి →"
-        subject: "మీరు డియాస్పోరాలొ చేరడానికి ఆహ్వానించబడ్డారు!"
-        view_in: వీక్షించండి
+        sign_up_now: "ఇప్పుడే నమోదవ్వండి →"
+        subject: "మీరు డయాస్పోరాలొ చేరడానికి ఆహ్వానించబడ్డారు!"
+        team_diaspora: "డయస్పోరా జట్టు"
+        unsubscribe: "చందా విరమించడానికి %{link}ను నొక్కండి."
+        view_in: "దీన్ని మీ విహారిణిలో చూడండి."
       inviter:
         accept_at: "%{url} వద్ద, మీరు క్రింది లింకు ద్వారా అంగీకరించవచ్చు"
-        has_invited_you: "%{పేరు}"
-        have_invited_you: "%{పేర్లు} మీరు డియాస్పోరాలొ చేరడానికి ఆహ్వానించారు"
+        have_invited_you: "%{names} మిమ్మల్ని డయాస్పోరాలో చేరమని ఆహ్వానించారు"
       reset_password_instructions:
-        change: "నా పాస్వర్డ్ను మార్చండి"
+        change: "నా సంకేతపదాన్ని మార్చు"
         ignore: "మీరు ఈ అభ్యర్థనను చేయకుంటె, దయచేసి ఈ ఇమెయిల్ పట్టించుకోకండి."
-        someone_requested: "ఎవరో మీ పాస్వర్డ్ను మార్చడానికి ఒక లింక్ను అభ్యర్థించారు, మీరు క్రింది లింకును ద్వారా మార్చవచ్చు.\n"
-        subject: "పాస్వర్డ్ రీసెట్ సూచనలను"
-        wont_change: "పై లింకును యాక్సెస్ చేసి ఒక క్రొత్త దానిని సృష్టించవచె వరకూ మీ పాస్వర్డ్ను మార్పు కాదు."
+        someone_requested: "ఎవరో మీ సంకేతపదాన్ని మార్చడానికి లంకెను అభ్యర్థించారు, మీరు క్రింది లంకె ద్వారా మార్చవచ్చు.\n"
+        subject: "సంకేతపద పునరుద్ధరణ సూచనలు"
+        wont_change: "పై లంకెకు వెళ్ళి మీరు కొత్త సంకేతపదం ఇచ్చేవరకూ మీ సంకేతపదం మారదు."
       unlock_instructions:
-        account_locked: "అధికంగా సైన్ ఇన్ ప్రయత్నాలు విఫలమైన   కారణంగా మీ ఖాతా  లాక్ చేయబడింది."
+        account_locked: "ఎక్కువ ప్రవేశ ప్రయత్నాలు విఫలమైన కారణంగా మీ ఖాతా లాక్ చేయబడింది."
         click_to_unlock: "మీ ఖాతాను అన్లాక్ చేయటానికి కింది లింకును క్లిక్ చేయండి:"
         subject: "అన్లాక్ సూచనలు"
         unlock: "నా ఖాతాను అన్లాక్ చెయ్యి"
       welcome: "స్వాగతం %{email}!"
     passwords:
       edit:
-        change_password: "నా పాస్వర్డ్ను మార్చండి"
+        change_password: "నా సంకేతపదాన్ని మార్చు"
       new:
-        forgot_password: "మీ పాస్వర్డ్ను మర్చిపోయారా?"
+        forgot_password: "మీ సంకేతపదాన్ని మర్చిపోయారా?"
         no_account: "ఈ ఈమెయిల్ తో ఖాతా లేదు. మీరు ఆహ్వానం కోసం వేచి ఉంటే, మేము సాధ్యమైనంత త్వరగా వాటిని రోలింగ్ చేస్తున్నాము"
         send_password_instructions: "నాకు పాస్వర్డ్ను పునరుద్ధరించడానికి సూచనలను పంపండి"
-      send_instructions: "మీకు కొన్ని నిమిషాల్లో మీ పాస్వర్డ్ను పునరుద్ధరించడానికి సూచనలతో ఇమెయిల్ వస్తుంది."
-      updated: "మీ పాస్వర్డ్ విజయవంతంగా మార్చబడింది. ఇప్పుడు మీరు సైన్ ఇన్ అయ్యారు."
+      send_instructions: "మీకు కొన్ని నిమిషాల్లో మీ సంకేతపదాన్ని పునరుద్ధరించడానికి సూచనలతో ఈమెయిల్ వస్తుంది."
+      updated: "మీ సంకేతపదాన్ని విజయవంతంగా మార్చాం. ఇప్పుడు మీరు ప్రవేశించారు."
     registrations:
-      destroyed: "వీడుకొలు! మీ ఖాతా విజయవంతంగా రద్దయింది. త్వరలో మిమ్ముల్ని మళ్ళీ చూడటానికి ఆశిస్తున్నాము."
-      signed_up: "మీరు విజయవంతంగా సైన్ అప్ అయ్యారు, నిర్ధారణ మీ ఇ-మెయిల్ పంపబడింది."
+      destroyed: "వీడుకోలు! మీ ఖాతా విజయవంతంగా రద్దయింది. మిమ్ముల్ని మళ్ళీ త్వరలో చూడాలని ఆశిస్తున్నాము."
+      signed_up: "మీరు విజయవంతంగా నమోదయ్యారు. నిర్ధారణ సందేశాన్ని మీ ఈ-మెయిలుకి పంపించాం."
       updated: "మీరు విజయవంతంగా మీ ఖాతాను నవీకరించారు."
     sessions:
       new:
         alpha_software: "మీరు ఆల్ఫా సాఫ్ట్వేర్ను ఉపయోగించపోవుచున్నారు."
-        login: లాగిన్
-        modern_browsers: "ఆధునిక బ్రౌజర్లకు మాత్రమే మద్దతు ఇస్తుంది."
-        password: పాస్వర్డ్
-        remember_me: "నన్ను గుర్తుంచుకోండి"
-        sign_in: "సైన్ ఇన్ అవ్వండి"
-        username: "యూజర్ పేరు"
-      signed_in: "విజయవంతంగా సైన్ ఇన్ అయ్యారు."
-      signed_out: "విజయవంతంగా సైన్ ఔట్ అయ్యారు."
+        login: ప్రవేశం
+        modern_browsers: "ఆధునిక విహారిణుల్లో మాత్రమే పనిచేస్తుంది."
+        password: సంకేతపదం
+        remember_me: "నన్ను గుర్తుంచుకో"
+        sign_in: ప్రవేశించండి
+        username: "వాడుకరి పేరు"
+      signed_in: "విజయవంతంగా ప్రవేశించారు."
+      signed_out: "విజయవంతంగా నిష్క్రమించారు."
     shared:
       links:
-        forgot_your_password: "మీ పాస్వర్డ్ను మర్చిపోయారా?"
-        receive_confirmation: "నిర్ధారణ సూచనలను అందుకొలెదా?"
+        forgot_your_password: "మీ సంకేతపదాన్ని మర్చిపోయారా?"
+        receive_confirmation: "నిర్ధారణ సూచనలు అందలేదా?"
         receive_unlock: "అన్లాక్ సూచనలను అందుకొలెదా?"
-        sign_in: "సైన్ ఇన్ అవ్వండి"
-        sign_up: "సైన్ అప్"
+        sign_in: ప్రవేశించండి
+        sign_up: నమోదవ్వండి
         sign_up_closed: "ఓపెన్ signups ఈ సమయంలో మూసుకుని ఉంటాయి."
       mail_signup_form:
-        sign_up_for_an_invite: "ఆహ్వానం సైన్ అప్ చేయండి!"
+        sign_up_for_an_invite: "ఆహ్వానం కొరకు నమోదుకండి!"
     unlocks:
       new:
         resend_unlock: "అన్లాక్ సూచనలు తిరిగి పంపండి"
diff --git a/config/locales/devise/devise.vi.yml b/config/locales/devise/devise.vi.yml
index 1e9c43583..ea6b009e7 100644
--- a/config/locales/devise/devise.vi.yml
+++ b/config/locales/devise/devise.vi.yml
@@ -20,17 +20,23 @@ vi:
       updated: "Thiết lập mật khẩu thành công. Bạn đã đăng nhập."
     mailer:
       invitation_instructions:
+        accept: "Chấp nhận lời mời"
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
         finally: "Cuối cùng - nó đây"
         made_by_people: "%{strong_diaspora} được tạo ra bởi những người yêu Internet như bạn. %{jointeam}, hay %{helpfund}!"
+        no_account_till: "Tài khoản của bạn sẽ không được tạo cho đến khi bạn truy cập vào liên kết ở trên và đăng kí."
         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: "tại %{url}, bạn có thể chấp nhận nó qua đường dẫn bên dưới."
+        have_invited_you: "%{names} đã mời bạn tham gia Diaspora"
       unlock_instructions:
         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: "Chào mừng %{email}!"
     passwords:
       edit:
         change_password: "Đổi mật khẩu"
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index b6b5de9d9..5a01b2ca5 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -793,7 +793,6 @@ bg:
     comment_stream:
       contacts_title: "Хора, чиито публикации сте коментирали"
       title: "Коментирани публикации"
-    commented_on: коментирани
     community_spotlight_stream: "От \"В центъра на вниманието\""
     followed_tag:
       add_a_tag: "Добавете още"
@@ -811,11 +810,9 @@ bg:
     multi:
       contacts_title: "Хора от потока ви"
       title: Поток
-    posted: публикувани
     public:
       contacts_title: "Скоро публикували"
       title: "Публична активност"
-    recently: "наскоро:"
     tags:
       contacts_title: "Хора, които харесват марката"
       tag_prefill_text: "Мисля, че %{tag_name}..."
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 19be408af..b9677e9a0 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -474,7 +474,6 @@ cy:
     aspects:
       title: "Eich Agweddau"
     aspects_stream: Agweddau
-    commented_on: "wedi sylwi arno"
     followed_tag:
       add_a_tag: "Ychwanegu tag"
       title: "#Tagiau ddilynwyd"
@@ -484,8 +483,6 @@ cy:
     multi:
       contacts_title: "Pobol yn eich ffrwd"
       title: Ffrwd
-    posted: "wedi postio"
-    recently: "yn ddiweddar:"
     tags:
       contacts_title: "People who dig these tags"
   tag_followings:
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 288c3e1ff..160d78970 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -793,7 +793,6 @@ da:
     comment_stream:
       contacts_title: "Brugere, hvis indlæg du har kommenteret"
       title: "Kommenterede indlæg"
-    commented_on: kommenteret
     community_spotlight_stream: "Kreative medlemmer"
     followed_tag:
       add_a_tag: "Tilføj et tag"
@@ -811,11 +810,9 @@ da:
     multi:
       contacts_title: "Personer i din Strøm"
       title: Strøm
-    posted: indsendt
     public:
       contacts_title: "Seneste indlæg"
       title: "Offentlig Aktivitet"
-    recently: "for nylig:"
     tags:
       contacts_title: "Folk der følger disse tags"
       tag_prefill_text: "Jeg synes at %{tag_name} er... "
@@ -862,6 +859,8 @@ da:
       wrong_password: "Det indtastede kodeord stemmer ikke overens med dit nuværende kodeord."
     edit:
       also_commented: "...nogen har kommenteret på en af dine kontakters indlæg?"
+      auto_follow_aspect: "Aspekt for brugere du automatisk følger:"
+      auto_follow_back: "Følg automatisk brugere der følger dig"
       change: Skift
       change_email: "Skift e-mail"
       change_language: "Skift sprog"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index f25c71ab5..b61f09a28 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -805,7 +805,6 @@ de:
     comment_stream:
       contacts_title: "Leute, deren Beiträge du kommentiert hast"
       title: "Kommentierte Beiträge"
-    commented_on: kommentiert
     community_spotlight_stream: Gemeinschafts-Schaukasten
     followed_tag:
       add_a_tag: "Füge einen Tag hinzu"
@@ -821,11 +820,9 @@ de:
       title: "@Erwähnungen"
     multi:
       contacts_title: "Personen in deinem Stream"
-    posted: veröffentlicht
     public:
       contacts_title: "Aktuelle Poster"
       title: "Öffentliche Aktivität"
-    recently: "zuletzt:"
     tags:
       contacts_title: "Personen, die diesen Tag nutzen"
       tag_prefill_text: "Das Interessante an %{tag_name} ist, dass …"
diff --git a/config/locales/diaspora/de_formal.yml b/config/locales/diaspora/de_formal.yml
index 3611cd1c9..4d3de7200 100644
--- a/config/locales/diaspora/de_formal.yml
+++ b/config/locales/diaspora/de_formal.yml
@@ -793,7 +793,6 @@ de_formal:
     aspects:
       title: "Ihre Aspekte"
     aspects_stream: Aspekte
-    commented_on: kommentiert
     community_spotlight_stream: Gemeinschafts-Schaukasten
     followed_tag:
       add_a_tag: "Fügen Sie einen Tag hinzu"
@@ -807,11 +806,9 @@ de_formal:
       title: "Ihre Erwähnungen"
     multi:
       contacts_title: "Personen in Ihrem Stream"
-    posted: veröffentlicht
     public:
       contacts_title: "Aktuelle Poster"
       title: "Öffentliche Aktivität"
-    recently: "zuletzt:"
     tags:
       contacts_title: "Menschen, die diese Tags nutzen"
       title: "Getaggte Beiträge: %{tags}"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 8f7731775..7468cf3bd 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -794,7 +794,6 @@ el:
     comment_stream:
       contacts_title: "Χρήστες των οποίων έχετε σχολιάσει αναρτήσεις"
       title: "Σχολιασμένες Αναρτήσεις"
-    commented_on: σχολιάστηκε
     community_spotlight_stream: "Αναρτήσεις Κοινότητας"
     followed_tag:
       add_a_tag: "Προσθήκη μιας ετικέτας"
@@ -811,11 +810,9 @@ el:
     multi:
       contacts_title: "Άτομα στη Ροή σας"
       title: Ροή
-    posted: αναρτήθηκε
     public:
       contacts_title: "Πρόσφατες Αφίσες"
       title: "Δημόσια Δραστηριότητα"
-    recently: "πρόσφατα:"
     tags:
       contacts_title: "Άτομα που τους αρέσει αυτή ή ετικέτα"
       tag_prefill_text: "Αυτό που σκέφτομαι για %{tag_name} είναι... "
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 80fa89e45..5f04a0008 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -794,7 +794,6 @@ eo:
     aspects:
       title: "Viaj Aspektoj"
     aspects_stream: Aspektoj
-    commented_on: "komentis pri"
     community_spotlight_stream: "Komunuma Reflektoro"
     followed_tag:
       add_a_tag: "Aldoni etikedon"
@@ -809,11 +808,9 @@ eo:
     multi:
       contacts_title: "Homoj en via Torento"
       title: Torento
-    posted: afiŝis
     public:
       contacts_title: "ĵusaj afiŝintoj"
       title: "publika aktiveco"
-    recently: "freŝdate:"
     tags:
       contacts_title: "Homoj, al kiuj tiuj ĉi etikedoj plaĉas"
       tag_prefill_text: "La afero pri %{tag_name} estas... "
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index d33a49443..451686fe2 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -802,7 +802,6 @@ es-AR:
     comment_stream:
       contacts_title: "Personas que han comentado tu mensaje"
       title: "Posts Comentados"
-    commented_on: comentado
     community_spotlight_stream: "Comunidad Creativa"
     followed_tag:
       add_a_tag: "Añade un tag"
@@ -819,11 +818,9 @@ es-AR:
       title: "@Menciones"
     multi:
       contacts_title: "Personas en tu Stream"
-    posted: publicado
     public:
       contacts_title: "Autores recientes"
       title: "Actividad Pública"
-    recently: "recientemente:"
     tags:
       contacts_title: "Gente que usó ese tag"
       tag_prefill_text: "Sobre %{tag_name}... "
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index e0a26d532..f858f5f34 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -791,7 +791,6 @@ es-CL:
     comment_stream:
       contacts_title: "Gente cuyas publicaciones comentaste"
       title: Comentado
-    commented_on: comentado
     community_spotlight_stream: "Comunidad Creativa"
     followed_tag:
       add_a_tag: "Añadir un tag"
@@ -808,11 +807,9 @@ es-CL:
       title: "@Menciones"
     multi:
       contacts_title: "Gente en tu Stream"
-    posted: publicado
     public:
       contacts_title: "Posters recientes"
       title: "Actividad publica"
-    recently: "recientemente:"
     tags:
       contacts_title: "Gente que usa este tag"
       tag_prefill_text: "La cosa sobre %{tag_name} es... "
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 6ed5370ce..86bc0687f 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -805,7 +805,6 @@ es:
     comment_stream:
       contacts_title: "Gente cuyas publicaciones comentaste"
       title: Comentado
-    commented_on: comentado
     community_spotlight_stream: "Comunidad Creativa"
     followed_tag:
       add_a_tag: "Añade una etiqueta"
@@ -823,11 +822,9 @@ es:
     multi:
       contacts_title: "Gente en tu Entrada"
       title: Entrada
-    posted: publicado
     public:
       contacts_title: "Publicadores recientes"
       title: "Actividad Pública"
-    recently: "recientemente:"
     tags:
       contacts_title: "Gente que sigue esta etiqueta"
       tag_prefill_text: "Sobre %{tag_name}..."
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 20f2183b4..900891adb 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -771,7 +771,6 @@ eu:
     aspects:
       title: "Zure Alderdiak"
     aspects_stream: Alderdiak
-    commented_on: iruzkindua
     community_spotlight_stream: "Komunitateko Nabarmenenak"
     followed_tag:
       add_a_tag: "Etiketa bat gehitu"
@@ -786,11 +785,9 @@ eu:
     multi:
       contacts_title: "Zure Kronologiako Jendea"
       title: Kronologia
-    posted: bidalia
     public:
       contacts_title: "MAutore Berrienak"
       title: "Ekintza Publikoak"
-    recently: "oraintsu:"
     tags:
       contacts_title: "Etiketa hau jarraitzen duen jendea"
       title: "Mezu etiketatuak: %{tags}"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 3955bbb07..ef7eab139 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -790,7 +790,6 @@ fi:
     comment_stream:
       contacts_title: "Ihmiset, joiden viestejä olet kommentoinut"
       title: "Kommentoimasi viestit"
-    commented_on: kommentoidut
     community_spotlight_stream: "Yhteisön valokeila"
     followed_tag:
       add_a_tag: "Lisää tagi"
@@ -808,8 +807,6 @@ fi:
     multi:
       contacts_title: "Ihmiset sinun virrassasi"
       title: Virta
-    posted: lähetetyt
-    recently: "äskettäin:"
     tags:
       contacts_title: "Näistä tageista pitävät ihmiset"
   tag_followings:
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 55f77a71b..e9c579739 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -791,7 +791,6 @@ fr:
     comment_stream:
       contacts_title: "Vos commentaires apportés sur les messages d'autres personnes"
       title: "Messages commentés"
-    commented_on: commenté
     community_spotlight_stream: "Actualités de la communauté"
     followed_tag:
       add_a_tag: "Ajouter un tag"
@@ -807,11 +806,9 @@ fr:
     multi:
       contacts_title: "Personnes dans votre flux"
       title: Flux
-    posted: posté
     public:
       contacts_title: "Posteurs récents"
       title: "Activité publique"
-    recently: "récemment :"
     tags:
       contacts_title: "Personnes qui suivent ce tag"
       tag_prefill_text: "Une chose que j'aime à propos de %{tag_name} est... "
@@ -858,6 +855,8 @@ fr:
       wrong_password: "Le mot de passe introduit ne correspond pas à  votre mot de passe actuel."
     edit:
       also_commented: "…quelqu'un d'autre commente une publication de votre contact ?"
+      auto_follow_aspect: "Aspect pour les utilisateurs suivis automatiquement :"
+      auto_follow_back: "Suivre automatiquement en retour ceux qui vous suivent"
       change: Modifier
       change_email: "Changer d'adresse électronique"
       change_language: "Changer la langue"
@@ -879,6 +878,7 @@ fr:
       edit_account: "Modifier le compte"
       email_awaiting_confirmation: "Nous vous avons envoyé un lien d'activation à %{unconfirmed_email}. Jusqu'à ce que vous suiviez ce lien et activiez la nouvelle adresse, nous allons continuer à utiliser votre adresse originale %{email}."
       export_data: "Exporter des données"
+      following: "Paramètres de suivi"
       getting_started: "Préférences de nouvel utilisateur"
       liked: "... quelqu'un aime votre message ?"
       mentioned: "…vous êtes mentionné(e) dans une publication ?"
@@ -919,6 +919,8 @@ fr:
       does_not_exist: "L'utilisateur %{username} n'existe pas !"
     update:
       email_notifications_changed: "Notifications par courriel modifiées"
+      follow_settings_changed: "Les paramètres de suivi ont été modifiés"
+      follow_settings_not_changed: "Échec de la modification des paramètres de suivi."
       language_changed: "Langue mise à jour"
       language_not_changed: "Échec lors de la mise à jour de la langue"
       password_changed: "Mot de passe mis à jour. Vous pouvez maintenant vous identifier avec votre nouveau mot de passe."
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 2d427e7e8..0888f1c1c 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -819,7 +819,6 @@ he:
     comment_stream:
       contacts_title: "אנשים שהגבת על הרשומה שלהם"
       title: "רשומות עם תגובות"
-    commented_on: "הגיב על"
     community_spotlight_stream: "דברים חשובים בקהילה"
     followed_tag:
       add_a_tag: "הוסף תגית"
@@ -837,11 +836,9 @@ he:
     multi:
       contacts_title: "אנשים בחדשות שלך"
       title: חדשות
-    posted: נרשם
     public:
       contacts_title: "מודעות חדשות"
       title: "פעילות ציבורית"
-    recently: ":לאחרונה"
     tags:
       contacts_title: "אנשים ששותפים לתגית הזו"
       tag_prefill_text: " %{tag_name} העניין בקשר ל"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 47c3afbd4..f20a8d8eb 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -800,7 +800,6 @@ hu:
     comment_stream:
       contacts_title: "Emberek, akiknek a bejegyzéséhez hozzászóltál."
       title: "Hozzászólt bejegyzések"
-    commented_on: hozzászólt
     community_spotlight_stream: Reflektorfényben
     followed_tag:
       add_a_tag: "Címke hozzáadása"
@@ -815,11 +814,9 @@ hu:
     multi:
       contacts_title: "Személyek a Hírfolyamodban"
       title: Hírfolyam
-    posted: elküldve
     public:
       contacts_title: "Friss poszterek"
       title: "Publikus tevékenység"
-    recently: "Utoljára:"
     tags:
       contacts_title: "Emberek, akik ezeket a címkéket követik"
       tag_prefill_text: "Mi újság erről: %{tag_name} ?"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index da28b8dbf..d20251904 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -794,7 +794,6 @@ it:
     comment_stream:
       contacts_title: "Persone a cui hai commentato i post"
       title: "Post commentati"
-    commented_on: commenti
     community_spotlight_stream: "In evidenza dalla comunità"
     followed_tag:
       add_a_tag: "Aggiungi un tag"
@@ -811,11 +810,9 @@ it:
       title: "@Menzioni"
     multi:
       contacts_title: "Persone nel tuo stream"
-    posted: post
     public:
       contacts_title: "Chi ha postato di recente"
       title: "Attività pubblica"
-    recently: "ordina per:"
     tags:
       contacts_title: "Persone con questo tag"
       tag_prefill_text: "A proposito di %{tag_name} ..."
@@ -862,6 +859,8 @@ it:
       wrong_password: "Hai inserito una password che non corrisponde a quella attuale."
     edit:
       also_commented: "...qualcuno commenta un post dopo di te?"
+      auto_follow_aspect: "Aspetto per gli utenti seguiti in automatico:"
+      auto_follow_back: "Segui automaticamente tutti coloro che iniziano a seguirti"
       change: Cambia
       change_email: "Cambia email"
       change_language: "Cambia lingua"
@@ -883,6 +882,7 @@ it:
       edit_account: "Modifica account"
       email_awaiting_confirmation: "È stato spedito su %{unconfirmed_email} un link di attivazione. Continueremo ad usare la tua email originale %{email} finché non cliccherai sul link e attiverai il nuovo indirizzo."
       export_data: "Esporta Dati"
+      following: "Impostazioni dei contatti"
       getting_started: "Preferenze nuovo utente"
       liked: "...a qualcuno piace un tuo post?"
       mentioned: "...sei menzionato in un post?"
@@ -923,6 +923,8 @@ it:
       does_not_exist: "L'utente %{username} non esiste!"
     update:
       email_notifications_changed: "Notifiche email modificate con successo"
+      follow_settings_changed: "Le impostazioni dei contatti sono state cambiate"
+      follow_settings_not_changed: "Le impostazioni dei contatti non sono state cambiate a causa di un errore."
       language_changed: "Lingua cambiata"
       language_not_changed: "Impossibile cambiare lingua"
       password_changed: "Password cambiata. Ora puoi effettuare l'accesso con la tua nuova password."
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index 9027c353b..b310572b4 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -805,7 +805,6 @@ ko:
     comment_stream:
       contacts_title: "내가 댓글 남긴 게시물을 공유한 사람들"
       title: "댓글 스트림"
-    commented_on: "댓글 달린 순"
     community_spotlight_stream: "커뮤니티 스포트라이트"
     followed_tag:
       add_a_tag: "태그 추가"
@@ -822,11 +821,9 @@ ko:
     multi:
       contacts_title: "내 스트림에 있는 사람들"
       title: 스트림
-    posted: "올린 순"
     public:
       contacts_title: "최근 게시자"
       title: "공개 활동"
-    recently: 최근에
     tags:
       tag_prefill_text: "%{tag_name} 태그를 달고 공유하세요!"
       title: "태그: %{tags}"
diff --git a/config/locales/diaspora/ml.yml b/config/locales/diaspora/ml.yml
index de2330bff..fe82132da 100644
--- a/config/locales/diaspora/ml.yml
+++ b/config/locales/diaspora/ml.yml
@@ -3,457 +3,527 @@
 #   the COPYRIGHT file.
 
 
-ml: 
-  _comments: "അഭിപ്രായങ്ങള്‍"
-  _home: "പൂമുഖം"
-  _photos: "ചിത്രങ്ങള്‍"
-  _services: "സേവനങ്ങള്‍"
+ml:
   _applications: "Applications"
-  account: "അക്കൗണ്ട്"
-  activerecord: 
-    errors: 
-      models: 
-        contact: 
-          attributes: 
-            person_id: 
+  _comments: അഭിപ്രായങ്ങള്‍
+  _contacts: സമ്പര്‍ക്കങ്ങള്‍
+  _home: പൂമുഖം
+  _photos: ചിത്രങ്ങള്‍
+  _services: സേവനങ്ങള്‍
+  account: അക്കൗണ്ട്
+  activerecord:
+    errors:
+      models:
+        contact:
+          attributes:
+            person_id:
               taken: "ഈ ഉപയോകതാവിന്റെ സമ്പര്‍ക്കങ്ങളുടേതില്‍നിന്നും വ്യത്യസ്തമായിരിക്കണം."
-        person: 
-          attributes: 
-            diaspora_handle: 
+        person:
+          attributes:
+            diaspora_handle:
               taken: "നേരത്തേ എടുത്തിട്ടുണ്ട്."
-        request: 
-          attributes: 
-            from_id: 
+        request:
+          attributes:
+            from_id:
               taken: "നിലവിലുള്ള ഒരു അപേക്ഷയുടെ പകര്‍പ്പാണ്."
         reshare:
           attributes:
             root_guid:
               taken: "You've already reshared that post!"
-        user: 
-          attributes: 
-            email: 
-              taken: "നേരത്തേ എടുത്തിട്ടുണ്ട്."
-            person: 
-              invalid: "സാധുവല്ല."
-            username: 
+        user:
+          attributes:
+            email:
               taken: "നേരത്തേ എടുത്തിട്ടുണ്ട്."
+            person:
+              invalid: സാധുവല്ല.
+            username:
               invalid: "is invalid. We only allow letters, numbers, and underscores"
+              taken: "നേരത്തേ എടുത്തിട്ടുണ്ട്."
   ago: "%{time} മുന്‍പ്"
-  all_aspects: "എല്ലാം"
-  application: 
-    helper: 
+  all_aspects: എല്ലാം
+  application:
+    helper:
+      diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "അറിയാത്ത വ്യക്തി"
-      video_title: 
+      video_title:
         unknown: "ചലചിത്രത്തിന്റെ തലക്കെട്ട് അറിയില്ല"
   are_you_sure: "താങ്കള്‍ക്ക് ഉറപ്പാണോ?"
-  aspect_memberships: 
-    destroy: 
+  are_you_sure_delete_account: "Are you sure you want to close your account? This can't be undone!"
+  aspect_memberships:
+    destroy:
       failure: "ഈ വ്യക്തിയെ പരിചയത്തില്‍ നിന്ന് മാറ്റാന്‍ കഴിഞ്ഞില്ല"
       no_membership: "തെരഞ്ഞെടുത്ത വ്യക്തി ഈ പരിചയത്തില്‍ ഇല്ല"
       success: "വ്യക്തിയെ വിജയകരമായി പരിചയത്തില്‍ നിന്നും നീക്കം ചെയ്തു"
-    aspect_dropdown:
-      add_to_aspect: "Add to aspect"
-      toggle:
-        zero: "Add to aspect"
-        one: "In %{count} aspect"
-        few: "In %{count} aspects"
-        many: "In %{count} aspects"
-        other: "In %{count} aspects"
-  aspects: 
-    add_to_aspect: 
+  aspects:
+    add_to_aspect:
       failure: "സമ്പര്‍ക്കം പരിചയത്തിലേക്ക് കൂട്ടിചേര്‍ക്കുന്നതില്‍ പരാജയപ്പെട്ടു."
       success: "വിജയകരമായി സമ്പര്‍ക്കം പരിചയത്തിലേക്ക് കൂട്ടിചേര്‍ത്തു."
-    aspect_contacts: 
+    aspect_contacts:
       done_editing: "മാറ്റം വരുത്തി കഴിഞ്ഞു"
-    aspect_stream: 
-      stream: "Stream"
-      recently: "recently:"
-      commented_on: "commented on"
-      posted: "posted"
+    aspect_listings:
+      add_an_aspect: "+ Add an aspect"
+      deselect_all: "Deselect all"
+      edit_aspect: "Edit %{name}"
+      select_all: "Select all"
+    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_visible: "ഈ പരിചയത്തിലുള്ള സമ്പര്‍ക്കങ്ങള്‍ക്ക് പരസ്പരം കാണാന്‍ സാധിക്കുന്നതാണ്."
-    create: 
+    create:
       failure: "പരിചയം സൃഷ്ടിക്കല്‍ പരാജയപ്പെട്ടു."
       success: "നിങ്ങളുടെ പുതിയ പരിചയം %{name} സൃഷ്ടിക്കപ്പെട്ടു."
-    destroy: 
+    destroy:
       failure: "%{name} ശുന്യമല്ലാത്തതിനാല്‍ നീക്കാനാകുന്നില്ല."
       success: "%{name} വിജയകരമായി നീക്കം ചെയ്തിരിക്കുന്നു."
-    edit: 
+    edit:
       add_existing: "നിലവിലുള്ള സമ്പര്‍ക്കം ചേര്‍കുക"
       aspect_list_is_not_visible: "പരിചയത്തിന്റെ പട്ടിക പരിചയത്തിലുള്ള മറ്റൂള്ളവരില്‍നിന്നും മറച്ചുവച്ചിരിക്കുന്നു"
       aspect_list_is_visible: "പരിചയപട്ടിക പരിചയത്തിലുള്ളവര്‍ക്ക് ദൃശ്യമാണ്."
       confirm_remove_aspect: "താങ്കള്‍ക്ക് ഈ പരിചയം നീക്കണമെന്ന് ഉറപ്പാണോ?"
-      done: "ചെയ്തു"
+      done: ചെയ്തു
       make_aspect_list_visible: "പരിചയം ദൃശ്യമാക്കുക"
       remove_aspect: "ഈ പരിചയം നീക്കം ചെയ്യുക"
       rename: "പേര് മാറ്റുക"
-      update: "പുതുക്കു"
-      updating: "പുതുക്കുന്നു"
+      update: പുതുക്കു
+      updating: പുതുക്കുന്നു
     few: "%{count} പരിചയങ്ങള്‍"
-    helper: 
+    helper:
       are_you_sure: "നിങ്ങള്‍ ഈ പരിചയം നീക്കം ചെയ്യുവാന്‍ ആഗ്രഹിക്കുന്നു, നിങ്ങള്‍ക്ക് തീര്‍ച്ചയാണോ?"
       aspect_not_empty: "പരിചയം ശൂന്യമല്ല "
       remove: "നീക്കം ചെയ്യു"
-    index: 
-      handle_explanation: "ഇത് താങ്കളുടെ ഡയസ്പോറ ഐഡിയാണ്. അളുകള്‍ക്ക് താങ്കളെ ബന്ധപെടാന്‍ ഇത് ഇമെയില്‍ പോലെ കൊടുക്കാം."
-      donate: "Donate"
-      keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
-      your_aspects: "Your Aspects"
-      tags_following: "Followed Tags"
-      no_tags: "+ Find a tag to follow"
-      unfollow_tag: "Stop following #%{tag}"
-      no_contacts: "സമ്പര്‍ക്കങ്ങളില്ല"
-      post_a_message: "ഒരു കത്തയക്കുക >>"
-      people_sharing_with_you: "People sharing with you"
+    index:
       cubbies:
-        heading: "Connect to Cubbi.es"
         explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
         learn_more: "Learn more"
       diaspora_id:
-        heading: "Diaspora ID"
         content_1: "Your Diaspora ID is:"
         content_2: "Give it to anyone and they'll be able to find you on Diaspora."
+        heading: "Diaspora ID"
+      donate: "Donate"
+      handle_explanation: "ഇത് താങ്കളുടെ ഡയസ്പോറ ഐഡിയാണ്. അളുകള്‍ക്ക് താങ്കളെ ബന്ധപെടാന്‍ ഇത് ഇമെയില്‍ പോലെ കൊടുക്കാം."
+      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"
+        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: "This is your stream.  Jump in and introduce yourself."
+      keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
+      new_here:
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
+      no_contacts: സമ്പര്‍ക്കങ്ങളില്ല
+      no_tags: "+ Find a tag to follow"
+      people_sharing_with_you: "People sharing with you"
+      post_a_message: "ഒരു കത്തയക്കുക >>"
       services:
-        heading: "Connect 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} പരിചയങ്ങള്‍"
-    move_contact: 
+    move_contact:
       error: "സമ്പര്‍ക്കം മാറ്റാന്‍ സാധിക്കുന്നില്ല : %{inspect}"
       failure: "ശരിയായില്ല. %{inspect}"
       success: "വ്യക്തിയെ പുതിയ പരിചയത്തിലേക്ക് മാറ്റിയിരിക്കുന്നു"
-    new: 
-      create: "ഉണ്ടാക്കു"
-      name: "പേര്"
-    no_posts_message: 
-      start_talking: "ആരും ഇതുവരെ ഒന്നും പറഞ്ഞില്ല!"
+    new:
+      create: ഉണ്ടാക്കു
+      name: പേര്
     no_contacts_message:
-      you_should_add_some_more_contacts: "You should add some more contacts!"
+      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_featured:  "Or you can share with %{link}"
-      featured_users: "featured users"
-    aspect_listings:
-      add_an_aspect: "+ Add an aspect"
-
-    selected_contacts:
-      view_all_contacts: "View all contacts"
-      no_contacts: "You don't have any contacts here yet."
-      manage_your_aspects: "Manage your aspects."
+      you_should_add_some_more_contacts: "You should add some more contacts!"
+    no_posts_message:
+      start_talking: "ആരും ഇതുവരെ ഒന്നും പറഞ്ഞില്ല!"
     one: "ഒരു പരിചയം"
     other: "%{count} പരിചയങ്ങള്‍"
-    seed: 
-      family: "കുടുംബം"
-      work: "ജോലി"
+    seed:
       acquaintances: "Acquaintances"
+      family: കുടുംബം
       friends: "Friends"
-    show: 
+      work: ജോലി
+    selected_contacts:
+      manage_your_aspects: "Manage your aspects."
+      no_contacts: "You don't have any contacts here yet."
+      view_all_community_spotlight: "See all community spotlight"
+      view_all_contacts: "View all contacts"
+    show:
       edit_aspect: "പരിചയം ചിട്ടപെടുത്തുക"
-    update: 
+    two: "%{count} aspects"
+    update:
       failure: "താങ്കള്‍ നല്കിയ %{name} എന്ന പരിചയത്തിന്റെ പേര് അനുവദിനീയമായതിലും വലുതാണ്."
       success: "നിങ്ങളുടെ പരിചയം, %{name}, വിജയകരമായി ചിട്ടപ്പെടുത്തി."
     zero: "പരിചയങ്ങള്‍ ഇല്ല"
-  back: "പിന്നോട്ട്"
+  authorizations:
+    index:
+      no_applications: "You haven't registered any applications yet."
+      revoke_access: "Revoke Access"
+  back: പിന്നോട്ട്
+  blocks:
+    create:
+      failure: "I couldn't ignore that user.  #evasion"
+      success: "Alright, you won't see that user in your stream again. #silencio!"
+    destroy:
+      failure: "I couldn't stop ignoring that user.  #evasion"
+      success: "Let's see what they have to say! #sayhello"
   bookmarklet:
-    heading: "Bookmarklet"
     explanation: "Post to Diaspora from anywhere by bookmarking %{link}."
     explanation_link_text: "this link"
+    heading: "Bookmarklet"
     post_something: "ഡയസ്പോറയിലേക്ക് എന്തെങ്കിലും കുറിക്കുക"
     post_success: "കുറിച്ചു! അടയ്ക്കുന്നു!"
-  cancel: "റദ്ദാക്കുക"
-  comments: 
+  cancel: റദ്ദാക്കുക
+  comments:
     few: "%{count} അഭിപ്രായങ്ങള്‍"
     many: "%{count} അഭിപ്രായങ്ങള്‍"
-    new_comment: 
-      comment: "അഭിപ്രായം"
+    new_comment:
+      comment: അഭിപ്രായം
       commenting: "അഭിപ്രായം രേഖപ്പെടുത്തുന്നു..."
     one: "1 അഭിപ്രായം"
     other: "%{count} അഭിപ്രായങ്ങള്‍"
-    zero: "അഭിപ്രായങ്ങളൊന്നുമില്ല."
-  contacts: 
-    create: 
+    two: "%{count} comments"
+    zero: അഭിപ്രായങ്ങളൊന്നുമില്ല.
+  contacts:
+    create:
       failure: "സമ്പര്‍ക്കം ഉണ്ടാക്കാനാകുന്നില്ല"
-    sharing:
-      people_sharing: "People sharing with you:"
+    few: "%{count} സമ്പര്‍ക്കങ്ങള്‍"
     index:
-      edit_aspect: "Edit %{name}"
-      start_a_conversation: "Start a conversation"
       add_a_new_aspect: "Add a new aspect"
-      title: "Contacts"
-      your_contacts: "Your Contacts"
-      no_contacts: "No contacts."
-      my_contacts: "My Contacts"
+      add_to_aspect: "add contacts to %{name}"
       all_contacts: "All Contacts"
+      check_out: "Check out"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
       remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
-      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them." 
-    featured:
-      featured_users: "Featured Users"
-    few: "%{count} സമ്പര്‍ക്കങ്ങള്‍"
+      start_a_conversation: "Start a conversation"
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} സമ്പര്‍ക്കങ്ങള്‍"
     one: "ഒരു സമ്പര്‍ക്കം"
     other: "%{count} മറ്റു സമ്പര്‍ക്കങ്ങള്‍"
-    zero: "സമ്പര്‍ക്കമൊന്നുമില്ല"
-  conversations: 
-    create: 
+    sharing:
+      people_sharing: "People sharing with you:"
+    spotlight:
+      community_spotlight: "Community Spotlight"
+    two: "%{count} contacts"
+    zero: സമ്പര്‍ക്കമൊന്നുമില്ല
+  conversations:
+    create:
+      fail: "Invalid message"
       sent: "സന്ദേശം അയച്ചു."
-    destroy: 
+    destroy:
       success: "സംഭാഷണം വിജയകരമായി നീക്കം ചെയ്തിരിക്കുന്നു."
-    helper: 
-      new_messages: 
+    helper:
+      new_messages:
         few: "%{count} പുതിയ സന്ദേശങ്ങള്‍"
         many: "%{count} പുതിയ സന്ദേശങ്ങള്‍"
         one: "ഒരു പുതിയ സന്ദേശം"
         other: "%{count} പുതിയ സന്ദേശങ്ങള്‍"
+        two: "%{count} new messages"
         zero: "പുതിയ സന്ദേശങ്ങളില്ല"
-    index: 
+    index:
       create_a_new_message: "പുതിയ സന്ദേശം ഉണ്ടാക്കുക"
-      inbox: "ഇന്‍ബോക്സ്"
+      inbox: ഇന്‍ബോക്സ്
       message_inbox: "സന്ദേശ ഇന്‍ബോക്സ്"
       new_message: "പുതിയ സന്ദേശം"
       no_conversation_selected: "സംവാദങ്ങളൊന്നും തിരഞ്ഞെടുത്തില്ല"
-      no_messages: "സന്ദേശങ്ങളൊന്നുമില്ല"
-    new: 
-      send: "അയക്കു"
-      subject: "വിഷയം"
-      to: "സ്വീകര്‍ത്താവ്"
-      sending: "Sending..."
+      no_messages: സന്ദേശങ്ങളൊന്നുമില്ല
+    new:
       abandon_changes: "Abandon changes?"
-    show: 
+      send: അയക്കു
+      sending: Sending...
+      subject: വിഷയം
+      to: സ്വീകര്‍ത്താവ്
+    new_message:
+      fail: "Invalid message"
+    show:
       delete: "സംഭാഷണം തടഞ്ഞ് നീക്കം ചെയ്യുക."
-      reply: "മറുപടി"
-  date: 
-    formats: 
+      reply: മറുപടി
+      replying: Replying...
+  date:
+    formats:
       birthday: "%B %d"
       birthday_with_year: "%B %d %Y"
       fullmonth_day: "%B %d"
   delete: "നീക്കം ചെയ്യുക"
-  email: "ഇമെയില്‍"
-  error_messages: 
-    helper: 
+  email: ഇമെയില്‍
+  error_messages:
+    helper:
       correct_the_following_errors_and_try_again: "ഈ പിഴവുകള്‍ പരിഹരിച്ച ശേഷം വീണ്ടും ശ്രമിക്കുക."
       invalid_fields: "അസാധുവായ കള്ളികള്‍"
   fill_me_out: "എന്നെ പൂരിപ്പിക്കു"
-  hide: "മറയ്ക്കു"
-  home: 
-    show: 
+  find_people: "Find people or #tags"
+  hide: മറയ്ക്കു
+  home:
+    show:
       already_account: "നിലവില്‍ ഒരു അക്കൌണ്ടുണ്ടോ?"
-      choice: "തിരഞ്ഞെടുക്കുക"
+      choice: തിരഞ്ഞെടുക്കുക
       choice_explanation: "ഡയസ്പോറയില്‍ താങ്കള്‍ക്ക് സമ്പര്‍ക്കങ്ങളെ പരിചയങ്ങള്‍ എന്ന കൂട്ടങ്ങളായി തിരിക്കാന്‍ അനുവദിക്കുന്നു. ഫോട്ടോകള്‍, കഥകള്‍, തമാശകള്‍ തുടങ്ങിയവ ഉദ്ദേശിക്കുന്ന ആളുകള്‍ക്കു മാത്രം കിട്ടാന്‍ പരിചയങ്ങള്‍ സഹായിക്കുന്നു. ഇത് ഡയസ്പോറയില്‍ മാത്രമുള്ളതാണ്."
       learn_about_host: "താങ്കളുടെ ഡയസ്പോറ സെര്‍വര്‍ എങ്ങിനെ സജ്ജീകരിക്കാമെന്നു നോക്കാം."
       login_here: "ഇവിടെ ലോഗിന്‍ ചെയ്യുന്നുണ്ടോ?"
-      ownership: "ഉടമസ്ഥത"
+      ownership: ഉടമസ്ഥത
       ownership_explanation: "നിങ്ങള്‍ തന്നെയാണു് നിങ്ങളുടെ ചിത്രങ്ങളുടെ ഉടമസ്ഥര്‍, പങ്കിടാനാഗ്രഹിയ്ക്കുന്നതു് കൊണ്ടു് മാത്രം മറ്റൊരാളെ ഉടമയാക്കണമെന്നില്ല. നിങ്ങള്‍ ഡയാസ്പുറയില്‍ പങ്കിടുന്നതെല്ലാം നിങ്ങളുടെ ഉടമസ്ഥതയിലായതിനാല്‍ അതെങ്ങനെയാണു് വിതരണം ചെയ്യേണ്ടതെന്നു് പൂര്‍ണ്ണമായും നിങ്ങള്‍ക്കു് തന്നെ നിയന്ത്രിയ്ക്കാം."
       share_what_you_want: "നിങ്ങള്‍ ആഗ്രഹിക്കുന്ന ആളുമായി, നിങ്ങള്‍ ആഗ്രഹിക്കുന്നത് പങ്കുവെയ്ക്കു."
-      simplicity: "ലളിതം"
+      simplicity: ലളിതം
       simplicity_explanation: "ഡയസ്പോറ പങ്കിടല്‍ എളുപ്പമാക്കുന്നു - സ്വകാര്യതയിലും. ഡയസ്പോറ പ്രൊഫൈല്‍ സുരക്ഷിതമാക്കാന്‍ പേജുകള്‍ ക​ണക്കിന് ക്രമികരണങ്ങള്‍ മാറ്റേണ്ട."
       tagline_first_half: "നിങ്ങള്‍ ആഗ്രഹിക്കുന്നത് പങ്കുവെയ്ക്കു,"
       tagline_second_half: "നിങ്ങള്‍ ആഗ്രഹിക്കുന്ന ആളുമായി."
-  invitations: 
-    check_token: 
+  invitations:
+    a_facebook_user: "A Facebook user"
+    check_token:
       not_found: "ക്ഷണത്തിന്റെ ടോക്കണ്‍ കാണുന്നില്ല"
-    create: 
+    create:
       already_contacts: "താങ്കള്‍ ഇതിനകം തന്നെ ഈ വ്യക്തിയുമായി ബന്ധിപ്പിച്ചിരിക്കുകയാണ്"
       already_sent: "താങ്കള്‍ ഇതിനകം തന്നെ ഈ വ്യക്തിയെ ക്ഷണിച്ചു."
-      own_address: "You can't send an invitation to your own address."
       no_more: "താങ്കള്‍ക്ക് ഇനി ക്ഷണങ്ങളൊന്നും ബാക്കിയില്ല."
+      own_address: "You can't send an invitation to your own address."
       rejected: "ഈ ഇമെയില്‍ വിലാസങ്ങള്‍ക്ക് പ്രശ്നങ്ങളുണ്ട്: "
       sent: "ക്ഷണങ്ങള്‍ അയച്ചിരിക്കുന്നു: "
-    edit: 
-      sign_up: "sign_up"
-      your_account_awaits: "Your account awaits!"
+    edit:
       accept_your_invitation: "Accept your invitation"
-    a_facebook_user: "A Facebook user"
-    new: 
+      your_account_awaits: "Your account awaits!"
+    new:
       already_invited: "The following people have not accepted your invitation:"
-      aspect: "പരിചയം"
+      aspect: പരിചയം
       comma_seperated_plz: "താങ്കള്‍ക്ക് കോമാ ഉപയോഗിച്ച് ഒന്നില്‍ കൂടൂതല്‍ ഇമെയില്‍ വിലാസങ്ങള്‍ ചേര്‍ക്കാം."
       if_they_accept_info: "അവര്‍ അംഗീകരിക്കുകയാണെങ്കില്‍, അവരെ താങ്കള്‍ ക്ഷണിച്ച പരിചയത്തിലേയ്ക്ക് ചേര്‍ക്കും."
       invite_someone_to_join: "ഡയസ്പോറയില്‍ ചേരാന്‍ ആരെയെങ്കിലും ക്ഷണിക്കു!"
+      language: "Language"
       personal_message: "വ്യക്തിപരമായ സന്ദേശം"
       resend: "വീണ്ടും അയയ്ക്കുക"
       send_an_invitation: "ഒരു ക്ഷണം അയയ്ക്കു"
       send_invitation: "ക്ഷണം അയയ്ക്കു"
-      to: "സ്വീകര്‍ത്താവ്"
-  layouts: 
-    application: 
+      to: സ്വീകര്‍ത്താവ്
+  layouts:
+    application:
       powered_by: "ഡയസ്പോറയാല്‍* ശക്തമാക്കിയത്"
       public_feed: "%{name} -ന്റെ പൊതു ഡയസ്പോറ ഫീഡ്"
       toggle: "മൊബൈല്‍ സൈറ്റിലേക്ക് മാറുക"
-      whats_new: "പുതിയത്?"
+      whats_new: പുതിയത്?
       your_aspects: "നിങ്ങളുടെ പരിചയങ്ങള്‍"
-    header: 
-      blog: "ബ്ലോഗ്"
-      code: "കോഡ്"
+    header:
+      admin: "admin"
+      blog: ബ്ലോഗ്
+      code: കോഡ്
       login: "അകത്ത് കടക്കുക"
       logout: "പുറത്ത് കടക്കു"
-      profile: "പ്രൊഫൈല്‍"
-      settings: "ക്രമീകരണങ്ങള്‍"
-      admin: "admin"
-      view_all: "View all"
+      profile: പ്രൊഫൈല്‍
       recent_notifications: "Recent notifications"
-  likes: 
-    likes: 
-      people_dislike_this: 
+      settings: ക്രമീകരണങ്ങള്‍
+      view_all: "View all"
+  likes:
+    likes:
+      people_dislike_this:
         few: "%{count} പേര്‍ ഇത് ഇഷ്ടപ്പെടുന്നില്ല"
         many: "%{count} പേര്‍ ഇത് ഇഷ്ടപ്പെടുന്നില്ല."
         one: "ഒരാള്‍ ഇതിഷ്ടപ്പെടുന്നില്ല."
         other: "%{count} പേര്‍ ഇത് ഇഷ്ടപ്പെടുന്നില്ല"
+        two: "%{count} dislikes"
         zero: "ആരും ഇത് ഇഷ്ടപ്പെടുന്നില്ല"
-      people_like_this_comment:
-        zero: "no likes"
-        one: "%{count} like"
-        few: "%{count} likes"
-        many: "%{count} likes"
-        other: "%{count} likes"
-      people_like_this: 
+      people_like_this:
         few: "%{count} ആളുകള്‍ ഇത് ഇഷ്ടപ്പെടുന്നു"
         many: "%{count} ആളുകള്‍ ഇത് ഇഷ്ട്പ്പെടുന്നു"
         one: "ഒരാള്‍ ഇത് ഇഷ്ടപ്പെടുന്നു"
         other: "%{count} ആളുകള്‍ ഇത് ഇഷ്ടപ്പെടുന്നു"
+        two: "%{count} likes"
         zero: "ആരും ഇതു ഇഷ്ടപ്പെടുന്നില്ല."
-  more: "കൂടുതല്‍"
-  next: "അടുത്തത്"
+      people_like_this_comment:
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        two: "%{count} likes"
+        zero: "no likes"
+  limited: "Limited"
+  more: കൂടുതല്‍
+  next: അടുത്തത്
   no_results: "ഫലങ്ങളൊന്നും കണ്ടെത്താനായില്ല."
-  _contacts: "Contacts"
-  notifications: 
-    helper: 
+  notifications:
+    also_commented:
+      few: "%{actors} also commented on %{post_author}'s %{post_link}."
+      many: "%{actors} also commented on %{post_author}'s %{post_link}."
+      one: "%{actors} also commented on %{post_author}'s %{post_link}."
+      other: "%{actors} also commented on %{post_author}'s %{post_link}."
+      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."
+    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}."
+    helper:
       new_notifications:
-        zero: "No new notifications"
-        one: "1 new notifications"
         few: "%{count} new notifications"
         many: "%{count} new notifications"
+        one: "1 new notifications"
         other: "%{count} new notifications"
-    index: 
-      and: "കൂടാതെ"
-      and_others: 
-        zero: "and nobody else"
-        one: "and one more"
+        two: "%{count} new notifications"
+        zero: "No new notifications"
+    index:
+      and: കൂടാതെ
+      and_others:
         few: "and %{count} others"
         many: "and %{count} others"
+        one: "and one more"
         other: "and %{count} others"
+        two: "and %{count} others"
+        zero: "and nobody else"
       mark_all_as_read: "എല്ലാം വായിച്ചതായി അടയാളപ്പെടുത്തുക"
-      notifications: "അറിയിപ്പുകള്‍"
-    started_sharing:
-      zero: "%{actors} started sharing with you."
-      one: "%{actors} started sharing with you."
-      few: "%{actors} started sharing with you."
-      many: "%{actors} started sharing with you."
-      other: "%{actors} started sharing with you."
-    private_message:
-      zero: "%{actors} sent you a message."
-      one: "%{actors} sent you a message."
-      few: "%{actors} sent you a message."
-      many: "%{actors} sent you a message."
-      other: "%{actors} sent you a message."
-    comment_on_post:
-      zero: "%{actors} commented on your %{post_link}."
-      one: "%{actors} commented on your %{post_link}."
-      few: "%{actors} commented on your %{post_link}."
-      many: "%{actors} commented on your %{post_link}."
-      other: "%{actors} commented on your %{post_link}."
-    also_commented:
-      zero: "%{actors} also commented on %{post_author}'s %{post_link}."
-      one: "%{actors} also commented on %{post_author}'s %{post_link}."
-      few: "%{actors} also commented on %{post_author}'s %{post_link}."
-      many: "%{actors} also commented on %{post_author}'s %{post_link}."
-      other: "%{actors} also commented on %{post_author}'s %{post_link}."
-    mentioned:
-      zero: "%{actors} has mentioned you in a %{post_link}."
-      one: "%{actors} has mentioned you in a %{post_link}."
-      few: "%{actors} has mentioned you in a %{post_link}."
-      many: "%{actors} has mentioned you in a %{post_link}."
-      other: "%{actors} has mentioned you in a %{post_link}."
+      notifications: അറിയിപ്പുകള്‍
     liked:
-      zero: "%{actors} has just liked your %{post_link}."
-      one: "%{actors} has just liked your %{post_link}."
       few: "%{actors} has just liked your %{post_link}."
       many: "%{actors} has just liked your %{post_link}."
+      one: "%{actors} has just liked your %{post_link}."
       other: "%{actors} has just liked your %{post_link}."
-    post: "post"
-    also_commented_deleted:
-      zero: "%{actors} commented on a deleted post."
-      one: "%{actors} commented on a deleted post."
-      few: "%{actors} commented on a deleted post."
-      many: "%{actors} commented on a deleted post."
-      other: "%{actors} commented on a deleted post."
+      two: "%{actors} have liked your %{post_link}."
+      zero: "%{actors} has just liked your %{post_link}."
     liked_post_deleted:
-      zero: "%{actors} liked your deleted post."
-      one: "%{actors} liked your deleted post."
       few: "%{actors} liked your deleted post."
       many: "%{actors} liked your deleted post."
+      one: "%{actors} liked your deleted post."
       other: "%{actors} liked your deleted post."
+      two: "%{actors} liked your deleted post."
+      zero: "%{actors} liked your deleted post."
+    mentioned:
+      few: "%{actors} has mentioned you in a %{post_link}."
+      many: "%{actors} has mentioned you in a %{post_link}."
+      one: "%{actors} has mentioned you in a %{post_link}."
+      other: "%{actors} has mentioned you in a %{post_link}."
+      two: "%{actors} have mentioned you in a %{post_link}."
+      zero: "%{actors} has mentioned you in a %{post_link}."
     mentioned_deleted:
-      zero: "%{actors} mentioned you in a deleted post."
-      one: "%{actors} mentioned you in a deleted post."
       few: "%{actors} mentioned you in a deleted post."
       many: "%{actors} mentioned you in a deleted post."
+      one: "%{actors} mentioned you in a deleted post."
       other: "%{actors} mentioned you in a deleted post."
-  notifier: 
-    comment_on_post: 
+      two: "%{actors} mentioned you in a deleted post."
+      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."
+    reshared:
+      few: "%{actors} have reshared your %{post_link}."
+      many: "%{actors} have reshared your %{post_link}."
+      one: "%{actors} has reshared your %{post_link}."
+      other: "%{actors} have reshared your %{post_link}."
+      two: "%{actors} have reshared your %{post_link}."
+      zero: "%{actors} have reshared your %{post_link}."
+    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."
+    started_sharing:
+      few: "%{actors} started sharing with you."
+      many: "%{actors} started sharing with you."
+      one: "%{actors} started sharing with you."
+      other: "%{actors} started sharing with you."
+      two: "%{actors} started sharing with you."
+      zero: "%{actors} started sharing with you."
+  notifier:
+    a_post_you_shared: "a post."
+    click_here: "click here"
+    comment_on_post:
       reply: "Reply or view %{name}'s post >"
+    confirm_email:
+      click_link: "To activate your new email address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new email address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "നമസ്‌കാരം %{name}!"
-    to_change_your_notification_settings: "to change your notification settings"
-    mentioned: 
+    liked:
+      liked: "%{name} just liked your post"
+      view_post: "View post >"
+    mentioned:
       mentioned: "താങ്കളെ ഒരു കുറിപ്പില്‍ സൂചിപ്പിച്ചു:"
       subject: "%{name} താങ്കളെ ഡയസ്പോറയില്‍* സൂചിപ്പിച്ചു"
-    liked:
-        liked: "%{name} just liked your post"
-        view_post: "View post >"
-    confirm_email:
-        subject: "Please activate your new email address %{unconfirmed_email}"
-        click_link: "To activate your new email address %{unconfirmed_email}, please click this link:"
-    private_message: 
+    private_message:
       reply_to_or_view: "Reply to or view this conversation >"
-    started_sharing:
-        subject: "%{name} started sharing with you on Diaspora*"
-        sharing: "has started sharing with you!"
-        view_profile: "View %{name}'s profile"
-    single_admin: 
+    reshared:
+      reshared: "%{name} reshared your post"
+      view_post: "View post >"
+    single_admin:
       admin: "നിങ്ങളുടെ ഡയസ്പോറ മേല്‍നോട്ടക്കാരന്‍"
       subject: "നിങ്ങളുടെ ഡയസ്പോറ അക്കൌണ്ടിനെ സംബന്ധിച്ച് ഒരു സന്ദേശം:"
+    started_sharing:
+      sharing: "has started sharing with you!"
+      subject: "%{name} started sharing with you on Diaspora*"
+      view_profile: "View %{name}'s profile"
     thanks: "നന്ദിയോടെ,"
-  ok: "ശരി"
-  or: "അല്ലെങ്കില്‍"
-  password: "അടയാളവാക്ക്"
+    to_change_your_notification_settings: "to change your notification settings"
+  ok: ശരി
+  or: അല്ലെങ്കില്‍
+  password: അടയാളവാക്ക്
   password_confirmation: "അടയാളവാക്ക് തിര്‍ച്ചപ്പെടുത്തുക"
-  people: 
-    add_contact_small: 
+  people:
+    add_contact_small:
       add_contact_from_tag: "ടാഗില്‍ നിന്ന് സമ്പര്‍ക്കം ചേര്‍ക്കുക"
-    aspect_list: 
+    aspect_list:
       edit_membership: "പരിചയത്തിലെ അംഗത്വം തിരുത്തു"
     few: "%{count} ആളുകള്‍"
-    helper: 
+    helper:
       people_on_pod_are_aware_of: " ഈ പോഡിലെ ആളുകള്‍ക്ക് ഇതിനെകുറിച്ച് അറിവുണ്ട്"
       results_for: " %{params} ന്റെ ഫലങ്ങള്‍"
-    index: 
+    index:
       couldnt_find_them_send_invite: "കണ്ടുപിടിയ്ക്കാനാകുന്നില്ലേ? ഒരു ക്ഷണം അയക്കു!"
+      looking_for: "Looking for posts tagged %{tag_link}?"
       no_one_found: "...പക്ഷേ, ഒരാളെയും കണ്ടുപിടിച്ചില്ല."
       no_results: "താങ്കള്‍ എന്തിനെങ്കിലും വേണ്ടി തിരയേണ്ടതുണ്ട്."
       results_for: "വിവരങ്ങള്‍ക്കായി തെരയുക"
     many: "%{count} ആളുകള്‍"
-    one: "ഒരാള്‍"
+    one: ഒരാള്‍
     other: "%{count} ആളുകള്‍"
-    person: 
+    person:
       add_contact: "സമ്പര്‍ക്കം ചേര്‍ക്കുക"
       already_connected: "ഇപ്പോള്‍ തന്നെ ബന്ധിപ്പിച്ചിട്ടുണ്ട്"
       pending_request: "അപേക്ഷ ബാക്കി നില്‍കുന്നു"
       thats_you: "ഇത് താങ്കളാണ്!"
-    profile_sidebar: 
+    profile_sidebar:
       bio: "സ്വയം വിവരണം"
-      born: "ജന്മദിനം"
+      born: ജന്മദിനം
       edit_my_profile: "എന്റെ പ്രൊഫൈല്‍ തിരുത്തുക"
-      gender: "ലിംഗം"
-      in_aspects: "പരിചയത്തില്‍"
-      location: "സ്ഥലം"
+      gender: ലിംഗം
+      in_aspects: പരിചയത്തില്‍
+      location: സ്ഥലം
       remove_contact: "സമ്പര്‍ക്കം മാറ്റുക"
       remove_from: "%{name} നെ %{aspect} നിന്ന് മാറ്റട്ടേ?"
-    show: 
-      add_some: "കുറച്ച് ചേര്‍ക്കുക"
+    show:
+      closed_account: "This account has been closed."
       does_not_exist: "വ്യക്തി നിലവിലില്ല!"
-      edit: "തിരുത്തു"
-      incoming_request: "%{name} നിങ്ങളുമായി പങ്കിടാന്‍ ആഗ്രഹിക്കുന്നു"
-      mention: "സൂചിപ്പിച്ചു"
-      message: "സന്ദേശം"
       has_not_shared_with_you_yet: "%{name} has not shared any posts with you yet!"
+      ignoring: "You are ignoring all posts from %{name}."
+      incoming_request: "%{name} നിങ്ങളുമായി പങ്കിടാന്‍ ആഗ്രഹിക്കുന്നു"
+      mention: സൂചിപ്പിച്ചു
+      message: സന്ദേശം
       not_connected: "താങ്കള്‍ %{name} യുമായി പങ്കുവെയ്ക്കുന്നില്ല"
       recent_posts: "സമീപകാല കുറിപ്പുകള്‍"
       recent_public_posts: "സമീപകാല പൊതു കുറിപ്പുകള്‍"
@@ -461,56 +531,59 @@ ml:
       see_all: "എല്ലാം കാണു"
       start_sharing: "പങ്കുവച്ച് തുടങ്ങുക"
       to_accept_or_ignore: "സ്വീകരിക്കുകയോ ത്യജിക്കുകയോ ചെയ്യാന്‍."
-      you_have_no_tags: "താങ്കള്‍ക്ക് ടാഗുകളില്ല!"
-    webfinger: 
+    sub_header:
+      add_some: "add some"
+      edit: "edit"
+      you_have_no_tags: "you have no tags!"
+    two: "%{count} people"
+    webfinger:
       fail: "ക്ഷമിക്കണം, ഞങ്ങള്‍ക്ക് %{handle} കണ്ടെത്താനായില്ല.."
-    zero: "ആളുകളില്ല"
-  photos: 
-    create: 
+    zero: ആളുകളില്ല
+  photos:
+    comment_email_subject: "%{name}'s photo"
+    create:
       integrity_error: "ചിത്രം അപ്‌ലോഡ് പരാജയപ്പെട്ടു. അത് ഒരു ചിത്രം തന്നെയായിരുന്നോ?"
       runtime_error: "ചിത്രം അപ്‌ലോഡ് പരാജയപ്പെട്ടു."
       type_error: "ചിത്രം അപ്‌ലോഡ് പരാജയപ്പെട്ടു..  താങ്കള്‍ ഒരു ചിത്രം അപ്‌ലോഡ് ചെയ്യാന്‍ തിരഞ്ഞെടുത്തിരുന്നോ?"
-    destroy: 
+    destroy:
       notice: "ചിത്രം നീക്കം ചെയ്തു."
-    edit: 
-      editing: "തിരുത്തുന്നു"
-    new: 
+    edit:
+      editing: തിരുത്തുന്നു
+    new:
       back_to_list: "തിരിച്ച് പട്ടികയിലേയ്ക്ക്"
       new_photo: "പുതിയ ചിത്രം"
-      post_it: "കുറിക്കു!"
-    new_photo: 
+      post_it: കുറിക്കു!
+    new_photo:
       empty: "{file} ശൂന്യമാണ്, അതല്ലാത്ത ഫയലുകള്‍ ദയവായി വീണ്ടും തെരഞ്ഞെടുക്കുക."
       invalid_ext: "{file} ന് തെറ്റായ extension ആണ്.  {extensions} മാത്രം അനുവദിച്ചിരിക്കുന്നു."
       size_error: "{file} വളരെ വലുതാണ്, കൂടിയ ഫയല്‍ വലിപ്പം {sizeLimit} ആകുന്നു."
-    new_profile_photo: 
-      or_select_one: "അല്ലെങ്കില്‍ ഇപ്പോഴുള്ളതില്‍ നിന്ന് തിരഞ്ഞെടുക്കുക"
+    new_profile_photo:
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "പുതിയ പ്രൊഫൈല്‍ ചിത്രം ചേര്‍ക്കുക!"
-    comment_email_subject: "%{name}'s photo"
-    photo: 
+    photo:
       view_all: "%{name}യുടെ എല്ലാ ചിത്രങ്ങളും കാണുക"
-    show: 
+    show:
       collection_permalink: "ശേഖരണത്തിന്റെ സ്ഥിരംകണ്ണി"
-      show_original_post: "Show original post"
       delete_photo: "ചിത്രം നീക്കുക"
-      edit: "തിരുത്തുക"
+      edit: തിരുത്തുക
       edit_delete_photo: "ചിത്രത്തിന്റെ വിവരണം തിരുത്തുക / ചിത്രം നീക്കം ചെയ്യുക"
       make_profile_photo: "പ്രൊഫൈല്‍ ചിത്രം ഉണ്ടാക്കുക"
+      show_original_post: "Show original post"
       update_photo: "ചിത്രം പുതുക്കുക"
-    update: 
+    update:
       error: "ചിത്രം പുതുക്കാന്‍ പറ്റുന്നില്ല.."
       notice: "ചിത്രം വിജയകരമായി പുതുക്കി."
-  post_visibilites: 
-    update: 
-      post_hidden: "%{name}ന്റെ കുറിപ്പ് മറച്ചിരിക്കുന്നു."
-  posts: 
+  posts:
     show:
       destroy: "Delete"
-      permalink: "permalink"
       not_found: "Sorry, we couldn't find that post."
-  previous: "മുന്‍‌പത്തെ"
-  profile: "പ്രൊഫൈല്‍"
-  profiles: 
-    edit: 
+      permalink: "permalink"
+  previous: മുന്‍‌പത്തെ
+  privacy: "Privacy"
+  privacy_policy: "Privacy Policy"
+  profile: പ്രൊഫൈല്‍
+  profiles:
+    edit:
       allow_search: "ഡയസ്പോറയ്ക്കകത്ത് മറ്റുള്ളവര്‍ എന്നെ കണ്ടെത്താന്‍ അനുവദിക്കുക"
       edit_profile: "പ്രൊഫൈല്‍ തിരുത്തുക"
       first_name: "ആദ്യ പേര്"
@@ -526,269 +599,364 @@ ml:
       your_public_profile: "താങ്കളുടെ പൊതു പ്രൊഫൈല്‍ "
       your_tags: "Describe yourself in 5 words"
       your_tags_placeholder: "like #movies #kittens #travel #teacher #newyork"
-    update: 
+    update:
       failed: "പ്രൊഫൈല്‍ തിരുത്തുന്നത് പരാജയപ്പെട്ടിരിക്കുന്നു."
       updated: "പ്രൊഫൈല്‍ വിജയകരമായൊ തിരുത്തിയിരിക്കുന്നു."
-  registrations: 
+  public: "Public"
+  reactions:
+    few: "%{count} reactions"
+    many: "%{count} reactions"
+    one: "1 reaction"
+    other: "%{count} reactions"
+    two: "%{count} reactions"
+    zero: "0 reactions"
+  registrations:
     closed: "ഈ ഡയസ്പോറ പോഡില്‍ ചേരുന്നത് അടച്ചിരിക്കുന്നു."
-    create: 
+    create:
       success: "താങ്കള്‍ ഡയസ്പോറയില്‍ ചേര്‍ന്നിരിക്കുന്നു!"
-    edit: 
+    edit:
       cancel_my_account: "എന്റെ അക്കൌണ്ട് റദ്ദാക്കു"
       edit: "%{name} തിരുത്തു"
       leave_blank: "(മാറ്റേണ്ടെങ്കില്‍ ഒഴിച്ച് തന്നെ ഇടുക)"
       password_to_confirm: "(മാറ്റങ്ങള്‍ സ്ഥിരികരിക്കാന്‍ വേണ്ടി താങ്കളുടെ നിലവിലുള്ള രഹസ്യവാക്ക് ആവശ്യമുണ്ട്)"
-      unhappy: "സന്തോഷമായില്ല?"
-      update: "പുതുക്കു"
-    new: 
+      unhappy: സന്തോഷമായില്ല?
+      update: പുതുക്കു
+    new:
       create_my_account: "Create my account"
-      join_the_movement: "Join the movement!"
-      sign_up_today: "Sign up today"
       enter_email: "Enter an email"
       enter_password: "അടയാളവാക്ക് നല്‍കുക"
       enter_password_again: "അടയാളവാക്ക് വീണ്ടും നല്‍കുക"
       enter_username: "ഉപഭാക്തൃ നാമം തിരഞ്ഞെടുക്കുക (അക്ഷരങ്ങളും സംഖ്യകളും അണ്ടര്‍ സ്കോറും മാത്രം)"
-  requests: 
-    create: 
-      sending: "അയയ്ക്കുന്നു"
+      join_the_movement: "Join the movement!"
+      sign_up_message: "Social Networking with a ♥"
+  requests:
+    create:
+      sending: അയയ്ക്കുന്നു
       sent: " %{name}-മായി പങ്കുവയ്ക്കാന്‍ താങ്കള്‍ അപേക്ഷിച്ചിരിക്കുന്നു. അടുത്ത തവണ ഡയസ്പോറയില്‍ %{name} പ്രവേശിക്കുമ്പോള്‍ താങ്കളുടെ അഭ്യര്‍ത്ഥന കാണുന്നതാണ്."
-    destroy: 
+    destroy:
       error: "ദയവായി ഒരു പരിചയം തിരഞ്ഞെടുക്കുക!"
       ignore: "സമ്പര്‍ക്ക അഭ്യര്‍ത്ഥന അവഗണിച്ചു."
       success: "നിങ്ങള്‍ ഇപ്പോള്‍ സുഹൃത്തുക്കളാണ്."
-    helper: 
-      new_requests: 
+    helper:
+      new_requests:
         few: "%{count} പുതിയ അപേക്ഷകള്‍!"
         many: "%{count} പുതിയ അപേക്ഷകള്‍!"
         one: "ഒരു പുതിയ അപേക്ഷ!"
         other: "%{count} പുതിയ അപേക്ഷകള്‍!"
+        two: "%{count} new requests!"
         zero: "പുതിയ അപേക്ഷയൊന്നുമില്ല"
-    manage_aspect_contacts: 
+    manage_aspect_contacts:
       existing: "നിലവിലുള്ള സമ്പര്‍ക്കങ്ങള്‍"
       manage_within: "ഉള്ളിലുള്ള സമ്പര്‍ക്കങ്ങളെ നിയന്ത്രിക്കുക"
-    new_request_to_person: 
-      sent: "അയച്ചു!"
+    new_request_to_person:
+      sent: അയച്ചു!
   reshares:
+    comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
+    create:
+      failure: "There was an error resharing this post."
     reshare:
-      reshare_original: "Reshare original"
+      deleted: "Original post deleted by author."
       reshare:
-        zero: "Reshare"
-        one: "1 reshare"
         few: "%{count} reshares"
         many: "%{count} reshares"
+        one: "1 reshare"
         other: "%{count} reshares"
-      show_original: "Show original"
+        two: "%{count} reshares"
+        zero: "Reshare"
       reshare_confirmation: "Reshare %{author}'s post?"
-      deleted: "Original post deleted by author."
+      reshare_original: "Reshare original"
+      reshared_via: "reshared via"
+      show_original: "Show original"
+  search: തിരയുക
+  services:
     create:
-      failure: "There was an error resharing this post."
-    comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
-  search: "തിരയുക"
-  find_people: "Find people or #tags"
-  services: 
-    create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "തിരിച്ചറിയല്‍ വിജയകരം."
-    destroy: 
+    destroy:
       success: "തിരിച്ചറിയല്‍ വിജയകരമായി നീക്കം ചെയ്തു."
-    failure: 
+    failure:
       error: "അ സേവനവുമായി ബന്ധിപ്പിക്കുന്നതില്‍ അവിടെ ഒരു തെറ്റുണ്ട്"
-    finder: 
-      service_friends: "%{service} Friends"
+    finder:
+      fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes."
       no_friends: "No Facebook friends found."
-    index: 
+      service_friends: "%{service} Friends"
+    index:
       connect_to_facebook: "ഫേസ്ബുക്കുമായി ബന്ധിപ്പിക്കു"
-      connect_to_twitter: "ട്വിറ്ററുമായി ബന്ധിപ്പിക്കു"
       connect_to_tumblr: "Connect to Tumblr"
-      disconnect: "വിച്ഛേദിക്കു"
+      connect_to_twitter: "ട്വിറ്ററുമായി ബന്ധിപ്പിക്കു"
+      disconnect: വിച്ഛേദിക്കു
       edit_services: "സേവനങ്ങളില്‍ മാറ്റം വരുത്തുക"
-      no_services: 'You have not connected any services yet.'
       logged_in_as: "ആയി പ്രവേശിച്ചിരിക്കുന്നു"
+      no_services: "You have not connected any services yet."
       really_disconnect: "%{service} വിച്ഛേദിക്കണോ?"
-    inviter: 
+    inviter:
       click_link_to_accept_invitation: "ക്ഷണം സ്വീകരിക്കുന്നതിനായി കണ്ണിയില്‍ അമര്‍ത്തുക"
       join_me_on_diaspora: "എന്നെ ഡയസ്പോറ*യില്‍ ചേര്‍ക്കൂ*"
-    remote_friend: 
-      invite: "ക്ഷണിക്കു"
+    remote_friend:
+      invite: ക്ഷണിക്കു
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "വീണ്ടും അയയ്ക്കു"
-  settings: "ക്രമീകരണങ്ങള്‍"
-  shared: 
-    add_contact: 
+  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."
+  shared:
+    add_contact:
+      add_new_contact: "Add a new contact"
       create_request: "ഡയസ്പോറ ഐഡി വെച്ച് കണ്ട് പിടിക്കുക"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "ഒരു ഡയസ്പോറ ഉപയോക്തനാമം നല്‍കുക :"
       know_email: "ആളിന്റെ ഇമെയില്‍ വിലാസം അറിയാമോ? നിങ്ങള്‍ക്ക് ആ വ്യക്തിയെ ക്ഷണിക്കാം."
       your_diaspora_username_is: "താങ്കളുടെ ഡയസ്പോറ ഉപയോക്തൃ നാമം: %{diaspora_handle}"
-      add_new_contact: "Add a new contact"
-    contact_list: 
+    aspect_dropdown:
+      add_to_aspect: "Add contact"
+      toggle:
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        two: "In %{count} aspects"
+        zero: "Add contact"
+    contact_list:
       all_contacts: "എല്ലാ സമ്പര്‍ക്കവും"
-    footer: 
+    footer:
       logged_in_as: "%{name} ആയി പ്രവേശിച്ചിരിക്കുന്നു."
       your_aspects: "നിങ്ങളുടെ പരിചയങ്ങള്‍"
-    invitations: 
+    invitations:
       by_email: "ഇമെയില്‍ വഴി"
       dont_have_now: "താങ്കള്‍ക്ക് ക്ഷണമൊന്നും ബാക്കിയില്ല, പക്ഷേ കൂടുതല്‍ വരുന്നുണ്ട്!"
       from_facebook: "ഫേസ്ബുക്കില്‍ നിന്ന്"
       invitations_left: "%{count}ക്ഷണങ്ങള്‍ ബാക്കി"
       invite_someone: "ആരെയെങ്കിലും ക്ഷണിക്കുക"
       invite_your_friends: "നിങ്ങളുടെ കൂട്ടുകാരെ ക്ഷണിക്കു."
-      invites: "ക്ഷണങ്ങള്‍"
+      invites: ക്ഷണങ്ങള്‍
       invites_closed: "ഈ ഡയസ്പോറ പോഡിലെ ക്ഷണങ്ങള്‍ നിര്‍ത്തിവെച്ചിരിക്കുന്നു"
-    notification: 
+    notification:
       new: "പുതിയ %{type} %{from} ല്‍ നിന്ന്"
-    public_explain: 
+    public_explain:
+      control_your_audience: "Control your Audience"
       logged_in: "%{service} ലേയ്ക്ക് പ്രവേശിച്ചിരിക്കുന്നു."
       manage: "ബന്ധിപ്പിച്ചിരിക്കുന്ന സേവനങ്ങളെ കൈകാര്യം ചെയ്യുക"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "പൊതു സന്ദേശങ്ങള്‍ ഡയസ്പോറയ്ക്ക് വെളിയിലുള്ളവര്‍ക്കും കാണാനാകും."
+      share: "Share"
       title: "നിങ്ങള്‍ ഒരു പൊതു സന്ദേശം കുറിക്കുവാന്‍ പോകുന്നു!"
-    publisher: 
-      upload_photos: "Upload photos"
-      all: "എല്ലാം"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
+    publisher:
+      all: എല്ലാം
       all_contacts: "എല്ലാ സമ്പര്‍ക്കവും"
-      click_to_share_with: "പങ്കിടാന്‍ ക്ളിക്ക് ചെയ്യുക: "
       discard_post: "Discard post"
-      make_public: "പൊതുവാക്കുക"
+      make_public: പൊതുവാക്കുക
+      new_user_prefill:
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}. "
+        invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "%{aspect}ല്‍ ഒരു സന്ദേശം പ്രസിദ്ധീകരിക്കുക"
-      posting: "കുറിക്കുന്നു..."
+      posting: കുറിക്കുന്നു...
       publishing_to: "പ്രസിദ്ധീകരിക്കുന്നു: "
-      share: "പങ്കുവെയ്ക്കുക"
-      share_with: "പങ്കുവെയ്ക്കുക"
+      share: പങ്കുവെയ്ക്കുക
+      share_with: പങ്കുവെയ്ക്കുക
+      upload_photos: "Upload photos"
       whats_on_your_mind: "എന്താണ് നിങ്ങളുടെ മനസ്സില്‍?"
-    reshare: 
+    reshare:
       reshare: "വീണ്ടും പങ്കിടുക"
-    stream_element: 
-      viewable_to_anyone: "This post is viewable to anyone on the web"
-      via: "via %{link}"
-      dislike: "ഇഷ്ടപ്പെടുന്നില്ല"
-      like: "ഇഷ്ടപ്പെടുന്നു"
+    stream_element:
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
+      dislike: ഇഷ്ടപ്പെടുന്നില്ല
+      hide_and_mute: "Hide and mute post"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
+      like: ഇഷ്ടപ്പെടുന്നു
+      nsfw: "This post has been flagged as NSFW by its author. %{link}"
       shared_with: "Shared with: %{aspect_names}"
-  status_messages: 
-    create: 
+      show: "show"
+      unlike: "Unlike"
+      via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
+  status_messages:
+    create:
       success: "വിജയകരമായി സൂചിപ്പിച്ചു: %{names}"
-    destroy: 
+    destroy:
       failure: "കുറിപ്പ് നീക്കം ചെയ്യാന്‍ സാധിക്കുന്നില്ല"
+    helper:
+      no_message_to_display: "സന്ദേശമൊന്നും കാണിക്കാനില്ല."
+    new:
+      mentioning: "സൂചിപ്പിക്കുന്നു: %{person}"
     too_long:
-      zero: "please make your status messages less than %{count} characters"
-      one: "please make your status messages less than %{count} character"
       few: "please make your status messages less than %{count} characters"
       many: "please make your status messages less than %{count} characters"
+      one: "please make your status messages less than %{count} character"
       other: "please make your status messages less than %{count} characters"
-    helper: 
-      no_message_to_display: "സന്ദേശമൊന്നും കാണിക്കാനില്ല."
-    new: 
-      mentioning: "സൂചിപ്പിക്കുന്നു: %{person}"
-  stream_helper: 
-    show_more_comments: "Show %{number} more comments"
+      two: "please make your status messages less than %{count} characters"
+      zero: "please make your status messages less than %{count} characters"
+  stream_helper:
     hide_comments: "Hide all comments"
-  tags: 
-    show: 
-      nobody_talking: "നിലവില്‍ ആരും %{tag}-നെ കുറിച്ച് സംസാരിക്കുന്നില്ല."
-      people_tagged_with: "%{tag} ചേര്‍ത്തിട്ടുള്ള ആളുകള്‍"
-      posts_tagged_with: "#%{tag} ചേര്‍ത്തിട്ടുള്ള കുറിപ്പുകള്‍"
-      follow: "Follow #%{tag}"
-      following: "Following #%{tag}"
-      stop_following: "Stop Following #%{tag}"
-
+    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"
+  streams:
+    aspects:
+      title: "Your Aspects"
+    aspects_stream: "Aspects"
+    comment_stream:
+      contacts_title: "People whose posts you commented on"
+      title: "Commented Posts"
+    community_spotlight_stream: "Community Spotlight"
+    followed_tag:
+      add_a_tag: "Add a tag"
+      contacts_title: "People who dig these tags"
+      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: "@Mentions"
+    multi:
+      contacts_title: "People in your Stream"
+      title: "Stream"
+    public:
+      contacts_title: "Recent Posters"
+      title: "Public Activity"
+    tags:
+      contacts_title: "People who dig this tag"
+      tag_prefill_text: "The thing about %{tag_name} is... "
+      title: "Posts tagged: %{tags}"
   tag_followings:
     create:
-      success: "Successfully following: #%{name}"
       failure: "Failed to follow: #%{name}"
+      none: "You cannot follow a blank tag!"
+      success: "Successfully following: #%{name}"
     destroy:
-      success: "Successfully stopped following: #%{name}"
       failure: "Failed to stop following: #%{name}"
-
+      success: "Successfully stopped following: #%{name}"
+  tags:
+    show:
+      follow: "Follow #%{tag}"
+      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"
-      what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
+      connecting_is_simple: "Connecting your Diaspora account is simple!  Just enter your Diaspora ID (<b>%{diaspora_id}</b>) from your cubbies <a href='%{href_link}'>settings page</a> and hit connect."
+      daniels_account: "Daniel's Diaspora account"
       love_to_try: "We'd love for you to try it out."
-      sign_up_today: "Sign up today!"
+      making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
+      sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
-      daniels_account: "Daniel's Diaspora account"
-      making_the_connection: "Making the Connection"
-      connecting_is_simple: "Connecting your Diaspora account is simple!  Just enter your Diaspora ID (<b>%{diaspora_id}</b>) from your cubbies <a href='%{href_link}'>settings page</a> and hit connect."
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       via: "(via %{link})"
-
-  authorizations:
-    index:
-      revoke_access: "Revoke Access"
-  public: "Public"
-  limited: "Limited"
-  undo: "പൂര്‍വരൂപത്തിലാക്കണോ?"
-  username: "ഉപയോക്തൃനാമം"
-  users: 
-    destroy: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
-    edit: 
+      what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
+  undo: പൂര്‍വരൂപത്തിലാക്കണോ?
+  username: ഉപയോക്തൃനാമം
+  users:
+    confirm_email:
+      email_confirmed: "Email %{email} activated"
+      email_not_confirmed: "Email could not be activated. Wrong link?"
+    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."
+    edit:
       also_commented: "...താങ്കളുടെ സമ്പര്‍ക്കത്തിന്റെ പോസ്റ്റില്‍ ആരെങ്കിലും അഭിപ്രായമിടുമ്പോള്‍?"
-      change: "മാറ്റുക"
+      auto_follow_aspect: "Aspect for automatically followed users:"
+      auto_follow_back: "Automatically follow back if someone follows you"
+      change: മാറ്റുക
+      change_email: "Change email"
       change_language: "ഭാഷ മാറ്റു"
       change_password: "അടയാളവാക്ക് മാറ്റു"
-      change_email: "Change email"
-      close_account: "അക്കൌണ്ട് അവസാനിപ്പിക്കു"
+      close_account:
+        dont_go: "Hey, please don't go!"
+        if_you_want_this: "If you really want this, type in your password below and click 'Close Account'"
+        lock_username: "This will lock your username if you decided to sign back up."
+        locked_out: "You will get signed out and locked out of your account."
+        make_diaspora_better: "We want you to help us make Diaspora better, so you should help us out instead of leaving. If you do want to leave, we want you to know what happens next."
+        mr_wiggles: "Mr Wiggles will be sad to see you go"
+        no_turning_back: "Currently, there is no turning back."
+        what_we_delete: "We delete all of your posts, profile data, as soon as humanly possible. Your comments will hang around, but be associated with your Diaspora Handle."
+      close_account_text: "Close Account"
       comment_on_post: "...താങ്കളുടെ പോസ്റ്റില്‍ ആരെങ്കിലും അഭിപ്രായമിടുമ്പോള്‍?"
       current_password: "ഇപ്പോഴത്തെ അടയാളവാക്ക്"
-      new_password: "New password"
       download_photos: "എന്റെ ചിത്രങ്ങള്‍ ഇറക്കു"
       download_xml: "എന്റെ എക്സ് എം എല്‍ ഇറക്കു"
       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: "വിവരങ്ങള്‍ കയറ്റുമതി ചെയ്യു"
+      following: "Following Settings"
+      getting_started: "New User Prefrences"
+      liked: "...someone likes your post?"
       mentioned: "...ഒരു കുറിപ്പില്‍ ആരെങ്കിലും സൂചിപ്പിക്കുമ്പോള്‍?"
       new_password: "പുതിയ അടയാളവാക്ക്"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...ഒരു സ്വകാര്യ സന്ദേശം കിട്ടുമ്പോള്‍?"
       receive_email_notifications: "ഇമെയില്‍ അറിയിപ്പുകള്‍ വേണോ?"
+      reshared: "...someone reshares your post?"
+      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_handle: "താങ്കളുടെ ഡയസ്പോറ ഐഡി"
-    getting_started: 
-      welcome: "സ്വാഗതം!"
-      welcome_with_name: "Welcome, %{name}!"
-
-      finished: "Finished"
-
-      fill_out_your_profile: "Fill out your profile"
-      profile_description: "Make it easier for people to find you by filling out your profile information."
-      profile_fields:
-        name: "Name"
-        birthday: "Birthday"
-        bio: "Bio"
-        tags: "Tags"
-        photo: "Photo"
-        gender: "Gender"
-        location: "Location"
-
-      connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      aspects: 'aspects'
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      featured_users: "Featured users"
-
-      follow_your_interests: "Follow your interests"
-      connect_to: "Connect to"
-
-      find_friends_from_facebook: "find friends from Facebook"
-      featured_tags: "Featured tags"
-      find_friends: "Find friends"
-      see_all_featured_users: "See all featured users"
-
+    getting_started:
+      awesome_take_me_to_diaspora: "Awesome! Take me to 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."
-    public: 
+      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-posting."
+      who_are_you: "Who are you?"
+    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*"
+      simply_visit: "Simply visit"
+      works_on_modern: "Works on all modern smartphones"
+    privacy_settings:
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
+    public:
       does_not_exist: "%{username} ഉപയോക്താവ് നിലവിലില്ല!"
-    confirm_email:
-      email_confirmed: "Email %{email} activated"
-      email_not_confirmed: "Email could not be activated. Wrong link?"
-    update: 
+    update:
       email_notifications_changed: "ഇമെയില്‍ അറിയിപ്പുകള്‍ മാറ്റി"
-      unconfirmed_email_changed: "Email changed. Needs activation."
-      unconfirmed_email_not_changed: "Email change failed"
+      follow_settings_changed: "Follow settings changed"
+      follow_settings_not_changed: "Follow settings change failed."
       language_changed: "ഭാഷ മാറ്റി"
       language_not_changed: "ഭാഷ മാറ്റാനാകുന്നില്ല"
       password_changed: "Password changed.  You can now log in with your new password."
       password_not_changed: "അടയാളവാക്ക് മാറ്റാനാകുന്നില്ല"
-  webfinger: 
+      settings_not_updated: "Settings update failed"
+      settings_updated: "Settings updated"
+      unconfirmed_email_changed: "Email changed. Needs activation."
+      unconfirmed_email_not_changed: "Email change failed"
+  webfinger:
     fetch_failed: "%{profile_url} -ന്റെ വെബ്ഫിംഗര്‍ പ്രൊഫൈല്‍ എടുക്കുന്നതില്‍ പരാജയം"
     hcard_fetch_failed: "%{account} -ന്റെ hcard എടുക്കുന്നതിന് പ്രശ്നം ഉണ്ട്"
     no_person_constructed: "ഒരു വ്യക്തിയ്ക്കും ഈ hcard ല്‍ നിന്ന്  നിര്‍മ്മിക്കാന്‍ കഴിയില്ല."
     not_enabled: "%{account}-ന്റെ ഹോസ്റ്റില്‍ വെബ്ഫിംഗര്‍ സജ്ജമാക്കിയിട്ടില്ലെന്ന് തോന്നുന്നു."
     xrd_fetch_failed: "അവിടെ %{account} അക്കൌണ്ടില്‍ നിന്നും  xrd കിട്ടുന്നതിന്  ഒരു തെറ്റുണ്ട്."
+  welcome: Welcome!
+  will_paginate:
+    next_label: "next &raquo;"
+    previous_label: "&laquo; previous"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 219299925..366981a39 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -767,10 +767,8 @@ nl:
       title: "Your Mentions"
     multi:
       contacts_title: "Gebuikers in je Stream"
-    posted: geplaatst
     public:
       title: "Publieke activiteit"
-    recently: "recentelijk:"
     tags:
       contacts_title: "People who dig these tags"
       title: "Posts getagged: %{tags}"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 7986bf1a3..9638bb610 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -805,7 +805,6 @@ pl:
     comment_stream:
       contacts_title: "Osoby których wpisy zostały skomentowane przez Ciebie"
       title: "Skomentowane wpisy"
-    commented_on: komentowane
     community_spotlight_stream: "W centrum uwagi społeczności"
     followed_tag:
       add_a_tag: "Dodaj znacznik"
@@ -823,11 +822,9 @@ pl:
     multi:
       contacts_title: "Osoby w Twoim Strumieniu"
       title: Strumień
-    posted: opublikowane
     public:
       contacts_title: "Ostatnio dodawali"
       title: "Działalność publiczna"
-    recently: "ostatnio:"
     tags:
       contacts_title: "Osoby, które wykopały te tagi"
       tag_prefill_text: "Rzecz o %{tag_link} jest..."
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 8a9309ae0..2dcb0fe3a 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -801,7 +801,6 @@ pt-BR:
     comment_stream:
       contacts_title: "Pessoas cujos posts você comentou"
       title: "Posts comentados"
-    commented_on: "comentou sobre"
     community_spotlight_stream: "Foco de Comunidade"
     followed_tag:
       add_a_tag: "Adicionar uma tag"
@@ -819,11 +818,9 @@ pt-BR:
     multi:
       contacts_title: "Pessoas em seus Fluxos"
       title: Fluxos
-    posted: postado
     public:
       contacts_title: "Postagens Recentes"
       title: "Atividade Pública"
-    recently: "recentemente:"
     tags:
       contacts_title: "Pessoas que seguem essa tag"
       tag_prefill_text: "As coisas sobre %{tag_name} é... "
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index e865312c1..90c88819e 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -798,7 +798,6 @@ pt-PT:
     comment_stream:
       contacts_title: "Pessoas cujos os posts você comentou"
       title: "Posts Comentados"
-    commented_on: "comentou no"
     community_spotlight_stream: "Destaque da Comunidade"
     followed_tag:
       add_a_tag: "Adicionar uma etiqueta"
@@ -815,11 +814,9 @@ pt-PT:
     multi:
       contacts_title: "Pessoas no seu Fluxo"
       title: Fluxo
-    posted: publicado
     public:
       contacts_title: "Cartazes Recentes"
       title: "Actividade Geral"
-    recently: "recentemente:"
     tags:
       contacts_title: "Pessoas que gostam desta etiqueta"
       tag_prefill_text: "O que acontece com %{tag_name} é... "
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 6d6ce93b2..09d47d060 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -803,7 +803,6 @@ ru:
     comment_stream:
       contacts_title: "Люди, чьи записи вы прокомментировали"
       title: Прокомментированные
-    commented_on: обсуждаемые
     community_spotlight_stream: "В центре внимания"
     followed_tag:
       add_a_tag: "Добавить метку"
@@ -821,11 +820,9 @@ ru:
     multi:
       contacts_title: "В вашем потоке"
       title: Поток
-    posted: опубликованные
     public:
       contacts_title: "Последние публиковавшие"
       title: "Публичная активность"
-    recently: "последние:"
     tags:
       contacts_title: "Люди, которым нравятся эта метка"
       tag_prefill_text: "По поводу метки %{tag_name}..."
@@ -872,6 +869,7 @@ ru:
       wrong_password: "Введенный вами пароль не совпадает с вашим текущим паролем."
     edit:
       also_commented: "... кто-то комментировал сообщения ваших контактов?"
+      auto_follow_back: "Автоматически подписываться в ответ, если кто-то начинает следить за вашими записями"
       change: Изменить
       change_email: "Изменить адрес"
       change_language: "Изменить язык"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index d15fbb6cb..2543bb927 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -806,7 +806,6 @@ sk:
     comment_stream:
       contacts_title: "Ľudia, ktorých príspevky ste okomentovali"
       title: "Okomentované príspevky"
-    commented_on: okomentované
     community_spotlight_stream: "V centre pozornosti komunity"
     followed_tag:
       add_a_tag: "Pridať značku"
@@ -824,11 +823,9 @@ sk:
     multi:
       contacts_title: "Ľudia na vašej nástenke"
       title: Nástenka
-    posted: odoslané
     public:
       contacts_title: "Autori najnovších príspevkov"
       title: "Verejná aktivita"
-    recently: "nedávno:"
     tags:
       contacts_title: "Ľudia, ktorí hľadajú tieto značky"
       tag_prefill_text: "%{tag_name} je... "
@@ -876,6 +873,8 @@ sk:
       wrong_password: "Zadané heslo sa nezhoduje  s vaším súčasným heslom."
     edit:
       also_commented: "...niekto okomentuje aj príspevok človeka vo vašich kontaktoch?"
+      auto_follow_aspect: "Kategória používateľov, ktorých sledujete automaticky:"
+      auto_follow_back: "Automaticky sledovať, ak niekto sleduje vás"
       change: Zmeniť
       change_email: "Zmeniť e-mail"
       change_language: "Zmeniť jazyk"
@@ -897,6 +896,7 @@ sk:
       edit_account: "Upraviť účet"
       email_awaiting_confirmation: "Poslali sme vám odkaz na aktiváciu %{unconfirmed_email}. Kým nekliknete na tento odkaz  a neaktivujete si novú adresu, budeme stále používať vašu pôvodnú adresu %{email}."
       export_data: "Exportovať dáta"
+      following: "Nastavenia sledovania"
       getting_started: "Nové nastavenia používateľa"
       liked: "...sa niekomu páči váš príspevok?"
       mentioned: "...vás spomenuli v príspevku?"
@@ -937,6 +937,8 @@ sk:
       does_not_exist: "Používateľ %{username} neexistuje!"
     update:
       email_notifications_changed: "Nastavenia oznamov e-mailom sa zmenili"
+      follow_settings_changed: "Nastavenia sledovania sa zmenili"
+      follow_settings_not_changed: "Nastavenia sledovania sa nepodarilo zmeniť."
       language_changed: "Jazyk sa zmenil"
       language_not_changed: "Nepodarilo sa zmeniť jazyk"
       password_changed: "Heslo sa zmenilo. Teraz sa môžete prihlásiť so svojím novým heslom."
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 8406539eb..85c62719f 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -794,7 +794,6 @@ sl:
     comment_stream:
       contacts_title: "Ljudje, katerim ste komentirali objave"
       title: "Komentirane objave"
-    commented_on: "komentiral na"
     community_spotlight_stream: "Vsebina skupnosti"
     followed_tag:
       add_a_tag: "Dodaj oznako"
@@ -811,11 +810,9 @@ sl:
     multi:
       contacts_title: "Ljudje v vašem toku"
       title: Vir
-    posted: objavljeno
     public:
       contacts_title: "Zadnji objavljajoči"
       title: "Javna aktivnost"
-    recently: "v zadnjem času:"
     tags:
       contacts_title: "Ljudje, ki so izbrskali to oznako"
       tag_prefill_text: "Zadeva o %{tag_name} je... "
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 2af3c6699..91edb23e9 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -18,7 +18,7 @@ sv:
         contact:
           attributes:
             person_id:
-              taken: "måste vara unik i den här användarens kontakter."
+              taken: "måste vara unik bland den här användarens kontakter."
         person:
           attributes:
             diaspora_handle:
@@ -34,14 +34,14 @@ sv:
         user:
           attributes:
             email:
-              taken: "är redan tagen."
+              taken: "används redan."
             person:
               invalid: "är ogiltig."
             username:
               invalid: "är felaktig. Vi tillåter endast bokstäver, siffror och understreck."
-              taken: "är redan taget."
+              taken: "används redan."
   ago: "%{time} sedan"
-  all_aspects: "Alla Aspekter"
+  all_aspects: "Alla aspekter"
   application:
     helper:
       unknown_person: "okänd person"
@@ -51,9 +51,9 @@ sv:
   are_you_sure_delete_account: "Är du säker på att du vill stänga ditt konto? Detta kan inte ångras!"
   aspect_memberships:
     destroy:
-      failure: "Misslyckades med att ta bort personen från aspekten"
+      failure: "Kunde inte ta bort personen från aspekten"
       no_membership: "Kunde inte hitta den valda personen i aspekten"
-      success: "Lyckades att ta bort personen från aspekten"
+      success: "Personen har nu tagits bort från aspekten"
   aspects:
     add_to_aspect:
       failure: "Personen kunde inte läggas till på aspekten."
@@ -67,18 +67,19 @@ sv:
       select_all: "Markera alla"
     aspect_stream:
       stay_updated: "Håll dig uppdaterad"
-      stay_updated_explanation: "Din huvudström innefattar alla dina kontakter, taggar du följer och inlägg från några kreativa medlemmar i gemenskapen."
-    contacts_not_visible: "Kontakterna på den här aspekten kommer inte kunna se varandra."
-    contacts_visible: "Kontakterna på den här aspekten kommer kunna se varandra."
+      stay_updated_explanation: "Din huvudström innefattar alla dina kontakter, de taggar du följer och inlägg från några kreativa medlemmar i gemenskapen."
+    contacts_not_visible: "Kontakterna i den här aspekten kommer inte kunna se varandra."
+    contacts_visible: "Kontakterna i den här aspekten kommer kunna se varandra."
     create:
       failure: "Aspekten kunde inte skapas."
       success: "Din nya aspekt %{name} har skapats"
     destroy:
-      failure: "%{name} är inte tom och kunde då inte tas bort"
-      success: "%{name} är nu borttagen."
+      failure: "%{name} är inte tom och kan därför inte tas bort"
+      success: "%{name} har nu tagits bort."
     edit:
       add_existing: "Lägg till en befintlig kontakt"
-      aspect_list_is_visible: "aspektlistan är synlig för andra i aspekten"
+      aspect_list_is_not_visible: "aspektlistan visas inte för andra i aspekten"
+      aspect_list_is_visible: "aspektlistan visas för andra i aspekten"
       confirm_remove_aspect: "Är du säker på att du vill ta bort den här aspekten?"
       done: Färdigt
       make_aspect_list_visible: "ska kontakterna i denna aspekt vara synliga för varandra? "
@@ -93,7 +94,7 @@ sv:
       remove: "ta bort"
     index:
       cubbies:
-        explanation: "Cubbi.es är den första Diaspora applikationen under utveckling."
+        explanation: "Cubbi.es är den första Diasporaapplikationen under utveckling."
         heading: "Anslut till Cubbi.es"
         learn_more: "Lär dig mer"
       diaspora_id:
@@ -101,21 +102,21 @@ sv:
         content_2: "Med hjälp av det kan alla hitta dig på Diaspora."
         heading: Diaspora-ID
       donate: Donera
-      handle_explanation: "Det här är ditt Diaspora ID. Det är det här du ska ge till dina vänner om du vill att de ska lägga till dig på Diaspora."
+      handle_explanation: "Det här är ditt Diaspora-ID. Det är det här du ska ge till dina vänner om du vill att de ska lägga till dig på Diaspora."
       help:
         do_you: "Har du:"
         email_feedback: "%{link} din feedback, om du föredrar det"
         feature_suggestion: "... ett %{link} förslag?"
         find_a_bug: "... hittat en %{link}?"
         have_a_question: "... en %{link}?"
-        here_to_help: "Diaspora communityn finns här!"
+        here_to_help: "Diaspora-communityn finns här!"
         need_help: "Behöver du hjälp?"
         satisfaction: "%{link}: Support ifrån communityn"
-        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Gemenskapens handledning, guider och nyheter"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Handledning, guider och nyheter från gemenskapen"
       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!"
       new_here:
-        follow: "Följ %{link} och välkomna nya användare av Diaspora*!"
+        follow: "Följ %{link} och välkomna nya användare till Diaspora*!"
         learn_more: "Läs mer"
         title: "Välkomna nya användare"
       no_contacts: "Inga kontakter"
@@ -153,14 +154,14 @@ sv:
     selected_contacts:
       manage_your_aspects: "Hantera dina aspekter."
       no_contacts: "Du har ännu inte några kontakter här."
-      view_all_community_spotlight: "Se alla gemenskapens rampljus"
+      view_all_community_spotlight: "Se allt i gemenskapens rampljus"
       view_all_contacts: "Se alla kontakter"
     show:
       edit_aspect: "ändra aspekt"
     two: "%{count} aspekter"
     update:
-      failure: "Din aspekt, %{name}, hade ett för långt namn för att kunna sparas."
-      success: "Din aspekt %{name} är nu ändrad."
+      failure: "Det namn du valde för din aspekt, %{name}, var för långt för att kunna sparas."
+      success: "Din aspekt %{name} har nu ändrats."
     zero: "inga aspekter"
   authorizations:
     index:
@@ -188,11 +189,11 @@ sv:
       commenting: Kommenterar...
     one: "1 kommentar"
     other: "%{count} kommentarer"
-    two: "Två kommentarer"
+    two: "%{count} kommentarer"
     zero: "inga kommentarer"
   contacts:
     create:
-      failure: "Misslyckades med att skapa kontakt"
+      failure: "Kunde inte skapa kontakt"
     few: "%{count} kontakter"
     index:
       add_a_new_aspect: "Lägg till en ny aspekt"
@@ -213,28 +214,28 @@ sv:
     sharing:
       people_sharing: "Personer delar med dig:"
     spotlight:
-      community_spotlight: "Gemenskapens Rampljus"
+      community_spotlight: "Gemenskapens lampljus"
     two: "%{count} kontakter"
     zero: kontakter
   conversations:
     create:
       fail: "Ogiltigt meddelande"
-      sent: "Meddelande skickat"
+      sent: "Meddelandet har skickats"
     destroy:
-      success: "Konversation borttagen"
+      success: "Konversationen har tagits bort nu"
     helper:
       new_messages:
         few: "%{count} nya meddelanden"
         many: "%{count} nya meddelanden"
         one: "1 nytt meddelande"
         other: "%{count} nya meddelanden"
-        two: "Två nya meddelanden"
+        two: "%{count} nya meddelanden"
         zero: "Inga nya meddelanden"
     index:
       create_a_new_message: "skapa ett nytt meddelande"
       inbox: Inlåda
-      message_inbox: "Meddelande Inkorg"
-      new_message: "Nytt Meddelande"
+      message_inbox: Meddelandeinkorg
+      new_message: "Nytt meddelande"
       no_conversation_selected: "ingen konversation vald"
       no_messages: "inga meddelanden"
     new:
@@ -262,8 +263,8 @@ sv:
     show:
       already_account: "har du redan ett konto?"
       choice: Valfrihet
-      choice_explanation: "Diaspora låter dig dela in dina kontakter i grupper som kallas Sidor. Det unika med sidor är att dina foton, meddelanden och skämt endast kan ses av de personer som du valt ska se meddelandet."
-      learn_about_host: "Lär dig hur du sätter upp en egen Diaspora server."
+      choice_explanation: "Diaspora låter dig dela in dina kontakter i grupper som kallas aspekter. Aspekter, som är unika för Diaspora, förhindrar att dina foton, meddelanden och skämt kan ses av någon annan än de personer som du valt."
+      learn_about_host: "Lär dig hur du sätter upp en egen Diasporaserver."
       login_here: "logga in här"
       ownership: Ägandeskap
       ownership_explanation: "Du äger dina bilder, och du ska inte behöva frångå det när vill dela med dig av dem. Du behåller äganderätten till allt du delar med dig av på Diaspora, vilket ger dig full kontroll över hur det distribueras."
@@ -273,15 +274,15 @@ sv:
       tagline_first_half: "Dela vad du vill,"
       tagline_second_half: "med vem du vill."
   invitations:
-    a_facebook_user: "En Facebook användare"
+    a_facebook_user: "En Facebookanvändare"
     check_token:
-      not_found: "Inbjudan inte funnen"
+      not_found: "Inbjudan kan inte hittas"
     create:
-      already_contacts: "Du är redan ansluten med denna personen"
-      already_sent: "Du har redan bjudit in denna personen."
+      already_contacts: "Du är redan i kontakt med denna person"
+      already_sent: "Du har redan bjudit in denna person."
       no_more: "Du har inga fler inbjudningar."
       own_address: "Du kan inte skicka en inbjudan till din egen adress."
-      rejected: "Det var problem med följande e-postadresser: "
+      rejected: "Det är problem med följande e-postadresser: "
       sent: "Inbjudningar har skickats till:"
     edit:
       accept_your_invitation: "Accepterat din inbjudan"
@@ -289,8 +290,8 @@ sv:
     new:
       already_invited: "Följande har inte accepterat din inbjudan:"
       aspect: Aspekt
-      comma_seperated_plz: "Du kan ange flera e-postadresser separerade av kommatecken."
-      if_they_accept_info: "om de accepterar, kommer de bli med på den sida du har bjudit in dem till."
+      comma_seperated_plz: "Du kan ange flera e-postadresser åtskiljda av kommatecken."
+      if_they_accept_info: "om de accepterar, kommer de läggas till i den aspekt du angav vid inbjudan."
       invite_someone_to_join: "Bjud in en vän till Diaspora!"
       language: Språk
       personal_message: "Personligt meddelande"
@@ -300,7 +301,7 @@ sv:
       to: Till
   layouts:
     application:
-      public_feed: "Offentligt Diaspora flöde för %{name}"
+      public_feed: "Offentligt Diasporaflöde för %{name}"
       toggle: "byt till mobilanpassad "
       whats_new: "några nyheter?"
       your_aspects: "dina aspekter"
@@ -339,7 +340,7 @@ sv:
   limited: Begränsad
   more: Mer
   next: nästa
-  no_results: "Inga Resultat Funna"
+  no_results: "Inga sökresultat"
   notifications:
     also_commented:
       few: "%{actors} personer har också kommenterat %{post_author}s %{post_link}."
@@ -408,7 +409,7 @@ sv:
       one: "En person har nämnt dig i ett raderat inlägg."
       other: "%{actors} har nämnt dig i ett raderat inlägg."
       two: "Två personer har nämnt dig i ett raderat inlägg."
-      zero: "Ingen inlägg där du är nämnd är raderat."
+      zero: "Ingen inlägg där du är nämnd har raderats."
     post: inlägg
     private_message:
       few: "%{actors} har skickat dig ett meddelande."
@@ -458,7 +459,7 @@ sv:
       reshared: "%{name} sprider ditt inlägg vidare."
       view_post: "Se inlägg >"
     single_admin:
-      admin: "Din Diaspora administratör"
+      admin: "Din Diasporaadministratör"
       subject: "Ett meddelande gällande ditt Diaspora-konto:"
     started_sharing:
       sharing: "har börjat dela med dig!"
@@ -474,7 +475,7 @@ sv:
       add_contact_from_tag: "lägg till kontakt från tagg"
     aspect_list:
       edit_membership: "redigera medlemskap för aspekt"
-    few: "%{count} människor"
+    few: "%{count} personer"
     helper:
       people_on_pod_are_aware_of: " personer på denna pod är medvetna om att"
       results_for: " resultat för %{params}"
@@ -484,7 +485,7 @@ sv:
       no_one_found: "...och ingen hittades."
       no_results: "Du måste söka efter något."
       results_for: "Sökresultat för"
-    many: "%{count} människor"
+    many: "%{count} personer"
     one: "1 person"
     other: "%{count} personer"
     person:
@@ -519,12 +520,12 @@ sv:
       add_some: "lägg till"
       edit: redigera
       you_have_no_tags: "du har inga taggar!"
-    two: "Två personer"
+    two: "%{count} personer"
     webfinger:
       fail: "Förlåt, vi kunde inte hitta %{handle}."
     zero: "0 personer"
   photos:
-    comment_email_subject: "%{name} foto"
+    comment_email_subject: "Ett foto av %{name}"
     create:
       integrity_error: "Fotouppladdning misslyckades. Är du säker på att det var en bild?"
       runtime_error: "Fotouppladdning misslyckades. Har du på dig ditt säkerhetsbälte?"
@@ -584,8 +585,8 @@ sv:
       your_tags: "Beskriv dig själv med fem ord"
       your_tags_placeholder: "gillar #diaspora #stryka #katter #musik"
     update:
-      failed: "Misslyckades att uppdatera profil"
-      updated: "Profilen uppdaterades"
+      failed: "Kunde inte uppdatera profilen"
+      updated: "Profilen har uppdaterats"
   public: Publik
   reactions:
     few: "%{count} reaktioner"
@@ -595,7 +596,7 @@ sv:
     two: "Två reaktioner"
     zero: "Ingen reaktion"
   registrations:
-    closed: "Registreringsformuläret är stäng på den här poden."
+    closed: "Registreringsformuläret är avstängt på den här Diasporaservern."
     create:
       success: "Du har nu gått med i Diaspora!"
     edit:
@@ -611,11 +612,11 @@ sv:
       enter_password: "Skriv in ett lösenord"
       enter_password_again: "Skriv in samma lösenord som tidigare"
       enter_username: "Välj ett användarnamn (endast bokstäver, nummer eller understreck)"
-      sign_up_message: "Social Nätverkning med ett ♥"
+      sign_up_message: "Socialt nätverkande med ♥"
   requests:
     create:
       sending: Skickar
-      sent: "Du har bett att dela med %{name}.  Dom kommer att se det nästa gång dom loggar in på Diaspora."
+      sent: "Du har begärt att dela med %{name}.  De kommer att få veta det nästa gång som de loggar in på Diaspora."
     destroy:
       error: "Var god välj en sida!"
       ignore: "Ignorerade kontaktförfrågan."
@@ -626,7 +627,7 @@ sv:
         many: "%{count} nya förfrågningar!"
         one: "ny förfrågan!"
         other: "%{count} nya förfrågningar!"
-        two: "Två nya förfrågningar!"
+        two: "%{count} nya förfrågningar!"
         zero: "inga nya förfrågningar"
     manage_aspect_contacts:
       existing: "Befintliga kontakter"
@@ -634,7 +635,7 @@ sv:
     new_request_to_person:
       sent: skickat!
   reshares:
-    comment_email_subject: "%{resharer}s vidarespridning av %{author}s inlägg."
+    comment_email_subject: "Den vidarespridning som %{resharer} gjort av %{author}s inlägg."
     create:
       failure: "Det blev fel när detta inlägg skulle spridas vidare."
     reshare:
@@ -654,8 +655,8 @@ sv:
   services:
     create:
       already_authorized: "En användare med diaspora-id %{diaspora_id} har redan auktoriserat det %{service_name}-kontot."
-      failure: "Autentisering misslyckades."
-      success: "Autentiering lyckades."
+      failure: "Kunde inte autentisera."
+      success: "Autentisering lyckades."
     destroy:
       success: "Du har nu kopplat bort tjänsten."
     failure:
@@ -687,9 +688,9 @@ sv:
   shared:
     add_contact:
       add_new_contact: "Lägg till en ny kontakt"
-      create_request: "Sök på Diaspora ID"
+      create_request: "Sök på Diaspora-ID"
       enter_a_diaspora_username: "Ange ett Diaspora-användarnamn:"
-      know_email: "Vet du deras e-post adress? Du borde bjuda in dem"
+      know_email: "Kan du deras e-postadress? Du borde bjuda in dem"
       your_diaspora_username_is: "Ditt Diaspora-användarnamn är: %{diaspora_handle}"
     aspect_dropdown:
       add_to_aspect: "Lägg till kontakt"
@@ -713,18 +714,18 @@ sv:
       invite_someone: "Bjud in en kontakt"
       invite_your_friends: "Bjud in dina vänner"
       invites: Inbjudningar
-      invites_closed: "Inbjudningar är för närvarande stängd på denna Diasporaserver"
+      invites_closed: "För närvarande är inbjudningar avstängda på denna Diasporaserver"
     notification:
       new: "Ny %{type} från %{from}"
     public_explain:
-      control_your_audience: "Bestäm din Publik"
+      control_your_audience: "Ha kontrollen över din publik"
       logged_in: "inloggad på %{service}"
       manage: "hantera anslutna tjänster"
       new_user_welcome_message: "Använd #hashtaggar för att klassificera dina inlägg och hitta folk som delar dina intressen. Ropa ut till häftiga personer med @Mentions"
       outside: "Publika meddelanden kan läsas av användare utanför Diaspora."
       share: Dela
       title: "Hantera anslutna tjänster"
-      visibility_dropdown: "Använd den här rullisten för att ändra synligheten för ditt inlägg (vi föreslår att du gör det här första inlägget publikt)."
+      visibility_dropdown: "Använd den här rullisten för att bestämma vilka som kan se ditt inlägg (vi föreslår att du gör det här första inlägget publikt)."
     publisher:
       all: alla
       all_contacts: "alla kontakter"
@@ -744,8 +745,8 @@ sv:
     reshare:
       reshare: Återdela
     stream_element:
-      connect_to_comment: "Anslut till den här användaren för att kommentera på deras inlägg"
-      currently_unavailable: "kommentering är för närvarande otillgängligt"
+      connect_to_comment: "Anslut till den här användaren för att kunna kommentera deras inlägg"
+      currently_unavailable: "det går för närvarande inte att kommentera"
       dislike: "Jag ogillar det här"
       hide_and_mute: "Dölj och ignorera"
       ignore_user: "Ignorera %{name}"
@@ -770,7 +771,7 @@ sv:
       many: "ditt statusmeddelande får inte vara längre än %{count} bokstäver"
       one: "ditt statusmeddelande får inte vara längre än %{count} bokstäver"
       other: "ditt statusmeddelande får inte vara längre än %{count} bokstäver"
-      two: "korta ner ditt status meddelande till %{count} tecken"
+      two: "korta ner ditt statusmeddelande till %{count} tecken"
       zero: "ditt statusmeddelande får inte vara längre än %{count} bokstäver"
   stream_helper:
     hide_comments: "Dölj alla kommentarer"
@@ -783,19 +784,18 @@ sv:
       zero: "Inga fler kommentarer"
   streams:
     aspects:
-      title: "Dina Aspekter"
+      title: "Dina aspekter"
     aspects_stream: Aspekter
     comment_stream:
       contacts_title: "Personer vars inlägg du har kommenterat på"
-      title: "Kommenterade Inlägg"
-    commented_on: kommenterade
-    community_spotlight_stream: "Gemenskapens Rampljus"
+      title: "Kommenterade inlägg"
+    community_spotlight_stream: "Gemenskapens rampljus"
     followed_tag:
       add_a_tag: "Lägg till en tagg"
       contacts_title: "Personer som gillar dessa taggar"
       follow: Följ
-      title: "#Följda Taggar"
-    followed_tags_stream: "#Följda Taggar"
+      title: "#Följda taggar"
+    followed_tags_stream: "#Följda taggar"
     like_stream:
       contacts_title: "Personer vars inlägg du gillar"
       title: "Omtyckta strömmar"
@@ -803,13 +803,11 @@ sv:
       contacts_title: "Personer som omnämnt dig"
       title: Omnämnanden
     multi:
-      contacts_title: "Personer i din Ström"
+      contacts_title: "Personer i din ström"
       title: Ström
-    posted: postade
     public:
       contacts_title: "Postade nyligen"
-      title: "Offentlig Aktivitet"
-    recently: "nyligen:"
+      title: "Publik aktivitet"
     tags:
       contacts_title: "Användare som gillar den här taggen"
       tag_prefill_text: "Det intressanta med %{tag_name} är... "
@@ -848,15 +846,15 @@ sv:
   username: Användarnamn
   users:
     confirm_email:
-      email_confirmed: "E-mail %{email} aktiverad"
-      email_not_confirmed: "E-mail kunde inte aktiveras. Fel länk?"
+      email_confirmed: "E-postadressen %{email} aktiverad"
+      email_not_confirmed: "E-postadressen kunde inte aktiveras. Fel länk?"
     destroy:
       no_password: "Vänligen ange ditt nuvarande lösenord för att avsluta ditt konto."
-      success: "Ditt konto har låsts. Det har ta 20 minuter för oss att avsluta ditt konto. Tack för att du testade Diaspora."
+      success: "Ditt konto har låsts. Det kan ta 20 minuter för oss att avsluta ditt konto. Tack för att du testade Diaspora."
       wrong_password: "Det angivna lösenordet stämde inte med ditt nuvarande lösenord."
     edit:
       also_commented: "...någon kommenterar dina inlägg?"
-      auto_follow_aspect: "Aspekt för automatiskt följda användare:"
+      auto_follow_aspect: "Den aspekt som automatiskt följda användare skall läggas i:"
       auto_follow_back: "Följ automatiskt de som börjar följa dig"
       change: Ändra
       change_email: "Ändra e-postadress"
@@ -869,37 +867,37 @@ sv:
         locked_out: "Du kommer att loggas ut och stängas ute ifrån ditt konto."
         make_diaspora_better: "Vi vill att du hjälper oss att göra Diaspora bättre, så du borde hjälpa oss, inte lämna oss. Men om du verkligen vill lämna oss, vill vi att du ska veta vad som kommer att hända."
         mr_wiggles: "Mr Wiggles kommer att bli ledsen"
-        no_turning_back: "Nu finns det inte återvändo."
-        what_we_delete: "Vi kommer att radera alla dina inlägg och din profil så fort som det bara går. Dina kommentarer kommer att finnas kvar, men vara associerade med din Diaspora Handle."
-      close_account_text: "Stäng Kontot"
-      comment_on_post: "...någon kommenterar på din post?"
+        no_turning_back: "Nu finns det ingen återvändo."
+        what_we_delete: "Vi kommer att radera alla dina inlägg och din profil så fort som det bara går. Dina kommentarer kommer att finnas kvar, men vara associerade med ditt Diaspora-användarnamn."
+      close_account_text: "Stäng kontot"
+      comment_on_post: "...någon kommenterar din post?"
       current_password: "Nuvarande lösenord"
       download_photos: "Ladda ner mina foton"
       download_xml: "Ladda ner min xml"
       edit_account: "Ändra konto"
       email_awaiting_confirmation: "Vi har skickat dig en länk till %{unconfirmed_email} för aktivering. Innan du har aktiverat din nya adress, kommer vi fortsätta att använda %{email}."
       export_data: "Exportera data"
-      following: "Inställningar för Följer"
-      getting_started: "Inställningar för Ny Användare"
+      following: "Inställningar för att följa"
+      getting_started: "Inställningar för nya användare"
       liked: "...någon gillar ditt inlägg?"
       mentioned: "...du omnämns i ett inlägg?"
       new_password: "Nytt lösenord"
-      photo_export_unavailable: "Export av foton är för närvarande otillgängligt"
+      photo_export_unavailable: "Det går för tillfället inte att exportera foton"
       private_message: "...du mottar ett privat meddelande?"
       receive_email_notifications: "Skicka notiser via e-post när..."
       reshared: "...någon sprider mina inlägg vidare?"
-      show_community_spotlight: "Ska Gemenskapens Rampljus visas i din Ström?"
-      show_getting_started: "Återaktivera \"Komma Igång\""
+      show_community_spotlight: "Ska Gemenskapens rampljus visas i din ström?"
+      show_getting_started: "Återaktivera \"Komma igång\""
       started_sharing: "...någon börjar dela med dig?"
-      stream_preferences: "Inställningar för din Ström"
+      stream_preferences: "Inställningar för din ström"
       your_email: "Din e-post"
-      your_handle: "Ditt Diaspora ID"
+      your_handle: "Ditt Diaspora-ID"
     getting_started:
       awesome_take_me_to_diaspora: "Häftigt! Ta mig till Diaspora*"
-      community_welcome: "Vi i Diasporas community är glada att ha dig här!"
+      community_welcome: "Vi i Diasporacommunityn är glada att ha dig här!"
       hashtag_explanation: "Hashtaggar gör det möjligt att diskutera och följa dina intressen. Det är också ett bra sätt att lära känna nya människor på Diaspora."
       hashtag_suggestions: "Testa att följa taggar såsom #konst, #film, #gif, etc."
-      hooking_up_fb: "koppla in ditt Facebook-konto"
+      hooking_up_fb: "länka in ditt Facebook-konto"
       saved: Sparat!
       we_can_speed_things_up: "Vi kan snabba upp det lite genom att"
       well_hello_there: "Hej på dig!"
@@ -913,21 +911,21 @@ sv:
       simply_visit: "Besök helt enkelt"
       works_on_modern: "Fungerar på alla moderna smartphones"
     privacy_settings:
-      ignored_users: "Ignorerade Användare"
+      ignored_users: "Ignorerade användare"
       stop_ignoring: "Sluta ignorera"
       title: Sekretessinställningar
     public:
       does_not_exist: "Användaren %{username} finns inte!"
     update:
-      email_notifications_changed: "Notiser via e-post har ändrats"
-      follow_settings_changed: "Inställningar för Följer ändrades"
-      follow_settings_not_changed: "Misslyckades att ändra inställningar för Följer."
-      language_changed: "Språk är nu ändrat"
+      email_notifications_changed: "Inställningarna för e-postnotiser har ändrats"
+      follow_settings_changed: "Inställningar för att följa har ändrats"
+      follow_settings_not_changed: "Kunde inte ändra inställningar för att följa."
+      language_changed: "Språket har ändrats"
       language_not_changed: "Språket kunde inte ändras"
-      password_changed: "Lösenordet är nu ändrat och klart att användas."
+      password_changed: "Lösenordet har nu ändrats och du kan nu logga in med ditt nya lösenord."
       password_not_changed: "Lösenordet kunde inte ändras"
-      settings_not_updated: "Uppdatering av inställningar misslyckades"
-      settings_updated: "Inställningar uppdaterades"
+      settings_not_updated: "Kunde inte uppdatera inställningar"
+      settings_updated: "Inställningarna har ändrats"
       unconfirmed_email_changed: "E-postadressen har ändrats och behöver aktiveras."
       unconfirmed_email_not_changed: "Byte av e-postadress misslyckades"
   webfinger:
diff --git a/config/locales/diaspora/te.yml b/config/locales/diaspora/te.yml
index 71abc299c..4bde811a8 100644
--- a/config/locales/diaspora/te.yml
+++ b/config/locales/diaspora/te.yml
@@ -13,9 +13,13 @@ te:
   _services: సేవలు
   account: ఖాతా
   ago: "%{time} క్రితం"
+  all_aspects: "అన్ని కోణాలు"
   application:
     helper:
+      diaspora_alpha: "డయాస్పోరా* ఆల్ఫా"
       unknown_person: "తెలియని వ్యక్తి"
+      video_title:
+        unknown: "తెలియని వీడియో శీర్షిక"
   aspects:
     edit:
       done: పూర్తయ్యింది
@@ -51,6 +55,8 @@ te:
     zero: "వ్యాఖ్యలు లేవు"
   contacts:
     few: "%{count} పరిచయాలు"
+    index:
+      your_contacts: "మీ పరిచయాలు"
     many: "%{count} contacts"
     one: "1 contact"
     other: "%{count} contacts"
@@ -264,13 +270,15 @@ te:
       reshare:
         few: "%{count} reshares"
         many: "%{count} reshares"
-        one: "1 reshare"
-        other: "%{count} reshares"
-        two: "%{count} reshares"
+        one: "1 పంచుకోలు"
+        other: "%{count} పంచుకోళ్ళు"
+        two: "%{count} పంచుకోళ్ళు"
         zero: Reshare
   search: వెతుకు
   settings: అమరికలు
   shared:
+    add_contact:
+      your_diaspora_username_is: "మీ డయస్పోరా వాడుకరి పేరు: %{diaspora_handle}"
     aspect_dropdown:
       toggle:
         few: "In %{count} aspects"
@@ -304,6 +312,10 @@ te:
       change_language: "భాష మార్పు"
       change_password: "సంకేతపదం మార్పు"
       close_account_text: "ఖాతా మూసివేత"
+      current_password: "ప్రస్తుత సంకేతపదం"
+      new_password: "కొత్త సంకేతపదం"
+      your_email: "మీ ఈమెయిలు"
+      your_handle: "మీ డయస్పోరా గుర్తింపు"
     privacy_settings:
       title: "అంతరంగికత అమరికలు"
     public:
@@ -311,6 +323,8 @@ te:
     update:
       language_changed: "భాషను మార్చాం"
       language_not_changed: "భాష మార్పు విఫలమైంది"
+      password_changed: "సంకేతపదాన్ని మార్చాం.  మీరు ఇప్పుడు మీ కొత్త సంకేతపదంలో ప్రవేశించవచ్చు."
+      password_not_changed: "సంకేతపదం మార్పు విఫలమైంది"
   welcome: స్వాగతం!
   will_paginate:
     next_label: "తదుపరి &raquo;"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 56d3c4cf5..01e0c16d1 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -97,7 +97,7 @@ tr:
       cubbies:
         explanation: "İlk Diaspora uygulaması Cubbi.es, geliştirilme aşamasındadır."
         heading: "Cubbi.es'e Bağlan"
-        learn_more: "Daha fazla bilgi edinin"
+        learn_more: "Daha fazla bilgi edin"
       diaspora_id:
         content_1: "Diaspora ID'niz:"
         content_2: "Diaspora'da sizi bulabilmelerini istediğiniz kişilere verebilirsiniz."
@@ -108,8 +108,8 @@ tr:
         do_you: "Seçim:"
         email_feedback: "%{link} ile yolla mesajını, bu yolu tercih ediyorsan"
         feature_suggestion: "... bir %{link} önerin var mı?"
-        find_a_bug: "... bulabilir misin %{link}?"
-        have_a_question: "... bir %{link} var mı?"
+        find_a_bug: "... bulduğun %{link} mı var?"
+        have_a_question: "... bir %{link} mu sormak istiyorsun?"
         here_to_help: "Diaspora topluluğu burada!"
         need_help: "Yardıma mı ihtiyacın var?"
         satisfaction: "%{link}: Topluluk desteği"
@@ -118,21 +118,21 @@ tr:
         tag_question: soru
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Topluluğun oluşturduğu haberler, belgeler ve yardımlar"
       introduce_yourself: "Bu sizin akışınızdır. Atla ve kendini tanıt."
-      keep_us_running: "%{pod} ağının daha hızlı ve hatasız olması için geliştiricilere kahve ısmarlayın!"
+      keep_us_running: "%{pod} ağının daha hızlı ve hatasız olması için geliştiricilere kahve ısmarla!"
       new_here:
         follow: "%{link} unsurunu izle ve yeni Diaspora* kullanıcılarını karşıla!"
         learn_more: "Daha fazla bilgi"
-        title: "Yenilere Hoş Geldin Deyin"
+        title: "Yenilere Hoş Geldin De"
       no_contacts: "Kişi yok"
       no_tags: "+ Takip etmek için bir etiket bul"
       people_sharing_with_you: "Seninle paylaşımda bulunanlar"
       post_a_message: "mesaj gönder >>"
       services:
-        content: "Diaspora'ya aşağıdaki hizmetleri bağlayabilirsiniz:"
+        content: "Diaspora'ya aşağıdaki hizmetleri bağlayabilirsin:"
         heading: "Servisleri ilişkilendir"
       unfollow_tag: "#%{tag}'i takip etmeyi bırak"
       welcome_to_diaspora: "Diaspora'ya Hoş Geldin, %{name}!"
-      your_aspects: Yönleriniz
+      your_aspects: Yönlerin
     many: "%{count} yön"
     move_contact:
       error: "Kişi taşıma problemi: %{inspect}"
@@ -180,8 +180,8 @@ tr:
       failure: "Bu kullanıcıyı görmezden gelmeyi kaldıramadım.  #evasion"
       success: "Bakalım ne diyecekler! #sayhello"
   bookmarklet:
-    explanation: "%{link} yer imleri çubuğuna sürükleyin."
-    explanation_link_text: "Diaspoara Gönder"
+    explanation: "Diaspora'ya istediğin her yerden gönderi yapmak için %{link} yer imleri çubuğuna sürükle."
+    explanation_link_text: "bu bağlantıyı"
     heading: "Diaspora yer işareti"
     post_something: "Diaspora için birşey gönder"
     post_success: "Gönderildi! Kapatılıyor!"
@@ -798,12 +798,11 @@ tr:
       zero: "Daha fazla yorum yok"
   streams:
     aspects:
-      title: Yönleriniz
+      title: Yönlerin
     aspects_stream: Yönler
     comment_stream:
       contacts_title: "Gönderilerini yorumladığın kişiler"
       title: "Yorumlanan gönderiler"
-    commented_on: yorumlanan
     community_spotlight_stream: "Topluluk Spotlight"
     followed_tag:
       add_a_tag: "Etiket ekle"
@@ -821,11 +820,9 @@ tr:
     multi:
       contacts_title: Kişiler
       title: Akış
-    posted: gönderi
     public:
       contacts_title: "Yeni Düzen"
       title: "Genel Aktiviteler"
-    recently: "son zamanlarda:"
     tags:
       contacts_title: "Kişileri etiketle"
       tag_prefill_text: "%{tag_name} hakkında olay şu ki... "
@@ -873,6 +870,8 @@ tr:
       wrong_password: "Girilen parola güncel parola ile uyumsuz."
     edit:
       also_commented: "...birisi gönderime yorum yazdığında?"
+      auto_follow_aspect: "Otomatik olarak izlenen kişiler için yön:"
+      auto_follow_back: "Seni izleyen birini otomatik olarak izle"
       change: Değiştir
       change_email: "E-posta değiştir"
       change_language: "Dili değiştir"
@@ -894,6 +893,7 @@ tr:
       edit_account: "Hesap düzenle"
       email_awaiting_confirmation: "Etkinleştirme bağlantısını %{unconfirmed_email} adresine gönderdik. Bu bağlantıyı izleyip yeni adresi etkinleştirmediğin sürece önceki %{email} adresini kullanmaya devam edeceğiz."
       export_data: "Bilgilerimi Dışarı taşı"
+      following: "İzleme ayarları"
       getting_started: "Yeni Kullanıcı Tercihleri"
       liked: "...birisi gönderimi beğendiğinde?"
       mentioned: "...benden bahsedildiğinde?"
@@ -934,6 +934,8 @@ tr:
       does_not_exist: "%{username} kullanıcısı bulunmamaktadır!"
     update:
       email_notifications_changed: "E-posta bildirimleri değişti"
+      follow_settings_changed: "İzleme ayarları değiştirildi"
+      follow_settings_not_changed: "İzleme ayarlarının değiştirilmesi başarısız oldu."
       language_changed: "Dil değişti"
       language_not_changed: "Dil değişikliği başarısız"
       password_changed: "Parola Değişti"
diff --git a/config/locales/diaspora/uk.yml b/config/locales/diaspora/uk.yml
index 3160e70d4..f22feaa1d 100644
--- a/config/locales/diaspora/uk.yml
+++ b/config/locales/diaspora/uk.yml
@@ -799,7 +799,6 @@ uk:
     comment_stream:
       contacts_title: "Люди, чиї записи ви прокоментували"
       title: Прокоментовані
-    commented_on: обговорювані
     community_spotlight_stream: "У центрі уваги"
     followed_tag:
       add_a_tag: "Додати мітку"
@@ -817,11 +816,9 @@ uk:
     multi:
       contacts_title: "Люди у вашому Потоці"
       title: Потік
-    posted: опубліковані
     public:
       contacts_title: "Нещодавно написали"
       title: "Публічна Активність"
-    recently: "останні:"
     tags:
       contacts_title: "Люди, яким подобаються ця мітка"
       tag_prefill_text: "Щодо %{tag_name} я думаю, що..."
diff --git a/config/locales/diaspora/vi.yml b/config/locales/diaspora/vi.yml
index 9bfcef02d..4940d4c3e 100644
--- a/config/locales/diaspora/vi.yml
+++ b/config/locales/diaspora/vi.yml
@@ -78,8 +78,11 @@ vi:
       success: "%{name} đã bị loại bỏ."
     edit:
       add_existing: "Thêm một liên lạc đang có"
+      aspect_list_is_not_visible: "danh sách mối quan hệ bị ẩn với người khác trong mối quan hệ"
+      aspect_list_is_visible: "danh sách mối quan hệ hiện với người khác trong mối quan hệ"
       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: "các liên lạc trong mối quan hệ này có thể thấy nhau?"
       remove_aspect: "Xoá mối quan hệ này"
       rename: "đổi tên"
       update: "cập nhật"
@@ -111,6 +114,8 @@ vi:
         tag_bug: "#bug"
         tag_feature: "#feature"
         tag_question: "#question"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Kinh nghiệm, thủ thuật, giải đáp và tin tức từ cộng đồng"
+      introduce_yourself: "Đây là luồng của bạn. Hãy tự giới thiệu mình ở đây."
       new_here:
         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"
@@ -133,6 +138,7 @@ vi:
       create: Tạo
       name: "Tên (chỉ bạn nhìn thấy)"
     no_contacts_message:
+      community_spotlight: "nổi bật từ cộng đồng"
       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!"
@@ -148,6 +154,7 @@ vi:
     selected_contacts:
       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: "Xem tất cả những người nổi bật trong cộng đồng"
       view_all_contacts: "Xem tất cả liên lạc"
     show:
       edit_aspect: "chỉnh sửa mối quan hệ"
@@ -161,6 +168,10 @@ vi:
       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: "Không thể bỏ qua người dùng.  #evasion"
+      success: "Bạn sẽ không thấy #silencio trong luồng của bạn nữa!"
   bookmarklet:
     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"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index a95cd9a9f..7e0aae721 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -805,7 +805,6 @@ zh-TW:
     comment_stream:
       contacts_title: 你發表過意見的貼文作者
       title: 有意見的貼文
-    commented_on: 有意見的
     community_spotlight_stream: 社群焦點
     followed_tag:
       add_a_tag: 新增標籤
@@ -823,11 +822,9 @@ zh-TW:
     multi:
       contacts_title: 出現在流水帳中的人
       title: 流水帳
-    posted: 發表的
     public:
       contacts_title: 最新貼文者
       title: 公開活動
-    recently: "最近:"
     tags:
       contacts_title: 這個標籤的粉絲
       tag_prefill_text: "有關於 %{tag_name} 的事情是... "
diff --git a/config/locales/javascript/javascript.ar.yml b/config/locales/javascript/javascript.ar.yml
index 4d8e64c25..a21cab3f6 100644
--- a/config/locales/javascript/javascript.ar.yml
+++ b/config/locales/javascript/javascript.ar.yml
@@ -9,12 +9,14 @@ ar:
     aspect_dropdown:
       add_to_aspect: "أضف مراسلا"
       all_aspects: "جميع الفئات"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle:
-        few: "في <%= count %> فئات"
-        many: "في <%= count %> فئات"
-        one: "في <%= count %> فئة"
-        other: "في <%= count %> فئات"
-        two: "في <%= count %> فئات"
+        few: "في {{count}} فئات"
+        many: "في {{count}} فئات"
+        one: "في {{count}} فئة"
+        other: "في {{count}} فئات"
         zero: "حدّد الفئات"
     comments:
       hide: "أخفِ التعليقات"
@@ -23,6 +25,7 @@ ar:
     failed_to_like: "فشل في [أعجبني]"
     failed_to_post_message: "فشل في نشر رسالة!"
     getting_started:
+      hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll:
       no_more: "لا توجد أية رسائل أخرى"
@@ -32,8 +35,29 @@ ar:
       public: "عام - مشاركتك ستكون متاحة للجميع ومفهرسة في محركات البحث"
     reshares:
       duplicate: "رائع، أليس كذلك؟ أعدت نشر هذه المشاركة مسبقا"
-    search_for: "إبحث عن <%= name %>"
+    search_for: "إبحث عن {{name}}"
     show_more: المزيد
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
+    tags:
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
       day: "منذ يوم"
       days: "منذ %d أيام"
@@ -51,6 +75,4 @@ ar:
       years: "منذ %d أعوام"
     videos:
       unknown: "نوع فيديو غير معروف"
-      watch: "شاهد هذا الفيديو عبر <%= provider %>"
-    web_sockets:
-      disconnected: "الـ websocket مغلق; الرسائل لن تنشر بعد الآن"
\ No newline at end of file
+      watch: "شاهد هذا الفيديو عبر {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.bg.yml b/config/locales/javascript/javascript.bg.yml
index a7acd3b52..5313b5022 100644
--- a/config/locales/javascript/javascript.bg.yml
+++ b/config/locales/javascript/javascript.bg.yml
@@ -9,16 +9,15 @@ bg:
     aspect_dropdown:
       add_to_aspect: "Избиране на аспект(и)"
       all_aspects: "Във всеки аспект"
-      error: "Не е възможно започване на споделяне с <%= name %>.  Вероятно ги игнорирате?"
+      error: "Не е възможно започване на споделяне с {{name}}.  Вероятно ги игнорирате?"
       select_aspects: "Избиране на аспект(и)"
-      started_sharing_with: "Започнахте да споделяте с <%= name %>!"
-      stopped_sharing_with: "Престанахте да споделяте с <%= name %>."
+      started_sharing_with: "Започнахте да споделяте с {{name}}!"
+      stopped_sharing_with: "Престанахте да споделяте с {{name}}."
       toggle:
-        few: "В <%= count %> аспекта"
-        many: "В <%= count %> аспекта"
-        one: "В <%= count %> аспект"
-        other: "В <%= count %> аспекта"
-        two: "В <%= count %> аспекта"
+        few: "В {{count}} аспекта"
+        many: "В {{count}} аспекта"
+        one: "В {{count}} аспект"
+        other: "В {{count}} аспекта"
         zero: "Избиране на аспект(и)"
     aspect_navigation:
       deselect_all: Никой
@@ -32,7 +31,7 @@ bg:
     failed_to_post_message: "Съобщението не бе публикувано!"
     getting_started:
       alright_ill_wait: "Добре, ще изчакам."
-      hey: "Здравейте, <%= name %>!"
+      hey: "Здравейте, {{name}}!"
       no_tags: "Не следите нито една марка!  Желаете ли да продължите въпреки това?"
       preparing_your_stream: "Вашият персонализиран поток се подготвя..."
     infinite_scroll:
@@ -45,10 +44,29 @@ bg:
       public: "Публично - публикацията ще бъде видима за всеки, а съдържанието ѝ ще бъде налично за търсещите машини"
     reshares:
       duplicate: "Вече сте споделили публикацията!"
-    search_for: "Търсене за <%= name %>"
+    search_for: "Търсене за {{name}}"
     show_more: "покажи още"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "Е, вероятно марката #<%= tagName %> не е чак толкова интересна..."
+      wasnt_that_interesting: "Е, вероятно марката #{{tagName}} не е чак толкова интересна..."
     timeago:
       day: ден
       days: "%d дни"
@@ -67,4 +85,4 @@ bg:
       years: "%d години"
     videos:
       unknown: "Неизвестен вид видео"
-      watch: "Гледайте видеото в <%= provider %>"
\ No newline at end of file
+      watch: "Гледайте видеото в {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.br.yml b/config/locales/javascript/javascript.br.yml
index 96b5713b3..30cf743a2 100644
--- a/config/locales/javascript/javascript.br.yml
+++ b/config/locales/javascript/javascript.br.yml
@@ -8,21 +8,45 @@ br:
   javascripts:
     aspect_dropdown:
       add_to_aspect: "Add to aspect"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle:
-        few: "In <%= count %> aspects"
-        many: "In <%= count %> aspects"
-        one: "In <%= count %> aspect"
-        other: "In <%= count %> aspects"
-        two: "In <%= count %> aspects"
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
         zero: "Add to aspect"
     confirm_dialog: "Emaoc'h sur?"
     getting_started:
+      hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
     publisher:
       at_least_one_aspect: "Dav eo deoc'h embann un arvez da'n nebeutañ"
     reshares:
       duplicate: "You've already reshared that post!"
-    search_for: "Klask war-lerc'h <%= name %>"
+    search_for: "Klask war-lerc'h {{name}}"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
+    tags:
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
       day: "un devezh"
       days: "%d a zevezhioù"
@@ -39,4 +63,4 @@ br:
       years: "%d a vloavezhioù"
     videos:
       unknown: "Stumm ar video dianav"
-      watch: "Sellet ouzh ar video gant <%= provider %>"
\ No newline at end of file
+      watch: "Sellet ouzh ar video gant {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.cs.yml b/config/locales/javascript/javascript.cs.yml
index be84c1d24..858733520 100644
--- a/config/locales/javascript/javascript.cs.yml
+++ b/config/locales/javascript/javascript.cs.yml
@@ -9,12 +9,14 @@ cs:
     aspect_dropdown:
       add_to_aspect: "Přidat kontakt"
       all_aspects: "Všechny aspekty"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle:
-        few: "Ve <%= count %> aspektech"
-        many: "V <%= count %> aspektech"
-        one: "V <%= count %> aspektu"
-        other: "Ve <%= count %> aspektech"
-        two: "Ve <%= count %> aspektech"
+        few: "Ve {{count}} aspektech"
+        many: "V {{count}} aspektech"
+        one: "V {{count}} aspektu"
+        other: "Ve {{count}} aspektech"
         zero: "Vybrat aspekty"
     comments:
       hide: "skrýt komentáře"
@@ -23,6 +25,7 @@ cs:
     failed_to_like: "Oblíbení se nezdařilo!"
     failed_to_post_message: "Odeslání příspěvku se nezdařilo!"
     getting_started:
+      hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll:
       no_more: "Žádné další příspěvky."
@@ -32,8 +35,29 @@ cs:
       public: "Veřejné - váši zprávu si bude moci přečíst kdokoliv a může být nalezena vyhledávači"
     reshares:
       duplicate: "Tato zprávu už sdílíte!"
-    search_for: "Hledat <%= name %>"
+    search_for: "Hledat {{name}}"
     show_more: "zobrazit více"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
+    tags:
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
       day: "1 dnem"
       days: "%d dny"
@@ -51,6 +75,4 @@ cs:
       years: "%d roky"
     videos:
       unknown: "Neznámý typ videa"
-      watch: "Podívejte se na tohle video na <%= provider %>"
-    web_sockets:
-      disconnected: "Websocket je uzavřen, příspěvky již nebude možno sledovat živě."
\ No newline at end of file
+      watch: "Podívejte se na tohle video na {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.cy.yml b/config/locales/javascript/javascript.cy.yml
index ade007522..be2b5a95e 100644
--- a/config/locales/javascript/javascript.cy.yml
+++ b/config/locales/javascript/javascript.cy.yml
@@ -9,15 +9,15 @@ cy:
     aspect_dropdown:
       add_to_aspect: "Ychwanegu cysylltiad"
       all_aspects: "Agweddau i gŷd"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Dewis agweddau"
-      started_sharing_with: "Rydych chi'n rhannu gyda <%= name %>!"
-      stopped_sharing_with: "Dydych chi ddim yn rhannu nawr gyda <%= name %>."
+      started_sharing_with: "Rydych chi'n rhannu gyda {{name}}!"
+      stopped_sharing_with: "Dydych chi ddim yn rhannu nawr gyda {{name}}."
       toggle:
-        few: "Mewn <%= count %> agweddau"
-        many: "Mewn <%= count %> agweddau"
-        one: "Mewn <%= count %> agwedd"
-        other: "Mewn <%= count %> agweddau"
-        two: "Mewn <%= count %> agweddau"
+        few: "Mewn {{count}} agweddau"
+        many: "Mewn {{count}} agweddau"
+        one: "Mewn {{count}} agwedd"
+        other: "Mewn {{count}} agweddau"
         zero: "Dewiswch agweddau"
     aspect_navigation:
       deselect_all: "Dad-ddewis i gŷd"
@@ -31,7 +31,7 @@ cy:
     failed_to_post_message: "Methwyd i bostio neges!"
     getting_started:
       alright_ill_wait: "O'r gorau - 'dwi'n aros..."
-      hey: "Hei, <%= name %>!"
+      hey: "Hei, {{name}}!"
       no_tags: "Hei, dydych chi ddim yn dilyn unrhyw tagiau! Dal ymlaen beth bynnag?"
       preparing_your_stream: "Preparing your personalised stream..."
     infinite_scroll:
@@ -40,10 +40,29 @@ cy:
       looking_good: "OMG, rydych chi'n ymddangos yn neis iawn!"
     reshares:
       duplicate: "Mae hynny'n dda, eh? Rydych chi wedi rhannu'r bost eisoes!"
-    search_for: "Chwilio am <%= name %>"
+    search_for: "Chwilio am {{name}}"
     show_more: "dangos mwy"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "OK, mae'n debyg nid yw #<%= tagName %> yn ddiddorol iawn..."
+      wasnt_that_interesting: "OK, mae'n debyg nid yw #{{tagName}} yn ddiddorol iawn..."
     timeago:
       day: diwrnod
       days: "%d diwrnod"
@@ -60,4 +79,4 @@ cy:
       years: "%d blyddynoedd"
     videos:
       unknown: "Math o fideo anhysbys"
-      watch: "Gwyliwch y fideo ar <%= provider %>"
\ No newline at end of file
+      watch: "Gwyliwch y fideo ar {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml
index 8635c15cf..1317716f8 100644
--- a/config/locales/javascript/javascript.da.yml
+++ b/config/locales/javascript/javascript.da.yml
@@ -9,16 +9,15 @@ da:
     aspect_dropdown:
       add_to_aspect: "Tilføj kontakt"
       all_aspects: "Alle aspekter"
-      error: "Kunne ikke begynde at dele med <%= name %>.  Ignorerer du vedkommende?"
+      error: "Kunne ikke begynde at dele med {{name}}.  Ignorerer du vedkommende?"
       select_aspects: "Vælg aspekter"
-      started_sharing_with: "Du er begyndt at dele med <%= name %>!"
-      stopped_sharing_with: "Du deler ikke længere med <%= name %>."
+      started_sharing_with: "Du er begyndt at dele med {{name}}!"
+      stopped_sharing_with: "Du deler ikke længere med {{name}}."
       toggle:
-        few: "I <%= count %> aspekter"
-        many: "I <%= count %> aspekter"
-        one: "I <%= count %> aspekt"
-        other: "I <%= count %> aspekter"
-        two: "I <%= count %> aspekter"
+        few: "I {{count}} aspekter"
+        many: "I {{count}} aspekter"
+        one: "I {{count}} aspekt"
+        other: "I {{count}} aspekter"
         zero: "Vælg aspekter"
     aspect_navigation:
       deselect_all: "Fravælg alle"
@@ -32,7 +31,7 @@ da:
     failed_to_post_message: "Kunne ikke indsende besked!"
     getting_started:
       alright_ill_wait: "Okay, jeg venter."
-      hey: "Hej <%= name %>!"
+      hey: "Hej {{name}}!"
       no_tags: "Du har ikke fulgt nogen tags! Vil du fortsætte alligevel?"
       preparing_your_stream: "Forbereder din personlige strøm..."
     infinite_scroll:
@@ -45,10 +44,29 @@ da:
       public: "Offentlig - dit indlæg vil være synligt for alle og kan findes af søgemaskiner"
     reshares:
       duplicate: "Du har allerede delt indlægget!"
-    search_for: "Søg efter <%= name %>"
+    search_for: "Søg efter {{name}}"
     show_more: "Vis mere"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "OK, jeg formoder #<%= tagName %> ikke var så spændende igen..."
+      wasnt_that_interesting: "OK, jeg formoder #{{tagName}} ikke var så spændende igen..."
     timeago:
       day: "en dag"
       days: "%d dage"
@@ -67,6 +85,4 @@ da:
       years: "%d år"
     videos:
       unknown: "Ukendt videotype"
-      watch: "Se denne video på <%= provider %>"
-    web_sockets:
-      disconnected: "Forbindelse er lukket; indlæg vil ikke længere blive opdateret live."
\ No newline at end of file
+      watch: "Se denne video på {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index d0592c474..0d8c4c4ca 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -9,16 +9,15 @@ de:
     aspect_dropdown:
       add_to_aspect: "Kontakt hinzufügen"
       all_aspects: "Alle Aspekte"
-      error: "Konnte nicht anfangen, mit <%= name %> zu teilen. Ignorierst du sie/ihn?"
+      error: "Konnte nicht anfangen, mit {{name}} zu teilen. Ignorierst du sie/ihn?"
       select_aspects: "Wähle Aspekte aus"
-      started_sharing_with: "Du hast angefangen, mit <%= name %> zu teilen!"
-      stopped_sharing_with: "Du hast aufgehört, mit <%= name %> zu teilen!"
+      started_sharing_with: "Du hast angefangen, mit {{name}} zu teilen!"
+      stopped_sharing_with: "Du hast aufgehört, mit {{name}} zu teilen!"
       toggle:
-        few: "In <%= count %> Aspekten"
-        many: "In <%= count %> Aspekten"
+        few: "In {{count}} Aspekten"
+        many: "In {{count}} Aspekten"
         one: "In einem Aspekt"
-        other: "In <%= count %> Aspekten"
-        two: "In <%= count %> Aspekten"
+        other: "In {{count}} Aspekten"
         zero: "Aspekt auswählen"
     aspect_navigation:
       deselect_all: "Auswahl aufheben"
@@ -32,6 +31,7 @@ de:
     failed_to_post_message: "Konnte Beitrag nicht senden!"
     getting_started:
       alright_ill_wait: "Alles klar, ich warte."
+      hey: "Hey, {{name}}!"
       no_tags: "Hey, du folgst noch keinen Tags! Trotzdem weitermachen?"
       preparing_your_stream: "Dein persönlicher Stream wird zusammengestellt …"
     infinite_scroll:
@@ -44,10 +44,29 @@ de:
       public: "Öffentlich - dein Beitrag ist für alle sichtbar und kann von Suchmaschinen gefunden werden"
     reshares:
       duplicate: "Du hast diesen Beitrag bereits weitergesagt!"
-    search_for: "Nach <%= name %> suchen"
+    search_for: "Nach {{name}} suchen"
     show_more: "Mehr zeigen"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "OK, ich nehme an, #<%= tagName %> war nicht so interessant..."
+      wasnt_that_interesting: "OK, ich nehme an, #{{tagName}} war nicht so interessant..."
     timeago:
       day: "einem Tag"
       days: "%d Tagen"
@@ -66,6 +85,4 @@ de:
       years: "%d Jahren"
     videos:
       unknown: "Unbekanntes Videoformat"
-      watch: "Dieses Video auf <%= provider %> ansehen"
-    web_sockets:
-      disconnected: "Der Websocket ist geschlossen. Beiträge werden nicht länger in Echtzeit aktualisiert."
\ No newline at end of file
+      watch: "Dieses Video auf {{provider}} ansehen"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.de_formal.yml b/config/locales/javascript/javascript.de_formal.yml
index 02ef14c90..ef677d24a 100644
--- a/config/locales/javascript/javascript.de_formal.yml
+++ b/config/locales/javascript/javascript.de_formal.yml
@@ -9,15 +9,15 @@ de_formal:
     aspect_dropdown:
       add_to_aspect: "Kontakt hinzufügen"
       all_aspects: "Alle Aspekte"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Wählen Sie Aspekte aus"
-      started_sharing_with: "Sie haben angefangen, mit <%= name %> zu teilen!"
-      stopped_sharing_with: "Sie haben aufgehört, mit <%= name %> zu teilen!"
+      started_sharing_with: "Sie haben angefangen, mit {{name}} zu teilen!"
+      stopped_sharing_with: "Sie haben aufgehört, mit {{name}} zu teilen!"
       toggle:
-        few: "In <%= count %> Aspekten"
-        many: "In <%= count %> Aspekten"
+        few: "In {{count}} Aspekten"
+        many: "In {{count}} Aspekten"
         one: "In einem Aspekt"
-        other: "In <%= count %> Aspekten"
-        two: "In <%= count %> Aspekten"
+        other: "In {{count}} Aspekten"
         zero: "Aspekt auswählen"
     aspect_navigation:
       deselect_all: "Auswahl aufheben"
@@ -31,6 +31,7 @@ de_formal:
     failed_to_post_message: "Konnte Beitrag nicht senden!"
     getting_started:
       alright_ill_wait: "Alles klar, ich warte."
+      hey: "Hey, {{name}}!"
       no_tags: "Hey, Sie folgen noch keinen Tags! Trotzdem weitermachen?"
       preparing_your_stream: "Ihr personalisierter Stream wird zusammengestellt..."
     infinite_scroll:
@@ -43,10 +44,29 @@ de_formal:
       public: "Öffentlich - Ihr Beitrag ist für alle sichtbar und kann von Suchmaschinen gefunden werden"
     reshares:
       duplicate: "Sie haben diesen Beitrag bereits weitergesagt!"
-    search_for: "Nach <%= name %> suchen"
+    search_for: "Nach {{name}} suchen"
     show_more: "Mehr zeigen"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "OK, ich nehme an, #<%= tagName %> war nicht so interessant..."
+      wasnt_that_interesting: "OK, ich nehme an, #{{tagName}} war nicht so interessant..."
     timeago:
       day: "einem Tag"
       days: "%d Tagen"
@@ -65,6 +85,4 @@ de_formal:
       years: "%d Jahren"
     videos:
       unknown: "Unbekanntes Videoformat"
-      watch: "Dieses Video auf <%= provider %> ansehen"
-    web_sockets:
-      disconnected: "Der Websocket ist geschlossen. Beiträge werden nicht länger in Echtzeit aktualisiert."
\ No newline at end of file
+      watch: "Dieses Video auf {{provider}} ansehen"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml
index 93f59f64e..4caefb2f0 100644
--- a/config/locales/javascript/javascript.el.yml
+++ b/config/locales/javascript/javascript.el.yml
@@ -9,16 +9,15 @@ el:
     aspect_dropdown:
       add_to_aspect: "Προσθήκη επαφής"
       all_aspects: "Όλες οι πτυχές"
-      error: "Δεν μπορεί να ξεκινήσει ο διαμοιρασμός με το χρήστη <%= name %>. Μήπως τον αγνοείτε;"
+      error: "Δεν μπορεί να ξεκινήσει ο διαμοιρασμός με το χρήστη {{name}}. Μήπως τον αγνοείτε;"
       select_aspects: "Επιλογή πτυχών"
-      started_sharing_with: "Ξεκινήσατε να διαμοιράζεστε με τον χρήστη <%= name %>!"
-      stopped_sharing_with: "Σταματήσατε να διαμοιράζεστε με τον χρήστη <%= name %>."
+      started_sharing_with: "Ξεκινήσατε να διαμοιράζεστε με τον χρήστη {{name}}!"
+      stopped_sharing_with: "Σταματήσατε να διαμοιράζεστε με τον χρήστη {{name}}."
       toggle:
-        few: "Σε <%= count %> πτυχές"
-        many: "Σε <%= count %> πτυχές"
-        one: "Σε <%= count %> πτυχή"
-        other: "Σε <%= count %> πτυχές"
-        two: "Σε <%= count %> πτυχές"
+        few: "Σε {{count}} πτυχές"
+        many: "Σε {{count}} πτυχές"
+        one: "Σε {{count}} πτυχή"
+        other: "Σε {{count}} πτυχές"
         zero: "Επιλέξτε πτυχές"
     aspect_navigation:
       deselect_all: "Εξαίρεση όλων"
@@ -32,7 +31,7 @@ el:
     failed_to_post_message: "Αποτυχία δημοσίευσης μηνύματος!"
     getting_started:
       alright_ill_wait: "Εντάξει, θα περιμένω."
-      hey: "Γεια σου, <%= name %>!"
+      hey: "Γεια σου, {{name}}!"
       no_tags: "Γεια, δεν ακολουθείς ακόμα καμία ετικέτα! Συνεχίζουμε παρ' όλ' αυτά;"
       preparing_your_stream: "Ετοιμάζεται η προσωπική σας ροή..."
     infinite_scroll:
@@ -45,10 +44,29 @@ el:
       public: "Δημόσιο - οι δημοσιεύσεις σας θα είναι ορατές στον καθένα και θα μπορούν να βρεθούν από τις μηχανές αναζήτησης."
     reshares:
       duplicate: "Αυτό είναι τόσο καλό ε; Έχετε ήδη κοινοποιήσει αυτή τη δημοσίευση!"
-    search_for: "Αναζήτηση για <%= name %>"
+    search_for: "Αναζήτηση για {{name}}"
     show_more: "Προβολή περισσότερων"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "OK, φαντάζομαι πως το #<%= tagName %> δεν ήταν και τόσο ενδιαφέρον τελικά..."
+      wasnt_that_interesting: "OK, φαντάζομαι πως το #{{tagName}} δεν ήταν και τόσο ενδιαφέρον τελικά..."
     timeago:
       day: "μία μέρα"
       days: "%d μέρες"
@@ -65,6 +83,4 @@ el:
       years: "%d χρόνια"
     videos:
       unknown: "Άγνωστος τύπος βίντεο"
-      watch: "Δείτε το βίντεο στο <%= provider %>"
-    web_sockets:
-      disconnected: "Το websocket είναι κλειστό: οι δημοσιεύσεις δεν θα αναμεταδίδονται ζωντανά πλέον."
\ No newline at end of file
+      watch: "Δείτε το βίντεο στο {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.en_1337.yml b/config/locales/javascript/javascript.en_1337.yml
index bf6906149..642c5b913 100644
--- a/config/locales/javascript/javascript.en_1337.yml
+++ b/config/locales/javascript/javascript.en_1337.yml
@@ -9,12 +9,14 @@ en_1337:
     aspect_dropdown:
       add_to_aspect: "4DD N00B"
       all_aspects: "4LL 45P3C75"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle:
-        few: "1N <%= count %> 45P3C75"
-        many: "1N <%= count %> 45P3C75"
-        one: "1N <%= count %> 45P3C7"
-        other: "1N <%= count %> 45P3C75"
-        two: "1N <%= count %> 45P3C75"
+        few: "1N {{count}} 45P3C75"
+        many: "1N {{count}} 45P3C75"
+        one: "1N {{count}} 45P3C7"
+        other: "1N {{count}} 45P3C75"
         zero: "4DD N00B"
     aspect_navigation:
       deselect_all: "D353L3C7 4LL"
@@ -27,6 +29,7 @@ en_1337:
     failed_to_like: "F41L3D 2 <3!"
     failed_to_post_message: "F41L3D 2 53ND 5P4M!"
     getting_started:
+      hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll:
       no_more: EOF
@@ -36,8 +39,29 @@ en_1337:
       public: "PUBL1C - Y0UR 5P4M W1LL B3 V151BL3 2 3V3RY0N3 4ND F0UND BY S34RCH 3NG1N35!"
     reshares:
       duplicate: "U H4V3 4LR34DY R35P4MM3D 7HI5!"
-    search_for: "S34RCH F0R <%= name %>"
+    search_for: "S34RCH F0R {{name}}"
     show_more: "5H0W M0R3!"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
+    tags:
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
       day: "4 D4Y"
       days: "%d D4Y5"
@@ -54,6 +78,4 @@ en_1337:
       years: "%d Y34R5"
     videos:
       unknown: "UNK0WN V1D30 7YP3"
-      watch: "W47CH 7H15 V1D30 0N <%= provider %>"
-    web_sockets:
-      disconnected: D15C0NN3C73D!
\ No newline at end of file
+      watch: "W47CH 7H15 V1D30 0N {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.en_pirate.yml b/config/locales/javascript/javascript.en_pirate.yml
index e8a4c117a..75ed83a2b 100644
--- a/config/locales/javascript/javascript.en_pirate.yml
+++ b/config/locales/javascript/javascript.en_pirate.yml
@@ -8,14 +8,41 @@ en_pirate:
   javascripts:
     aspect_dropdown:
       add_to_aspect: "Add to aspect"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle:
-        few: "In <%= count %> aspects"
-        many: "In <%= count %> aspects"
-        one: "In <%= count %> aspect"
-        other: "In <%= count %> aspects"
-        two: "In <%= count %> aspects"
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
         zero: "Add to aspect"
     getting_started:
+      hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
     reshares:
-      duplicate: "You've already reshared that post!"
\ No newline at end of file
+      duplicate: "You've already reshared that post!"
+    search_for: "Search for {{name}}"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
+    tags:
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
+    videos:
+      watch: "Watch this video on {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.en_shaw.yml b/config/locales/javascript/javascript.en_shaw.yml
index 3106e50e6..69c0aa335 100644
--- a/config/locales/javascript/javascript.en_shaw.yml
+++ b/config/locales/javascript/javascript.en_shaw.yml
@@ -8,12 +8,14 @@ en_shaw:
   javascripts:
     aspect_dropdown:
       add_to_aspect: "𐑨𐑛 𐑑 𐑨𐑕𐑐𐑧𐑒𐑑"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle:
-        few: "𐑦𐑯 <%= count %> 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
-        many: "𐑦𐑯 <%= count %> 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
-        one: "𐑦𐑯 <%= count %> 𐑨𐑕𐑐𐑧𐑒𐑑"
-        other: "𐑦𐑯 <%= count %> 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
-        two: "In <%= count %> aspects"
+        few: "𐑦𐑯 {{count}} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
+        many: "𐑦𐑯 {{count}} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
+        one: "𐑦𐑯 {{count}} 𐑨𐑕𐑐𐑧𐑒𐑑"
+        other: "𐑦𐑯 {{count}} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
         zero: "𐑨𐑛 𐑑 𐑨𐑕𐑐𐑧𐑒𐑑"
     comments:
       hide: "𐑣𐑲𐑛 𐑒𐑪𐑥𐑩𐑯𐑑𐑕"
@@ -22,6 +24,7 @@ en_shaw:
     failed_to_like: "𐑓𐑱𐑤𐑛 𐑑 𐑤𐑲𐑒!"
     failed_to_post_message: "𐑓𐑱𐑤𐑛 𐑑 𐑐𐑴𐑕𐑑 𐑥𐑧𐑕𐑩𐑡!"
     getting_started:
+      hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll:
       no_more: "𐑯𐑴 𐑥𐑹 𐑐𐑴𐑕𐑑𐑕."
@@ -29,8 +32,29 @@ en_shaw:
       at_least_one_aspect: "𐑿 𐑥𐑳𐑕𐑑 𐑐𐑳𐑚𐑤𐑦𐑖 𐑑 𐑨𐑑 𐑤𐑰𐑕𐑑 𐑢𐑳𐑯 𐑨𐑕𐑐𐑧𐑒𐑑"
     reshares:
       duplicate: "𐑿𐑝 𐑷𐑤𐑮𐑧𐑛𐑦 𐑮𐑦𐑖𐑺𐑛 𐑞𐑨𐑑 𐑐𐑴𐑕𐑑!"
-    search_for: "𐑕𐑻𐑗 𐑓𐑹 <%= name %>"
+    search_for: "𐑕𐑻𐑗 𐑓𐑹 {{name}}"
     show_more: "𐑖𐑴 𐑥𐑹"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
+    tags:
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
       day: "𐑩 𐑛𐑱"
       days: "%d 𐑛𐑱𐑟"
@@ -49,6 +73,4 @@ en_shaw:
       years: "%d 𐑘𐑽𐑟"
     videos:
       unknown: "𐑩𐑯𐑯𐑴𐑯 𐑝𐑦𐑛𐑦𐑴 𐑑𐑲𐑐"
-      watch: "𐑢𐑷𐑗 𐑞𐑦𐑕 𐑝𐑦𐑛𐑦𐑴 𐑪𐑯 <%= provider %>"
-    web_sockets:
-      disconnected: "𐑞 𐑢𐑧𐑚𐑕𐑪𐑒𐑩𐑑 𐑦𐑟 𐑒𐑤𐑴𐑟𐑛; 𐑐𐑴𐑕𐑑𐑕 𐑢𐑦𐑤 𐑯𐑴 𐑤𐑪𐑙𐑜𐑼 𐑚𐑰 𐑕𐑑𐑮𐑰𐑥𐑛 𐑤𐑲𐑝."
\ No newline at end of file
+      watch: "𐑢𐑷𐑗 𐑞𐑦𐑕 𐑝𐑦𐑛𐑦𐑴 𐑪𐑯 {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.eo.yml b/config/locales/javascript/javascript.eo.yml
index 548a1e084..c4d5e2ff4 100644
--- a/config/locales/javascript/javascript.eo.yml
+++ b/config/locales/javascript/javascript.eo.yml
@@ -9,16 +9,15 @@ eo:
     aspect_dropdown:
       add_to_aspect: "Aldoni kontakton"
       all_aspects: "Ĉiuj aspektoj"
-      error: "Ne estis eble komunigi kun <%= name %>. Ĉu vi ignoras ilin?"
+      error: "Ne estis eble komunigi kun {{name}}. Ĉu vi ignoras ilin?"
       select_aspects: "Elekti aspektojn"
-      started_sharing_with: "Vi komencis komunigi kun <%= name %>!"
-      stopped_sharing_with: "Vi ĉesis komunigi kun <%= name %>."
+      started_sharing_with: "Vi komencis komunigi kun {{name}}!"
+      stopped_sharing_with: "Vi ĉesis komunigi kun {{name}}."
       toggle:
-        few: "En <%= count %> aspektoj"
-        many: "En <%= count %> aspektoj"
-        one: "En <%= count %> aspekto"
-        other: "En <%= count %> aspektoj"
-        two: "En <%= count %> aspektoj"
+        few: "En {{count}} aspektoj"
+        many: "En {{count}} aspektoj"
+        one: "En {{count}} aspekto"
+        other: "En {{count}} aspektoj"
         zero: "Elekti aspektojn"
     aspect_navigation:
       deselect_all: "Malselekti ĉiujn"
@@ -32,7 +31,7 @@ eo:
     failed_to_post_message: "Ne povis afiŝi mesaĝon!"
     getting_started:
       alright_ill_wait: "En ordo, mi atendos."
-      hey: "Hej, <%= name %>!"
+      hey: "Hej, {{name}}!"
       no_tags: "Hej, vi ne sekvas iun etikedon! Ĉu tamen daŭrigi?"
       preparing_your_stream: "Preparante vian personan torenton..."
     infinite_scroll:
@@ -45,10 +44,29 @@ eo:
       public: "Publika - via afiŝo vidoteblos de ĉiuj kaj trovotos de retserĉaplikaĵoj."
     reshares:
       duplicate: "Nu, ĉu tiel bone? Vi jam rekonigis tiun afiŝon!"
-    search_for: "Serĉi por <%= name %>"
+    search_for: "Serĉi por {{name}}"
     show_more: "vidi plu"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "Nu, mi supozas, ke #<%= tagName %> ne estis tiel interese..."
+      wasnt_that_interesting: "Nu, mi supozas, ke #{{tagName}} ne estis tiel interese..."
     timeago:
       day: "unu tago"
       days: "%d tagoj"
@@ -67,6 +85,4 @@ eo:
       years: "%d jaroj"
     videos:
       unknown: "nekonata tipo de videaĵo"
-      watch: "Vidi tiun ĉi videon je <%= provider %>"
-    web_sockets:
-      disconnected: "La reta kontaktoskatolo estas fermita; afiŝoj ne plu rekte fluos."
\ No newline at end of file
+      watch: "Vidi tiun ĉi videon je {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.es-AR.yml b/config/locales/javascript/javascript.es-AR.yml
index b14bbf066..59b88ea15 100644
--- a/config/locales/javascript/javascript.es-AR.yml
+++ b/config/locales/javascript/javascript.es-AR.yml
@@ -9,16 +9,15 @@ es-AR:
     aspect_dropdown:
       add_to_aspect: "Agregar contacto"
       all_aspects: "Todos los aspectos"
-      error: "No se pudo empezar a compartir con <%= name %>.  ¿Será que lo/a estás ignorando?"
+      error: "No se pudo empezar a compartir con {{name}}.  ¿Será que lo/a estás ignorando?"
       select_aspects: "Selecciona aspectos"
-      started_sharing_with: "Empezaste a compartir con <%= name %>!"
-      stopped_sharing_with: "Dejaste de compartir con <%= name %>."
+      started_sharing_with: "Empezaste a compartir con {{name}}!"
+      stopped_sharing_with: "Dejaste de compartir con {{name}}."
       toggle:
-        few: "En <%= count %> aspectos"
-        many: "En <%= count %> aspectos"
-        one: "En <%= count %> aspecto"
-        other: "En <%= count %> aspectos"
-        two: "En <%= count %> aspectos"
+        few: "En {{count}} aspectos"
+        many: "En {{count}} aspectos"
+        one: "En {{count}} aspecto"
+        other: "En {{count}} aspectos"
         zero: "Seleccionar aspectos"
     aspect_navigation:
       deselect_all: "De-seleccionar todo"
@@ -32,7 +31,7 @@ es-AR:
     failed_to_post_message: "¡No pudo publicarse el mensaje!"
     getting_started:
       alright_ill_wait: "Todo bien, voy a esperar."
-      hey: "Che, <%= name %>!"
+      hey: "Che, {{name}}!"
       no_tags: "¡Che, no estás siguiendo ningún tag! ¿Continuar de todos modos?"
       preparing_your_stream: "Preparando tu stream personalizado..."
     infinite_scroll:
@@ -45,10 +44,29 @@ es-AR:
       public: "Publica - tu publicación sera visible para cualquiera y los buscadores podrán encontrarla"
     reshares:
       duplicate: "¿Te gustó eh? ¡Ya habías compartido esa publicación!"
-    search_for: "Buscar a <%= name %>"
+    search_for: "Buscar a {{name}}"
     show_more: "mostrar más"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "OK, supongamos que #<%= tagName %> no era tan interesante..."
+      wasnt_that_interesting: "OK, supongamos que #{{tagName}} no era tan interesante..."
     timeago:
       day: "un día"
       days: "%d días"
@@ -67,6 +85,4 @@ es-AR:
       years: "%d años"
     videos:
       unknown: "Tipo de video desconocido"
-      watch: "Ver este video en <%= provider %>"
-    web_sockets:
-      disconnected: "La conexión WebSocket está cerrada; las publicaciones ya no serán transmitidas en vivo."
\ No newline at end of file
+      watch: "Ver este video en {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index 98af3ccb4..a65c471b7 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -9,7 +9,7 @@ es:
     aspect_dropdown:
       add_to_aspect: "Añadir contacto"
       all_aspects: "Todos los aspectos"
-      error: "No podría empezar a compartir con <%= name %>.  ¿Vas a ignonarl@?"
+      error: "No podría empezar a compartir con <%= name %>. ¿Vas a ignonarl@?"
       select_aspects: "Elige los aspectos"
       started_sharing_with: "¡Ahora sigues los mensajes públicos de <%= name %>!"
       stopped_sharing_with: "Ya no compartes más con <%= name %>."
@@ -18,7 +18,6 @@ es:
         many: "En <%= count %> aspectos"
         one: "En <%= count %> aspecto"
         other: "En <%= count %> aspectos"
-        two: "En <%= count %> aspectos"
         zero: "Elige los aspectos"
     aspect_navigation:
       deselect_all: "Desmarcar todos"
@@ -47,6 +46,25 @@ es:
       duplicate: "Que bien, ¿eh? ¡Has compartido esa publicación!"
     search_for: "Buscar a <%= name %>"
     show_more: "mostrar más"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
       wasnt_that_interesting: "OK, supongo que #<%= tagName %> no era tan interesante..."
     timeago:
@@ -67,6 +85,4 @@ es:
       years: "%d años"
     videos:
       unknown: "Tipo de video desconocido"
-      watch: "Ver este video con <%= provider %>"
-    web_sockets:
-      disconnected: "El canal está cerrado; las publicaciones no serán actualizadas al momento."
\ No newline at end of file
+      watch: "Ver este video con <%= provider %>"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.eu.yml b/config/locales/javascript/javascript.eu.yml
index fd50b02c8..abed6cc1f 100644
--- a/config/locales/javascript/javascript.eu.yml
+++ b/config/locales/javascript/javascript.eu.yml
@@ -9,15 +9,15 @@ eu:
     aspect_dropdown:
       add_to_aspect: "Adiskidea gehitu"
       all_aspects: "Alderdi guztiak"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Alderdiak aukeratu"
-      started_sharing_with: "<%= name %>(r)ekin harremanetan hasi zara!"
-      stopped_sharing_with: "Jada ez zaude <%= name %>(r)ekin harremanetan."
+      started_sharing_with: "{{name}}(r)ekin harremanetan hasi zara!"
+      stopped_sharing_with: "Jada ez zaude {{name}}(r)ekin harremanetan."
       toggle:
-        few: "<%= count %> alderdietan"
-        many: "<%= count %> alderdietan"
-        one: "Alderdi <%= count %>ean"
-        other: "<%= count %> alderdietan"
-        two: "<%= count %> alderditan"
+        few: "{{count}} alderdietan"
+        many: "{{count}} alderdietan"
+        one: "Alderdi {{count}}ean"
+        other: "{{count}} alderdietan"
         zero: "Alderdial hautatu"
     aspect_navigation:
       deselect_all: "Guztiak deshautatu"
@@ -31,7 +31,7 @@ eu:
     failed_to_post_message: "Huts egin du mezuaren bidalketak!"
     getting_started:
       alright_ill_wait: "Beno, itxarongo dut."
-      hey: "Aizu, <%= name %>!"
+      hey: "Aizu, {{name}}!"
       no_tags: "Aizu, ez duzu etiketarik jarraitzen! Jarraitu hala ere?"
       preparing_your_stream: "Zure kronologia pertsonalizatua prestatzen..."
     infinite_scroll:
@@ -44,10 +44,29 @@ eu:
       public: "Publikoa - zure mezua edonork ikusi ahalko du, bai eta bilaketa zerbitzuetan agertu ere"
     reshares:
       duplicate: "Oso ona, e? Dagoeneko birpartekatu duzu mezu hori!"
-    search_for: "Bilatu <%= name %>"
+    search_for: "Bilatu {{name}}"
     show_more: "erakutsi gehiago"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "Beno, suposatzen dut #<%= tagName %> ez zela oso interesgarria..."
+      wasnt_that_interesting: "Beno, suposatzen dut #{{tagName}} ez zela oso interesgarria..."
     timeago:
       day: "egun bat"
       days: "%d egun"
@@ -65,6 +84,4 @@ eu:
       years: "%d urte"
     videos:
       unknown: "Bideo mota ezezaguna"
-      watch: "Ikusi bideo hau <%= provider %>(e)n"
-    web_sockets:
-      disconnected: "Websocketa itxita dago; mezuak ez dira denbora errealean azalduko."
\ No newline at end of file
+      watch: "Ikusi bideo hau {{provider}}(e)n"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.fi.yml b/config/locales/javascript/javascript.fi.yml
index 465fe9450..1876e2cfe 100644
--- a/config/locales/javascript/javascript.fi.yml
+++ b/config/locales/javascript/javascript.fi.yml
@@ -9,16 +9,15 @@ fi:
     aspect_dropdown:
       add_to_aspect: "Lisää kontakti"
       all_aspects: "Kaikki näkymät"
-      error: "Ei voitu aloittaa jakamaan käyttäjän <%= name %> kanssa. Oletko sivuuttanut hänet?"
+      error: "Ei voitu aloittaa jakamaan käyttäjän {{name}} kanssa. Oletko sivuuttanut hänet?"
       select_aspects: "Valitse näkymät"
-      started_sharing_with: "Olet alkanut jakaa käyttäjän <%= name %> kanssa!"
-      stopped_sharing_with: "Olet lopettanut jakamisen käyttäjän <%= name %> kanssa."
+      started_sharing_with: "Olet alkanut jakaa käyttäjän {{name}} kanssa!"
+      stopped_sharing_with: "Olet lopettanut jakamisen käyttäjän {{name}} kanssa."
       toggle:
-        few: "<%= count %> näkymässä"
-        many: "<%= count %> näkymässä"
-        one: "<%= count %> näkymässä"
-        other: "<%= count %> näkymässä"
-        two: "<%= count %> näkymässä"
+        few: "{{count}} näkymässä"
+        many: "{{count}} näkymässä"
+        one: "{{count}} näkymässä"
+        other: "{{count}} näkymässä"
         zero: "Valitse näkymät"
     aspect_navigation:
       deselect_all: "Poista valinnat"
@@ -32,7 +31,7 @@ fi:
     failed_to_post_message: "Viestin lähetys epäonnistui!"
     getting_started:
       alright_ill_wait: "Okei, minä odotan."
-      hey: "Hei <%= name %>!"
+      hey: "Hei {{name}}!"
       no_tags: "Hei, et seuraa yhtäkään tagia!  Jatketaanko silti?"
       preparing_your_stream: "Yksilöllistä virtaasi valmistellaan..."
     infinite_scroll:
@@ -45,10 +44,29 @@ fi:
       public: "Julkinen - viestisi näkyvät kaikille mukaan lukien hakukoneet ja niiden tulokset"
     reshares:
       duplicate: "Olet jo uudelleenjakanut viesti!"
-    search_for: "Etsi nimellä <%= name %>"
+    search_for: "Etsi nimellä {{name}}"
     show_more: "näytä lisää"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "OK, #<%= tagName %> ei tainnut ollakaan kovin kiinnostava aihe..."
+      wasnt_that_interesting: "OK, #{{tagName}} ei tainnut ollakaan kovin kiinnostava aihe..."
     timeago:
       day: päivä
       days: "%d päivää"
@@ -65,6 +83,4 @@ fi:
       years: "%d vuotta"
     videos:
       unknown: "Tuntematon videomuoto"
-      watch: "Katso video <%= provider %> :ssa"
-    web_sockets:
-      disconnected: "Yhteys on suljettu; viestejä ei enää esitetä reaaliaikaisesti."
\ No newline at end of file
+      watch: "Katso video {{provider}} :ssa"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml
index 27b5c074d..49227d9bc 100644
--- a/config/locales/javascript/javascript.fr.yml
+++ b/config/locales/javascript/javascript.fr.yml
@@ -9,16 +9,15 @@ fr:
     aspect_dropdown:
       add_to_aspect: "Ajouter le contact"
       all_aspects: "Tous les aspects"
-      error: "Impossible de partager avec <%= name %>. Ignorez-vous cette personne ?"
+      error: "Impossible de partager avec {{name}}. Ignorez-vous cette personne ?"
       select_aspects: "Choisir les aspects"
-      started_sharing_with: "Vous avez commencé à partager avec <%= name %> !"
-      stopped_sharing_with: "Vous avez arrêté de partager avec <%= name %>."
+      started_sharing_with: "Vous avez commencé à partager avec {{name}} !"
+      stopped_sharing_with: "Vous avez arrêté de partager avec {{name}}."
       toggle:
-        few: "Dans <%= count %> aspects"
-        many: "Dans <%= count %> aspects"
-        one: "Dans <%= count %> aspect"
-        other: "Dans <%= count %> aspects"
-        two: "Dans <%= count %> aspects"
+        few: "Dans {{count}} aspects"
+        many: "Dans {{count}} aspects"
+        one: "Dans {{count}} aspect"
+        other: "Dans {{count}} aspects"
         zero: "Sélectionnez les aspects"
     aspect_navigation:
       deselect_all: "Désélectionner tout"
@@ -32,7 +31,7 @@ fr:
     failed_to_post_message: "Impossible de partager le message !"
     getting_started:
       alright_ill_wait: "Bon, je vais attendre."
-      hey: "Hey, <%= name %> !"
+      hey: "Hey, {{name}} !"
       no_tags: "Hey, vous ne suivez aucun tag ! Continuer quand même ?"
       preparing_your_stream: "Préparation de votre flux personnalisé..."
     infinite_scroll:
@@ -45,10 +44,29 @@ fr:
       public: "Public - votre message sera visible de tous et trouvé par les moteurs de recherche"
     reshares:
       duplicate: "C'est si bien que ça ? Vous avez déjà repartagé ce message !"
-    search_for: "Chercher <%= name %>"
+    search_for: "Chercher {{name}}"
     show_more: "Voir plus"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "Ok, je suppose que #<%= tagName %> n'est pas la seule chose qui vous intéresse..."
+      wasnt_that_interesting: "Ok, je suppose que #{{tagName}} n'est pas la seule chose qui vous intéresse..."
     timeago:
       day: "environ un jour"
       days: "environ %d jours"
@@ -67,6 +85,4 @@ fr:
       years: "%d ans"
     videos:
       unknown: "Type de vidéo inconnu"
-      watch: "Voir cette vidéo sur <%= provider %>"
-    web_sockets:
-      disconnected: "Le WebSocket est fermé, les messages ne seront plus diffusés en direct."
\ No newline at end of file
+      watch: "Voir cette vidéo sur {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.he.yml b/config/locales/javascript/javascript.he.yml
index 4d0f63f28..8d867019a 100644
--- a/config/locales/javascript/javascript.he.yml
+++ b/config/locales/javascript/javascript.he.yml
@@ -14,11 +14,10 @@ he:
       started_sharing_with: "{{name}}! התחלת לשתף עם"
       stopped_sharing_with: "{{name}} הפסקת לשתף עם"
       toggle:
-        few: "<%= count %> תחומי עניין ב"
-        many: "<%= count %> תחומי עניין ב"
-        one: "<%= count %> בתחום עניין "
-        other: "ב־<%= count %> היבטים"
-        two: "ב־<%= count %> היבטים"
+        few: "{{count}} תחומי עניין ב"
+        many: "{{count}} תחומי עניין ב"
+        one: "{{count}}בתחום עניין "
+        other: "ב־{{count}} היבטים"
         zero: "בחר תחום עניין"
     aspect_navigation:
       deselect_all: "בטל את הסימון"
@@ -32,7 +31,7 @@ he:
     failed_to_post_message: "פרסום ההודעה נכשל!"
     getting_started:
       alright_ill_wait: "בסדר, אני אמתין."
-      hey: "שלום, <%= name %>!"
+      hey: "שלום, {{name}}!"
       no_tags: "?היי, לא עקבת אחרי אף תגית! לאן אתה רוצה להמשיך"
       preparing_your_stream: "החדשות האישיות שלך בשלבי הכנה"
     infinite_scroll:
@@ -45,10 +44,29 @@ he:
       public: "ציבורי - הרשומה שלך תהיה גלויה לכולם וניתן יהיה למצוא אותה במנועי חיפוש"
     reshares:
       duplicate: "כבר שיתפת רשומה זו בעבר "
-    search_for: " <%= name %>חיפוש אחר"
+    search_for: " {{name}}חיפוש אחר"
     show_more: "הצגת עוד"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "...זה לא היה כל כך מעניין#<%= tagName %> אוקיי, אני מניח "
+      wasnt_that_interesting: "...זה לא היה כל כך מעניין#{{tagName}} אוקיי, אני מניח "
     timeago:
       day: יום
       days: "%d ימים"
@@ -67,6 +85,4 @@ he:
       years: "%d שנים"
     videos:
       unknown: "סוג הווידאו אינו ידוע"
-      watch: " <%= provider %>צפייה בסרטון וידאו זה באתר"
-    web_sockets:
-      disconnected: "צינור ההודעות סגור; הודעות לא יוצגו בזמן אמת"
+      watch: " {{provider}}צפייה בסרטון וידאו זה באתר"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml
index b7e283784..784719b61 100644
--- a/config/locales/javascript/javascript.hu.yml
+++ b/config/locales/javascript/javascript.hu.yml
@@ -9,16 +9,15 @@ hu:
     aspect_dropdown:
       add_to_aspect: "Hozzáadás a csoporthoz"
       all_aspects: "Összes csoport"
-      error: "Nem indult el a megosztás vele: <%= name %>. Visszavonod?"
+      error: "Nem indult el a megosztás vele: {{name}}. Visszavonod?"
       select_aspects: "Csoportok kiválasztása"
-      started_sharing_with: "Mostantól megosztassz vele: <%= name %>!"
-      stopped_sharing_with: "Nem osztassz meg többé vele: <%= name %>."
+      started_sharing_with: "Mostantól megosztassz vele: {{name}}!"
+      stopped_sharing_with: "Nem osztassz meg többé vele: {{name}}."
       toggle:
-        few: "<%= count %> csoportban"
-        many: "<%= count %> csoportban"
-        one: "<%= count %> csoportban"
-        other: "<%= count %> csoportban"
-        two: "<%= count %> csoportban"
+        few: "{{count}} csoportban"
+        many: "{{count}} csoportban"
+        one: "{{count}} csoportban"
+        other: "{{count}} csoportban"
         zero: "Csoportok kiválasztása"
     aspect_navigation:
       deselect_all: "Összes kijelölés megszüntetése"
@@ -32,7 +31,7 @@ hu:
     failed_to_post_message: "Üzenet elküldése sikertelen!"
     getting_started:
       alright_ill_wait: "Rendben, várok!"
-      hey: "Szia <%= name %>!"
+      hey: "Szia {{name}}!"
       no_tags: "Hékás, nem követtél egy #címkét sem! Így is folytatod?"
       preparing_your_stream: "Személyre szabott hírfolyamod előkészítése..."
     infinite_scroll:
@@ -45,10 +44,29 @@ hu:
       public: "Nyilvános - ezt a bejegyzést bárki láthatja az interneten."
     reshares:
       duplicate: "Jó mi? De már egyszer megosztottad ezt a bejegyzést!"
-    search_for: "<%= name %> keresése."
+    search_for: "{{name}} keresése."
     show_more: tovább
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "Oké, azt hiszem a #<%= tagName %> nem volt annyira érdekes."
+      wasnt_that_interesting: "Oké, azt hiszem a #{{tagName}} nem volt annyira érdekes."
     timeago:
       day: "egy nappal"
       days: "%d nappal"
@@ -65,6 +83,4 @@ hu:
       years: "%d évvel"
     videos:
       unknown: "Ismeretlen videó tipus"
-      watch: "Videó megtekintése itt: <%= provider %>"
-    web_sockets:
-      disconnected: "A websocket zárolva van. A bejegyzések nem lesznek előben stream-elve."
\ No newline at end of file
+      watch: "Videó megtekintése itt: {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.id.yml b/config/locales/javascript/javascript.id.yml
index 5e69536b5..cbd2adc89 100644
--- a/config/locales/javascript/javascript.id.yml
+++ b/config/locales/javascript/javascript.id.yml
@@ -8,17 +8,42 @@ id:
   javascripts:
     aspect_dropdown:
       add_to_aspect: "Add to aspect"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle:
-        few: "In <%= count %> aspects"
-        many: "In <%= count %> aspects"
-        one: "In <%= count %> aspect"
-        other: "In <%= count %> aspects"
-        two: "In <%= count %> aspects"
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
         zero: "Add to aspect"
     getting_started:
+      hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
     reshares:
       duplicate: "You've already reshared that post!"
+    search_for: "Search for {{name}}"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
+    tags:
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
       day: sehari
       days: "%d hari"
@@ -32,4 +57,6 @@ id:
       suffixAgo: "yang lalu"
       suffixFromNow: "dari sekarang"
       year: "sekitar setahun"
-      years: "%d tahun"
\ No newline at end of file
+      years: "%d tahun"
+    videos:
+      watch: "Watch this video on {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.is.yml b/config/locales/javascript/javascript.is.yml
index 42a900e61..66276ecfc 100644
--- a/config/locales/javascript/javascript.is.yml
+++ b/config/locales/javascript/javascript.is.yml
@@ -8,18 +8,43 @@ is:
   javascripts:
     aspect_dropdown:
       add_to_aspect: "Add to aspect"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle:
-        few: "In <%= count %> aspects"
-        many: "In <%= count %> aspects"
-        one: "In <%= count %> aspect"
-        other: "In <%= count %> aspects"
-        two: "In <%= count %> aspects"
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
         zero: "Add to aspect"
     confirm_dialog: "Ertu viss?"
     getting_started:
+      hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
     reshares:
       duplicate: "You've already reshared that post!"
+    search_for: "Search for {{name}}"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
+    tags:
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
       day: "á dag"
       days: "%d dagar"
@@ -35,4 +60,4 @@ is:
       years: "%d ára"
     videos:
       unknown: "Óþekkt vídeó tegund"
-      watch: "Horfa á þetta vídeó á <%= provider %>"
\ No newline at end of file
+      watch: "Horfa á þetta vídeó á {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.it.yml b/config/locales/javascript/javascript.it.yml
index cfbbde881..285f27123 100644
--- a/config/locales/javascript/javascript.it.yml
+++ b/config/locales/javascript/javascript.it.yml
@@ -9,16 +9,15 @@ it:
     aspect_dropdown:
       add_to_aspect: Aggiungi
       all_aspects: "Tutti gli aspetti"
-      error: "Non è possibile condividere con <%= name %>. E' tra gli utenti ignorati?"
+      error: "Non è possibile condividere con {{name}}. E' tra gli utenti ignorati?"
       select_aspects: "Scegli gli aspetti"
-      started_sharing_with: "Hai iniziato a condividere con <%= name %>!"
-      stopped_sharing_with: "Hai smesso di condividere con <%= name %>."
+      started_sharing_with: "Hai iniziato a condividere con {{name}}!"
+      stopped_sharing_with: "Hai smesso di condividere con {{name}}."
       toggle:
-        few: "In <%= count %> aspetti"
-        many: "In <%= count %> aspetti"
-        one: "In <%= count %> aspetto"
-        other: "In <%= count %> aspetti"
-        two: "In <%= count %> aspetti"
+        few: "In {{count}} aspetti"
+        many: "In {{count}} aspetti"
+        one: "In {{count}} aspetto"
+        other: "In {{count}} aspetti"
         zero: "Scegli gli aspetti"
     aspect_navigation:
       deselect_all: "Deseleziona tutti"
@@ -32,7 +31,7 @@ it:
     failed_to_post_message: "Invio messaggio fallito!"
     getting_started:
       alright_ill_wait: "Perfetto, aspetterò."
-      hey: "Ciao, <%= name %>!"
+      hey: "Ciao, {{name}}!"
       no_tags: "Non hai scelto di seguire alcun tag, vuoi continuare comunque?"
       preparing_your_stream: "Sto preparando il tuo stream personalizzato..."
     infinite_scroll:
@@ -45,10 +44,29 @@ it:
       public: "Pubblico - il tuo post sarà visibile a tutti, inclusi i motori di ricerca"
     reshares:
       duplicate: "Bello eh? Ma hai già condiviso quel post!"
-    search_for: "Ricerca per <%= name %>"
+    search_for: "Ricerca per {{name}}"
     show_more: continua...
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "OK, immagino che #<%= tagName %> non fosse così interessante..."
+      wasnt_that_interesting: "OK, immagino che #{{tagName}} non fosse così interessante..."
     timeago:
       day: "un giorno"
       days: "%d giorni"
@@ -66,6 +84,4 @@ it:
       years: "%d anni"
     videos:
       unknown: "Tipo di video sconosciuto"
-      watch: "Guarda questo video su <%= provider %>"
-    web_sockets:
-      disconnected: "Il websocket è chiuso; i post non saranno più aggiornati in tempo reale."
\ No newline at end of file
+      watch: "Guarda questo video su {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.ja.yml b/config/locales/javascript/javascript.ja.yml
index 7a4b70509..6d2702ad3 100644
--- a/config/locales/javascript/javascript.ja.yml
+++ b/config/locales/javascript/javascript.ja.yml
@@ -8,15 +8,18 @@ ja:
   javascripts:
     aspect_dropdown:
       add_to_aspect: "Add to aspect"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle:
-        few: "In <%= count %> aspects"
-        many: "In <%= count %> aspects"
-        one: "In <%= count %> aspect"
-        other: "In <%= count %> aspects"
-        two: "In <%= count %> aspects"
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
         zero: "Add to aspect"
     confirm_dialog: 本当にいいですか。
     getting_started:
+      hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll:
       no_more: 投稿はこれ以上ありません。
@@ -24,7 +27,28 @@ ja:
       at_least_one_aspect: アスペクトを選択してから投稿してください。
     reshares:
       duplicate: "You've already reshared that post!"
-    search_for: "<%= name %>を検索する"
+    search_for: "{{name}}を検索する"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
+    tags:
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
       day: 1日
       days: "%d日"
@@ -42,6 +66,4 @@ ja:
       years: "%d年"
     videos:
       unknown: 動画の種類が不明です
-      watch: "<%= provider %>で動画を視聴する"
-    web_sockets:
-      disconnected: 接続が解除されました。投稿のリアルタイム更新を中断します。
\ No newline at end of file
+      watch: "{{provider}}で動画を視聴する"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.ka.yml b/config/locales/javascript/javascript.ka.yml
index 0ce619fe4..721dbf097 100644
--- a/config/locales/javascript/javascript.ka.yml
+++ b/config/locales/javascript/javascript.ka.yml
@@ -9,16 +9,15 @@ ka:
     aspect_dropdown:
       add_to_aspect: "კონტაქტის დამატება"
       all_aspects: "ყველა ასპექტი"
-      error: "<%= name %>-თან გაზიარების დაწყება ვერ მოხერხდა. იგნორირება ხომ არ გაუკეთეთ მას?"
+      error: "{{name}}-თან გაზიარების დაწყება ვერ მოხერხდა. იგნორირება ხომ არ გაუკეთეთ მას?"
       select_aspects: "აირჩიეთ ასპექტები"
-      started_sharing_with: "თქვნ დაიწყეთ <%= name %>-თან გაზიარება!"
-      stopped_sharing_with: "თქვენ შეწყვიტეთ <%= name %>-თან გაზიარება."
+      started_sharing_with: "თქვნ დაიწყეთ {{name}}-თან გაზიარება!"
+      stopped_sharing_with: "თქვენ შეწყვიტეთ {{name}}-თან გაზიარება."
       toggle:
-        few: "<%= count %> ასპექტში"
-        many: "<%= count %> ასპექტში"
-        one: "<%= count %> ასპექტში"
-        other: "<%= count %> ასპექტში"
-        two: "<%= count %> ასპექტში"
+        few: "{{count}} ასპექტში"
+        many: "{{count}} ასპექტში"
+        one: "{{count}} ასპექტში"
+        other: "{{count}} ასპექტში"
         zero: "აირჩიეთ ასპექტები"
     aspect_navigation:
       deselect_all: "მონიშვნის მოხსნა"
@@ -32,7 +31,7 @@ ka:
     failed_to_post_message: "შეტყობინების გამოცხადება ჩაიშალა!"
     getting_started:
       alright_ill_wait: "კარგი, მოვიცდი."
-      hey: "ჰეი, <%= name %>!"
+      hey: "ჰეი, {{name}}!"
       no_tags: "ჰეი, თქვენ არ მიყვებით არცერთ ტეგს! მაინც გსურთ გაგრძელება?"
       preparing_your_stream: "თქვენი პერსონალიზებული ნაკადი მზადდება..."
     infinite_scroll:
@@ -45,10 +44,29 @@ ka:
       public: "საჯარო - თქვენს პოსტს დაინახავს ყველა და მას მოძებნილი იქნებიან საძიბო სისტემებით"
     reshares:
       duplicate: "ასეთი მაგარია?  თქვენ უკვე გააზიარეთ ეს პოსტი!"
-    search_for: "ძებნა <%= name %>"
+    search_for: "ძებნა {{name}}"
     show_more: "მეტის ჩვენება"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "კარგი, მე ვფიქრობ რომ #<%= tagName %> არც ისე საინტერესო იყო..."
+      wasnt_that_interesting: "კარგი, მე ვფიქრობ რომ #{{tagName}} არც ისე საინტერესო იყო..."
     timeago:
       day: დღე
       days: "%d დღე"
@@ -67,6 +85,4 @@ ka:
       years: "%d წელი"
     videos:
       unknown: "ვიდეოს ტიპი უცნობია"
-      watch: "ვიდეოს ნახვა საიტზე <%= provider %>"
-    web_sockets:
-      disconnected: "ვებ-სოკეტი დახურულია; განხადებების ნაკადი აღარ მოედინება პირდაპირ."
\ No newline at end of file
+      watch: "ვიდეოს ნახვა საიტზე {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.ko.yml b/config/locales/javascript/javascript.ko.yml
index d742dc959..ef4e3a9dc 100644
--- a/config/locales/javascript/javascript.ko.yml
+++ b/config/locales/javascript/javascript.ko.yml
@@ -9,16 +9,15 @@ ko:
     aspect_dropdown:
       add_to_aspect: "애스펙에 넣기"
       all_aspects: "모든 에스팩"
-      error: "<%= name %>님과 공유를 시작할 수 없습니다. 혹시 무시하고 있습니까?"
+      error: "{{name}}님과 공유를 시작할 수 없습니다. 혹시 무시하고 있습니까?"
       select_aspects: "에스팩 선택"
-      started_sharing_with: "<%= name %>님과의 공유를 시작합니다!"
-      stopped_sharing_with: "<%= name %>님과의 공유를 멈췄습니다."
+      started_sharing_with: "{{name}}님과의 공유를 시작합니다!"
+      stopped_sharing_with: "{{name}}님과의 공유를 멈췄습니다."
       toggle:
-        few: "애스펙 <%= count %>개 안에 있습니다"
-        many: "애스펙 <%= count %>개 안에 있습니다"
+        few: "애스펙 {{count}}개 안에 있습니다"
+        many: "애스펙 {{count}}개 안에 있습니다"
         one: "애스펙 한 개 안에 있습니다"
-        other: "애스펙 <%= count %>개 안에 있습니다"
-        two: "<%= count %>개의 에스팩에서"
+        other: "애스펙 {{count}}개 안에 있습니다"
         zero: "애스펙에 넣기"
     aspect_navigation:
       deselect_all: "선택 해제"
@@ -31,7 +30,7 @@ ko:
     failed_to_like: "좋아요를 실패했습니다!"
     failed_to_post_message: "메시지 게시를 실패하였습니다!"
     getting_started:
-      hey: "<%= name %>님 안녕하세요?"
+      hey: "{{name}}님 안녕하세요?"
       no_tags: "태그를 팔로우하지 않았습니다. 그래도 계속하시겠습니까?"
       preparing_your_stream: "개인화 스트림 준비중···"
     infinite_scroll:
@@ -44,10 +43,29 @@ ko:
       public: "공개 - 내 게시물을 누구나 볼 수 있고 검색 엔진으로 찾을 수 있습니다"
     reshares:
       duplicate: "이미 재공유된 게시물입니다!"
-    search_for: "<%= name %> 검색"
+    search_for: "{{name}} 검색"
     show_more: "더 보기"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "처리했습니다. #<%= tagName %> 태그는 흥미롭지 않았군요?"
+      wasnt_that_interesting: "처리했습니다. #{{tagName}} 태그는 흥미롭지 않았군요?"
     timeago:
       day: 하루
       days: "%d일"
@@ -65,6 +83,4 @@ ko:
       years: "%d년"
     videos:
       unknown: "알 수 없는 동영상 형식"
-      watch: "동영상을 <%= provider %>에서 보기"
-    web_sockets:
-      disconnected: "웹소켓이 닫혔습니다. 앞으로는 게시물이 실시간으로 제공되지 않습니다."
\ No newline at end of file
+      watch: "동영상을 {{provider}}에서 보기"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.ml.yml b/config/locales/javascript/javascript.ml.yml
index 7d7cf3f89..c39b4606c 100644
--- a/config/locales/javascript/javascript.ml.yml
+++ b/config/locales/javascript/javascript.ml.yml
@@ -3,10 +3,95 @@
 #   the COPYRIGHT file.
 
 
-ml: 
-  javascripts: 
+ml:
+  javascripts:
+    aspect_dropdown:
+      add_to_aspect: "Add to aspect"
+      all_aspects: "All aspects"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      select_aspects: "Select aspects"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
+      toggle:
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
+        zero: "Add to aspect"
+    aspect_navigation:
+      deselect_all: "Deselect all"
+      no_aspects: "No aspects selected"
+      select_all: "Select all"
+    comments:
+      hide: "hide comments"
+      show: "show all comments"
     confirm_dialog: "താങ്കള്‍ക്ക് ഉറപ്പാണോ?"
-    timeago: 
+    delete: "Delete"
+    failed_to_like: "Failed to like!"
+    failed_to_post_message: "Failed to post message!"
+    getting_started:
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personalized stream..."
+    header:
+      admin: "Admin"
+      contacts: "Contacts"
+      home: "Home"
+      log_out: "Log out"
+      mark_all_as_read: "Mark all as read"
+      messages: "Messages"
+      notifications: "Notifications"
+      profile: "Profile"
+      recent_notifications: "Recent Notifications"
+      search: "Find people or #tags"
+      settings: "Settings"
+      view_all: "View all"
+    ignore: "Ignore"
+    infinite_scroll:
+      no_more: "കൂടുതല്‍ പോസ്റ്റുകളൊന്നുമില്ല."
+    photo_uploader:
+      looking_good: "OMG, you look awesome!"
+    publisher:
+      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"
+    reshares:
+      duplicate: "You've already reshared that post!"
+    search_for: "{{name}}നായി തിരയുക"
+    show_more: "show more"
+    stream:
+      comment: "Comment"
+      hide: "Hide"
+      like: "Like"
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      limited: "Limited"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      nsfw: "This post has been flagged NSFW by its author."
+      original_post_deleted: "Original post deleted by author."
+      public: "Public"
+      reshare: "Reshare"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
+      show: "Show"
+      unlike: "Unlike"
+    tags:
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
+    timeago:
       day: "ഒരു ദിവസം"
       days: "%d ദിവസങ്ങള്‍"
       hour: "ഉദ്ദേശം ഒരു മണീക്കൂര്‍"
@@ -18,37 +103,10 @@ ml:
       prefixAgo: ""
       prefixFromNow: "ഇപ്പോള്‍ മുതല്‍"
       seconds: "ഏതാനും നിമിഷങ്ങള്‍"
-      suffixAgo: "മുന്‍പ്"
-      suffixFromNow: "വരെ"
+      suffixAgo: മുന്‍പ്
+      suffixFromNow: വരെ
       year: "ഉദ്ദേശം ഒരു വര്‍ഷം"
       years: "%d വര്‍ഷങ്ങള്‍ക്ക്"
-    videos: 
+    videos:
       unknown: "അജ്ഞാതമായ തരം വീഡിയോ"
-      watch: "ഈ വീഡിയോ <%= provider %>ല്‍ കാണുക"
-    search_for: "<%= name %>നായി തിരയുക"
-    infinite_scroll: 
-      no_more: "കൂടുതല്‍ പോസ്റ്റുകളൊന്നുമില്ല."
-    publisher: 
-      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"
-    web_sockets: 
-      disconnected: 
-        body: "പോസ്റ്റൂകള്‍ തത്സമയമായി കാണിക്കുന്നതല്ല."
-        title: "താങ്കള്‍ വിച്ഛേദിക്കപ്പെട്ടിരിക്കുന്നു."
-    aspect_dropdown:
-      add_to_aspect: "Add to aspect"
-      toggle:
-        zero: "Add to aspect"
-        one: "In <%= count %> aspect"
-        few: "In <%= count %> aspects"
-        many: "In <%= count %> aspects"
-        other: "In <%= count %> aspects"
-    show_more: "show more"
-    failed_to_like: "Failed to like!"
-    failed_to_post_message: "Failed to post message!"
-    comments:
-      show: "show all comments"
-      hide: "hide comments"
-    reshares:
-      duplicate: "You've already reshared that post!"
+      watch: "ഈ വീഡിയോ {{provider}}ല്‍ കാണുക"
diff --git a/config/locales/javascript/javascript.ms.yml b/config/locales/javascript/javascript.ms.yml
index 5c7349409..9754d8e98 100644
--- a/config/locales/javascript/javascript.ms.yml
+++ b/config/locales/javascript/javascript.ms.yml
@@ -9,16 +9,15 @@ ms:
     aspect_dropdown:
       add_to_aspect: "Tambah kenalan"
       all_aspects: "Semua aspek"
-      error: "Tidak dapat berkongsi dengan <%= name %>.  Adakah anda mengabaikan mereka?"
+      error: "Tidak dapat berkongsi dengan {{name}}.  Adakah anda mengabaikan mereka?"
       select_aspects: "Pilih kenalan"
-      started_sharing_with: "Anda telah mula berkongsi dengan <%= name %>!"
-      stopped_sharing_with: "Anda telah berhenti berkongsi dengan <%= name %>."
+      started_sharing_with: "Anda telah mula berkongsi dengan {{name}}!"
+      stopped_sharing_with: "Anda telah berhenti berkongsi dengan {{name}}."
       toggle:
-        few: "Dalam <%= count %> aspek"
-        many: "Dalam <%= count %> aspek"
-        one: "Dalam <%= count %> aspek"
-        other: "dalam <%= count %> aspek"
-        two: "Dalam <%= count %> aspek"
+        few: "Dalam {{count}} aspek"
+        many: "Dalam {{count}} aspek"
+        one: "Dalam {{count}} aspek"
+        other: "dalam {{count}} aspek"
         zero: "Pilih aspek"
     aspect_navigation:
       deselect_all: "menyahpilih semua"
@@ -32,7 +31,7 @@ ms:
     failed_to_post_message: "Gagal untuk pos mesej!"
     getting_started:
       alright_ill_wait: "Baiklah, saya akan tunggu."
-      hey: "Hei, <%= name %>!"
+      hey: "Hei, {{name}}!"
       no_tags: "Hei, anda tidak mengikuti mana-mana tag! Teruskan juga?"
       preparing_your_stream: "Menyediakan strim peribadi anda..."
     infinite_scroll:
@@ -45,10 +44,29 @@ ms:
       public: "Awam - Pos anda akan dilihat oleh semua orang dan dijumpai oleh enjin carian"
     reshares:
       duplicate: "Yang baik, kan? Anda telah berkongsi semula pos itu!"
-    search_for: "Mencari <%= name %>"
+    search_for: "Mencari {{name}}"
     show_more: "tunjuk lagi"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "OK, saya mengandaikan # <%= tagName %> tidak semua yang menarik..."
+      wasnt_that_interesting: "OK, saya mengandaikan # {{tagName}} tidak semua yang menarik..."
     timeago:
       day: sehari
       days: "%d hari"
@@ -67,6 +85,4 @@ ms:
       years: "%d tahun"
     videos:
       unknown: "Jenis video tidak diketahui"
-      watch: "Tonton video ini di <%= provider %>"
-    web_sockets:
-      disconnected: "Websocket ditutup; pos tidak lagi akan distrim secara langsung."
\ No newline at end of file
+      watch: "Tonton video ini di {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.nb.yml b/config/locales/javascript/javascript.nb.yml
index f5efdd061..e4b5fe3b3 100644
--- a/config/locales/javascript/javascript.nb.yml
+++ b/config/locales/javascript/javascript.nb.yml
@@ -9,16 +9,15 @@ nb:
     aspect_dropdown:
       add_to_aspect: "Legg til kategori"
       all_aspects: "Alle kategorier"
-      error: "Kunne ikke begynne å dele med <%= name %>.  Ignorerer du dem?"
+      error: "Kunne ikke begynne å dele med {{name}}.  Ignorerer du dem?"
       select_aspects: "Velg kategori"
-      started_sharing_with: "Du har begynt å dele med <%= name %>!"
-      stopped_sharing_with: "Du har sluttet å dele med <%= name %>."
+      started_sharing_with: "Du har begynt å dele med {{name}}!"
+      stopped_sharing_with: "Du har sluttet å dele med {{name}}."
       toggle:
-        few: "I <%= count %> kategorier"
-        many: "I <%= count %> kategorier"
-        one: "I <%= count %> kategori"
-        other: "I <%= count %> kategorier"
-        two: "I <%= count %> kategorier"
+        few: "I {{count}} kategorier"
+        many: "I {{count}} kategorier"
+        one: "I {{count}} kategori"
+        other: "I {{count}} kategorier"
         zero: "Legg til kategori"
     aspect_navigation:
       deselect_all: "Avmerk alle"
@@ -32,7 +31,7 @@ nb:
     failed_to_post_message: "Klarte ikke å publisere post!"
     getting_started:
       alright_ill_wait: "Greit, jeg venter."
-      hey: "Hei, <%= name %>!"
+      hey: "Hei, {{name}}!"
       no_tags: "Hei, du har ikke fulgt noen tagger! Fortsett likevel?"
       preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll:
@@ -45,10 +44,29 @@ nb:
       public: "Offentlig - posten din vil være synlig for alle og kan bli funnet av søkemotorer"
     reshares:
       duplicate: "du har allerede delt denne posten!"
-    search_for: "Søk etter <%= name %>"
+    search_for: "Søk etter {{name}}"
     show_more: "vis mer"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "OK, jeg skjønner at #<%= tagName %> ikke var så spennende likevel..."
+      wasnt_that_interesting: "OK, jeg skjønner at #{{tagName}} ikke var så spennende likevel..."
     timeago:
       day: "en dag"
       days: "%d dager"
@@ -67,4 +85,4 @@ nb:
       years: "%d år"
     videos:
       unknown: "Ukjent videotype"
-      watch: "Se denne videoen på <%= provider %>"
\ No newline at end of file
+      watch: "Se denne videoen på {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml
index 72919bf28..9f9177f54 100644
--- a/config/locales/javascript/javascript.nl.yml
+++ b/config/locales/javascript/javascript.nl.yml
@@ -9,13 +9,15 @@ nl:
     aspect_dropdown:
       add_to_aspect: "Voeg toe aan aspect"
       all_aspects: "Alle aspecten"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Selecteer aspecten"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle:
-        few: "In <%= count %> aspecten"
-        many: "In <%= count %> aspecten"
-        one: "In <%= count %> aspect"
-        other: "In <%= count %> aspecten"
-        two: "In <%= count %> aspecten"
+        few: "In {{count}} aspecten"
+        many: "In {{count}} aspecten"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspecten"
         zero: "Voeg toe aan aspect"
     aspect_navigation:
       deselect_all: "Alles deselecteren"
@@ -29,6 +31,7 @@ nl:
     failed_to_post_message: "Bericht plaatsen mislukt!"
     getting_started:
       alright_ill_wait: "Prima, ik wacht wel."
+      hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll:
       no_more: "Geen posts meer."
@@ -38,8 +41,29 @@ nl:
       public: "Openbaar - je post is zichtbaar voor iedereen en kan gevonden worden door zoekmachines"
     reshares:
       duplicate: "Je hebt deze post al doorgegeven!"
-    search_for: "Zoek naar <%= name %>"
+    search_for: "Zoek naar {{name}}"
     show_more: "laat meer zien"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
+    tags:
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
       day: "een dag"
       days: "%d dagen"
@@ -56,6 +80,4 @@ nl:
       years: "%d jaar"
     videos:
       unknown: "Onbekend video type"
-      watch: "Bekijk deze video op <%= provider %>"
-    web_sockets:
-      disconnected: "De websocket is gesloten; posts worden niet langer live gestreamd."
\ No newline at end of file
+      watch: "Bekijk deze video op {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.nn.yml b/config/locales/javascript/javascript.nn.yml
index 38817459b..18e130e90 100644
--- a/config/locales/javascript/javascript.nn.yml
+++ b/config/locales/javascript/javascript.nn.yml
@@ -9,16 +9,15 @@ nn:
     aspect_dropdown:
       add_to_aspect: "Legg til kontakt"
       all_aspects: "Alle aspekta"
-      error: "Klarte ikkje å byrja å dela med <%= name %>.  Ignorerer du dei?"
+      error: "Klarte ikkje å byrja å dela med {{name}}.  Ignorerer du dei?"
       select_aspects: "Vel aspekt"
-      started_sharing_with: "Du har byrja å dela med <%= name %>."
-      stopped_sharing_with: "Du deler ikkje lenger med <%= name %>."
+      started_sharing_with: "Du har byrja å dela med {{name}}."
+      stopped_sharing_with: "Du deler ikkje lenger med {{name}}."
       toggle:
-        few: "I <%= count %> aspekt"
-        many: "I <%= count %> aspekt"
-        one: "I <%= count %> aspekt"
-        other: "I <%= count %> aspekt"
-        two: "I <%= count %> aspekt"
+        few: "I {{count}} aspekt"
+        many: "I {{count}} aspekt"
+        one: "I {{count}} aspekt"
+        other: "I {{count}} aspekt"
         zero: "Vel aspekt"
     aspect_navigation:
       deselect_all: "Vel vekk alle"
@@ -32,7 +31,7 @@ nn:
     failed_to_post_message: "Klarte ikkje å senda meldinga."
     getting_started:
       alright_ill_wait: "Greitt, eg ventar."
-      hey: "Hei, <%= name %>!"
+      hey: "Hei, {{name}}!"
       no_tags: "Du har ikkje følgt nokon etikett. Vil du likevel halda fram?"
       preparing_your_stream: "Lagar den tilpassa straumen din …"
     infinite_scroll:
@@ -45,10 +44,29 @@ nn:
       public: "Offentleg - alle kan sjå meldinga di og ho kan bli funnen av søkjemotorar"
     reshares:
       duplicate: "Så bra, altså? Men du har allereie delt meldinga :-)"
-    search_for: "Leit etter <%= name %>"
+    search_for: "Leit etter {{name}}"
     show_more: "syn meir"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "Greitt, #<%= tagName %> var vel kanskje ikkje så interessant …"
+      wasnt_that_interesting: "Greitt, #{{tagName}} var vel kanskje ikkje så interessant …"
     timeago:
       day: "om dagen"
       days: "%d dagar"
@@ -65,6 +83,4 @@ nn:
       years: "%d år"
     videos:
       unknown: "Ukjend videotype"
-      watch: "Sjå denne videoen hos <%= provider %>"
-    web_sockets:
-      disconnected: "Nettendepunktet er lukka - meldingane vil ikkje lenger kunna strøymast direkte."
\ No newline at end of file
+      watch: "Sjå denne videoen hos {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.pl.yml b/config/locales/javascript/javascript.pl.yml
index e384d1902..715236040 100644
--- a/config/locales/javascript/javascript.pl.yml
+++ b/config/locales/javascript/javascript.pl.yml
@@ -9,16 +9,15 @@ pl:
     aspect_dropdown:
       add_to_aspect: "Dodaj kontakt"
       all_aspects: "Wszystkie aspekty"
-      error: "Nie można zacząć dzielić się z <%= name %>. Może ich ignorujesz?"
+      error: "Nie można zacząć dzielić się z {{name}}. Może ich ignorujesz?"
       select_aspects: "Wybierz aspekty"
-      started_sharing_with: "Od teraz dzielisz się z <%= name %>!"
-      stopped_sharing_with: "Nie dzielisz się już z <%= name %>."
+      started_sharing_with: "Od teraz dzielisz się z {{name}}!"
+      stopped_sharing_with: "Nie dzielisz się już z {{name}}."
       toggle:
-        few: "W <%= count %> aspektach"
-        many: "W <%= count %> aspektach"
-        one: "W <%= count %> aspekcie"
-        other: "W <%= count %> aspektach"
-        two: "W <%= count %> aspektach"
+        few: "W {{count}} aspektach"
+        many: "W {{count}} aspektach"
+        one: "W {{count}} aspekcie"
+        other: "W {{count}} aspektach"
         zero: "Wybierz aspekty"
     aspect_navigation:
       deselect_all: "Odznacz wszystkie"
@@ -32,7 +31,7 @@ pl:
     failed_to_post_message: "Nie można wysłać wiadomości!"
     getting_started:
       alright_ill_wait: "Dobrze, poczekam."
-      hey: "Hej, <%= name %>!"
+      hey: "Hej, {{name}}!"
       no_tags: "Hej, nie obserwujesz żadnych znaczników! Kontynuować mimo to?"
       preparing_your_stream: "Przygotowanie spersonalizowanego strumienia..."
     infinite_scroll:
@@ -45,10 +44,29 @@ pl:
       public: "Publiczny - wpis będzie widoczny dla wszystkich i można go znaleźć przez wyszukiwarki"
     reshares:
       duplicate: "Już przekaza@{m:łeś|f:łaś|n:no} dalej ten wpis!"
-    search_for: "Znajdź: <%= name %>"
+    search_for: "Znajdź: {{name}}"
     show_more: "wyświetl więcej"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "OK, przypuszczam, że #<%= tagName %> nie był, aż tak interesujący..."
+      wasnt_that_interesting: "OK, przypuszczam, że #{{tagName}} nie był, aż tak interesujący..."
     timeago:
       day: dzień
       days: "%d dni"
@@ -67,6 +85,4 @@ pl:
       years: "%d lat"
     videos:
       unknown: "Nieznany typ wideo"
-      watch: "Zobacz ten film na <%= provider %>"
-    web_sockets:
-      disconnected: "Kanał komunikacji jest zamknięty; wpisy nie będą publikowane online."
\ No newline at end of file
+      watch: "Zobacz ten film na {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.pt-BR.yml b/config/locales/javascript/javascript.pt-BR.yml
index cc0cccf38..59b3120fa 100644
--- a/config/locales/javascript/javascript.pt-BR.yml
+++ b/config/locales/javascript/javascript.pt-BR.yml
@@ -9,16 +9,15 @@ pt-BR:
     aspect_dropdown:
       add_to_aspect: "Adicionar contato"
       all_aspects: "Todos aspectos"
-      error: "Não foi possível compartilhar com <%= name %>.  Deseja ignorar isto?"
+      error: "Não foi possível compartilhar com {{name}}.  Deseja ignorar isto?"
       select_aspects: "Selecione os aspectos"
-      started_sharing_with: "Você começou a compartilhar com <%= name %>!"
-      stopped_sharing_with: "Você parou de compartilhar com <%= name %>."
+      started_sharing_with: "Você começou a compartilhar com {{name}}!"
+      stopped_sharing_with: "Você parou de compartilhar com {{name}}."
       toggle:
-        few: "Em <%= count %> aspectos"
-        many: "Em <%= count %> aspectos"
-        one: "Em <%= count %> aspecto"
-        other: "Em <%= count %> aspectos"
-        two: "Em <%= count %> aspectos"
+        few: "Em {{count}} aspectos"
+        many: "Em {{count}} aspectos"
+        one: "Em {{count}} aspecto"
+        other: "Em {{count}} aspectos"
         zero: "Adicione para aspecto"
     aspect_navigation:
       deselect_all: "Desmarcar tudo"
@@ -32,7 +31,7 @@ pt-BR:
     failed_to_post_message: "Falha em postar a mensagem!"
     getting_started:
       alright_ill_wait: "Tudo bem, eu esperarei."
-      hey: "Ei, <%= name %>!"
+      hey: "Ei, {{name}}!"
       no_tags: "Ei, você não está seguindo todas as tags! Continuar assim mesmo?"
       preparing_your_stream: "Preparando seu fluxo personalizado..."
     infinite_scroll:
@@ -45,10 +44,29 @@ pt-BR:
       public: "Pública - a sua postagem será totalmente visível na web e poderá ser encontrada pelos mecanismos de buscas, Google, Bing e etc..."
     reshares:
       duplicate: "Você já compartilhou essa postagem."
-    search_for: "Procurar por <%= name %>"
+    search_for: "Procurar por {{name}}"
     show_more: "mostrar mais"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "Ok, eu acho que #<%= tagName %> não era tão interessante..."
+      wasnt_that_interesting: "Ok, eu acho que #{{tagName}} não era tão interessante..."
     timeago:
       day: "um dia"
       days: "%d dias"
@@ -65,6 +83,4 @@ pt-BR:
       years: "%d anos"
     videos:
       unknown: "Tipo de vídeo desconhecido"
-      watch: "Assista este vídeo no <%= provider %>"
-    web_sockets:
-      disconnected: "A conexão foi encerrada, não é mais possível transmitir novas postagens."
\ No newline at end of file
+      watch: "Assista este vídeo no {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.pt-PT.yml b/config/locales/javascript/javascript.pt-PT.yml
index 66aa51468..6094ce69d 100644
--- a/config/locales/javascript/javascript.pt-PT.yml
+++ b/config/locales/javascript/javascript.pt-PT.yml
@@ -9,16 +9,15 @@ pt-PT:
     aspect_dropdown:
       add_to_aspect: "Adicionar contacto"
       all_aspects: "Todos os aspectos"
-      error: "Não foi possível começar a partilhar com <%= name %>. Você está a ignorá-los?"
+      error: "Não foi possível começar a partilhar com {{name}}. Você está a ignorá-los?"
       select_aspects: "Seleccionar aspectos"
-      started_sharing_with: "Começou a partilhar com <%= name %>!"
-      stopped_sharing_with: "Deixou de partilhar com <%= name %>."
+      started_sharing_with: "Começou a partilhar com {{name}}!"
+      stopped_sharing_with: "Deixou de partilhar com {{name}}."
       toggle:
-        few: "Em <%= count %> aspectos"
-        many: "Em <%= count %> aspectos"
-        one: "Em <%= count %> aspecto"
-        other: "Em <%= count %> aspectos"
-        two: "Em <%= count %> aspectos"
+        few: "Em {{count}} aspectos"
+        many: "Em {{count}} aspectos"
+        one: "Em {{count}} aspecto"
+        other: "Em {{count}} aspectos"
         zero: "Seleccione os aspectos"
     aspect_navigation:
       deselect_all: "Desmarcar todos"
@@ -32,7 +31,7 @@ pt-PT:
     failed_to_post_message: "Falhou ao publicar a mensagem!"
     getting_started:
       alright_ill_wait: "Tudo bem, eu esperarei."
-      hey: "Ei, <%= name %>!"
+      hey: "Ei, {{name}}!"
       no_tags: "Ei, não está a seguir nenhuma etiqueta! Continuar mesmo assim?"
       preparing_your_stream: "A preparar o seu Stream personalizado..."
     infinite_scroll:
@@ -45,10 +44,29 @@ pt-PT:
       public: "Público - A sua publicação será visível para todos e encontrada por motores de busca"
     reshares:
       duplicate: "Que bom, hein? Você já republicou essa mensagem!"
-    search_for: "Procurar por <%= name %>"
+    search_for: "Procurar por {{name}}"
     show_more: "mostrar mais"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "OK, suponho que #<%= tagName %> não era assim tão interessante..."
+      wasnt_that_interesting: "OK, suponho que #{{tagName}} não era assim tão interessante..."
     timeago:
       day: "um dia"
       days: "%d dias"
@@ -67,6 +85,4 @@ pt-PT:
       years: "%d anos"
     videos:
       unknown: "Formato de vídeo desconhecido"
-      watch: "Visualize este vídeo no <%= provider %>"
-    web_sockets:
-      disconnected: "A websocket está fechada; as publicações não serão distribuídas em directo."
\ No newline at end of file
+      watch: "Visualize este vídeo no {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.ro.yml b/config/locales/javascript/javascript.ro.yml
index 31114e55a..c1a8e8e3f 100644
--- a/config/locales/javascript/javascript.ro.yml
+++ b/config/locales/javascript/javascript.ro.yml
@@ -9,16 +9,15 @@ ro:
     aspect_dropdown:
       add_to_aspect: "Adaugă la contacte"
       all_aspects: "Toate aspectele"
-      error: "Nu sa putut incepe impartirea de publicatii cu <%= name %>. Ii ignorati cumva ?"
+      error: "Nu sa putut incepe impartirea de publicatii cu {{name}}. Ii ignorati cumva ?"
       select_aspects: "Selectează aspecte"
-      started_sharing_with: "Ati inceput sa impartiti publicatii cu <%= name %>!"
-      stopped_sharing_with: "Nu mai imparti publicatii cu <%= name %>."
+      started_sharing_with: "Ati inceput sa impartiti publicatii cu {{name}}!"
+      stopped_sharing_with: "Nu mai imparti publicatii cu {{name}}."
       toggle:
-        few: "În <%= count %> aspecte"
-        many: "În <%= count %> aspecte"
-        one: "În <%= count %> aspect"
-        other: "În <%= count %> aspecte"
-        two: "In <%= count %> aspecte"
+        few: "În {{count}} aspecte"
+        many: "În {{count}} aspecte"
+        one: "În {{count}} aspect"
+        other: "În {{count}} aspecte"
         zero: "Selectati aspecte"
     aspect_navigation:
       deselect_all: "Deselectează tot"
@@ -32,7 +31,7 @@ ro:
     failed_to_post_message: "Nu sa reusit trimiterea mesajului!"
     getting_started:
       alright_ill_wait: "In regulă, o să aștept."
-      hey: "Salutare, <%= name %>!"
+      hey: "Salutare, {{name}}!"
       no_tags: "Hopa, nu urmati nicio eticheta! Continuati si asa ?"
       preparing_your_stream: "Se pregateste fluxul personalizat pentru dvs..."
     infinite_scroll:
@@ -44,10 +43,29 @@ ro:
       limited: "Limitat - publicatia va fi vazuta doar de catre persoanele cu care imparti publicatii"
     reshares:
       duplicate: "E chiar asa de tare, hmm?  Ati mai raspandit o data aceasta publicatie!"
-    search_for: "Caută <%= name %>"
+    search_for: "Caută {{name}}"
     show_more: "arată mai mult"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "Bine, presupun ca #<%= tagName %> nu a fost chiar atat de interesant..."
+      wasnt_that_interesting: "Bine, presupun ca #{{tagName}} nu a fost chiar atat de interesant..."
     timeago:
       day: "o zi"
       days: "%d zile"
@@ -66,6 +84,4 @@ ro:
       years: "%d ani"
     videos:
       unknown: "Format de video necunoscut"
-      watch: "Vizualizează acest video pe <%= provider %>"
-    web_sockets:
-      disconnected: "Websocket-ul e închis; posturile nu vor mai fi transmise în direct."
\ No newline at end of file
+      watch: "Vizualizează acest video pe {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml
index 110da0cb6..00fb05223 100644
--- a/config/locales/javascript/javascript.ru.yml
+++ b/config/locales/javascript/javascript.ru.yml
@@ -9,16 +9,15 @@ ru:
     aspect_dropdown:
       add_to_aspect: "Добавить контакт"
       all_aspects: "Все аспекты"
-      error: "Невозможно начать делиться с пользователем <%= name %>.  Возможно, вы его заблокировали?"
+      error: "Невозможно начать делиться с пользователем {{name}}.  Возможно, вы его заблокировали?"
       select_aspects: "Выбрать аспекты"
-      started_sharing_with: "Вы начали делиться с <%= name %>!"
-      stopped_sharing_with: "Вы перестали делиться с <%= name %>."
+      started_sharing_with: "Вы начали делиться с {{name}}!"
+      stopped_sharing_with: "Вы перестали делиться с {{name}}."
       toggle:
-        few: "В <%= count %> аспектах"
-        many: "В <%= count %> аспектах"
-        one: "В <%= count %> аспекте"
-        other: "В <%= count %> аспектах"
-        two: "В <%= count %> аспектах"
+        few: "В {{count}} аспектах"
+        many: "В {{count}} аспектах"
+        one: "В {{count}} аспекте"
+        other: "В {{count}} аспектах"
         zero: "Выбрать аспекты"
     aspect_navigation:
       deselect_all: "Выключить все"
@@ -32,7 +31,7 @@ ru:
     failed_to_post_message: "Не удалось отправить сообщение!"
     getting_started:
       alright_ill_wait: "Хорошо, я подожду."
-      hey: "Привет, <%= name %>!"
+      hey: "Привет, {{name}}!"
       no_tags: "Вы не следите ни за одной меткой! Все равно продолжить?"
       preparing_your_stream: "Подготовка вашего личного потока..."
     infinite_scroll:
@@ -45,10 +44,29 @@ ru:
       public: "Публичная - ваша запись будет видна всем, включая поисковые системы"
     reshares:
       duplicate: "Настолько круто, да? Вы уже поделились этой записью!"
-    search_for: "Искать <%= name %>"
+    search_for: "Искать {{name}}"
     show_more: "показать больше"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "Что ж, видимо, метка #<%= tagName %> была не такой уж интересной..."
+      wasnt_that_interesting: "Что ж, видимо, метка #{{tagName}} была не такой уж интересной..."
     timeago:
       day: день
       days: "%d дней[-я]"
@@ -66,6 +84,4 @@ ru:
       years: "%d лет"
     videos:
       unknown: "Неизвестный видеоформат"
-      watch: "Смотреть это видео на <%= provider %>"
-    web_sockets:
-      disconnected: "WebSocket закрыт; сообщения больше не будут транслироваться в прямом эфире."
\ No newline at end of file
+      watch: "Смотреть это видео на {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.sk.yml b/config/locales/javascript/javascript.sk.yml
index b05e1c7ac..30e3e7619 100644
--- a/config/locales/javascript/javascript.sk.yml
+++ b/config/locales/javascript/javascript.sk.yml
@@ -9,16 +9,15 @@ sk:
     aspect_dropdown:
       add_to_aspect: "Pridať kontakt"
       all_aspects: "Všetky kategórie"
-      error: "Nemôžete sa začať deliť s použ. <%= name %>. Neignorujete ho (ju)?"
+      error: "Nemôžete sa začať deliť s použ. {{name}}. Neignorujete ho (ju)?"
       select_aspects: "Vyberte si kategórie"
-      started_sharing_with: "Začali ste sa deliť s použ. <%= name %>!"
-      stopped_sharing_with: "Prestali ste sa deliť s použ. <%= name %>."
+      started_sharing_with: "Začali ste sa deliť s použ. {{name}}!"
+      stopped_sharing_with: "Prestali ste sa deliť s použ. {{name}}."
       toggle:
-        few: "V(o) <%= count %> kategóriách"
-        many: "V(o) <%= count %> kategóriách"
-        one: "V <%= count %> kategórii"
-        other: "V(o) <%= count %> kategóriách"
-        two: "V(o) <%= count %> kategóriách"
+        few: "V(o) {{count}} kategóriách"
+        many: "V(o) {{count}} kategóriách"
+        one: "V {{count}} kategórii"
+        other: "V(o) {{count}} kategóriách"
         zero: "Vyberte si kategórie"
     aspect_navigation:
       deselect_all: "Odznačiť všetky"
@@ -27,12 +26,12 @@ sk:
     comments:
       hide: "Skryť komentáre"
       show: "Zobraziť všetky komentáre"
-    confirm_dialog: "Ste si istý (-á)?"
+    confirm_dialog: Určite?
     failed_to_like: "Nepodarilo sa označiť, že sa vám to páči!"
     failed_to_post_message: "Správu sa nepodarilo poslať!"
     getting_started:
       alright_ill_wait: "V poriadku, počkám."
-      hey: "Hej, <%= name %>!"
+      hey: "Hej, {{name}}!"
       no_tags: "Hej, nesledujete žiadne značky!  Chcete aj tak pokračovať?"
       preparing_your_stream: "Pripravuje sa vaša upravená nástenka..."
     infinite_scroll:
@@ -45,10 +44,29 @@ sk:
       public: "Verejný - váš príspevok pomocou vyhľadávačov uvidí a nájde každý"
     reshares:
       duplicate: "To je dobré, čo? Tento príspevok ste už raz znova zdieľali!"
-    search_for: "Hľadať <%= name %>"
+    search_for: "Hľadať {{name}}"
     show_more: "Zobraziť viac"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "Dobre, značka #<%= tagName %> asi nebola veľmi zaujímavá..."
+      wasnt_that_interesting: "Dobre, značka #{{tagName}} asi nebola veľmi zaujímavá..."
     timeago:
       day: včera
       days: "pred %d dňami"
@@ -65,6 +83,4 @@ sk:
       years: "pred %d rokmi"
     videos:
       unknown: "Neznámy typ videa"
-      watch: "Pozrite sa na toto video na sieti <%= provider %>"
-    web_sockets:
-      disconnected: "Webová zásuvka (websocket) je odpojená; príspevky sa už viac nebudú spracúvať v reálnom čase."
\ No newline at end of file
+      watch: "Pozrite sa na toto video na sieti {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.sl.yml b/config/locales/javascript/javascript.sl.yml
index d0636238b..cc2cd48ea 100644
--- a/config/locales/javascript/javascript.sl.yml
+++ b/config/locales/javascript/javascript.sl.yml
@@ -9,16 +9,15 @@ sl:
     aspect_dropdown:
       add_to_aspect: "Dodaj stik"
       all_aspects: "Vsi pogledi"
-      error: "Ne morem začeti deliti s <%= name %>. Ali ste jih ignorirali?"
+      error: "Ne morem začeti deliti s {{name}}. Ali ste jih ignorirali?"
       select_aspects: "Izberi poglede"
-      started_sharing_with: "Začeli ste deliti z <%= name %>!"
-      stopped_sharing_with: "Prenehali ste deliti z <%= name %>."
+      started_sharing_with: "Začeli ste deliti z {{name}}!"
+      stopped_sharing_with: "Prenehali ste deliti z {{name}}."
       toggle:
-        few: "V <%= count %> pogledih"
-        many: "V <%= count %> pogledih"
-        one: "V <%= count %> pogledu"
-        other: "V <%= count %> pogledih"
-        two: "V <%= count %> pogledih"
+        few: "V {{count}} pogledih"
+        many: "V {{count}} pogledih"
+        one: "V {{count}} pogledu"
+        other: "V {{count}} pogledih"
         zero: "Izberi pogled"
     aspect_navigation:
       deselect_all: "Označi nič"
@@ -32,7 +31,7 @@ sl:
     failed_to_post_message: "Objava ni uspela!"
     getting_started:
       alright_ill_wait: "V redu, bom počakal."
-      hey: "Hej, <%= name %>!"
+      hey: "Hej, {{name}}!"
       no_tags: "Hej, niste sledili nobeni oznaki! Vseeno nadaljuj?"
       preparing_your_stream: "Pripravljanje vašega osebnega toka ..."
     infinite_scroll:
@@ -45,10 +44,29 @@ sl:
       public: "Javno - Vaša objava bo vidna vsem, prikazana bo tudi v spletnih  iskalnikih"
     reshares:
       duplicate: "To objavo ste že ponovno delili"
-    search_for: "Išči <%= name %>"
+    search_for: "Išči {{name}}"
     show_more: "pokaži več"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "Vredu, mislim, da zaznamek #<%= tagName %> ni bil tako zanimiv ..."
+      wasnt_that_interesting: "Vredu, mislim, da zaznamek #{{tagName}} ni bil tako zanimiv ..."
     timeago:
       day: včeraj
       days: "pred %d dnem"
@@ -65,6 +83,4 @@ sl:
       years: "pred %d leti"
     videos:
       unknown: "Neznan tip videa"
-      watch: "Glej ta video na <%= provider %>"
-    web_sockets:
-      disconnected: "Ta spletni vtič je zaprt; objave se ne bodo več prenašale v  živo."
\ No newline at end of file
+      watch: "Glej ta video na {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.sq.yml b/config/locales/javascript/javascript.sq.yml
index ee29c23d0..5e12a77cd 100644
--- a/config/locales/javascript/javascript.sq.yml
+++ b/config/locales/javascript/javascript.sq.yml
@@ -18,7 +18,6 @@ sq:
         many: "Në {{count}} aspekte"
         one: "Në {{count}} aspekt"
         other: "Në {{count}} aspekte"
-        two: "Në {{count}} aspekte"
         zero: "Përzgjidhni aspekte"
     aspect_navigation:
       deselect_all: "Çpërzgjidhi krejt"
@@ -47,6 +46,25 @@ sq:
       duplicate: "I bukur ky, hë?  E keni ndarë një herë me të tjerët atë postim!"
     search_for: "Kërkoni për {{name}}"
     show_more: "shfaq më tepër"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
       wasnt_that_interesting: "OK, Them se #{{tagName}} nuk qe kushedi se çë interesant..."
     timeago:
@@ -65,6 +83,4 @@ sq:
       years: "%d vjetë"
     videos:
       unknown: "Lloj i panjohur videoje"
-      watch: "Shiheni këtë video në {{provider}}"
-    web_sockets:
-      disconnected: "Kanali web është mbyllur; postimet nuk do të transmetohen më live."
\ No newline at end of file
+      watch: "Shiheni këtë video në {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml
index 27c84bdcf..b1a673c09 100644
--- a/config/locales/javascript/javascript.sv.yml
+++ b/config/locales/javascript/javascript.sv.yml
@@ -9,16 +9,15 @@ sv:
     aspect_dropdown:
       add_to_aspect: "Lägg till kontakt"
       all_aspects: "Alla aspekter"
-      error: "Det går inte att börja dela med <%= name %>. Ignorerar du dem?"
+      error: "Det går inte att börja dela med {{name}}. Ignorerar du dem?"
       select_aspects: "Välj aspekter"
-      started_sharing_with: "Du har börjat dela med <%= name %>!"
-      stopped_sharing_with: "Du har slutat dela med <%= name %>."
+      started_sharing_with: "Du har börjat dela med {{name}}!"
+      stopped_sharing_with: "Du har slutat dela med {{name}}."
       toggle:
-        few: "I <%= count %> aspekter"
-        many: "I <%= count %> aspekter"
-        one: "I <%= count %> aspekt"
-        other: "I <%= count %> aspekter"
-        two: "I <%= count %> aspekter"
+        few: "I {{count}} aspekter"
+        many: "I {{count}} aspekter"
+        one: "I {{count}} aspekt"
+        other: "I {{count}} aspekter"
         zero: "Välj aspekter"
     aspect_navigation:
       deselect_all: "Visa ingen"
@@ -32,7 +31,7 @@ sv:
     failed_to_post_message: "Misslyckades att posta meddelande!"
     getting_started:
       alright_ill_wait: "Okej, jag väntar."
-      hey: "Hej, <%= name %>!"
+      hey: "Hej, {{name}}!"
       no_tags: "Du, du följer ju inte några taggar! Vill du fortsätta ändå?"
       preparing_your_stream: "Förbereder din personliga ström..."
     infinite_scroll:
@@ -45,10 +44,29 @@ sv:
       public: "Publikt - ditt inlägg visas för alla och i söktjänster"
     reshares:
       duplicate: "Du gillar detta va? Du har nämligen redan spridit detta inlägg vidare!"
-    search_for: "Sök efter <%= name %>"
+    search_for: "Sök efter {{name}}"
     show_more: "visa mer"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "OK, jag antar att #<%= tagName %> inte var så intressant..."
+      wasnt_that_interesting: "OK, jag antar att #{{tagName}} inte var så intressant..."
     timeago:
       day: "en dag"
       days: "%d dagar"
@@ -67,6 +85,4 @@ sv:
       years: "%d år"
     videos:
       unknown: "Okänd videotyp"
-      watch: "Se den här videon på <%= provider %>"
-    web_sockets:
-      disconnected: "WebSocketen är stängd; inlägg kommer inte längre att bli direktstreamade."
\ No newline at end of file
+      watch: "Se den här videon på {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.te.yml b/config/locales/javascript/javascript.te.yml
index 0d1dc0a6c..0b5e24b9d 100644
--- a/config/locales/javascript/javascript.te.yml
+++ b/config/locales/javascript/javascript.te.yml
@@ -7,12 +7,14 @@
 te:
   javascripts:
     aspect_dropdown:
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle:
-        few: "In <%= count %> aspects"
-        many: "In <%= count %> aspects"
-        one: "In <%= count %> aspect"
-        other: "In <%= count %> aspects"
-        two: "In <%= count %> aspects"
+        few: "In {{count}} aspects"
+        many: "In {{count}} aspects"
+        one: "In {{count}} aspect"
+        other: "In {{count}} aspects"
         zero: "Select aspects"
     aspect_navigation:
       select_all: "అన్నిటినీ ఎంచుకో"
@@ -20,13 +22,34 @@ te:
       hide: "వ్యాఖ్యలను దాచు"
       show: "అన్ని వ్యాఖ్యలను చూపించు"
     getting_started:
-      hey: "ఓయ్, <%= name %>!"
+      hey: "ఓయ్, {{name}}!"
     infinite_scroll:
       no_more: "ఇంక టపాలు లేవు."
     reshares:
       duplicate: "ఓహో, అది బాగుందా?  ఆ టపాని మీరు ఇప్పటికే పంచుకున్నారు!"
-    search_for: "<%= name %> కోసం వెతకండి"
+    search_for: "{{name}} కోసం వెతకండి"
     show_more: "మరిన్ని చూపించు"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
+    tags:
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
       day: "ఒక రోజు"
       days: "%d రోజుల"
@@ -42,4 +65,4 @@ te:
       year: "దాదాపు సంవత్సరం"
       years: "%d సంవత్సరాల"
     videos:
-      watch: "ఈ వీడియోని <%= provider %>లో చూడండి"
\ No newline at end of file
+      watch: "ఈ వీడియోని {{provider}}లో చూడండి"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.tr.yml b/config/locales/javascript/javascript.tr.yml
index 3c3232578..7b723b479 100644
--- a/config/locales/javascript/javascript.tr.yml
+++ b/config/locales/javascript/javascript.tr.yml
@@ -11,14 +11,13 @@ tr:
       all_aspects: "Tüm yönler"
       error: "{{name}} ile paylaşım başlatılamadı. Onu yasaklamış olmayasınız?"
       select_aspects: "Yönleri seç"
-      started_sharing_with: "<%= name %> sizinle paylaşıma başladı!"
-      stopped_sharing_with: "<%= name %> sizinle paylaşımı durdurdu."
+      started_sharing_with: "{{name}} sizinle paylaşıma başladı!"
+      stopped_sharing_with: "{{name}} sizinle paylaşımı durdurdu."
       toggle:
-        few: "<%= count %> yön"
-        many: "<%= count %> yön"
-        one: "<%= count %> yön"
-        other: "<%= count %> yön"
-        two: "<%= count %> yön"
+        few: "{{count}} yön"
+        many: "{{count}} yön"
+        one: "{{count}} yön"
+        other: "{{count}} yön"
         zero: "Yön seç"
     aspect_navigation:
       deselect_all: "Tümünü kaldır"
@@ -32,7 +31,7 @@ tr:
     failed_to_post_message: "Gönderi başarısız oldu!"
     getting_started:
       alright_ill_wait: "Tamam, ben bekleyeceğim."
-      hey: "Merhaba, <%= name %>!"
+      hey: "Merhaba, {{name}}!"
       no_tags: "Hey, hiç etiket takip etmiyorsunuz! Gerçekten devam etmek istiyor musun?"
       preparing_your_stream: "Kişiselleştirilmiş akışınız hazırlanıyor..."
     infinite_scroll:
@@ -45,10 +44,29 @@ tr:
       public: "Genel - gönderi herkes tarafından görünür ve arama motorları tarafından bulunur olacak"
     reshares:
       duplicate: "Bu iyi, değil mi? Zaten bu gönderiyi tekrar paylaştın!"
-    search_for: "<%= name %> Ara"
+    search_for: "{{name}} Ara"
     show_more: "daha fazlasını göster"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "Tamam, benim #<%= tagName %> o kadar da ilginç değil..."
+      wasnt_that_interesting: "Tamam, benim #{{tagName}} o kadar da ilginç değil..."
     timeago:
       day: "1 gün"
       days: "%d gün"
@@ -67,6 +85,4 @@ tr:
       years: "%d yıl"
     videos:
       unknown: "Bilinmeyen video tipi"
-      watch: "Bu videoyu <%= provider %>'da izle"
-    web_sockets:
-      disconnected: "Websocket kapalı; gönderiler bundan sonra canlı akış olacak."
\ No newline at end of file
+      watch: "Bu videoyu {{provider}}'da izle"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.uk.yml b/config/locales/javascript/javascript.uk.yml
index b311a9325..77f6fdca7 100644
--- a/config/locales/javascript/javascript.uk.yml
+++ b/config/locales/javascript/javascript.uk.yml
@@ -9,16 +9,15 @@ uk:
     aspect_dropdown:
       add_to_aspect: "Додати контакт"
       all_aspects: "Усі аспекти"
-      error: "Неможливо почати ділитися з користувачем <%= name %>. Можливо, ви його заблокували?"
+      error: "Неможливо почати ділитися з користувачем {{name}}. Можливо, ви його заблокували?"
       select_aspects: "Вибрати аспекти"
-      started_sharing_with: "Ви почали ділитися з <%= name %>!"
-      stopped_sharing_with: "Ви перестали ділитися з <%= name %>."
+      started_sharing_with: "Ви почали ділитися з {{name}}!"
+      stopped_sharing_with: "Ви перестали ділитися з {{name}}."
       toggle:
-        few: "У <%= count %> аспектах"
-        many: "У <%= count %> аспектах"
-        one: "У <%= count %> аспектах"
-        other: "У <%= count %> аспектах"
-        two: "У <%= count %> аспектах"
+        few: "У {{count}} аспектах"
+        many: "У {{count}} аспектах"
+        one: "У {{count}} аспектах"
+        other: "У {{count}} аспектах"
         zero: "Вибрати аспекти"
     aspect_navigation:
       deselect_all: "Відмінити всі"
@@ -32,7 +31,7 @@ uk:
     failed_to_post_message: "Не вдалося відправити повідомлення!"
     getting_started:
       alright_ill_wait: "Добре, я почекаю."
-      hey: "Привіт, <%= name %>!"
+      hey: "Привіт, {{name}}!"
       no_tags: "Ви не стежите ні за однією міткою! Все одно продовжити?"
       preparing_your_stream: "Підготовка вашого особистого потоку..."
     infinite_scroll:
@@ -45,10 +44,29 @@ uk:
       public: "Публічна - ваш запис буде видний усім, включаючи пошукові системи"
     reshares:
       duplicate: "Настільки круто, так? Ви вже поділилися цим записом!"
-    search_for: "Шукати <%= name %>"
+    search_for: "Шукати {{name}}"
     show_more: "показати більше"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "OK, мабуть, стежити за міткою #<%= tagName %> було не так вже цікаво..."
+      wasnt_that_interesting: "OK, мабуть, стежити за міткою #{{tagName}} було не так вже цікаво..."
     timeago:
       day: день
       days: "%d днів[-я]"
@@ -67,6 +85,4 @@ uk:
       years: "%d років"
     videos:
       unknown: "Невідомий відеоформат"
-      watch: "Дивитися це відео на <%= provider %>"
-    web_sockets:
-      disconnected: "WebSocket закритий; повідомлення більше не транслюватимуться в прямому ефірі."
\ No newline at end of file
+      watch: "Дивитися це відео на {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.vi.yml b/config/locales/javascript/javascript.vi.yml
index 4250dc50a..2ac3138f6 100644
--- a/config/locales/javascript/javascript.vi.yml
+++ b/config/locales/javascript/javascript.vi.yml
@@ -9,16 +9,15 @@ vi:
     aspect_dropdown:
       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ọ?"
+      error: "Không thể bắt đầu chia sẻ với {{name}}. Bạn có muốn 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 %>."
+      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: "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ệ"
+        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ệ"
         zero: "Chọn mối quan hệ"
     aspect_navigation:
       deselect_all: "Bỏ chọn tất cả"
@@ -28,12 +27,15 @@ vi:
       hide: "ẩn các bình luận"
       show: "hiện tất cả bình luận"
     confirm_dialog: "Bạn có chắc không?"
+    failed_to_like: "Không thích được!"
     failed_to_post_message: "Đăng tin thất bại!"
     getting_started:
       alright_ill_wait: "Được rồi, tôi sẽ chờ."
-      hey: "Này, <%= name %>!"
+      hey: "Này, {{name}}!"
       no_tags: "Bạn chưa theo dõi thẻ nào cả! Tiếp tục?"
-      preparing_your_stream: "Preparing your personialized stream..."
+      preparing_your_stream: "Đang chuẩn bị luồng cho bạn..."
+    infinite_scroll:
+      no_more: "Không còn bài đăng nào nữa."
     photo_uploader:
       looking_good: "Ôi, trông bạn thật tuyệt!"
     publisher:
@@ -42,8 +44,29 @@ vi:
       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: "Bạn đã chia sẻ lại tin đó!"
-    search_for: "Tìm <%= name %>"
+    search_for: "Tìm {{name}}"
     show_more: "hiện thêm"
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
+    tags:
+      wasnt_that_interesting: "Tôi cho rằng #{{tagName}} không thú vị..."
     timeago:
       day: "một ngày"
       days: "%d ngày"
@@ -55,9 +78,9 @@ vi:
       months: "%d tháng"
       seconds: "ít hơn một phút"
       suffixAgo: trước
-      suffixFromNow: "kể từ bây giờ"
+      suffixFromNow: "kể từ đây"
       year: "khoảng một năm"
       years: "%d năm"
     videos:
       unknown: "Chưa biết kiểu video"
-      watch: "Xem video này trên <%= provider %>"
\ No newline at end of file
+      watch: "Xem video này trên {{provider}}"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.zh-CN.yml b/config/locales/javascript/javascript.zh-CN.yml
index 075ac57b8..327678c4e 100644
--- a/config/locales/javascript/javascript.zh-CN.yml
+++ b/config/locales/javascript/javascript.zh-CN.yml
@@ -8,12 +8,14 @@ zh-CN:
   javascripts:
     aspect_dropdown:
       add_to_aspect: 添加到视图
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle:
-        few: "在<%= count %>个视图中"
-        many: "在<%= count %>个视图中"
-        one: "在<%= count %>个视图中"
-        other: "在<%= count %>个视图中"
-        two: "In <%= count %> aspects"
+        few: "在{{count}}个视图中"
+        many: "在{{count}}个视图中"
+        one: "在{{count}}个视图中"
+        other: "在{{count}}个视图中"
         zero: 添加到视图
     comments:
       hide: 隐藏评论
@@ -22,6 +24,7 @@ zh-CN:
     failed_to_like: 表示喜欢失败！
     failed_to_post_message: 发布消息失败！
     getting_started:
+      hey: "Hey, {{name}}!"
       preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll:
       no_more: 没有更多的内容了。
@@ -29,8 +32,29 @@ zh-CN:
       at_least_one_aspect: 发布时请选择至少一个情景
     reshares:
       duplicate: "You've already reshared that post!"
-    search_for: "搜索 <%= name %>"
+    search_for: "搜索 {{name}}"
     show_more: 查看更多
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
+    tags:
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:
       day: 1天
       days: "%d天"
@@ -47,6 +71,4 @@ zh-CN:
       years: "%d年"
     videos:
       unknown: 未知视频格式
-      watch: "在 <%= provider %> 上看观看视频"
-    web_sockets:
-      disconnected: websocket已关闭，内容不会再实时更新。
\ No newline at end of file
+      watch: "在 {{provider}} 上看观看视频"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml
index 78e1dfb02..013cfda9a 100644
--- a/config/locales/javascript/javascript.zh-TW.yml
+++ b/config/locales/javascript/javascript.zh-TW.yml
@@ -9,16 +9,15 @@ zh-TW:
     aspect_dropdown:
       add_to_aspect: 加聯絡人
       all_aspects: 所有面向
-      error: "無法開始和 <%= name %> 分享. 你還在忽視他們嗎?"
+      error: "無法開始和 {{name}} 分享. 你還在忽視他們嗎?"
       select_aspects: 選面向
-      started_sharing_with: "你開始和 <%= name %> 分享了!"
-      stopped_sharing_with: "你停止和 <%= name %> 分享了."
+      started_sharing_with: "你開始和 {{name}} 分享了!"
+      stopped_sharing_with: "你停止和 {{name}} 分享了."
       toggle:
-        few: "在<%= count %>個面向中"
-        many: "在<%= count %>個面向中"
-        one: "在<%= count %>個面向中"
-        other: "在<%= count %>個面向中"
-        two: "在<%= count %>個面向中"
+        few: "在{{count}}個面向中"
+        many: "在{{count}}個面向中"
+        one: "在{{count}}個面向中"
+        other: "在{{count}}個面向中"
         zero: 選面向
     aspect_navigation:
       deselect_all: 全不選
@@ -32,7 +31,7 @@ zh-TW:
     failed_to_post_message: 貼文失敗!
     getting_started:
       alright_ill_wait: "好吧, 以後再說."
-      hey: "嘿, <%= name %>!"
+      hey: "嘿, {{name}}!"
       no_tags: "嘿, 你還沒有追蹤任何標籤! 要往下一步嗎?"
       preparing_your_stream: 整理你個人的流水帳中...
     infinite_scroll:
@@ -45,10 +44,29 @@ zh-TW:
       public: "公開 - 所有人都能看到你的貼文, 包括搜尋引擎"
     reshares:
       duplicate: "很棒對吧? 你已經轉貼過該篇貼文了!"
-    search_for: "搜尋 <%= name %>"
+    search_for: "搜尋 {{name}}"
     show_more: 顯示更多
+    stream:
+      likes:
+        few: "<%= count %> Likes"
+        many: "<%= count %> Likes"
+        one: "<%= count %> Like"
+        other: "<%= count %> Likes"
+        zero: "<%= count %> Likes"
+      more_comments:
+        few: "Show <%= count %> more comments"
+        many: "Show <%= count %> more comments"
+        one: "Show <%= count %> more comment"
+        other: "Show <%= count %> more comments"
+        zero: "Show <%= count %> more comments"
+      reshares:
+        few: "<%= count %> Reshares"
+        many: "<%= count %> Reshares"
+        one: "<%= count %> Reshare"
+        other: "<%= count %> Reshares"
+        zero: "<%= count %> Reshares"
     tags:
-      wasnt_that_interesting: "OK, 我想 #<%= tagName %> 大概沒那麼有趣..."
+      wasnt_that_interesting: "OK, 我想 #{{tagName}} 大概沒那麼有趣..."
     timeago:
       day: 一天
       days: "%d天"
@@ -67,6 +85,4 @@ zh-TW:
       years: "%d年"
     videos:
       unknown: 不明的影片類別
-      watch: "從 <%= provider %> 看這部影片"
-    web_sockets:
-      disconnected: "Websocket 已斷線; 貼文不會再即時更新了."
\ No newline at end of file
+      watch: "從 {{provider}} 看這部影片"
\ No newline at end of file