updated 135 locale files [ci skip]

author: Jonne Hass <mrzyx@mrzyx.de> 2011-11-04 02:10:07 +0400
committer: Jonne Hass <mrzyx@mrzyx.de> 2011-11-04 02:10:07 +0400
commit: b4e974161b88089cd41b333251fa365dc8c26e73 (patch)
tree: e2195d55af37da3c92b8c050d6c9520557517ea5 /config/locales
parent: dca370d3ffc9bbb87b9668bc1028095b70cc1fa1 (diff)
135 files changed, 3099 insertions, 1926 deletions
diff --git a/config/locales/devise/devise.ar.yml b/config/locales/devise/devise.ar.yml
index b0f5ba79c..69e781894 100644
--- a/config/locales/devise/devise.ar.yml
+++ b/config/locales/devise/devise.ar.yml
@@ -33,9 +33,9 @@ ar:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
@@ -91,11 +91,11 @@ ar:
         alpha_software: "أنت على وشك استخدام برنامج تجريبي ألفا"
         bugs_and_feedback: "للتذكير، ستواجه خلال تجربتك بعض المشاكل التقنية.  نشجعك على استخدام زر التبليغ -الموجود بالجانب الأيمن من متصفحك- من أجل تنبيه المطورين لأي معضلة واجهتها, وسنعمل بأسرع ما يمكن لحل أي مشكلة تقنية تم الإبلاغ عنها."
         bugs_and_feedback_mobile: "للتذكير، ستواجه خلال تجربتك بعض المشاكل التقنية.  نشجعك على استخدام زر التبليغ من أجل تنبيه المطورين لأي معضلة واجهتها, وسنعمل بأسرع ما يمكن لحل أي مشكلة تقنية تم الإبلاغ عنها"
-        login: "لُج"
+        login: لُج
         modern_browsers: "الدعم حصري للمتصفحات الحديثة."
         password: "كلمة المرور"
         remember_me: "تذكرني"
-        sign_in: "لُج"
+        sign_in: لُج
         username: "المعرف"
       signed_in: "تم تسجيل الدخول بنجاح"
       signed_out: "تم تسجيل الخروج بنجاح"
@@ -104,8 +104,8 @@ ar:
         forgot_your_password: "نسيت كلمة المرور؟"
         receive_confirmation: "لم تصلك تعليمات تأكيد حسابك؟"
         receive_unlock: "لم تصلك تعليمات إعادة فتح حسابك؟"
-        sign_in: "لُج"
-        sign_up: "سجِل"
+        sign_in: لُج
+        sign_up: سجِل
         sign_up_closed: "التسجيلات مغلقة حاليا"
       mail_signup_form: 
         sign_up_for_an_invite: "سجل في قائمة انتظار الدعوات"
diff --git a/config/locales/devise/devise.bg.yml b/config/locales/devise/devise.bg.yml
index 50774f2e2..d5a5d3c18 100644
--- a/config/locales/devise/devise.bg.yml
+++ b/config/locales/devise/devise.bg.yml
@@ -33,9 +33,9 @@ bg:
         arrived: "Социалната мрежа, която сте очаквали е вече реалност. Подобрена, по-сигурна и развлекателна, %{strong_diaspora} е насреща когато желаете да споделяте и изследвате мрежата по нов начин."
         be_yourself: "Бъдете себе си"
         be_yourself_paragraph: "Internet предоставя уникални възможности за изразяване. %{strong_diaspora} ви позволява да бъдете себе си и да споделяте както желаете, с когото пожелаете, ползвайки или не името си."
-        cubbies: "Cubbi.es"
+        cubbies: Cubbi.es
         displaying_correctly: "Съдържанието не се визуализира правилно? %{link} във вашия браузър"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "За общи запитвания и поддръжка на вашия акаунт в Diaspora моля пишете ни на %{email}."
         finally: "Най-накрая е тук"
         friends_saying: "Какво казват приятелите ви..."
diff --git a/config/locales/devise/devise.br.yml b/config/locales/devise/devise.br.yml
index d2a1f57c5..7dfef55a9 100644
--- a/config/locales/devise/devise.br.yml
+++ b/config/locales/devise/devise.br.yml
@@ -25,7 +25,7 @@ br:
     mailer: 
       confirmation_instructions: 
         confirm: "Kadarnaat ma c'hont"
-        subject: "Titouroù-kadarnaat"
+        subject: Titouroù-kadarnaat
         you_can_confirm: "Moaien zo deoc'h kadarnaat ho kont gant al liamm dindan:"
       hello: "Demat, %{email}!"
       invitation_instructions: 
@@ -33,9 +33,9 @@ br:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
@@ -93,10 +93,10 @@ br:
         bugs_and_feedback_mobile: "Deoc'h da c'hoût e vo kavet vioù-koukoug ganeoc'h. Reiñ a reomp ton deoc'h evit kelaouiñ ac'hanomp pep gwech ma vo kavet fazioù ganeoc'h! Labourat a rimp ar buanañ a c'hellomp evit diluziañ pep kudenn a vo disklaeriet ganeoc'h."
         login: "Mont e-barzh"
         modern_browsers: "ne c'hell mont en dro gant merdeidi modern nemetken."
-        password: "Ger-kuzh"
+        password: Ger-kuzh
         remember_me: "Dalc'hen soñj deus ma fenn"
         sign_in: "Mont e-barzh"
-        username: "Anv-implijer"
+        username: Anv-implijer
       signed_in: "Luget mat."
       signed_out: "Diluget mat."
     shared: 
diff --git a/config/locales/devise/devise.cs.yml b/config/locales/devise/devise.cs.yml
index 55546aeae..187f114dd 100644
--- a/config/locales/devise/devise.cs.yml
+++ b/config/locales/devise/devise.cs.yml
@@ -33,9 +33,9 @@ cs:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.cy.yml b/config/locales/devise/devise.cy.yml
index 40eb858cb..682211fa3 100644
--- a/config/locales/devise/devise.cy.yml
+++ b/config/locales/devise/devise.cy.yml
@@ -33,9 +33,9 @@ cy:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.da.yml b/config/locales/devise/devise.da.yml
index be86cd0ae..0ce50f77e 100644
--- a/config/locales/devise/devise.da.yml
+++ b/config/locales/devise/devise.da.yml
@@ -33,9 +33,9 @@ da:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
index cb76a4a89..f4cc4c3cc 100644
--- a/config/locales/devise/devise.de.yml
+++ b/config/locales/devise/devise.de.yml
@@ -30,32 +30,32 @@ de:
       hello: "Hallo %{email}!"
       invitation_instructions: 
         accept: "Einladung annehmen"
-        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"
-        email_address: "questions@joindiaspora.com"
-        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
-        finally: "Finally - it's here"
-        friends_saying: "What your friends are saying..."
-        get_connected: "Get Connected"
-        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
-        have_fun: "Have Fun"
-        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
-        help_fund: "help fund Diaspora"
-        here: "here"
+        arrived: "Das soziale Netzwerk, auf das du schon immer gewartet hast, ist da. Aufpoliert, sicherer und lustiger ist %{strong_diaspora} dafür da, dir dabei zu helfen, das Web auf eine ganz neue Weise zu entdecken."
+        be_yourself: "Sei du selbst"
+        be_yourself_paragraph: "Das Internet hat einzigartige Möglichkeiten entwickelt, um uns auszudrücken. %{strong_diaspora} lässt dich du selbst sein und teilen, was du möchtest, mit oder ohne deinem echten Namen."
+        cubbies: Cubbi.es
+        displaying_correctly: "E-Mail-Darstellung nicht lesbar? %{link} in deinem Browser"
+        email_address: questions@joindiaspora.com
+        email_us: "Für allgemeine Anfragen oder Unterstützung mit deinem Diaspora-Account, wende dich an uns per %{email}."
+        finally: "Endlich - Es ist da"
+        friends_saying: "Was deine Freunde sagen..."
+        get_connected: "Verbinde dich"
+        get_connected_paragraph: "Als eine internationale Bewegung mit einer gemeinsamen Vision eines besseren Webs, %{strong_diaspora}s Besonderheit Nummer Eins ist seine Gemeinschaft. Lerne neue Leute kennen, verbinde dich mit Freunden und schließ' dich dem Spaß an."
+        have_fun: "Hab' Spaß"
+        have_fun_paragraph: "Bei %{strong_diaspora} dreht es sich darum, online faszinierende Inhalte und Leute zu entdecken. %{link}, die erste %{strong_diaspora}-Anwendung der Welt, ist nur der Anfang. Sammle und teile das Web in all seiner Pracht."
+        help_fund: "Hilf, Diaspora zu finanzieren"
+        here: "hier"
         ignore: "Wenn du die Einladung nicht annehmen möchtest, ignoriere diese E-Mail einfach."
-        join_team: "Join our Team"
-        love: "Love,"
-        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
-        more_people: "Even more people are excited to see you!"
+        join_team: "Tritt unserem Team bei"
+        love: "Alles liebe,"
+        made_by_people: "%{strong_diaspora} wird von Leuten erstellt, die das Internet genauso lieben, wie du. %{jointeam}, oder %{helpfund}!"
+        more_people: "Noch mehr Leute sind gespannt, dich zu sehen!"
         no_account_till: "Dein Konto wird nicht erstellt solange du dich nicht über den oberen Link registrierst."
-        or: "or"
-        sign_up_now: "Sign up now &rarr;"
+        or: "oder"
+        sign_up_now: "Jetzt registrieren &rarr;"
         subject: "Du wurdest zu Diaspora eingeladen!"
-        team_diaspora: "Team Diaspora"
-        unsubscribe: "To unsubscribe please click %{link}."
+        team_diaspora: Diaspora-Team
+        unsubscribe: "Zum Abbestellen bitte %{link} klicken."
         view_in: "View in"
       inviter: 
         accept_at: "unter %{url}, kannst du sie über den untenstehenden Link akzeptieren."
@@ -97,8 +97,8 @@ de:
         remember_me: "Angemeldet bleiben"
         sign_in: "Anmelden"
         username: "Benutzername"
-      signed_in: "Angemeldet."
-      signed_out: "Abgemeldet."
+      signed_in: Angemeldet.
+      signed_out: Abgemeldet.
     shared: 
       links: 
         forgot_your_password: "Kennwort vergessen?"
diff --git a/config/locales/devise/devise.de_formal.yml b/config/locales/devise/devise.de_formal.yml
index 3623d3eaa..cba57e073 100644
--- a/config/locales/devise/devise.de_formal.yml
+++ b/config/locales/devise/devise.de_formal.yml
@@ -33,9 +33,9 @@ de_formal:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
@@ -97,8 +97,8 @@ de_formal:
         remember_me: "Angemeldet bleiben"
         sign_in: "Anmelden"
         username: "Benutzername"
-      signed_in: "Angemeldet."
-      signed_out: "Abgemeldet."
+      signed_in: Angemeldet.
+      signed_out: Abgemeldet.
     shared: 
       links: 
         forgot_your_password: "Kennwort vergessen?"
diff --git a/config/locales/devise/devise.el.yml b/config/locales/devise/devise.el.yml
index d50bde8d9..486957501 100644
--- a/config/locales/devise/devise.el.yml
+++ b/config/locales/devise/devise.el.yml
@@ -33,9 +33,9 @@ el:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.en_1337.yml b/config/locales/devise/devise.en_1337.yml
index 650b83c54..4633124af 100644
--- a/config/locales/devise/devise.en_1337.yml
+++ b/config/locales/devise/devise.en_1337.yml
@@ -29,13 +29,13 @@ en_1337:
         you_can_confirm: "4CC C0MF1RM471ON -> L1NK B3L0W"
       hello: "H3Y %{email}!"
       invitation_instructions: 
-        accept: "J01N!"
+        accept: J01N!
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
@@ -97,7 +97,7 @@ en_1337:
         remember_me: "C47CH M3 (1F U C4N!)"
         sign_in: "51GN 1N"
         username: "N1CK"
-      signed_in: "G07CH4!"
+      signed_in: G07CH4!
       signed_out: "KTHXB41"
     shared: 
       links: 
diff --git a/config/locales/devise/devise.en_pirate.yml b/config/locales/devise/devise.en_pirate.yml
index c0b790bee..4a6b2eff4 100644
--- a/config/locales/devise/devise.en_pirate.yml
+++ b/config/locales/devise/devise.en_pirate.yml
@@ -33,9 +33,9 @@ en_pirate:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.en_shaw.yml b/config/locales/devise/devise.en_shaw.yml
index c51d42c2d..e97d7ec03 100644
--- a/config/locales/devise/devise.en_shaw.yml
+++ b/config/locales/devise/devise.en_shaw.yml
@@ -33,9 +33,9 @@ en_shaw:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.eo.yml b/config/locales/devise/devise.eo.yml
index 0eccff254..cb78ffd2f 100644
--- a/config/locales/devise/devise.eo.yml
+++ b/config/locales/devise/devise.eo.yml
@@ -33,9 +33,9 @@ eo:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.es-AR.yml b/config/locales/devise/devise.es-AR.yml
index 482cb2c57..e97df70a9 100644
--- a/config/locales/devise/devise.es-AR.yml
+++ b/config/locales/devise/devise.es-AR.yml
@@ -33,9 +33,9 @@ es-AR:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.es-CL.yml b/config/locales/devise/devise.es-CL.yml
index 4e8783f8c..885e9eac4 100644
--- a/config/locales/devise/devise.es-CL.yml
+++ b/config/locales/devise/devise.es-CL.yml
@@ -33,9 +33,9 @@ es-CL:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml
index a6d2d4e94..9881b3ae7 100644
--- a/config/locales/devise/devise.es.yml
+++ b/config/locales/devise/devise.es.yml
@@ -33,9 +33,9 @@ es:
         arrived: "La red social que has estado esperando ha llegado. Renovada, más segura y más divertida, %{strong_diaspora} está lista para ayudarte a compartir y explorar la web de una forma totalmente nueva."
         be_yourself: "Se tú mismo"
         be_yourself_paragraph: "Internet ha creado nuevas formas únicas para que nos expresemos. %{strong_diaspora} te permite ser tú mismo y compartir lo que le apetezca, usando tu nombre real o no."
-        cubbies: "Cubbi.es"
+        cubbies: Cubbi.es
         displaying_correctly: "¿No se muestra correctamente el email? %{Link} en su navegador"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "Para consultas generales o soporte sobre tu cuenta de Diaspora*, por favor envíanos un correo a %{email}."
         finally: "Finalmente - ya está aquí"
         friends_saying: "Lo que tus amigos están diciendo..."
diff --git a/config/locales/devise/devise.eu.yml b/config/locales/devise/devise.eu.yml
index c563dcc37..31a8a3428 100644
--- a/config/locales/devise/devise.eu.yml
+++ b/config/locales/devise/devise.eu.yml
@@ -33,9 +33,9 @@ eu:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.fi.yml b/config/locales/devise/devise.fi.yml
index a0fbb5cb2..8c6d7dfb4 100644
--- a/config/locales/devise/devise.fi.yml
+++ b/config/locales/devise/devise.fi.yml
@@ -33,9 +33,9 @@ fi:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
@@ -70,7 +70,7 @@ fi:
       unlock_instructions: 
         account_locked: "Käyttäjätilisi on lukittu liian usean epäonnistuneen kirjautumisyrityksen vuoksi."
         click_to_unlock: "Poista käyttäjätilisi lukitus alla olevasta linkistä:"
-        subject: "Lukituksenpoisto-ohjeet"
+        subject: Lukituksenpoisto-ohjeet
         unlock: "Poista käyttäjätilini lukitus"
       welcome: "Tervetuloa %{email}!"
     passwords: 
diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index a092dc004..5b94a0869 100644
--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -33,9 +33,9 @@ fr:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.ga.yml b/config/locales/devise/devise.ga.yml
index 2c6ab535a..80811eb27 100644
--- a/config/locales/devise/devise.ga.yml
+++ b/config/locales/devise/devise.ga.yml
@@ -33,9 +33,9 @@ ga:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.he.yml b/config/locales/devise/devise.he.yml
index b693492af..62d8538d5 100644
--- a/config/locales/devise/devise.he.yml
+++ b/config/locales/devise/devise.he.yml
@@ -33,9 +33,9 @@ he:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.hu.yml b/config/locales/devise/devise.hu.yml
index 2dd7d2d5a..3665f63cc 100644
--- a/config/locales/devise/devise.hu.yml
+++ b/config/locales/devise/devise.hu.yml
@@ -30,33 +30,33 @@ hu:
       hello: "Szia %{email}!"
       invitation_instructions: 
         accept: "Elfogadom a meghívót"
-        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"
-        email_address: "questions@joindiaspora.com"
-        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
-        finally: "Finally - it's here"
-        friends_saying: "What your friends are saying..."
-        get_connected: "Get Connected"
-        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
-        have_fun: "Have Fun"
-        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
-        help_fund: "help fund Diaspora"
-        here: "here"
+        arrived: "Megérkezett az a közösségi hálózat amire vártál. Átalakított, biztonságosabb és szórakoztatóbb, %{strong_diaspora} készen áll arra, hogy segítsen neked a web felfedezésében és megosztásában. "
+        be_yourself: "Légy Önmagad"
+        be_yourself_paragraph: "Az Internet egy új lehetőséged ad az önkifejezésre. A %{strong_diaspora} lehetőséged ad, hogy önmagad légy,  megossz amit akarsz, valódi neveddel vagy anélkül."
+        cubbies: Cubbi.es
+        displaying_correctly: "Levelünk hibásan jelenik meg? %{link} böngészöben"
+        email_address: questions@joindiaspora.com
+        email_us: "Felhasználói fiókoddal kapcsolatos kérdésekkel kérjük írj a %{email} címre."
+        finally: "Végre - Itt van!"
+        friends_saying: "Miről beszélnek az ismerőseid..."
+        get_connected: "Kapcsolódj"
+        get_connected_paragraph: "Nemzetközi megmozdulás egy közös álom a jobb webről. A %{strong_diaspora} fő funkciója a közösség. Ismerkedj új emberekkel, tartsd a kapcsolatot barátaiddal."
+        have_fun: "Jó szórakozást"
+        have_fun_paragraph: "%{strong_diaspora} az érdekes új dolgok felfedezéséről szól. %{link}, a világ első %{strong_diaspora} applikációja épp most indult. Gyűjtsd össze és oszd meg a web érdekességeit."
+        help_fund: "segíts a Diaspora* fenntartásában"
+        here: "itt"
         ignore: "Ha nem szeretnél csatlakozni csak hagyd figyelmen kívül ezt a levelet."
-        join_team: "Join our Team"
-        love: "Love,"
-        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
-        more_people: "Even more people are excited to see you!"
+        join_team: "Csatlakozz a Csapatunkhoz"
+        love: "Szeretettel,"
+        made_by_people: "A %{strong_diaspora} olyan emberek munkája, akik annyira szeretik az Internetet, mint te magad. %{jointeam}, vagy %{helpfund}!"
+        more_people: "Egyre több személy szeretne kapcsolatba lépni veled!"
         no_account_till: "A fiókod addig nem készül el amíg be nem lépsz a megadott linkkel és be nem regisztrálsz."
-        or: "or"
-        sign_up_now: "Sign up now &rarr;"
+        or: "vagy"
+        sign_up_now: "Regisztrálj most &rarr;"
         subject: "Meghívtak, hogy csatlakozz a Diaspora* közösségi hálóhoz."
-        team_diaspora: "Team Diaspora"
-        unsubscribe: "To unsubscribe please click %{link}."
-        view_in: "View in"
+        team_diaspora: "Diaspora* Csapat"
+        unsubscribe: "Leiratkozáshoz kattints %{link}."
+        view_in: "Megtekintés"
       inviter: 
         accept_at: "Meghívás elfogadása: %{url}"
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.id.yml b/config/locales/devise/devise.id.yml
index b550e3476..6694e87ff 100644
--- a/config/locales/devise/devise.id.yml
+++ b/config/locales/devise/devise.id.yml
@@ -33,9 +33,9 @@ id:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.is.yml b/config/locales/devise/devise.is.yml
index 0073261c0..b2622fd5d 100644
--- a/config/locales/devise/devise.is.yml
+++ b/config/locales/devise/devise.is.yml
@@ -33,9 +33,9 @@ is:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.it.yml b/config/locales/devise/devise.it.yml
index 14fead06d..d6fc2562f 100644
--- a/config/locales/devise/devise.it.yml
+++ b/config/locales/devise/devise.it.yml
@@ -30,33 +30,33 @@ it:
       hello: "Ciao %{email}!"
       invitation_instructions: 
         accept: "Accetta l'invito"
-        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"
-        email_address: "questions@joindiaspora.com"
-        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
-        finally: "Finally - it's here"
-        friends_saying: "What your friends are saying..."
-        get_connected: "Get Connected"
-        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
-        have_fun: "Have Fun"
-        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
-        help_fund: "help fund Diaspora"
-        here: "here"
+        arrived: "Il social network che stavi aspettando è arrivato. Rinnovato, più sicuro e più divertente, %{strong_diaspora} è pronto ad aiutarti nel condividere ed esplorare la rete in un modo tutto nuovo."
+        be_yourself: "Sii te stesso"
+        be_yourself_paragraph: "Internet ha creato nuovi modi per poterci esprimere. %{strong_diaspora} ti permette di essere te stesso e di condividere come vuoi tu, con o senza il tuo vero nome."
+        cubbies: Cubbi.es
+        displaying_correctly: "L'email non compare correttamente? %{link} nel browser"
+        email_address: questions@joindiaspora.com
+        email_us: "Per domande generali e per avere aiuto riguardo al tuo account Diaspora, scrivi pure a %{email}."
+        finally: "Finalmente - è qui"
+        friends_saying: "Cosa dicono i tuoi amici..."
+        get_connected: "Connettiti"
+        get_connected_paragraph: "Una comunità internazionale, con una visione condivisa per un web migliore, la funzionalità n°1 di %{strong_diaspora} è la sua community. Trova persone nuove, stai in contatto con gli amici e divertiti."
+        have_fun: "Divertiti"
+        have_fun_paragraph: "%{strong_diaspora} è fatta per sorprenderti con nuovi contenuti e nuove persone online. %{link}, la prima applicazione al mondo per %{strong_diaspora}, è solo l'inizio. Colleziona e condividi quel che trovi in rete in tutto il suo splendore."
+        help_fund: "aiuta a finanziare Diaspora"
+        here: "qui"
         ignore: "Se non vuoi accettare l'invito, per favore ignora questa email."
-        join_team: "Join our Team"
-        love: "Love,"
-        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
-        more_people: "Even more people are excited to see you!"
+        join_team: "Entra nel nostro team"
+        love: "Con affetto,"
+        made_by_people: "%{strong_diaspora} è fatta di persone che amano internet tanto quanto te. %{jointeam}, o %{helpfund}!"
+        more_people: "Tante altre persone son felici di trovarti qui!"
         no_account_till: "Il tuo account non sarà creato finché non cliccherai sul link qua sopra ed effettuerai la registrazione."
-        or: "or"
-        sign_up_now: "Sign up now &rarr;"
+        or: "oppure"
+        sign_up_now: "Iscriviti adesso &rarr;"
         subject: "Hai un invito per iscriverti a Diaspora!"
-        team_diaspora: "Team Diaspora"
-        unsubscribe: "To unsubscribe please click %{link}."
-        view_in: "View in"
+        team_diaspora: "Il team di Diaspora"
+        unsubscribe: "Per rimuoverti clicca %{link}."
+        view_in: "Vedi"
       inviter: 
         accept_at: "su %{url}, puoi accettare dal link qua sotto."
         has_invited_you: "%{name} ti ha invitato ad entrare in Diaspora"
diff --git a/config/locales/devise/devise.ja.yml b/config/locales/devise/devise.ja.yml
index c475b1d2c..25bd35cb5 100644
--- a/config/locales/devise/devise.ja.yml
+++ b/config/locales/devise/devise.ja.yml
@@ -6,36 +6,36 @@
 ja: 
   devise: 
     confirmations: 
-      confirmed: "アカウントの認証に成功しました。既にログイン済みです。"
+      confirmed: アカウントの認証に成功しました。既にログイン済みです。
       new: 
         resend_confirmation: "認証メールを再送する"
-      send_instructions: "数分後にアカウント認証の手続きメールが届きます。"
+      send_instructions: 数分後にアカウント認証の手続きメールが届きます。
     failure: 
-      inactive: "アカウントはまだ承認されていません。"
-      invalid: "ユーザ名またはパスワードが不正です。"
-      invalid_token: "無効な認証トークンです。"
-      locked: "アカウントがロックされています。"
-      timeout: "セッション切れになりました。続くにはもう一度ログインしてください。"
-      unauthenticated: "進むにはログインまたは新規登録する必要があります。"
-      unconfirmed: "進にはアカウントを確認する必要があります。"
+      inactive: アカウントはまだ承認されていません。
+      invalid: ユーザ名またはパスワードが不正です。
+      invalid_token: 無効な認証トークンです。
+      locked: アカウントがロックされています。
+      timeout: セッション切れになりました。続くにはもう一度ログインしてください。
+      unauthenticated: 進むにはログインまたは新規登録する必要があります。
+      unconfirmed: 進にはアカウントを確認する必要があります。
     invitations: 
-      invitation_token_invalid: "ご使用の招待トークンは無効です！"
-      send_instructions: "招待メールを送信しました。"
-      updated: "パスワードの設定に成功しました。既にログイン済みです。"
+      invitation_token_invalid: ご使用の招待トークンは無効です！
+      send_instructions: 招待メールを送信しました。
+      updated: パスワードの設定に成功しました。既にログイン済みです。
     mailer: 
       confirmation_instructions: 
         confirm: "アカウントを認証する"
         subject: "認証手続き"
-        you_can_confirm: "次のリンクからアカウントが認証できます。"
+        you_can_confirm: 次のリンクからアカウントが認証できます。
       hello: "%{email}さん、こんにちは！"
       invitation_instructions: 
         accept: "Accept invitation"
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
@@ -63,13 +63,13 @@ ja:
         have_invited_you: "%{names} have invited you to join Diaspora"
       reset_password_instructions: 
         change: "パスワードを変更する"
-        ignore: "再設定を申請した覚えがない場合はこのメールを無視してください。"
-        someone_requested: "パスワード変更リンクの申請を預かりました。下のリンクから変更可能です。"
+        ignore: 再設定を申請した覚えがない場合はこのメールを無視してください。
+        someone_requested: パスワード変更リンクの申請を預かりました。下のリンクから変更可能です。
         subject: "パスワード再設定手続き"
-        wont_change: "上のリンクをアクセスして新しいパスワードを登録するまではパスワードが変更されません。"
+        wont_change: 上のリンクをアクセスして新しいパスワードを登録するまではパスワードが変更されません。
       unlock_instructions: 
-        account_locked: "ログイン失敗が多すぎたため、アカウントがロックされました。"
-        click_to_unlock: "アカウントのロックを解除するのに下記のリンクにクリックしてください。"
+        account_locked: ログイン失敗が多すぎたため、アカウントがロックされました。
+        click_to_unlock: アカウントのロックを解除するのに下記のリンクにクリックしてください。
         subject: "ロック解除説明"
         unlock: "アカウントのロックを解除する"
       welcome: "%{email}さん、ようこそ！"
@@ -77,45 +77,45 @@ ja:
       edit: 
         change_password: "パスワードを変更する"
       new: 
-        forgot_password: "パスワードを忘れましたか。"
-        no_account: "このメールアドレスに一致するアカウントは存在しません。招待待ちの方は、なるべく早く出せるように努力していますので、もう少々お待ちください。"
-        send_password_instructions: "パスワード再発行の手続きメールを送ってください。"
-      send_instructions: "数分後にパスワード再発行の手続きメールが届きます。"
-      updated: "パスワードの変更に成功しました。既にログイン済みです。"
+        forgot_password: パスワードを忘れましたか。
+        no_account: このメールアドレスに一致するアカウントは存在しません。招待待ちの方は、なるべく早く出せるように努力していますので、もう少々お待ちください。
+        send_password_instructions: パスワード再発行の手続きメールを送ってください。
+      send_instructions: 数分後にパスワード再発行の手続きメールが届きます。
+      updated: パスワードの変更に成功しました。既にログイン済みです。
     registrations: 
-      destroyed: "さようなら！アカウントの取消しに成功しました。またのご参加をお待ちしています。"
-      signed_up: "新規登録に成功しました。設定が有効な場合、確認メールも送信されました。"
-      updated: "アカウントの更新に成功しました。"
+      destroyed: さようなら！アカウントの取消しに成功しました。またのご参加をお待ちしています。
+      signed_up: 新規登録に成功しました。設定が有効な場合、確認メールも送信されました。
+      updated: アカウントの更新に成功しました。
     sessions: 
       new: 
-        alpha_software: "これから使うソフトはアルファ版です。"
-        bugs_and_feedback: "バク発生に覚悟してください。小さな支障でもページ右側の「フィードバック」ボタンからご報告願います！頂いた問題報告はなるべく早く解決できるよう努力します。"
-        bugs_and_feedback_mobile: "バク発生に覚悟してください。小さな支障でもご報告願います！頂いた問題報告はなるべく早く解決できるよう努力します。"
+        alpha_software: これから使うソフトはアルファ版です。
+        bugs_and_feedback: バク発生に覚悟してください。小さな支障でもページ右側の「フィードバック」ボタンからご報告願います！頂いた問題報告はなるべく早く解決できるよう努力します。
+        bugs_and_feedback_mobile: バク発生に覚悟してください。小さな支障でもご報告願います！頂いた問題報告はなるべく早く解決できるよう努力します。
         login: "ログイン"
-        modern_browsers: "最新型のブラウザにしか対応していません。"
+        modern_browsers: 最新型のブラウザにしか対応していません。
         password: "パスワード"
         remember_me: "ログインしたままにする"
         sign_in: "ログイン"
         username: "ユーザ名"
-      signed_in: "ログインに成功しました。"
-      signed_out: "ログアウトに成功しました。"
+      signed_in: ログインに成功しました。
+      signed_out: ログアウトに成功しました。
     shared: 
       links: 
-        forgot_your_password: "パスワードを忘れましたか。"
-        receive_confirmation: "認証手続きメールが届きませんでしたか。"
-        receive_unlock: "ロック解除の説明が届きませんでしたか。"
+        forgot_your_password: パスワードを忘れましたか。
+        receive_confirmation: 認証手続きメールが届きませんでしたか。
+        receive_unlock: ロック解除の説明が届きませんでしたか。
         sign_in: "ログイン"
         sign_up: "新規登録"
-        sign_up_closed: "一般の新規登録は現在受け付けていません。"
+        sign_up_closed: 一般の新規登録は現在受け付けていません。
       mail_signup_form: 
-        sign_up_for_an_invite: "参加招待の希望者として登録したい！"
+        sign_up_for_an_invite: 参加招待の希望者として登録したい！
     unlocks: 
       new: 
         resend_unlock: "ロック解除手続きメールを再送する"
-      send_instructions: "数分後にアカウントロック解除の手続きメールが届きます。"
-      unlocked: "アカウントのロック解除に成功しました。既にログイン済みです。"
+      send_instructions: 数分後にアカウントロック解除の手続きメールが届きます。
+      unlocked: アカウントのロック解除に成功しました。既にログイン済みです。
   errors: 
     messages: 
-      already_confirmed: "既に認証済みです。"
-      not_found: "見つかりませんでした。"
-      not_locked: "ロックされませんでした。"
+      already_confirmed: 既に認証済みです。
+      not_found: 見つかりませんでした。
+      not_locked: ロックされませんでした。
diff --git a/config/locales/devise/devise.ko.yml b/config/locales/devise/devise.ko.yml
index 814f61686..67fdc1b4d 100644
--- a/config/locales/devise/devise.ko.yml
+++ b/config/locales/devise/devise.ko.yml
@@ -33,9 +33,9 @@ ko:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.lt.yml b/config/locales/devise/devise.lt.yml
index 65a37b483..69577b039 100644
--- a/config/locales/devise/devise.lt.yml
+++ b/config/locales/devise/devise.lt.yml
@@ -33,9 +33,9 @@ lt:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.mk.yml b/config/locales/devise/devise.mk.yml
index 905f2aa85..c2d3c3e5b 100644
--- a/config/locales/devise/devise.mk.yml
+++ b/config/locales/devise/devise.mk.yml
@@ -33,9 +33,9 @@ mk:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.nb.yml b/config/locales/devise/devise.nb.yml
index c5e1decd0..536d58114 100644
--- a/config/locales/devise/devise.nb.yml
+++ b/config/locales/devise/devise.nb.yml
@@ -33,9 +33,9 @@ nb:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.nl.yml b/config/locales/devise/devise.nl.yml
index 5db300103..ddcd2ad48 100644
--- a/config/locales/devise/devise.nl.yml
+++ b/config/locales/devise/devise.nl.yml
@@ -33,9 +33,9 @@ nl:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.nn.yml b/config/locales/devise/devise.nn.yml
index d30380525..090bbdbb2 100644
--- a/config/locales/devise/devise.nn.yml
+++ b/config/locales/devise/devise.nn.yml
@@ -33,9 +33,9 @@ nn:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.pa.yml b/config/locales/devise/devise.pa.yml
index 06a5cc3ed..17c8e1ea2 100644
--- a/config/locales/devise/devise.pa.yml
+++ b/config/locales/devise/devise.pa.yml
@@ -33,9 +33,9 @@ pa:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
@@ -91,9 +91,9 @@ pa:
         alpha_software: "You are about to use alpha software."
         bugs_and_feedback: "Be advised, you will experience bugs.  We encourage you to use the Feedback button on the right hand side of your browser to report any hiccups!  We will work as fast as we can to resolve any issues you report."
         bugs_and_feedback_mobile: "Be advised, you will experience bugs.  We encourage you to report any hiccups!  We will work as fast as we can to resolve any issues you report."
-        login: "ਲਾਗਇਨ"
+        login: ਲਾਗਇਨ
         modern_browsers: "only supports modern browsers."
-        password: "ਪਾਸਵਰਡ"
+        password: ਪਾਸਵਰਡ
         remember_me: "Remember me"
         sign_in: "Sign in"
         username: "Username"
diff --git a/config/locales/devise/devise.pl.yml b/config/locales/devise/devise.pl.yml
index fc1212747..3a86b4841 100644
--- a/config/locales/devise/devise.pl.yml
+++ b/config/locales/devise/devise.pl.yml
@@ -30,32 +30,32 @@ pl:
       hello: "Cześć %{email}!"
       invitation_instructions: 
         accept: "Przyjmij zaproszenie"
-        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."
+        arrived: "Sieć społecznościowa na którą czekałeś lub czekałaś właśnie stała się faktem. Przebudowana, bezpieczniejsza i zabawniejsza %{strong_diaspora} jest gotowa pomóc Ci dzielić się i odkrywać internet w zupełnie nowy sposób."
         be_yourself: "Bądź sobą"
-        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"
+        be_yourself_paragraph: "Internet dostarcza wiele zupełnie nowych sposobów wyrażania siebie. %{strong_diaspora} pozwala Ci być sobą i udostępniać cokolwiek chcesz, podając lub nie swoje prawdziwe imię i nazwisko."
+        cubbies: Cubbi.es
         displaying_correctly: "E-mail nie wyświetla się poprawnie? Otwórz %{link} w przeglądarce"
-        email_address: "questions@joindiaspora.com"
-        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        email_address: questions@joindiaspora.com
+        email_us: "Pytania ogólne oraz zgłoszenia problemów z kontem na Diasporze należy kierować do nas na adres %{email}."
         finally: "Nareszcie - jest tutaj"
         friends_saying: "Co mówią Twoi znajomi..."
         get_connected: "Bądź w kontakcie"
-        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        get_connected_paragraph: "Międzynarodowy ruch dzielący wspólną wizję lepszego internetu. %{strong_diaspora} - tutaj społeczność jest na pierwszym planie. Poznaj nowych ludzi, połącz się ze znajomymi i bawcie się razem."
         have_fun: "Baw się dobrze"
-        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        have_fun_paragraph: "%{strong_diaspora} służy odkrywaniu niesamowitych nowych treści i ludzi. %{link}, pierwsza na świecie %{strong_diaspora} aplikacja to tylko początek. Zbieraj i udostępniaj zawartość internetu w całej okazałości."
         help_fund: "wspomóż Diasporę darowizną"
         here: "tutaj"
         ignore: "Zignoruj tę wiadomość jeśli nie chcesz zaakceptować tego zaproszenia."
         join_team: "Dołącz do naszego zespołu"
         love: "Pozdrawiam,"
-        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        made_by_people: "%{strong_diaspora} została stworzona przez ludzi kochających internet tak samo jak Ty. %{jointeam} lub %{helpfund}!"
         more_people: "Jeszcze więcej osób, nie może się doczekać, aby Cię zobaczyć!"
         no_account_till: "Konto nie zostanie utworzone dopóki nie zalogujesz się na stronie powyżej."
         or: "lub"
         sign_up_now: "Zarejestruj się teraz →"
         subject: "Zapraszamy do dołączenia do Diaspory!"
         team_diaspora: "Zespół Diaspory"
-        unsubscribe: "To unsubscribe please click %{link}."
+        unsubscribe: "Aby zrezygnować z subskrypcji kliknij %{link}."
         view_in: "Wyświetl w"
       inviter: 
         accept_at: "na %{url}, możesz je zaakceptować używając poniższego łącza."
diff --git a/config/locales/devise/devise.pt-BR.yml b/config/locales/devise/devise.pt-BR.yml
index 2ea16a371..690aeac3c 100644
--- a/config/locales/devise/devise.pt-BR.yml
+++ b/config/locales/devise/devise.pt-BR.yml
@@ -31,24 +31,24 @@ pt-BR:
       invitation_instructions: 
         accept: "Aceitar convite"
         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: "Seja você mesmo"
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
-        finally: "Finally - it's here"
-        friends_saying: "What your friends are saying..."
+        finally: "Finalmente - está aqui"
+        friends_saying: "O que seus amigos estão dizendo..."
         get_connected: "Get Connected"
         get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
         have_fun: "Have Fun"
         have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
         help_fund: "help fund Diaspora"
-        here: "here"
+        here: "aqui"
         ignore: "Se você não quer aceitar o convite, por favor ignore este e-mail."
         join_team: "Join our Team"
         love: "Love,"
-        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        made_by_people: "%{strong_diaspora} é feito por pessoas que amam Internet tanto quanto você. %{jointeam}, ou %{helpfund}!"
         more_people: "Even more people are excited to see you!"
         no_account_till: "Sua conta não pode ser criada até que você acesse o link acima e se cadastre."
         or: "or"
@@ -105,7 +105,7 @@ pt-BR:
         receive_confirmation: "Não recebeu instruções de confirmação?"
         receive_unlock: "Não recebeu instruções de desbloqueio?"
         sign_in: "Entrar"
-        sign_up: "Cadastre-se"
+        sign_up: Cadastre-se
         sign_up_closed: "Registros abertos estão encerrados no momento."
       mail_signup_form: 
         sign_up_for_an_invite: "Registre-se para receber um convite!"
diff --git a/config/locales/devise/devise.pt-PT.yml b/config/locales/devise/devise.pt-PT.yml
index 1123f8720..edcf9301f 100644
--- a/config/locales/devise/devise.pt-PT.yml
+++ b/config/locales/devise/devise.pt-PT.yml
@@ -33,9 +33,9 @@ pt-PT:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
@@ -93,7 +93,7 @@ pt-PT:
         bugs_and_feedback_mobile: "Tenha em conta que irão ocorrer erros.  Encorajamo-lo a relatar quaisquer anomalias!  Trabalharemos tão rapidamente quanto possível para resolver quaisquer problemas que relate."
         login: "Iniciar sessão"
         modern_browsers: "apenas suporta navegadores modernos."
-        password: "Palavra-passe"
+        password: Palavra-passe
         remember_me: "Lembrar-se de mim"
         sign_in: "Iniciar sessão"
         username: "Nome de Utilizador"
@@ -105,7 +105,7 @@ pt-PT:
         receive_confirmation: "Não recebeu as instruções de confirmação?"
         receive_unlock: "Não recebeu as instruções de desbloqueio?"
         sign_in: "Iniciar sessão"
-        sign_up: "Registe-se"
+        sign_up: Registe-se
         sign_up_closed: "Os registos abertos não estão disponíveis por agora."
       mail_signup_form: 
         sign_up_for_an_invite: "Inscreva-se para receber um convite!"
diff --git a/config/locales/devise/devise.ro.yml b/config/locales/devise/devise.ro.yml
index 7a4f68a78..bb3d68004 100644
--- a/config/locales/devise/devise.ro.yml
+++ b/config/locales/devise/devise.ro.yml
@@ -33,9 +33,9 @@ ro:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
@@ -105,7 +105,7 @@ ro:
         receive_confirmation: "Nu aţi primit instrucţiunile de confirmare?"
         receive_unlock: "Nu aţi primit instrucţiunile de deblocare?"
         sign_in: "Autentificare"
-        sign_up: "Înregistrează-te"
+        sign_up: Înregistrează-te
         sign_up_closed: "Înscrierile sunt închise în acest moment."
       mail_signup_form: 
         sign_up_for_an_invite: "Înscrie-te pentru o invitaţie!"
diff --git a/config/locales/devise/devise.ru.yml b/config/locales/devise/devise.ru.yml
index 84abe5ba1..6f45e0a1a 100644
--- a/config/locales/devise/devise.ru.yml
+++ b/config/locales/devise/devise.ru.yml
@@ -30,33 +30,33 @@ ru:
       hello: "Привет %{email}!"
       invitation_instructions: 
         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"
-        email_address: "questions@joindiaspora.com"
-        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
-        finally: "Finally - it's here"
-        friends_saying: "What your friends are saying..."
-        get_connected: "Get Connected"
-        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
-        have_fun: "Have Fun"
-        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
-        help_fund: "help fund Diaspora"
-        here: "here"
+        arrived: "Социальная сеть, которую вы так долго ждали, наконец, появилась. Обновленная, более защищенная и более дружелюбная, %{strong_diaspora} готова помочь вам делиться и исследовать Сеть по-новому."
+        be_yourself: "Будьте собой"
+        be_yourself_paragraph: "Интернет дал нам множество уникальных способов самовыражения. %{strong_diaspora} позволяет вам быть собой и делиться чем угодно, как под настоящим именем, так и под псевдонимом."
+        cubbies: Cubbi.es
+        displaying_correctly: "Письмо отображается некорректно? %{link} в вашем браузере"
+        email_address: questions@joindiaspora.com
+        email_us: "По общим вопросам или вопросам, связанным с вашей учетной записью в Диаспоре, пожалуйста пишите нам на адрес %{email}."
+        finally: "Наконец, она здесь"
+        friends_saying: "Что говорят ваши друзья..."
+        get_connected: "Общайтесь"
+        get_connected_paragraph: "Международное движение, объединенное общим взглядом на будущее Сети, сообщество %{strong_diaspora} — ее главный козырь. Знакомьтесь с новыми людьми, общайтесь с друзьями и присоединяйтесь к празднику."
+        have_fun: "Веселитесь"
+        have_fun_paragraph: "Основная задача %{strong_diaspora} — помочь вам находить новую качественную информацию и интересных людей. %{link}, первое в мире приложение для %{strong_diaspora}, это только начало. Собирайте и делитесь своими лучшими находками в сети."
+        help_fund: "помогите финансировать Диаспору"
+        here: "сюда"
         ignore: "Если вы не хотите принимать приглашение, проигнорируйте."
-        join_team: "Join our Team"
-        love: "Love,"
-        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
-        more_people: "Even more people are excited to see you!"
+        join_team: "Присоединяйтесь к нам"
+        love: "С любовью,"
+        made_by_people: "%{strong_diaspora} создается людьми, которые любят Интернет так же, как и вы. %{jointeam} или %{helpfund}!"
+        more_people: "Даже больше людей рады видеть вас!"
         no_account_till: "Ваш аккаунт не будет создан, пока вы не зарегистрировались."
-        or: "or"
-        sign_up_now: "Sign up now &rarr;"
+        or: "или"
+        sign_up_now: "Зарегистрируйтесь сейчас &rarr;"
         subject: "Вы приглашены присоединиться к диаспоре!"
-        team_diaspora: "Team Diaspora"
-        unsubscribe: "To unsubscribe please click %{link}."
-        view_in: "View in"
+        team_diaspora: "Команда Диаспоры"
+        unsubscribe: "Чтобы отписаться, нажмите %{link}."
+        view_in: "Открыть в"
       inviter: 
         accept_at: "в %{url}, вы можете принять его по ссылке ниже."
         has_invited_you: "%{name}"
@@ -97,8 +97,8 @@ ru:
         remember_me: "Запомнить"
         sign_in: "Войти"
         username: "Имя пользователя"
-      signed_in: "Вошли."
-      signed_out: "Вышли."
+      signed_in: Вошли.
+      signed_out: Вышли.
     shared: 
       links: 
         forgot_your_password: "Забыли пароль?"
diff --git a/config/locales/devise/devise.sk.yml b/config/locales/devise/devise.sk.yml
index 9556026de..69b2809b5 100644
--- a/config/locales/devise/devise.sk.yml
+++ b/config/locales/devise/devise.sk.yml
@@ -33,9 +33,9 @@ sk:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.sl.yml b/config/locales/devise/devise.sl.yml
index b65722088..75b9dd15b 100644
--- a/config/locales/devise/devise.sl.yml
+++ b/config/locales/devise/devise.sl.yml
@@ -1,4 +1,4 @@
-#   Copyright (c) 2011, Diaspora Inc.  This file is
+#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
@@ -6,92 +6,204 @@
 sl: 
   devise: 
     confirmations: 
-      confirmed: "Vaš uporabniški račun je uspešno potrjen. Zdaj ste prijavljeni."
+      confirmed: !binary |
+          VmGaIHVwb3JhYm5pmmtpIHJh6HVuIGplIHVzcGWabm8gcG90cmplbi4gWmRh
+          aiBzdGUgcHJpamF2bGplbmku
       new: 
-        resend_confirmation: "Ponovno pošlji navodila za potrditev uporabniškega računa"
-      send_instructions: "V nekaj minutah boste po e-pošti prejeli navodila, kako potrditi vaš uporabniški račun."
+        resend_confirmation: !binary |
+            UG9ub3ZubyBwb5psamkgbmF2b2RpbGEgemEgcG90cmRpdGV2IHVwb3JhYm5p
+            mmtlZ2EgcmHodW5h
+      send_instructions: !binary |
+          ViBuYXNsZWRuamloIG5la2FqIG1pbnV0YWggYm9zdGUgcHJlamVsaSBlLXBv
+          mnRvIHogIG5hdm9kaWxpLCBrYWtvIHBvdHJkaXRpIHZhmiB1cG9yYWJuaZpr
+          aSByYeh1bi4=
     failure: 
-      inactive: "Vaš račun še ni aktiviran."
-      invalid: "Napačeno uporabniško ime ali geslo."
-      invalid_token: "Neveljavna avtentikacija."
-      locked: "Vaš račun je zaklenjen."
-      timeout: "Vaša seja je potekla. Za nadaljevanje se ponovno prijavite."
+      inactive: !binary |
+          VmGaIHJh6HVuIJplIG5pIGFrdGl2aXJhbi4=
+      invalid: !binary |
+          TmFwYehubyB1cG9yYWJuaZprbyBpbWUgYWxpIGdlc2xvLg==
+      invalid_token: !binary |
+          UHJldmVyamFuamUgcHJpc3Rub3N0aSBuaSBtb2dv6GUu
+      locked: !binary |
+          VmGaIHJh6HVuIGplIHpha2xlbmplbi4=
+      timeout: !binary |
+          VmGaYSBzZWphIGplIHBvdGVrbGEuIFphIG5hZGFsamV2YW5qZSBzZSBwb25v
+          dm5vIHByaWphdml0ZS4=
       unauthenticated: "Za nadaljevanje se prijavite ali registrirajte."
-      unconfirmed: "Za nadaljevanje potrdite vaš račun."
+      unconfirmed: !binary |
+          WmEgbmFkYWxqZXZhbmplIHBvdHJkaXRlIHZhmiByYeh1bi4=
     invitations: 
       invitation_token_invalid: "Povabilo ni veljavno!"
-      send_instructions: "Vaše povabilo je poslano."
-      updated: "Vaše geslo je uspešno spremenjeno. Zdaj ste prijavljeni."
+      send_instructions: !binary |
+          VmGaZSBwb3ZhYmlsbyBqZSBwb3NsYW5vLg==
+      updated: !binary |
+          VmGaZSBnZXNsbyBqZSB1c3Blmm5vIHNwcmVtZW5qZW5vLiBaZGFqIHN0ZSBw
+          cmlqYXZsamVuaS4=
     mailer: 
       confirmation_instructions: 
-        confirm: "Potrdi uporabniški račun"
-        subject: "Navodila za potrditev uporabniškega računa"
-        you_can_confirm: "Vaš uporabniški račun lahko potrdite s pomočjo spodnje povezave:"
+        confirm: !binary |
+            UG90cmRpIHVwb3JhYm5pmmtpIHJh6HVu
+        subject: !binary |
+            TmF2b2RpbGEgemEgcG90cmRpdGV2IHVwb3JhYm5pmmtlZ2EgcmHodW5h
+        you_can_confirm: !binary |
+            VmGaIHVwb3JhYm5pmmtpIHJh6HVuIGxhaGtvIHBvdHJkaXRlIHMgcG9tb+hq
+            byBzcG9kbmplIHBvdmV6YXZlOg==
       hello: "Pozdravljeni %{email}!"
       invitation_instructions: 
-        accept: "Accept invitation"
-        ignore: "If you don't want to accept the invitation, please ignore this email."
-        no_account_till: "Your account won't be created until you access the link above and sign up."
-        subject: "You've been invited to join Diaspora!"
+        accept: "Sprejmi povabilo"
+        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"
+        email_address: questions@joindiaspora.com
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
+        ignore: !binary |
+            yGUgcG92YWJpbGEgbmUgnmVsaXRlIHNwcmVqZXRpLCBwcm9zaW1vIGplbWxq
+            aXRlIHRvIGUtcG+adG8ga290IGJyZXpwcmVkbWV0bm8u
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
+        no_account_till: !binary |
+            VmGaIHJh6HVuIG5lIGJvIHVzdHZhcmplbiwgZG9rbGVyIG5lIGJvc3RlIG9i
+            aXNrYWxpICBwb3ZlemF2ZSB6Z29yYWogaW4gc2UgdnBpc2FsaS4=
+        or: "or"
+        sign_up_now: "Sign up now &rarr;"
+        subject: !binary |
+            UG92YWJsamVuaSBzdGUsIGRhIHNlIHByaWRydZ5pdGUgb21yZZ5qdSBEaWFz
+            cG9yYSE=
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
-        accept_at: "at %{url}, you can accept it through the link below."
+        accept_at: "na %{url}, sprejmete lahko preko spodnje povezave."
         has_invited_you: "%{name}"
-        have_invited_you: "%{names} have invited you to join Diaspora"
+        have_invited_you: !binary |
+            JXtuYW1lc30gc28gdmFzIHBvdmFiaWxpIHYgb21yZZ5qZSBEaWFzcG9yYQ==
       reset_password_instructions: 
         change: "Spremeni geslo"
-        ignore: "V kolikor tega niste zahtevali, vzamite to e-sporočilo kot brezpredmetno."
-        someone_requested: "Nekdo je zahteval povezavo za spremembo vašega gesla, kar lahko storite s pomočjo spodnje povezave."
+        ignore: !binary |
+            ViBrb2xpa29yIHRlZ2EgbmlzdGUgemFodGV2YWxpLCBqZW1saml0ZSB0byBl
+            LXBvmnRvIGtvdCBicmV6cHJlZG1ldG5vLg==
+        someone_requested: !binary |
+            TmVrZG8gamUgemFodGV2YWwgcG92ZXphdm8gemEgc3ByZW1lbWJvIHZhmmVn
+            YSBnZXNsYSwga2FyIGxhaGtvIHN0b3JpdGUgcyBwb21v6GpvIHNwb2RuamUg
+            cG92ZXphdmUu
         subject: "Navodila za ponastavitev gesla"
-        wont_change: "Vaše geslo lahko spremenite s pomočjo zgornje povezave ter z vpisom novega gesla."
+        wont_change: !binary |
+            VmGaZSBnZXNsbyBsYWhrbyBzcHJlbWVuaXRlIHMgcG9tb+hqbyB6Z29ybmpl
+            IHBvdmV6YXZlIHRlciB6IHZwaXNvbSBub3ZlZ2EgZ2VzbGEu
       unlock_instructions: 
-        account_locked: "Zaradi večkratne neuspešne prijave se je vaš uporabniški račun zaklenil."
-        click_to_unlock: "Odklenite vaš uporabniški račun s klikom na spodnjo povezavo:"
-        subject: "Navodila za odklepanje uporabniškega računa"
-        unlock: "Odkleni uporabniški račun"
-      welcome: "Dobrodošli %{email}!"
+        account_locked: !binary |
+            WmFyYWRpIHZl6GtyYXRuZSBuZXVzcGWabmUgcHJpamF2ZSBzZSBqZSB2YZog
+            dXBvcmFibmmaa2kgcmHodW4gemFrbGVuaWwu
+        click_to_unlock: !binary |
+            T2RrbGVuaXRlIHZhmiB1cG9yYWJuaZpraSByYeh1biBzIGtsaWtvbSBuYSBz
+            cG9kbmpvIHBvdmV6YXZvOg==
+        subject: !binary |
+            TmF2b2RpbGEgemEgb2RrbGVwYW5qZSB1cG9yYWJuaZprZWdhIHJh6HVuYQ==
+        unlock: !binary |
+            T2RrbGVuaSB1cG9yYWJuaZpraSByYeh1bg==
+      welcome: !binary |
+          RG9icm9kb5psaSAle2VtYWlsfSE=
     passwords: 
       edit: 
         change_password: "Spremeni geslo"
       new: 
         forgot_password: "Ste pozabili geslo?"
-        no_account: "Uporabniški račun s tem e-naslovom ne obstaja. V kolikor še čakate na povabilo, ga lahko v kratkem pričakujete."
-        send_password_instructions: "Pošlji navodila za ponastavitev gesla"
-      send_instructions: "V nekaj minutah boste po e-pošti prejeli navodila za ponastavitev vašega gesla."
-      updated: "Vaše geslo je bilo uspešno spremenjeno. Zdaj ste prijavljeni."
+        no_account: !binary |
+            VXBvcmFibmmaa2kgcmHodW4gcyB0ZW0gZS1uYXNsb3ZvbSBuZSBvYnN0YWph
+            LiBWIGtvbGlrb3IgmmUg6GFrYXRlIG5hIHBvdmFiaWxvLCB2YXMgcHJvc2lt
+            byB6YSBwb3RycGxqZW5qZS4=
+        send_password_instructions: !binary |
+            UG+abGppIG5hdm9kaWxhIHphIHBvbmFzdGF2aXRldiBnZXNsYQ==
+      send_instructions: !binary |
+          ViBuZWthaiBtaW51dGFoIGJvc3RlIHByZWplbGkgZS1wb5p0byB6IG5hdm9k
+          aWxpIHphIHBvbmFzdGF2aXRldiB2YZplZ2EgZ2VzbGEu
+      updated: !binary |
+          VmGaZSBnZXNsbyBqZSBiaWxvIHVzcGWabm8gc3ByZW1lbmplbm8uIFpkYWog
+          c3RlIHByaWphdmxqZW5pLg==
     registrations: 
-      destroyed: "Nasvidenje! Vaš uporabniški račun je uspešno preklican. Vljudno ste vabljeni, da nas ponovno obiščete."
-      signed_up: "Vaša registracija je uspešna. V kolikor je omogočeno, ste v vašo e-pošto prejeli sporočilo za potrditev računa."
-      updated: "Vaš uporabniški račun je uspešno posodobljen."
+      destroyed: !binary |
+          TmFzdmlkZW5qZSEgVmGaIHVwb3JhYm5pmmtpIHJh6HVuIGplIHVzcGWabm8g
+          cHJla2xpY2FuLiBWbGp1ZG5vIHZhcyB2YWJpbW8sIGRhIG5hcyBwb25vdm5v
+          IG9iaZroZXRlLg==
+      signed_up: !binary |
+          VmGaYSByZWdpc3RyYWNpamEgamUgdXNwZZpuYS4gViBrb2xpa29yIGplIG9t
+          b2dv6GVubywgc3RlIHYgdmGabyBlLXBvmnRvIHByZWplbGkgc3Bvcm/oaWxv
+          IHphIHBvdHJkaXRldiByYeh1bmEu
+      updated: !binary |
+          VmGaIHVwb3JhYm5pmmtpIHJh6HVuIGplIHVzcGWabm8gcG9zb2RvYmxqZW4u
     sessions: 
       new: 
-        alpha_software: "Uporabili boste alfa različico programa."
-        bugs_and_feedback: "Opozarjamo vas, da lahko naletite na napake. Veseli bomo vsake prijave napake, ki jo lahko oddate s pomočjo 'Feedback' gumba na desni strani spletnega brskalnika. Po najboljših močeh se bomo potrudili, da prijavljeno napako obravnavamo in odpravimo v najkrajšem možnem času."
-        bugs_and_feedback_mobile: "Opozarjamo vas, da lahko naletite na napake. Veseli bomo vsake vaše prijave napake, ki jo bomo poskusili obravnavati in rešiti v najkrajšem možnem času."
+        alpha_software: !binary |
+            VXBvcmFiaWxpIGJvc3RlIGFscGhhIHJhemxp6GljbyBwcm9ncmFtYS4=
+        bugs_and_feedback: !binary |
+            T3BvemFyamFtbyB2YXMsIGRhIGxhaGtvIG5hbGV0aXRlIG5hIGhyb5roZS4g
+            VmVzZWxpIGJvbW8gdnNha2UgcHJpamF2bGplbmUgbmFwYWtlLCBraSBqbyBs
+            YWhrbyBvZGRhdGUgcyBwb21v6GpvICdGZWVkYmFjaycgZ3VtYmEgbmEgZGVz
+            bmkgc3RyYW5pIHNwbGV0bmVnYSBicnNrYWxuaWthLiBQbyBuYWpib2xqmmlo
+            IG1v6GVoIHNlIGJvbW8gcG90cnVkaWxpLCBkYSBwcmlqYXZsamVubyBuYXBh
+            a28gb2JyYXZuYXZhbW8gaW4gb2RwcmF2aW1vIHYgbmFqa3JhapplbSBtb55u
+            ZW0g6GFzdS4=
+        bugs_and_feedback_mobile: !binary |
+            T3BvemFyamFtbyB2YXMsIGRhIGxhaGtvIG5hbGV0aXRlIG5hIG5hcGFrZS4g
+            IFZlc2VsaSBib21vIHZzYWtlIHZhmmUgcHJpamF2bGplbmUgbmFwYWtlLCBr
+            aSBqbyBib21vIHBvc2t1c2lsaSBvYnJhdm5hdmF0aSBpbiByZZppdGkgdiBu
+            YWprcmFqmmVtIG1vnm5lbSDoYXN1Lg==
         login: "Prijava"
-        modern_browsers: "podpira le novejše spletne brskalnike."
+        modern_browsers: !binary |
+            cG9kcGlyYSBsZSBub3ZlapplIHNwbGV0bmUgYnJza2FsbmlrZS4=
         password: "Geslo"
         remember_me: "Zapomni si me"
         sign_in: "Prijavi se"
-        username: "Uporabniško ime"
-      signed_in: "Vaša prijava je uspešna."
-      signed_out: "Vaša odjava je uspešna."
+        username: !binary |
+            VXBvcmFibmmaa28gaW1l
+      signed_in: !binary |
+          VmGaYSBwcmlqYXZhIGplIHVzcGWabmEu
+      signed_out: !binary |
+          VmGaYSBvZGphdmEgamUgdXNwZZpuYS4=
     shared: 
       links: 
         forgot_your_password: "Ste pozabili geslo?"
-        receive_confirmation: "Ste prejeli navodila za potrditev uporabniškega računa?"
-        receive_unlock: "Ste prejeli navodila za odklepanje uporabniškega računa?"
+        receive_confirmation: !binary |
+            U3RlIHByZWplbGkgbmF2b2RpbGEgemEgcG90cmRpdGV2IHVwb3JhYm5pmmtl
+            Z2EgcmHodW5hPw==
+        receive_unlock: !binary |
+            U3RlIHByZWplbGkgbmF2b2RpbGEgemEgb2RrbGVwYW5qZSB1cG9yYWJuaZpr
+            ZWdhIHJh6HVuYT8=
         sign_in: "Prijava"
-        sign_up: "Registracija"
-        sign_up_closed: "Registracija trenutno ni omogočena."
+        sign_up: "Vpis"
+        sign_up_closed: !binary |
+            VnBpcyB0cmVudXRubyBuaSBvbW9nb+hlbi4=
       mail_signup_form: 
-        sign_up_for_an_invite: "Dodaj me med povabljene!"
+        sign_up_for_an_invite: !binary |
+            UHJpamF2YSBuYSDoYWthbG5vIGxpc3RvIHphIHBvdmFiaWxhIQ==
     unlocks: 
       new: 
-        resend_unlock: "Ponovno pošlji navodila za odklepanje uporabniškega računa"
-      send_instructions: "V nekaj minutah boste po e-pošti prejeli navodila za odklepanje vašega uporabniškega računa."
-      unlocked: "Vaš uporabniški račun je bil uspešno odklenjen. Zdaj ste prijavljeni."
+        resend_unlock: !binary |
+            UG9ub3ZubyBwb5psamkgbmF2b2RpbGEgemEgb2RrbGVwYW5qZSB1cG9yYWJu
+            aZprZWdhIHJh6HVuYQ==
+      send_instructions: !binary |
+          ViBuZWthaiBtaW51dGFoIGJvc3RlIHByZWplbGkgZS1wb5p0byB6IG5hdm9k
+          aWxpIHphIG9ka2xlcGFuamUgdmGaZWdhIHVwb3JhYm5pmmtlZ2EgcmHodW5h
+          Lg==
+      unlocked: !binary |
+          VmGaIHVwb3JhYm5pmmtpIHJh6HVuIGplIGJpbCB1c3Blmm5vIG9ka2xlbmpl
+          bi4gWmRhaiBzdGUgcHJpamF2bGplbmku
   errors: 
     messages: 
-      already_confirmed: "je že bilo potrjeno"
-      not_found: "ni bilo mogoče najti"
+      already_confirmed: !binary |
+          amUgnmUgYmlsbyBwb3RyamVubw==
+      not_found: !binary |
+          bmkgYmlsbyBtb2dv6GUgbmFqdGk=
       not_locked: "ni bilo zaklenjeno"
diff --git a/config/locales/devise/devise.sv.yml b/config/locales/devise/devise.sv.yml
index d942a62c7..985b64b35 100644
--- a/config/locales/devise/devise.sv.yml
+++ b/config/locales/devise/devise.sv.yml
@@ -33,9 +33,9 @@ sv:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.tr.yml b/config/locales/devise/devise.tr.yml
index fbcc68469..ef57b0568 100644
--- a/config/locales/devise/devise.tr.yml
+++ b/config/locales/devise/devise.tr.yml
@@ -33,9 +33,9 @@ tr:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.uk.yml b/config/locales/devise/devise.uk.yml
index e569d4be3..632296f0e 100644
--- a/config/locales/devise/devise.uk.yml
+++ b/config/locales/devise/devise.uk.yml
@@ -30,33 +30,33 @@ uk:
       hello: "Привіт %{email}!"
       invitation_instructions: 
         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"
-        email_address: "questions@joindiaspora.com"
-        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
-        finally: "Finally - it's here"
-        friends_saying: "What your friends are saying..."
-        get_connected: "Get Connected"
-        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
-        have_fun: "Have Fun"
-        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
-        help_fund: "help fund Diaspora"
-        here: "here"
+        arrived: "Соціальна мережа, яку ви так довго чекали, нарешті, з'явилася. Оновлена, захищеніша і доброзичливіша %{strong_diaspora} готова допомогти вам ділитися і досліджувати Мережу по-новому."
+        be_yourself: "Будьте собою"
+        be_yourself_paragraph: "Інтернет дав нам безліч унікальних способів самовираження. %{strong_diaspora} дозволяє вам бути собою і ділитися чим завгодно, як під справжнім ім'ям, так і під псевдонімом."
+        cubbies: Cubbi.es
+        displaying_correctly: "Лист відображається некоректно? %{link} у вашому браузері"
+        email_address: questions@joindiaspora.com
+        email_us: "Із загальних питань або питань, пов'язаних з вашим обліковим записом в Діаспорі, будь ласка пишіть нам на адресу %{email}."
+        finally: "Нарешті, вона тут"
+        friends_saying: "Що говорять ваші друзі..."
+        get_connected: "Спілкуйтеся"
+        get_connected_paragraph: "Міжнародний рух, об'єднаний загальним поглядом на майбутнє Мережі, співтовариство %{strong_diaspora} - її головний козир. Знайомтеся з новими людьми, спілкуйтеся з друзями і приєднуйтеся до свята."
+        have_fun: "Веселіться"
+        have_fun_paragraph: "Основне завдання %{strong_diaspora} - допомогти вам знаходити нову якісну інформацію і цікавих людей. %{link}, перший у світі додаток для %{strong_diaspora}, це тільки початок. Збирайте і діліться своїми кращими знахідками в мережі."
+        help_fund: "допоможіть фінансувати Діаспору"
+        here: "сюди"
         ignore: "Якщо ви не хочете приймати запрошення, проігноруйте."
-        join_team: "Join our Team"
-        love: "Love,"
-        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
-        more_people: "Even more people are excited to see you!"
+        join_team: "Приєднуйтеся до нас"
+        love: "З любов'ю,"
+        made_by_people: "%{strong_diaspora} створюється людьми, які люблять Інтернет так само, як і ви. %{jointeam} чи %{helpfund}!"
+        more_people: "Навіть більше людей раді бачити вас!"
         no_account_till: "Ваш аккаунт не буде створений, поки ви не зареєструвалися."
-        or: "or"
-        sign_up_now: "Sign up now &rarr;"
+        or: "чи"
+        sign_up_now: "Зареєструйтеся зараз &rarr;"
         subject: "Ви запрошені приєднатися до Діаспори!"
-        team_diaspora: "Team Diaspora"
-        unsubscribe: "To unsubscribe please click %{link}."
-        view_in: "View in"
+        team_diaspora: "Команда Діаспори"
+        unsubscribe: "Щоб відписатися, натисніть %{link}."
+        view_in: "Відкрити в"
       inviter: 
         accept_at: "в %{url}, ви можете прийняти його по посиланню нижче."
         has_invited_you: "%{name}"
@@ -94,11 +94,11 @@ uk:
         login: "Логін"
         modern_browsers: "підтримує тільки сучасні браузери."
         password: "Пароль"
-        remember_me: "Запам'ятати"
+        remember_me: Запам'ятати
         sign_in: "Увійти"
         username: "Ім'я користувача"
-      signed_in: "Увійшли."
-      signed_out: "Вишли."
+      signed_in: Увійшли.
+      signed_out: Вишли.
     shared: 
       links: 
         forgot_your_password: "Забули пароль?"
diff --git a/config/locales/devise/devise.vi.yml b/config/locales/devise/devise.vi.yml
index 259155cfd..277a198d7 100644
--- a/config/locales/devise/devise.vi.yml
+++ b/config/locales/devise/devise.vi.yml
@@ -33,9 +33,9 @@ vi:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
diff --git a/config/locales/devise/devise.zh-CN.yml b/config/locales/devise/devise.zh-CN.yml
index 68ac1b24a..8adc378e4 100644
--- a/config/locales/devise/devise.zh-CN.yml
+++ b/config/locales/devise/devise.zh-CN.yml
@@ -6,36 +6,36 @@
 zh-CN: 
   devise: 
     confirmations: 
-      confirmed: "帐号确认成功。您已经成功登录。"
+      confirmed: 帐号确认成功。您已经成功登录。
       new: 
         resend_confirmation: "重送发送帐号确认邮件"
-      send_instructions: "您会在几分钟内收到一封邮件，它将指引您完成帐号确认步骤。"
+      send_instructions: 您会在几分钟内收到一封邮件，它将指引您完成帐号确认步骤。
     failure: 
-      inactive: "你的帐号尚未激活。"
-      invalid: "邮箱或密码有误。"
-      invalid_token: "验证信息不合法。"
-      locked: "您的帐号已锁定。"
-      timeout: "会话超时。若要继续，请重新登录。"
-      unauthenticated: "请您登录或注册。"
-      unconfirmed: "你必须先验证帐号才能继续。"
+      inactive: 你的帐号尚未激活。
+      invalid: 邮箱或密码有误。
+      invalid_token: 验证信息不合法。
+      locked: 您的帐号已锁定。
+      timeout: 会话超时。若要继续，请重新登录。
+      unauthenticated: 请您登录或注册。
+      unconfirmed: 你必须先验证帐号才能继续。
     invitations: 
-      invitation_token_invalid: "邀请码验证失败。"
-      send_instructions: "邀请发送成功。"
-      updated: "密码设定成功。您已经成功登录。"
+      invitation_token_invalid: 邀请码验证失败。
+      send_instructions: 邀请发送成功。
+      updated: 密码设定成功。您已经成功登录。
     mailer: 
       confirmation_instructions: 
         confirm: "确认帐号"
         subject: "帐号确认步骤"
-        you_can_confirm: "你可以点击下面的链接确认帐号："
+        you_can_confirm: 你可以点击下面的链接确认帐号：
       hello: "您好, %{email}!"
       invitation_instructions: 
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
@@ -45,15 +45,15 @@ zh-CN:
         have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
         help_fund: "help fund Diaspora"
         here: "here"
-        ignore: "如果您不想接收这个邀请，请忽略这封邮件。"
+        ignore: 如果您不想接收这个邀请，请忽略这封邮件。
         join_team: "Join our Team"
         love: "Love,"
         made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
         more_people: "Even more people are excited to see you!"
-        no_account_till: "只有在您点击上面的链接并注册后，您的帐号才会被创建。"
+        no_account_till: 只有在您点击上面的链接并注册后，您的帐号才会被创建。
         or: "or"
         sign_up_now: "Sign up now &rarr;"
-        subject: "您被邀请加入Diaspora！"
+        subject: 您被邀请加入Diaspora！
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
@@ -64,12 +64,12 @@ zh-CN:
       reset_password_instructions: 
         change: "重置密码"
         ignore: "如果您并没有请求重置密码, 请忽略这封信件。"
-        someone_requested: "有人请求重置您的密码，若确实要这么做，请点击下面的链接。"
+        someone_requested: 有人请求重置您的密码，若确实要这么做，请点击下面的链接。
         subject: "密码重置步骤"
-        wont_change: "在点击以上链接重置密码后，您的密码才会改变。"
+        wont_change: 在点击以上链接重置密码后，您的密码才会改变。
       unlock_instructions: 
-        account_locked: "您的帐号因为登录失败次数异常而被锁定。"
-        click_to_unlock: "点击下面的链接以解锁您的帐号："
+        account_locked: 您的帐号因为登录失败次数异常而被锁定。
+        click_to_unlock: 点击下面的链接以解锁您的帐号：
         subject: "帐号解锁步骤"
         unlock: "解锁帐号"
       welcome: "欢迎您, %{email}!"
@@ -77,43 +77,43 @@ zh-CN:
       edit: 
         change_password: "修改密码"
       new: 
-        forgot_password: "忘记密码？"
+        forgot_password: 忘记密码？
         no_account: "没有与此邮箱关联的帐号。如果您在等待邀请函, 我们将尽快寄出."
         send_password_instructions: "请向我发送密码重置步骤"
-      send_instructions: "几分钟内您将收到一封包含密码重置步骤的邮件。"
-      updated: "密码修改成功。您已经登入了。"
+      send_instructions: 几分钟内您将收到一封包含密码重置步骤的邮件。
+      updated: 密码修改成功。您已经登入了。
     registrations: 
-      destroyed: "再见！您的帐号已经关闭。希望不久后再会。"
+      destroyed: 再见！您的帐号已经关闭。希望不久后再会。
       signed_up: "您已经成功注册。如果有设定的话, 确认信会送到您的邮箱。"
-      updated: "帐号更新成功。"
+      updated: 帐号更新成功。
     sessions: 
       new: 
-        alpha_software: "你即将使用处于开发初期的功能。"
+        alpha_software: 你即将使用处于开发初期的功能。
         bugs_and_feedback: "给您一个提醒, 你将可能遇到bug。 遇到任何问题，都请您点击浏览器右边的\"反馈\"按钮向我们反馈！ 我们会尽快处理您反馈的任何问题。"
         bugs_and_feedback_mobile: "给您一个提醒, 你将可能遇到bug。 遇到任何问题都请你向我们反馈! 我们会尽快处理你反馈的任何问题."
         login: "登录"
-        modern_browsers: "只支持较新的浏览器。"
+        modern_browsers: 只支持较新的浏览器。
         password: "密码"
         remember_me: "记住密码"
         sign_in: "登录"
         username: "用户名"
-      signed_in: "登录成功。"
-      signed_out: "登出成功。"
+      signed_in: 登录成功。
+      signed_out: 登出成功。
     shared: 
       links: 
-        forgot_your_password: "忘记密码？"
-        receive_confirmation: "没有收到确认步骤？"
-        receive_unlock: "没有收到重置步骤？"
+        forgot_your_password: 忘记密码？
+        receive_confirmation: 没有收到确认步骤？
+        receive_unlock: 没有收到重置步骤？
         sign_in: "登录"
         sign_up: "注册"
-        sign_up_closed: "目前不开放公开注册。"
+        sign_up_closed: 目前不开放公开注册。
       mail_signup_form: 
-        sign_up_for_an_invite: "凭邀请函注册！"
+        sign_up_for_an_invite: 凭邀请函注册！
     unlocks: 
       new: 
         resend_unlock: "重新发送解锁步骤"
-      send_instructions: "几分钟后您将收到一封邮件，它将指引您解锁您的帐号。"
-      unlocked: "帐号解锁成功。你已经登录。"
+      send_instructions: 几分钟后您将收到一封邮件，它将指引您解锁您的帐号。
+      unlocked: 帐号解锁成功。你已经登录。
   errors: 
     messages: 
       already_confirmed: "已确认"
diff --git a/config/locales/devise/devise.zh-TW.yml b/config/locales/devise/devise.zh-TW.yml
index b703d0f65..b687fb49c 100644
--- a/config/locales/devise/devise.zh-TW.yml
+++ b/config/locales/devise/devise.zh-TW.yml
@@ -9,18 +9,18 @@ zh-TW:
       confirmed: "帳號已確認成功. 你已經登入了."
       new: 
         resend_confirmation: "重送確認步驟"
-      send_instructions: "幾分鐘內你會收到一封說明如何確認帳號的信件."
+      send_instructions: 幾分鐘內你會收到一封說明如何確認帳號的信件.
     failure: 
-      inactive: "你的帳號尚未開通."
-      invalid: "用戶名稱或密碼有誤."
-      invalid_token: "認證信物無效."
-      locked: "你的帳號已鎖定."
+      inactive: 你的帳號尚未開通.
+      invalid: 用戶名稱或密碼有誤.
+      invalid_token: 認證信物無效.
+      locked: 你的帳號已鎖定.
       timeout: "工作階段已逾時, 若要繼續請重新登入."
-      unauthenticated: "繼續之前你必須先登入或登記."
-      unconfirmed: "你必須先確認帳號才能繼續."
+      unauthenticated: 繼續之前你必須先登入或登記.
+      unconfirmed: 你必須先確認帳號才能繼續.
     invitations: 
-      invitation_token_invalid: "提供的邀請信物無效!"
-      send_instructions: "邀請函已寄出."
+      invitation_token_invalid: 提供的邀請信物無效!
+      send_instructions: 邀請函已寄出.
       updated: "密碼已設定成功. 你已經登入了."
     mailer: 
       confirmation_instructions: 
@@ -33,9 +33,9 @@ zh-TW:
         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"
+        cubbies: Cubbi.es
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
-        email_address: "questions@joindiaspora.com"
+        email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
         finally: "Finally - it's here"
         friends_saying: "What your friends are saying..."
@@ -68,7 +68,7 @@ zh-TW:
         subject: "密碼重設步驟"
         wont_change: "在使用以上連結設定新的密碼後, 你的密碼才會改變."
       unlock_instructions: 
-        account_locked: "你的帳號因為登入失敗太多次而被鎖定了."
+        account_locked: 你的帳號因為登入失敗太多次而被鎖定了.
         click_to_unlock: "點一下以下連結以將你的帳號解鎖:"
         subject: "解鎖步驟"
         unlock: "帳號解鎖"
@@ -77,42 +77,42 @@ zh-TW:
       edit: 
         change_password: "更改密碼"
       new: 
-        forgot_password: "忘記密碼?"
+        forgot_password: 忘記密碼?
         no_account: "無此電子信箱關聯的帳號. 如果你是在等邀請函, 我們會盡快寄出."
         send_password_instructions: "傳送密碼重設的步驟給我"
-      send_instructions: "幾分鐘內你會收到一封說明如何重設密碼的信件."
+      send_instructions: 幾分鐘內你會收到一封說明如何重設密碼的信件.
       updated: "密碼更改成功. 你已經登入了."
     registrations: 
       destroyed: "再會! 你的帳號已經取消了. 希望不久後再見."
       signed_up: "你已經成功登記了. 如果有設定的話, 確認信會送到你的信箱."
-      updated: "帳號更新成功."
+      updated: 帳號更新成功.
     sessions: 
       new: 
-        alpha_software: "你將要使用剛開發的軟體."
+        alpha_software: 你將要使用剛開發的軟體.
         bugs_and_feedback: "給你個忠告, 你將會遭遇到臭蟲. 遇到任何不順, 都請你使用瀏覽器右手邊的\"回饋\"按鈕向我們回報! 我們會盡快處理你回報的任何問題."
         bugs_and_feedback_mobile: "給你個忠告, 你將會遭遇到臭蟲. 遇到任何不順都請你向我們回報! 我們會盡快處理你回報的任何問題."
         login: "登入"
-        modern_browsers: "只支援摩登的瀏覽器."
+        modern_browsers: 只支援摩登的瀏覽器.
         password: "密碼"
         remember_me: "記住我"
         sign_in: "登入"
         username: "用戶名稱"
-      signed_in: "登入成功."
-      signed_out: "登出成功."
+      signed_in: 登入成功.
+      signed_out: 登出成功.
     shared: 
       links: 
-        forgot_your_password: "忘記密碼?"
-        receive_confirmation: "沒收到確認步驟?"
-        receive_unlock: "沒收到解鎖步驟?"
+        forgot_your_password: 忘記密碼?
+        receive_confirmation: 沒收到確認步驟?
+        receive_unlock: 沒收到解鎖步驟?
         sign_in: "登入"
         sign_up: "登記"
-        sign_up_closed: "目前不開放公開登記."
+        sign_up_closed: 目前不開放公開登記.
       mail_signup_form: 
-        sign_up_for_an_invite: "邀請函登記!"
+        sign_up_for_an_invite: 邀請函登記!
     unlocks: 
       new: 
         resend_unlock: "重送解鎖步驟"
-      send_instructions: "幾分鐘後你將收到一封說明如何將你的帳號解鎖的信件."
+      send_instructions: 幾分鐘後你將收到一封說明如何將你的帳號解鎖的信件.
       unlocked: "帳號解鎖成功. 你已經登入了."
   errors: 
     messages: 
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 56112cb99..bf16e5779 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -100,7 +100,7 @@ ar:
         content_1: "وسيط ديسبورا خاصتك هو:"
         content_2: "أعطه لأي شخص وسيتمكن من إيجادك على ديسبورا."
         heading: "وسيط ديسبورا"
-      donate: "تبرّع"
+      donate: تبرّع
       handle_explanation: "هذا وسيط دياسبرا. مثل البريد الالكتروني، يمكنك منحه للأصدقاء حتى تستطيع التواصل معهم."
       help: 
         do_you: "Do you:"
@@ -146,7 +146,7 @@ ar:
     one: "فئة"
     other: "%{count} فئات"
     seed: 
-      acquaintances: "معارِفي"
+      acquaintances: معارِفي
       family: "العائلة"
       friends: "الأصدقاء"
       work: "العمل"
@@ -167,18 +167,25 @@ ar:
       no_applications: "لم تُسجِّل أي تطبيقات بعد."
       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: 
     explanation: "%{link} انشر في ديسبورا من أي مكان بحفظ الرابط في مفضلتك/علاماتك"
     explanation_link_text: "هذا الرابط"
     heading: "زر المفضلة"
     post_something: "انشر شيئا على دياسبرا"
     post_success: "تم النشر, إغلاق"
-  cancel: "أَلْغِ"
+  cancel: أَلْغِ
   comments: 
     few: "%{count} تعليقات"
     many: "%{count} تعليقًا"
     new_comment: 
-      comment: "علِّق"
+      comment: علِّق
       commenting: "يُرسل التعليق ..."
     one: "تعليقٌ واحد"
     other: "%{count} تعليق"
@@ -233,22 +240,22 @@ ar:
       no_messages: "لا يوجد رسائل"
     new: 
       abandon_changes: "أأتجاهل التغييرات؟"
-      send: "أَرْسِل"
-      sending: "يُرسـَل..."
+      send: أَرْسِل
+      sending: يُرسـَل...
       subject: "العنوان"
       to: "إلى"
     new_message: 
       fail: "رسالة غير صالحة"
     show: 
       delete: "احْذِف واحْظُر المحادثة"
-      reply: "رُدَّ"
-      replying: "يُجيب..."
+      reply: رُدَّ
+      replying: يُجيب...
   date: 
     formats: 
       birthday: "%d %B"
       birthday_with_year: "%d %B %Y"
       fullmonth_day: "%d %B"
-  delete: "احذِف"
+  delete: احذِف
   email: "بريد إلكتروني"
   error_messages: 
     helper: 
@@ -256,7 +263,7 @@ ar:
       invalid_fields: "حقولٌ غير صالحة"
   fill_me_out: "إملأني"
   find_people: "ابحث عن الأصدقاء أو #الوسوم"
-  hide: "آَخْفِ"
+  hide: آَخْفِ
   home: 
     show: 
       already_account: "لديك حساب؟"
@@ -308,7 +315,7 @@ ar:
       admin: "المشرف"
       blog: "مدونة"
       code: "شيفرة"
-      login: "لُج"
+      login: لُج
       logout: "خروج"
       profile: "الصفحة الشخصية"
       recent_notifications: "آخر التنبيهات"
@@ -440,7 +447,7 @@ ar:
       two: "%{actors} بدآ المشاركة معك."
       zero: "%{actors} بدأ المشاركة معك."
   notifier: 
-    a_post_you_shared: "مشاركة."
+    a_post_you_shared: مشاركة.
     click_here: "اضغط هنا"
     comment_on_post: 
       reply: "رُد أو اعرض مشاركة %{name} >"
@@ -469,7 +476,7 @@ ar:
       view_profile: "اعرض ملف %{name} الشخصي"
     thanks: "شكرا,"
     to_change_your_notification_settings: "لتعديل إعدادات التنبيهات خاصتك"
-  ok: "حسنًا"
+  ok: حسنًا
   or: "أو"
   password: "كلمة المرور"
   password_confirmation: "تأكيد كلمة المرور الجديدة"
@@ -507,6 +514,7 @@ ar:
     show: 
       does_not_exist: "هذا العضو غير موجود"
       has_not_shared_with_you_yet: "%{name} لمْ يشارك أي مشاركة معك بعد"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name} يريد المشاركة معك"
       mention: "إشارة"
       message: "رسالة"
@@ -519,7 +527,7 @@ ar:
       to_accept_or_ignore: "للقبول أو التجاهل"
     sub_header: 
       add_some: "أضف بعض"
-      edit: "عدِّل"
+      edit: عدِّل
       you_have_no_tags: "لا تتوفر على وسوم"
     two: "%{count} عضوان"
     webfinger: 
@@ -551,7 +559,7 @@ ar:
     show: 
       collection_permalink: "رابط دائم للمجموعة"
       delete_photo: "احْذِف الصورة"
-      edit: "عَدِّل"
+      edit: عَدِّل
       edit_delete_photo: "عَدِّل وصف الصورة / احْذِف الصورة"
       make_profile_photo: "اجعلها صورة شخصية"
       show_original_post: "إِعرِضْ المشاركة الأصلية"
@@ -559,30 +567,27 @@ ar:
     update: 
       error: "فشل تحرير الصورة."
       notice: "حُدِّثَت الصورة بنجاح."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "أُخفِيت مشاركة %{name}، وعُطِلت تنبيهاتها"
-      see_it_on_their_profile: "راجع صفحة %{name} الشخصية إن رغبت في الإطلاع على جديد هاته المشاركة"
   posts: 
     show: 
       destroy: "احذف"
       not_found: "عفوًا، لم نجد هذه المشاركة."
       permalink: "رابط دائم"
   previous: "السابق"
+  privacy: "Privacy"
   profile: "الصفحة الشخصية"
   profiles: 
     edit: 
       allow_search: "اسمَح للجميع بالبحث عنك من خلال دياسبرا"
       edit_profile: "حَرِّر صفحتك الشخصية"
-      first_name: "اسمُك"
-      last_name: "لقبُك"
+      first_name: اسمُك
+      last_name: لقبُك
       update_profile: "حَدِّث الصفحة الشخصية"
       your_bio: "سيرتُك الشخصية"
       your_birthday: "تاريخ مولدك"
-      your_gender: "جِنسُك"
-      your_location: "مكانُك"
+      your_gender: جِنسُك
+      your_location: مكانُك
       your_name: "اسمك"
-      your_photo: "صورتُك"
+      your_photo: صورتُك
       your_private_profile: "معلوماتك الخاصة"
       your_public_profile: "معلوماتك العامة"
       your_tags: "صِف نفسك في 5 كلمات"
@@ -637,7 +642,7 @@ ar:
       existing: "جهات الإتصال الموجودة مسبقًا"
       manage_within: "أَدِر جهات الإتصال في"
     new_request_to_person: 
-      sent: "أُرْسِلَت!"
+      sent: أُرْسِلَت!
   reshares: 
     comment_email_subject: "نشر %{resharer} المُعاد لمشاركة %{author}"
     create: 
@@ -685,11 +690,15 @@ ar:
       not_on_diaspora: "ليس بعد على دياسبرا"
       resend: "إعادة إرسال"
   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: "أضف جهة اتصال جديدة"
       create_request: "ابحث باستخدام وسيط ديسبورا"
-      diaspora_handle: "ديسبورا@فرع.org"
+      diaspora_handle: ديسبورا@فرع.org
       enter_a_diaspora_username: "أدخل معرف دياسبرا:"
       know_email: "أتَعرِف بُرُدَهم الإلكترونية؟ يَجدر بك دعوتهم"
       your_diaspora_username_is: "وسيط دياسبورا خاصتك هو: %{diaspora_handle}"
@@ -706,7 +715,7 @@ ar:
       all_contacts: "جميع الأعضاء"
     footer: 
       logged_in_as: "ولوج بـ %{name}"
-      your_aspects: "فئاتُك"
+      your_aspects: فئاتُك
     invitations: 
       by_email: "عبر رسالة بالبريد الإلكتروني"
       dont_have_now: "لا تملك دعوات حاليا، لكنها قادمة قريبا"
@@ -731,7 +740,7 @@ ar:
       all: "الجميع"
       all_contacts: "جميع الفئات"
       discard_post: "تجاهل المشاركة"
-      make_public: "عَمِّمْهَا"
+      make_public: عَمِّمْهَا
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
@@ -739,7 +748,7 @@ ar:
       post_a_message_to: "انشر رسالة إلى %{aspect}"
       posting: "يَنشُر ..."
       publishing_to: "نشر إلى: "
-      share: "شَارِك"
+      share: شَارِك
       share_with: "شارِك مع %{aspect}"
       upload_photos: "ارفع صور"
       whats_on_your_mind: "ماذا يجول في خاطرك؟"
@@ -750,6 +759,8 @@ ar:
       currently_unavailable: "commenting currently unavailable"
       dislike: "لم يعجبني"
       hide_and_mute: "أخـفِ وأسكـتْ"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "أعجبني"
       shared_with: "مُشَارك مع: %{aspect_names}"
       unlike: "إلغاء إعجابي"
@@ -830,7 +841,7 @@ ar:
       typical_userpage: "حساب cubbi.es نموذجي"
       via: "(عبر %{link})"
       what_is_cubbies: "Cubbi.es هو أول تطبيق دياسبرا في العالم.  وأيضا أفضل وسيلة لتجميع الصور على الويب."
-  undo: "أَأَتَرَاجَع؟"
+  undo: أَأَتَرَاجَع؟
   username: "معرف"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ ar:
       hashtag_explanation: "الوسوم تسمح لك بالحديث عن اهتماماتك ومتابعتها.  وهي أيضا طريقة عبقرية للعثور على أناس جدد بدياسبرا."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ ar:
       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} غير موجود"
     update: 
@@ -901,4 +916,4 @@ ar:
     no_person_constructed: "هذا الـ hcard غير صالح."
     not_enabled: "webfinger غير مفعل للمضيف %{account}"
     xrd_fetch_failed: "خطأ خلال استرجاع xrd من الحساب %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index a9b1f9760..82edcd488 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -167,19 +167,26 @@ bg:
       no_applications: "Все още не сте регистрирали нито едно приложение."
       revoke_access: "Прекратяване на достъпа"
   back: "Назад"
+  blocks: 
+    create: 
+      failure: "Потребителят не може да бъде игнориран.  #evasion"
+      success: "Няма да виждате повече потребителя в потока си. #silencio!"
+    destroy: 
+      failure: "Игнорирането на потребителя не бе прекратено.  #evasion"
+      success: "Какво ли ще кажат! #sayhello"
   bookmarklet: 
     explanation: "Публикувайте в Diaspora от където и да е, запаметявайки %{link} като отметка."
     explanation_link_text: "тази връзка"
     heading: "Bookmarklet"
     post_something: "Публикуване в Diaspora"
-    post_success: "Публикувано!"
+    post_success: Публикувано!
   cancel: "Отказ"
   comments: 
     few: "%{count} коментара"
     many: "%{count} коментара"
     new_comment: 
       comment: "Коментар"
-      commenting: "Коментиране..."
+      commenting: Коментиране...
     one: "1 коментар"
     other: "%{count} коментара"
     two: "%{count} коментара"
@@ -234,7 +241,7 @@ bg:
     new: 
       abandon_changes: "Отказвате се от промените?"
       send: "Изпращане"
-      sending: "Изпращане..."
+      sending: Изпращане...
       subject: "тема"
       to: "до"
     new_message: 
@@ -440,7 +447,7 @@ bg:
       two: "%{actors} започнаха да споделят с вас."
       zero: "%{actors} започна да споделя с вас."
   notifier: 
-    a_post_you_shared: "публикация."
+    a_post_you_shared: публикация.
     click_here: "кликнете тук"
     comment_on_post: 
       reply: "Отговорете или прегледайте публикацията на %{name} >"
@@ -507,6 +514,7 @@ bg:
     show: 
       does_not_exist: "Лицето не съществува!"
       has_not_shared_with_you_yet: "%{name} все още не е споделил нито една публикация с вас!"
+      ignoring: "Всички публикации на %{name} биват игнорирани."
       incoming_request: "%{name} желае да споделя с вас"
       mention: "Споменете"
       message: "Съобщение"
@@ -538,7 +546,7 @@ bg:
     new: 
       back_to_list: "Назад към списъка"
       new_photo: "Нова снимка"
-      post_it: "публикуване!"
+      post_it: публикуване!
     new_photo: 
       empty: "{file} е празен. Моля, изберете наново файловете без празния."
       invalid_ext: "{file} е с невалидно разширение. Позволени са само: {extensions}."
@@ -559,16 +567,13 @@ bg:
     update: 
       error: "Снимката не бе изтрита."
       notice: "Снимката е обновена."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "Публикацията на %{name} е скрита и няма да получавате известия за нея."
-      see_it_on_their_profile: "Ако желаете да прегледате новините относно публикацията посетете профила на %{name}."
   posts: 
     show: 
       destroy: "Изтриване"
       not_found: "За съжаление публикацията не може да бъде намерена."
       permalink: "постоянен адрес"
   previous: "предишна"
+  privacy: "Privacy"
   profile: "Профил"
   profiles: 
     edit: 
@@ -637,7 +642,7 @@ bg:
       existing: "Съществуващи контакти"
       manage_within: "Manage contacts within"
     new_request_to_person: 
-      sent: "изпратена!"
+      sent: изпратена!
   reshares: 
     comment_email_subject: "Споделена публикация от %{resharer} с автор %{author}'"
     create: 
@@ -685,11 +690,15 @@ bg:
       not_on_diaspora: "Все още не е в Diaspora"
       resend: "повторно изпращане"
   settings: "Настройки"
+  share_visibilites: 
+    update: 
+      post_hidden_and_muted: "Публикацията на %{name} е скрита, а получаването на известия за нея - прекратено."
+      see_it_on_their_profile: "Ако желаете да прегледате новините относно публикацията на %{name} можете да посетите профила му."
   shared: 
     add_contact: 
       add_new_contact: "Добавяне на контакт"
       create_request: "Търси по адрес в Diaspora"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Въведете потребителско име от Diaspora:"
       know_email: "Знаете адресите на ел. им поща? Трябва да ги поканите"
       your_diaspora_username_is: "Вашето потребителско име в Diaspora е %{diaspora_handle}"
@@ -737,7 +746,7 @@ bg:
         i_like: "Интересува ме %{tags}."
         invited_by: "Благодаря за поканата, "
       post_a_message_to: "Публикувайте публично съобщение в %{aspect}"
-      posting: "Публикуване..."
+      posting: Публикуване...
       publishing_to: "публикуване в: "
       share: "Споделете"
       share_with: "споделяне с"
@@ -749,7 +758,9 @@ bg:
       connect_to_comment: "Свържете се с потребителя, за да коментирате публикацията му"
       currently_unavailable: "временно не е възможно да коментирате"
       dislike: "Не ми харесва"
-      hide_and_mute: "Скриване и прекратяване на известяването"
+      hide_and_mute: "Скриване и прекратяване на известяването за публикацията"
+      ignore_user: "Игнориране на %{name}"
+      ignore_user_description: "Игнориране и премахване на потребителя от всички аспекти?"
       like: "Харесва ми"
       shared_with: "Споделена с: %{aspect_names}"
       unlike: "Не ми харесва"
@@ -779,19 +790,19 @@ bg:
       title: "Вашите аспекти"
     aspects_stream: "Аспекти"
     commented_on: "коментирани"
-    community_spotlight_stream: "В центъра на вниманието"
+    community_spotlight_stream: "От \"В центъра на вниманието\""
     followed_tag: 
       add_a_tag: "Добавете още"
-      contacts_title: "Хора, които харесват марките"
+      contacts_title: "Същите марки са харесани от:"
       follow: "Добавяне"
       title: "#Марки, които следите"
-    followed_tags_stream: "##Марки, които следите"
+    followed_tags_stream: "От #Марка, която следите"
     mentioned_stream: "@Кой ви спомена"
     mentions: 
       contacts_title: "Хора, които са ви споменали"
       title: "@Кой ви е споменал"
     multi: 
-      contacts_title: "Хора от аспектите ви"
+      contacts_title: "Хора от потока ви"
       title: "Поток"
     posted: "публикувани"
     public: 
@@ -830,7 +841,7 @@ bg:
       typical_userpage: "Типична потребителска страница от cubbi.es"
       via: "(чрез %{link})"
       what_is_cubbies: "Cubbi.es е първото приложение за Diaspora. Също така е и най-добрият начин за събиране на изображения."
-  undo: "Отмяна?"
+  undo: Отмяна?
   username: "Потребителско име"
   users: 
     confirm_email: 
@@ -871,9 +882,9 @@ bg:
       hashtag_explanation: "Диез марките (#име–на-марката) ви позволяват да коментирате и следите интересни за вас теми.  Улесняват и откриване на хора със сходни интереси в Diaspora."
       hashtag_suggestions: "Пробвайте да следвате няколко марки като #art, #movies, #gif и др."
       hooking_up_fb: "да свържете акаунта си от Facebook"
-      saved: "Записано!"
+      saved: Записано!
       we_can_speed_things_up: "Ако желаете можете"
-      well_hello_there: "Здравейте!"
+      well_hello_there: Здравейте!
       what_are_you_in_to: "От какво се интересувате?"
       what_facebook_does: "с Diaspora. Така някои данни (име и снимка) ще бъдат попълнени автоматично и ще можете да публикувате съобщения във Facebook от Diaspora."
       who_are_you: "Кой сте вие?"
@@ -883,6 +894,10 @@ bg:
       signed_out: "Отписахте се от Diaspora*"
       simply_visit: "Просто посетете"
       works_on_modern: "Съвместима е с всеки съвременен смартфон"
+    privacy_settings: 
+      ignored_users: "Игнорирани поотребители"
+      stop_ignoring: "Прекратяване на игнорирането"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "Потребителят %{username} не съществува!"
     update: 
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index c752f7775..50c1f2be9 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -167,6 +167,13 @@ br:
       no_applications: "You haven't registered any applications yet."
       revoke_access: "Revoke Access"
   back: "Distreiñ"
+  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: 
     explanation: "%{link} adalek pep lec'h dre lakaat al liamm-se e-barzh ho sinedoù."
     explanation_link_text: "Embann e-barzh Diaspora"
@@ -226,7 +233,7 @@ br:
         zero: "kemenadenn nevez ebet"
     index: 
       create_a_new_message: "sevel ur gemennadenn nevez"
-      inbox: "Boest-lizhiri"
+      inbox: Boest-lizhiri
       message_inbox: "Message Inbox"
       new_message: "Kemennadenn Nevez"
       no_conversation_selected: "no conversation selected"
@@ -234,7 +241,7 @@ br:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Kaset"
-      sending: "Sending..."
+      sending: Sending...
       subject: "sujed"
       to: "da"
     new_message: 
@@ -242,7 +249,7 @@ br:
     show: 
       delete: "delete and block conversation"
       reply: "respont"
-      replying: "Replying..."
+      replying: Replying...
   date: 
     formats: 
       birthday: "%B %d"
@@ -338,7 +345,7 @@ br:
         two: "%{count} likes"
         zero: "no likes"
   limited: "Limited"
-  more: "Muioc'h"
+  more: Muioc'h
   next: "next"
   no_results: "Disoc'h Ebet"
   notifications: 
@@ -471,7 +478,7 @@ br:
     to_change_your_notification_settings: "to change your notification settings"
   ok: "MAT EO"
   or: "pe"
-  password: "Ger-kuzh"
+  password: Ger-kuzh
   password_confirmation: "Kadarnaat ar ger-kuzh"
   people: 
     add_contact_small: 
@@ -497,7 +504,7 @@ br:
       thats_you: "That's you!"
     profile_sidebar: 
       bio: "buhez"
-      born: "deiziad-ganidigezh"
+      born: deiziad-ganidigezh
       edit_my_profile: "Edit my profile"
       gender: "reizh"
       in_aspects: "in aspects"
@@ -507,6 +514,7 @@ br:
     show: 
       does_not_exist: "Person does not exist!"
       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} wants to share with you"
       mention: "Mention"
       message: "Kemmenadenn"
@@ -538,7 +546,7 @@ br:
     new: 
       back_to_list: "Distreiñ da'r rollad"
       new_photo: "Foto Nevez"
-      post_it: "postit!"
+      post_it: postit!
     new_photo: 
       empty: "{file} is empty, please select files again without it."
       invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
@@ -559,23 +567,20 @@ br:
     update: 
       error: "Failed to edit photo."
       notice: "Foto bet kaset mat."
-  post_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."
   posts: 
     show: 
       destroy: "Delete"
       not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
-  previous: "war-raok"
+  previous: war-raok
+  privacy: "Privacy"
   profile: "Patrom"
   profiles: 
     edit: 
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Kempenn ar patrom"
       first_name: "First name"
-      last_name: "Anv-familh"
+      last_name: Anv-familh
       update_profile: "Update Profile"
       your_bio: "Ho puhez"
       your_birthday: "Ho teiziad-ganidigezh"
@@ -607,7 +612,7 @@ br:
       edit: "Edit %{name}"
       leave_blank: "(laoskit goullo m'ho peus ket c'hoant cheñch an dra-se)"
       password_to_confirm: "(ho ker-kuzh zo ret a-benn kadarnaat ar cheñchamantoù)"
-      unhappy: "Unhappy?"
+      unhappy: Unhappy?
       update: "Update"
     new: 
       create_my_account: "Create my account"
@@ -637,7 +642,7 @@ br:
       existing: "Existing contacts"
       manage_within: "Manage contacts within"
     new_request_to_person: 
-      sent: "kaset!"
+      sent: kaset!
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -685,11 +690,15 @@ br:
       not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   settings: "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: "Klask diwar ar skor Diaspora"
-      diaspora_handle: "diaspora@handle.org"
+      diaspora_handle: diaspora@handle.org
       enter_a_diaspora_username: "Enter a Diaspora username:"
       know_email: "Know their email address? You should invite them"
       your_diaspora_username_is: "Setu hoc'h anv-implijer war Diaspora: %{diaspora_handle}"
@@ -750,6 +759,8 @@ br:
       currently_unavailable: "commenting currently unavailable"
       dislike: "Ne blij ket din"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Plij' ra din"
       shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
@@ -831,7 +842,7 @@ br:
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
   undo: "Mont war-gil?"
-  username: "Anv-implijer"
+  username: Anv-implijer
   users: 
     confirm_email: 
       email_confirmed: "E-Mail %{email} activated"
@@ -871,7 +882,7 @@ br:
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ br:
       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: "User %{username} does not exist!"
     update: 
@@ -901,4 +916,4 @@ br:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index b733a3829..696e72289 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -167,6 +167,13 @@ cs:
       no_applications: "Nemáte registrovanou žádnou aplikaci."
       revoke_access: "Zrušit přístup"
   back: "Zpět"
+  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: 
     explanation: "Pište na Diasporu odkudkoliv pomocí %{link}."
     explanation_link_text: "tohoto odkazu"
@@ -179,7 +186,7 @@ cs:
     many: "%{count} komentářů"
     new_comment: 
       comment: "komentář"
-      commenting: "Komentování..."
+      commenting: Komentování...
     one: "1 komentář"
     other: "%{count} komentářů"
     two: "%{count} komentáře"
@@ -234,7 +241,7 @@ cs:
     new: 
       abandon_changes: "Zamítnout změny?"
       send: "Poslat"
-      sending: "Posílám..."
+      sending: Posílám...
       subject: "předmět"
       to: "pro"
     new_message: 
@@ -242,14 +249,14 @@ cs:
     show: 
       delete: "smazat a blokovat konverzaci"
       reply: "odpověď"
-      replying: "Odpovídám..."
+      replying: Odpovídám...
   date: 
     formats: 
       birthday: "%B %d"
       birthday_with_year: "%B %d %Y"
       fullmonth_day: "%B %d"
   delete: "Smazat"
-  email: "E-mail"
+  email: E-mail
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Opravte následující chyby a zkuste to znovu."
@@ -478,7 +485,7 @@ cs:
       add_contact_from_tag: "přidat kontakt ze štítku"
     aspect_list: 
       edit_membership: "upravit člena aspektu"
-    few: "%{count} lidmi"
+    few: "%{count} lidi"
     helper: 
       people_on_pod_are_aware_of: " lidé na podu jsou si vědomi"
       results_for: " výsledky pro %{params}"
@@ -487,9 +494,9 @@ cs:
       no_one_found: "... a nikdo nebyl nalezen."
       no_results: "Hej! Musíte něco hledat."
       results_for: "výsledky hledání"
-    many: "%{count} lidmi"
-    one: "1 člověkem"
-    other: "%{count} lidmi"
+    many: "%{count} lidí"
+    one: "1 člověk"
+    other: "%{count} lidí"
     person: 
       add_contact: "přidat kontakt"
       already_connected: "Již připojen"
@@ -507,6 +514,7 @@ cs:
     show: 
       does_not_exist: "Osoba neexistuje!"
       has_not_shared_with_you_yet: "%{name} s vámi zatím žádnou zprávu nesdílí!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name} s vámi chce sdílet"
       mention: "Zmínka"
       message: "Zpráva"
@@ -521,10 +529,10 @@ cs:
       add_some: "přidat nějaké"
       edit: "upravit"
       you_have_no_tags: "nemáš žádný štítek!"
-    two: "%{count} lidmi"
+    two: "%{count} lidi"
     webfinger: 
       fail: "Omlouváme se, ale %{handle} nebyl nalezen."
-    zero: "nikým"
+    zero: "nikdo"
   photos: 
     comment_email_subject: "%{name}'s photo"
     create: 
@@ -538,7 +546,7 @@ cs:
     new: 
       back_to_list: "Zpět na seznam"
       new_photo: "Nová fotka"
-      post_it: "poslat!"
+      post_it: poslat!
     new_photo: 
       empty: "{file} je prázdný, prosím vyberte soubory znovu bez něho."
       invalid_ext: "{file} má chybnou příponu. Jsou povoleny pouze {extensions}."
@@ -559,16 +567,13 @@ cs:
     update: 
       error: "Nepodařilo se upravit fotku."
       notice: "Fotka úspěšně aktualizována."
-  post_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."
   posts: 
     show: 
       destroy: "Smazat"
       not_found: "Tento příspěvek nelze bohužel najít."
       permalink: "trvalý odkaz"
   previous: "předchozí"
+  privacy: "Privacy"
   profile: "Profil"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ cs:
       edit: "Upravit %{name}"
       leave_blank: "(nechte prázdné pokud nechcete provést změnu)"
       password_to_confirm: "(potřebujeme vaše současné heslo pro potvrzení změn)"
-      unhappy: "Nešťastný?"
+      unhappy: Nešťastný?
       update: "Aktualizovat"
     new: 
       create_my_account: "Vytvořit účet"
@@ -637,7 +642,7 @@ cs:
       existing: "Existující kontakty"
       manage_within: "Spravovat kontakty uvnitř"
     new_request_to_person: 
-      sent: "odesláno!"
+      sent: odesláno!
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -685,11 +690,15 @@ cs:
       not_on_diaspora: "Ještě není na Diaspoře"
       resend: "přeposlat"
   settings: "Nastavení"
+  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: "Přidat nový kontakt"
       create_request: "Hledat podle Diaspora ID"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Zadejte uživatelské jméno na Diaspoře:"
       know_email: "Znáte jejich e-mailové adresy? Můžete je pozvat"
       your_diaspora_username_is: "Vaše uživatelské jméno na Diaspoře: %{diaspora_handle}"
@@ -708,7 +717,7 @@ cs:
       logged_in_as: "přihlášen jako %{name}"
       your_aspects: "vaše aspekty"
     invitations: 
-      by_email: "e-mailem"
+      by_email: e-mailem
       dont_have_now: "Již nemáte žádné, ale další brzy přibudou!"
       from_facebook: "z Facebooku"
       invitations_left: "%{count} zbývá"
@@ -737,7 +746,7 @@ cs:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Poslat zprávu do %{aspect}"
-      posting: "Odesílání..."
+      posting: Odesílání...
       publishing_to: "publikování na:"
       share: "Sdělit"
       share_with: "sdílet s"
@@ -750,6 +759,8 @@ cs:
       currently_unavailable: "commenting currently unavailable"
       dislike: "to se mi nelíbí"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "to se mi líbí"
       shared_with: "Sdíleno s: %{aspect_names}"
       unlike: "to se mi už nelíbí"
@@ -811,7 +822,7 @@ cs:
   tags: 
     show: 
       follow: "Sledovat #%{tag}"
-      followed_by: "sledováno"
+      followed_by: "sleduje"
       following: "Sledujete #%{tag}"
       nobody_talking: "Nikdo dosud nemluví o %{tag}."
       people_tagged_with: "Lidé označení %{tag}"
@@ -830,7 +841,7 @@ cs:
       typical_userpage: "Typická uživatelská stránka na cubbi.es"
       via: "(přes %{link})"
       what_is_cubbies: "Cubbi.es je celosvětově první aplikace Diaspory. Je to také nejlepší způsob, jak shromažďovat fotografie online."
-  undo: "Vrátit?"
+  undo: Vrátit?
   username: "Uživatelské jméno"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ cs:
       hashtag_explanation: "Štítky vám dovolují sledovat, o co se zajímáte, a diskutovat. Je to také skvělý způsob, jak najít nové lidi na Diaspoře."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ cs:
       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: "Uživatel %{username} neexistuje!"
     update: 
@@ -901,4 +916,4 @@ cs:
     no_person_constructed: "Z této hcard nemůže být vytvořena žádná osoba."
     not_enabled: "Vypadá to, že webfinger nemůže být povolen pro hosta účtu %{account}"
     xrd_fetch_failed: "vyskytl se problém při získání xrd z účtu %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 0de1fefda..fa01316d2 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -167,6 +167,13 @@ cy:
       no_applications: "You haven't registered any applications yet."
       revoke_access: "Revoke Access"
   back: "Yn ôl"
+  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: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
@@ -179,7 +186,7 @@ cy:
     many: "%{count} comments"
     new_comment: 
       comment: "Sylw"
-      commenting: "Commenting..."
+      commenting: Commenting...
     one: "1 comment"
     other: "%{count} comments"
     two: "%{count} comments"
@@ -234,7 +241,7 @@ cy:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
-      sending: "Sending..."
+      sending: Sending...
       subject: "subject"
       to: "to"
     new_message: 
@@ -242,14 +249,14 @@ cy:
     show: 
       delete: "delete and block conversation"
       reply: "reply"
-      replying: "Replying..."
+      replying: Replying...
   date: 
     formats: 
       birthday: "%B %d"
       birthday_with_year: "%B %d %Y"
       fullmonth_day: "%B %d"
   delete: "Dileu"
-  email: "E-bost"
+  email: E-bost
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Correct the following errors and try again."
@@ -440,7 +447,7 @@ cy:
       two: "Mae %{actors} wedi dechrau rhannu gyda chi."
       zero: "Mae %{actors} wedi dechrau rhannu gyda chi."
   notifier: 
-    a_post_you_shared: "post."
+    a_post_you_shared: post.
     click_here: "cliciwch yma"
     comment_on_post: 
       reply: "Ateb neu gweld post %{name} >"
@@ -507,6 +514,7 @@ cy:
     show: 
       does_not_exist: "Dydy'r unigolyn ddim yn bodoli!"
       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: "You have an incoming request from this person."
       mention: "Mention"
       message: "Neges"
@@ -559,16 +567,13 @@ cy:
     update: 
       error: "Failed to edit photo."
       notice: "Photo successfully updated."
-  post_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."
   posts: 
     show: 
       destroy: "Delete"
       not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   previous: "previous"
+  privacy: "Privacy"
   profile: "Profile"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ cy:
       edit: "Edit %{name}"
       leave_blank: "(leave blank if you don't want to change it)"
       password_to_confirm: "(we need your current password to confirm your changes)"
-      unhappy: "Unhappy?"
+      unhappy: Unhappy?
       update: "Update"
     new: 
       create_my_account: "Create my account"
@@ -619,7 +624,7 @@ cy:
       sign_up_message: "Social Networking with a <3"
   requests: 
     create: 
-      sending: "Sending..."
+      sending: Sending...
       sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
     destroy: 
       error: "Dewiswch agwedd!"
@@ -637,7 +642,7 @@ cy:
       existing: "Existing contacts"
       manage_within: "Manage contacts within"
     new_request_to_person: 
-      sent: "sent!"
+      sent: sent!
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -685,6 +690,10 @@ cy:
       not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   settings: "Gosodiadau"
+  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"
@@ -737,7 +746,7 @@ cy:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Post neges i %{aspect}"
-      posting: "Posting..."
+      posting: Posting...
       publishing_to: "publishing to: "
       share: "Share"
       share_with: "Share with %{aspect}"
@@ -750,6 +759,8 @@ cy:
       currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Dwi'n hoffi hyn"
       shared_with: "Shared with: %{aspect_names}"
       unlike: "Dim hoffi"
@@ -830,7 +841,7 @@ cy:
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-  undo: "Undo?"
+  undo: Undo?
   username: "Enw Defnyddiwr"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ cy:
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ cy:
       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: "Nid% Defnyddiwr {username} yn bodoli!"
     update: 
@@ -901,4 +916,4 @@ cy:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index e1ff84bb2..055bae2cd 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -167,6 +167,13 @@ da:
       no_applications: "Du har ikke registreret nogen applikationer endnu."
       revoke_access: "Fjern adgang"
   back: "Tilbage"
+  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: 
     explanation: "Skriv indlæg på Diaspora fra hvor som helst ved at bookmarke %{link}."
     explanation_link_text: "dette link"
@@ -234,7 +241,7 @@ da:
     new: 
       abandon_changes: "Opgiv ændringer?"
       send: "Send"
-      sending: "Sender..."
+      sending: Sender...
       subject: "emne"
       to: "til"
     new_message: 
@@ -242,14 +249,14 @@ da:
     show: 
       delete: "slet og bloker samtalen"
       reply: "Svar"
-      replying: "Svarer..."
+      replying: Svarer...
   date: 
     formats: 
       birthday: "%d %B"
       birthday_with_year: "%d %B %Y"
       fullmonth_day: "%d %B"
   delete: "Slet"
-  email: "E-mail"
+  email: E-mail
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Ret følgende fejl og prøv igen."
@@ -507,6 +514,7 @@ da:
     show: 
       does_not_exist: "Personen findes ikke!"
       has_not_shared_with_you_yet: "%{name} har ikke delt nogen indlæg med dig endnu!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name} vil gerne dele med dig."
       mention: "Nævn"
       message: "Besked"
@@ -559,16 +567,13 @@ da:
     update: 
       error: "Kunne ikke redigere billede."
       notice: "Billedet blev opdateret."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "%{name}s indlæg er blevet skjult, og meddelelser er blevet dæmpet."
-      see_it_on_their_profile: "Hvis du ønsker at se opdateringer om dette indlæg, kan du besøge %{name}s profil side."
   posts: 
     show: 
       destroy: "Slet"
       not_found: "Vi kunne desværre ikke finde dette indlæg."
       permalink: "permalink"
   previous: "Forrige"
+  privacy: "Privacy"
   profile: "Profil"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ da:
       edit: "Redigér %{name}"
       leave_blank: "(Lad være tom hvis du ikke ønsker at ændre det)"
       password_to_confirm: "(Vi har brug for din nuværende adgangskode for at bekræfte dine ændringer)"
-      unhappy: "Ulykkelig?"
+      unhappy: Ulykkelig?
       update: "Opdatér"
     new: 
       create_my_account: "Opret min konto"
@@ -637,7 +642,7 @@ da:
       existing: "Eksisterende kontaktpersoner"
       manage_within: "Administrér kontaktpersoner indenfor"
     new_request_to_person: 
-      sent: "afsendt!"
+      sent: afsendt!
   reshares: 
     comment_email_subject: "%{resharer}s deling af %{author}s indlæg"
     create: 
@@ -685,11 +690,15 @@ da:
       not_on_diaspora: "Endnu ikke på diaspora"
       resend: "Send igen"
   settings: "Indstillinger"
+  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: "Tilføj en ny kontakt"
       create_request: "Find med Diaspora ID"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Indtast et Diaspora handle:"
       know_email: "Kender du deres e-mail addresse? Du burde invitere dem"
       your_diaspora_username_is: "Dit Diaspora handle er: %{diaspora_handle}"
@@ -737,7 +746,7 @@ da:
         i_like: "Jeg interesserer mig for %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Send en besked til %{aspect}"
-      posting: "Sender..."
+      posting: Sender...
       publishing_to: "del med: "
       share: "Del"
       share_with: "Del med"
@@ -750,6 +759,8 @@ da:
       currently_unavailable: "Det er i øjeblikket ikke muligt at kommentere"
       dislike: "Synes ikke om"
       hide_and_mute: "Skjul indlæg og kommentarer"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Synes om"
       shared_with: "Delt med: %{aspect_names}"
       unlike: "Synes ikke om"
@@ -830,7 +841,7 @@ da:
       typical_userpage: "En typisk cubbi.es brugerside"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es er verdens første Diaspora applikation. Det er også den bedste måde at samle billeder på nettet."
-  undo: "Fortryd?"
+  undo: Fortryd?
   username: "Brugernavn"
   users: 
     confirm_email: 
@@ -871,9 +882,9 @@ da:
       hashtag_explanation: "Hashtags giver dig mulighed for at tale om og følge dine interesser. De er også en fantastisk måde at finde nye folk på diaspora."
       hashtag_suggestions: "Prøv med følgende tags som #kunst, #film, #gif, osv."
       hooking_up_fb: "forbind din Facebook-konto"
-      saved: "Gemt!"
+      saved: Gemt!
       we_can_speed_things_up: "Vi kan gøre det hele lidt hurtigere ved at"
-      well_hello_there: "Hejsa!"
+      well_hello_there: Hejsa!
       what_are_you_in_to: "Hvad er dine interesser?"
       what_facebook_does: "til diaspora. Dette vil hente dit navn og foto, samt gøre det muligt at skrive indlæg på tværs af platforme."
       who_are_you: "Hvem er du?"
@@ -883,6 +894,10 @@ da:
       signed_out: "Du er logget ud af Diaspora*"
       simply_visit: "Du skal blot besøge"
       works_on_modern: "Virker på alle moderne smartphones"
+    privacy_settings: 
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "Brugeren %{username} findes ikke!"
     update: 
@@ -901,4 +916,4 @@ da:
     no_person_constructed: "Ingen person kunne konstrueres fra dette hcard."
     not_enabled: "det ser ikke ud til at webfinger er aktiveret på %{account}s domæne"
     xrd_fetch_failed: "der opstod en fejl i forbindelse med hentning af xrd fra kontoen %{account}"
-  welcome: "Velkommen!"
+  welcome: Velkommen!
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 17e99e511..dc759c945 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -99,7 +99,7 @@ de:
       diaspora_id: 
         content_1: "Deine Diaspora-ID ist:"
         content_2: "Gib diese weiter und sei somit auf Diaspora leicht zu finden."
-        heading: "Diaspora-ID"
+        heading: Diaspora-ID
       donate: "Spenden"
       handle_explanation: "Das ist deine Diaspora-ID. Du kannst sie wie eine E-Mail-Adresse weitergeben, damit andere Nutzer mit dir Kontakt aufnehmen können."
       help: 
@@ -137,7 +137,7 @@ de:
       create: "Erstellen"
       name: "Name (nur für dich sichtbar)"
     no_contacts_message: 
-      community_spotlight: "Gemeinschafts-Schaukasten"
+      community_spotlight: Gemeinschafts-Schaukasten
       or_spotlight: "Du kannst auch mit %{link} teilen"
       try_adding_some_more_contacts: "Du kannst weitere Kontakte suchen oder welche einladen."
       you_should_add_some_more_contacts: "Du solltest ein paar neue Kontakte hinzufügen!"
@@ -167,6 +167,13 @@ de:
       no_applications: "Du hast noch keine Anwendung registriert."
       revoke_access: "Zugriff widerrufen"
   back: "Zurück"
+  blocks: 
+    create: 
+      failure: "Ich konnte diesen Benutzer nicht ignorieren. #evasion"
+      success: "Alles klar, Du wirst diesen Benutzer nicht mehr in deinem Stream sehen. #silencio!"
+    destroy: 
+      failure: "Ich konnte das Ignorieren dieses Benutzers nicht beenden.  #evasion"
+      success: "Mal sehen was sie zu sagen haben! #sayhello"
   bookmarklet: 
     explanation: "Erstelle von überall einen Beitrag in Diaspora, indem du %{link} als Lesezeichen speicherst."
     explanation_link_text: "diesen Link"
@@ -207,7 +214,7 @@ de:
     sharing: 
       people_sharing: "Leute, die mit dir teilen:"
     spotlight: 
-      community_spotlight: "Gemeinschafts-Schaukasten"
+      community_spotlight: Gemeinschafts-Schaukasten
     two: "%{count} Kontakte"
     zero: "Kontakte"
   conversations: 
@@ -249,7 +256,7 @@ de:
       birthday_with_year: "%d. %B %Y"
       fullmonth_day: "%d. %B"
   delete: "Löschen"
-  email: "E-Mail"
+  email: E-Mail
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Korrigiere die folgenden Fehler und versuche es erneut."
@@ -472,7 +479,7 @@ de:
   ok: "OK"
   or: "oder"
   password: "Kennwort"
-  password_confirmation: "Kennwort-Bestätigung"
+  password_confirmation: Kennwort-Bestätigung
   people: 
     add_contact_small: 
       add_contact_from_tag: "Füge Kontakt über einen Hashtag hinzu"
@@ -507,6 +514,7 @@ de:
     show: 
       does_not_exist: "Diese Person existiert nicht!"
       has_not_shared_with_you_yet: "%{name} hat bisher noch keine Beiträge mit dir geteilt!"
+      ignoring: "Du ignorierst alle Beiträge von %{name}."
       incoming_request: "Du hast eine eingehende Anfrage von %{name}."
       mention: "Erwähnen"
       message: "Nachricht"
@@ -538,7 +546,7 @@ de:
     new: 
       back_to_list: "Zurück zur Liste"
       new_photo: "Neues Foto"
-      post_it: "Teilen!"
+      post_it: Teilen!
     new_photo: 
       empty: "{file} ist leer, bitte wähle erneut Dateien aus."
       invalid_ext: "{file} hat keine gültige Erweiterung. Nur {extensions} sind erlaubt."
@@ -559,16 +567,13 @@ de:
     update: 
       error: "Bearbeiten des Fotos fehlgeschlagen."
       notice: "Foto erfolgreich aktualisiert."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "%{name}s Beitrag wurde ausgeblendet und Benachrichtigungen abgeschaltet."
-      see_it_on_their_profile: "Wenn Du Neuigkeiten zu diesem Beitrag sehen willst, besuche %{name}s Profilseite."
   posts: 
     show: 
       destroy: "Löschen"
       not_found: "Entschuldige, wir konnten den Beitrag leider nicht finden."
       permalink: "Permanentlink"
   previous: "Vorherige"
+  privacy: "Privatsphäre"
   profile: "Profil"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ de:
       edit: "%{name} bearbeiten"
       leave_blank: "(Du willst nichts ändern? Einfach leer lassen.)"
       password_to_confirm: "(wir brauchen dein aktuelles Kennwort, um deine Änderungen zu bestätigen)"
-      unhappy: "Unglücklich?"
+      unhappy: Unglücklich?
       update: "Aktualisieren"
     new: 
       create_my_account: "Konto erstellen!"
@@ -637,7 +642,7 @@ de:
       existing: "Bestehende Kontakte"
       manage_within: "Kontakte verwalten in"
     new_request_to_person: 
-      sent: "Gesendet!"
+      sent: Gesendet!
   reshares: 
     comment_email_subject: "%{resharer}'s Version von %{author}'s Beitrag"
     create: 
@@ -685,11 +690,15 @@ de:
       not_on_diaspora: "Noch nicht auf Diaspora"
       resend: "Erneut senden"
   settings: "Einstellungen"
+  share_visibilites: 
+    update: 
+      post_hidden_and_muted: "%{name}'s Beitrag wurde ausgeblendet und die Benachrichtigungen abgeschaltet."
+      see_it_on_their_profile: "Wenn du Updates zu diesem Beitrag sehen möchtest, besuche %{name}'s Profil."
   shared: 
     add_contact: 
       add_new_contact: "Einen neuen Kontakt hinzufügen"
       create_request: "Finde mittels Diaspora ID"
-      diaspora_handle: "diaspora@beispiel.org"
+      diaspora_handle: diaspora@beispiel.org
       enter_a_diaspora_username: "Gib einen Diaspora-Benutzernamen ein:"
       know_email: "Du kennst die E-Mail-Adresse? Sende eine Einladung!"
       your_diaspora_username_is: "Dein Diaspora Nutzername ist: %{diaspora_handle}"
@@ -749,7 +758,9 @@ de:
       connect_to_comment: "Verbinde dich mit diesem Benutzer, um seinen Beitrag zu kommentieren"
       currently_unavailable: "Kommentieren derzeit nicht verfügbar"
       dislike: "Gefällt mir nicht"
-      hide_and_mute: "Verbergen und stummschalten"
+      hide_and_mute: "Beitrag verbergen und stummschalten"
+      ignore_user: "Ignoriere %{name}"
+      ignore_user_description: "Benutzer ignorieren und aus allen Aspekten entfernen?"
       like: "Gefällt mir"
       shared_with: "Geteilt mit: %{aspect_names}"
       unlike: "Gefällt mir nicht mehr"
@@ -779,7 +790,7 @@ de:
       title: "Deine Aspekte"
     aspects_stream: "Aspekte"
     commented_on: "kommentiert"
-    community_spotlight_stream: "Gemeinschafts-Schaukasten"
+    community_spotlight_stream: Gemeinschafts-Schaukasten
     followed_tag: 
       add_a_tag: "Füge einen Tag hinzu"
       contacts_title: "Leute, denen diese Tags gefallen"
@@ -806,7 +817,7 @@ de:
       failure: "Fehler beim Folgen von: #%{name}. Folgst du #%{name} bereits?"
       success: "Hurra! Du folgst nun: #%{name}"
     destroy: 
-      failure: "Fehler beim Beenden des Folgens von: #%{name}"
+      failure: "Fehler beim Beenden des Folgens von: #%{name}. Vielleicht hast du schon aufgehört zu folgen?"
       success: "Du folgst #%{name} nicht mehr"
   tags: 
     show: 
@@ -862,7 +873,7 @@ de:
       show_community_spotlight: "Gemeinschafts-Schaukasten im Stream anzeigen?"
       show_getting_started: "Einstiegshinweise wieder aktivieren"
       started_sharing: "… jemand mit dir zu teilen anfängt?"
-      stream_preferences: "Stream-Einstellungen"
+      stream_preferences: Stream-Einstellungen
       your_email: "Deine E-Mail-Adresse"
       your_handle: "Deine Diaspora ID"
     getting_started: 
@@ -871,7 +882,7 @@ de:
       hashtag_explanation: "Hashtags ermöglichen dir, über deine Interessen zu reden und ihnen zu folgen. Sie sind auch ein guter Weg, neue Leute bei Diaspora zu treffen!"
       hashtag_suggestions: "Probier mal Tags wie #kunst, #musik oder #gif zu folgen."
       hooking_up_fb: "du deinen Facebook-Account"
-      saved: "Gespeichert!"
+      saved: Gespeichert!
       we_can_speed_things_up: "Wir können die Dinge ein wenig beschleunigen wenn"
       well_hello_there: "Also, Hallöchen!"
       what_are_you_in_to: "Was machst du so?"
@@ -883,6 +894,10 @@ de:
       signed_out: "Du hast dich aus Diaspora* ausgeloggt"
       simply_visit: "Besuche einfach"
       works_on_modern: "Funktioniert auf allen modernen Smartphones"
+    privacy_settings: 
+      ignored_users: "Ignorierte Benutzer"
+      stop_ignoring: "Aufhören zu ignorieren"
+      title: Privatsphären-Einstellungen
     public: 
       does_not_exist: "Benutzer %{username} existiert nicht!"
     update: 
@@ -901,4 +916,4 @@ de:
     no_person_constructed: "Konnte keine Person aus dieser hcard erstellen."
     not_enabled: "Webfinger scheint nicht für den Server von %{account} verfügbar zu sein."
     xrd_fetch_failed: "Die XRD-Datei von %{account} konnte nicht heruntergeladen werden."
-  welcome: "Willkommen!"
+  welcome: Willkommen!
diff --git a/config/locales/diaspora/de_formal.yml b/config/locales/diaspora/de_formal.yml
index 75328b390..9ccb3f044 100644
--- a/config/locales/diaspora/de_formal.yml
+++ b/config/locales/diaspora/de_formal.yml
@@ -99,7 +99,7 @@ de_formal:
       diaspora_id: 
         content_1: "Ihre Diaspora ID ist:"
         content_2: "Geben Sie diese weiter und seien Sie somit auf Diaspora leicht zu finden."
-        heading: "Diaspora-ID"
+        heading: Diaspora-ID
       donate: "Spenden"
       handle_explanation: "Das ist Ihre Diaspora ID. Sie können sie wie eine E-Mail-Adresse weitergeben, damit andere Nutzer mit Ihnen Kontakt aufnehmen können."
       help: 
@@ -137,7 +137,7 @@ de_formal:
       create: "Erstellen"
       name: "Name (nur für Sie sichtbar)"
     no_contacts_message: 
-      community_spotlight: "Gemeinschafts-Schaukasten"
+      community_spotlight: Gemeinschafts-Schaukasten
       or_spotlight: "Sie können auch mit %{link} teilen"
       try_adding_some_more_contacts: "Sie können nach Kontakten suchen (oben) oder welche einladen (rechts)."
       you_should_add_some_more_contacts: "Sie sollten ein paar neue Kontakte hinzufügen!"
@@ -167,6 +167,13 @@ de_formal:
       no_applications: "Sie haben noch keine Anwendung registriert."
       revoke_access: "Zugriff widerrufen"
   back: "Zurück"
+  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: 
     explanation: "Erstellen Sie einen Beitrag in Diaspora von überall, in dem Sie %{link} als Lesezeichen speichern."
     explanation_link_text: "diesen Link"
@@ -207,7 +214,7 @@ de_formal:
     sharing: 
       people_sharing: "Leute, die mit Ihnen teilen:"
     spotlight: 
-      community_spotlight: "Gemeinschafts-Schaukasten"
+      community_spotlight: Gemeinschafts-Schaukasten
     two: "%{count} Kontakte"
     zero: "Kontakte"
   conversations: 
@@ -249,7 +256,7 @@ de_formal:
       birthday_with_year: "%d. %B %Y"
       fullmonth_day: "%d. %B"
   delete: "Löschen"
-  email: "E-Mail"
+  email: E-Mail
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Korrigieren Sie die folgenden Fehler und versuchen Sie es erneut."
@@ -472,7 +479,7 @@ de_formal:
   ok: "OK"
   or: "oder"
   password: "Kennwort"
-  password_confirmation: "Kennwort-Bestätigung"
+  password_confirmation: Kennwort-Bestätigung
   people: 
     add_contact_small: 
       add_contact_from_tag: "Fügen Sie Kontakt über einen Hashtag hinzu"
@@ -507,6 +514,7 @@ de_formal:
     show: 
       does_not_exist: "Diese Person existiert nicht!"
       has_not_shared_with_you_yet: "%{name} hat bisher noch keine Beiträge mit Ihnen geteilt!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "Sie haben eine eingehende Anfrage von %{name}."
       mention: "Erwähnen"
       message: "Nachricht"
@@ -538,7 +546,7 @@ de_formal:
     new: 
       back_to_list: "Zurück zur Liste"
       new_photo: "Neues Foto"
-      post_it: "Teilen!"
+      post_it: Teilen!
     new_photo: 
       empty: "{file} ist leer, bitte wählen Sie erneut Dateien aus."
       invalid_ext: "{file} hat keine gültige Erweiterung. Nur {extensions} sind erlaubt."
@@ -559,16 +567,13 @@ de_formal:
     update: 
       error: "Bearbeiten des Fotos fehlgeschlagen."
       notice: "Foto erfolgreich aktualisiert."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "%{name}s Beitrag wurde ausgeblendet und Benachrichtigungen abgeschaltet."
-      see_it_on_their_profile: "Wenn Sie Neuigkeiten zu diesem Beitrag sehen wollen, besuchen Sie %{name}s Profilseite."
   posts: 
     show: 
       destroy: "Löschen"
       not_found: "Entschuldigen Sie, wir konnten den Beitrag leider nicht finden."
       permalink: "Permanentlink"
   previous: "Vorherige"
+  privacy: "Privacy"
   profile: "Profil"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ de_formal:
       edit: "%{name} bearbeiten"
       leave_blank: "(Sie wollen nichts ändern? Einfach leer lassen.)"
       password_to_confirm: "(wir brauchen Ihr aktuelles Passwort, um Ihre Änderungen zu bestätigen)"
-      unhappy: "Unglücklich?"
+      unhappy: Unglücklich?
       update: "Aktualisieren"
     new: 
       create_my_account: "Konto erstellen"
@@ -637,7 +642,7 @@ de_formal:
       existing: "Bestehende Kontakte"
       manage_within: "Kontakte verwalten in"
     new_request_to_person: 
-      sent: "Gesendet!"
+      sent: Gesendet!
   reshares: 
     comment_email_subject: "%{resharer}'s Version von %{author}'s Beitrag"
     create: 
@@ -685,11 +690,15 @@ de_formal:
       not_on_diaspora: "Noch nicht auf Diaspora"
       resend: "Erneut senden"
   settings: "Einstellungen"
+  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: "Einen neuen Kontakt hinzufügen"
       create_request: "Finden Sie mittels Diaspora ID"
-      diaspora_handle: "diaspora@beispiel.org"
+      diaspora_handle: diaspora@beispiel.org
       enter_a_diaspora_username: "Geben Sie einen Diaspora-Benutzernamen ein:"
       know_email: "Sie kennen die E-Mail-Adresse? Senden Sie eine Einladung!"
       your_diaspora_username_is: "Ihr Diaspora Nutzername ist: %{diaspora_handle}"
@@ -750,6 +759,8 @@ de_formal:
       currently_unavailable: "Kommentieren derzeit nicht verfügbar"
       dislike: "Gefällt mir nicht"
       hide_and_mute: "Verbergen und stummschalten"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Gefällt mir"
       shared_with: "Geteilt mit: %{aspect_names}"
       unlike: "Gefällt mir nicht mehr"
@@ -779,7 +790,7 @@ de_formal:
       title: "Ihre Aspekte"
     aspects_stream: "Aspekte"
     commented_on: "kommentiert"
-    community_spotlight_stream: "Gemeinschafts-Schaukasten"
+    community_spotlight_stream: Gemeinschafts-Schaukasten
     followed_tag: 
       add_a_tag: "Fügen Sie einen Tag hinzu"
       contacts_title: "Leute, denen diese Tags gefallen"
@@ -862,7 +873,7 @@ de_formal:
       show_community_spotlight: "Gemeinschafts-Schaukasten im Stream anzeigen?"
       show_getting_started: "Einstieg reaktivieren"
       started_sharing: "… jemand mit Ihnen zu teilen anfängt?"
-      stream_preferences: "Stream-Einstellungen"
+      stream_preferences: Stream-Einstellungen
       your_email: "Ihre E-Mail-Adresse"
       your_handle: "Ihre Diaspora ID"
     getting_started: 
@@ -871,7 +882,7 @@ de_formal:
       hashtag_explanation: "Hashtags ermöglichen Ihnen, über Ihre Interessen zu reden und ihnen zu folgen. Sie sind auch ein guter Weg, neue Leute bei Diaspora zu treffen!"
       hashtag_suggestions: "Probieren Sie mal Tags wie #kunst, #musik oder #gif zu folgen."
       hooking_up_fb: "Sie Ihren Facebook-Account"
-      saved: "Gespeichert!"
+      saved: Gespeichert!
       we_can_speed_things_up: "Wir können die Dinge ein wenig beschleunigen wenn"
       well_hello_there: "Also, Hallöchen!"
       what_are_you_in_to: "Was machen Sie so?"
@@ -883,6 +894,10 @@ de_formal:
       signed_out: "Sie haben Sich aus Diaspora* ausgeloggt"
       simply_visit: "Besuchen Sie einfach"
       works_on_modern: "Funktioniert auf allen modernen Smartphones"
+    privacy_settings: 
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "Benutzer %{username} existiert nicht!"
     update: 
@@ -901,4 +916,4 @@ de_formal:
     no_person_constructed: "Konnte keine Person aus dieser hcard erstellen."
     not_enabled: "Webfinger scheint nicht für den Server von %{account} verfügbar zu sein."
     xrd_fetch_failed: "Die XRD-Datei von %{account} konnte nicht heruntergeladen werden."
-  welcome: "Willkommen!"
+  welcome: Willkommen!
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 45ed94f01..e66df8f2c 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -103,7 +103,7 @@ el:
       donate: "Κάντε Δωρεά"
       handle_explanation: "Αυτό είναι το αναγνωριστικό σας στο Diaspora (ID). Όπως και με μια διεύθυνση ηλεκτρονικού ταχυδρομείου, μπορείτε να το δώσετε σε άλλους για να σας βρουν."
       help: 
-        do_you: "Μήπως.."
+        do_you: Μήπως..
         email_feedback: "%{link} your feedback, if you prefer"
         feature_suggestion: "... έχεις μια %{link} πρόταση?"
         find_a_bug: "... βρες %{link}?"
@@ -167,6 +167,13 @@ el:
       no_applications: "Δεν έχετε εσισάγει καμία εφαρμογή ακόμα. "
       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: 
     explanation: "Δημοσιεύστε στο Diaspora από οπουδήποτε προσθέτοντας %{link}."
     explanation_link_text: "αυτόν τον σύνδεσμο"
@@ -179,7 +186,7 @@ el:
     many: "%{count} σχόλια"
     new_comment: 
       comment: "Σχολιάστε"
-      commenting: "Σχολιάζει..."
+      commenting: Σχολιάζει...
     one: "1 σχόλιο"
     other: "%{count} σχόλια"
     two: "%{count} σχόλια"
@@ -234,7 +241,7 @@ el:
     new: 
       abandon_changes: "Απόρριψη αλλαγών?"
       send: "Αποστολή"
-      sending: "Αποστολή..."
+      sending: Αποστολή...
       subject: "θέμα"
       to: "στον"
     new_message: 
@@ -242,7 +249,7 @@ el:
     show: 
       delete: "διαγραφή και φραγή συζήτησης"
       reply: "απάντηση"
-      replying: "Απάντηση..."
+      replying: Απάντηση...
   date: 
     formats: 
       birthday: "%B %d"
@@ -507,6 +514,7 @@ el:
     show: 
       does_not_exist: "Ο/Η χρήστης δεν υπάρχει!"
       has_not_shared_with_you_yet: "Ο χρήστης %{name} δεν μοιράζεται ακόμα κάποια δημοσίευση μαζί σας!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "Ο/Η %{name} θέλει να μοιραστεί μαζί σας"
       mention: "Αναφορά"
       message: "Μήνυμα"
@@ -559,16 +567,13 @@ el:
     update: 
       error: "Αποτυχία επεξεργασίας φωτογραφίας."
       notice: "Η φωτογραφία ενημερώθηκε επιτυχώς."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "Οι αναρτήσεις από τον/την %{name} έχουν γίνει κρυφές, και οι ειδοποιήσεις έχουν απενεργοποιηθεί."
-      see_it_on_their_profile: "Εάν θέλετε να δείτε τις ενημερώσεις αυτής της δημοσίευσης, επισκεφθείτε το προφίλ του χρήστη %{name}. "
   posts: 
     show: 
       destroy: "Διαγραφή"
       not_found: "Λυπούμαστε, δεν καταφέραμε να βρούμε αυτή τη δημοσίευση."
       permalink: "permalink"
   previous: "προηγούμενο"
+  privacy: "Privacy"
   profile: "Προφίλ"
   profiles: 
     edit: 
@@ -637,7 +642,7 @@ el:
       existing: "Υφιστάμενες επαφές"
       manage_within: "Διαχειριστείτε τις επαφές της πτυχής"
     new_request_to_person: 
-      sent: "εστάλη!"
+      sent: εστάλη!
   reshares: 
     comment_email_subject: "κοινοποίηση της δημοσίευσης του %{author} από τον %{resharer}"
     create: 
@@ -685,11 +690,15 @@ el:
       not_on_diaspora: "Όχι ακόμα στο Diaspora"
       resend: "αποστολή ξανά"
   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: "Προσθέστε μια νέα επαφή"
       create_request: "Εύρεση βάσει Diaspora ID"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Εισάγετε όνομα χρήστη Diaspora:"
       know_email: "Ξέρετε τις ηλεκτρονικές τους διευθύνσεις; Τότε πρέπει να τους προσκαλέσετε"
       your_diaspora_username_is: "Το όνομα χρήστη σας στο Diaspora είναι: %{diaspora_handle}"
@@ -737,7 +746,7 @@ el:
         i_like: "Με ενδιαφέρουν οι ετικέτες %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Αναρτήστε ένα μήνυμα στην πτυχή %{aspect}"
-      posting: "Ανάρτηση..."
+      posting: Ανάρτηση...
       publishing_to: "δημοσίευση στο: "
       share: "Μοιράσου"
       share_with: "Μοιράσου με"
@@ -750,6 +759,8 @@ el:
       currently_unavailable: "commenting currently unavailable"
       dislike: "Δεν μ' αρέσει"
       hide_and_mute: "Απόκρυψη και Σίγαση "
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Μου αρέσει"
       shared_with: "Διαμοιρασμένο με: %{aspect_names}"
       unlike: "Δεν μου αρέσει"
@@ -830,7 +841,7 @@ el:
       typical_userpage: "Μία τυπική cubbi.es σελίδα χρήστη"
       via: "(μέσω %{link})"
       what_is_cubbies: "Το Cubbi.es είναι παγκοσμίως η πρώτη εφαρμογή για το Diaspora. Είναι επίσης ο καλύτερος τρόπος συλλογής φωτογραφιών στο διαδίκτυο."
-  undo: "Αναίρεση;"
+  undo: Αναίρεση;
   username: "Όνομα Χρήστη"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ el:
       hashtag_explanation: "Τα hashtags σας επιτρέπουν να συζητάτε και να ακολουθείτε συγκεκριμένα ενδιαφέροντα. Είναι ακόμα ένας ωραίος τρόπος για να γνωρίσετε νέα άτομα στο Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ el:
       signed_out: "Έχετε αποσυνδεθεί από το Diaspora*"
       simply_visit: "Απλά επισκεφθείτε "
       works_on_modern: "Δουλεύει σε όλα τα μοντέρνα smartphones"
+    privacy_settings: 
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "Ο χρήστης %{username} δεν υπάρχει!"
     update: 
@@ -901,4 +916,4 @@ el:
     no_person_constructed: "Κανένα άτομο δεν μπορούσε να κατασκευαστεί απο αυτό το hcard."
     not_enabled: "το webfinger φαίνεται να μην είναι ενεργοποιημέο για τον host του %{account}"
     xrd_fetch_failed: "υπήρξε ένα πρόβλημα στη λήψη του xrd απο το λογαριασμό %{account}"
-  welcome: "Καλωσήρθατε!"
+  welcome: Καλωσήρθατε!
diff --git a/config/locales/diaspora/en_1337.yml b/config/locales/diaspora/en_1337.yml
index 8d2bbcd0b..69638a342 100644
--- a/config/locales/diaspora/en_1337.yml
+++ b/config/locales/diaspora/en_1337.yml
@@ -79,16 +79,16 @@ en_1337:
       add_existing: "4DD 4 KN0WN N00B"
       aspect_list_is_not_visible: "45P3C7 L157 15 H1DD3N 2 07H3R5 1N 45P3C7!"
       aspect_list_is_visible: "45P3C7 L157 15 V151BL3 2 07H3R5 1N 45P3C7!"
-      confirm_remove_aspect: "5UR3?"
+      confirm_remove_aspect: 5UR3?
       done: "K"
       make_aspect_list_visible: "M4K3 N00B5 V151BL3 2 34CH 07H3R?"
       remove_aspect: "D3L373 7H15 45P3C7!"
       rename: "R3N4M3"
       update: "UPD473"
-      updating: "UPD471NG..."
+      updating: UPD471NG...
     few: "%{count} 45P3C75"
     helper: 
-      are_you_sure: "5UR3?"
+      are_you_sure: 5UR3?
       aspect_not_empty: "45P3C7 N07 3MP7Y!"
       remove: "R3M0V3"
     index: 
@@ -100,7 +100,7 @@ en_1337:
         content_1: "Y0UR D* 1D 15:"
         content_2: "G1V3 7H3M 2 N00B5 4ND 7H3Y W1LL F1ND U!"
         heading: "D* 1D"
-      donate: "D0N473!"
+      donate: D0N473!
       handle_explanation: "7H15 15 Y0UR D* 1D, N00B5 C4N F1ND U U51NG 17!"
       help: 
         do_you: "D0 U:"
@@ -149,7 +149,7 @@ en_1337:
       acquaintances: "PR05"
       family: "RL"
       friends: "N00B5"
-      work: "RL-N00B5"
+      work: RL-N00B5
     selected_contacts: 
       manage_your_aspects: "M4N4G3 Y0UR 45P3C75!"
       no_contacts: "U D0N7 H4V3 4NY N00B5 H3R3!"
@@ -166,7 +166,14 @@ en_1337:
     index: 
       no_applications: "U H4V3N7 R3G1573R3D 4NY 4PP Y37!"
       revoke_access: "R3V0K3 4CC355"
-  back: "<-"
+  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: 
     explanation: "5P4M FR0M 4NYWH3R3, 4NY71M3! %{link}."
     explanation_link_text: "7H15 L1NK"
@@ -179,7 +186,7 @@ en_1337:
     many: "%{count} 5P4M5"
     new_comment: 
       comment: "5P4M"
-      commenting: "5P4MM1NG..."
+      commenting: 5P4MM1NG...
     one: "1 5P4M"
     other: "%{count} 5P4M5"
     two: "%{count} 5P4M5"
@@ -234,7 +241,7 @@ en_1337:
     new: 
       abandon_changes: "D0N7 54V3?"
       send: "5P4M"
-      sending: "5P4MM1NG..."
+      sending: 5P4MM1NG...
       subject: "N00B"
       to: "2"
     new_message: 
@@ -242,7 +249,7 @@ en_1337:
     show: 
       delete: "PWN 7H47 C0NV3R54710N!"
       reply: "R3PLY"
-      replying: "R3PLY1NG..."
+      replying: R3PLY1NG...
   date: 
     formats: 
       birthday: "%B %d"
@@ -256,7 +263,7 @@ en_1337:
       invalid_fields: "1NV4L1D F13LD5!"
   fill_me_out: "F1LL M3 0U7!"
   find_people: "F1ND N00B5 0R #74G5"
-  hide: "PWN?"
+  hide: PWN?
   home: 
     show: 
       already_account: "4LR34DY H4V3 4N 4CC0UN7?"
@@ -264,7 +271,7 @@ en_1337:
       choice_explanation: "D* L375 U 50R7 Y0UR N00B5 1N GR0UP5 C4LL3D 45P3C75! UN1QU3 70 D*, 45P3C75 3N5UR3 7H47 Y0UR 74RG375, J0K35 4ND PR0N 4R3 5H4R3D 0NLY W17H 7H3 N00B5 U W4N7 2!"
       learn_about_host: "L34RN 4B0U7 H0W 2 H057 Y0UR 0WN D* 53RV3R!"
       login_here: "L0G 1N H3R3!"
-      ownership: "0WN(3R5H1P)"
+      ownership: 0WN(3R5H1P)
       ownership_explanation: "U 0WN Y0UR PR0N, 4ND U 5H0ULDN7 H4V3 2 G1V3 7H47 UP JU57 2 5H4R3 17! U M41N741N 0WN3R5H1P 0N 3V3RY7H1NG U 5H4R3 0N D*, G1V1NG U FULL C0N7R0L 0V3R H0W 175 C0N7R1BU73D!"
       share_what_you_want: "5P4M WH0 U W4N7, W17H WH47 U W4N7!"
       simplicity: "51MPL1C17Y"
@@ -293,7 +300,7 @@ en_1337:
       invite_someone_to_join: "5P4M 50M30N3 2 J01N D*!"
       language: "Language"
       personal_message: "P3R50N4L M3554G3"
-      resend: "R35P4M!"
+      resend: R35P4M!
       send_an_invitation: "53ND 4 5P4M!"
       send_invitation: "53ND 5P4M!"
       to: "7o"
@@ -305,7 +312,7 @@ en_1337:
       whats_new: "WH475 N3W?"
       your_aspects: "Y0UR 45P3C75"
     header: 
-      admin: "G0DM0D3!"
+      admin: G0DM0D3!
       blog: "BL0G"
       code: "C0D3"
       login: "L0G 1N"
@@ -497,7 +504,7 @@ en_1337:
       thats_you: "7H475 U!"
     profile_sidebar: 
       bio: "B10"
-      born: "B-D4Y"
+      born: B-D4Y
       edit_my_profile: "3D17 MY PR0F1L3"
       gender: "G3ND3R"
       in_aspects: "1N 45P3C75"
@@ -507,6 +514,7 @@ en_1337:
     show: 
       does_not_exist: "N00B != 3X1571NG"
       has_not_shared_with_you_yet: "%{name} H45 N07 5H4R3D 4NY 5P4M W17H U!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name} W4N75 2 5H4R3 W17H U!"
       mention: "M3N710N"
       message: "5P4M"
@@ -559,16 +567,13 @@ en_1337:
     update: 
       error: "F41L3D 2 3D17 P1C!"
       notice: "P1C 5UCC35FULLY UPD473D!"
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "%{name}'s 5P4M H45 B33N PWND, 4ND N071F1C4710N5 2!"
-      see_it_on_their_profile: "1F U W4N7 2 533 UPD4735 0N 7H15 5P4M, V1517 %{name}'s PR0F1L3 P4G3!"
   posts: 
     show: 
       destroy: "D3L373"
       not_found: "50RRY, W3 C0ULDN7 F1ND 7H47 5P4M!"
       permalink: "P3RM4L1NK"
   previous: "PR3V10U5"
+  privacy: "Privacy"
   profile: "PR0F1L3"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ en_1337:
       edit: "3D17 %{name}"
       leave_blank: "(L34V3 BL4NK 1F U D0N7 W4N7 2 CH4NG3 17)"
       password_to_confirm: "(W3 N33D Y0UR CURR3N7 ***** 2 C0NF1RM CH4NG35!)"
-      unhappy: "UNH4PPY?"
+      unhappy: UNH4PPY?
       update: "UPD473"
     new: 
       create_my_account: "CR3473 MY 4CC0UN7!"
@@ -637,7 +642,7 @@ en_1337:
       existing: "3X1571NG N00B5"
       manage_within: "M4N4G3 N00B5 W17H1N"
     new_request_to_person: 
-      sent: "5P4MM3D!"
+      sent: 5P4MM3D!
   reshares: 
     comment_email_subject: "%{resharer}'s R35P4M 0F %{author}'s 5P4M"
     create: 
@@ -685,11 +690,15 @@ en_1337:
       not_on_diaspora: "N07 Y37 0N D*!"
       resend: "R35P4M"
   settings: "53771NG5"
+  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: "4DD 4 N3W N00B"
       create_request: "F1ND BY D* 1D"
-      diaspora_handle: "N1CK@P0D.0RG"
+      diaspora_handle: N1CK@P0D.0RG
       enter_a_diaspora_username: "3N73R 4 D* N1CK:"
       know_email: "KN0W 7H31R M41L? U 5H0ULD 1NV173 7H3M!"
       your_diaspora_username_is: "Y0UR D* N1CK 15: %{diaspora_handle}"
@@ -737,7 +746,7 @@ en_1337:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "5P4M 7H15 45P3C7: %{aspect}"
-      posting: "5P4MM1NG..."
+      posting: 5P4MM1NG...
       publishing_to: "PUBL15H1NG 2: "
       share: "5P4M"
       share_with: "5H4R3 W17H"
@@ -750,9 +759,11 @@ en_1337:
       currently_unavailable: "commenting currently unavailable"
       dislike: "PWN"
       hide_and_mute: "H1D3 4ND PWN"
-      like: "<3"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
+      like: <3
       shared_with: "5H4R3D W17H: %{aspect_names}"
-      unlike: "</3"
+      unlike: </3
       via: "V14 %{link}"
       viewable_to_anyone: "7H15 5P4M 15 V13W4BL3 2 4NY0N3 1N 7H3 W3B!"
   status_messages: 
@@ -830,7 +841,7 @@ en_1337:
       typical_userpage: "4 7YP1C4L CUBB135 N00B P4G3"
       via: "(V14 %{link})"
       what_is_cubbies: "CUBB135 15 7H3 W0RLD5 F1R57 D* 4PPL1C4710N! 175 4L50 7H3 B357 W4Y 2 C0LL3C7 P1C5 0NL1N3!"
-  undo: "UND0?"
+  undo: UND0?
   username: "N1CKN4M3"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ en_1337:
       hashtag_explanation: "H45H74G5 4LL0W U 2 74LK 4B0U7 4ND F0LL0W Y0UR 1N73R3575! 7H3YR3 4L50 4 GR347 W4Y 2 F1ND N3W N00B5 0N D*!"
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ en_1337:
       signed_out: "U H4V3 51GN3D 0U7 0F D*!"
       simply_visit: "51MPLY V1517"
       works_on_modern: "W0RK5 0N 4LL M0D3RN 5M4R7PH0N35!"
+    privacy_settings: 
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "U53R %{username} D035 N07 3X157!"
     update: 
@@ -901,4 +916,4 @@ en_1337:
     no_person_constructed: "N0 P3R50N C0ULD B3 C0N57RUC73D FR0M 7H15 HC4RD!"
     not_enabled: "W3BF1NG3R D035 N07 533M 70 B3 3N4BL3D F0R %{account}'s H057!"
     xrd_fetch_failed: "3RR0R G3771NG XRD F0R %{account}!"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/en_pirate.yml b/config/locales/diaspora/en_pirate.yml
index b4a463d3e..0a62773df 100644
--- a/config/locales/diaspora/en_pirate.yml
+++ b/config/locales/diaspora/en_pirate.yml
@@ -167,6 +167,13 @@ en_pirate:
       no_applications: "You haven't registered any applications yet."
       revoke_access: "Revoke Access"
   back: "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: 
     explanation: "Post to Diaspora from anywhere by bookmarking %{link}."
     explanation_link_text: "this link"
@@ -179,7 +186,7 @@ en_pirate:
     many: "%{count} comments"
     new_comment: 
       comment: "Comment"
-      commenting: "Commenting..."
+      commenting: Commenting...
     one: "1 comment"
     other: "%{count} comments"
     two: "%{count} comments"
@@ -234,7 +241,7 @@ en_pirate:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
-      sending: "Sending..."
+      sending: Sending...
       subject: "subject"
       to: "to"
     new_message: 
@@ -242,7 +249,7 @@ en_pirate:
     show: 
       delete: "delete and block conversation"
       reply: "reply"
-      replying: "Replying..."
+      replying: Replying...
   date: 
     formats: 
       birthday: "%B %d"
@@ -507,6 +514,7 @@ en_pirate:
     show: 
       does_not_exist: "Person does not exist!"
       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} wants to share with you"
       mention: "Mention"
       message: "Message"
@@ -559,16 +567,13 @@ en_pirate:
     update: 
       error: "Failed to edit photo."
       notice: "Photo successfully updated."
-  post_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."
   posts: 
     show: 
       destroy: "Delete"
       not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   previous: "previous"
+  privacy: "Privacy"
   profile: "Profile"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ en_pirate:
       edit: "Edit %{name}"
       leave_blank: "(leave blank if you don't want to change it)"
       password_to_confirm: "(we need your current password to confirm your changes)"
-      unhappy: "Unhappy?"
+      unhappy: Unhappy?
       update: "Update"
     new: 
       create_my_account: "Create my account"
@@ -637,7 +642,7 @@ en_pirate:
       existing: "Existing contacts"
       manage_within: "Manage contacts within"
     new_request_to_person: 
-      sent: "sent!"
+      sent: sent!
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -685,11 +690,15 @@ en_pirate:
       not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   settings: "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: "Find by Diaspora ID"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Enter a Diaspora username:"
       know_email: "Know their email address? You should invite them"
       your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
@@ -737,9 +746,9 @@ en_pirate:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Post a message to %{aspect}"
-      posting: "Posting..."
+      posting: Posting...
       publishing_to: "publishing to: "
-      share: "Fire!"
+      share: Fire!
       share_with: "share with"
       upload_photos: "Upload photos"
       whats_on_your_mind: "What be botherin' you?"
@@ -750,6 +759,8 @@ en_pirate:
       currently_unavailable: "commenting currently unavailable"
       dislike: "Dislike"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Like"
       shared_with: "Fired at: %{aspect_names}"
       unlike: "Unlike"
@@ -830,7 +841,7 @@ en_pirate:
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-  undo: "Undo?"
+  undo: Undo?
   username: "Username"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ en_pirate:
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ en_pirate:
       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: "User %{username} does not exist!"
     update: 
@@ -901,4 +916,4 @@ en_pirate:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index c21cd17b9..cec3c3198 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -167,6 +167,13 @@ en_shaw:
       no_applications: "You haven't registered any applications yet."
       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: 
     explanation: "𐑐𐑴𐑕𐑑 𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑓𐑮𐑳𐑥 𐑨𐑯𐑦𐑢𐑺 𐑚𐑲 𐑚𐑫𐑒𐑥𐑸𐑒𐑦𐑙 %{link}."
     explanation_link_text: "𐑞𐑦𐑕 𐑤𐑦𐑙𐑒"
@@ -179,7 +186,7 @@ en_shaw:
     many: "%{count} 𐑒𐑪𐑥𐑩𐑯𐑑𐑕"
     new_comment: 
       comment: "𐑒𐑪𐑥𐑩𐑯𐑑"
-      commenting: "𐑒𐑪𐑥𐑩𐑯𐑑𐑦𐑙..."
+      commenting: 𐑒𐑪𐑥𐑩𐑯𐑑𐑦𐑙...
     one: "1 𐑒𐑪𐑥𐑩𐑯𐑑"
     other: "%{count} 𐑒𐑪𐑥𐑩𐑯𐑑𐑕"
     two: "%{count} comments"
@@ -234,7 +241,7 @@ en_shaw:
     new: 
       abandon_changes: "𐑩𐑚𐑨𐑯𐑛𐑩𐑯 𐑗𐑱𐑯𐑡𐑩𐑟?"
       send: "𐑕𐑧𐑯𐑛"
-      sending: "𐑕𐑧𐑯𐑛𐑦𐑙..."
+      sending: 𐑕𐑧𐑯𐑛𐑦𐑙...
       subject: "𐑕𐑳𐑚𐑡𐑧𐑒𐑑"
       to: "𐑑"
     new_message: 
@@ -242,14 +249,14 @@ en_shaw:
     show: 
       delete: "𐑛𐑦𐑤𐑰𐑑 𐑯 𐑚𐑤𐑪𐑒 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯"
       reply: "𐑮𐑦𐑐𐑤𐑲"
-      replying: "Replying..."
+      replying: Replying...
   date: 
     formats: 
       birthday: "%B %d"
       birthday_with_year: "%B %d %Y"
       fullmonth_day: "%B %d"
   delete: "𐑛𐑦𐑤𐑰𐑑"
-  email: "𐑦-𐑥𐑱𐑤"
+  email: 𐑦-𐑥𐑱𐑤
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "𐑒𐑩𐑮𐑧𐑒𐑑 𐑞 𐑓𐑪𐑤𐑴𐑦𐑙 𐑺𐑼𐑟 𐑯 𐑑𐑮𐑲 𐑩𐑜𐑧𐑯."
@@ -507,6 +514,7 @@ en_shaw:
     show: 
       does_not_exist: "𐑐𐑻𐑕𐑩𐑯 𐑛𐑳𐑟 𐑯𐑪𐑑 𐑧𐑜𐑟𐑦𐑕𐑑!"
       has_not_shared_with_you_yet: "%{name} 𐑣𐑨𐑟 𐑯𐑪𐑑 𐑖𐑺𐑛 𐑧𐑯𐑦 𐑐𐑴𐑕𐑑𐑕 𐑢𐑦𐑞 𐑿 𐑘𐑧𐑑!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name} 𐑢𐑳𐑯𐑑𐑕 𐑑 𐑖𐑺 𐑢𐑦𐑞 𐑿"
       mention: "𐑥𐑧𐑯𐑖𐑩𐑯"
       message: "𐑥𐑧𐑕𐑩𐑡"
@@ -559,16 +567,13 @@ en_shaw:
     update: 
       error: "𐑓𐑱𐑤𐑛 𐑑 𐑧𐑛𐑦𐑑 𐑓𐑴𐑑𐑴."
       notice: "𐑓𐑴𐑑𐑴 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑳𐑐𐑛𐑱𐑑𐑩𐑛."
-  post_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."
   posts: 
     show: 
       destroy: "𐑛𐑦𐑤𐑰𐑑"
       not_found: "𐑕𐑪𐑮𐑦, 𐑢𐑰 𐑒𐑫𐑛𐑯𐑑 𐑓𐑲𐑯𐑛 𐑞𐑨𐑑 𐑐𐑴𐑕𐑑."
       permalink: "𐑐𐑻𐑥𐑩𐑤𐑦𐑙𐑒"
   previous: "𐑐𐑮𐑰𐑝𐑾𐑕"
+  privacy: "Privacy"
   profile: "𐑐𐑮𐑴𐑓𐑲𐑤"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ en_shaw:
       edit: "𐑧𐑛𐑦𐑑 %{name}"
       leave_blank: "(𐑤𐑰𐑝 𐑚𐑤𐑱𐑙𐑒 𐑦𐑓 𐑿 𐑛𐑴𐑯𐑑 𐑢𐑳𐑯𐑑 𐑑 𐑗𐑱𐑯𐑡 𐑦𐑑)"
       password_to_confirm: "(𐑢𐑰 𐑯𐑰𐑛 𐑿𐑼 𐑒𐑻𐑩𐑯𐑑 𐑐𐑨𐑕𐑢𐑼𐑛 𐑑 𐑒𐑩𐑯𐑓𐑻𐑥 𐑿𐑼 𐑗𐑱𐑯𐑡𐑩𐑟)"
-      unhappy: "𐑩𐑯𐑣𐑨𐑐𐑦?"
+      unhappy: 𐑩𐑯𐑣𐑨𐑐𐑦?
       update: "𐑳𐑐𐑛𐑱𐑑"
     new: 
       create_my_account: "Create my account"
@@ -637,7 +642,7 @@ en_shaw:
       existing: "𐑧𐑜𐑟𐑦𐑕𐑑𐑦𐑙 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
       manage_within: "𐑥𐑨𐑯𐑩𐑡 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑢𐑦𐑞𐑦𐑯"
     new_request_to_person: 
-      sent: "𐑕𐑧𐑯𐑑!"
+      sent: 𐑕𐑧𐑯𐑑!
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -685,11 +690,15 @@ en_shaw:
       not_on_diaspora: "Not yet on Diaspora"
       resend: "𐑮𐑦𐑕𐑧𐑯𐑛"
   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: "𐑨𐑛 𐑯𐑿 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
       create_request: "𐑓𐑲𐑯𐑛 𐑚𐑲·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑲𐑛𐑧𐑯𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯"
-      diaspora_handle: "diaspora@handle.org"
+      diaspora_handle: diaspora@handle.org
       enter_a_diaspora_username: "𐑧𐑯𐑑𐑼 𐑩 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑿𐑟𐑼𐑯𐑱𐑥:"
       know_email: "𐑯𐑴 𐑞𐑺 𐑦-𐑥𐑱𐑤 𐑩𐑛𐑮𐑧𐑕? 𐑿 𐑖𐑫𐑛 𐑦𐑯𐑝𐑲𐑑 𐑞𐑧𐑥"
       your_diaspora_username_is: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑿𐑟𐑼𐑯𐑱𐑥 𐑦𐑟: %{diaspora_handle}"
@@ -737,7 +746,7 @@ en_shaw:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "𐑐𐑴𐑕𐑑 𐑩 𐑥𐑧𐑕𐑩𐑡 𐑑 %{aspect}"
-      posting: "𐑐𐑴𐑕𐑑𐑦𐑙..."
+      posting: 𐑐𐑴𐑕𐑑𐑦𐑙...
       publishing_to: "𐑐𐑳𐑚𐑤𐑦𐑖𐑦𐑙 𐑑: "
       share: "𐑖𐑺"
       share_with: "𐑖𐑺 𐑢𐑦𐑞 %{aspect}"
@@ -750,6 +759,8 @@ en_shaw:
       currently_unavailable: "commenting currently unavailable"
       dislike: "𐑛𐑦𐑕𐑤𐑲𐑒"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "𐑤𐑲𐑒"
       shared_with: "𐑖𐑺𐑛 𐑢𐑦𐑞: %{aspect_names}"
       unlike: "𐑩𐑯𐑤𐑲𐑒"
@@ -830,7 +841,7 @@ en_shaw:
       typical_userpage: "𐑩 𐑑𐑦𐑐𐑦𐑒𐑩𐑤 cubbi.es 𐑿𐑟𐑼𐑐𐑱𐑡"
       via: "(𐑝𐑾 %{link})"
       what_is_cubbies: "Cubbi.es 𐑦𐑟 𐑞 𐑢𐑻𐑤𐑛𐑟 𐑓𐑻𐑕𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑨𐑐𐑤𐑦𐑒𐑱𐑖𐑩𐑯.  𐑦𐑑𐑕 𐑷𐑤𐑕𐑴 𐑞 𐑚𐑧𐑕𐑑 𐑢𐑱 𐑑 𐑒𐑩𐑤𐑧𐑒𐑑 𐑓𐑴𐑑𐑴𐑟 𐑪𐑯𐑤𐑲𐑯."
-  undo: "𐑩𐑯𐑛𐑵?"
+  undo: 𐑩𐑯𐑛𐑵?
   username: "𐑿𐑟𐑼𐑯𐑱𐑥"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ en_shaw:
       hashtag_explanation: "𐑣𐑨𐑖𐑑𐑨𐑜𐑟 𐑩𐑤𐑬 𐑿 𐑑 𐑑𐑷𐑒 𐑩𐑚𐑬𐑑 𐑯 𐑓𐑪𐑤𐑴 𐑿𐑼 𐑦𐑯𐑑𐑮𐑧𐑕𐑑𐑕.  𐑞𐑺 𐑷𐑤𐑕𐑴 𐑩 𐑜𐑮𐑱𐑑 𐑢𐑱 𐑑 𐑓𐑲𐑯𐑛 𐑯𐑿 𐑐𐑰𐑐𐑩𐑤 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ en_shaw:
       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} 𐑛𐑳𐑟 𐑯𐑪𐑑 𐑧𐑜𐑟𐑦𐑕𐑑!"
     update: 
@@ -901,4 +916,4 @@ en_shaw:
     no_person_constructed: "𐑯𐑴 𐑐𐑻𐑕𐑩𐑯 𐑒𐑫𐑛 𐑚𐑰 𐑒𐑩𐑯𐑕𐑑𐑮𐑳𐑒𐑑𐑩𐑛 𐑓𐑮𐑪𐑥 𐑞𐑦𐑕 𐑣-𐑒𐑸𐑛."
     not_enabled: "𐑢𐑧𐑚𐑓𐑦𐑙𐑜𐑼 𐑛𐑳𐑟 𐑯𐑪𐑑 𐑕𐑰𐑥 𐑑 𐑚𐑰 𐑦𐑯𐑱𐑚𐑩𐑤𐑛 𐑓𐑹 %{account}𐑟 𐑣𐑴𐑕𐑑"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 30bfcd6e7..8cc6414d7 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -115,9 +115,9 @@ eo:
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Helpu %{pod} rapide funkcii kaj aĉetu por niaj servkomputiloj ilian kaforiparon per ĉiumonata donatado!"
       new_here: 
-        follow: "Follow %{link} and welcome new users to Diaspora*!"
-        learn_more: "Learn more"
-        title: "Welcome New Users"
+        follow: "Sekvu %{link} kaj bonvenu novajn uzantojn al Diaspora*!"
+        learn_more: "Lerni pli"
+        title: "Bonvenigu novajn uzantojn"
       no_contacts: "neniuj kontaktoj"
       no_tags: "+ Trovi etikedon aboni"
       people_sharing_with_you: "Homoj, kiuj konigas kun vi"
@@ -167,6 +167,13 @@ eo:
       no_applications: "Vi ne jam registris iujn aplikaĵojn."
       revoke_access: "Revoki Permeson"
   back: "Antaŭen"
+  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: 
     explanation: "Vi povas afiŝi al DIASPORA* el ĉie per paĝosigno montranta al %{link}."
     explanation_link_text: "ĉi tiu ligilo"
@@ -179,7 +186,7 @@ eo:
     many: "%{count} komentoj"
     new_comment: 
       comment: "Komenti"
-      commenting: "Komentanta..."
+      commenting: Komentanta...
     one: "1 komento"
     other: "%{count} komentoj"
     two: "%{count} komentoj"
@@ -234,7 +241,7 @@ eo:
     new: 
       abandon_changes: "Ĉu forlasi ŝanĝojn?"
       send: "Sendi"
-      sending: "Poŝtanta..."
+      sending: Poŝtanta...
       subject: "temo"
       to: "al"
     new_message: 
@@ -242,7 +249,7 @@ eo:
     show: 
       delete: "forigi kaj bloki interparoladon"
       reply: "respondi"
-      replying: "Respondanta..."
+      replying: Respondanta...
   date: 
     formats: 
       birthday: "%B %d"
@@ -291,7 +298,7 @@ eo:
       comma_seperated_plz: "Vi povas aldoni multajn retpoŝtadresojn, apartate per komoj."
       if_they_accept_info: "se tiu akceptos, tiu aldoniĝos al la aspekto, en kiun vi invitis tiun."
       invite_someone_to_join: "Invitu iun aniĝi al DIASPORA*!"
-      language: "Language"
+      language: "Lingvo"
       personal_message: "Persona mesaĝo"
       resend: "Resendi"
       send_an_invitation: "Sendu inviton"
@@ -440,7 +447,7 @@ eo:
       two: "%{actors} komenis partopreni kun vi."
       zero: "%{actors} komencis konigi kun vi."
   notifier: 
-    a_post_you_shared: "afiŝo."
+    a_post_you_shared: afiŝo.
     click_here: "kliku tie ĉi"
     comment_on_post: 
       reply: "Respondi aŭ vidi afiŝon de %{name} >"
@@ -507,6 +514,7 @@ eo:
     show: 
       does_not_exist: "Persono ne ekzistas!"
       has_not_shared_with_you_yet: "%{name} ne jam partoprenis iuj ajn afiŝojn kun vi!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name} volas konigi kun vi"
       mention: "Mencii"
       message: "Mesaĝo"
@@ -559,16 +567,13 @@ eo:
     update: 
       error: "Ne povis redakti bildon."
       notice: "Bildo sukcese ĝisdatiĝis."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "La afiŝo de %{name} ne plu videblas, kaj sciigoj ne plu sendiĝos."
-      see_it_on_their_profile: "Se vi volas vidi ŝanĝojn pri tiu ĉi afiŝo, iru al la profilpaĝo de %{name}."
   posts: 
     show: 
       destroy: "Forlasi"
       not_found: "Ni bedaŭras, sed ni ne povis trovi tiun afiŝon."
       permalink: "malŝanĝantligilo"
   previous: "antaŭa"
+  privacy: "Privacy"
   profile: "Profilo"
   profiles: 
     edit: 
@@ -637,7 +642,7 @@ eo:
       existing: "Ekzistantaj kontaktoj"
       manage_within: "Administri kontaktojn ene de"
     new_request_to_person: 
-      sent: "sendita!"
+      sent: sendita!
   reshares: 
     comment_email_subject: "la repartoprenado de %{resharer} de la afiŝo de %{author}"
     create: 
@@ -685,11 +690,15 @@ eo:
       not_on_diaspora: "Ne jam ĉe DIASPORA*"
       resend: "resendi"
   settings: "Agordoj"
+  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: "Aldoni novan kontakton"
       create_request: "Trovi per DIASPORA* uzantnomo"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Enmetu DIASPORA* uzantnomon:"
       know_email: "Ĉu vi scias iliajn retpoŝtadresojn? Vi devus inviti ilin"
       your_diaspora_username_is: "Via DIASPORA* uzantnomo estas: %{diaspora_handle}"
@@ -735,9 +744,9 @@ eo:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
-        invited_by: "Thanks for the invite, "
+        invited_by: "Dankon pro la invito,"
       post_a_message_to: "Afiŝi al %{aspect}"
-      posting: "Afiŝanta..."
+      posting: Afiŝanta...
       publishing_to: "koniganta al: "
       share: "Konigi"
       share_with: "konigi kun"
@@ -746,15 +755,17 @@ eo:
     reshare: 
       reshare: "Rekonigi"
     stream_element: 
-      connect_to_comment: "Connect to this user to comment on their post"
-      currently_unavailable: "commenting currently unavailable"
+      connect_to_comment: "konektu al tiu uzanto por komenti al lia afiŝo"
+      currently_unavailable: "komentado intertempe ne eblas"
       dislike: "Malŝati"
       hide_and_mute: "Malvidebligi kaj malsciiĝi"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Ŝati"
       shared_with: "Partoprenita kun: %{aspect_names}"
       unlike: "Ne plu ŝati"
       via: "per %{link}"
-      viewable_to_anyone: "Tiu ĉi afiŝo videblas de iu ajn ĉe la reto"
+      viewable_to_anyone: "Tiu ĉi afiŝo videblas de iu ajn en la reto"
   status_messages: 
     create: 
       success: "Sukcese menciis: %{names}"
@@ -781,9 +792,9 @@ eo:
     commented_on: "komentis pri"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
-      add_a_tag: "Add a tag"
+      add_a_tag: "Aldoni etikedon"
       contacts_title: "People who dig these tags"
-      follow: "Follow"
+      follow: "Sekvi"
       title: "#Sekvataj etikedoj"
     followed_tags_stream: "#Sekvataj etikedoj"
     mentioned_stream: "@Mencioj"
@@ -855,12 +866,12 @@ eo:
       liked: "...iu ŝatis vian afiŝon?"
       mentioned: "...vi estas menciita en afiŝo?"
       new_password: "Nova pasvorto"
-      photo_export_unavailable: "Photo exporting currently unavailable"
+      photo_export_unavailable: "bildeksporto intertempe ne eblas"
       private_message: "...vi ricevas malpublikan mesaĝon?"
       receive_email_notifications: "Ĉu ricevi retpoŝtajn sciigojn, kiam..."
       reshared: "...iu repartoprenas vian afiŝon?"
       show_community_spotlight: "Ĉu montri Komunuman Reflektoron en Torento?"
-      show_getting_started: "Re-enable Getting Started"
+      show_getting_started: "Reŝalti Komencadon"
       started_sharing: "...iu komencis konigi kun vi?"
       stream_preferences: "Torentaj agordoj"
       your_email: "Via retpoŝtadreso"
@@ -869,10 +880,10 @@ eo:
       awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "La komunumo de DIASPORA* feliĉas, ke vi aniĝis!"
       hashtag_explanation: "Etikedoj lasu vin pridiri kaj aboni viajn interesigojn.  Ili ankaŭ estas bona metodo trovi novajn homojn ĉe DIASPORA*."
-      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hashtag_suggestions: "Provu sekvi etikedojn kiel #arto, #filmoj, #gif, ktp."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
-      we_can_speed_things_up: "We can speed things up a bit by"
+      saved: Saved!
+      we_can_speed_things_up: "Ni povas iomete rapidigi ĝin per"
       well_hello_there: "Well, hello there!"
       what_are_you_in_to: "What are you into?"
       what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
@@ -883,6 +894,10 @@ eo:
       signed_out: "Vi elsalutis je DIASPORA*."
       simply_visit: "Nur iru al"
       works_on_modern: "Funkcias per ĉiuj modernaj poŝtelefonoj"
+    privacy_settings: 
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "Uzanto %{username} ne ekzistas!"
     update: 
@@ -901,4 +916,4 @@ eo:
     no_person_constructed: "Neniu persono povis esti kreita per tiu ĉi hcard."
     not_enabled: "webfinger ŝajnas ne esti ŝaltita ĉe la servilo de %{account}"
     xrd_fetch_failed: "estis eraro dum la venigado de al xrd de konto %{account}"
-  welcome: "Welcome!"
+  welcome: Bonvenon!
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index 747ecf22d..37d4d26b9 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -167,6 +167,13 @@ es-AR:
       no_applications: "No registraste ninguna aplicación todavía."
       revoke_access: "Revocar Acceso"
   back: "Atrás"
+  blocks: 
+    create: 
+      failure: "I couldn't ignore that user.  #evasion"
+      success: "Alright, you won't see that user in your stream again. #silencio!"
+    destroy: 
+      failure: "I couldn't stop ignoring that user.  #evasion"
+      success: "Let's see what they have to say! #sayhello"
   bookmarklet: 
     explanation: "Publicá algo en Diáspora* desde donde quieras agregando %{link} al marcador."
     explanation_link_text: "este enlace"
@@ -179,7 +186,7 @@ es-AR:
     many: "%{count} comentarios"
     new_comment: 
       comment: "Comentar"
-      commenting: "Comentando..."
+      commenting: Comentando...
     one: "1 comentario"
     other: "%{count} comentarios"
     two: "%{count} comentarios"
@@ -234,7 +241,7 @@ es-AR:
     new: 
       abandon_changes: "Abandonar los cambios?"
       send: "Enviar"
-      sending: "Enviando..."
+      sending: Enviando...
       subject: "asunto"
       to: "para"
     new_message: 
@@ -242,7 +249,7 @@ es-AR:
     show: 
       delete: "eliminar y bloquear conversación"
       reply: "responder"
-      replying: "Contestando..."
+      replying: Contestando...
   date: 
     formats: 
       birthday: "%d de %B"
@@ -499,7 +506,7 @@ es-AR:
       bio: "biografía"
       born: "nacimiento"
       edit_my_profile: "Editar mi perfil"
-      gender: "género/sexo"
+      gender: género/sexo
       in_aspects: "en aspectos"
       location: "ubicación"
       remove_contact: "eliminar contacto"
@@ -507,6 +514,7 @@ es-AR:
     show: 
       does_not_exist: "¡Ese usuario no existe!"
       has_not_shared_with_you_yet: "¡%{name} no compartió ninguna publicación con vos todavía!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name} quiere compartir con vos"
       mention: "Mención"
       message: "Mensaje"
@@ -538,7 +546,7 @@ es-AR:
     new: 
       back_to_list: "Volver a la lista"
       new_photo: "Foto nueva"
-      post_it: "¡Publicalo!"
+      post_it: ¡Publicalo!
     new_photo: 
       empty: "{file} está vacío, por favor seleccioná archivos sin él."
       invalid_ext: "{file} tiene una extensión incorrecta. Sólo se permiten {extensions}."
@@ -559,16 +567,13 @@ es-AR:
     update: 
       error: "Error al editar la foto."
       notice: "La foto se subió correctamente."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "El mensaje de %{name} ha sido escondido, y las notificaciones se han silenciado."
-      see_it_on_their_profile: "Si querés ver actualizaciones de este mensaje, visitá el perfil de %{name}."
   posts: 
     show: 
       destroy: "Eliminar"
       not_found: "No se pudo encontrar la publicación."
       permalink: "permalink"
   previous: "anterior"
+  privacy: "Privacy"
   profile: "Perfil"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ es-AR:
       edit: "Editar %{name}"
       leave_blank: "(dejalo en blanco si no querés cambiarlo)"
       password_to_confirm: "(necesitamos tu contraseña actual para confirmar los cambios)"
-      unhappy: "¿Insatisfecho?"
+      unhappy: ¿Insatisfecho?
       update: "Actualizar"
     new: 
       create_my_account: "Crear mi cuenta"
@@ -637,7 +642,7 @@ es-AR:
       existing: "Contactos existentes"
       manage_within: "Gestioná tus contactos"
     new_request_to_person: 
-      sent: "¡Enviado!"
+      sent: ¡Enviado!
   reshares: 
     comment_email_subject: "%{resharer} compartió una publicación de %{author}"
     create: 
@@ -685,11 +690,15 @@ es-AR:
       not_on_diaspora: "Todavía no está en Diáspora"
       resend: "reenviar"
   settings: "Configuración"
+  share_visibilites: 
+    update: 
+      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
+      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
   shared: 
     add_contact: 
       add_new_contact: "Añadir contacto"
       create_request: "Buscar por la dirección Diáspora*"
-      diaspora_handle: "direcc@diasp.org"
+      diaspora_handle: direcc@diasp.org
       enter_a_diaspora_username: "Ingresá el nombre de usuario de Diáspora*:"
       know_email: "¿Conocés sus direcciones de correo? ¡Podés invitarlos a unirse!"
       your_diaspora_username_is: "Tu nombre de usuario de Diáspora* es: %{diaspora_handle}"
@@ -737,7 +746,7 @@ es-AR:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Publicar un mensaje en %{aspect}"
-      posting: "Publicando..."
+      posting: Publicando...
       publishing_to: "publicar en: "
       share: "Compartir"
       share_with: "compartir con"
@@ -750,6 +759,8 @@ es-AR:
       currently_unavailable: "commenting currently unavailable"
       dislike: "Me disgusta"
       hide_and_mute: "Esconder y Silenciar"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Me gusta"
       shared_with: "Compartido con: %{aspect_names}"
       unlike: "No me gusta"
@@ -830,7 +841,7 @@ es-AR:
       typical_userpage: "Una típica página de usuario de cubbi.es"
       via: "(vía %{link})"
       what_is_cubbies: "Cubbi.es es la primera aplicación de Diáspora*. Es, también, la mejor forma de coleccionar fotos en línea."
-  undo: "¿Deshacer?"
+  undo: ¿Deshacer?
   username: "Nombre de usuario"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ es-AR:
       hashtag_explanation: "Los hashtags te permiten seguir y hablar sobre tus intereses. También son una gran manera de encontrar gente nueva en Diáspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ es-AR:
       signed_out: "Te desconectaste de Diáspora*"
       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: "¡El usuariuo %{username} no existe!"
     update: 
@@ -901,4 +916,4 @@ es-AR:
     no_person_constructed: "No pudo crearse ninguna persona a partir de esta 'hcard'."
     not_enabled: "Parece que webfinger no está habilitado para el servidor de %{account}"
     xrd_fetch_failed: "Hubo un error al buscar el 'xrd' de %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 0da2d33a1..7407d28a3 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -167,6 +167,13 @@ es-CL:
       no_applications: "Todavía no has registrado ninguna aplicación."
       revoke_access: "Revocar el Acceso"
   back: "Atrás"
+  blocks: 
+    create: 
+      failure: "I couldn't ignore that user.  #evasion"
+      success: "Alright, you won't see that user in your stream again. #silencio!"
+    destroy: 
+      failure: "I couldn't stop ignoring that user.  #evasion"
+      success: "Let's see what they have to say! #sayhello"
   bookmarklet: 
     explanation: "%{link} donde sea agregando a marcadores este link."
     explanation_link_text: "Postea en Diaspora"
@@ -179,7 +186,7 @@ es-CL:
     many: "%{count} comentarios"
     new_comment: 
       comment: "Comentar"
-      commenting: "Comentando..."
+      commenting: Comentando...
     one: "1 comentario"
     other: "%{count} comentarios"
     two: "%{count} comentarios"
@@ -234,7 +241,7 @@ es-CL:
     new: 
       abandon_changes: "Descartar los cambios?"
       send: "Enviar"
-      sending: "Enviando..."
+      sending: Enviando...
       subject: "asunto"
       to: "para"
     new_message: 
@@ -242,7 +249,7 @@ es-CL:
     show: 
       delete: "Eliminar y bloquear conversación"
       reply: "responder"
-      replying: "Respondiendo..."
+      replying: Respondiendo...
   date: 
     formats: 
       birthday: "%B %d"
@@ -507,6 +514,7 @@ es-CL:
     show: 
       does_not_exist: "¡La persona no existe!"
       has_not_shared_with_you_yet: "%{name} todavía no ha compartido ningún post contigo!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "Tienes una solicitud pendiente de %{name}"
       mention: "Mencionar"
       message: "Mensaje"
@@ -538,7 +546,7 @@ es-CL:
     new: 
       back_to_list: "Volver a la lista"
       new_photo: "Nueva Foto"
-      post_it: "¡postéalo!"
+      post_it: ¡postéalo!
     new_photo: 
       empty: "{file} está vacío, por favor, seleccione los archivos nuevamente sin éste último"
       invalid_ext: "{file} tiene una extensión no válida. Solo están permitidas {extensions}."
@@ -559,16 +567,13 @@ es-CL:
     update: 
       error: "Error al editar foto."
       notice: "Foto actualizada correctamente."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "El post de %{name} se ha ocultado, y las notificaciones se han silenciado."
-      see_it_on_their_profile: "Si quieres ver las actualizaciones de este post, visita el perfil de %{name}."
   posts: 
     show: 
       destroy: "ELiminar"
       not_found: "Lo sentimos, no pudimos encontrar ese post."
       permalink: "permalink"
   previous: "Anterior"
+  privacy: "Privacy"
   profile: "Perfil"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ es-CL:
       edit: "Editar %{name}"
       leave_blank: "(déjalo en blanco si no quieres cambiarlo)"
       password_to_confirm: "(necesitamos tu contraseña actual para confirmar los cambios)"
-      unhappy: "¿Triste?"
+      unhappy: ¿Triste?
       update: "Actualizar"
     new: 
       create_my_account: "Crear mi cuenta"
@@ -637,7 +642,7 @@ es-CL:
       existing: "Los contactos existen"
       manage_within: "Manejar los contactos en"
     new_request_to_person: 
-      sent: "¡enviado!"
+      sent: ¡enviado!
   reshares: 
     comment_email_subject: "%{resharer} compartió el post de %{author}"
     create: 
@@ -685,11 +690,15 @@ es-CL:
       not_on_diaspora: "Aun no en Diaspora"
       resend: "reenviar"
   settings: "Configuración"
+  share_visibilites: 
+    update: 
+      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
+      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
   shared: 
     add_contact: 
       add_new_contact: "Agregar un nuevo contacto"
       create_request: "Encontrar por el ID de Diaspora"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Ingresa tu nombre de usuario Diaspora:"
       know_email: "¿Conoces sus direcciones de correo? Deberías invitarlos"
       your_diaspora_username_is: "Tu nombre de usuario Diaspora es: %{diaspora_handle}"
@@ -737,7 +746,7 @@ es-CL:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Postear un mensaje a %{aspect}"
-      posting: "Posteando..."
+      posting: Posteando...
       publishing_to: "publicar en: "
       share: "Compartir"
       share_with: "Compartir con "
@@ -750,6 +759,8 @@ es-CL:
       currently_unavailable: "commenting currently unavailable"
       dislike: "No me gusta esto"
       hide_and_mute: "Ocultar y silenciar"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Me gusta esto"
       shared_with: "Compartir con: %{aspect_names}"
       unlike: "No me gusta"
@@ -830,7 +841,7 @@ es-CL:
       typical_userpage: "Una tipica pagina de usuario de cubbi.es "
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es es la primera aplicación en el mundo de Diaspora.  Es también la mejor manera de coleccionar fotos online."
-  undo: "Deshacer?"
+  undo: Deshacer?
   username: "Nombre de usuario"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ es-CL:
       hashtag_explanation: "Los Hashtags te permiten hablar y seguir sobre tus intereses. También son una manera genial de encontrar nuevas personas en Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ es-CL:
       signed_out: "Te has desconectado de Diaspora*"
       simply_visit: "Simplemente visita"
       works_on_modern: "Funciona en todos los smartphones modernos"
+    privacy_settings: 
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "¡El usuario %{username} no existe!"
     update: 
@@ -901,4 +916,4 @@ es-CL:
     no_person_constructed: "Ninguna persona puede ser construida a partir de ésta hcard"
     not_enabled: "el webfinger parece no estar disponible para el host de %{account}"
     xrd_fetch_failed: "hubo un error al recibir el crd desde la cuenta %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 019db07fe..e9d05c8ff 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -50,9 +50,9 @@ es:
   are_you_sure: "¿Estás seguro?"
   aspect_memberships: 
     destroy: 
-      failure: "No se pudo eliminar a la persona del aspecto"
+      failure: "No se pudo quitar a la persona del aspecto"
       no_membership: "No se pudo encontrar a la persona seleccionada en ese aspecto"
-      success: "Persona eliminada con éxito del aspecto"
+      success: "Se ha quitado con éxito a la persona del aspecto"
   aspects: 
     add_to_aspect: 
       failure: "Error añadiendo el contacto al aspecto."
@@ -115,9 +115,9 @@ es:
       introduce_yourself: "Esta es tu entrada de novedades. Adelante, preséntate..."
       keep_us_running: "Haz que %{pod} vaya más rápido, ¡compra a nuestros servidores sus dosis de café mensual!"
       new_here: 
-        follow: "¡Sigue %{link} y da la bienvenida a los usuarios nuevos de Diaspora*!"
+        follow: "¡Sigue %{link} y da la bienvenida a Diaspora* a los nuevos usuarios!"
         learn_more: "Más información"
-        title: "Bienvenida a los usuarios nuevos"
+        title: "Bienvenida de nuevos usuarios"
       no_contacts: "No hay contactos"
       no_tags: "+ Encuentra una etiqueta a seguir"
       people_sharing_with_you: "Comparten contigo"
@@ -146,7 +146,7 @@ es:
     one: "1 aspecto"
     other: "%{count} aspectos"
     seed: 
-      acquaintances: "Conocid@s"
+      acquaintances: Conocid@s
       family: "Familia"
       friends: "Amigos"
       work: "Trabajo"
@@ -167,6 +167,13 @@ es:
       no_applications: "Aún no tienes registrada ninguna aplicación."
       revoke_access: "Revocar acceso"
   back: "Atrás"
+  blocks: 
+    create: 
+      failure: "No podría ignorar a ese usuario. #evasion"
+      success: "Bien, tú no verás a ese usuario en tus novedades otra vez. #silencio!"
+    destroy: 
+      failure: "No podría dejar de ignorar a ese usuario.  #evasion"
+      success: "¡Vamos a ver qué tiene que decir! #sayhello"
   bookmarklet: 
     explanation: "Publica en Diaspora* desde donde quieras agregando a tus marcadores %{link}."
     explanation_link_text: "este enlace"
@@ -179,7 +186,7 @@ es:
     many: "%{count} comentarios"
     new_comment: 
       comment: "Comentar"
-      commenting: "Comentando..."
+      commenting: Comentando...
     one: "1 comentario"
     other: "%{count} comentarios"
     two: "%{count} comentarios"
@@ -234,7 +241,7 @@ es:
     new: 
       abandon_changes: "¿Descartar los cambios?"
       send: "Enviar"
-      sending: "Enviando..."
+      sending: Enviando...
       subject: "asunto"
       to: "para"
     new_message: 
@@ -242,7 +249,7 @@ es:
     show: 
       delete: "Eliminar y bloquear conversación"
       reply: "responder"
-      replying: "Respondiendo..."
+      replying: Respondiendo...
   date: 
     formats: 
       birthday: "%d %B "
@@ -502,11 +509,12 @@ es:
       gender: "Género"
       in_aspects: "en aspectos"
       location: "Ubicación "
-      remove_contact: "eliminar contacto"
+      remove_contact: "quitar contacto"
       remove_from: "¿Eliminar a %{name} de %{aspect}?"
     show: 
       does_not_exist: "¡El usuario no existe!"
       has_not_shared_with_you_yet: "¡%{name} todavía no ha compartido ninguna publicación contigo!"
+      ignoring: "Estás ignorando todas las publicaciones de %{name}."
       incoming_request: "%{name} quisiera compartir contigo"
       mention: "Mención"
       message: "Mensaje"
@@ -538,7 +546,7 @@ es:
     new: 
       back_to_list: "Volver a la lista"
       new_photo: "Nueva foto"
-      post_it: "¡Publícalo!"
+      post_it: ¡Publícalo!
     new_photo: 
       empty: "{file} está vacío, por favor selecciona otros archivos."
       invalid_ext: "{file} tiene una extensión inválida. Sólo {extensions} están permitidas."
@@ -559,16 +567,13 @@ es:
     update: 
       error: "Error editando la foto."
       notice: "Foto actualizada con éxito."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "Las publicaciones de %{name} han sido ocultadas, y sus notificaciones silenciadas."
-      see_it_on_their_profile: "Si quieres ver novedades sobre esta publicación visita la página principal de %{name}."
   posts: 
     show: 
       destroy: "Eliminar"
       not_found: "Lo sentimos, no podemos encontrar ese comentario."
       permalink: "enlace permanente"
   previous: "anterior"
+  privacy: "Privacidad"
   profile: "Perfil"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ es:
       edit: "Editar %{name}"
       leave_blank: "(déjalo en blanco si no quieres cambiarlo)"
       password_to_confirm: "(necesitamos tu contraseña actual para confirmar los cambios)"
-      unhappy: "¿Triste?"
+      unhappy: ¿Triste?
       update: "Actualizar"
     new: 
       create_my_account: "¡Crear mi cuenta!"
@@ -637,7 +642,7 @@ es:
       existing: "Contactos existentes"
       manage_within: "Gestión de contactos"
     new_request_to_person: 
-      sent: "¡Enviado!"
+      sent: ¡Enviado!
   reshares: 
     comment_email_subject: "%{resharer} compartió la publicación de %{author}"
     create: 
@@ -685,11 +690,15 @@ es:
       not_on_diaspora: "Aún no en Diaspora*"
       resend: "reenviar"
   settings: "Configuración"
+  share_visibilites: 
+    update: 
+      post_hidden_and_muted: "La publicación de %{name} ha sido ocultada, y las notificaciones desactivadas."
+      see_it_on_their_profile: "Si quieres ver actualizaciones sobre esta publicación, visita el perfil de %{name}."
   shared: 
     add_contact: 
       add_new_contact: "Añade un nuevo contacto"
       create_request: "Encontrar por la dirección Diaspora*"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Introduce un nombre de usuario Diaspora*:"
       know_email: "¿Conoces sus direcciones de email? Podrías invitarles"
       your_diaspora_username_is: "Su nombre de usuario Diaspora* es: %{diaspora_handle}"
@@ -733,11 +742,11 @@ es:
       discard_post: "Descartar publicación"
       make_public: "hacer público"
       new_user_prefill: 
-        hello: "Eih, hola a todos. I'm #%{new_user_tag}."
+        hello: "Hola a todos, soy nuevo aquí. I'm #%{new_user_tag}."
         i_like: "Tengo interés en %{tags}."
         invited_by: "Gracias por la invitación, "
       post_a_message_to: "Publicar un mensaje en %{aspect}"
-      posting: "Publicando..."
+      posting: Publicando...
       publishing_to: "publicar en:"
       share: "Compartir"
       share_with: "compartir con"
@@ -749,7 +758,9 @@ es:
       connect_to_comment: "Conecta con este usuario para comentar en su publicación"
       currently_unavailable: "comentarios actualmente no disponibles"
       dislike: "No me gusta"
-      hide_and_mute: "Ocultado y Silenciado"
+      hide_and_mute: "Ocultar y silenciar publicación"
+      ignore_user: "Ignorar a %{name}"
+      ignore_user_description: "¿Ignorar y quitar al usuario de todos los aspectos?"
       like: "Me gusta"
       shared_with: "Compartir con: %{aspect_names}"
       unlike: "No me gusta"
@@ -804,7 +815,7 @@ es:
   tag_followings: 
     create: 
       failure: "Error al seguir a #%{name}. ¿Estás siguiéndolo ya?"
-      success: "¡Bien! Ahora ya sigues #%{name}."
+      success: "¡Sí! Ahora sigues #%{name}."
     destroy: 
       failure: "Error al dejar de seguir #%{name}. ¿Tal vez ya lo hiciste?"
       success: "¡Ay! Ya no sigues más #%{name}."
@@ -830,7 +841,7 @@ es:
       typical_userpage: "Una típica pagina de usuario de cubbi.es"
       via: "(vía %{link})"
       what_is_cubbies: "Cubbi.es es la primera aplicación de Diaspora en el mundo.  Es también la mejor forma de coleccionar fotos en línea."
-  undo: "¿Deshacer?"
+  undo: ¿Deshacer?
   username: "Nombre de usuario"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ es:
       hashtag_explanation: "Las etiquetas te permiten hablar sobre tus intereses así como seguirlos. Además es una forma genial de encontrar gente nueva en Diaspora. "
       hashtag_suggestions: "Prueba a seguir etiquetas como #art, #cine, #gif, etc."
       hooking_up_fb: "conecta tu cuenta de Facebook"
-      saved: "¡Guardado!"
+      saved: ¡Guardado!
       we_can_speed_things_up: "Podemos acelerar las cosas un poquito mediante"
       well_hello_there: "Bueno, ¿qué tal?"
       what_are_you_in_to: "¿Qué andas haciendo?"
@@ -883,6 +894,10 @@ es:
       signed_out: "Saliste de Diaspora*"
       simply_visit: "Simplemente visita"
       works_on_modern: "Funciona en todos los smartphones modernos"
+    privacy_settings: 
+      ignored_users: "Usuarios Ignorados"
+      stop_ignoring: "Dejar de ignorar"
+      title: "Configuración de Privacidad"
     public: 
       does_not_exist: "¡El usuario %{username} no existe!"
     update: 
@@ -901,4 +916,4 @@ es:
     no_person_constructed: "Ninguna persona pudo ser creada a partir de este hcard."
     not_enabled: "El webfinger parece no estar habilitado para el host de %{account}"
     xrd_fetch_failed: "Hubo un error al recibir el xrd desde la cuenta %{account}"
-  welcome: "¡Bienvenid@!"
+  welcome: ¡Bienvenid@!
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index bcc3ca0e7..8cee9faed 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -167,6 +167,13 @@ eu:
       no_applications: "Aplikaziorik ez duzu erregistratu oraindik."
       revoke_access: "Sarbidea Baliogabetu"
   back: "Atzera"
+  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: 
     explanation: "Diasporan partekatu %{link} erabiliz."
     explanation_link_text: "esteka hau"
@@ -179,7 +186,7 @@ eu:
     many: "%{count} iruzkin"
     new_comment: 
       comment: "Iruzkindu"
-      commenting: "Iruzkintzen..."
+      commenting: Iruzkintzen...
     one: "iruzkin 1"
     other: "%{count} iruzkin"
     two: "%{count} iruzkin"
@@ -226,15 +233,15 @@ eu:
         zero: "Mezu pribatu berririk ez"
     index: 
       create_a_new_message: "mezu berria sortu"
-      inbox: "Sarrera-ontzia"
-      message_inbox: "Sarrera-ontzia"
+      inbox: Sarrera-ontzia
+      message_inbox: Sarrera-ontzia
       new_message: "Mezu Berria"
       no_conversation_selected: "ez da aukeratu elkarrizketarik"
       no_messages: "mezurik ez"
     new: 
       abandon_changes: "Aldaketak bertan behera utzi?"
       send: "Bidali"
-      sending: "Bidaltzen..."
+      sending: Bidaltzen...
       subject: "gaia"
       to: "nori:"
     new_message: 
@@ -242,14 +249,14 @@ eu:
     show: 
       delete: "ezabatu eta giltzapetu elkarrizketa"
       reply: "erantzun"
-      replying: "Erantzuten..."
+      replying: Erantzuten...
   date: 
     formats: 
       birthday: "%B %d"
       birthday_with_year: "%Y (e)ko &B ren %d an"
       fullmonth_day: "%B %d"
   delete: "Ezabatu"
-  email: "E-posta"
+  email: E-posta
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Zuzendu honako akatsak eta saiatu berriro."
@@ -507,6 +514,7 @@ eu:
     show: 
       does_not_exist: "Pertsona hau ez dago!"
       has_not_shared_with_you_yet: "%{name}(e)k ez duzu mezurik partekatu zurekin oraindik!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name}(e)k zure adiskidea izan nahi du"
       mention: "Aipatu"
       message: "Mezu pribatua bidali"
@@ -559,16 +567,13 @@ eu:
     update: 
       error: "Huts argazkia aldatzean."
       notice: "Argazkia arrakastaz eguneratua."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "%{name}(r)en mezua izkutatua izan da, jakinarazpenak isildu dira."
-      see_it_on_their_profile: "Mezu honen eguneraketak ikusi nahi badituzu, bisitatu %{name}(r)en profila."
   posts: 
     show: 
       destroy: "Ezabatu"
       not_found: "Barkatu, baina ezin izan dugu mezu hori aurkitu."
       permalink: "permalink"
   previous: "aurrekoa"
+  privacy: "Privacy"
   profile: "Profila"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ eu:
       edit: "%{name} aldatu"
       leave_blank: "(hutsik utzi aldatu nahi ez baduzu)"
       password_to_confirm: "(zure pasahitza behar dugu zure aldaketak gauzatzeko)"
-      unhappy: "Goibel?"
+      unhappy: Goibel?
       update: "Eguneratu"
     new: 
       create_my_account: "Nire kontua sortu!"
@@ -637,7 +642,7 @@ eu:
       existing: "Adiskideak"
       manage_within: "Adiskideak kudeatu hemen:"
     new_request_to_person: 
-      sent: "bidalia!"
+      sent: bidalia!
   reshares: 
     comment_email_subject: "%{author}(r)en mezuaren %{resharer}(r)en birpartekaketa"
     create: 
@@ -685,11 +690,15 @@ eu:
       not_on_diaspora: "Diasporan oraindik ez"
       resend: "berbidali"
   settings: "Lehentasunak"
+  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: "Adiskide berria gehitu"
       create_request: "Diaspora IDaren arabera bilatu"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Diaspora erabiltzaile izena idatzi:"
       know_email: "Badakizu beraien e-posta? Gonbida itzazu!"
       your_diaspora_username_is: "Zure Diaspora helbidea honakoa da: %{diaspora_handle}"
@@ -737,7 +746,7 @@ eu:
         i_like: "%{tags} interesatzen zait."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "%{aspect}(e)n mezu bat partekatu"
-      posting: "Partekatzen..."
+      posting: Partekatzen...
       publishing_to: "hemen partekatzen:"
       share: "Partekatu"
       share_with: "honekin partekatu:"
@@ -750,6 +759,8 @@ eu:
       currently_unavailable: "iruzkinak tenporalki desgaituak"
       dislike: "Ez dut gustoko"
       hide_and_mute: "Ezkutatu eta Isildu"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Gustoko dut"
       shared_with: "%{aspect_names}(r)kin partekatua"
       unlike: "Ez dut gustoko"
@@ -830,7 +841,7 @@ eu:
       typical_userpage: "Cubbi.es erabiltzaile orrialde tipiko bat"
       via: "(%{link}(r)en bidez)"
       what_is_cubbies: "Cubbi.es munduko lehen Diaspora aplikazioa da. Argazkiak metatzeko biderik onena ere da."
-  undo: "Desegin?"
+  undo: Desegin?
   username: "Erabiltzailea"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ eu:
       hashtag_explanation: "Hashtagek gustoko dun jendea eta gauzak jarraitzea ahalbidetzen dizu.  Jende berria ezagutzeko bide on bat dira baita ere."
       hashtag_suggestions: "Saiatu #artea, #filmak, #gif, etab. bezalako etiketak jarraitzen"
       hooking_up_fb: "zure Facebook kontua lotzen"
-      saved: "Gordeta!"
+      saved: Gordeta!
       we_can_speed_things_up: "Gauzak azkartu ditzakegu"
       well_hello_there: "Beno, kaixo!"
       what_are_you_in_to: "Zelan zabiltza?"
@@ -883,6 +894,10 @@ eu:
       signed_out: "Diasporatik atera zara"
       simply_visit: "Bisitatu soilik"
       works_on_modern: "Smartphone berri guztietan dabil"
+    privacy_settings: 
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "%{username} erabiltzailerik ez dago!"
     update: 
@@ -901,4 +916,4 @@ eu:
     no_person_constructed: "Ezin izan da pertsona sortu hcard erabiliz."
     not_enabled: "webfinger ez dago aktibatuta %{account} zerbitzariarengatik"
     xrd_fetch_failed: "akatsa sortu da %{account}(e)tik xrd lortzean"
-  welcome: "Ongietorri!"
+  welcome: Ongietorri!
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 2bfe2548e..7b2e459f7 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -99,7 +99,7 @@ fi:
       diaspora_id: 
         content_1: "Diaspora-ID:si on:"
         content_2: "Anna se toisille ihmisille, jotta he voivat löytää sinut Diasporasta."
-        heading: "Diaspora-ID"
+        heading: Diaspora-ID
       donate: "Lahjoita"
       handle_explanation: "Tämä on Diaspora-osoitteesi. Voit käyttää sitä kuten sähköpostiosoitettasi. Sen avulla sinut tavoitetaan Diasporasta."
       help: 
@@ -167,6 +167,13 @@ fi:
       no_applications: "You haven't registered any applications yet."
       revoke_access: "Estä pääsy"
   back: "Takaisin"
+  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: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
@@ -179,7 +186,7 @@ fi:
     many: "%{count} kommenttia"
     new_comment: 
       comment: "Kommentoi"
-      commenting: "Kommentoidaan..."
+      commenting: Kommentoidaan...
     one: "1 kommentti"
     other: "%{count} kommenttia"
     two: "%{count} comments"
@@ -234,7 +241,7 @@ fi:
     new: 
       abandon_changes: "Hylkää muutokset?"
       send: "Lähetä"
-      sending: "Sending..."
+      sending: Sending...
       subject: "aihe"
       to: "vastaanottaja"
     new_message: 
@@ -242,7 +249,7 @@ fi:
     show: 
       delete: "poista ja estä tämä keskustelu"
       reply: "vastaa"
-      replying: "Replying..."
+      replying: Replying...
   date: 
     formats: 
       birthday: "%B %d"
@@ -410,7 +417,7 @@ fi:
       other: "%{actors} mainitsi sinut poistetussa viestissä."
       two: "%{actors} mentioned you in a deleted post."
       zero: "%{actors} mainitsi sinut poistetussa viestissä."
-    post: "viesti."
+    post: viesti.
     private_message: 
       few: "%{actors} lähetti sinulle viestin."
       many: "%{actors} lähetti sinulle viestin."
@@ -507,6 +514,7 @@ fi:
     show: 
       does_not_exist: "Henkilöä ei ole olemassa!"
       has_not_shared_with_you_yet: "%{name} ei ole jakanut vielä yhtään postausta kanssasi!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "Tämä henkilö on lähettänyt sinulle pyynnön."
       mention: "Mainitse"
       message: "Viesti"
@@ -538,7 +546,7 @@ fi:
     new: 
       back_to_list: "Takaisin listaan"
       new_photo: "Uusi kuva"
-      post_it: "lähetä!"
+      post_it: lähetä!
     new_photo: 
       empty: "{file} on tyhjä, valitse tiedostot uudelleen ilman kyseistä tiedostoa."
       invalid_ext: "{file} sisältää viallisen tiedostopäätteen. Tuetut muodot ovat {extensions}."
@@ -559,16 +567,13 @@ fi:
     update: 
       error: "Kuvan muokkaus epäonnistui."
       notice: "Kuva päivitettiin onnistuneesti."
-  post_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."
   posts: 
     show: 
       destroy: "Poista"
       not_found: "Valitettavasti viestiä ei löytynyt."
       permalink: "pysyvä linkki"
   previous: "edellinen"
+  privacy: "Privacy"
   profile: "Profiili"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ fi:
       edit: "Muokkaa %{name}"
       leave_blank: "(jätä tyhjäksi, mikäli et halua muuttaa)"
       password_to_confirm: "(tarvitsemme nykyisen salasanasi muutosten varmistusta varten)"
-      unhappy: "Epäonnellinen?"
+      unhappy: Epäonnellinen?
       update: "Päivitä"
     new: 
       create_my_account: "Create my account"
@@ -619,7 +624,7 @@ fi:
       sign_up_message: "Social Networking with a <3"
   requests: 
     create: 
-      sending: "Lähetetään..."
+      sending: Lähetetään...
       sent: "Haluat jakaa %{name} kanssa. Heidän pitäisi nähdä se kirjautuessaan seuraavan kerran Diasporaan."
     destroy: 
       error: "Ole hyvä, valitse näkymä!"
@@ -637,7 +642,7 @@ fi:
       existing: "Olemassa olevat kontaktit"
       manage_within: "Muokkaa kontakteja näkymässä"
     new_request_to_person: 
-      sent: "lähetetty!"
+      sent: lähetetty!
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -685,11 +690,15 @@ fi:
       not_on_diaspora: "Not yet on Diaspora"
       resend: "lähetä uudelleen"
   settings: "Asetukset"
+  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: "Lisää uusi kontakti"
       create_request: "Etsi Diaspora-tunnuksella"
-      diaspora_handle: "diaspora@handle.org"
+      diaspora_handle: diaspora@handle.org
       enter_a_diaspora_username: "Anna Diaspora-käyttäjätunnus:"
       know_email: "Tiedätkö heidän sähköpostiosoitteitansa? Kutsu heidät!"
       your_diaspora_username_is: "Diaspora-käyttäjätunnuksesi on: %{diaspora_handle}"
@@ -737,7 +746,7 @@ fi:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Lähetä viesti näkymään %{aspect}"
-      posting: "Lähetetään..."
+      posting: Lähetetään...
       publishing_to: "Julkaistaan: "
       share: "Jaa"
       share_with: "Jaa"
@@ -750,6 +759,8 @@ fi:
       currently_unavailable: "commenting currently unavailable"
       dislike: "En tykkää"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Tykkää"
       shared_with: "Jaa heidän kanssa: %{aspect_names}"
       unlike: "En tykkää"
@@ -824,13 +835,13 @@ fi:
       daniels_account: "Danielin Diaspora-käyttäjätili"
       log_in_with_diaspora_is_comming: "Pian voit lisätä uuden sovelluksen luomatta uutta käyttäjätiliä nykyisen tilisi lisäksi."
       love_to_try: "Kokeile sinäkin."
-      making_the_connection: "Yhteyttä muodostetaan"
+      making_the_connection: "Yhteyden muodostaminen"
       screenshot_explanation: "%{link1}. Tämä tila on linkitetty tänne: %{link2}."
       sign_up_today: "Liity tänään!"
       typical_userpage: "Esimerkki cubbi.es-käyttäjäsivusta"
       via: "(%{link} kautta)"
       what_is_cubbies: "Cubbi.es on maailman ensimmäinen Diaspora-sovellus. Se on myös paras tapa kerätä valokuvia verkossa."
-  undo: "Peruuta?"
+  undo: Peruuta?
   username: "Käyttäjätunnus"
   users: 
     confirm_email: 
@@ -864,14 +875,14 @@ fi:
       started_sharing: "...aloittaa jakamaan kanssasi?"
       stream_preferences: "Stream Preferences"
       your_email: "Sähköpostiosoitteesi"
-      your_handle: "Diaspora-tunnuksesi"
+      your_handle: Diaspora-tunnuksesi
     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: "Hashtagit mahdollistavat kiinnostuksen kohteistasi keskustelun ja niiden seuraamisen. Ne ovat myös hyvä keino ihmisten löytämiseen Diasporassa."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ fi:
       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: "Käyttäjää %{username} ei ole olemassa!"
     update: 
@@ -901,4 +916,4 @@ fi:
     no_person_constructed: "Yhtäkään henkilöä ei pystytty kokoamaan tältä hcard:ilta."
     not_enabled: "webfinger-palvelua ei ilmeisesti ole aktivoitu tilin, %{account}, isännälle"
     xrd_fetch_failed: "tapahtui virhe haettaessa xrd:tä käyttäjätilille %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 9f85296f2..43de16b7c 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -111,13 +111,13 @@ fr:
         here_to_help: "La communauté Diaspora est là !"
         need_help: "Besoin d'aide ?"
         satisfaction: "%{link} : Support par la communauté"
-        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Tutoriels créés par la communauté, how-to, et infos"
       introduce_yourself: "Ceci est votre flux. Rejoignez-nous et présentez-vous."
       keep_us_running: "Permettez à %{pod} de fonctionner rapidement et achetez une dose de café par mois à nos serveurs !"
       new_here: 
-        follow: "Follow %{link} and welcome new users to Diaspora*!"
-        learn_more: "Learn more"
-        title: "Welcome New Users"
+        follow: "Suivez %{link} et souhaitez la bienvenue aux nouveaux utilisateurs de Diaspora*!"
+        learn_more: "En savoir plus"
+        title: "Bienvenue Nouvel Utilisateur"
       no_contacts: "Aucun contact"
       no_tags: "+ Trouver un tag à suivre"
       people_sharing_with_you: "Personnes partageant avec vous"
@@ -167,6 +167,13 @@ fr:
       no_applications: "Vous n'avez pas encore enregistré d'application."
       revoke_access: "Révoquer l'accès"
   back: "Retour"
+  blocks: 
+    create: 
+      failure: "Je ne pouvais pas ignorer cet utilisateur.  #evasion"
+      success: "Très bien, vous ne verrez plus cet utilisateur dans votre flux. #silencio!"
+    destroy: 
+      failure: "I couldn't stop ignoring that user.  #evasion"
+      success: "Voyons ce qu'ils ont à dire ! #sayhello"
   bookmarklet: 
     explanation: "Publier sur Diaspora depuis n'importe où en ajoutant %{link} à vos marque-pages."
     explanation_link_text: "ce lien"
@@ -249,12 +256,12 @@ fr:
       birthday_with_year: "%d %B %Y"
       fullmonth_day: "%d %B"
   delete: "Supprimer"
-  email: "E-mail"
+  email: E-mail
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Corrigez les erreurs suivantes, puis réessayez."
       invalid_fields: "Champs invalides"
-  fill_me_out: "Remplissez-moi"
+  fill_me_out: Remplissez-moi
   find_people: "Rechercher des personnes ou des #tags"
   hide: "Masquer"
   home: 
@@ -291,7 +298,7 @@ fr:
       comma_seperated_plz: "Vous pouvez entrer plusieurs adresses de courrier électronique séparées par des virgules."
       if_they_accept_info: "s'ils acceptent, ils seront ajoutés à l'aspect dans lequel vous les avez invités."
       invite_someone_to_join: "Inviter quelqu'un à rejoindre Diaspora !"
-      language: "Language"
+      language: "Langage"
       personal_message: "Message personnel"
       resend: "Envoyer à nouveau"
       send_an_invitation: "Envoyer une invitation"
@@ -507,6 +514,7 @@ fr:
     show: 
       does_not_exist: "Cette personne n'existe pas !"
       has_not_shared_with_you_yet: "%{name} n'as pas encore partagé de messages avec vous !"
+      ignoring: "Vous ignorez tous les messages de %{name}."
       incoming_request: "%{name} désire partager avec vous"
       mention: "Mentionner"
       message: "Message"
@@ -559,16 +567,13 @@ fr:
     update: 
       error: "La modification de la photo a échoué."
       notice: "La photo a été mise à jour."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "Le message de %{name} a été masqué, et les notifications mises en sourdine."
-      see_it_on_their_profile: "Si vous voulez voir les mises à jour de ce message, visitez la page de profil de %{name}."
   posts: 
     show: 
       destroy: "Supprimer"
       not_found: "Désolé, nous n'avons pas pu trouver ce message."
       permalink: "lien permanent"
   previous: "précédent"
+  privacy: "Privacy"
   profile: "Profil"
   profiles: 
     edit: 
@@ -637,7 +642,7 @@ fr:
       existing: "Contacts existants"
       manage_within: "Gérer les contacts de"
     new_request_to_person: 
-      sent: "envoyée !"
+      sent: envoyée !
   reshares: 
     comment_email_subject: "Partage par %{resharer} d'un message de %{author}"
     create: 
@@ -685,11 +690,15 @@ fr:
       not_on_diaspora: "Pas encore sur Diaspora"
       resend: "envoyer à nouveau"
   settings: "Options"
+  share_visibilites: 
+    update: 
+      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
+      see_it_on_their_profile: "Si vous souhaitez voir des mises à jour de ce message, visitez la page de profil de %{name}."
   shared: 
     add_contact: 
       add_new_contact: "Ajouter un nouveau contact"
       create_request: "Rechercher par identifiant Diaspora"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Entrez un nom d'utilisateur Diaspora :"
       know_email: "Vous connaissez leur adresse de courrier électronique ? Vous devriez les inviter"
       your_diaspora_username_is: "Votre nom d'utilisateur Diaspora est : %{diaspora_handle}"
@@ -735,14 +744,14 @@ fr:
       new_user_prefill: 
         hello: "Bonjour tout le monde, je suis #%{new_user_tag}. "
         i_like: "Je suis intéressé par %{tags}."
-        invited_by: "Thanks for the invite, "
+        invited_by: "Merci pour l'invitation, "
       post_a_message_to: "Publier un message dans %{aspect}"
-      posting: "Publication…"
+      posting: Publication…
       publishing_to: "publication vers : "
       share: "Partager"
       share_with: "Partager avec"
       upload_photos: "Envoyer des photos"
-      whats_on_your_mind: "exprimez-vous"
+      whats_on_your_mind: exprimez-vous
     reshare: 
       reshare: "Repartager"
     stream_element: 
@@ -750,7 +759,9 @@ fr:
       currently_unavailable: "les commentaires sont actuellement indisponible"
       dislike: "Je n'aime pas"
       hide_and_mute: "Masquer et mettre en sourdine"
-      like: "J'aime"
+      ignore_user: "Ignorez %{name}"
+      ignore_user_description: "Ignorez et supprimer l'utilisateur de tous les aspects ?"
+      like: J'aime
       shared_with: "Partagé avec : %{aspect_names}"
       unlike: "Je n'aime plus"
       via: "via %{link}"
@@ -883,6 +894,10 @@ fr:
       signed_out: "Vous vous êtes déconnecté de Diaspora*"
       simply_visit: "Il suffit de visiter"
       works_on_modern: "Fonctionne sur tous les smartphones modernes"
+    privacy_settings: 
+      ignored_users: "Utilisateurs ignorés"
+      stop_ignoring: "Stop ignoring"
+      title: "Paramètres de confidentialité"
     public: 
       does_not_exist: "L'utilisateur %{username} n'existe pas !"
     update: 
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 9b1ea37f5..d4c019682 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -167,6 +167,13 @@ ga:
       no_applications: "You haven't registered any applications yet."
       revoke_access: "Revoke Access"
   back: "Ar ais"
+  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: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
@@ -234,7 +241,7 @@ ga:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
-      sending: "Sending..."
+      sending: Sending...
       subject: "subject"
       to: "to"
     new_message: 
@@ -242,7 +249,7 @@ ga:
     show: 
       delete: "delete and block conversation"
       reply: "reply"
-      replying: "Replying..."
+      replying: Replying...
   date: 
     formats: 
       birthday: "%B %d"
@@ -507,6 +514,7 @@ ga:
     show: 
       does_not_exist: "Person does not exist!"
       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: "Tá iarratas nua agat ón duine seo."
       mention: "Mention"
       message: "Message"
@@ -559,16 +567,13 @@ ga:
     update: 
       error: "Níor d'éirigh le aithrú an pictiúr."
       notice: "Pictiure Uaslódaithe."
-  post_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."
   posts: 
     show: 
       destroy: "Delete"
       not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   previous: "roimhhe"
+  privacy: "Privacy"
   profile: "Próifíl"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ ga:
       edit: "Athraigh %{name}"
       leave_blank: "(fág bánán muna bhfuil tú ag iarraidh é a athrú)"
       password_to_confirm: "(táimid ag iarradh do pasfhocal reatha chun do aithrithe a deimhniú)"
-      unhappy: "Míshásta?"
+      unhappy: Míshásta?
       update: "Nuashonrú"
     new: 
       create_my_account: "Create my account"
@@ -637,7 +642,7 @@ ga:
       existing: "Teagmháillí eiseadh"
       manage_within: "Bainistiú teagmháilí istigh"
     new_request_to_person: 
-      sent: "seolta!"
+      sent: seolta!
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -685,11 +690,15 @@ ga:
       not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   settings: "Socraithe"
+  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: "Find by Diaspora handle"
-      diaspora_handle: "diaspora@handle.org"
+      diaspora_handle: diaspora@handle.org
       enter_a_diaspora_username: "Líon isteach ainm úsáideora:"
       know_email: "Is agat a seola ríomhphost? Ba cheart duit cuireadh a sheola chucu"
       your_diaspora_username_is: "Is é %{diaspora_handle} do ainm úsáideora"
@@ -737,7 +746,7 @@ ga:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Chuir teachtaireach chuig %{aspect}"
-      posting: "Póstáil..."
+      posting: Póstáil...
       publishing_to: "publishing to: "
       share: "Roinn"
       share_with: "Roinn le %{aspect}"
@@ -750,6 +759,8 @@ ga:
       currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "I like this"
       shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
@@ -830,7 +841,7 @@ ga:
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-  undo: "Undo?"
+  undo: Undo?
   username: "Ainm úsáideora"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ ga:
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ ga:
       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: "Níl aon úsáidóira, %{username}!"
     update: 
@@ -901,4 +916,4 @@ ga:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "bhí fadbh ag fháil an xrd ón cúntas %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 1b0e2ab17..1accdbe46 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -35,7 +35,7 @@ he:
             email: 
               taken: "כבר תפוס."
             person: 
-              invalid: "שגוי."
+              invalid: שגוי.
             username: 
               invalid: "שגוי. אנו מרשים להשתמש באותיות, מספרים וקווים תחתיים בלבד."
               taken: "כבר תפוס."
@@ -47,7 +47,7 @@ he:
       unknown_person: "אדם לא ידוע"
       video_title: 
         unknown: "כותרת הווידאו אינה ידועה"
-  are_you_sure: "בבטחה?"
+  are_you_sure: בבטחה?
   aspect_memberships: 
     destroy: 
       failure: "אירע כשל בהסרת המשתמש מההיבט"
@@ -167,6 +167,13 @@ he:
       no_applications: "You haven't registered any applications yet."
       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: 
     explanation: "פרסום ישירות לדיאספורה מכל מקום על ידי הוספת %{link} לסימניות."
     explanation_link_text: "קישור זה"
@@ -234,7 +241,7 @@ he:
     new: 
       abandon_changes: "האם להתעלם מהשינויים?"
       send: "שליחה"
-      sending: "בשליחה..."
+      sending: בשליחה...
       subject: "נושא"
       to: "אל"
     new_message: 
@@ -242,14 +249,14 @@ he:
     show: 
       delete: "מחיקה וחסימת הדיון"
       reply: "תגובה"
-      replying: "Replying..."
+      replying: Replying...
   date: 
     formats: 
       birthday: "ה־%d ב%B"
       birthday_with_year: "ה־%d ב%B %Y"
       fullmonth_day: "ה־%d ב%B"
   delete: "מחיקה"
-  email: "דוא״ל"
+  email: דוא״ל
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "יש לתקן את השגיאות הבאות ולנסות שוב."
@@ -440,7 +447,7 @@ he:
       two: "%{actors} started sharing with you."
       zero: "%{actors} החלו לשתף אתך."
   notifier: 
-    a_post_you_shared: "רשומה."
+    a_post_you_shared: רשומה.
     click_here: "יש ללחוץ כאן"
     comment_on_post: 
       reply: "שליחת תגובה או צפייה ברשומה של %{name} >"
@@ -507,6 +514,7 @@ he:
     show: 
       does_not_exist: "אדם זה אינו קיים!"
       has_not_shared_with_you_yet: "%{name} עדיין לא שיתף אתך רשומות כלל!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "ברצונו/ה של %{name} לשתף אתך"
       mention: "אזכור"
       message: "הודעה"
@@ -538,7 +546,7 @@ he:
     new: 
       back_to_list: "חזרה לרשימה"
       new_photo: "תמונה חדשה"
-      post_it: "פרסום!"
+      post_it: פרסום!
     new_photo: 
       empty: "הקובץ {file} ריק, נא לבחור שוב קבצים אבל בלעדיו."
       invalid_ext: "לקובץ {file} יש סיומת בלתי מוכרת. רק הסיומות {extensions} מותרות לשימוש."
@@ -559,16 +567,13 @@ he:
     update: 
       error: "אירע כשל בעריכת התמונה."
       notice: "התמונה עודכנה בהצלחה."
-  post_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."
   posts: 
     show: 
       destroy: "מחיקה"
       not_found: "לא ניתן למצוא רשומה זו, עמך הסליחה."
       permalink: "קישור קבוע"
   previous: "הקודמת"
+  privacy: "Privacy"
   profile: "פרופיל"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ he:
       edit: "עריכת %{name}"
       leave_blank: "(יש להשאיר ריק אם אין ברצונך לשנות זאת)"
       password_to_confirm: "(נזדקק לססמה הנוכחית שלך כדי לאמת את השינויים)"
-      unhappy: "בבאסה?"
+      unhappy: בבאסה?
       update: "עדכון"
     new: 
       create_my_account: "יצירת החשבון שלי"
@@ -637,7 +642,7 @@ he:
       existing: "אנשי הקשר הקיימים"
       manage_within: "ניהול אנשי קשר בתוך"
     new_request_to_person: 
-      sent: "נשלחה!"
+      sent: נשלחה!
   reshares: 
     comment_email_subject: "שיתוף מחדש על ידי %{resharer} לרשומה של %{author}"
     create: 
@@ -685,11 +690,15 @@ he:
       not_on_diaspora: "עדיין לא בדיאספורה"
       resend: "שליחה שוב"
   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: "הוספת איש קשר חדש"
       create_request: "חיפוש לפי שם משתמש בדיאספורה"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "נא להזין שם משתמש בדיאספורה:"
       know_email: "כתובת הדוא״ל שלהם ידועה לך? עליך להזמין אותם"
       your_diaspora_username_is: "שם המשתמש שלך בדיאספורה הוא: %{diaspora_handle}"
@@ -708,9 +717,9 @@ he:
       logged_in_as: "נכנסת בשם %{name}"
       your_aspects: "ההיבטים שלך"
     invitations: 
-      by_email: "בדוא״ל"
+      by_email: בדוא״ל
       dont_have_now: "אין לך כרגע, אך יתווספו לך הזמנות בקרוב!"
-      from_facebook: "מ־Facebook"
+      from_facebook: מ־Facebook
       invitations_left: "%{count} נותרו"
       invite_someone: "שליחת הזמנה"
       invite_your_friends: "הזמנת החברים שלך"
@@ -737,7 +746,7 @@ he:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "פרסום הודעה אל %{aspect}"
-      posting: "פרסום..."
+      posting: פרסום...
       publishing_to: "פרסום אל:"
       share: "שיתוף"
       share_with: "שיתוף עם"
@@ -750,6 +759,8 @@ he:
       currently_unavailable: "commenting currently unavailable"
       dislike: "לא אהבתי את זה"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "אהבתי"
       shared_with: "משותף עם: %{aspect_names}"
       unlike: "לא אהבתי"
@@ -871,7 +882,7 @@ he:
       hashtag_explanation: "תגיות מאפשרות לך לשוחח על ולעקוב אחר תחומי העניין שלך. זוהי גם דרך מצוינת למצוא אנשים בדיאספורה."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ he:
       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} אינו קיים!"
     update: 
@@ -901,4 +916,4 @@ he:
     no_person_constructed: "לא ניתן להרכיב איש קשר מ־hcard זה."
     not_enabled: "נראה כי webfinger אינו פעיל עבור המארח של %{account}"
     xrd_fetch_failed: "אירעה שגיאה בקבלת ה־xrd מהחשבון %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 70a701dfb..6bcc31636 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -29,13 +29,13 @@ hu:
         reshare: 
           attributes: 
             root_guid: 
-              taken: "Már újra megosztottad ezt a bejegyzést!"
+              taken: "Egyszer már újraosztottad ezt a bejegyzést!"
         user: 
           attributes: 
             email: 
               taken: "már foglalt."
             person: 
-              invalid: "érvénytelen."
+              invalid: érvénytelen.
             username: 
               invalid: "érvénytelen. Csak betűk, számok és aláhúzás használható."
               taken: "már foglalt."
@@ -65,8 +65,8 @@ hu:
       edit_aspect: "Szerkesztés %{name}"
       select_all: "Mindent kijelöl"
     aspect_stream: 
-      stay_updated: "Stay Updated"
-      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
+      stay_updated: "Légy naprakész"
+      stay_updated_explanation: "A Hírfolyamodban megjelennek az ismerőseid bejegyzései, követett címkéid és a Reflektorfényben szereplő személyek bejegyzései."
     contacts_not_visible: "A csoporttagok nem láthatják egymást."
     contacts_visible: "A csoport tagjai láthatják egymást."
     create: 
@@ -111,13 +111,13 @@ hu:
         here_to_help: "A Diaspora közösség megérkezett!"
         need_help: "Segítségre van szüksége?"
         satisfaction: "%{link}: Közösségi támogatás"
-        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
-      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Közösségi leckék, módszerek, hírek"
+      introduce_yourself: "Ez a te Hírfolyamod. Kezdd is el gyorsan egy bemutatkozással."
       keep_us_running: "Hogy gyors maradjon ez a pod (%{pod}), kérlek adományozz pénzt."
       new_here: 
-        follow: "Follow %{link} and welcome new users to Diaspora*!"
-        learn_more: "Learn more"
-        title: "Welcome New Users"
+        follow: "Kövesd %{link} és üdvözöld az új Diaspora* felhasználókat!"
+        learn_more: "Tudj meg többet"
+        title: "Sziasztok új felhasználók"
       no_contacts: "Nincs ismerős"
       no_tags: "+ #címke keresése"
       people_sharing_with_you: "Ismerőseid"
@@ -126,7 +126,7 @@ hu:
         content: "A következő szolgáltatásokhoz tudsz kapcsolódni:"
         heading: "Összekapcsolt szolgáltatások"
       unfollow_tag: "Követés leállítása #%{tag}"
-      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
+      welcome_to_diaspora: "Üdv a Diaspora* közösségi oldalon %{name}!"
       your_aspects: "Csoportjaid"
     many: "%{count} csoport"
     move_contact: 
@@ -137,9 +137,9 @@ hu:
       create: "Létrehoz"
       name: "Név"
     no_contacts_message: 
-      community_spotlight: "community spotlight"
-      or_spotlight: "Or you can share with %{link}"
-      try_adding_some_more_contacts: "Ismerősöket kereshetsz (fent) vagy hívhatsz meg (jobbra)."
+      community_spotlight: "reflektorfényben"
+      or_spotlight: "Vagy meg tudod osztani %{link}"
+      try_adding_some_more_contacts: "Ismerősöket kereshetsz vagy hívhatsz meg."
       you_should_add_some_more_contacts: "Adj hozzá pár ismerőst."
     no_posts_message: 
       start_talking: "Mindenki hallgat. Kezd el te a beszélgetést."
@@ -153,7 +153,7 @@ hu:
     selected_contacts: 
       manage_your_aspects: "Csoportok kezelése"
       no_contacts: "Itt még nincs ismerősöd."
-      view_all_community_spotlight: "See all community spotlight"
+      view_all_community_spotlight: "Összes Reflektorfényben"
       view_all_contacts: "Összes kapcsolat"
     show: 
       edit_aspect: "csoport szerkesztése"
@@ -167,6 +167,13 @@ hu:
       no_applications: "Még nem regisztráltál egyetlen alkalmazást sem."
       revoke_access: "Hozzáférés visszavonása"
   back: "Vissza"
+  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: 
     explanation: "Küldj bejegyzést a Diaspora-ra bárhonnan, csak mentsd el ezt könyvjelzőként:"
     explanation_link_text: "ez a link"
@@ -179,7 +186,7 @@ hu:
     many: "%{count} hozzászólás"
     new_comment: 
       comment: "Hozzászólás"
-      commenting: "Hozzászólok.."
+      commenting: Hozzászólok..
     one: "1 hozzászólás"
     other: "%{count} hozzászólás"
     two: "%{count} hozzászólás"
@@ -242,7 +249,7 @@ hu:
     show: 
       delete: "beszélgetés törlése és blokkolása"
       reply: "válasz"
-      replying: "Válaszolás..."
+      replying: Válaszolás...
   date: 
     formats: 
       birthday: "%B %d"
@@ -291,7 +298,7 @@ hu:
       comma_seperated_plz: "Megadhatsz több e-mail címet is vesszővel elválasztva."
       if_they_accept_info: "Ha elfogadják felkérésed, akkor belekerülnek abba a csoportba amelyikbe meghívtad őket."
       invite_someone_to_join: "Hívj meg valakit, hogy csatlakozzon a Diaspora-hoz!"
-      language: "Language"
+      language: "Nyelv"
       personal_message: "Személyes üzenet"
       resend: "Újraküld"
       send_an_invitation: "Küldj egy meghívót"
@@ -383,12 +390,12 @@ hu:
       mark_all_as_read: "Mind megjelölése olvasottként"
       notifications: "Értesítések"
     liked: 
-      few: "%{actors} kedveli a bejegyzésedet: %{post_link}."
-      many: "%{actors} kedveli a bejegyzésedet: %{post_link}."
-      one: "%{actors} kedveli a bejegyzésedet: %{post_link}."
-      other: "%{actors} kedveli a bejegyzésedet: %{post_link}."
-      two: "%{actors} épp most olvasta és tetszett neki: %{post_link}."
-      zero: "%{actors} kedveli a bejegyzésedet: %{post_link}."
+      few: "%{actors} kedveli a %{post_link}edet."
+      many: "%{actors} kedveli a %{post_link}edet."
+      one: "%{actors} kedveli a %{post_link}edet."
+      other: "%{actors} kedveli a %{post_link}edet."
+      two: "%{actors} kedveli a %{post_link}edet."
+      zero: "%{actors} kedveli a %{post_link}edet."
     liked_post_deleted: 
       few: "%{actors} kedveli a már törölt bejegyzésedet."
       many: "%{actors} kedveli a már törölt bejegyzésedet."
@@ -419,12 +426,12 @@ hu:
       two: "%{actors} küldött egy üzenetet."
       zero: "%{actors} üzenetet küldött neked."
     reshared: 
-      few: "%{actors} újraosztotta a bejegyzésedet: %{post_link}."
-      many: "%{actors} újraosztotta a bejegyzésedet: %{post_link}."
+      few: "%{actors} újraosztotta a %{post_link}edet."
+      many: "%{actors} újraosztotta a %{post_link}edet."
       one: "%{actors} újraosztotta a bejegyzésedet: %{post_link}."
-      other: "%{actors} újraosztotta a bejegyzésedet: %{post_link}."
-      two: "%{actors} megosztotta ezt: %{post_link}."
-      zero: "%{actors} újraosztotta a bejegyzésedet: %{post_link}."
+      other: "%{actors} újraosztotta a %{post_link}edet."
+      two: "%{actors} újraosztotta a %{post_link}edet."
+      zero: "%{actors} újraosztotta a %{post_link}edet."
     reshared_post_deleted: 
       few: "%{actors} újraosztotta a már törölt bejegyzésedet."
       many: "%{actors} újraosztotta a már törölt bejegyzésedet."
@@ -507,6 +514,7 @@ hu:
     show: 
       does_not_exist: "Személy nem létezik!"
       has_not_shared_with_you_yet: "%{name} még nem oszt meg veled semmit."
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name} megosztást kezdeményezett veled."
       mention: "Megemlít"
       message: "Üzenet"
@@ -538,7 +546,7 @@ hu:
     new: 
       back_to_list: "Vissza a listához"
       new_photo: "Új kép"
-      post_it: "Elküld!"
+      post_it: Elküld!
     new_photo: 
       empty: "{file} egy üres fájl, válaszd ki újra a fájlokat {file} kivételéve!"
       invalid_ext: "{file} érvénytelen kiterjesztés. Csak {extensions} kiterjesztések megengedettek."
@@ -559,16 +567,13 @@ hu:
     update: 
       error: "Nem sikerült szerkeszteni a képet."
       notice: "Kép szerkesztése sikerült."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "%{name} bejegyzései el lettek rejtve, az értesítések pedig ki lettek kapcsolva."
-      see_it_on_their_profile: "Ha követni akarod ennek a bejegyzésnek a frissítéseit, akkor látogass el %{name} oldalára."
   posts: 
     show: 
       destroy: "Töröl"
       not_found: "Bocsi, de nem találjuk a bejegyzést."
       permalink: "permalink"
   previous: "előző"
+  privacy: "Privacy"
   profile: "Profil"
   profiles: 
     edit: 
@@ -610,13 +615,13 @@ hu:
       unhappy: "Elégedetlen vagy?"
       update: "Frissítés"
     new: 
-      create_my_account: "Fiók létrehozása"
+      create_my_account: "Fiók létrehozása!"
       enter_email: "Írd be az e-mail címed"
       enter_password: "Írj be egy jelszót"
       enter_password_again: "Ugyanazt a jelszót írd amit az előbb"
       enter_username: "Válassz egy felhasználónevet (csak angol betű, szám és aláhúzás engedett)"
-      join_the_movement: "Csatlakozz!"
-      sign_up_message: "Social Networking with a <3"
+      join_the_movement: Csatlakozz!
+      sign_up_message: "Közösségi Hálózat <3"
   requests: 
     create: 
       sending: "Küldés"
@@ -637,7 +642,7 @@ hu:
       existing: "Meglévő kapcsolatok"
       manage_within: "Kapcsolatok kezelése"
     new_request_to_person: 
-      sent: "elküldve!"
+      sent: elküldve!
   reshares: 
     comment_email_subject: "%{resharer} újraosztotta %{author} bejegyzését"
     create: 
@@ -658,8 +663,8 @@ hu:
   search: "Keresés"
   services: 
     create: 
-      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
-      failure: "Authentication failed."
+      already_authorized: "Egy %{diaspora_id} nevű felhasználó, már hitelesítette ezt a %{service_name} fiókot."
+      failure: "A hitelesítés sikertelen."
       success: "A hitelesítés sikeres."
     destroy: 
       success: "Sikeresen megsemmisítetted a kapcsolódást."
@@ -685,11 +690,15 @@ hu:
       not_on_diaspora: "Még nincs Diaspora fiókja"
       resend: "újraküld"
   settings: "Beállítások"
+  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: "Új ismerős"
       create_request: "Keresés Diaspora azonosító alapján"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Diaspora felhasználónév:"
       know_email: "Tudod az e-mail címüket? Hívd meg őket!"
       your_diaspora_username_is: "Diaspora felhasználóneved: %{diaspora_handle}"
@@ -710,7 +719,7 @@ hu:
     invitations: 
       by_email: "emailben"
       dont_have_now: "Nincs több meghívód, de hamarosan kapsz még!"
-      from_facebook: "Facebook-ról"
+      from_facebook: Facebook-ról
       invitations_left: "%{count} maradt"
       invite_someone: "Hívj meg valakit"
       invite_your_friends: "Hívd meg a barátaidat"
@@ -719,25 +728,27 @@ hu:
     notification: 
       new: "Új %{type} %{from}-tól/től"
     public_explain: 
-      control_your_audience: "Control your Audience"
+      control_your_audience: "Közönséged beállítása"
       logged_in: "bejelentkezve ide: %{service}"
       manage: "kapcsolódó szolgáltatások kezelése"
-      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
+      new_user_welcome_message: |-
+          Használj kettőskeresztet(#), hogy felcímkézd a bejegyzésedet. Címkék alapján találhatsz veled azonos érdeklődésű embereket.
+          A kukac(@) jellel, pedig személyeket említhetsz meg a bejegyzésedben.
       outside: "A publikus üzeneteket a Diaspora-n kívüli személyek is láthatják."
-      share: "Share"
+      share: "Megoszt"
       title: "Kapcsolódó szolgáltatások beállítása"
-      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
+      visibility_dropdown: "Használd ezt a legördülő menüt, hogy módosítsd a bejegyzésed láthatóságát."
     publisher: 
       all: "összes"
       all_contacts: "összes kapcsolat"
       discard_post: "Bejegyzés elvetése"
       make_public: "nyilvánossá tesz"
       new_user_prefill: 
-        hello: "Hey everyone, I'm #%{new_user_tag}. "
-        i_like: "I'm interested in %{tags}."
-        invited_by: "Thanks for the invite, "
+        hello: "Sziasztok, én #%{new_user_tag} vagyok. "
+        i_like: "Engem ezek érdekelnek: %{tags}."
+        invited_by: "Köszi a meghívásért,"
       post_a_message_to: "Bejegyzés küldése ennek a csoportnak: %{aspect}"
-      posting: "Küldés..."
+      posting: Küldés...
       publishing_to: "Publikálás:"
       share: "Megosztás"
       share_with: "megosztás vele"
@@ -746,10 +757,12 @@ hu:
     reshare: 
       reshare: "Újraosztás"
     stream_element: 
-      connect_to_comment: "Connect to this user to comment on their post"
-      currently_unavailable: "commenting currently unavailable"
+      connect_to_comment: "Csatlakozz ehhez a személyhez, hogy hozzászólhass a bejegyzéseihez"
+      currently_unavailable: "a hozzászólás jelenleg felfüggesztve"
       dislike: "Nem tetszik"
       hide_and_mute: "Elrejt és elnémít"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Tetszik"
       shared_with: "Megosztva vele: %{aspect_names}"
       unlike: "Nem tetszik"
@@ -776,38 +789,38 @@ hu:
     show_more_comments: "Még %{number} hozzászólás"
   streams: 
     aspects: 
-      title: "Your Aspects"
-    aspects_stream: "Aspects"
-    commented_on: "commented on"
-    community_spotlight_stream: "Community Spotlight"
+      title: "Csoportjaid"
+    aspects_stream: "Csoportok"
+    commented_on: "hozzászólt"
+    community_spotlight_stream: "Reflektorfényben"
     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"
-    mentioned_stream: "@Mentions"
+      add_a_tag: "Címke hozzáadása"
+      contacts_title: "Emberek, akiket ugyanezek a címkék érdekelnek"
+      follow: "Követ"
+      title: "#követett címkék"
+    followed_tags_stream: "#Követett címkék"
+    mentioned_stream: "@említéses"
     mentions: 
       contacts_title: "Emberek, akik megemlítettek"
-      title: "Említéseid"
+      title: "@Megemlítettek"
     multi: 
-      contacts_title: "People in your Stream"
-      title: "Stream"
-    posted: "posted"
+      contacts_title: "Személyek a Hírfolyamodban"
+      title: "Hírfolyam"
+    posted: "elküldve"
     public: 
       contacts_title: "Friss poszterek"
       title: "Publikus tevékenység"
-    recently: "recently:"
+    recently: "Utoljára:"
     tags: 
-      contacts_title: "Emberek, akik ezeket a címkéket keresték"
+      contacts_title: "Emberek, akik ezeket a címkéket követik"
       title: "Bejegyzés megjelölve: %{tags}"
   tag_followings: 
     create: 
-      failure: "Követés sikertelen: #%{name}"
-      success: "Figyelemmel követed: #%{name}"
+      failure: "#%{name} követése nem sikerült. Talán már eddig is követted?"
+      success: "Hurrá! Figyelemmel követed #%{name} dolgait."
     destroy: 
-      failure: "Hiba a követés leállítáésakor #%{name}"
-      success: "Követés leállítva: #%{name}"
+      failure: "Hiba #%{name} követésének leállításakor. Talán már nem is követed őt? "
+      success: "Már nem követed őt: #%{name}"
   tags: 
     show: 
       follow: "Címke követése"
@@ -830,7 +843,7 @@ hu:
       typical_userpage: "Tipikus 'cubbi.es' oldal"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es a világ első Diaspora* applikációja. Egyben a legjobb mód az online fotógyűjtésre!"
-  undo: "Visszavonod?"
+  undo: Visszavonod?
   username: "Felhasználónév"
   users: 
     confirm_email: 
@@ -851,38 +864,42 @@ hu:
       edit_account: "Fiók szerkesztése"
       email_awaiting_confirmation: "Aktivációs link elküldve ide: %{unconfirmed_email}. Amíg nem erősíted meg az új címed, addig a régit használjuk: %{email}."
       export_data: "Adatok exportálása"
-      getting_started: "New User Prefrences"
+      getting_started: "Új felhasználó beállítások"
       liked: "... valakinek tetszik a bejegyzésed?"
       mentioned: "...meg vagy említve egy bejegyzésben?"
       new_password: "Új jelszó"
-      photo_export_unavailable: "Photo exporting currently unavailable"
+      photo_export_unavailable: "Fénykép exportálás jelenleg felfüggesztve"
       private_message: "...privát üzenetet kaptál?"
       receive_email_notifications: "Email értesítést kérek amikor..."
       reshared: "...valaki újraosztotta a bejegyzésedet?"
-      show_community_spotlight: "Show Community Spotlight in Stream?"
-      show_getting_started: "Re-enable Getting Started"
+      show_community_spotlight: "Mutassa a Reflektorfényben szereplő dolgokat a Hírfolyamodban?"
+      show_getting_started: "\"Kezdő lépések\" újra engedélyezése"
       started_sharing: "...valaki megoszt veled?"
-      stream_preferences: "Stream Preferences"
+      stream_preferences: "Hírfolyam tulajdonságai"
       your_email: "E-mail címed"
       your_handle: "Diaspora azonosítód"
     getting_started: 
-      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
+      awesome_take_me_to_diaspora: "Remek! Irány a Diaspora*"
       community_welcome: "A Diaspora közösség üdvözöl a fedélzeten!"
       hashtag_explanation: "A #címkék segítenek egy bizonyos téma megtalálásában, így akár új kapcsolatokra is szert tehetsz."
-      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
-      hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
-      we_can_speed_things_up: "We can speed things up a bit by"
-      well_hello_there: "Well, hello there!"
-      what_are_you_in_to: "What are you into?"
-      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
-      who_are_you: "Who are you?"
+      hashtag_suggestions: "Kövess pár téged érdeklő címkét. Például: #művészet, #fényképezés, #webdesign"
+      hooking_up_fb: "Kapcsold ide a Facebook fiókoadt"
+      saved: Mentve!
+      we_can_speed_things_up: "Tudjuk gyorsítani a dolgokat egy kicsi"
+      well_hello_there: "Nos, üdv itt!"
+      what_are_you_in_to: "Mi érdekel?"
+      what_facebook_does: "ide. Így itt is megjelenik a képed, neved és engedélyezed a közös bejegyzéseket."
+      who_are_you: "Ki vagy?"
     logged_out: 
       go_mobile: "Maradj kapcsolatban."
       on_your_mobile_device: "a mobiltelefonodon, hogy hozzáférj a Diaspora* mobil verzióhoz."
       signed_out: "Kijelentkeztél a Diaspora* rendszerből"
       simply_visit: "Tekintsd meg"
       works_on_modern: "Az összes modern okostelefonon működik"
+    privacy_settings: 
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "%{username} nem létezik!"
     update: 
@@ -891,8 +908,8 @@ hu:
       language_not_changed: "Nyelv megváltoztatása nem sikerült"
       password_changed: "A jelszó megváltozott, már bejelentkezhetsz az új jelszóval."
       password_not_changed: "Jelszó megváltoztatása nem sikerült"
-      settings_not_updated: "Settings update failed"
-      settings_updated: "Settings updated"
+      settings_not_updated: "Beállítások frissítése sikertelen"
+      settings_updated: "Beállítások frissítve"
       unconfirmed_email_changed: "Email megváltozott, aktiváció szükséges."
       unconfirmed_email_not_changed: "Email módosítás sikertelen"
   webfinger: 
@@ -901,4 +918,4 @@ hu:
     no_person_constructed: "Ebből a hCard névjegyből nem lehet személyt létrehozni."
     not_enabled: "a webfinger nincs engedélyezve %{account} kiszolgálóján"
     xrd_fetch_failed: "%{account} fiókjából nem sikerült az XRD kiolvasása"
-  welcome: "Welcome!"
+  welcome: Üdv!
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index e3b610fd1..03134a458 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -167,6 +167,13 @@ id:
       no_applications: "You haven't registered any applications yet."
       revoke_access: "Revoke Access"
   back: "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: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
@@ -179,7 +186,7 @@ id:
     many: "%{count} comments"
     new_comment: 
       comment: "Komentar"
-      commenting: "Commenting..."
+      commenting: Commenting...
     one: "1 comment"
     other: "%{count} comments"
     two: "%{count} comments"
@@ -234,7 +241,7 @@ id:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
-      sending: "Sending..."
+      sending: Sending...
       subject: "subject"
       to: "to"
     new_message: 
@@ -242,14 +249,14 @@ id:
     show: 
       delete: "delete and block conversation"
       reply: "reply"
-      replying: "Replying..."
+      replying: Replying...
   date: 
     formats: 
       birthday: "%B %d"
       birthday_with_year: "%B %d %Y"
       fullmonth_day: "%B %d"
   delete: "Hapus"
-  email: "E-mail"
+  email: E-mail
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Perbaiki kesalahan berikut dan coba lagi."
@@ -507,6 +514,7 @@ id:
     show: 
       does_not_exist: "Orang tidak ada!"
       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: "You have an incoming request from this person."
       mention: "Mention"
       message: "Message"
@@ -538,7 +546,7 @@ id:
     new: 
       back_to_list: "Kembali ke Daftar"
       new_photo: "Foto Baru"
-      post_it: "posting!"
+      post_it: posting!
     new_photo: 
       empty: "{file} is empty, please select files again without it."
       invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
@@ -559,16 +567,13 @@ id:
     update: 
       error: "Gagal mengubah foto."
       notice: "Foto berhasil diperbarui."
-  post_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."
   posts: 
     show: 
       destroy: "Delete"
       not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   previous: "previous"
+  privacy: "Privacy"
   profile: "Profile"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ id:
       edit: "Edit %{name}"
       leave_blank: "(leave blank if you don't want to change it)"
       password_to_confirm: "(we need your current password to confirm your changes)"
-      unhappy: "Unhappy?"
+      unhappy: Unhappy?
       update: "Update"
     new: 
       create_my_account: "Create my account"
@@ -619,7 +624,7 @@ id:
       sign_up_message: "Social Networking with a <3"
   requests: 
     create: 
-      sending: "Sending..."
+      sending: Sending...
       sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
     destroy: 
       error: "Silahkan pilih sebuah aspek!"
@@ -637,7 +642,7 @@ id:
       existing: "Existing contacts"
       manage_within: "Manage contacts within"
     new_request_to_person: 
-      sent: "sent!"
+      sent: sent!
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -685,6 +690,10 @@ id:
       not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   settings: "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"
@@ -737,7 +746,7 @@ id:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Post a message to %{aspect}"
-      posting: "Posting..."
+      posting: Posting...
       publishing_to: "publishing to: "
       share: "Bagikan"
       share_with: "Share with %{aspect}"
@@ -750,6 +759,8 @@ id:
       currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "I like this"
       shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
@@ -830,7 +841,7 @@ id:
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-  undo: "Undo?"
+  undo: Undo?
   username: "Username"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ id:
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ id:
       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: "User %{username} does not exist!"
     update: 
@@ -901,4 +916,4 @@ id:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 8792c3d6e..61f1add00 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -167,6 +167,13 @@ is:
       no_applications: "You haven't registered any applications yet."
       revoke_access: "Revoke Access"
   back: "Til baka"
+  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: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
@@ -234,7 +241,7 @@ is:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
-      sending: "Sending..."
+      sending: Sending...
       subject: "subject"
       to: "to"
     new_message: 
@@ -242,7 +249,7 @@ is:
     show: 
       delete: "delete and block conversation"
       reply: "reply"
-      replying: "Replying..."
+      replying: Replying...
   date: 
     formats: 
       birthday: "%B %d"
@@ -507,6 +514,7 @@ is:
     show: 
       does_not_exist: "Manneskjan er ekki til!"
       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} vill samnýta með þér"
       mention: "Mention"
       message: "Message"
@@ -559,23 +567,20 @@ is:
     update: 
       error: "Ekki tókst að breyta mynd."
       notice: "Velheppnuð uppfærsla á mynd. "
-  post_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."
   posts: 
     show: 
       destroy: "Delete"
       not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   previous: "fyrra"
+  privacy: "Privacy"
   profile: "Síðan mín"
   profiles: 
     edit: 
       allow_search: "Leyfa fólki að leita að þér á Díaspora"
       edit_profile: "Breyta síðunni minni"
       first_name: "Fornafn"
-      last_name: "Kenninafn/Eftirnafn"
+      last_name: Kenninafn/Eftirnafn
       update_profile: "Uppfæra síðuna mína"
       your_bio: "Ferilskrá þín"
       your_birthday: "Fæðingardagur þinn"
@@ -607,7 +612,7 @@ is:
       edit: "Breyta %{name}"
       leave_blank: "(Skildu eftir autt ef þú vilt ekki gera breytingu)"
       password_to_confirm: "(Við þurfum núverandi lykilorðið þitt til að staðfesta breytingar þínar)"
-      unhappy: "Óhamingjusamur?"
+      unhappy: Óhamingjusamur?
       update: "Uppfæra"
     new: 
       create_my_account: "Create my account"
@@ -637,7 +642,7 @@ is:
       existing: "Núverandi tengiliðir"
       manage_within: "Umsjón tengiliða innan"
     new_request_to_person: 
-      sent: "sent!"
+      sent: sent!
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -685,11 +690,15 @@ is:
       not_on_diaspora: "Not yet on Diaspora"
       resend: "endursenda"
   settings: "Stillingar"
+  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: "Finna fólk eftir Díaspora netfangi"
-      diaspora_handle: "diaspora@handle.org"
+      diaspora_handle: diaspora@handle.org
       enter_a_diaspora_username: "Skrifaðu notandanafn hjá Diaspora:"
       know_email: "Veistu netföngin þeirra? Þú ættir að senda þeim boðsmiða"
       your_diaspora_username_is: "Þitt Diaspora notandanafn er: %{diaspora_handle}"
@@ -737,7 +746,7 @@ is:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Skrifa skilaboð til %{aspect}"
-      posting: "Senda..."
+      posting: Senda...
       publishing_to: "publishing to: "
       share: "Deila"
       share_with: "deila með"
@@ -750,6 +759,8 @@ is:
       currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "I like this"
       shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
@@ -830,7 +841,7 @@ is:
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-  undo: "Undo?"
+  undo: Undo?
   username: "Notandanafn"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ is:
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ is:
       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: "Notandinn %{username} er ekki til!"
     update: 
@@ -901,4 +916,4 @@ is:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 0e3f48170..480865c86 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -103,7 +103,7 @@ it:
       donate: "Fai una donazione"
       handle_explanation: "Questo è il tuo ID su Diaspora. Lo puoi dare alle persone per farti trovare, come un indirizzo email."
       help: 
-        do_you: "Vuoi..."
+        do_you: Vuoi...
         email_feedback: "Se preferisci, manda un feedback via %{link}"
         feature_suggestion: "...proporre un'idea? %{link}"
         find_a_bug: "...segnalare un problema? %{link}"
@@ -111,13 +111,13 @@ it:
         here_to_help: "La comunità di Diaspora è qui!"
         need_help: "Hai bisogno di aiuto?"
         satisfaction: "%{link}: Per avere supporto dalla comunità"
-        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Per le ultime notizie, le guide e i suggerimenti della comunità"
       introduce_yourself: "Questo è il tuo stream. Sali a bordo e presentati!"
       keep_us_running: "Mantieni %{pod} veloce e scattante, la tua donazione mensile sarà il caffè per i nostri server!"
       new_here: 
-        follow: "Follow %{link} and welcome new users to Diaspora*!"
-        learn_more: "Learn more"
-        title: "Welcome New Users"
+        follow: "Segui %{link} per dare il benvenuto ai nuovi iscritti su Diaspora*!"
+        learn_more: "Scopri i dettagli"
+        title: "Saluta i nuovi arrivati"
       no_contacts: "Nessun contatto"
       no_tags: "+ Cerca tag da seguire"
       people_sharing_with_you: "Persone in condivisione con te"
@@ -167,6 +167,13 @@ it:
       no_applications: "Non hai ancora autorizzato nessuna applicazione."
       revoke_access: "Revoca l'autorizzazione"
   back: "Indietro"
+  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: 
     explanation: "Condividi su Diaspora in qualsiasi momento aggiungendo come segnalibro %{link}."
     explanation_link_text: "questo link"
@@ -291,7 +298,7 @@ it:
       comma_seperated_plz: "Puoi inserire più indirizzi email separati da virgole."
       if_they_accept_info: "se loro accettano, saranno aggiunti all'aspetto in cui li hai invitati."
       invite_someone_to_join: "Invita qualcuno ad entrare in Diaspora!"
-      language: "Language"
+      language: "Lingua"
       personal_message: "Messaggio privato"
       resend: "Invia di nuovo"
       send_an_invitation: "Invia un invito"
@@ -507,6 +514,7 @@ it:
     show: 
       does_not_exist: "La persona non esiste!"
       has_not_shared_with_you_yet: "%{name} non ha ancora condiviso nessun post con te!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name} vuole condividere con te"
       mention: "Menziona"
       message: "Messaggio"
@@ -538,7 +546,7 @@ it:
     new: 
       back_to_list: "Torna all'elenco"
       new_photo: "Nuova foto"
-      post_it: "condividi!"
+      post_it: condividi!
     new_photo: 
       empty: "{file} è vuoto, per favore seleziona di nuovo i file senza di esso."
       invalid_ext: "{file} ha un'estensione non valida. Sono permesse soltanto {extensions}."
@@ -559,16 +567,13 @@ it:
     update: 
       error: "Modifica della foto fallita."
       notice: "Foto aggiornata con successo."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "Il post di %{name} è stato nascosto e le notifiche disattivate."
-      see_it_on_their_profile: "Se vuoi vedere i nuovi commenti su questo post, visita il profilo di %{name}."
   posts: 
     show: 
       destroy: "Elimina"
       not_found: "Ci scusiamo, non possiamo trovare il post."
       permalink: "permalink"
   previous: "precedente"
+  privacy: "Privacy"
   profile: "Profilo"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ it:
       edit: "Modifica %{name}"
       leave_blank: "(lascialo bianco se non vuoi modificarlo)"
       password_to_confirm: "(abbiamo bisogno della tua password attuale per confermare le tue modifiche)"
-      unhappy: "Triste?"
+      unhappy: Triste?
       update: "Aggiorna"
     new: 
       create_my_account: "Crea il mio account!"
@@ -685,11 +690,15 @@ it:
       not_on_diaspora: "Non ancora su Diaspora"
       resend: "reinvia"
   settings: "Impostazioni"
+  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: "Aggiungi un nuovo contatto"
       create_request: "Cerca per ID"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Inserisci un nome utente Diaspora"
       know_email: "Conosci i loro indirizzi email? Dovresti invitarli"
       your_diaspora_username_is: "Il tuo ID è: %{diaspora_handle}"
@@ -735,7 +744,7 @@ it:
       new_user_prefill: 
         hello: "Ciao a tutti, eccomi qui! Hey everyone, I'm #%{new_user_tag}"
         i_like: "I miei interessi sono %{tags}."
-        invited_by: "Thanks for the invite, "
+        invited_by: "Grazie per l'invito, "
       post_a_message_to: "Invia un messaggio a %{aspect}"
       posting: "Invio in corso..."
       publishing_to: "stai condividendo con: "
@@ -750,6 +759,8 @@ it:
       currently_unavailable: "al momento non è possibile commentare"
       dislike: "Non mi piace"
       hide_and_mute: "Nascondi e disattiva le notifiche"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Mi piace"
       shared_with: "Condiviso con: %{aspect_names}"
       unlike: "Annulla"
@@ -804,10 +815,10 @@ it:
   tag_followings: 
     create: 
       failure: "Errore nel tentativo di seguire: #%{name}. Lo stai già seguendo?"
-      success: "Fantastico! Hai iniziato a seguire: #%{name}"
+      success: "Fantastico! Hai iniziato a seguire #%{name}."
     destroy: 
-      failure: "Non è stato possibile smettere di seguire: #%{name}"
-      success: "Hai smesso di seguire: #%{name}"
+      failure: "Non è stato possibile smettere di seguire #%{name}. Avevi già smesso di seguirlo?"
+      success: "Peccato! Hai appena smesso di seguire #%{name}."
   tags: 
     show: 
       follow: "Segui #%{tag}"
@@ -830,7 +841,7 @@ it:
       typical_userpage: "Una tipica pagina utente di cubbi.es"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es è la prima applicazione Diaspora nel mondo.  E' anche il miglior modo di raccogliere le foto online."
-  undo: "Annullare?"
+  undo: Annullare?
   username: "Nome Utente"
   users: 
     confirm_email: 
@@ -871,9 +882,9 @@ it:
       hashtag_explanation: "I tag ti permettono di parlare dei tuoi interessi e di seguirli. Sono anche un ottimo sistema per trovare nuove persone su Diaspora."
       hashtag_suggestions: "Prova a seguire tag tipo #art, #movies, #gif, ecc."
       hooking_up_fb: "abbinando il tuo account Facebook"
-      saved: "Salvato!"
+      saved: Salvato!
       we_can_speed_things_up: "Possiamo velocizzare le cose"
-      well_hello_there: "Ciao!"
+      well_hello_there: Ciao!
       what_are_you_in_to: "Di cosa ti interessi?"
       what_facebook_does: "a Diaspora. Così scaricherai nome e foto, oltre ad abilitare l'invio dei post anche verso l'altro social network."
       who_are_you: "Chi sei?"
@@ -883,6 +894,10 @@ it:
       signed_out: "Hai appena lasciato Diaspora*"
       simply_visit: "Visita semplicemente"
       works_on_modern: "Funziona su tutti i moderni smartphone"
+    privacy_settings: 
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "L'utente %{username} non esiste!"
     update: 
@@ -901,4 +916,4 @@ it:
     no_person_constructed: "Non si può risalire a neanche una persona da questa hcard."
     not_enabled: "webfinger non attivo sull'host di %{account}"
     xrd_fetch_failed: "impossibile recuperare il xrd dall'account %{account}"
-  welcome: "Benvenuto!"
+  welcome: Benvenuto!
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index ea1307818..702be0e88 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -17,15 +17,15 @@ ja:
         contact: 
           attributes: 
             person_id: 
-              taken: "このユーザの他の連絡先と重複してはいけません。"
+              taken: このユーザの他の連絡先と重複してはいけません。
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "既に使われています。"
+              taken: 既に使われています。
         request: 
           attributes: 
             from_id: 
-              taken: "既存のリクエストと重複しています。"
+              taken: 既存のリクエストと重複しています。
         reshare: 
           attributes: 
             root_guid: 
@@ -33,30 +33,30 @@ ja:
         user: 
           attributes: 
             email: 
-              taken: "既に使われています。"
+              taken: 既に使われています。
             person: 
-              invalid: "無効です。"
+              invalid: 無効です。
             username: 
               invalid: "is invalid. We only allow letters, numbers, and underscores"
-              taken: "既に使われています。"
+              taken: 既に使われています。
   ago: "%{time}前"
   all_aspects: "全てのアスペクト"
   application: 
     helper: 
-      diaspora_alpha: "ダイアスポラ＊アルファ"
+      diaspora_alpha: ダイアスポラ＊アルファ
       unknown_person: "不明な連絡先"
       video_title: 
         unknown: "不明な動画タイトル"
-  are_you_sure: "本当にいいですか。"
+  are_you_sure: 本当にいいですか。
   aspect_memberships: 
     destroy: 
-      failure: "連絡先をアスペクトから除外するのに失敗しました。"
+      failure: 連絡先をアスペクトから除外するのに失敗しました。
       no_membership: "選択した連絡先はそのアスペクト内に見つかりませんでした"
-      success: "連絡先をアスペクトから除外するのに成功しました。"
+      success: 連絡先をアスペクトから除外するのに成功しました。
   aspects: 
     add_to_aspect: 
-      failure: "連絡先をアスペクトに追加するのに失敗しました。"
-      success: "連絡先をアスペクトに追加するのに成功しました。"
+      failure: 連絡先をアスペクトに追加するのに失敗しました。
+      success: 連絡先をアスペクトに追加するのに成功しました。
     aspect_contacts: 
       done_editing: "編集完了"
     aspect_listings: 
@@ -67,10 +67,10 @@ ja:
     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: "このアスペクトの連絡先はお互いの存在が確認できます。"
+    contacts_not_visible: このアスペクトの連絡先はお互いの存在が確認できません。
+    contacts_visible: このアスペクトの連絡先はお互いの存在が確認できます。
     create: 
-      failure: "アスペクトを作成するのに失敗しました。"
+      failure: アスペクトを作成するのに失敗しました。
       success: "新しいアスペクト「%{name}」を作成しました。"
     destroy: 
       failure: "%{name}に連絡先が残っているので削除できません。"
@@ -79,17 +79,17 @@ ja:
       add_existing: "既存の連絡先を追加する"
       aspect_list_is_not_visible: "このアスペクトのメンバー一覧はメンバーへ公開されていません"
       aspect_list_is_visible: "このアスペクトのメンバー一覧はメンバーに公開されています"
-      confirm_remove_aspect: "このアスペクトを本当に削除していいですか。"
+      confirm_remove_aspect: このアスペクトを本当に削除していいですか。
       done: "完了"
-      make_aspect_list_visible: "アスペクトのメンバー一覧を公開しますか。"
+      make_aspect_list_visible: アスペクトのメンバー一覧を公開しますか。
       remove_aspect: "このアスペクトを削除する"
       rename: "名前の変更"
       update: "更新"
       updating: "更新中"
     few: "アスペクト%{count}集"
     helper: 
-      are_you_sure: "本当にこのアスペクトを削除しますか。"
-      aspect_not_empty: "アスペクトは空ではありません。"
+      are_you_sure: 本当にこのアスペクトを削除しますか。
+      aspect_not_empty: アスペクトは空ではありません。
       remove: "削除"
     index: 
       cubbies: 
@@ -101,7 +101,7 @@ ja:
         content_2: "Give it to anyone and they'll be able to find you on Diaspora."
         heading: "Diaspora ID"
       donate: "Donate"
-      handle_explanation: "これがあなたのハンドル名です。メールアドレスと同じようにほかの人に教えて、ダイアスポラで連絡を取り合うことができます。"
+      handle_explanation: これがあなたのハンドル名です。メールアドレスと同じようにほかの人に教えて、ダイアスポラで連絡を取り合うことができます。
       help: 
         do_you: "Do you:"
         email_feedback: "%{link} your feedback, if you prefer"
@@ -132,7 +132,7 @@ ja:
     move_contact: 
       error: "連絡先の移動にエラーが発生しました： %{inspect}"
       failure: "連絡先を移動させるのに失敗しました：%{inspect}"
-      success: "連絡先を新しいアスペクトに移動させました。"
+      success: 連絡先を新しいアスペクトに移動させました。
     new: 
       create: "Create"
       name: "Name"
@@ -142,7 +142,7 @@ ja:
       try_adding_some_more_contacts: "You can search (top) or invite (right) more contacts."
       you_should_add_some_more_contacts: "You should add some more contacts!"
     no_posts_message: 
-      start_talking: "投稿がまだありません。会話を始めましょう！"
+      start_talking: 投稿がまだありません。会話を始めましょう！
     one: "アスペクト1集"
     other: "アスペクト%{count}集"
     seed: 
@@ -167,26 +167,33 @@ ja:
       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: 
     explanation: "このリンクをお気に入りに登録すると、どこからでも%{link}できます。"
     explanation_link_text: "ダイアスポラに投稿"
     heading: "Diaspora Bookmarklet"
     post_something: "ダイアスポラに投稿"
-    post_success: "投稿完了！ウィンドウを閉じます。"
+    post_success: 投稿完了！ウィンドウを閉じます。
   cancel: "取り消す"
   comments: 
     few: "コメント%{count}件"
     many: "コメント%{count}件"
     new_comment: 
       comment: "コメント"
-      commenting: "コメント投稿中…"
+      commenting: コメント投稿中…
     one: "コメント1件"
     other: "コメント%{count}件"
     two: "%{count} comments"
     zero: "コメントがありません"
   contacts: 
     create: 
-      failure: "連絡先を作成するのに失敗しました。"
+      failure: 連絡先を作成するのに失敗しました。
     few: "連絡先%{count}件"
     index: 
       add_a_new_aspect: "Add a new aspect"
@@ -215,7 +222,7 @@ ja:
       fail: "Invalid message"
       sent: "メッセージを送信しました"
     destroy: 
-      success: "会話を削除するのに成功しました。"
+      success: 会話を削除するのに成功しました。
     helper: 
       new_messages: 
         few: "新着メッセージ%{count}通"
@@ -234,15 +241,15 @@ ja:
     new: 
       abandon_changes: "Abandon changes?"
       send: "送信する"
-      sending: "Sending..."
+      sending: Sending...
       subject: "件名"
       to: "宛先"
     new_message: 
       fail: "Invalid message"
     show: 
-      delete: "会話を削除して、ブロックする"
+      delete: 会話を削除して、ブロックする
       reply: "返信"
-      replying: "Replying..."
+      replying: Replying...
   date: 
     formats: 
       birthday: "%m月%d日"
@@ -252,51 +259,51 @@ ja:
   email: "メール"
   error_messages: 
     helper: 
-      correct_the_following_errors_and_try_again: "次の問題を解決してからやり直してください。"
+      correct_the_following_errors_and_try_again: 次の問題を解決してからやり直してください。
       invalid_fields: "不正なフィールド名"
   fill_me_out: "記入して"
   find_people: "Find people"
   hide: "隠す"
   home: 
     show: 
-      already_account: "アカウントは既にお持ちですか。"
+      already_account: アカウントは既にお持ちですか。
       choice: "自由"
-      choice_explanation: "ダイアスポラ＊で連絡先をアスペクトと呼ばれる集団に分けることができます。アスペクトはダイアスポラ＊独特の機能で、これによってあなたの写真、話、冗談などが目的の知り合いだけに共有されることが保証されます。"
-      learn_about_host: "ダイアスポラ＊サーバーの立ち上げ方をお教えします。"
+      choice_explanation: ダイアスポラ＊で連絡先をアスペクトと呼ばれる集団に分けることができます。アスペクトはダイアスポラ＊独特の機能で、これによってあなたの写真、話、冗談などが目的の知り合いだけに共有されることが保証されます。
+      learn_about_host: ダイアスポラ＊サーバーの立ち上げ方をお教えします。
       login_here: "ここからログイン"
       ownership: "所有"
-      ownership_explanation: "写真は自分の持ち物で、シェアしたいからと言って権利を譲る必要はありません。ダイアスポラでシェアしたものでも所有権は保全されますので、自由に配給などを制御することができます。"
-      share_what_you_want: "好きなものだけを、好きな人だけに。"
+      ownership_explanation: 写真は自分の持ち物で、シェアしたいからと言って権利を譲る必要はありません。ダイアスポラでシェアしたものでも所有権は保全されますので、自由に配給などを制御することができます。
+      share_what_you_want: 好きなものだけを、好きな人だけに。
       simplicity: "平易"
-      simplicity_explanation: "ダイアスポラ＊は簡潔に共有を可能にしながら、プライバシーも簡潔にします。ダイアスポラ＊は根本的なプライバシー主義で、プロフィールを保護するために何ページもの複雑な設定を使いこなす必要はありません。"
+      simplicity_explanation: ダイアスポラ＊は簡潔に共有を可能にしながら、プライバシーも簡潔にします。ダイアスポラ＊は根本的なプライバシー主義で、プロフィールを保護するために何ページもの複雑な設定を使いこなす必要はありません。
       tagline_first_half: "好きなことだけ共有する"
-      tagline_second_half: "好きな人に。"
+      tagline_second_half: 好きな人に。
   invitations: 
     a_facebook_user: "A Facebook user"
     check_token: 
-      not_found: "招待トークンが見つかりません。"
+      not_found: 招待トークンが見つかりません。
     create: 
-      already_contacts: "既に連絡先として登録しています。"
-      already_sent: "既に招待しました。"
-      no_more: "招待権がもう残っていません。"
+      already_contacts: 既に連絡先として登録しています。
+      already_sent: 既に招待しました。
+      no_more: 招待権がもう残っていません。
       own_address: "You can't send an invitation to your own address."
-      rejected: "次のメールアドレスに問題が発生しました："
-      sent: "次の人々に招待を送信しました："
+      rejected: 次のメールアドレスに問題が発生しました：
+      sent: 次の人々に招待を送信しました：
     edit: 
       accept_your_invitation: "Accept your invitation"
       your_account_awaits: "Your account awaits!"
     new: 
       already_invited: "招待済み"
       aspect: "アスペクト"
-      comma_seperated_plz: "複数のメールアドレスはコンマ区切りで入力可能です。"
-      if_they_accept_info: "招待を承諾してくれた場合、招待時のアスペクトに追加されます。"
-      invite_someone_to_join: "知り合いをダイアスポラ＊に招待しましょう！"
+      comma_seperated_plz: 複数のメールアドレスはコンマ区切りで入力可能です。
+      if_they_accept_info: 招待を承諾してくれた場合、招待時のアスペクトに追加されます。
+      invite_someone_to_join: 知り合いをダイアスポラ＊に招待しましょう！
       language: "Language"
       personal_message: "個人メッセージ"
       resend: "再送する"
       send_an_invitation: "招待を送信する"
       send_invitation: "招待を送信する"
-      to: "宛先："
+      to: 宛先：
   layouts: 
     application: 
       powered_by: "POWERED BY DIASPORA*"
@@ -319,17 +326,17 @@ ja:
       people_dislike_this: 
         few: "これが嫌いな人：%{count}人"
         many: "これが嫌いな人：%{count}人"
-        one: "これが嫌いな人：1人"
+        one: これが嫌いな人：1人
         other: "これが嫌いな人：%{count}人"
         two: "%{count} dislikes"
-        zero: "これが嫌いな人：0人"
+        zero: これが嫌いな人：0人
       people_like_this: 
         few: "これが好きな人：%{count}人"
         many: "これが好きな人：%{count}人"
-        one: "これが好きな人：1人"
+        one: これが好きな人：1人
         other: "これが好きな人：%{count}人"
         two: "%{count} likes"
-        zero: "これが好きな人：0人"
+        zero: これが好きな人：0人
       people_like_this_comment: 
         few: "%{count} likes"
         many: "%{count} likes"
@@ -410,7 +417,7 @@ ja:
       other: "%{actors} mentioned you in a deleted 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."
@@ -453,7 +460,7 @@ ja:
       liked: "%{name} has just liked your post: "
       view_post: "View post >"
     mentioned: 
-      mentioned: "さんは投稿であなたをメンションしました。"
+      mentioned: さんは投稿であなたをメンションしました。
       subject: "%{name}さんはダイアスポラ＊であなたをメンションしました。"
     private_message: 
       reply_to_or_view: "Reply to or view this conversation >"
@@ -461,13 +468,13 @@ ja:
       reshared: "%{name} just reshared your post"
       view_post: "View post >"
     single_admin: 
-      admin: "ダイアスポラ＊管理者"
-      subject: "ダイアスポラ＊アカウントの重要なお知らせ："
+      admin: ダイアスポラ＊管理者
+      subject: ダイアスポラ＊アカウントの重要なお知らせ：
     started_sharing: 
       sharing: "has started sharing with you!"
       subject: "%{name} has started sharing with you on Diaspora*"
       view_profile: "View %{name}'s profile"
-    thanks: "ありがとうございます。"
+    thanks: ありがとうございます。
     to_change_your_notification_settings: "to change your notification settings"
   ok: "了解"
   or: "または"
@@ -483,10 +490,10 @@ ja:
       people_on_pod_are_aware_of: "人のポッドメンバーが知っています"
       results_for: "%{params}の検索結果"
     index: 
-      couldnt_find_them_send_invite: "見つかりませんでしたか。招待メールを送信しましょう！"
-      no_one_found: "…1人も見つかりませんでした。"
-      no_results: "何かを検索しないといけません。"
-      results_for: "検索結果："
+      couldnt_find_them_send_invite: 見つかりませんでしたか。招待メールを送信しましょう！
+      no_one_found: …1人も見つかりませんでした。
+      no_results: 何かを検索しないといけません。
+      results_for: 検索結果：
     many: "%{count}人の連絡先"
     one: "1人の連絡先"
     other: "%{count}人の連絡先"
@@ -494,7 +501,7 @@ ja:
       add_contact: "連絡先を追加する"
       already_connected: "既につながっています"
       pending_request: "共有の承認待ち"
-      thats_you: "あなた自身です！"
+      thats_you: あなた自身です！
     profile_sidebar: 
       bio: "略歴"
       born: "誕生日"
@@ -505,8 +512,9 @@ ja:
       remove_contact: "連絡先を削除する"
       remove_from: "%{name}さんを%{aspect}から除外しますか。"
     show: 
-      does_not_exist: "存在しない連絡先です！"
+      does_not_exist: 存在しない連絡先です！
       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: "メッセージ"
@@ -516,7 +524,7 @@ ja:
       return_to_aspects: "アスペクトページに戻る"
       see_all: "全て表示"
       start_sharing: "共有を開始する"
-      to_accept_or_ignore: "承諾するか無視するか決めて下さい。"
+      to_accept_or_ignore: 承諾するか無視するか決めて下さい。
     sub_header: 
       add_some: "add some"
       edit: "edit"
@@ -528,47 +536,44 @@ ja:
   photos: 
     comment_email_subject: "%{name}'s photo"
     create: 
-      integrity_error: "写真のアップロードに失敗しました。確かに画像ファイルだったのでしょうか。"
-      runtime_error: "写真のアップロードに失敗しました。シートベルトはしっかりとお締めでしょうか。"
-      type_error: "写真のアップロードに失敗しました。確かに画像ファイルを添付しましたか。"
+      integrity_error: 写真のアップロードに失敗しました。確かに画像ファイルだったのでしょうか。
+      runtime_error: 写真のアップロードに失敗しました。シートベルトはしっかりとお締めでしょうか。
+      type_error: 写真のアップロードに失敗しました。確かに画像ファイルを添付しましたか。
     destroy: 
-      notice: "写真を削除しました。"
+      notice: 写真を削除しました。
     edit: 
       editing: "編集中"
     new: 
       back_to_list: "一覧に戻る"
       new_photo: "新しい写真"
-      post_it: "投稿する！"
+      post_it: 投稿する！
     new_photo: 
       empty: "{file}は空です。取り除いてファイルを選択しなおしてください。"
       invalid_ext: "{file}のファイル名は不正です。{extensions}以外の拡張子は使えません。"
       size_error: "{file}は大きすぎます。ファイルサイズの上限は{sizeLimit}です。"
     new_profile_photo: 
       or_select_one: "或いは既存のから選択する"
-      upload: "新しいプロフィール写真をアップロードする！"
+      upload: 新しいプロフィール写真をアップロードする！
     photo: 
       view_all: "%{name}の写真をすべてみる"
     show: 
       collection_permalink: "コレクションのパーマリンク"
       delete_photo: "写真を削除する"
       edit: "編集"
-      edit_delete_photo: "写真の説明を編集する／写真を削除する"
+      edit_delete_photo: 写真の説明を編集する／写真を削除する
       make_profile_photo: "プロフィール写真にする"
       show_original_post: "Show original post"
       update_photo: "写真を更新する"
     update: 
-      error: "写真の編集に失敗しました。"
-      notice: "写真の更新に成功しました。"
-  post_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."
+      error: 写真の編集に失敗しました。
+      notice: 写真の更新に成功しました。
   posts: 
     show: 
       destroy: "Delete"
       not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   previous: "前へ"
+  privacy: "Privacy"
   profile: "プロフィール"
   profiles: 
     edit: 
@@ -599,22 +604,22 @@ ja:
     two: "%{count} reactions"
     zero: "0 reactions"
   registrations: 
-    closed: "このダイアスポラ＊ポッドでは新規登録を受け付けていません。"
+    closed: このダイアスポラ＊ポッドでは新規登録を受け付けていません。
     create: 
-      success: "ダイアスポラの新規登録が完了しました！"
+      success: ダイアスポラの新規登録が完了しました！
     edit: 
       cancel_my_account: "アカウント登録を取り消す"
       edit: "%{name}を編集する"
-      leave_blank: "（変更したくない場合は空白のままにしてください）"
-      password_to_confirm: "（確認のため、現パスワードも必要です）"
-      unhappy: "何かご不満ですか。"
+      leave_blank: （変更したくない場合は空白のままにしてください）
+      password_to_confirm: （確認のため、現パスワードも必要です）
+      unhappy: 何かご不満ですか。
       update: "更新"
     new: 
       create_my_account: "Create my account"
-      enter_email: "メールアドレスを入力してください。"
-      enter_password: "パスワードを入力してください。"
-      enter_password_again: "もう一度同じパスワードを入力してください。"
-      enter_username: "ユーザ名を選択してください。（半角英数字とアンダーバーのみ）"
+      enter_email: メールアドレスを入力してください。
+      enter_password: パスワードを入力してください。
+      enter_password_again: もう一度同じパスワードを入力してください。
+      enter_username: ユーザ名を選択してください。（半角英数字とアンダーバーのみ）
       join_the_movement: "Join the movement!"
       sign_up_message: "Social Networking with a <3"
   requests: 
@@ -622,22 +627,22 @@ ja:
       sending: "送信中"
       sent: "共有リクエストを送信しました。%{name}さんは次回のログイン時に見るでしょう。"
     destroy: 
-      error: "アスペクトを選択して下さい。"
-      ignore: "共有リクエストを無視しました。"
-      success: "現在共有しています。"
+      error: アスペクトを選択して下さい。
+      ignore: 共有リクエストを無視しました。
+      success: 現在共有しています。
     helper: 
       new_requests: 
         few: "新リクエスト%{count}件！"
         many: "新リクエスト%{count}件！"
-        one: "新リクエスト！"
+        one: 新リクエスト！
         other: "新リクエスト%{count}件！"
         two: "%{count} new requests!"
         zero: "新リクエスト無し"
     manage_aspect_contacts: 
       existing: "現在の連絡先"
-      manage_within: "次のアスペクトの連絡先を管理："
+      manage_within: 次のアスペクトの連絡先を管理：
     new_request_to_person: 
-      sent: "送信しました！"
+      sent: 送信しました！
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -660,11 +665,11 @@ ja:
     create: 
       already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
       failure: "Authentication failed."
-      success: "認証に成功しました。"
+      success: 認証に成功しました。
     destroy: 
-      success: "認証を削除するのに成功しました。"
+      success: 認証を削除するのに成功しました。
     failure: 
-      error: "サービスへ接続中にエラーが発生しました。"
+      error: サービスへ接続中にエラーが発生しました。
     finder: 
       no_friends: "No Facebook friends found."
       service_friends: "%{service} Friends"
@@ -674,24 +679,28 @@ ja:
       connect_to_twitter: "ツイッターに接続する"
       disconnect: "切断"
       edit_services: "サービスを編集する"
-      logged_in_as: "ログイン済みユーザ名："
+      logged_in_as: ログイン済みユーザ名：
       no_services: "You have not connected any services yet."
       really_disconnect: "%{service}から切断しますか。"
     inviter: 
-      click_link_to_accept_invitation: "招待を承諾するにはこのリンクにクリックしてください。"
-      join_me_on_diaspora: "ダイアスポラ＊に参加しませんか。"
+      click_link_to_accept_invitation: 招待を承諾するにはこのリンクにクリックしてください。
+      join_me_on_diaspora: ダイアスポラ＊に参加しませんか。
     remote_friend: 
       invite: "招待"
       not_on_diaspora: "Not yet on Diaspora"
       resend: "再送"
   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@handle.org"
-      enter_a_diaspora_username: "ダイアスポラのユーザ名を入力してください。"
-      know_email: "メールアドレスをご存じなら招待しましょう！"
+      diaspora_handle: diaspora@handle.org
+      enter_a_diaspora_username: ダイアスポラのユーザ名を入力してください。
+      know_email: メールアドレスをご存じなら招待しましょう！
       your_diaspora_username_is: "あなたのハンドル名は%{diaspora_handle}です。"
     aspect_dropdown: 
       add_to_aspect: "Add to aspect"
@@ -709,7 +718,7 @@ ja:
       your_aspects: "アスペクト"
     invitations: 
       by_email: "メールで"
-      dont_have_now: "現在、招待権が残っていません。少々お待ち下さい。"
+      dont_have_now: 現在、招待権が残っていません。少々お待ち下さい。
       from_facebook: "Facebookから"
       invitations_left: "（残り%{count}回）"
       invite_someone: "誰かを招待する"
@@ -723,7 +732,7 @@ ja:
       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: "公開投稿はダイアスポラ外の人にも表示されます。"
+      outside: 公開投稿はダイアスポラ外の人にも表示されます。
       share: "Share"
       title: "提携サービスを設定する"
       visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
@@ -738,30 +747,32 @@ ja:
         invited_by: "Thanks for the invite, "
       post_a_message_to: "%{aspect}に投稿する"
       posting: "投稿中"
-      publishing_to: "公開先："
+      publishing_to: 公開先：
       share: "共有"
-      share_with: "共有先："
+      share_with: 共有先：
       upload_photos: "Upload photos"
-      whats_on_your_mind: "いま何を考えている？"
+      whats_on_your_mind: いま何を考えている？
     reshare: 
       reshare: "再共有"
     stream_element: 
       connect_to_comment: "Connect to this user to comment on their post"
       currently_unavailable: "commenting currently unavailable"
-      dislike: "これ嫌い！"
+      dislike: これ嫌い！
       hide_and_mute: "Hide and Mute"
-      like: "これ好き！"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
+      like: これ好き！
       shared_with: "Shared with: %{aspect_names}"
-      unlike: "これ好き！を取り消す"
+      unlike: これ好き！を取り消す
       via: "via %{link}"
       viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "%{names}を参照するのに成功しました。"
     destroy: 
-      failure: "投稿を削除するのに失敗しました。"
+      failure: 投稿を削除するのに失敗しました。
     helper: 
-      no_message_to_display: "表示するメッセージがありません。"
+      no_message_to_display: 表示するメッセージがありません。
     new: 
       mentioning: "%{person}さんのメンション"
     too_long: 
@@ -836,7 +847,7 @@ ja:
     confirm_email: 
       email_confirmed: "E-Mail %{email} activated"
       email_not_confirmed: "E-Mail could not be activated. Wrong link?"
-    destroy: "アカウント閉鎖に成功しました。"
+    destroy: アカウント閉鎖に成功しました。
     edit: 
       also_commented: "他の人も連絡先の投稿にコメントしたとき"
       change: "変更"
@@ -871,7 +882,7 @@ ja:
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,10 +894,14 @@ ja:
       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}」は存在しません。"
     update: 
-      email_notifications_changed: "メール通知の設定を変更しました。"
+      email_notifications_changed: メール通知の設定を変更しました。
       language_changed: "言語の設定を変更しました"
       language_not_changed: "言語の選択に失敗しました"
       password_changed: "パスワードを変更しました"
@@ -898,7 +913,7 @@ ja:
   webfinger: 
     fetch_failed: "%{profile_url} のwebfingerプロフィールの取得に失敗しました。"
     hcard_fetch_failed: "%{account}のhcard取得に問題が発生しました。"
-    no_person_constructed: "このhcardから連絡先人を生成することができませんでした。"
+    no_person_constructed: このhcardから連絡先人を生成することができませんでした。
     not_enabled: "%{account}のポッドではwebfingerが無効になっているようです。"
     xrd_fetch_failed: "%{account}のxrd取得にエラーが発生しました。"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index 26be32755..1c5273047 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -47,7 +47,7 @@ ko:
       unknown_person: "알 수 없는 사람"
       video_title: 
         unknown: "알 수 없는 비디오 제목"
-  are_you_sure: "확실합니까?"
+  are_you_sure: 확실합니까?
   aspect_memberships: 
     destroy: 
       failure: "애스펙에서 지우지 못했습니다"
@@ -94,13 +94,13 @@ ko:
     index: 
       cubbies: 
         explanation: "Cubbi.es는 개발중인 최초의 디아스포라 어플입니다."
-        heading: "Cubbi.es에 연결하기"
+        heading: "Cubbi.es에 연결하세요"
         learn_more: "자세히 알아보기"
       diaspora_id: 
         content_1: "내 디아스포라 ID:"
         content_2: "내 ID를 주면 누구든지 디아스포라에서 날 찾을수 있습니다."
         heading: "디아스포라 ID"
-      donate: "기부하기"
+      donate: "기부해주세요"
       handle_explanation: "이 디아스포라 핸들은 이메일 주소처럼 남에게 건넬 수 있습니다."
       help: 
         do_you: "해시태그:"
@@ -111,20 +111,20 @@ ko:
         here_to_help: "디아스포라 커뮤니티가 도와드립니다!"
         need_help: "도움이 필요하세요?"
         satisfaction: "%{link}: 커뮤니티 지원"
-        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial}과 %{wiki}와  %{forum}: 커뮤니티가 운영하는 튜토리얼, 사용 방법과 소식"
       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"
+        follow: "%{link} 태그를 팔로우해서 디아스포라*의 새 사용자를 맞으세요!"
+        learn_more: "자세히"
+        title: "새 사용자를 맞으세요"
       no_contacts: "컨택 없음"
       no_tags: "태그 없음"
       people_sharing_with_you: "나와 공유하는 사람들"
       post_a_message: "새 메시지 올리기 >>"
       services: 
         content: "다음의 여러 서비스를 디아스포라에 연결할 수 있습니다"
-        heading: "서비스 연결"
+        heading: "서비스를 연결하세요"
       unfollow_tag: "#%{tag} 태그 팔로우 멈추기"
       welcome_to_diaspora: "%{name}님, 디아스포라에 오신걸 환영합니다!"
       your_aspects: "내 애스펙"
@@ -167,10 +167,17 @@ ko:
       no_applications: "아직 어플을 등록하지 않았습니다."
       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: 
     explanation: "%{link} 링크를 북마크로 추가하세요."
     explanation_link_text: "디아스포라에 올리기"
-    heading: "디아스포라 북마크"
+    heading: "북마클릿"
     post_something: "디아스포라에 올리기"
     post_success: "올렸습니다! 닫힙니다!"
   cancel: "취소"
@@ -242,7 +249,7 @@ ko:
     show: 
       delete: "지운 뒤 대화를 차단합니다"
       reply: "답장"
-      replying: "답장중···"
+      replying: 답장중···
   date: 
     formats: 
       birthday: "%B %d일"
@@ -290,8 +297,8 @@ ko:
       aspect: "애스펙"
       comma_seperated_plz: "쉼표로 구분하여 여러 이메일 주소를 넣을 수 있습니다."
       if_they_accept_info: "수락한 친구는 초대했던 애스펙에 추가됩니다."
-      invite_someone_to_join: "친구를 디아스포라로 초대하세요!"
-      language: "Language"
+      invite_someone_to_join: "다이스포라에 친구를 초대하세요!"
+      language: "언어"
       personal_message: "쪽지"
       resend: "다시 보내기"
       send_an_invitation: "초대장 보내기"
@@ -467,7 +474,7 @@ ko:
       sharing: "님이 나와 공유를 시작했습니다!"
       subject: "%{name}님이 디아스포라*에서 나와 공유를 시작했습니다."
       view_profile: "%{name}님의 프로필 보기"
-    thanks: "고맙습니다."
+    thanks: 고맙습니다.
     to_change_your_notification_settings: "내 알림 설정을 바꾸기 위해"
   ok: "확인"
   or: "또는"
@@ -483,7 +490,7 @@ ko:
       people_on_pod_are_aware_of: "팟의 사람들이 알고 있는"
       results_for: "%{params} 결과"
     index: 
-      couldnt_find_them_send_invite: "찾을 수 없는 사람들을 초대하세요!"
+      couldnt_find_them_send_invite: "못 찾았나요? 초대장을 보내세요!"
       no_one_found: "검색 결과가 없습니다"
       no_results: "검색 결과가 없습니다"
       results_for: "검색 결과:"
@@ -507,6 +514,7 @@ ko:
     show: 
       does_not_exist: "없는 사람입니다!"
       has_not_shared_with_you_yet: "%{name}님은 아직 나와 아무것도 공유하지 않았습니다!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name}님이 나와 공유하길 원합니다"
       mention: "멘션"
       message: "쪽지"
@@ -538,7 +546,7 @@ ko:
     new: 
       back_to_list: "목록으로 돌아가기"
       new_photo: "새 사진"
-      post_it: "올리기!"
+      post_it: 올리기!
     new_photo: 
       empty: "{file} 파일은 빈 파일입니다. 이 파일만 빼고 다시 시도하세요."
       invalid_ext: "{file} 파일은 유효하지 않은 형식입니다. {extensions} 형식의 파일을 올려주세요."
@@ -559,16 +567,13 @@ ko:
     update: 
       error: "사진 고치기 실패."
       notice: "사진을 성공적으로 업데이트했습니다."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "%{name}님의 공유물이 숨겨지고, 알림이 꺼졌습니다."
-      see_it_on_their_profile: "이 공유물의 업데이트를 보고싶으면 %{name}님의 프로필을 방문하세요."
   posts: 
     show: 
       destroy: "지우기"
       not_found: "해당 공유물을 찾을 수 없습니다."
       permalink: "영구 링크"
   previous: "이전"
+  privacy: "Privacy"
   profile: "프로필"
   profiles: 
     edit: 
@@ -615,7 +620,7 @@ ko:
       enter_password: "암호를 입력하세요"
       enter_password_again: "암호를 다시 입력하세요"
       enter_username: "사용자명을 선택하세요 (로마자, 아라비아 숫자, 언더스코어만)"
-      join_the_movement: "합류하세요!"
+      join_the_movement: 합류하세요!
       sign_up_message: "소셜 네트워크♡"
   requests: 
     create: 
@@ -637,7 +642,7 @@ ko:
       existing: "Existing contacts"
       manage_within: "컨택 관리하기:"
     new_request_to_person: 
-      sent: "보냈습니다."
+      sent: 보냈습니다.
   reshares: 
     comment_email_subject: "%{resharer}님이 재공유한 %{author}님의 공유물"
     create: 
@@ -685,11 +690,15 @@ ko:
       not_on_diaspora: "아직 디아스포라에 없습니다"
       resend: "다시 보내기"
   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: "새 컨택 추가"
       create_request: "디아스포라 핸들로 찾기"
-      diaspora_handle: "diaspora@handle.org"
+      diaspora_handle: diaspora@handle.org
       enter_a_diaspora_username: "디아스포라 사용자명을 입력하세요:"
       know_email: "이메일 주소를 알면 초대할 수 있습니다!"
       your_diaspora_username_is: "내 디아스포라 핸들: %{diaspora_handle}"
@@ -713,7 +722,7 @@ ko:
       from_facebook: "페이스북에서 찾기"
       invitations_left: "(%{count}통 남음)"
       invite_someone: "초대하기"
-      invite_your_friends: "친구 초대하기"
+      invite_your_friends: "친구들을 초대하세요"
       invites: "초대"
       invites_closed: "이 디아스포라는 초대가 닫혀있습니다."
     notification: 
@@ -735,7 +744,7 @@ ko:
       new_user_prefill: 
         hello: "#%{new_user_tag} 반갑습니다! 새로 가입했습니다."
         i_like: "제 관심사는 %{tags} 입니다."
-        invited_by: "Thanks for the invite, "
+        invited_by: "초대해주셔서 고맙습니다,"
       post_a_message_to: "%{aspect}에 공유물 올리기"
       posting: "올리는 중···"
       publishing_to: "올릴 곳: "
@@ -750,6 +759,8 @@ ko:
       currently_unavailable: "지금은 댓글을 달 수 없습니다"
       dislike: "싪어요"
       hide_and_mute: "숨기고 알림 끄기"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "좋아요"
       shared_with: "공유된 애스펙: %{aspect_names}"
       unlike: "좋아요 취소"
@@ -830,7 +841,7 @@ ko:
       typical_userpage: "전형적인 cubbi.es 사용자 페이지"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es 는 세계 최초의 디아스포라 어플입니다.  온라인으로 사진을 모을 수 있는 가장 좋은 방법이기도 합니다."
-  undo: "돌이키겠습니까?"
+  undo: 돌이키겠습니까?
   username: "사용자명"
   users: 
     confirm_email: 
@@ -871,18 +882,22 @@ ko:
       hashtag_explanation: "해시태그로 내 관심사에 대해 말하거나 팔로우할 수 있습니다. 디아스포라에서 새로운 사람들을 찾을 수 있는 또 하나의 훌륭한 방법입니다."
       hashtag_suggestions: "#art, #movies, #gif 같은 태그를 팔로우해보세요."
       hooking_up_fb: "페이스북 계정을 연결하면"
-      saved: "저장되었습니다!"
+      saved: 저장되었습니다!
       we_can_speed_things_up: "디아스포라에"
       well_hello_there: "자, 어서오십시오!"
       what_are_you_in_to: "뭘 좋아해요?"
       what_facebook_does: "더 간편히 가입할 수 있습니다. 페이스북에서 이름과 사진을 가져올 수 있고, 두 서비스에 서로 게시할 수도 있습니다."
-      who_are_you: "누구시죠?"
+      who_are_you: 누구시죠?
     logged_out: 
       go_mobile: "이제 모바일로 즐기세요."
       on_your_mobile_device: "에 접속하면 디아스포라* 모바일을 쓸 수 있습니다."
       signed_out: "디아스포라*에서 로그아웃되었습니다."
       simply_visit: "모바일 기기로"
       works_on_modern: "모든 최신 스마트폰에서 작동합니다"
+    privacy_settings: 
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "%{username}님을 찾을 수 없습니다!"
     update: 
@@ -901,4 +916,4 @@ ko:
     no_person_constructed: "이 hcard로부터 아무도 만들어지지 않았습니다."
     not_enabled: "웹핑거가 %{account}의 호스트에서 활성화 된 것 같지 않습니다."
     xrd_fetch_failed: "%{account} 계정으로부터 xrd를 가져오는 것에 실패했습니다."
-  welcome: "환영합니다!"
+  welcome: 환영합니다!
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 8dfb26a71..c2f2c9a8f 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -167,6 +167,13 @@ lt:
       no_applications: "You haven't registered any applications yet."
       revoke_access: "Revoke Access"
   back: "Atgal"
+  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: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
@@ -234,7 +241,7 @@ lt:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
-      sending: "Sending..."
+      sending: Sending...
       subject: "subject"
       to: "to"
     new_message: 
@@ -242,7 +249,7 @@ lt:
     show: 
       delete: "delete and block conversation"
       reply: "reply"
-      replying: "Replying..."
+      replying: Replying...
   date: 
     formats: 
       birthday: "%B %d"
@@ -306,7 +313,7 @@ lt:
       your_aspects: "your aspects"
     header: 
       admin: "admin"
-      blog: "blog'as"
+      blog: blog'as
       code: "code"
       login: "prisijungti"
       logout: "atsijungti"
@@ -507,6 +514,7 @@ lt:
     show: 
       does_not_exist: "Asmuo neegzistuoja!"
       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: "Jūs gavote pakvietimą iš šio asmens."
       mention: "Mention"
       message: "Message"
@@ -538,7 +546,7 @@ lt:
     new: 
       back_to_list: "Atgal į sąrašą"
       new_photo: "Nauja nuotrauka"
-      post_it: "paskelbti!"
+      post_it: paskelbti!
     new_photo: 
       empty: "{file} yra tuščias, pasirink failus iš naujo."
       invalid_ext: "{file} turi neteisingą galūnę. Yra leidžiamos tik {extensions}."
@@ -559,16 +567,13 @@ lt:
     update: 
       error: "Nuotraukos atnaujinti nepavyko."
       notice: "Nuotrauka atnaujinta sėkmingai."
-  post_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."
   posts: 
     show: 
       destroy: "Delete"
       not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   previous: "previous"
+  privacy: "Privacy"
   profile: "Profilis"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ lt:
       edit: "Redaguoti %{name}"
       leave_blank: "(palik tuščią, jei nenori pakeisti)"
       password_to_confirm: "(tavo slaptažodis reikalingas, kad patvirtintume pakeitimus)"
-      unhappy: "Nesmagu?"
+      unhappy: Nesmagu?
       update: "Atnaujinimas"
     new: 
       create_my_account: "Create my account"
@@ -624,7 +629,7 @@ lt:
     destroy: 
       error: "Pasirink aspektą!"
       ignore: "Ignoruotas prašymas draugauti."
-      success: "Susidraugavai."
+      success: Susidraugavai.
     helper: 
       new_requests: 
         few: "%{count} new requests!"
@@ -637,7 +642,7 @@ lt:
       existing: "Egzistuojantys kontaktai"
       manage_within: "Valdyti kontaktus ties"
     new_request_to_person: 
-      sent: "išsiųsta!"
+      sent: išsiųsta!
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -685,11 +690,15 @@ lt:
       not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   settings: "Nustatymai"
+  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: "Rask pagal Diasporos vartotojo vardą"
-      diaspora_handle: "diaspora@handle.org"
+      diaspora_handle: diaspora@handle.org
       enter_a_diaspora_username: "Įvesk Diasporos vartotojo vardą:"
       know_email: "Know their email address? You should invite them"
       your_diaspora_username_is: "Tavo Diasporos vartotojo vardas yra: %{diaspora_handle}"
@@ -737,7 +746,7 @@ lt:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Parašyti žinutę į aspektą \"%{aspect}\""
-      posting: "Rašoma..."
+      posting: Rašoma...
       publishing_to: "publishing to: "
       share: "Skelbti"
       share_with: "Skelbti aspekte \"%{aspect}\""
@@ -750,6 +759,8 @@ lt:
       currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "I like this"
       shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
@@ -830,7 +841,7 @@ lt:
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-  undo: "Undo?"
+  undo: Undo?
   username: "Vartotojo vardas"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ lt:
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ lt:
       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: "Vartotojas %{username} neegzistuoja!"
     update: 
@@ -901,4 +916,4 @@ lt:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 6e4fe09b0..531404a1f 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -167,6 +167,13 @@ mk:
       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: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
@@ -179,7 +186,7 @@ mk:
     many: "%{count} comments"
     new_comment: 
       comment: "Коментар"
-      commenting: "Коментирање..."
+      commenting: Коментирање...
     one: "1 comment"
     other: "%{count} comments"
     two: "%{count} comments"
@@ -234,7 +241,7 @@ mk:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
-      sending: "Sending..."
+      sending: Sending...
       subject: "subject"
       to: "to"
     new_message: 
@@ -242,14 +249,14 @@ mk:
     show: 
       delete: "delete and block conversation"
       reply: "reply"
-      replying: "Replying..."
+      replying: Replying...
   date: 
     formats: 
       birthday: "%B %d"
       birthday_with_year: "%B %d %Y"
       fullmonth_day: "%B %d"
   delete: "Избриши"
-  email: "Е-маил"
+  email: Е-маил
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Поправете ги следниве грешки и обидете се повторно."
@@ -507,6 +514,7 @@ mk:
     show: 
       does_not_exist: "Личноста не постои!"
       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: "You have an incoming request from this person."
       mention: "Mention"
       message: "Message"
@@ -538,7 +546,7 @@ mk:
     new: 
       back_to_list: "Назад кон листа"
       new_photo: "Нова слика"
-      post_it: "објави!"
+      post_it: објави!
     new_photo: 
       empty: "{file} е празен, изберете датотеки без него."
       invalid_ext: "{file} има невалидна екстензија. Само овие {extensions} се дозволени."
@@ -559,16 +567,13 @@ mk:
     update: 
       error: "Неуспешно уредување на слика."
       notice: "Ажурирањето на сликата е успешно."
-  post_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."
   posts: 
     show: 
       destroy: "Delete"
       not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   previous: "previous"
+  privacy: "Privacy"
   profile: "Профил"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ mk:
       edit: "Уреди %{name}"
       leave_blank: "(оставете го празно ако не сакате да го измените)"
       password_to_confirm: "(потребна е вашата тековна лозинка за потврдување на измените)"
-      unhappy: "Незадоволни?"
+      unhappy: Незадоволни?
       update: "Ажурирај"
     new: 
       create_my_account: "Create my account"
@@ -637,7 +642,7 @@ mk:
       existing: "Постоечки контакти"
       manage_within: "Менаџирај контакти во"
     new_request_to_person: 
-      sent: "испратено!"
+      sent: испратено!
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -685,6 +690,10 @@ mk:
       not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   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"
@@ -737,7 +746,7 @@ mk:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Додај порака во %{aspect}"
-      posting: "Објавување..."
+      posting: Објавување...
       publishing_to: "publishing to: "
       share: "Сподели"
       share_with: "Сподели со %{aspect}"
@@ -750,6 +759,8 @@ mk:
       currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "I like this"
       shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
@@ -830,7 +841,7 @@ mk:
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-  undo: "Undo?"
+  undo: Undo?
   username: "Корисничко име"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ mk:
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ mk:
       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} не постои!"
     update: 
@@ -901,4 +916,4 @@ mk:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index db03db24b..ea0df5f88 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -167,6 +167,13 @@ nb:
       no_applications: "You haven't registered any applications yet."
       revoke_access: "Revoke Access"
   back: "Tilbake"
+  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: 
     explanation: "%{link} fra hvor som helst ved å bokmerke denne linken."
     explanation_link_text: "Post på Diaspora"
@@ -179,7 +186,7 @@ nb:
     many: "%{count} kommentarer"
     new_comment: 
       comment: "Kommentér"
-      commenting: "Kommenterer..."
+      commenting: Kommenterer...
     one: "1 kommentar"
     other: "%{count} kommentarer"
     two: "%{count} comments"
@@ -234,7 +241,7 @@ nb:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
-      sending: "Sending..."
+      sending: Sending...
       subject: "emne"
       to: "til"
     new_message: 
@@ -242,7 +249,7 @@ nb:
     show: 
       delete: "slett og blokkér samtalen"
       reply: "svar"
-      replying: "Svarer..."
+      replying: Svarer...
   date: 
     formats: 
       birthday: "%B %d"
@@ -507,6 +514,7 @@ nb:
     show: 
       does_not_exist: "Personen eksisterer ikke!"
       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: "You have an incoming request from this person."
       mention: "Nevn"
       message: "Melding"
@@ -559,16 +567,13 @@ nb:
     update: 
       error: "Greide ikke å endre bildet."
       notice: "Bildet er oppdatert."
-  post_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."
   posts: 
     show: 
       destroy: "Delete"
       not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   previous: "forrige"
+  privacy: "Privacy"
   profile: "Profil"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ nb:
       edit: "Endre %{name}"
       leave_blank: "(La stå tom hvis du ikke ønsker å endre det)"
       password_to_confirm: "(vi trenger ditt nåværende passord for å bekrefte endringene)"
-      unhappy: "Ulykkelig?"
+      unhappy: Ulykkelig?
       update: "Oppdater"
     new: 
       create_my_account: "Create my account"
@@ -619,7 +624,7 @@ nb:
       sign_up_message: "Social Networking with a <3"
   requests: 
     create: 
-      sending: "Sending..."
+      sending: Sending...
       sent: "Du har bedt om å dele med %{name}.  De burde se det neste gang de logger inn på Diaspora"
     destroy: 
       error: "Velg et aspekt først!"
@@ -637,7 +642,7 @@ nb:
       existing: "Eksisterende kontakter"
       manage_within: "Administrer kontakter innen"
     new_request_to_person: 
-      sent: "sendt!"
+      sent: sendt!
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -685,6 +690,10 @@ nb:
       not_on_diaspora: "Not yet on Diaspora"
       resend: "send på nytt"
   settings: "Innstillinger"
+  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: "Legg til en ny kontakt"
@@ -737,7 +746,7 @@ nb:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Post et innlegg til %{aspect}"
-      posting: "Poster..."
+      posting: Poster...
       publishing_to: "publiserer til:"
       share: "Del"
       share_with: "del med"
@@ -750,6 +759,8 @@ nb:
       currently_unavailable: "commenting currently unavailable"
       dislike: "Liker ikke"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Liker"
       shared_with: "Shared with: %{aspect_names}"
       unlike: "Liker ikke"
@@ -830,7 +841,7 @@ nb:
       typical_userpage: "En typisk cubbi.es brukerside"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es er verdens første Diasporaapplikasjon. Det er også den beste måten å samle bilder på nettet."
-  undo: "Angre?"
+  undo: Angre?
   username: "Brukernavn"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ nb:
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ nb:
       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: "Bruker %{username} finnes ikke!"
     update: 
@@ -901,4 +916,4 @@ nb:
     no_person_constructed: "Ingen personer kunne konstrueres fra dette hCard."
     not_enabled: "det virker ikke som webfinger er aktivert for % {account}'s vert"
     xrd_fetch_failed: "kunne ikke få xrd fra kontoen %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index b23b9a469..632007306 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -8,7 +8,7 @@ nl:
   _comments: "Reacties"
   _contacts: "Contacten"
   _home: "Home"
-  _photos: "foto's"
+  _photos: foto's
   _services: "Services"
   account: "Account"
   activerecord: 
@@ -167,19 +167,26 @@ nl:
       no_applications: "Je hebt nog geen applicaties geregistreerd."
       revoke_access: "Toegang Terugdraaien"
   back: "Terug"
+  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: 
     explanation: "Post vanaf overal naar Diaspora door %{link} op te slaan."
     explanation_link_text: "deze link"
     heading: "Bookmarklet"
     post_something: "Post iets naar Diaspora"
-    post_success: "Gepost!"
+    post_success: Gepost!
   cancel: "Annuleren"
   comments: 
     few: "%{count} reacties"
     many: "%{count} reacties"
     new_comment: 
       comment: "Reactie"
-      commenting: "Reageren..."
+      commenting: Reageren...
     one: "1 reactie"
     other: "%{count} reacties"
     two: "%{count} reacties"
@@ -234,7 +241,7 @@ nl:
     new: 
       abandon_changes: "Wijzigingen annuleren?"
       send: "Verstuur"
-      sending: "Verzenden..."
+      sending: Verzenden...
       subject: "onderwerp"
       to: "aan"
     new_message: 
@@ -242,14 +249,14 @@ nl:
     show: 
       delete: "verwijder en blokkeer conversatie"
       reply: "beantwoord"
-      replying: "Beantwoorden..."
+      replying: Beantwoorden...
   date: 
     formats: 
       birthday: "%B %d"
       birthday_with_year: "%B %d %Y"
       fullmonth_day: "%B %d"
   delete: "Verwijderen"
-  email: "E-mail"
+  email: E-mail
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Corrigeer de volgende fouten en probeer opnieuw."
@@ -507,6 +514,7 @@ nl:
     show: 
       does_not_exist: "Die persoon bestaat niet!"
       has_not_shared_with_you_yet: "%{name} heeft nog geen posts met je gedeeld!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name} wil met je delen"
       mention: "Noemen"
       message: "Bericht"
@@ -559,16 +567,13 @@ nl:
     update: 
       error: "Foto veranderen niet gelukt."
       notice: "Foto succesvol veranderd."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "%{name}'s post is verborgen en notificaties zijn geblokkeerd."
-      see_it_on_their_profile: "Als je updates wilt zien op dit bericht, bezoek %{name}'s profiel pagina."
   posts: 
     show: 
       destroy: "Verwijder"
       not_found: "Sorry, die post konden we niet vinden."
       permalink: "permalink"
   previous: "vorige"
+  privacy: "Privacy"
   profile: "Profiel"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ nl:
       edit: "Bewerk %{name}"
       leave_blank: "(leeg laten als je niets wilt wijzigen)"
       password_to_confirm: "(we hebben je huidige wachtwoord nodig om de wijzigingen te bevestigen)"
-      unhappy: "Ontevreden?"
+      unhappy: Ontevreden?
       update: "Update"
     new: 
       create_my_account: "Maak mijn account aan"
@@ -619,7 +624,7 @@ nl:
       sign_up_message: "Social Networking with a <3"
   requests: 
     create: 
-      sending: "Versturen..."
+      sending: Versturen...
       sent: "Je hebt gevraagd te delen met %{name}. Hij of zij zou het moeten zien eerstvolgende keer dat hij of zij inlogt op Diaspora."
     destroy: 
       error: "Selecteer een aspect!"
@@ -637,7 +642,7 @@ nl:
       existing: "Bestaande contacten"
       manage_within: "Beheer contacten in"
     new_request_to_person: 
-      sent: "verzonden!"
+      sent: verzonden!
   reshares: 
     comment_email_subject: "%{resharer}'s doorgifte van %{author}'s post"
     create: 
@@ -685,11 +690,15 @@ nl:
       not_on_diaspora: "Nog niet op Diaspora"
       resend: "herstuur"
   settings: "Instellingen"
+  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: "Voeg een contact toe"
       create_request: "Vind door middel van Diaspora ID"
-      diaspora_handle: "gebruikersnaam@pod.org"
+      diaspora_handle: gebruikersnaam@pod.org
       enter_a_diaspora_username: "Vul een Diaspora gebruikersnaam in:"
       know_email: "Weet je hun e-mailadres? Je zou ze uit moeten nodigen"
       your_diaspora_username_is: "Jouw Diaspora gebruikersnaam is: %{diaspora_handle}"
@@ -737,7 +746,7 @@ nl:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Plaats een bericht aan %{aspect}"
-      posting: "Plaatsen..."
+      posting: Plaatsen...
       publishing_to: "delen met: "
       share: "Delen"
       share_with: "deel met"
@@ -750,6 +759,8 @@ nl:
       currently_unavailable: "commenting currently unavailable"
       dislike: "Vind ik niet meer leuk"
       hide_and_mute: "Verberg en blokkeer"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Vind ik leuk"
       shared_with: "Gedeeld met: %{aspect_names}"
       unlike: "vind ik niet meer leuk"
@@ -871,7 +882,7 @@ nl:
       hashtag_explanation: "Hashtags laten je gemakkelijk jou interesses volgen. Bovendien kunnen ze je helpen bij het vinden van nieuwe contacten op Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ nl:
       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: "Gebruiker %{username} bestaat niet!"
     update: 
@@ -901,4 +916,4 @@ nl:
     no_person_constructed: "Er kon geen persoon worden gemaakt van deze hcard."
     not_enabled: "webfinger lijkt niet aan te staan voor %{account}'s provider"
     xrd_fetch_failed: "er was een probleem bij het verkrijgen van de xrd van het account %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/nn.yml b/config/locales/diaspora/nn.yml
index 45522de69..7a5158833 100644
--- a/config/locales/diaspora/nn.yml
+++ b/config/locales/diaspora/nn.yml
@@ -99,7 +99,7 @@ nn:
       diaspora_id: 
         content_1: "Diaspora-ID-en din er:"
         content_2: "Gje han til kven som helst så kan dei finna deg på Diaspora."
-        heading: "Diaspora-ID"
+        heading: Diaspora-ID
       donate: "Doner"
       handle_explanation: "Dette er Diaspora-ID-en din. Nett som ei e-postadresse kan du gje han til folk slik at dei kan nå deg."
       help: 
@@ -167,6 +167,13 @@ nn:
       no_applications: "Du har enno ikkje registrert nokon applikasjonar."
       revoke_access: "Trekk attende tilgangen"
   back: "Attende"
+  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: 
     explanation: "Send til Diaspora frå kor som helst ved å lagra %{link} som bokmerke."
     explanation_link_text: "denne lenkja"
@@ -494,7 +501,7 @@ nn:
       add_contact: "legg til kontakt"
       already_connected: "Allereie tilkopla"
       pending_request: "Ventande førespurnad"
-      thats_you: "Deg!"
+      thats_you: Deg!
     profile_sidebar: 
       bio: "livshistorie"
       born: "fødselsdag"
@@ -507,6 +514,7 @@ nn:
     show: 
       does_not_exist: "Personen finst ikkje."
       has_not_shared_with_you_yet: "%{name} har enno ikkje delt noko innlegg med deg."
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name} ønskjer å dela med deg"
       mention: "Omtale"
       message: "Melding"
@@ -559,16 +567,13 @@ nn:
     update: 
       error: "Klarte ikkje å endra biletet."
       notice: "Biletet vart oppdatert."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "Innlegget til %{name} er vorte gøymt og varsel er slått av."
-      see_it_on_their_profile: "Besøk %{name} si profilside om du vil sjå oppdateringane til dette innlegget."
   posts: 
     show: 
       destroy: "Sletta"
       not_found: "Vi klarte dessverre ikkje å finna innlegget."
       permalink: "permlenkje"
   previous: "førre"
+  privacy: "Privacy"
   profile: "Profil"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ nn:
       edit: "Endra %{name}"
       leave_blank: "(lat vera tomt om du ikkje vil endra)"
       password_to_confirm: "(vi treng det gjeldande passordet ditt for å kunna stadfesta endringane)"
-      unhappy: "Ulukkeleg?"
+      unhappy: Ulukkeleg?
       update: "Oppdater"
     new: 
       create_my_account: "Lag kontoen min."
@@ -685,11 +690,15 @@ nn:
       not_on_diaspora: "Enno ikkje på Diaspora"
       resend: "send på nytt"
   settings: "Innstillingar"
+  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: "Legg til ein ny kontakt"
       create_request: "Finn ved hjelp av Diaspora-id-en"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Skriv inn eit Diaspora-brukarnamn:"
       know_email: "Kjenner du epostadressene deira? Du burde invitera dei"
       your_diaspora_username_is: "Diaspora-brukarnamnet ditt er: %{diaspora_handle}"
@@ -750,6 +759,8 @@ nn:
       currently_unavailable: "commenting currently unavailable"
       dislike: "Mislik"
       hide_and_mute: "Gøym og demp"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Lik"
       shared_with: "Delt med: %{aspect_names}"
       unlike: "Lik ikkje lenger"
@@ -871,7 +882,7 @@ nn:
       hashtag_explanation: "Grindmerke (#) gjer at du kan tala om og følgja interessene dine. Dei er òg ein fin måte å finna nye Diaspora-brukarar på."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ nn:
       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: "Brukaren %{username} finst ikkje."
     update: 
@@ -901,4 +916,4 @@ nn:
     no_person_constructed: "Klarte ikkje å laga nokon person frå hcard-fila."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 940602f97..8860f4e42 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -5,12 +5,12 @@
 
 pa: 
   _applications: "Applications"
-  _comments: "ਟਿੱਪਣੀਆਂ"
-  _contacts: "ਸੰਪਰਕ"
+  _comments: ਟਿੱਪਣੀਆਂ
+  _contacts: ਸੰਪਰਕ
   _home: "ਘਰ"
-  _photos: "ਫੋਟੋ"
-  _services: "ਸਰਵਿਸਾਂ"
-  account: "ਅਕਾਊਂਟ"
+  _photos: ਫੋਟੋ
+  _services: ਸਰਵਿਸਾਂ
+  account: ਅਕਾਊਂਟ
   activerecord: 
     errors: 
       models: 
@@ -83,14 +83,14 @@ pa:
       done: "Done"
       make_aspect_list_visible: "make aspect list visible to others in aspect"
       remove_aspect: "Delete this aspect"
-      rename: "ਨਾਂ-ਬਦਲੋ"
+      rename: ਨਾਂ-ਬਦਲੋ
       update: "update"
       updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Aspect not empty"
-      remove: "ਹਟਾਓ"
+      remove: ਹਟਾਓ
     index: 
       cubbies: 
         explanation: "Cubbi.es is the first Diaspora application under development."
@@ -147,9 +147,9 @@ pa:
     other: "%{count} aspects"
     seed: 
       acquaintances: "Acquaintances"
-      family: "ਪਰਿਵਾਰ"
+      family: ਪਰਿਵਾਰ
       friends: "Friends"
-      work: "ਕੰਮ"
+      work: ਕੰਮ
     selected_contacts: 
       manage_your_aspects: "Manage your aspects."
       no_contacts: "You don't have any contacts here yet."
@@ -166,7 +166,14 @@ pa:
     index: 
       no_applications: "You haven't registered any applications yet."
       revoke_access: "Revoke Access"
-  back: "ਪਿੱਛੇ"
+  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: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
@@ -178,7 +185,7 @@ pa:
     few: "%{count} comments"
     many: "%{count} comments"
     new_comment: 
-      comment: "ਟਿੱਪਣੀ"
+      comment: ਟਿੱਪਣੀ
       commenting: "ਟਿੱਪਣੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
     one: "1 comment"
     other: "%{count} comments"
@@ -234,7 +241,7 @@ pa:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
-      sending: "Sending..."
+      sending: Sending...
       subject: "subject"
       to: "to"
     new_message: 
@@ -242,14 +249,14 @@ pa:
     show: 
       delete: "delete and block conversation"
       reply: "reply"
-      replying: "Replying..."
+      replying: Replying...
   date: 
     formats: 
       birthday: "%B %d"
       birthday_with_year: "%B %d %Y"
       fullmonth_day: "%B %d"
-  delete: "ਹਟਾਓ"
-  email: "ਈਮੇਲ"
+  delete: ਹਟਾਓ
+  email: ਈਮੇਲ
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Correct the following errors and try again."
@@ -306,10 +313,10 @@ pa:
       your_aspects: "your aspects"
     header: 
       admin: "admin"
-      blog: "ਬਲੌਗ"
-      code: "ਕੋਡ"
-      login: "ਲਾਗਇਨ"
-      logout: "ਲਾਗਆਉਟ"
+      blog: ਬਲੌਗ
+      code: ਕੋਡ
+      login: ਲਾਗਇਨ
+      logout: ਲਾਗਆਉਟ
       profile: "profile"
       recent_notifications: "Recent notifications"
       settings: "settings"
@@ -338,8 +345,8 @@ pa:
         two: "%{count} likes"
         zero: "no likes"
   limited: "Limited"
-  more: "ਹੋਰ"
-  next: "ਅੱਗੇ"
+  more: ਹੋਰ
+  next: ਅੱਗੇ
   no_results: "No Results Found"
   notifications: 
     also_commented: 
@@ -410,7 +417,7 @@ pa:
       other: "%{actors} mentioned you in a deleted 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."
@@ -470,8 +477,8 @@ pa:
     thanks: "Thanks,"
     to_change_your_notification_settings: "to change your notification settings"
   ok: "ਠੀਕ ਹੈ"
-  or: "ਜਾਂ"
-  password: "ਪਾਸਵਰਡ"
+  or: ਜਾਂ
+  password: ਪਾਸਵਰਡ
   password_confirmation: "ਪਾਸਵਰਡ ਪੁਸ਼ਟੀ"
   people: 
     add_contact_small: 
@@ -507,6 +514,7 @@ pa:
     show: 
       does_not_exist: "Person does not exist!"
       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} wants to share with you"
       mention: "Mention"
       message: "Message"
@@ -559,16 +567,13 @@ pa:
     update: 
       error: "Failed to edit photo."
       notice: "Photo successfully updated."
-  post_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."
   posts: 
     show: 
       destroy: "Delete"
       not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
-  previous: "ਪਿੱਛੇ"
+  previous: ਪਿੱਛੇ
+  privacy: "Privacy"
   profile: "Profile"
   profiles: 
     edit: 
@@ -608,7 +613,7 @@ pa:
       leave_blank: "(leave blank if you don't want to change it)"
       password_to_confirm: "(we need your current password to confirm your changes)"
       unhappy: "ਖੁਸ਼ ਨਹੀਂ?"
-      update: "ਅੱਪਡੇਟ"
+      update: ਅੱਪਡੇਟ
     new: 
       create_my_account: "Create my account"
       enter_email: "ਈਮੇਲ ਦਿਓ"
@@ -637,7 +642,7 @@ pa:
       existing: "Existing contacts"
       manage_within: "Manage contacts within"
     new_request_to_person: 
-      sent: "ਭੇਜਿਆ!"
+      sent: ਭੇਜਿਆ!
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -655,7 +660,7 @@ pa:
       reshare_original: "Reshare orignial"
       reshared_via: "reshared via"
       show_original: "Show Original"
-  search: "ਖੋਜ"
+  search: ਖੋਜ
   services: 
     create: 
       already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
@@ -681,15 +686,19 @@ pa:
       click_link_to_accept_invitation: "Click this link to accept your invitation"
       join_me_on_diaspora: "Join me on DIASPORA*"
     remote_friend: 
-      invite: "ਸੱਦਾ"
+      invite: ਸੱਦਾ
       not_on_diaspora: "Not yet on Diaspora"
-      resend: "ਮੁੜ-ਭੇਜੋ"
+      resend: ਮੁੜ-ਭੇਜੋ
   settings: "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: "Find by Diaspora handle"
-      diaspora_handle: "diaspora@handle.org"
+      diaspora_handle: diaspora@handle.org
       enter_a_diaspora_username: "Enter a Diaspora username:"
       know_email: "Know their email address? You should invite them"
       your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
@@ -750,6 +759,8 @@ pa:
       currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "I like this"
       shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
@@ -830,7 +841,7 @@ pa:
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-  undo: "Undo?"
+  undo: Undo?
   username: "ਯੂਜ਼ਰ ਨਾਂ"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ pa:
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ pa:
       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: "User %{username} does not exist!"
     update: 
@@ -901,4 +916,4 @@ pa:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index e7df83ddc..5cd676168 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -167,6 +167,13 @@ pl:
       no_applications: "Nie zarejstrowa@{m:łeś|f:łaś|n:ano} jeszcze żadnej aplikacji!"
       revoke_access: "Zablokuj dostęp"
   back: "Powrót"
+  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: 
     explanation: "Publikuj w Disporze z każdego miejsca dodając do zakładek %{link}."
     explanation_link_text: "te łącze"
@@ -234,7 +241,7 @@ pl:
     new: 
       abandon_changes: "Porzucić zmiany?"
       send: "Wyślij"
-      sending: "Wysyłanie..."
+      sending: Wysyłanie...
       subject: "temat"
       to: "do"
     new_message: 
@@ -242,14 +249,14 @@ pl:
     show: 
       delete: "usuń i zablokuj rozmowę"
       reply: "odpowiedz"
-      replying: "Odpowiadanie..."
+      replying: Odpowiadanie...
   date: 
     formats: 
       birthday: "%d %B"
       birthday_with_year: "%d %B %Y"
       fullmonth_day: "%d %B"
   delete: "Usuń"
-  email: "E-mail"
+  email: E-mail
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Popraw poniższe błędy i spróbuj ponownie."
@@ -440,7 +447,7 @@ pl:
       two: "%{actors} zaczęli Ci udostępniać"
       zero: "%{actors} zaczęli Ci udostępniać."
   notifier: 
-    a_post_you_shared: "wpis."
+    a_post_you_shared: wpis.
     click_here: "kliknij tutaj"
     comment_on_post: 
       reply: "Odpowiedz lub wyświetl wpis użytkownika %{name} >"
@@ -507,6 +514,7 @@ pl:
     show: 
       does_not_exist: "Osoba nie istnieje!"
       has_not_shared_with_you_yet: "%{name} nie udostępnia Ci jeszcze żadnych wpisów!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name} chce Ci udostępniać"
       mention: "Wspomnij"
       message: "Wiadomość"
@@ -538,7 +546,7 @@ pl:
     new: 
       back_to_list: "Powrót do listy"
       new_photo: "Nowe zdjęcie"
-      post_it: "opublikuj!"
+      post_it: opublikuj!
     new_photo: 
       empty: "Plik {file} jest pusty. Wybierz proszę jeszcze raz odpowiednie pliki, pomijając ten."
       invalid_ext: "Plik {file} ma niewłaściwe rozszerzenie. Akceptowane rozszerzenia: {extensions}"
@@ -559,16 +567,13 @@ pl:
     update: 
       error: "Błąd podczas edycji zdjęcia."
       notice: "Pomyślnie zaktualizowano zdjęcie."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "Wpis %{name} został ukryty, a powiadomienia wyciszone."
-      see_it_on_their_profile: "Jeśli chcesz zobaczyć aktualizacje tego wpisu, odwiedź profil %{name}."
   posts: 
     show: 
       destroy: "Usuń"
       not_found: "Nie można odnaleźć wskazanego wpisu."
       permalink: "permalink"
   previous: "poprzedni"
+  privacy: "Privacy"
   profile: "Profil"
   profiles: 
     edit: 
@@ -637,7 +642,7 @@ pl:
       existing: "Istniejące kontakty"
       manage_within: "Zarządzanie kontaktami w"
     new_request_to_person: 
-      sent: "wysłano!"
+      sent: wysłano!
   reshares: 
     comment_email_subject: "%{resharer} podzieli@{m:ł|f:ła|n:ło} się z innymi wpisem %{author}"
     create: 
@@ -685,11 +690,15 @@ pl:
       not_on_diaspora: "Nie ma jeszcze konta na Diasporze"
       resend: "wyślij ponownie"
   settings: "Ustawienia"
+  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: "Dodaj nowy kontakt"
       create_request: "Szukaj wg Identyfikatora Diaspory"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Wpisz nazwę użytkownika Diaspory:"
       know_email: "Znasz ich adresy e-mail? Powi@{m:nieneś|f:nnaś|n:nni}{ }{m,f:ich zaprosić|n:zostać zaproszeni}!"
       your_diaspora_username_is: "Twój identyfikator w Diasporze: %{diaspora_handle}"
@@ -737,7 +746,7 @@ pl:
         i_like: "Interesują mnie %{tags}."
         invited_by: "Dzięki za zaproszenie,"
       post_a_message_to: "Wyślij wiadomość do %{aspect}"
-      posting: "Publikowanie..."
+      posting: Publikowanie...
       publishing_to: "publikuj na:"
       share: "Udostępnij"
       share_with: "udostępnij"
@@ -750,6 +759,8 @@ pl:
       currently_unavailable: "dodawanie komentarzy jest aktualnie niemożliwe"
       dislike: "Nie lubię"
       hide_and_mute: "Ukryj i wycisz"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Lubię"
       shared_with: "Opublikowano w: %{aspect_names}"
       unlike: "Nie lubię"
@@ -830,7 +841,7 @@ pl:
       typical_userpage: "Typowa strona użytkownika cubbi.es"
       via: "(przez %{link})"
       what_is_cubbies: "Cubbi.es jest pierwszą aplikacją Diaspory. To także najlepszy sposób na zebranie swoich zdjęć z sieci w jedno miejsce."
-  undo: "Cofnąć?"
+  undo: Cofnąć?
   username: "Nazwa użytkownika"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ pl:
       hashtag_explanation: "Znaczniki pozwalają łatwo odnaleźć interesujące Cię tematy. Są także świetnym sposobem na nawiązywanie znajomości na Diasporze."
       hashtag_suggestions: "Spróbuj obserwować znaczniki takie jak #sztuka, #filmy, #gif, itd."
       hooking_up_fb: "podpinanie Twojego konta na Facebooku"
-      saved: "Zapisano!"
+      saved: Zapisano!
       we_can_speed_things_up: "Możemy przyspieszyć nieco dzięki"
       well_hello_there: "No, witam!"
       what_are_you_in_to: "Czym się interesujesz?"
@@ -883,6 +894,10 @@ pl:
       signed_out: "Wyrejestrowa@{m:łeś|f:łaś|n:no} się z Diaspory*"
       simply_visit: "Wystarczy odwiedzić"
       works_on_modern: "Działa na wszystkich nowoczesnych smartfonach"
+    privacy_settings: 
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "Użytkownik %{username} nie istnieje!"
     update: 
@@ -901,4 +916,4 @@ pl:
     no_person_constructed: "Nie udało się utworzyć osoby używając tego zbioru hcard."
     not_enabled: "Usługa Webfinger nie działa w systemie utrzymującym konto użytkownika %{account}"
     xrd_fetch_failed: "wystąpił błąd podczas pobierania xrd z konta %{account}"
-  welcome: "Witamy!"
+  welcome: Witamy!
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 1c14825bd..3734b93e4 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -167,6 +167,13 @@ pt-BR:
       no_applications: "Você ainda não registrou nenhum aplicativo."
       revoke_access: "Revogar Acesso"
   back: "Voltar"
+  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: 
     explanation: "Postar para Diaspora de qualquer lugar através dos favoritos %{link}."
     explanation_link_text: "nesse link"
@@ -179,7 +186,7 @@ pt-BR:
     many: "%{count} comentários"
     new_comment: 
       comment: "Comentar"
-      commenting: "Comentando..."
+      commenting: Comentando...
     one: "1 comentário"
     other: "%{count} comentários"
     two: "%{count} comentários"
@@ -234,7 +241,7 @@ pt-BR:
     new: 
       abandon_changes: "Abandonar modificações?"
       send: "Enviar"
-      sending: "Enviando..."
+      sending: Enviando...
       subject: "assunto"
       to: "para"
     new_message: 
@@ -242,7 +249,7 @@ pt-BR:
     show: 
       delete: "deletar e bloquear conversa"
       reply: "responder"
-      replying: "Respondendo..."
+      replying: Respondendo...
   date: 
     formats: 
       birthday: "%B %d"
@@ -507,6 +514,7 @@ pt-BR:
     show: 
       does_not_exist: "Esta pessoa não existe!"
       has_not_shared_with_you_yet: "%{name}, não possui nenhuma postagem compartilhada com você ainda!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name}, quer compartilhar com você."
       mention: "Mencionar"
       message: "Mensagem"
@@ -538,7 +546,7 @@ pt-BR:
     new: 
       back_to_list: "Voltar para Lista"
       new_photo: "Nova Foto"
-      post_it: "Enviar!"
+      post_it: Enviar!
     new_photo: 
       empty: "{file} está vazio, por favor, selecione os arquivos novamente."
       invalid_ext: "{file} possui uma extensão inválida. Somente {extensions} são permitidos."
@@ -559,16 +567,13 @@ pt-BR:
     update: 
       error: "Falha ao tentar enviar a foto."
       notice: "A foto foi enviada com sucesso."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "%{name}'s a postagem foi escondida, e as notificações estão silenciadas."
-      see_it_on_their_profile: "Para ver as atualizações desta postagem visite o perfil de %{name}'s"
   posts: 
     show: 
       destroy: "Deletar"
       not_found: "Desculpe! Não foi possível encontrar."
       permalink: "link permanente"
   previous: "Anterior"
+  privacy: "Privacy"
   profile: "Perfil"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ pt-BR:
       edit: "Editar %{name}"
       leave_blank: "(deixe em branco se não quiser alterar)"
       password_to_confirm: "(digite a senha atual para as alterações)"
-      unhappy: "Infeliz?"
+      unhappy: Infeliz?
       update: "Atualizar"
     new: 
       create_my_account: "Criar minha conta"
@@ -637,7 +642,7 @@ pt-BR:
       existing: "Contatos existentes"
       manage_within: "Gerenciar contatos dentro"
     new_request_to_person: 
-      sent: "Enviado!"
+      sent: Enviado!
   reshares: 
     comment_email_subject: "%{resharer}'s postagem compartilhada por %{author}"
     create: 
@@ -685,11 +690,15 @@ pt-BR:
       not_on_diaspora: "Não está ainda em Diaspora"
       resend: "Reenviar"
   settings: "Configurações"
+  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: "Adicione um novo contato"
       create_request: "Procurar por Diaspora ID"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Digite um usuário Diaspora:"
       know_email: "Você sabe seus e-mails? Convide-os!"
       your_diaspora_username_is: "Seu nome de usuário em Diaspora é: %{diaspora_handle}"
@@ -737,7 +746,7 @@ pt-BR:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Postar uma mensagem para %{aspect}"
-      posting: "Postando..."
+      posting: Postando...
       publishing_to: "publicando para:"
       share: "Compartilhar"
       share_with: "Compartilhar com %{aspect}"
@@ -750,6 +759,8 @@ pt-BR:
       currently_unavailable: "commenting currently unavailable"
       dislike: "Descurtir"
       hide_and_mute: "Ocultar e Silenciar"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Curtir"
       shared_with: "Compartilhado com: %{aspect_names}"
       unlike: "Descurtir"
@@ -830,7 +841,7 @@ pt-BR:
       typical_userpage: "Uma típica página do cubbi.es"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es é a primeira aplicação do mundo feita para Diaspora. E também a melhor maneira de coletar imagens online."
-  undo: "Desfazer?"
+  undo: Desfazer?
   username: "Usuário"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ pt-BR:
       hashtag_explanation: "As hashtags permitem à você compartilhar e acompanhar os teus interesses. Elas também são uma ótima maneira de encontrar novas pessoas em Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ pt-BR:
       signed_out: "Você saiu de Diaspora*"
       simply_visit: "Basta visitar"
       works_on_modern: "Funciona em todos smartphones modernos"
+    privacy_settings: 
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "O usuário %{username} não existe!"
     update: 
@@ -901,4 +916,4 @@ pt-BR:
     no_person_constructed: "Não foi possível construir uma pessoa a partir deste hcard."
     not_enabled: "O webfinger parece não estar habilitado para o servidor %{account}"
     xrd_fetch_failed: "Ocorreu um problema ao obter o xrd da conta %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index d36d7d20c..08d8958ff 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -167,6 +167,13 @@ pt-PT:
       no_applications: "Ainda não registou nenhuma aplicação."
       revoke_access: "Revogar o Acesso"
   back: "Voltar"
+  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: 
     explanation: "Publique no Diaspora de qualquer lado ao adicionar %{link} como marcador."
     explanation_link_text: "esta hiperligação"
@@ -254,7 +261,7 @@ pt-PT:
     helper: 
       correct_the_following_errors_and_try_again: "Corrija os seguintes erros e volte a tentar."
       invalid_fields: "Campos Inválidos"
-  fill_me_out: "Informe-me"
+  fill_me_out: Informe-me
   find_people: "Encontrar pessoas ou #tags"
   hide: "Esconder"
   home: 
@@ -471,7 +478,7 @@ pt-PT:
     to_change_your_notification_settings: "para alterar as suas definições de notificação"
   ok: "OK"
   or: "ou"
-  password: "Palavra-passe"
+  password: Palavra-passe
   password_confirmation: "Confirmação de palavra-passe"
   people: 
     add_contact_small: 
@@ -507,6 +514,7 @@ pt-PT:
     show: 
       does_not_exist: "Essa pessoa não existe!"
       has_not_shared_with_you_yet: "%{name} ainda não partilhou quaisquer publicações consigo!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name} quer partilhar consigo"
       mention: "Mencionar"
       message: "Mensagem"
@@ -538,7 +546,7 @@ pt-PT:
     new: 
       back_to_list: "Voltar à Lista"
       new_photo: "Nova Fotografia"
-      post_it: "Publique!"
+      post_it: Publique!
     new_photo: 
       empty: "{file} está vazio, por favor seleccione de novo os ficheiros sem este último."
       invalid_ext: "{file} tem uma extensão inválida. Apenas são permitidas as extensões {extensions}."
@@ -559,16 +567,13 @@ pt-PT:
     update: 
       error: "Falha ao editar a fotografia"
       notice: "Fotografia actualizada com sucesso."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "A publicação de %{name} foi escondida, e as notificações foram silenciadas."
-      see_it_on_their_profile: "Se deseja ver as actualizações desta publicação, visite a página de perfil de %{name}."
   posts: 
     show: 
       destroy: "Apagar"
       not_found: "Lamentamos muito, mas não foi possível encontrar essa publicação."
       permalink: "permalink"
   previous: "anterior"
+  privacy: "Privacy"
   profile: "Perfil"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ pt-PT:
       edit: "Editar %{name}"
       leave_blank: "(deixe em branco se não quiser modificar)"
       password_to_confirm: "(necessitamos da sua palavra-passe actual para confirmar as modificações)"
-      unhappy: "Descontente?"
+      unhappy: Descontente?
       update: "Actualizar"
     new: 
       create_my_account: "Criar a minha conta"
@@ -637,7 +642,7 @@ pt-PT:
       existing: "Contactos existentes"
       manage_within: "Gerir contactos dentro de"
     new_request_to_person: 
-      sent: "enviado!"
+      sent: enviado!
   reshares: 
     comment_email_subject: "repartilha de %{resharer} da publicação de %{author}"
     create: 
@@ -685,11 +690,15 @@ pt-PT:
       not_on_diaspora: "Ainda não no Diaspora"
       resend: "reenviar"
   settings: "Definições"
+  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: "Adicionar um novo contacto"
       create_request: "Encontrar através da identificação do Diaspora"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Introduza um nome de utilizador do Diaspora:"
       know_email: "Sabe os seus endereços de email? Deveria convidá-los"
       your_diaspora_username_is: "O seu nome de utilizador do Diaspora é: %{diaspora_handle}"
@@ -750,6 +759,8 @@ pt-PT:
       currently_unavailable: "comentar actualmente indisponível"
       dislike: "Não gosto"
       hide_and_mute: "Esconder e Silenciar"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Gosto"
       shared_with: "Partilhado com: %{aspect_names}"
       unlike: "Não Gosto"
@@ -830,7 +841,7 @@ pt-PT:
       typical_userpage: "Uma típica página de utilizador do cubbi.es"
       via: "(via %{link})"
       what_is_cubbies: "O Cubbi.es é a primeira aplicação Diaspora do mundo.  É também a melhor forma de coleccionar fotografias online."
-  undo: "Anular?"
+  undo: Anular?
   username: "Nome de utilizador"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ pt-PT:
       hashtag_explanation: "Hashtags permitem-lhe falar sobre e seguir os seus interesses.  Também são uma óptima forma de conhecer novas pessoas no Diaspora."
       hashtag_suggestions: "Siga etiquetas como #arte, #cinema, #gif, etc."
       hooking_up_fb: "ligar à sua conta de Facebook"
-      saved: "Guardado!"
+      saved: Guardado!
       we_can_speed_things_up: "Podemos acelerar as coisas um pouco mais ao"
       well_hello_there: "Oh, olá!"
       what_are_you_in_to: "O que gostas mais?"
@@ -883,6 +894,10 @@ pt-PT:
       signed_out: "Você saiu do Diaspora*"
       simply_visit: "Visite"
       works_on_modern: "Funciona em todos os recentes smartphones"
+    privacy_settings: 
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "O utilizador %{username} não existe!"
     update: 
@@ -901,4 +916,4 @@ pt-PT:
     no_person_constructed: "Nenhuma pessoa pôde ser construída através deste hcard."
     not_enabled: "webfinger parece não estar activado para o anfitrião de %{account}"
     xrd_fetch_failed: "ocorreu um erro ao obter o xrd da conta %{account}"
-  welcome: "Bem-vindo(a)!"
+  welcome: Bem-vindo(a)!
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index c9f75a2c7..57a1f47f2 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -167,6 +167,13 @@ ro:
       no_applications: "You haven't registered any applications yet."
       revoke_access: "Revoke Access"
   back: "Înapoi"
+  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: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
@@ -179,7 +186,7 @@ ro:
     many: "%{count} comments"
     new_comment: 
       comment: "Comentariu"
-      commenting: "Comentând..."
+      commenting: Comentând...
     one: "1 comment"
     other: "%{count} comments"
     two: "%{count} comments"
@@ -234,7 +241,7 @@ ro:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Trimite"
-      sending: "Trimitere..."
+      sending: Trimitere...
       subject: "subiect"
       to: "către"
     new_message: 
@@ -242,19 +249,19 @@ ro:
     show: 
       delete: "delete and block conversation"
       reply: "reply"
-      replying: "Replying..."
+      replying: Replying...
   date: 
     formats: 
       birthday: "%B %d"
       birthday_with_year: "%B %d %Y"
       fullmonth_day: "%B %d"
   delete: "Şterge"
-  email: "E-mail"
+  email: E-mail
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Corectaţi următoarele erori şi încercaţi din nou."
       invalid_fields: "Câmpuri invalide"
-  fill_me_out: "Umple-mă"
+  fill_me_out: Umple-mă
   find_people: "Find people"
   hide: "Ascunde"
   home: 
@@ -507,6 +514,7 @@ ro:
     show: 
       does_not_exist: "Persoana nu există!"
       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: "You have an incoming request from this person."
       mention: "Mention"
       message: "Message"
@@ -538,7 +546,7 @@ ro:
     new: 
       back_to_list: "Înapoi la Listă"
       new_photo: "Nouă Fotografie"
-      post_it: "postează!"
+      post_it: postează!
     new_photo: 
       empty: "{file} is empty, please select files again without it."
       invalid_ext: "{file} are o extensie invalidă. Doar extensiile {extensions} sunt permise."
@@ -559,16 +567,13 @@ ro:
     update: 
       error: "Nu s-a reuşit editarea fotografiii."
       notice: "Fotografia a fost actualizată cu succes."
-  post_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."
   posts: 
     show: 
       destroy: "Şterge"
       not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   previous: "anterioare"
+  privacy: "Privacy"
   profile: "Profil"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ ro:
       edit: "Editează %{name}"
       leave_blank: "(lăsaţi necompletat dacă nu doriţi să o schimbaţi)"
       password_to_confirm: "(avem nevoie de parola curentă pentru a confirma modificările)"
-      unhappy: "Nefericit?"
+      unhappy: Nefericit?
       update: "Actualizează"
     new: 
       create_my_account: "Create my account"
@@ -619,7 +624,7 @@ ro:
       sign_up_message: "Social Networking with a <3"
   requests: 
     create: 
-      sending: "Trimitere..."
+      sending: Trimitere...
       sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
     destroy: 
       error: "Vă rugăm să selectaţi un aspect!"
@@ -637,7 +642,7 @@ ro:
       existing: "Contactele existente"
       manage_within: "Manage contacts within"
     new_request_to_person: 
-      sent: "trimis!"
+      sent: trimis!
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -685,6 +690,10 @@ ro:
       not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   settings: "Setări"
+  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: "Adaugă un nou contact"
@@ -737,7 +746,7 @@ ro:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Post a message to %{aspect}"
-      posting: "Publicare..."
+      posting: Publicare...
       publishing_to: "publishing to: "
       share: "Distribuie"
       share_with: "Share with %{aspect}"
@@ -750,6 +759,8 @@ ro:
       currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "I like this"
       shared_with: "Shared with: %{aspect_names}"
       unlike: "Nu ȋmi place"
@@ -830,7 +841,7 @@ ro:
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es este prima aplicaţie Diaspora din lume.  Este cea mai bună metodă de a colecta imagini online."
-  undo: "Undo?"
+  undo: Undo?
   username: "Nume de utilizator"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ ro:
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ ro:
       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: "Utilizatorul %{username} nu există!"
     update: 
@@ -901,4 +916,4 @@ ro:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index bef013fe5..d6f9686c6 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -35,7 +35,7 @@ ru:
             email: 
               taken: "уже занято."
             person: 
-              invalid: "недействительно."
+              invalid: недействительно.
             username: 
               invalid: "не подходит. Можно использовать только буквы, цифры и знак подчеркивания."
               taken: "уже занято."
@@ -111,13 +111,13 @@ ru:
         here_to_help: "Сообщество Диаспоры всегда рядом!"
         need_help: "Нужна помощь?"
         satisfaction: "%{link}: осуществляемая сообществом поддержка"
-        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial}, %{wiki} и %{forum}: составляемые сообществом справочные пособия, инструкции и новости."
       introduce_yourself: "Это ваш поток. Ныряйте и осваивайтесь здесь."
       keep_us_running: "Помогите %{pod} работать быстро — купите нашим серверам дозу кофе, сделав ежемесячное пожертвование!"
       new_here: 
-        follow: "Follow %{link} and welcome new users to Diaspora*!"
-        learn_more: "Learn more"
-        title: "Welcome New Users"
+        follow: "Следите за меткой %{link} и приветствуйте новых пользователей в Диаспоре*!"
+        learn_more: "Узнать больше"
+        title: "Приветствуйте новичков"
       no_contacts: "Контакты отсутствуют"
       no_tags: "+ Найти метку"
       people_sharing_with_you: "Люди делятся с вами"
@@ -167,6 +167,13 @@ ru:
       no_applications: "Вы еще не зарегистрировали ни одного приложения."
       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: 
     explanation: "Пишите в Диаспору с любой страницы с помощью %{link}."
     explanation_link_text: "этой закладки"
@@ -179,7 +186,7 @@ ru:
     many: "%{count} комментариев"
     new_comment: 
       comment: "Комментировать"
-      commenting: "Комментирование..."
+      commenting: Комментирование...
     one: "1 комментарий"
     other: "%{count} комментариев"
     two: "%{count} комментариев"
@@ -234,7 +241,7 @@ ru:
     new: 
       abandon_changes: "Отказаться от изменений?"
       send: "Отправить"
-      sending: "Отправка..."
+      sending: Отправка...
       subject: "тема"
       to: "кому"
     new_message: 
@@ -242,7 +249,7 @@ ru:
     show: 
       delete: "удалить и заблокировать разговор"
       reply: "ответить"
-      replying: "Ответ..."
+      replying: Ответ...
   date: 
     formats: 
       birthday: "%d %B"
@@ -291,7 +298,7 @@ ru:
       comma_seperated_plz: "Вы можете ввести несколько адресов электронной почты через запятую."
       if_they_accept_info: "после согласия с их стороны, они будут добавлены в предложенный вами аспект."
       invite_someone_to_join: "Пригласить кого-либо в Диаспору!"
-      language: "Language"
+      language: "Язык"
       personal_message: "Личное сообщение"
       resend: "Ещё раз послать"
       send_an_invitation: "Отправить приглашение"
@@ -301,7 +308,7 @@ ru:
     application: 
       powered_by: "ПОДДЕРЖИВАЕТСЯ ДИАСПОРОЙ*"
       public_feed: "Общественный канал диаспоры для %{name}"
-      toggle: "обычный/мобильный"
+      toggle: обычный/мобильный
       whats_new: "что нового?"
       your_aspects: "Ваши аспекты"
     header: 
@@ -440,7 +447,7 @@ ru:
       two: "%{actors} начал(а) делиться с вами."
       zero: "%{actors} начали делиться с вами."
   notifier: 
-    a_post_you_shared: "запись."
+    a_post_you_shared: запись.
     click_here: "нажмите сюда,"
     comment_on_post: 
       reply: "Ответить или посмотреть запись %{name} >"
@@ -507,6 +514,7 @@ ru:
     show: 
       does_not_exist: "Персоны не существует!"
       has_not_shared_with_you_yet: "%{name} еще не делился записями с вами!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name} хочет поделиться с вами"
       mention: "Упоминание"
       message: "Сообщение"
@@ -538,7 +546,7 @@ ru:
     new: 
       back_to_list: "Вернуться к списку"
       new_photo: "Новая фотография"
-      post_it: "Опубликовать!"
+      post_it: Опубликовать!
     new_photo: 
       empty: "{file} пуст, выберите пожалуйста файл повторно."
       invalid_ext: "{file} имеет недопустимое расширение. Разрешены только {extensions}."
@@ -559,16 +567,13 @@ ru:
     update: 
       error: "Не удалось изменить фотографию."
       notice: "Фотография успешно загружена."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "Запись пользователя %{name} была скрыта вместе с уведомлениями."
-      see_it_on_their_profile: "Если вы хотите видеть обновления этой записи, посетите профиль пользователя %{name}."
   posts: 
     show: 
       destroy: "Удалить"
       not_found: "Извините, мы не смогли найти эту запись."
       permalink: "постоянная ссылка"
   previous: "предыдущая"
+  privacy: "Privacy"
   profile: "Профиль"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ ru:
       edit: "Редактировать %{name}"
       leave_blank: "(Оставьте пустым, если не хотите менять)"
       password_to_confirm: "(введите ваш текущий пароль для подтверждения изменений)"
-      unhappy: "Недовольны?"
+      unhappy: Недовольны?
       update: "Обновить"
     new: 
       create_my_account: "Создать мой аккаунт!"
@@ -637,7 +642,7 @@ ru:
       existing: "Существующие контакты"
       manage_within: "Управление контактами в"
     new_request_to_person: 
-      sent: "отправлено!"
+      sent: отправлено!
   reshares: 
     comment_email_subject: "Перепост %{resharer} записи %{author}"
     create: 
@@ -685,11 +690,15 @@ ru:
       not_on_diaspora: "Еще нет в Диаспоре"
       resend: "отправить повторно"
   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: "Добавить контакт"
       create_request: "Поиск по идентификатору в Диаспоре"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Введите имя пользователя Диаспоры:"
       know_email: "Знаете их email адреса? Вы должны предложить им присоединится к Диаспоре "
       your_diaspora_username_is: "Ваше имя пользователя Диаспоры: %{diaspora_handle}"
@@ -735,9 +744,9 @@ ru:
       new_user_prefill: 
         hello: "Привет всем, я тут #%{new_user_tag}."
         i_like: "Я интересуюсь %{tags}."
-        invited_by: "Thanks for the invite, "
+        invited_by: "Спасибо за приглашение, "
       post_a_message_to: "Опубликовать сообщение для %{aspect}"
-      posting: "Отправка..."
+      posting: Отправка...
       publishing_to: "публикация в:"
       share: "Поделиться"
       share_with: "поделиться с"
@@ -750,6 +759,8 @@ ru:
       currently_unavailable: "комментирование недоступно"
       dislike: "Не нравится"
       hide_and_mute: "Скрыть и отключить уведомления"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Мне нравится"
       shared_with: "Для аспектов: %{aspect_names}"
       unlike: "Не нравится"
@@ -806,8 +817,8 @@ ru:
       failure: "Ошибка отслеживания метки #%{name}. Возможно, вы уже следите за ней?"
       success: "Ура! Теперь вы следите за меткой #%{name}."
     destroy: 
-      failure: "Не вышло перестать следить за: #%{name}"
-      success: "Вы успешно перестали следить за: #%{name}"
+      failure: "Не вышло перестать следить за меткой #%{name}. Возможно, вы уже отписались от нее?"
+      success: "Увы! Вы больше не следите за меткой #%{name}."
   tags: 
     show: 
       follow: "Следить за меткой #%{tag}"
@@ -830,7 +841,7 @@ ru:
       typical_userpage: "Типичная cubbi.es страница"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es - это первое в мире приложение для Диаспоры. Кроме того, это лучший способ создания коллекции фотографий в Интернете."
-  undo: "Отменить?"
+  undo: Отменить?
   username: "Имя пользователя"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ ru:
       hashtag_explanation: "Метки позволяют вам обсуждать и следить за интересующими вас темами. Это также отличный способ поиска единомышленников в Диаспоре."
       hashtag_suggestions: "Попробуйте следующие метки, например #искусство, #кино, #gif и т. п."
       hooking_up_fb: "подключив вашу учетную запись Facebook"
-      saved: "Сохранено!"
+      saved: Сохранено!
       we_can_speed_things_up: "Регистрацию можно ускорить"
       well_hello_there: "Приветствуем вас!"
       what_are_you_in_to: "Чем вы интересуетесь?"
@@ -883,6 +894,10 @@ ru:
       signed_out: "Вы вышли из Диаспоры*"
       simply_visit: "Просто зайдите на"
       works_on_modern: "Работает на всех современных смартфонах"
+    privacy_settings: 
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "Пользователя %{username} не существует!"
     update: 
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index f41719aa1..9e5e85982 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -167,6 +167,13 @@ sk:
       no_applications: "Ešte ste nezaregistrovali žiadne aplikácie."
       revoke_access: "Zamedziť prístup"
   back: "Späť"
+  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: 
     explanation: "Píšte na Diasporu z hocikiaľ tak, že si pridáte do záložiek odkaz %{link}."
     explanation_link_text: "tento odkaz"
@@ -249,7 +256,7 @@ sk:
       birthday_with_year: "%e. %B %Y"
       fullmonth_day: "%e. %B "
   delete: "Zmazať"
-  email: "E-mail"
+  email: E-mail
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Opravte nasledujúce chyby a skúste znova."
@@ -440,7 +447,7 @@ sk:
       two: "%{actors} sa začali s vami deliť o rôzne veci."
       zero: "%{actors} sa s vami začalo deliť o rôzne veci."
   notifier: 
-    a_post_you_shared: "príspevok."
+    a_post_you_shared: príspevok.
     click_here: "Kliknite sem"
     comment_on_post: 
       reply: "Zobraziť príspevok použ. %{name} alebo naň odpovedať >"
@@ -507,6 +514,7 @@ sk:
     show: 
       does_not_exist: "Osoba neexistuje!"
       has_not_shared_with_you_yet: "%{name} sa s vami ešte nepodelil(a) o žiadne príspevky!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name} sa s vami chce o niečo podeliť"
       mention: "Zmienka"
       message: "Správa"
@@ -559,16 +567,13 @@ sk:
     update: 
       error: "Nepodarilo sa upraviť fotku."
       notice: "Fotka bola úspešne aktualizovaná."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "Príspevok použ. %{name} sa skryl a oznamy boli vypnuté."
-      see_it_on_their_profile: "Ak chcete vidieť aktualizácie tohto príspevku, navštívte stránku s profilom použ. %{name}."
   posts: 
     show: 
       destroy: "Odstrániť"
       not_found: "Prepáčte, tento príspevok sa nepodarilo nájsť."
       permalink: "trvalý odkaz"
   previous: "Predchádzajúce"
+  privacy: "Privacy"
   profile: "Profil"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ sk:
       edit: "Upraviť %{name}"
       leave_blank: "(ak to nechcete zmeniť, nevypĺňajte, prosím, toto pole)"
       password_to_confirm: "(na potvrdenie zmien budeme potrebovať Vaše heslo)"
-      unhappy: "Nešťastný?"
+      unhappy: Nešťastný?
       update: "Aktualizovať"
     new: 
       create_my_account: "Založte si účet!"
@@ -637,7 +642,7 @@ sk:
       existing: "Existujúce kontakty"
       manage_within: "Spravovať kontakty v"
     new_request_to_person: 
-      sent: "Poslané!"
+      sent: Poslané!
   reshares: 
     comment_email_subject: "%{resharer} sa znova podelil(a) o príspevok použ. %{author}"
     create: 
@@ -685,11 +690,15 @@ sk:
       not_on_diaspora: "Ešte nie je na Diaspore"
       resend: "preposlať"
   settings: "Nastavenia"
+  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: "Pridať nový kontakt"
       create_request: "Nájsť podľa ID na Diasporu"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Zadajte používateľské meno na Diasporu:"
       know_email: "Poznáte túto adresu? Môžete na ňu poslať pozvánku."
       your_diaspora_username_is: "Vaše používateľské meno na Diaspore je %{diaspora_handle}"
@@ -708,7 +717,7 @@ sk:
       logged_in_as: "prihlásili ste sa ako %{name}"
       your_aspects: "vaše kategórie"
     invitations: 
-      by_email: "E-mailom"
+      by_email: E-mailom
       dont_have_now: "Momentálne už nemáte žiadnu, ale ďalšie čoskoro prídu!"
       from_facebook: "Z Facebooku"
       invitations_left: "ostáva(jú) %{count} "
@@ -750,6 +759,8 @@ sk:
       currently_unavailable: "commenting currently unavailable"
       dislike: "Nepáči sa mi to"
       hide_and_mute: "Schovať a vypnúť"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Páči sa mi to"
       shared_with: "Zdieľa sa s kategóriami: %{aspect_names}"
       unlike: "Odznačiť"
@@ -871,7 +882,7 @@ sk:
       hashtag_explanation: "Hashtagy vám umožňujú hovoriť o tom, čo vás zaujíma a sledovať diskusie o takýchto veciach.   Je to aj skvelý spôsob, ako nájsť nových ľudí na Diaspore."
       hashtag_suggestions: "Skúste štítky ako napr. #art, #movies, #gif, atď."
       hooking_up_fb: "prepojíte svoj účet na Facebooku"
-      saved: "Uložené!"
+      saved: Uložené!
       we_can_speed_things_up: "Môžeme veci urýchliť, ak"
       well_hello_there: "Nuž, ahoj!"
       what_are_you_in_to: "Čo vás baví?"
@@ -883,6 +894,10 @@ sk:
       signed_out: "Odhlásili ste sa z Diaspory*"
       simply_visit: "Jednoducho navštívte"
       works_on_modern: "Funguje na všetkých moderných smartfónoch"
+    privacy_settings: 
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "Používateľ %{username} neexistuje!"
     update: 
@@ -901,4 +916,4 @@ sk:
     no_person_constructed: "Žiadna osoba nemôže byť vytvorená z tejto hcard."
     not_enabled: "Zdá sa, že webfinger nie je povolený pre hostiteľa účtu %{account}"
     xrd_fetch_failed: "Pri získavaní xrd z účtu %{account} nastala chyba"
-  welcome: "Vitajte!"
+  welcome: Vitajte!
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index c0665cc0e..78bf0da41 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -1,4 +1,4 @@
-#   Copyright (c) 2011, Diaspora Inc.  This file is
+#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
@@ -6,302 +6,440 @@
 sl: 
   _applications: "Applications"
   _comments: "Komentarji"
-  _contacts: "Contacts"
+  _contacts: "Stiki"
   _home: "Domov"
   _photos: "slike"
-  _services: "Servisi"
-  account: "Uporabniški račun"
+  _services: "Storitve"
+  account: "Uporabniki raun"
   activerecord: 
     errors: 
       models: 
         contact: 
           attributes: 
             person_id: 
-              taken: "must be unique among this user's contacts."
+              taken: "ne sme biti enak drugim stikom te osebe."
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "is already taken."
+              taken: !binary |
+                  amUgnmUgemFzZWRlbi4=
         request: 
           attributes: 
             from_id: 
-              taken: "is a duplicate of a pre-existing request."
+              taken: !binary |
+                  amUgZHZvam5payB2bG9nZSwga2kgnmUgb2JzdGFqYS4=
         reshare: 
           attributes: 
             root_guid: 
-              taken: "You've already reshared that post!"
+              taken: !binary |
+                  VG8gb2JqYXZvIHN0ZSCeZSBkZWxpbGkh
         user: 
           attributes: 
             email: 
-              taken: "is already taken."
+              taken: !binary |
+                  amUgnmUgemFzZWRlbi4=
             person: 
-              invalid: "is invalid."
+              invalid: "je neveljaven."
             username: 
-              invalid: "is invalid. We only allow letters, numbers, and underscores"
-              taken: "is already taken."
+              invalid: !binary |
+                  amUgbmV2ZWxqYXZlbi4gRG92b2xqZW5hIGplIHVwb3JhYmEgbGUg6HJrLCCa
+                  dGV2aWxrIGluICBwb2TocnRhamV2
+              taken: !binary |
+                  amUgnmUgemFzZWRlbi4=
   ago: "%{time} nazaj"
-  all_aspects: "Vse skupine"
+  all_aspects: "Vsi pogledi"
   application: 
     helper: 
       diaspora_alpha: "DIASPORA* ALPHA"
       unknown_person: "neznana oseba"
       video_title: 
-        unknown: "Neznani video naslov"
-  are_you_sure: "Ste prepričani?"
+        unknown: "Neznani naslov videa"
+  are_you_sure: !binary |
+      U3RlIHByZXByaehhbmk/
   aspect_memberships: 
     destroy: 
-      failure: "Failed to remove person from aspect"
-      no_membership: "Could not find the selected person in that aspect"
-      success: "Successfully removed person from aspect"
+      failure: !binary |
+          T2RzdHJhbml0ZXYgb3NlYmUgaXogcG9nbGVkYSBuaSBiaWxhIHVzcGWabmE=
+      no_membership: "Oseba ni bila najdena znotraj tega pogleda"
+      success: !binary |
+          T3NlYmEgamUgYmlsYSBpeiBwb2dsZWRhIHVzcGWabm8gb2RzdHJhbmplbmE=
   aspects: 
     add_to_aspect: 
-      failure: "Dodajanje stika v skupino ni uspelo."
-      success: "Dodajanje stika v skupino je uspelo."
+      failure: "Dodajanje stika v pogled ni uspelo."
+      success: "Dodajanje stika v pogled je uspelo."
     aspect_contacts: 
-      done_editing: "zaključi urejanje"
+      done_editing: !binary |
+          emFrbGp16GkgdXJlamFuamU=
     aspect_listings: 
-      add_an_aspect: "+ Add an aspect"
+      add_an_aspect: "+ Dodaj pogled"
+      deselect_all: "Deselect all"
+      edit_aspect: "Edit %{name}"
+      select_all: "Select all"
     aspect_stream: 
-      commented_on: "commented on"
-      posted: "posted"
-      recently: "recently:"
-      stream: "Stream"
-    contacts_not_visible: "Stiki v tej skupini drug drugega ne bodo videli."
-    contacts_visible: "Stiki v tej skupini drug drugega lahko vidijo."
+      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: "Stiki v tem pogledu drug drugega ne bodo videli."
+    contacts_visible: "Stiki v tem pogledu drug drugega lahko vidijo."
     create: 
-      failure: "Ustvarjanje skupine ni uspelo."
-      success: "Skupina %{name} je ustvarjena"
+      failure: "Ustvarjanje pogleda ni uspelo."
+      success: "Pogled %{name} je ustvarjena"
     destroy: 
-      failure: "%{name} is not empty and could not be removed."
-      success: "%{name} je uspešno odstranjen."
+      failure: !binary |
+          JXtuYW1lfSBuaSBwcmF6ZW4gaW4gZ2EgbmkgbW9nb+hlIG9kc3RyYW5pdGku
+      success: !binary |
+          JXtuYW1lfSBqZSB1c3Blmm5vIG9kc3RyYW5qZW4u
     edit: 
-      add_existing: "Dodaj obstoječ kontakt"
-      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
-      aspect_list_is_visible: "aspect list is visible to others in aspect"
-      confirm_remove_aspect: "Ste prepričani, da bi radi izbrisali ta vidik?"
-      done: "Done"
-      make_aspect_list_visible: "make aspect list visible?"
-      remove_aspect: "Izbriši ta vidik"
+      add_existing: !binary |
+          RG9kYWogb2JzdG9qZeggc3Rpaw==
+      aspect_list_is_not_visible: "seznam pogledov ni viden drugim stikom  pogleda"
+      aspect_list_is_visible: "seznam pogledov je viden drugim stikom pogleda"
+      confirm_remove_aspect: !binary |
+          U3RlIHByZXByaehhbmksIGRhIGJpIHJhZGkgaXpicmlzYWxpIHRhIHBvZ2xl
+          ZD8=
+      done: !binary |
+          S29u6GFubw==
+      make_aspect_list_visible: !binary |
+          b3puYehpIHNlem5hbSBwb2dsZWRvdiBrb3QgdmlkZW4/
+      remove_aspect: !binary |
+          SXpicmmaaSB0YSBwb2dsZWQ=
       rename: "preimenuj"
-      update: "update"
-      updating: "updating"
-    few: "%{count} aspects"
+      update: "posodobi"
+      updating: "posodabljam"
+    few: "%{count} pogledov"
     helper: 
-      are_you_sure: "Ste prepričani, da želite izbrisati skupino?"
-      aspect_not_empty: "Skupina vsebuje stike"
+      are_you_sure: !binary |
+          U3RlIHByZXByaehhbmksIGRhIJ5lbGl0ZSBpemJyaXNhdGkgdGEgcG9nbGVk
+          Pw==
+      aspect_not_empty: "Pogled vsebuje stike"
       remove: "odstrani"
     index: 
       cubbies: 
-        explanation: "Cubbi.es is the first Diaspora application under development."
-        heading: "Connect to Cubbi.es"
-        learn_more: "Learn more"
+        explanation: "Cubbi.es je prva Diaspora aplikacija v razvoju."
+        heading: !binary |
+            UG92ZZ5pIHNlIHogQ3ViYmkuZXM=
+        learn_more: !binary |
+            VmXoIGluZm9ybWFjaWo=
       diaspora_id: 
-        content_1: "Your Diaspora ID is:"
-        content_2: "Give it to anyone and they'll be able to find you on Diaspora."
+        content_1: !binary |
+            VmGaIERpYXNwb3JhIElEIGplOg==
+        content_2: !binary |
+            U3ZvaiBEaWFzcG9yYSBJRCBkZWxpdGUgeiBkcnVnaW1pLCBkYSB2YXMgYm9k
+            byBsYWhrbyBuYZpsaS4=
         heading: "Diaspora ID"
-      donate: "Donate"
-      handle_explanation: "To je vaš diaspora naslov. Tako kot vaš e-naslov, ga lahko uporabite kot naslov s pomočjo katerega drugi stopijo v stik z vami."
+      donate: "Prispevaj"
+      handle_explanation: !binary |
+          VG8gamUgdmGaIERpYXNwb3JhIElEIG5hc2xvdi4gVGFrbyBrb3QgdmGaIGUt
+          bmFzbG92LCAgZ2EgbGFoa28gdXBvcmFiaXRlIGtvdCBuYXNsb3YgcyBwb21v
+          6GpvIGthdGVyZWdhIGRydWdpIHN0b3Bpam8gdiBzdGlrIHogdmFtaS4=
       help: 
-        did_you: "Did you:"
-        feature_suggestion: "... have a %{link} suggestion?"
-        find_a_bug: "... find a %{link}?"
-        have_a_question: "... have a %{link}?"
-        here_to_help: "Diaspora community is here to help!"
-        more_support: "For more support, you should also check out %{link}."
-        need_help: "Need Help?"
-        tutorials: "For tutorials, check out %{link}."
-      keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
-      no_contacts: "Ni kontaktov"
-      no_tags: "No tags"
-      people_sharing_with_you: "People sharing with you"
-      post_a_message: "post a message >>"
+        do_you: "Do you:"
+        email_feedback: "%{link} your feedback, if you prefer"
+        feature_suggestion: "... imeli %{link} predlog?"
+        find_a_bug: !binary |
+            Li4uIG5hmmxpICV7bGlua30/
+        have_a_question: "... imeli %{link}?"
+        here_to_help: "Diaspora skupnost je tukaj, da vam pomaga!"
+        need_help: !binary |
+            UG90cmVidWpldGUgcG9tb+g/
+        satisfaction: "%{link}: Community-powered support"
+        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: !binary |
+          UG9tYWdhanRlICV7cG9kfSwgZGEgYm8gdGVrZWwgaGl0cmVqZSwga3VwaXRl
+          IG5hmmltICBzdHJlnm5pa29tIG1lc2Xobm8gZG96byBrYXZlIQ==
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
+      no_contacts: "Ni stikov"
+      no_tags: "Ni oznak"
+      people_sharing_with_you: "Ljudje, ki delijo z vami"
+      post_a_message: !binary |
+          b2JqYXZpIHNwb3Jv6GlsbyA+Pg==
       services: 
-        content: "You can connect the following services to Diaspora:"
-        heading: "Connect Services"
-      tags_following: "Followed Tags"
-      unfollow_tag: "Stop following #%{tag}"
-      your_aspects: "Your Aspects"
-    many: "%{count} aspects"
+        content: !binary |
+            WiB2YZppbSBEaWFzcG9yYSBuYXNsb3ZvbSBsYWhrbyBwb3ZlnmV0ZSBuYXNs
+            ZWRuamUgc3Rvcml0dmU=
+        heading: !binary |
+            UG92ZZ5pIHN0b3JpdHZl
+      unfollow_tag: "Nehaj slediti #%{tag}"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
+      your_aspects: !binary |
+          VmGaaSBwb2dsZWRp
+    many: "%{count} pogledov"
     move_contact: 
-      error: "Prestavljanje stika neuspešno: %{inspect}"
+      error: !binary |
+          UHJlc3RhdmxqYW5qZSBzdGlrYSBuZXVzcGWabm86ICV7aW5zcGVjdH0=
       failure: "ni uspelo %{inspect}"
       success: "Oseba je prestavljena v novo skupino"
     new: 
-      create: "Create"
-      name: "Name"
+      create: "Ustvari"
+      name: "Ime"
     no_contacts_message: 
-      featured_users: "featured users"
-      or_featured: "Or you can share with %{link}"
-      try_adding_some_more_contacts: "You can search (top) or invite (right) more contacts."
-      you_should_add_some_more_contacts: "You should add some more contacts!"
+      community_spotlight: "community spotlight"
+      or_spotlight: "Or you can share with %{link}"
+      try_adding_some_more_contacts: !binary |
+          WiB6Z29ybmppbSBva25vbSBsYWhrbyBwb2ma6GV0ZSwgeiBkZXNuaW0gIHBh
+          IHBvdmFiaXRlIHZl6CBzdGlrb3Yu
+      you_should_add_some_more_contacts: !binary |
+          TGFoa28gYmkgZG9kYWxpIJplIGtha5pubyBvc2VibyE=
     no_posts_message: 
-      start_talking: "Trenutno še brez objav. Začnite s prvo objavo!"
-    one: "1 aspect"
-    other: "%{count} aspects"
+      start_talking: !binary |
+          VHJlbnV0bm8gbmkgmmUgbmlo6GUgbmnoZXNhciBvYmphdmlsLiBaYehuaXRl
+          IHZpIQ==
+    one: "1 pogled"
+    other: "%{count} pogledov"
     seed: 
-      acquaintances: "Acquaintances"
-      family: "Družina"
-      friends: "Friends"
-      work: "Služba"
+      acquaintances: "Poznanstva"
+      family: !binary |
+          RHJ1nmluYQ==
+      friends: "Prijatelji"
+      work: !binary |
+          U2x1nmJh
     selected_contacts: 
-      manage_your_aspects: "Manage your aspects."
-      no_contacts: "You don't have any contacts here yet."
-      view_all_contacts: "View all contacts"
+      manage_your_aspects: "Urejanje pogledov."
+      no_contacts: !binary |
+          WmFlbmtyYXQgc3RlIJplIGJyZXogc3Rpa292Lg==
+      view_all_community_spotlight: "See all community spotlight"
+      view_all_contacts: "Poglej vse stike"
     show: 
-      edit_aspect: "uredi skupino"
-    two: "%{count} aspects"
+      edit_aspect: "uredi pogled"
+    two: "%{count} pogledov"
     update: 
-      failure: "Skupina %{name} ima predolgo ime, zato je ni mogoče shraniti."
-      success: "Vaša skupina %{name} je bila uspešno posodobljena."
-    zero: "no aspects"
+      failure: !binary |
+          UG9nbGVkICV7bmFtZX0gaW1hIHByZWRvbGdvIGltZSwgemF0byBnYSBuaSBt
+          b2dv6GUgc2hyYW5pdGku
+      success: !binary |
+          VmGaIHBvZ2xlZCAle25hbWV9IGplIGJpbGEgdXNwZZpubyBwb3NvZG9ibGpl
+          bi4=
+    zero: "brez pogledov"
   authorizations: 
     index: 
-      no_applications: "You haven't registered any applications yet."
-      revoke_access: "Revoke Access"
+      no_applications: !binary |
+          TmlzdGUgcG92ZXphbGkgmmUgbm9iZW5lIGFwbGlrYWNpamUu
+      revoke_access: !binary |
+          UHJla2xp6GkgZG9zdG9w
   back: "Nazaj"
+  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: 
-    explanation: "%{link} from anywhere by bookmarking this link."
-    explanation_link_text: "Post to Diaspora"
-    heading: "Diaspora Bookmarklet"
-    post_something: "Post something to Diaspora"
-    post_success: "Posted! Closing!"
-  cancel: "Prekliči"
+    explanation: "%{link} od kjerkoli - dodajte to povezavo med priljubljene."
+    explanation_link_text: "Objavi na Diaspora"
+    heading: "Diaspora zaznamek"
+    post_something: "Objavite kaj na Diaspora"
+    post_success: "Objavljeno! Zapiram!"
+  cancel: !binary |
+      UHJla2xp6Gk=
   comments: 
-    few: "%{count} comments"
-    many: "%{count} comments"
+    few: "%{count} komentarjev"
+    many: "%{count} komentarjev"
     new_comment: 
       comment: "komentiraj"
-      commenting: "komentiraj..."
-    one: "1 comment"
-    other: "%{count} comments"
-    two: "%{count} comments"
-    zero: "no comments"
+      commenting: komentiranje...
+    one: "1 komentar"
+    other: "%{count} komentarjev"
+    two: "%{count} komentarja"
+    zero: "brez komentarjev"
   contacts: 
     create: 
-      failure: "Failed to create contact"
-    featured: 
-      featured_users: "Featured Users"
-    few: "število stikov %{count}"
+      failure: !binary |
+          VXN0dmFyamFuamUgc3Rpa2EgbmkgYmlsbyBtb2dv6GU=
+    few: "%{count} stikov"
     index: 
-      add_a_new_aspect: "Add a new aspect"
-      all_contacts: "All Contacts"
-      edit_aspect: "Edit %{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."
-      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}\""
-      start_a_conversation: "Start a conversation"
-      title: "Contacts"
-      your_contacts: "Your Contacts"
-    many: "%{count} contacts"
+      add_a_new_aspect: "Dodaj nov pogled"
+      add_to_aspect: "Add contacts to %{name}"
+      all_contacts: "Vsi stiki"
+      check_out: "Check out"
+      many_people_are_you_sure: !binary |
+          U3RlIHByZXByaehhbmksIGRhIJ5lbGl0ZSB6YehldGkgemFzZWJuaSAgcG9n
+          b3ZvciB6IHZl6CBrb3QgJXtzdWdnZXN0ZWRfbGltaXR9IHN0aWtpPyBNb3Jk
+          YSBiaSBiaWxvIGJvbGplLCBkYSBiaSAgc3Bvcm/oaWxvIG9iamF2aWxpIHYg
+          cG9nbGVkdS4=
+      my_contacts: "Moji stiki"
+      no_contacts: "Ni stikov."
+      only_sharing_with_me: "Delijo samo z mano"
+      remove_person_from_aspect: "Odstrani %{person_name} iz \"%{aspect_name}\""
+      start_a_conversation: !binary |
+          WmHobmkgcG9nb3Zvcg==
+      title: "Stiki"
+      your_contacts: !binary |
+          VmGaaSBzdGlraQ==
+    many: "%{count} stikov"
     one: "1 stik"
-    other: "število stikov %{count}"
+    other: "%{count} stikov"
     sharing: 
-      people_sharing: "People sharing with you:"
-    two: "%{count} contacts"
-    zero: "brez stikov"
+      people_sharing: "Ljudje, ki delijo z vami:"
+    spotlight: 
+      community_spotlight: "Community Spotlight"
+    two: "%{count} stikov"
+    zero: "ni stikov"
   conversations: 
     create: 
-      fail: "Invalid message"
-      sent: "Message sent"
+      fail: !binary |
+          TmV2ZWxqYXZubyBzcG9yb+hpbG8=
+      sent: !binary |
+          U3Bvcm/oaWxvIHBvc2xhbm8=
     destroy: 
-      success: "Conversation successfully removed"
+      success: !binary |
+          UG9nb3ZvciB1c3Blmm5vIG9kc3RyYW5qZW4=
     helper: 
       new_messages: 
-        few: "%{count} new messages"
-        many: "%{count} new messages"
-        one: "1 new messages"
-        other: "%{count} new messages"
-        two: "%{count} new messages"
-        zero: "no new messages"
+        few: !binary |
+            JXtjb3VudH0gbm92aWggc3Bvcm/oaWw=
+        many: !binary |
+            JXtjb3VudH0gbm92aWggc3Bvcm/oaWw=
+        one: !binary |
+            MSBub3ZvIHNwb3Jv6Glsbw==
+        other: !binary |
+            JXtjb3VudH0gbm92aWggc3Bvcm/oaWw=
+        two: !binary |
+            JXtjb3VudH0gbm92aSBzcG9yb+hpbGk=
+        zero: !binary |
+            bmkgbm92aWggc3Bvcm/oaWw=
     index: 
-      create_a_new_message: "create a new message"
-      inbox: "Inbox"
-      message_inbox: "Message Inbox"
-      new_message: "New Message"
-      no_conversation_selected: "no conversation selected"
-      no_messages: "no messages"
+      create_a_new_message: !binary |
+          dXN0dmFyaSBub3ZvIHNwb3Jv6Glsbw==
+      inbox: "Prejeto"
+      message_inbox: !binary |
+          UHJlamV0YSBzcG9yb+hpbGE=
+      new_message: !binary |
+          Tm92byBzcG9yb+hpbG8=
+      no_conversation_selected: !binary |
+          b3puYehlbiBuaSBiaWwgbm9iZW4gcG9nb3Zvcg==
+      no_messages: !binary |
+          bmkgc3Bvcm/oaWw=
     new: 
-      abandon_changes: "Abandon changes?"
-      send: "Send"
-      sending: "Sending..."
-      subject: "subject"
-      to: "to"
+      abandon_changes: "Opusti spremembe?"
+      send: !binary |
+          UG+abGpp
+      sending: !binary |
+          UG+aaWxqYW0uLi4=
+      subject: "zadeva"
+      to: "za"
     new_message: 
-      fail: "Invalid message"
+      fail: !binary |
+          TmV2ZWxqYXZubyBzcG9yb+hpbG8=
     show: 
-      delete: "delete and block conversation"
-      reply: "reply"
-      replying: "Replying..."
+      delete: !binary |
+          aXpicmmaaSBpbiBibG9raXJhaiBwb2dvdm9y
+      reply: "odgovori"
+      replying: Odgovarjam...
   date: 
     formats: 
       birthday: "%B %d"
       birthday_with_year: "%B %d %Y"
       fullmonth_day: "%B %d"
-  delete: "Izbriši"
-  email: "E-pošta"
+  delete: !binary |
+      SXpicmmaaQ==
+  email: !binary |
+      RS1wb5p0YQ==
   error_messages: 
     helper: 
-      correct_the_following_errors_and_try_again: "Popravite naslednje napake in poskusite znova."
+      correct_the_following_errors_and_try_again: "Popravite naslednje napake  in poskusite znova."
       invalid_fields: "Neveljavna polja"
   fill_me_out: "Izpolni me"
   find_people: "Find people"
-  hide: "Hide"
+  hide: "Skrij"
   home: 
     show: 
-      already_account: "ali že imate uporabniški račun?"
+      already_account: !binary |
+          nmUgaW1hdGUgdXBvcmFibmmaa2kgcmHodW4/
       choice: "Izbira"
-      choice_explanation: "V Diaspori lahko vaše stike razvrščate s pomočjo skupin. Skupine kot takšne so unikatne in vam omogočajo, da so vaše slike, zgodbe in šale dostopne le osebam katerim ste jih namenili."
-      learn_about_host: "Preberite več o tem, kako gostiti lasten Diaspora strežnik."
-      login_here: "tukaj se prijavite"
-      ownership: "Lastništvo"
-      ownership_explanation: "Slike so vaša last in zato je prav, da jih lahko delite, ne da bi jih s tem komerkoli posredovali. Vsebina, ki jo delite v Diaspori, se ohrani v vaši lasti, kot tudi kontrola nad distribucijo le-te."
-      share_what_you_want: "Delite kar želite, s komerkoli želite."
+      choice_explanation: !binary |
+          ViBvbXJlnmp1IERpYXNwb3JhIGxhaGtvIHZhmmUgc3Rpa2UgcmF6dnKa6GF0
+          ZSBzIHBvbW/oam8gcG9nbGVkb3YuIFBvZ2xlZGkga290IHRha5puaSBzbyB1
+          bmlrYXRuaSBpbiB2YW0gb21vZ2/oYWpvLCBkYSBzbyB2YZplIHNsaWtlLCB6
+          Z29kYmUgaW4gmmFsZSBkb3N0b3BuZSBsZSBvc2ViYW0ga2F0ZXJpbSBzdGUg
+          amloIG5hbWVuaWxpLg==
+      learn_about_host: !binary |
+          UHJlYmVyaXRlIHZl6CBvIHRlbSwga2FrbyBnb3N0aXRpIGxhc3RlbiBEaWFz
+          cG9yYSAgc3RyZZ5uaWsu
+      login_here: "prijavite se tukaj"
+      ownership: !binary |
+          TGFzdG5pmnR2bw==
+      ownership_explanation: !binary |
+          VmGaZSBzbGlrZSBzbyB2YZphIGxhc3QgaW4gemF0byBqZSBwcmF2LCBkYSBq
+          aWggbGFoa28gZGVsaXRlLCBuZSBkYSBiaSBqaWggcyB0ZW0ga29tZXJrb2xp
+          IHBvc3JlZG92YWxpLiBWc2ViaW5hLCBraSBqbyBkZWxpdGUgdiAgb21yZZ5q
+          dSBEaWFzcG9yYSwgc2Ugb2hyYW5pIHYgdmGaaSBsYXN0aSwga290IHR1ZGkg
+          a29udHJvbGEgbmFkIGRpc3RyaWJ1Y2lqbyBsZS10ZS4=
+      share_what_you_want: !binary |
+          RGVsaXRlIGthciCeZWxpdGUsIHMga29tZXJrb2xpIJ5lbGl0ZS4=
       simplicity: "Preprostost"
-      simplicity_explanation: "Diaspora omogoča preprosto izmenjavo in upošteva vašo zasebnost. Za ohranjanje zasebnosti v Diaspori ni potrebno skozi goro različnih nastavitev in možnosti."
-      tagline_first_half: "Delite kar želite,"
-      tagline_second_half: "s komerkoli želite."
+      simplicity_explanation: !binary |
+          RGlhc3BvcmEgb21vZ2/oYSBwcmVwcm9zdG8gaXptZW5qYXZvIHogdXBvmnRl
+          dmFuamVtIHZhmmUgemFzZWJub3N0aS4gWmEgb2hyYW5qYW5qZSB6YXNlYm5v
+          c3RpIHYgRGlhc3BvcmkgbmkgcG90cmVibm8gc2tvemkgbmVza29u6GVuIHNl
+          em5hbSByYXpsaehuaWggbmFzdGF2aXRldiBpbiBtb55ub3N0aS4=
+      tagline_first_half: !binary |
+          RGVsaXRlIGthciCeZWxpdGUs
+      tagline_second_half: !binary |
+          cyBrb21lcmtvbGkgnmVsaXRlLg==
   invitations: 
-    a_facebook_user: "A Facebook user"
+    a_facebook_user: "Facebook uporabnik"
     check_token: 
       not_found: "Povabilo ni bilo najdeno"
     create: 
-      already_contacts: "S to osebo ste že povezani"
-      already_sent: "To osebo ste že povabili."
-      no_more: "Nimate več povabil."
-      own_address: "You can't send an invitation to your own address."
-      rejected: "Naslednji e-naslovi imajo težave z dostavo povabila: "
+      already_contacts: !binary |
+          UyB0byBvc2VibyBzdGUgnmUgcG92ZXphbmk=
+      already_sent: !binary |
+          VG8gb3NlYm8gc3RlIJ5lIHBvdmFiaWxpLg==
+      no_more: !binary |
+          TmltYXRlIHZl6CBwb3ZhYmlsLg==
+      own_address: "Povabila ne morete poslati na lasten e-naslov."
+      rejected: !binary |
+          TmFzbGVkbmppIGUtbmFzbG92aSBpbWFqbyB0ZZ5hdmUgeiBkb3N0YXZvIHBv
+          dmFiaWxhOiA=
       sent: "Povabila so bila poslana naslednjim: "
     edit: 
-      accept_your_invitation: "Accept your invitation"
-      your_account_awaits: "Your account awaits!"
+      accept_your_invitation: !binary |
+          U3ByZWptaXRlIHZhmmUgcG92YWJpbG8=
+      your_account_awaits: !binary |
+          VmGaIHJh6HVuIHZhcyCeZSDoYWthIQ==
     new: 
-      already_invited: "Že povabljeni"
-      aspect: "Skupina"
-      comma_seperated_plz: "Vnesete lahko več e-naslovov, ki jih med sabo ločite z vejico."
-      if_they_accept_info: "v kolikor sprejmejo vaše povabilo, bodo samodejno dodani skupinam v katere ste jih povabili."
-      invite_someone_to_join: "Povabi druge, da se pridružijo v Diasporo!"
-      personal_message: "Osebno sporočilo"
+      already_invited: !binary |
+          nmUgcG92YWJsamVuaQ==
+      aspect: "Pogled"
+      comma_seperated_plz: !binary |
+          Vm5lc2V0ZSBsYWhrbyB2ZeggZS1uYXNsb3Zvdiwga2kgbmFqIGJvZG8gbWVk
+          IHNlYm9qIGxv6GVuaSB6IHZlamljby4=
+      if_they_accept_info: !binary |
+          diBrb2xpa29yIHNwcmVqbWVqbyB2YZplIHBvdmFiaWxvLCBib2RvIHNhbW9k
+          ZWpubyAgZG9kYW5pIHBvZ2xlZG9tIHYga2F0ZXJlIHN0ZSBqaWggcG92YWJp
+          bGku
+      invite_someone_to_join: !binary |
+          UG92YWJpdGUgbmVrb2dhIHYgb21yZZ5qZSBEaWFzcG9yYSE=
+      language: "Language"
+      personal_message: !binary |
+          T3NlYm5vIHNwb3Jv6Glsbw==
       resend: "Resend"
-      send_an_invitation: "Pošlji povabilo"
-      send_invitation: "Pošlji povabilo"
+      send_an_invitation: !binary |
+          UG+abGppIHBvdmFiaWxv
+      send_invitation: !binary |
+          UG+abGppIHBvdmFiaWxv
       to: "Za"
   layouts: 
     application: 
       powered_by: "STRAN POGANJA DIASPORA*"
-      public_feed: "Public Diaspora Feed for %{name}"
-      toggle: "toggle mobile site"
+      public_feed: "Javne Diaspora objave za %{name}"
+      toggle: "vklop/izklop mobilne strani"
       whats_new: "kaj je novega?"
-      your_aspects: "vaše skupine"
+      your_aspects: !binary |
+          dmGaZSBza3VwaW5l
     header: 
       admin: "admin"
       blog: "blog"
-      code: "koda"
+      code: !binary |
+          mmlmcmE=
       login: "prijava"
       logout: "odjavi me"
-      profile: "profile"
-      recent_notifications: "Recent notifications"
+      profile: "profil"
+      recent_notifications: "Nedavna obvestila"
       settings: "settings"
       view_all: "View all"
   likes: 
@@ -328,7 +466,8 @@ sl:
         two: "%{count} likes"
         zero: "no likes"
   limited: "Limited"
-  more: "Več"
+  more: !binary |
+      VmXo
   next: "naslednja"
   no_results: "No Results Found"
   notifications: 
@@ -370,8 +509,10 @@ sl:
         other: "and %{count} others"
         two: "and %{count} others"
         zero: "and nobody else"
-      mark_all_as_read: "Označi vse kot prebrano"
-      notifications: "Sporočila"
+      mark_all_as_read: !binary |
+          T3puYehpIHZzZSBrb3QgcHJlYnJhbm8=
+      notifications: !binary |
+          U3Bvcm/oaWxh
     liked: 
       few: "%{actors} has just liked your %{post_link}."
       many: "%{actors} has just liked your %{post_link}."
@@ -435,9 +576,9 @@ sl:
     comment_on_post: 
       reply: "Reply or view %{name}'s post >"
     confirm_email: 
-      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
+      click_link: "To activate your new e-mail address %{unconfirmed_email},  please click this link:"
       subject: "Please activate your new e-mail address %{unconfirmed_email}"
-    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to  stop getting emails like this,"
     hello: "Pozdravljeni %{name}!"
     liked: 
       liked: "%{name} has just liked your post: "
@@ -451,8 +592,10 @@ sl:
       reshared: "%{name} just reshared your post"
       view_post: "View post >"
     single_admin: 
-      admin: "Vaš administrator Diaspore"
-      subject: "Sporočilo o vašem Diaspora računu:"
+      admin: !binary |
+          VmGaIGFkbWluaXN0cmF0b3IgRGlhc3BvcmU=
+      subject: !binary |
+          U3Bvcm/oaWxvIG8gdmGaZW0gRGlhc3BvcmEgcmHodW51Og==
     started_sharing: 
       sharing: "has started sharing with you!"
       subject: "%{name} has started sharing with you on Diaspora*"
@@ -467,14 +610,17 @@ sl:
     add_contact_small: 
       add_contact_from_tag: "add contact from tag"
     aspect_list: 
-      edit_membership: "uredi člane skupin"
+      edit_membership: !binary |
+          dXJlZGkg6GxhbmUgc2t1cGlu
     few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " ljudje v 'podu' so seznanjeni o"
       results_for: "zadetkov za %{params}"
     index: 
-      couldnt_find_them_send_invite: "Jih niste našli? Pošljite povabilo!"
-      no_one_found: "...nikogar ni bilo mogoče najti."
+      couldnt_find_them_send_invite: !binary |
+          SmloIG5pc3RlIG5hmmxpPyBQb5psaml0ZSBwb3ZhYmlsbyE=
+      no_one_found: !binary |
+          Li4ubmlrb2dhciBuaSBiaWxvIG1vZ2/oZSBuYWp0aS4=
       no_results: "Ja, halo! Za iskanje je potrebno vpisati pogoj."
       results_for: "rezultati iskanja za"
     many: "%{count} people"
@@ -482,11 +628,14 @@ sl:
     other: "%{count} people"
     person: 
       add_contact: "dodaj stik"
-      already_connected: "Ste že povezani"
-      pending_request: "Čakajoče zahteve"
+      already_connected: !binary |
+          U3RlIJ5lIHBvdmV6YW5p
+      pending_request: !binary |
+          xIxha2Fqb+hlIHphaHRldmU=
       thats_you: "To ste vi!"
     profile_sidebar: 
-      bio: "življenjepis"
+      bio: !binary |
+          nml2bGplbmplcGlz
       born: "datum rojstva"
       edit_my_profile: "Uredi moj profil"
       gender: "spol"
@@ -496,16 +645,20 @@ sl:
       remove_from: "Ali odstranim %{name} iz skupine %{aspect}?"
     show: 
       does_not_exist: "Oseba ne obstaja!"
-      has_not_shared_with_you_yet: "%{name} has not shared any posts with you yet!"
-      incoming_request: "%{name} želi deliti z vami."
+      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: !binary |
+          JXtuYW1lfSCeZWxpIGRlbGl0aSB6IHZhbWku
       mention: "Mention"
       message: "Message"
       not_connected: "S to osebo ne delite"
       recent_posts: "Zadnje objave"
       recent_public_posts: "Zadnje javne objave"
-      return_to_aspects: "Vrnite se na vašo stran s skupinami"
+      return_to_aspects: !binary |
+          VnJuaXRlIHNlIG5hIHZhmm8gc3RyYW4gcyBza3VwaW5hbWk=
       see_all: "See all"
-      start_sharing: "začni deliti"
+      start_sharing: !binary |
+          emHobmkgZGVsaXRp
       to_accept_or_ignore: "sprejmite ali zavrnite."
     sub_header: 
       add_some: "add some"
@@ -513,14 +666,19 @@ sl:
       you_have_no_tags: "you have no tags!"
     two: "%{count} people"
     webfinger: 
-      fail: "Žal ni bilo mogoče najti %{handle}."
+      fail: !binary |
+          nmFsIG5pIGJpbG8gbW9nb+hlIG5hanRpICV7aGFuZGxlfS4=
     zero: "no people"
   photos: 
     comment_email_subject: "%{name}'s photo"
     create: 
-      integrity_error: "Nalaganje slike ni uspelo. Ste prepričani, da je bila izbrana slika?"
+      integrity_error: !binary |
+          TmFsYWdhbmplIHNsaWtlIG5pIHVzcGVsby4gU3RlIHByZXByaehhbmksIGRh
+          IGplIGJpbGEgIGl6YnJhbmEgc2xpa2E/
       runtime_error: "Nalaganje slike ni uspelo. Imate pripet varnostni pas?"
-      type_error: "Nalaganje slike ni uspelo. Ste prepričani, da je bila dodana slika?"
+      type_error: !binary |
+          TmFsYWdhbmplIHNsaWtlIG5pIHVzcGVsby4gU3RlIHByZXByaehhbmksIGRh
+          IGplIGJpbGEgZG9kYW5hICBzbGlrYT8=
     destroy: 
       notice: "Slika izbrisana."
     edit: 
@@ -528,37 +686,42 @@ sl:
     new: 
       back_to_list: "Nazaj na seznam"
       new_photo: "Nova slika"
-      post_it: "objavi!"
+      post_it: objavi!
     new_photo: 
-      empty: "Datoteka {file} je prazna, prosimo ponovno izberite datoteke brez nje."
-      invalid_ext: "Datoteka {file} ni veljavna. Dovoljene so samo naslednje vrste datotek {extensions}."
-      size_error: "Datoteka {file} je prevelika, največja dovoljena velikost je {sizeLimit}."
+      empty: "Datoteka {file} je prazna, prosimo ponovno izberite datoteke brez  nje."
+      invalid_ext: "Datoteka {file} ni veljavna. Dovoljene so samo naslednje  vrste datotek {extensions}."
+      size_error: !binary |
+          RGF0b3Rla2Ege2ZpbGV9IGplIHByZXZlbGlrYSwgbmFqdmXoamEgZG92b2xq
+          ZW5hIHZlbGlrb3N0IGplICB7c2l6ZUxpbWl0fS4=
     new_profile_photo: 
-      or_select_one: "ali izberite eno od vaših obstoječih"
-      upload: "Naloži novo sliko profila!"
+      or_select_one: !binary |
+          YWxpIGl6YmVyaXRlIGVubyBvZCB2YZppaCBvYnN0b2pl6Glo
+      upload: !binary |
+          TmFsb55pIG5vdm8gc2xpa28gcHJvZmlsYSE=
     photo: 
       view_all: "ogled vseh slik osebe %{name}"
     show: 
       collection_permalink: "collection permalink"
-      delete_photo: "Izbriši sliko"
+      delete_photo: !binary |
+          SXpicmmaaSBzbGlrbw==
       edit: "uredi"
-      edit_delete_photo: "Dodaj opis slike ali izbriši sliko"
+      edit_delete_photo: !binary |
+          RG9kYWogb3BpcyBzbGlrZSBhbGkgaXpicmmaaSBzbGlrbw==
       make_profile_photo: "uporabi sliko za moj profil"
       show_original_post: "Show original post"
       update_photo: "Posodobi sliko"
     update: 
       error: "Urejanje slike ni uspelo."
-      notice: "Slika uspešno posodobljena."
-  post_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."
+      notice: !binary |
+          U2xpa2EgdXNwZZpubyBwb3NvZG9ibGplbmEu
   posts: 
     show: 
       destroy: "Delete"
       not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
-  previous: "prejšnja"
+  previous: !binary |
+      cHJlappuamE=
+  privacy: "Privacy"
   profile: "Profil"
   profiles: 
     edit: 
@@ -581,32 +744,57 @@ sl:
       failed: "Failed to update profile"
       updated: "Profile updated"
   public: "Public"
+  reactions: 
+    few: "%{count} reactions"
+    many: "%{count} reactions"
+    one: "1 reaction"
+    other: "%{count} reactions"
+    two: "%{count} reactions"
+    zero: "0 reactions"
   registrations: 
-    closed: "Za ta 'Diaspora pod' registracije trentno niso omogočene."
+    closed: !binary |
+        WmEgdGEgJ0RpYXNwb3JhIHBvZCcgcmVnaXN0cmFjaWplIHRyZW50bm8gbmlz
+        byBvbW9nb+hlbmUu
     create: 
-      success: "Pridružili ste se v Diasporo!"
+      success: !binary |
+          UHJpZHJ1nmlsaSBzdGUgc2UgdiBEaWFzcG9ybyE=
     edit: 
-      cancel_my_account: "Prekliči moj uporabniški račun"
+      cancel_my_account: !binary |
+          UHJla2xp6GkgbW9qIHVwb3JhYm5pmmtpIHJh6HVu
       edit: "Uredi %{name}"
-      leave_blank: "(v kolikor ne želite spremeniti pustite prazno)"
-      password_to_confirm: "(spremembo je potrebno potrditi z vašim trenutnim geslom)"
+      leave_blank: !binary |
+          KHYga29saWtvciBuZSCeZWxpdGUgc3ByZW1lbml0aSBwdXN0aXRlIHByYXpu
+          byk=
+      password_to_confirm: !binary |
+          KHNwcmVtZW1ibyBqZSBwb3RyZWJubyBwb3RyZGl0aSB6IHZhmmltIHRyZW51
+          dG5pbSAgZ2VzbG9tKQ==
       unhappy: "Ste nezadovoljni?"
       update: "Posodobi"
     new: 
       create_my_account: "Create my account"
-      enter_email: "Vpišite e-naslov"
-      enter_password: "Vpišite geslo"
-      enter_password_again: "Ponovno vpišite isto geslo"
-      enter_username: "Izberite uporabniško ime (samo črke, številke in podčrtaji)"
+      enter_email: !binary |
+          VnBpmml0ZSBlLW5hc2xvdg==
+      enter_password: !binary |
+          VnBpmml0ZSBnZXNsbw==
+      enter_password_again: !binary |
+          UG9ub3ZubyB2cGmaaXRlIGlzdG8gZ2VzbG8=
+      enter_username: !binary |
+          SXpiZXJpdGUgdXBvcmFibmmaa28gaW1lIChzYW1vIOhya2UsIJp0ZXZpbGtl
+          IGluICBwb2TocnRhamkp
       join_the_movement: "Join the movement!"
-      sign_up_today: "Sign up today"
+      sign_up_message: "Social Networking with a <3"
   requests: 
     create: 
-      sending: "Pošiljam"
-      sent: "%{name} ste vprašali, če bi delili z vami. Vaše vprašanje bodo videli, ko se bodo prijavili v Diasporo."
+      sending: !binary |
+          UG+aaWxqYW0=
+      sent: !binary |
+          JXtuYW1lfSBzdGUgdnByYZphbGksIOhlIGJpIGRlbGlsaSB6IHZhbWkuIFZh
+          mmUgdnByYZphbmplIGJvZG8gIHZpZGVsaSwga28gc2UgYm9kbyBwcmlqYXZp
+          bGkgdiBEaWFzcG9yby4=
     destroy: 
       error: "Prosim izberite skupino!"
-      ignore: "Prošnja za stik je zavrnjena."
+      ignore: !binary |
+          UHJvmm5qYSB6YSBzdGlrIGplIHphdnJuamVuYS4=
       success: "Zdaj sta prijatelja."
     helper: 
       new_requests: 
@@ -617,10 +805,11 @@ sl:
         two: "%{count} new requests!"
         zero: "no new requests"
     manage_aspect_contacts: 
-      existing: "Obstoječi stiki"
+      existing: !binary |
+          T2JzdG9qZehpIHN0aWtp
       manage_within: "Uredi stike znotraj"
     new_request_to_person: 
-      sent: "poslano!"
+      sent: poslano!
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -636,43 +825,64 @@ sl:
         zero: "Reshare"
       reshare_confirmation: "Reshare %{author} - %{text}?"
       reshare_original: "Reshare orignial"
+      reshared_via: "reshared via"
       show_original: "Show Original"
   search: "Najdi"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Preverjanje istovetnosti je uspelo."
     destroy: 
-      success: "Preverjanje istovetnosti je uspešno izbrisano."
+      success: !binary |
+          UHJldmVyamFuamUgaXN0b3ZldG5vc3RpIGplIHVzcGWabm8gaXpicmlzYW5v
+          Lg==
     failure: 
-      error: "pri povezovanju s servisom je prišlo do napake"
+      error: !binary |
+          cHJpIHBvdmV6b3Zhbmp1IHMgc2Vydmlzb20gamUgcHJpmmxvIGRvIG5hcGFr
+          ZQ==
     finder: 
       no_friends: "No Facebook friends found."
       service_friends: "%{service} Friends"
     index: 
-      connect_to_facebook: "Poveži se s facebook"
+      connect_to_facebook: !binary |
+          UG92ZZ5pIHNlIHMgZmFjZWJvb2s=
       connect_to_tumblr: "Connect to Tumblr"
-      connect_to_twitter: "Poveži se s twitter"
+      connect_to_twitter: !binary |
+          UG92ZZ5pIHNlIHMgdHdpdHRlcg==
       disconnect: "povezava prekinjena"
       edit_services: "Uredi servise"
       logged_in_as: "prijavljeni ste kot"
       no_services: "You have not connected any services yet."
       really_disconnect: "prekinem povezavo s servisom %{service}?"
     inviter: 
-      click_link_to_accept_invitation: "Kliknite na povezavo za potrditev vašega povabila"
-      join_me_on_diaspora: "Pridruži se mi na DIASPORI*"
+      click_link_to_accept_invitation: !binary |
+          S2xpa25pdGUgbmEgcG92ZXphdm8gemEgcG90cmRpdGV2ICB2YZplZ2EgcG92
+          YWJpbGE=
+      join_me_on_diaspora: !binary |
+          UHJpZHJ1nmkgc2UgbWkgbmEgRElBU1BPUkkq
     remote_friend: 
       invite: "povabi"
       not_on_diaspora: "Not yet on Diaspora"
-      resend: "pošlji ponovno"
+      resend: !binary |
+          cG+abGppIHBvbm92bm8=
   settings: "Nastavitve"
+  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: "Poišči po Diaspora imenu"
-      diaspora_handle: "diaspora@handle.org"
-      enter_a_diaspora_username: "Vpišite Diaspora uporabniško ime:"
+      create_request: !binary |
+          UG9pmuhpIHBvIERpYXNwb3JhIGltZW51
+      diaspora_handle: diaspora@handle.org
+      enter_a_diaspora_username: !binary |
+          VnBpmml0ZSBEaWFzcG9yYSB1cG9yYWJuaZprbyBpbWU6
       know_email: "Ali poznate njihove naslove e-naslove? Povabite jih"
-      your_diaspora_username_is: "Vaše Diaspora uporabniško ime je: %{diaspora_handle}"
+      your_diaspora_username_is: !binary |
+          VmGaZSBEaWFzcG9yYSB1cG9yYWJuaZprbyBpbWUgamU6ICAle2RpYXNwb3Jh
+          X2hhbmRsZX0=
     aspect_dropdown: 
       add_to_aspect: "Add to aspect"
       toggle: 
@@ -688,39 +898,62 @@ sl:
       logged_in_as: "logged in as %{name}"
       your_aspects: "your aspects"
     invitations: 
-      by_email: "po e-pošti"
-      dont_have_now: "Trenutno nimate povabil, vendar jih lahko v kratkem pričakujete!"
+      by_email: !binary |
+          cG8gZS1wb5p0aQ==
+      dont_have_now: !binary |
+          VHJlbnV0bm8gbmltYXRlIHBvdmFiaWwsIHZlbmRhciBqaWggbGFoa28gdiBr
+          cmF0a2VtICBwcmnoYWt1amV0ZSE=
       from_facebook: "iz Facebook-a"
-      invitations_left: "(še %{count})"
+      invitations_left: !binary |
+          KJplICV7Y291bnR9KQ==
       invite_someone: "Povabi osebo"
       invite_your_friends: "Povabi prijatelje"
       invites: "Povabila"
-      invites_closed: "Za ta 'Diaspora pod' so povabila trenutno onemogočena."
+      invites_closed: !binary |
+          WmEgdGEgJ0RpYXNwb3JhIHBvZCcgc28gcG92YWJpbGEgdHJlbnV0bm8gb25l
+          bW9nb+hlbmEu
     notification: 
       new: "Novo %{type} od %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "prijavljeni ste v %{service}"
       manage: "uredi povezane servise"
-      outside: "Javna sporočila bodo na ogled tudi osebam izven Diaspore."
-      title: "Objavili boste javno sporočilo!"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
+      outside: !binary |
+          SmF2bmEgc3Bvcm/oaWxhIGJvZG8gbmEgb2dsZWQgdHVkaSBvc2ViYW0gaXp2
+          ZW4gRGlhc3BvcmUu
+      share: "Share"
+      title: !binary |
+          T2JqYXZpbGkgYm9zdGUgamF2bm8gc3Bvcm/oaWxvIQ==
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "vsi"
       all_contacts: "vsi stiki"
-      click_to_share_with: "Click to share with: "
       discard_post: "Discard post"
       make_public: "objavi kot javno"
-      post_a_message_to: "Objavi sporočilo v %{aspect}"
-      posting: "Objavljam..."
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
+      post_a_message_to: !binary |
+          T2JqYXZpIHNwb3Jv6GlsbyB2ICV7YXNwZWN0fQ==
+      posting: Objavljam...
       publishing_to: "publishing to: "
       share: "Objavi"
       share_with: "deli s/z"
       upload_photos: "Upload photos"
-      whats_on_your_mind: "bi kaj želeli sporočiti?"
+      whats_on_your_mind: !binary |
+          Ymkga2FqIJ5lbGVsaSBzcG9yb+hpdGk/
     reshare: 
-      reshare: "Objavi še v"
+      reshare: !binary |
+          T2JqYXZpIJplIHY=
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "I like this"
       shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
@@ -732,7 +965,8 @@ sl:
     destroy: 
       failure: "Failed to delete post"
     helper: 
-      no_message_to_display: "Ni sporočil."
+      no_message_to_display: !binary |
+          Tmkgc3Bvcm/oaWwu
     new: 
       mentioning: "Mentioning: %{person}"
     too_long: 
@@ -745,6 +979,33 @@ sl:
   stream_helper: 
     hide_comments: "skrij komentarje"
     show_more_comments: "Show %{number} more comments"
+  streams: 
+    aspects: 
+      title: "Your Aspects"
+    aspects_stream: "Aspects"
+    commented_on: "commented on"
+    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"
+    mentioned_stream: "@Mentions"
+    mentions: 
+      contacts_title: "People who mentioned you"
+      title: "Your Mentions"
+    multi: 
+      contacts_title: "People in your Stream"
+      title: "Stream"
+    posted: "posted"
+    public: 
+      contacts_title: "Recent Posters"
+      title: "Public Activity"
+    recently: "recently:"
+    tags: 
+      contacts_title: "People who dig these tags"
+      title: "Posts tagged: %{tags}"
   tag_followings: 
     create: 
       failure: "Failed to follow: #%{name}"
@@ -755,6 +1016,7 @@ sl:
   tags: 
     show: 
       follow: "Follow #%{tag}"
+      followed_by: "followed by"
       following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
       people_tagged_with: "People tagged with %{tag}"
@@ -763,89 +1025,106 @@ sl:
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
-      connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
+      connecting_is_simple: "Connecting your Diaspora account is as simple as  filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      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."
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
-      screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
+      screenshot_explanation: "%{link1}.  This particular cubby is linked to  %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-  undo: "Undo?"
-  username: "Uporabniško ime"
+      what_is_cubbies: "Cubbi.es is the world's first Diaspora application.   It's also the best way to collect photos online."
+  undo: Undo?
+  username: !binary |
+      VXBvcmFibmmaa28gaW1l
   users: 
     confirm_email: 
       email_confirmed: "E-Mail %{email} activated"
       email_not_confirmed: "E-Mail could not be activated. Wrong link?"
-    destroy: "Uporabniški račun je uspešno zaprt."
+    destroy: !binary |
+        VXBvcmFibmmaa2kgcmHodW4gamUgdXNwZZpubyB6YXBydC4=
     edit: 
       also_commented: "...someone also comments on your contact's post?"
       change: "Spremeni"
       change_email: "Change E-Mail"
       change_language: "Spremeni jezik"
       change_password: "Spremeni geslo"
-      close_account: "Zapri uporabniški račun"
+      close_account: !binary |
+          WmFwcmkgdXBvcmFibmmaa2kgcmHodW4=
       comment_on_post: "...someone comments on your post?"
       current_password: "Trenutno geslo"
       download_photos: "prenesi slike"
       download_xml: "prenesi v xml"
-      edit_account: "Uredi uporabniški račun"
-      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
+      edit_account: "Uredi uporabniki raun"
+      email_awaiting_confirmation: "We have sent you an activation link to  %{unconfirmed_email}. Till you follow this link and activate the new address,  we will continue to use your original address %{email}."
       export_data: "Izvozi podatke"
+      getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "Novo geslo"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...you receive a private message?"
-      receive_email_notifications: "Želite prejemati obvestila po e-pošti, ko..."
+      receive_email_notifications: !binary |
+          nmVsaXRlIHByZWplbWF0aSBvYnZlc3RpbGEgcG8gZS1wb5p0aSwga28uLi4g
       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?"
-      your_email: "Vaš e-naslov"
-      your_handle: "Vaš diaspora naslov"
+      stream_preferences: "Stream Preferences"
+      your_email: !binary |
+          VmGaIGUtbmFzbG92
+      your_handle: !binary |
+          VmGaIGRpYXNwb3JhIG5hc2xvdg==
     getting_started: 
-      bold: "aspects"
-      connect_to: "Connect to"
-      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"
-      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."
-      edit_profile: "Uredite vaš profil"
-      featured_tags: "Featured tags"
-      featured_users: "Featured users"
-      fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
-      finished: "Končano!"
-      follow_your_interests: "Follow your interests"
-      hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Birthday"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "Photo"
-        tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_featured_users: "See all featured users"
-      welcome: "Dobrodošli v Diasporo!"
-      welcome_with_name: "Welcome, %{name}!"
+      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."
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: Saved!
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
+    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: "Uporabnik %{username} ne obstaja!"
     update: 
-      email_notifications_changed: "Obveščanje po e-pošti spremenjeno"
+      email_notifications_changed: !binary |
+          T2J2ZZroYW5qZSBwbyBlLXBvmnRpIHNwcmVtZW5qZW5v
       language_changed: "Jezik spremenjen"
       language_not_changed: "Sprememba jezika ni uspela"
       password_changed: "Geslo spremenjeno"
       password_not_changed: "Sprememba gesla ni uspela"
+      settings_not_updated: "Settings update failed"
+      settings_updated: "Settings updated"
       unconfirmed_email_changed: "E-Mail Changed. Needs activation."
       unconfirmed_email_not_changed: "E-Mail Change Failed"
   webfinger: 
-    fetch_failed: "'webfinger' profil ni bilo mogoče prenesti za %{profile_url}"
-    hcard_fetch_failed: "prišlo je do težave pri prenosu 'hCard' kartice za %{account}"
-    no_person_constructed: "Iz te 'hCard' kartice ni bilo mogoče razpoznati osebe."
-    not_enabled: "račun gostitelja (host) %{account} se ne odziva na 'webfinger' protokol"
-    xrd_fetch_failed: "pri pridobivanju 'XRD' iz uporabniškega računa %{account} je prišlo do napake"
+    fetch_failed: !binary |
+        J3dlYmZpbmdlcicgcHJvZmlsIG5pIGJpbG8gbW9nb+hlIHByZW5lc3RpIHph
+        ICV7cHJvZmlsZV91cmx9
+    hcard_fetch_failed: !binary |
+        cHJpmmxvIGplIGRvIHRlnmF2ZSBwcmkgcHJlbm9zdSAnaENhcmQnIGthcnRp
+        Y2UgemEgICV7YWNjb3VudH0=
+    no_person_constructed: !binary |
+        SXogdGUgJ2hDYXJkJyBrYXJ0aWNlIG5pIGJpbG8gbW9nb+hlIHJhenBvem5h
+        dGkgIG9zZWJlLg==
+    not_enabled: !binary |
+        cmHodW4gZ29zdGl0ZWxqYSAoaG9zdCkgJXthY2NvdW50fSBzZSBuZSBvZHpp
+        dmEgbmEgICd3ZWJmaW5nZXInIHByb3Rva29s
+    xrd_fetch_failed: !binary |
+        cHJpIHByaWRvYml2YW5qdSAnWFJEJyBpeiB1cG9yYWJuaZprZWdhIHJh6HVu
+        YSAgJXthY2NvdW50fSBqZSBwcmmabG8gZG8gbmFwYWtl
+  welcome: Welcome!
diff --git a/config/locales/diaspora/sq.yml b/config/locales/diaspora/sq.yml
index 76d7efb44..93b41ede2 100644
--- a/config/locales/diaspora/sq.yml
+++ b/config/locales/diaspora/sq.yml
@@ -167,6 +167,13 @@ sq:
       no_applications: "You haven't registered any applications yet."
       revoke_access: "Revoke Access"
   back: "Kthehu"
+  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: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
@@ -234,7 +241,7 @@ sq:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
-      sending: "Sending..."
+      sending: Sending...
       subject: "subject"
       to: "to"
     new_message: 
@@ -242,7 +249,7 @@ sq:
     show: 
       delete: "delete and block conversation"
       reply: "reply"
-      replying: "Replying..."
+      replying: Replying...
   date: 
     formats: 
       birthday: "%B %d"
@@ -507,6 +514,7 @@ sq:
     show: 
       does_not_exist: "Person does not exist!"
       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: "You have an incoming request from this person."
       mention: "Mention"
       message: "Message"
@@ -559,16 +567,13 @@ sq:
     update: 
       error: "Dështoi për ta ndryshuar foton."
       notice: "Fotoja u ngarkua me sukëses."
-  post_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."
   posts: 
     show: 
       destroy: "Delete"
       not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   previous: "i mëparshëm"
+  privacy: "Privacy"
   profile: "Profile"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ sq:
       edit: "Edit %{name}"
       leave_blank: "(leave blank if you don't want to change it)"
       password_to_confirm: "(we need your current password to confirm your changes)"
-      unhappy: "Unhappy?"
+      unhappy: Unhappy?
       update: "Update"
     new: 
       create_my_account: "Create my account"
@@ -637,7 +642,7 @@ sq:
       existing: "Existing contacts"
       manage_within: "Manage contacts within"
     new_request_to_person: 
-      sent: "sent!"
+      sent: sent!
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -685,11 +690,15 @@ sq:
       not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   settings: "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: "Find by Diaspora handle"
-      diaspora_handle: "diaspora@handle.org"
+      diaspora_handle: diaspora@handle.org
       enter_a_diaspora_username: "Enter a Diaspora username:"
       know_email: "Know their email address? You should invite them"
       your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
@@ -737,7 +746,7 @@ sq:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Post a message to %{aspect}"
-      posting: "Posting..."
+      posting: Posting...
       publishing_to: "publishing to: "
       share: "Share"
       share_with: "Share with %{aspect}"
@@ -750,6 +759,8 @@ sq:
       currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "I like this"
       shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
@@ -830,7 +841,7 @@ sq:
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-  undo: "Undo?"
+  undo: Undo?
   username: "Username"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ sq:
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ sq:
       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: "User %{username} does not exist!"
     update: 
@@ -901,4 +916,4 @@ sq:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index f53b1ac10..52f70c60a 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -99,7 +99,7 @@ sv:
       diaspora_id: 
         content_1: "Ditt Diaspora-ID är:"
         content_2: "Med hjälp av det kan alla hitta dig på Diaspora."
-        heading: "Diaspora-ID"
+        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."
       help: 
@@ -167,6 +167,13 @@ sv:
       no_applications: "Du har inte registrerat några applikationer än."
       revoke_access: "Neka tillträde"
   back: "Tillbaka"
+  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: 
     explanation: "Bokmärk %{link} för att posta på Diaspora ifrån varsomhelst. "
     explanation_link_text: "denna länk"
@@ -179,7 +186,7 @@ sv:
     many: "%{count} kommentarer"
     new_comment: 
       comment: "Kommentera"
-      commenting: "Kommenterar..."
+      commenting: Kommenterar...
     one: "1 kommentar"
     other: "%{count} kommentarer"
     two: "Två kommentarer"
@@ -234,7 +241,7 @@ sv:
     new: 
       abandon_changes: "Förkasta ändringar?"
       send: "Skicka"
-      sending: "Skickar..."
+      sending: Skickar...
       subject: "ämne"
       to: "till"
     new_message: 
@@ -242,14 +249,14 @@ sv:
     show: 
       delete: "ta bort och blockera konversation"
       reply: "svara"
-      replying: "Svarar..."
+      replying: Svarar...
   date: 
     formats: 
       birthday: "%B %d"
       birthday_with_year: "%B %d %Y"
       fullmonth_day: "%B %d"
   delete: "Ta bort"
-  email: "E-post"
+  email: E-post
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Rätta till följande fel och försök igen."
@@ -507,6 +514,7 @@ sv:
     show: 
       does_not_exist: "Den här personen finns inte!"
       has_not_shared_with_you_yet: "%{name} har inte delat några inlägg med dig än!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name} vill dela med dig"
       mention: "Nämna"
       message: "Meddelande"
@@ -538,7 +546,7 @@ sv:
     new: 
       back_to_list: "Tillbaka till listan"
       new_photo: "Nytt foto"
-      post_it: "skicka!"
+      post_it: skicka!
     new_photo: 
       empty: "{file} är tom, välj om filerna utan att välja denna."
       invalid_ext: "{file} har en ogiltig filändelse. Endast {extensions} är tillåtna."
@@ -559,16 +567,13 @@ sv:
     update: 
       error: "Misslyckades med att ändra fotot."
       notice: "Fotot är nu uppdaterat."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "%{name}s inlägg har dolts, och alla notiser kommer att ignoreras."
-      see_it_on_their_profile: "Om du vill de alla uppdateringar i detta inlägg, besök %{name}s sida."
   posts: 
     show: 
       destroy: "Ta bort"
       not_found: "Tyvärr, men vi kan inte hitta det inlägget."
       permalink: "permalänk"
   previous: "föregående"
+  privacy: "Privacy"
   profile: "Profil"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ sv:
       edit: "Ändra %{name}"
       leave_blank: "(lämna tomt om du inte vill ändra det)"
       password_to_confirm: "(det nuvarande lösenordet krävs för att bekräfta ändringarna)"
-      unhappy: "Missnöjd?"
+      unhappy: Missnöjd?
       update: "Uppdatera"
     new: 
       create_my_account: "Skapa mitt konto"
@@ -637,7 +642,7 @@ sv:
       existing: "Befintliga kontakter"
       manage_within: "Hantera kontakter i "
     new_request_to_person: 
-      sent: "skickat!"
+      sent: skickat!
   reshares: 
     comment_email_subject: "%{resharer}s vidarespridning av %{author}s inlägg."
     create: 
@@ -685,11 +690,15 @@ sv:
       not_on_diaspora: "Ännu inte på Diaspora"
       resend: "skicka igen"
   settings: "Inställningar"
+  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: "Lägg till en ny kontakt"
       create_request: "Sök på Diaspora ID"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Ange ett Diaspora-användarnamn:"
       know_email: "Vet du deras e-post adress? Du borde bjuda in dem"
       your_diaspora_username_is: "Ditt Diaspora-användarnamn är: %{diaspora_handle}"
@@ -737,7 +746,7 @@ sv:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Skicka ett meddelande till %{aspect}"
-      posting: "Skickar..."
+      posting: Skickar...
       publishing_to: "publicerar till: "
       share: "Dela"
       share_with: "dela med"
@@ -750,6 +759,8 @@ sv:
       currently_unavailable: "commenting currently unavailable"
       dislike: "Jag ogillar det här"
       hide_and_mute: "Dölj och ignorera"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Jag gillar det här"
       shared_with: "Delas med: %{aspect_names}"
       unlike: "Sluta gilla"
@@ -830,7 +841,7 @@ sv:
       typical_userpage: "En typisk cubbi.es sida"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es är världens först Diaspora applikation. Den är också bäst på att samla ihop dina online fotografier."
-  undo: "Ångra?"
+  undo: Ångra?
   username: "Användarnamn"
   users: 
     confirm_email: 
@@ -858,7 +869,7 @@ sv:
       photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...du mottar ett privat meddelande?"
       receive_email_notifications: "Skicka notiser via e-post när..."
-      reshared: "...sprider någon mina inlägg vidare?"
+      reshared: "...någon sprider mina inlägg vidare?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
       show_getting_started: "Re-enable Getting Started"
       started_sharing: "...någon börjar dela med dig?"
@@ -871,7 +882,7 @@ sv:
       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: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ sv:
       signed_out: "Du har loggat ut ifrån Diaspora*"
       simply_visit: "Besök helt enkelt"
       works_on_modern: "Fungerar på alla moderna smartphones"
+    privacy_settings: 
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "Användaren %{username} finns inte!"
     update: 
@@ -901,4 +916,4 @@ sv:
     no_person_constructed: "Den här personen kunde inte hittas (hcard-fel)."
     not_enabled: "Webfinger verkar inte vara påslaget på %{account}'s server"
     xrd_fetch_failed: "kunde inte hämta xrd-fil från kontot %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 0f2a75bc2..500b60b4a 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -35,7 +35,7 @@ tr:
             email: 
               taken: "önceden alınmış."
             person: 
-              invalid: "geçersiz."
+              invalid: geçersiz.
             username: 
               invalid: "geçersiz. Sadece harf,sayı ve alt çizgi"
               taken: "önceden alınmış."
@@ -167,6 +167,13 @@ tr:
       no_applications: "Henüz kayıtlı bir uygulama yok."
       revoke_access: "Erişimi Kaldır"
   back: "Geri"
+  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: 
     explanation: "%{link} yer imleri çubuğuna sürükleyin."
     explanation_link_text: "Diaspoara Gönder"
@@ -179,7 +186,7 @@ tr:
     many: "%{count} yorum"
     new_comment: 
       comment: "Yorum yaz"
-      commenting: "Yorumlanıyor..."
+      commenting: Yorumlanıyor...
     one: "1 yorum"
     other: "%{count} yorum"
     two: "%{count} yorum"
@@ -234,7 +241,7 @@ tr:
     new: 
       abandon_changes: "Değişiklikler silinsin mi?"
       send: "Gönder"
-      sending: "Gönderiliyor..."
+      sending: Gönderiliyor...
       subject: "konu"
       to: "kime"
     new_message: 
@@ -242,14 +249,14 @@ tr:
     show: 
       delete: "iletişimi sil ya da engelle"
       reply: "yanıtla"
-      replying: "Yanıtlanıyor..."
+      replying: Yanıtlanıyor...
   date: 
     formats: 
       birthday: "%B %d"
       birthday_with_year: "%B %d %Y"
       fullmonth_day: "%B %d"
   delete: "Sil"
-  email: "E-posta"
+  email: E-posta
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Alttaki yanlıșları düzeltin ve tekrar deneyin."
@@ -270,7 +277,7 @@ tr:
       simplicity: "Sadelik"
       simplicity_explanation: "Diaspora, sadeliğe,kolay paylaşıma ve gizliliklere önem verir. Doğal olarak özeldir, Diaspora Java ayarları sayfalarıyla saklama yapmaz.Bu yüzden güvenlidir."
       tagline_first_half: "İstediğiniz ne ise paylaşın,"
-      tagline_second_half: "istediğiniz."
+      tagline_second_half: istediğiniz.
   invitations: 
     a_facebook_user: "Bir Facebook kullanıcısı"
     check_token: 
@@ -507,6 +514,7 @@ tr:
     show: 
       does_not_exist: "Kişi yok!"
       has_not_shared_with_you_yet: "%{name} seninle henüz bir şey paylaşmamış!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "You have an incoming request from this person."
       mention: "Bahset"
       message: "Mesaj"
@@ -538,7 +546,7 @@ tr:
     new: 
       back_to_list: "Listeye geri dön"
       new_photo: "Yeni Fotoğraf"
-      post_it: "gönder!"
+      post_it: gönder!
     new_photo: 
       empty: "{file} boş bir dosya, bu olmadan dosyaları tekrar seçin."
       invalid_ext: "{file} geçersiz uzantıya sahip. sadece {extensions} uzantılarına izin verilir."
@@ -559,16 +567,13 @@ tr:
     update: 
       error: "Fotoğraf düzeltme başarısız oldu."
       notice: "Fotoğraf başarıyla güncellendi."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "%{name} kişisinin gönderileri gizlendi, bildirim alımı durduruldu."
-      see_it_on_their_profile: "Bu gönderiye yapılan güncellemeleri görmek istiyorsan, %{name} kişisinin profilini ziyaret et."
   posts: 
     show: 
       destroy: "Sil"
       not_found: "Üzgünüz, bu gönderi bulamadı."
       permalink: "kalıcı bağlantı"
   previous: "önceki"
+  privacy: "Privacy"
   profile: "Profil"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ tr:
       edit: "Düzenle %{name}"
       leave_blank: "(Eğer değiştirmek istemiyorsanız boş bırakın.)"
       password_to_confirm: "(Değişikliklerin onaylanması için şu anki parolanız gerekmektedir)"
-      unhappy: "Mutsuz?"
+      unhappy: Mutsuz?
       update: "Güncelle"
     new: 
       create_my_account: "Hesabımı oluştur!"
@@ -619,7 +624,7 @@ tr:
       sign_up_message: "Sosyal Ağ <3"
   requests: 
     create: 
-      sending: "Gönderiliyor..."
+      sending: Gönderiliyor...
       sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
     destroy: 
       error: "Lütfen bir yön seçiniz!"
@@ -637,7 +642,7 @@ tr:
       existing: "Mevcut rehber"
       manage_within: "Kişileri yönetin"
     new_request_to_person: 
-      sent: "yollandı!"
+      sent: yollandı!
   reshares: 
     comment_email_subject: "%{resharer}, %{author} kişisinin gönderisini tekrar paylaştı"
     create: 
@@ -685,11 +690,15 @@ tr:
       not_on_diaspora: "Henüz Diaspora'da değil"
       resend: "tekrar gönder"
   settings: "Ayarlar"
+  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: "Yeni kişi ekle"
       create_request: "Diaspora ID ile bul"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Diaspora kullanıcı adınızı giriniz:"
       know_email: "E-posta adresini biliyor musun? O zaman onu davet et"
       your_diaspora_username_is: "Diaspora kullanıcı adın: %{diaspora_handle}"
@@ -710,7 +719,7 @@ tr:
     invitations: 
       by_email: "E-posta ile"
       dont_have_now: "Şu an davetiyen yok, ama yakında gelir!"
-      from_facebook: "Facebook'dan"
+      from_facebook: Facebook'dan
       invitations_left: "%{count} kaldı"
       invite_someone: "Birisini davet et"
       invite_your_friends: "Arkadaşlarını davet et"
@@ -737,7 +746,7 @@ tr:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "%{aspect} yönüne mesaj gönder "
-      posting: "Gönderiliyor..."
+      posting: Gönderiliyor...
       publishing_to: "buraya yayınlanıyor:"
       share: "Paylaş"
       share_with: "paylaş"
@@ -750,6 +759,8 @@ tr:
       currently_unavailable: "yorum kullanılamıyor"
       dislike: "Beğenme"
       hide_and_mute: "Gizle"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Beğen"
       shared_with: "%{aspect_names} ile paylaşıldı"
       unlike: "Beğenme"
@@ -863,7 +874,7 @@ tr:
       show_getting_started: "Başlarken etkin"
       started_sharing: "...birisi benimle birşey paylaştığında?"
       stream_preferences: "Akış Tercihleri"
-      your_email: "E-posta"
+      your_email: E-posta
       your_handle: "Diaspora ID"
     getting_started: 
       awesome_take_me_to_diaspora: "Harika! Diaspora* Git"
@@ -871,9 +882,9 @@ tr:
       hashtag_explanation: "Etiketler, hakkında konuşmak ve ilgi alanlarını takip etmenize izin verir. Ayrıca yeni insanları Diaspora üzerinde bulmak için harika bir yoldur."
       hashtag_suggestions: "Sevdiğiniz etiketleri takip etmeyi denyin #resim, #film, #gif, vb."
       hooking_up_fb: "Facebook hesabıza bağlanın"
-      saved: "Kaydedildi!"
+      saved: Kaydedildi!
       we_can_speed_things_up: "Biz şeyler için biraz hız"
-      well_hello_there: "Merhaba!"
+      well_hello_there: Merhaba!
       what_are_you_in_to: "What are you into?"
       what_facebook_does: "Diaspora için. Bu adınızı girin ve fotoğrafınızı çekin."
       who_are_you: "Sen kimsin?"
@@ -883,6 +894,10 @@ tr:
       signed_out: "Diaspora'dan çıkış yaptınız*"
       simply_visit: "Basitçe ziyaret"
       works_on_modern: "Tüm modern akıllı telefonlarda çalışır"
+    privacy_settings: 
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "%{username} kullanıcısı bulunmamaktadır!"
     update: 
diff --git a/config/locales/diaspora/uk.yml b/config/locales/diaspora/uk.yml
index 29d475eee..b6cc41254 100644
--- a/config/locales/diaspora/uk.yml
+++ b/config/locales/diaspora/uk.yml
@@ -35,7 +35,7 @@ uk:
             email: 
               taken: "вже зайнято."
             person: 
-              invalid: "недійсний."
+              invalid: недійсний.
             username: 
               invalid: "не підходить. Можна використати тільки букви, цифри і знак підкреслення."
               taken: "вже зайнято."
@@ -111,13 +111,13 @@ uk:
         here_to_help: "Товариство Діаспори до ваших послуг!"
         need_help: "Потрібна допомога?"
         satisfaction: "%{link}: здійснювана товариством підтримка"
-        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial}, %{wiki} і %{forum}: довідкові посібники, що складаються товариством, інструкції та новини."
       introduce_yourself: "Це ваш потік. Пірнайте і освоюйтеся."
       keep_us_running: "Допоможіть %{pod} працювати швидко - купіть нашим серверам дозу кави, зробивши щомісячне пожертвування!"
       new_here: 
-        follow: "Follow %{link} and welcome new users to Diaspora*!"
-        learn_more: "Learn more"
-        title: "Welcome New Users"
+        follow: "Стежте за міткою %{link} і вітайте нових користувачів в Діаспорі*!"
+        learn_more: "Дізнатися більше"
+        title: "Вітайте новачків"
       no_contacts: "Контакти відсутні"
       no_tags: "+ Знайти мітку"
       people_sharing_with_you: "Люди діляться з вами"
@@ -147,7 +147,7 @@ uk:
     other: "%{count} аспект[-и, -ів]"
     seed: 
       acquaintances: "Знайомі"
-      family: "Сім'я"
+      family: Сім'я
       friends: "Друзі"
       work: "Робота"
     selected_contacts: 
@@ -167,6 +167,13 @@ uk:
       no_applications: "Ви ще не зареєстрували жодного додатку."
       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: 
     explanation: "Пишіть в Діаспору з будь-якої сторінки з допомогою %{link}."
     explanation_link_text: "цієї закладки"
@@ -179,7 +186,7 @@ uk:
     many: "%{count} коментарів"
     new_comment: 
       comment: "Коментувати"
-      commenting: "Коментування..."
+      commenting: Коментування...
     one: "1 коментар"
     other: "%{count} коментарів"
     two: "%{count} коментарів"
@@ -234,7 +241,7 @@ uk:
     new: 
       abandon_changes: "Відмовитися від змін?"
       send: "Відправити"
-      sending: "Відправка..."
+      sending: Відправка...
       subject: "тема"
       to: "кому"
     new_message: 
@@ -242,7 +249,7 @@ uk:
     show: 
       delete: "видалити і заблокувати розмову"
       reply: "відповісти"
-      replying: "Відповідь..."
+      replying: Відповідь...
   date: 
     formats: 
       birthday: "%B %d"
@@ -291,7 +298,7 @@ uk:
       comma_seperated_plz: "Ви можете ввести декілька адрес електронної пошти через кому."
       if_they_accept_info: "після згоди з їх боку, вони будуть додані в запропонований вами аспект."
       invite_someone_to_join: "Запросити кого-небудь в Діаспору!"
-      language: "Language"
+      language: "Мова"
       personal_message: "Особисте повідомлення"
       resend: "Ще раз послати"
       send_an_invitation: "Відправити запрошення"
@@ -440,7 +447,7 @@ uk:
       two: "%{actors} почав(ла) ділитися з вами."
       zero: "%{actors} почав(ла) ділитися з вами."
   notifier: 
-    a_post_you_shared: "запис."
+    a_post_you_shared: запис.
     click_here: "натисніть сюди"
     comment_on_post: 
       reply: "Відповісти або подивитися запис %{name} >"
@@ -507,6 +514,7 @@ uk:
     show: 
       does_not_exist: "Персони не існує!"
       has_not_shared_with_you_yet: "%{name} ще не ділився записами з вами!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name} хоче поділитися з вами"
       mention: "Згадати"
       message: "Повідомлення"
@@ -538,7 +546,7 @@ uk:
     new: 
       back_to_list: "Повернутися до списку"
       new_photo: "Нова Фотографія"
-      post_it: "Опублікувати!"
+      post_it: Опублікувати!
     new_photo: 
       empty: "{file} порожній, виберіть будь ласка файл повторно."
       invalid_ext: "{file} має неприпустиме розширення. Дозволені тільки {extensions}."
@@ -559,22 +567,19 @@ uk:
     update: 
       error: "Не вдалося змінити фотографію."
       notice: "Фотографія успішно завантажена."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "Запис користувача %{name} був прихований разом з повідомленнями."
-      see_it_on_their_profile: "Якщо ви хочете бачити оновлення цього запису, відвідайте профіль користувача %{name}."
   posts: 
     show: 
       destroy: "Видалити"
       not_found: "Вибачте, ми не змогли знайти цей запис."
       permalink: "постiйне посилання"
   previous: "попередня"
+  privacy: "Privacy"
   profile: "Профіль"
   profiles: 
     edit: 
       allow_search: "Дозволити усім шукати вас в Діаспорі"
       edit_profile: "Редагувати профіль"
-      first_name: "Ім'я"
+      first_name: Ім'я
       last_name: "Прізвище"
       update_profile: "Оновити профіль"
       your_bio: "Ваша біографія"
@@ -607,7 +612,7 @@ uk:
       edit: "Редагувати %{name}"
       leave_blank: "(Залиште порожнім, якщо не хочете міняти)"
       password_to_confirm: "(введіть ваш поточний пароль для підтвердження змін)"
-      unhappy: "Нещасні?"
+      unhappy: Нещасні?
       update: "Відновити"
     new: 
       create_my_account: "Створити мій аккаунт!"
@@ -637,7 +642,7 @@ uk:
       existing: "Існуючі контакти"
       manage_within: "Управління контактами в"
     new_request_to_person: 
-      sent: "відправлено!"
+      sent: відправлено!
   reshares: 
     comment_email_subject: "Перепост %{resharer} запису %{author}"
     create: 
@@ -672,7 +677,7 @@ uk:
       connect_to_facebook: "Підключення до Facebook"
       connect_to_tumblr: "Підключення до Tumblr"
       connect_to_twitter: "Підключення до Twitter"
-      disconnect: "роз'єднати"
+      disconnect: роз'єднати
       edit_services: "Редагувати сервіси"
       logged_in_as: "Ви увійшли як"
       no_services: "Ви ще не підключили жодної служби."
@@ -685,11 +690,15 @@ uk:
       not_on_diaspora: "Ще немає в Діаспорі"
       resend: "відправити повторно"
   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: "Додати контакт"
       create_request: "Пошук по ідентифікатору в Діаспорі"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Введіть ім'я користувача Діаспори :"
       know_email: "Знаєте їх email адреси? Ви повинні запропонувати їм приєднається до Діаспори"
       your_diaspora_username_is: "Ваше ім'я користувача Діаспори : %{diaspora_handle}"
@@ -735,9 +744,9 @@ uk:
       new_user_prefill: 
         hello: "Привіт всім, я тут #%{new_user_tag}."
         i_like: "Я цікавлюся %{tags}."
-        invited_by: "Thanks for the invite, "
+        invited_by: "Спасибі за запрошення,"
       post_a_message_to: "Опублікувати повідомлення для %{aspect}"
-      posting: "Відправка..."
+      posting: Відправка...
       publishing_to: "публікація в:"
       share: "Поділитися"
       share_with: "поділитися з"
@@ -750,6 +759,8 @@ uk:
       currently_unavailable: "коментування на даний момент не доступне"
       dislike: "Не подобається"
       hide_and_mute: "Приховати і відключити повідомлення"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Мені подобається"
       shared_with: "Для аспектів: %{aspect_names}"
       unlike: "Не подобається"
@@ -804,10 +815,10 @@ uk:
   tag_followings: 
     create: 
       failure: "Помилка відстежування #%{name}"
-      success: "Починаємо стежити за: #%{name}"
+      success: "Ура! Тепер ви стежите за міткою #%{name}."
     destroy: 
-      failure: "Не вийшло перестати стежити за: #%{name}"
-      success: "Ви успішно перестали стежити за: #%{name}"
+      failure: "Не вийшло перестати стежити за міткою #%{name}. Можливо, ви вже відписалися від неї?"
+      success: "На жаль! Ви більше не стежите за міткою #%{name}."
   tags: 
     show: 
       follow: "Стежити за міткою #%{tag}"
@@ -830,7 +841,7 @@ uk:
       typical_userpage: "Типова cubbi.es сторінка"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es - це перший у світі додаток для Діаспори. Крім того, це кращий спосіб створення колекції фотографій в Інтернеті."
-  undo: "Відмінити?"
+  undo: Відмінити?
   username: "Ім'я користувача"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ uk:
       hashtag_explanation: "Мітки дозволяють вам обговорювати і стежити за темами, що цікавлять вас. Це також відмінний спосіб пошуку однодумців в Діаспорі."
       hashtag_suggestions: "Спробуйте наступні мітки, наприклад #мистецтво, #кіно, #gif і т.п."
       hooking_up_fb: "підключивши ваш обліковий запис Facebook"
-      saved: "Збережено!"
+      saved: Збережено!
       we_can_speed_things_up: "Реєстрацію можна прискорити"
       well_hello_there: "Вітаємо вас!"
       what_are_you_in_to: "Чим ви цікавитеся?"
@@ -883,6 +894,10 @@ uk:
       signed_out: "Ви вийшли з Діаспори*"
       simply_visit: "Просто зайдіть на"
       works_on_modern: "Працює на усіх сучасних смартфонах"
+    privacy_settings: 
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "Користувача %{username} не існує!"
     update: 
diff --git a/config/locales/diaspora/ur-PK.yml b/config/locales/diaspora/ur-PK.yml
index 37e044416..02c76c9f7 100644
--- a/config/locales/diaspora/ur-PK.yml
+++ b/config/locales/diaspora/ur-PK.yml
@@ -167,6 +167,13 @@ ur-PK:
       no_applications: "آپ نے ابھی تک کسی بھی ایپلیکیشن کا اندرج نہیں کیا ہے۔"
       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: 
     explanation: "Post to Diaspora from anywhere by bookmarking %{link}."
     explanation_link_text: "this link"
@@ -179,7 +186,7 @@ ur-PK:
     many: "%{count} comments"
     new_comment: 
       comment: "Comment"
-      commenting: "Commenting..."
+      commenting: Commenting...
     one: "1 comment"
     other: "%{count} comments"
     two: "%{count} comments"
@@ -234,7 +241,7 @@ ur-PK:
     new: 
       abandon_changes: "Abandon changes?"
       send: "Send"
-      sending: "Sending..."
+      sending: Sending...
       subject: "subject"
       to: "to"
     new_message: 
@@ -242,7 +249,7 @@ ur-PK:
     show: 
       delete: "delete and block conversation"
       reply: "reply"
-      replying: "Replying..."
+      replying: Replying...
   date: 
     formats: 
       birthday: "%B %d"
@@ -507,6 +514,7 @@ ur-PK:
     show: 
       does_not_exist: "Person does not exist!"
       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} wants to share with you"
       mention: "Mention"
       message: "Message"
@@ -559,16 +567,13 @@ ur-PK:
     update: 
       error: "Failed to edit photo."
       notice: "Photo successfully updated."
-  post_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."
   posts: 
     show: 
       destroy: "Delete"
       not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   previous: "previous"
+  privacy: "Privacy"
   profile: "Profile"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ ur-PK:
       edit: "Edit %{name}"
       leave_blank: "(leave blank if you don't want to change it)"
       password_to_confirm: "(we need your current password to confirm your changes)"
-      unhappy: "Unhappy?"
+      unhappy: Unhappy?
       update: "Update"
     new: 
       create_my_account: "Create my account"
@@ -637,7 +642,7 @@ ur-PK:
       existing: "Existing contacts"
       manage_within: "Manage contacts within"
     new_request_to_person: 
-      sent: "sent!"
+      sent: sent!
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -685,11 +690,15 @@ ur-PK:
       not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   settings: "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: "Find by Diaspora ID"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Enter a Diaspora username:"
       know_email: "Know their email address? You should invite them"
       your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
@@ -737,7 +746,7 @@ ur-PK:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Post a message to %{aspect}"
-      posting: "Posting..."
+      posting: Posting...
       publishing_to: "publishing to: "
       share: "Share"
       share_with: "share with"
@@ -750,6 +759,8 @@ ur-PK:
       currently_unavailable: "commenting currently unavailable"
       dislike: "Dislike"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Like"
       shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
@@ -830,7 +841,7 @@ ur-PK:
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-  undo: "Undo?"
+  undo: Undo?
   username: "Username"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ ur-PK:
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ ur-PK:
       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: "User %{username} does not exist!"
     update: 
@@ -901,4 +916,4 @@ ur-PK:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/vi.yml b/config/locales/diaspora/vi.yml
index e2fecf1ca..6d891e1c6 100644
--- a/config/locales/diaspora/vi.yml
+++ b/config/locales/diaspora/vi.yml
@@ -167,6 +167,13 @@ vi:
       no_applications: "You haven't registered any applications yet."
       revoke_access: "Revoke Access"
   back: "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: 
     explanation: "Post to Diaspora from anywhere by bookmarking %{link}."
     explanation_link_text: "this link"
@@ -507,6 +514,7 @@ vi:
     show: 
       does_not_exist: "Person does not exist!"
       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} wants to share with you"
       mention: "Mention"
       message: "Message"
@@ -559,16 +567,13 @@ vi:
     update: 
       error: "Failed to edit photo."
       notice: "Photo successfully updated."
-  post_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."
   posts: 
     show: 
       destroy: "Delete"
       not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   previous: "previous"
+  privacy: "Privacy"
   profile: "Profile"
   profiles: 
     edit: 
@@ -607,7 +612,7 @@ vi:
       edit: "Edit %{name}"
       leave_blank: "(leave blank if you don't want to change it)"
       password_to_confirm: "(we need your current password to confirm your changes)"
-      unhappy: "Unhappy?"
+      unhappy: Unhappy?
       update: "Update"
     new: 
       create_my_account: "Create my account"
@@ -637,7 +642,7 @@ vi:
       existing: "Existing contacts"
       manage_within: "Manage contacts within"
     new_request_to_person: 
-      sent: "sent!"
+      sent: sent!
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -685,11 +690,15 @@ vi:
       not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   settings: "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: "Find by Diaspora ID"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Enter a Diaspora username:"
       know_email: "Know their email address? You should invite them"
       your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
@@ -737,7 +746,7 @@ vi:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "Post a message to %{aspect}"
-      posting: "Posting..."
+      posting: Posting...
       publishing_to: "publishing to: "
       share: "Share"
       share_with: "share with"
@@ -750,6 +759,8 @@ vi:
       currently_unavailable: "commenting currently unavailable"
       dislike: "Dislike"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Like"
       shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
@@ -830,7 +841,7 @@ vi:
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-  undo: "Undo?"
+  undo: Undo?
   username: "Username"
   users: 
     confirm_email: 
@@ -871,7 +882,7 @@ vi:
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ vi:
       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: "User %{username} does not exist!"
     update: 
@@ -901,4 +916,4 @@ vi:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index a4a59cfc2..2635a97ab 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -17,15 +17,15 @@ zh-CN:
         contact: 
           attributes: 
             person_id: 
-              taken: "在好友中必须是唯一的。"
+              taken: 在好友中必须是唯一的。
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "已被注册。"
+              taken: 已被注册。
         request: 
           attributes: 
             from_id: 
-              taken: "与已存在的请求重复。"
+              taken: 与已存在的请求重复。
         reshare: 
           attributes: 
             root_guid: 
@@ -33,12 +33,12 @@ zh-CN:
         user: 
           attributes: 
             email: 
-              taken: "已被注册。"
+              taken: 已被注册。
             person: 
-              invalid: "不合法。"
+              invalid: 不合法。
             username: 
               invalid: "is invalid. We only allow letters, numbers, and underscores"
-              taken: "已被注册。"
+              taken: 已被注册。
   ago: "%{time}前"
   all_aspects: "所有视图"
   application: 
@@ -47,7 +47,7 @@ zh-CN:
       unknown_person: "未知用户"
       video_title: 
         unknown: "未知影片标题"
-  are_you_sure: "你确定吗？"
+  are_you_sure: 你确定吗？
   aspect_memberships: 
     destroy: 
       failure: "从视图中移除好友失败"
@@ -55,8 +55,8 @@ zh-CN:
       success: "从视图中移除好友成功"
   aspects: 
     add_to_aspect: 
-      failure: "将好友添加到视图失败。"
-      success: "将好友添加到视图成功。"
+      failure: 将好友添加到视图失败。
+      success: 将好友添加到视图成功。
     aspect_contacts: 
       done_editing: "编辑完成"
     aspect_listings: 
@@ -67,10 +67,10 @@ zh-CN:
     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: "此视图中的好友相互可见。"
+    contacts_not_visible: 此视图中的好友相互不可见。
+    contacts_visible: 此视图中的好友相互可见。
     create: 
-      failure: "添加视图失败。"
+      failure: 添加视图失败。
       success: "添加新视图 %{name} 成功"
     destroy: 
       failure: "无法删除 %{name} ，它不是空的。"
@@ -79,16 +79,16 @@ zh-CN:
       add_existing: "添加好友"
       aspect_list_is_not_visible: "视图中的好友不能看见本视图的好友列表"
       aspect_list_is_visible: "视图中的好友能够看见本视图的好友列表"
-      confirm_remove_aspect: "你确定要删除这个视图？"
+      confirm_remove_aspect: 你确定要删除这个视图？
       done: "完成"
-      make_aspect_list_visible: "是否让其他人可以看见本视图的好友列表？"
+      make_aspect_list_visible: 是否让其他人可以看见本视图的好友列表？
       remove_aspect: "删除这个视图"
       rename: "重命名"
       update: "更新"
       updating: "更新中"
     few: "%{count}个视图"
     helper: 
-      are_you_sure: "您确定要删除这个视图？"
+      are_you_sure: 您确定要删除这个视图？
       aspect_not_empty: "此视图不是空的"
       remove: "删除"
     index: 
@@ -121,7 +121,7 @@ zh-CN:
       no_contacts: "没有任何好友"
       no_tags: "No tags"
       people_sharing_with_you: "与您分享的人"
-      post_a_message: "发布站内信>>"
+      post_a_message: 发布站内信>>
       services: 
         content: "You can connect the following services to Diaspora:"
         heading: "Connect Services"
@@ -142,7 +142,7 @@ zh-CN:
       try_adding_some_more_contacts: "You can search (top) or invite (right) more contacts."
       you_should_add_some_more_contacts: "You should add some more contacts!"
     no_posts_message: 
-      start_talking: "还没人发布过内容。你发布第一条吧！"
+      start_talking: 还没人发布过内容。你发布第一条吧！
     one: "1个视图"
     other: "%{count}个视图"
     seed: 
@@ -167,19 +167,26 @@ zh-CN:
       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: 
     explanation: "%{link} 收藏这个链接，即可随时发布新内容"
     explanation_link_text: "这个链接"
     heading: "Diaspora Bookmarklet"
     post_something: "发布些新内容到Diaspora"
-    post_success: "发布完成！关闭中！"
+    post_success: 发布完成！关闭中！
   cancel: "取消"
   comments: 
     few: "%{count}条回复"
     many: "%{count}条回复"
     new_comment: 
       comment: "发布回复"
-      commenting: "回复发布中……"
+      commenting: 回复发布中……
     one: "1条回复"
     other: "%{count}条回应"
     two: "%{count} comments"
@@ -205,7 +212,7 @@ zh-CN:
     one: "1个好友"
     other: "%{count}个好友"
     sharing: 
-      people_sharing: "与您分享的人："
+      people_sharing: 与您分享的人：
     spotlight: 
       community_spotlight: "Community Spotlight"
     two: "%{count} contacts"
@@ -234,7 +241,7 @@ zh-CN:
     new: 
       abandon_changes: "Abandon changes?"
       send: "发送"
-      sending: "Sending..."
+      sending: Sending...
       subject: "主题"
       to: "收件人"
     new_message: 
@@ -242,7 +249,7 @@ zh-CN:
     show: 
       delete: "删除并中止对话"
       reply: "回复"
-      replying: "Replying..."
+      replying: Replying...
   date: 
     formats: 
       birthday: "%m-%d"
@@ -252,34 +259,34 @@ zh-CN:
   email: "电子邮件"
   error_messages: 
     helper: 
-      correct_the_following_errors_and_try_again: "修正以下错误后重试。"
+      correct_the_following_errors_and_try_again: 修正以下错误后重试。
       invalid_fields: "无效栏目"
   fill_me_out: "填写我"
   find_people: "Find people"
   hide: "隐藏"
   home: 
     show: 
-      already_account: "已经有帐号了吗？"
+      already_account: 已经有帐号了吗？
       choice: "选择"
       choice_explanation: "Diaspora 让你将您的关系分成多个视图，每个视图是您生活的不同部分。这是Diaspora首创，用来确保您的照片、经历和笑话，只与您所希望分享的人分享。"
-      learn_about_host: "学习如何架设您自己的Diaspora服务器。"
+      learn_about_host: 学习如何架设您自己的Diaspora服务器。
       login_here: "从这里登录"
       ownership: "所有权"
-      ownership_explanation: "你拥有您的图片，且不因为分享而失去该权利。在Diaspora，所有你分享的内容，你都持有所有权，你可以控制它们的发布。"
-      share_what_you_want: "分享您想分享的内容，给您想分享给的人。"
+      ownership_explanation: 你拥有您的图片，且不因为分享而失去该权利。在Diaspora，所有你分享的内容，你都持有所有权，你可以控制它们的发布。
+      share_what_you_want: 分享您想分享的内容，给您想分享给的人。
       simplicity: "简单"
       simplicity_explanation: "Diaspora让分享变得干净而简单，对隐私设置也是这样。以隐私为出发点，Diaspora 让你不必千辛万苦的调整设置，就能保护您的个人信息安全。"
-      tagline_first_half: "分享您想分享的内容，"
-      tagline_second_half: "给您想分享给的人。"
+      tagline_first_half: 分享您想分享的内容，
+      tagline_second_half: 给您想分享给的人。
   invitations: 
     a_facebook_user: "A Facebook user"
     check_token: 
       not_found: "找不到该邀请码"
     create: 
       already_contacts: "你已经将他加为好友了"
-      already_sent: "你邀请过这个人了。"
-      no_more: "你没有邀请函了。"
-      own_address: "您不能发送邀请给自己。"
+      already_sent: 你邀请过这个人了。
+      no_more: 你没有邀请函了。
+      own_address: 您不能发送邀请给自己。
       rejected: "下列电子信箱有问题: "
       sent: "邀请函已经寄给: "
     edit: 
@@ -288,9 +295,9 @@ zh-CN:
     new: 
       already_invited: "已邀请过"
       aspect: "视图"
-      comma_seperated_plz: "你可以输入多个邮箱，输入多个时以逗号分隔。"
-      if_they_accept_info: "如果他们接受，就会自动被加入到您所邀请的视图中。"
-      invite_someone_to_join: "邀请好友来加入到Diaspora！"
+      comma_seperated_plz: 你可以输入多个邮箱，输入多个时以逗号分隔。
+      if_they_accept_info: 如果他们接受，就会自动被加入到您所邀请的视图中。
+      invite_someone_to_join: 邀请好友来加入到Diaspora！
       language: "Language"
       personal_message: "个人信息"
       resend: "重寄"
@@ -302,7 +309,7 @@ zh-CN:
       powered_by: "Powered by DIASPORA*"
       public_feed: "%{name} 的 Diaspora RSS Feed"
       toggle: "切换为手机网页"
-      whats_new: "有什么新内容？"
+      whats_new: 有什么新内容？
       your_aspects: "您的视图"
     header: 
       admin: "管理员"
@@ -410,7 +417,7 @@ zh-CN:
       other: "%{actors} mentioned you in a deleted 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."
@@ -464,10 +471,10 @@ zh-CN:
       admin: "为您服务的 Diaspora 管理员"
       subject: "关于您 Diaspora 帐号的信息:"
     started_sharing: 
-      sharing: "刚开始与您分享！"
+      sharing: 刚开始与您分享！
       subject: "%{name}刚开始在Diaspora*与您分享"
       view_profile: "View %{name}'s profile"
-    thanks: "谢谢，"
+    thanks: 谢谢，
     to_change_your_notification_settings: "to change your notification settings"
   ok: "确定"
   or: "或"
@@ -483,10 +490,10 @@ zh-CN:
       people_on_pod_are_aware_of: " Pod上已知的人"
       results_for: " %{params}的搜索结果"
     index: 
-      couldnt_find_them_send_invite: "找不到他们？邀请他们加入Diaspora吧！"
-      no_one_found: "……找不到任何内容。"
+      couldnt_find_them_send_invite: 找不到他们？邀请他们加入Diaspora吧！
+      no_one_found: ……找不到任何内容。
       no_results: "嘿！ 搜索必须要有目标呀。"
-      results_for: "搜索结果："
+      results_for: 搜索结果：
     many: "%{count}个好友"
     one: "1个好友"
     other: "%{count}个好友"
@@ -494,7 +501,7 @@ zh-CN:
       add_contact: "加为好友"
       already_connected: "已加为好友"
       pending_request: "请求等候中"
-      thats_you: "这是你自己！"
+      thats_you: 这是你自己！
     profile_sidebar: 
       bio: "自我介绍"
       born: "生日"
@@ -505,8 +512,9 @@ zh-CN:
       remove_contact: "解除好友关系"
       remove_from: "要从 %{aspect} 删除 %{name} 吗？"
     show: 
-      does_not_exist: "好友不存在！"
+      does_not_exist: 好友不存在！
       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: "消息"
@@ -516,7 +524,7 @@ zh-CN:
       return_to_aspects: "回到您的视图主页"
       see_all: "查看全部"
       start_sharing: "开始分享"
-      to_accept_or_ignore: "接受或忽略它。"
+      to_accept_or_ignore: 接受或忽略它。
     sub_header: 
       add_some: "add some"
       edit: "edit"
@@ -528,24 +536,24 @@ zh-CN:
   photos: 
     comment_email_subject: "%{name}'s photo"
     create: 
-      integrity_error: "照片上传失败。你确定它是图片吗？"
-      runtime_error: "照片上传失败。你确定有扣安全带吗？"
-      type_error: "照片上传失败。你确定有选择任何图片吗？"
+      integrity_error: 照片上传失败。你确定它是图片吗？
+      runtime_error: 照片上传失败。你确定有扣安全带吗？
+      type_error: 照片上传失败。你确定有选择任何图片吗？
     destroy: 
-      notice: "照片删除成功。"
+      notice: 照片删除成功。
     edit: 
       editing: "编辑中"
     new: 
       back_to_list: "回列表"
       new_photo: "新照片"
-      post_it: "发布！"
+      post_it: 发布！
     new_photo: 
       empty: "文件 {file} 是空的，请重新选择文件，并且不要选中它。"
       invalid_ext: "不支持文件 {file} 的格式。只接受{extensions}。"
       size_error: "文件 {file} 太大了，上限是 {sizeLimit}。"
     new_profile_photo: 
       or_select_one: "或从既有照片中挑选一张"
-      upload: "上传新的头像！"
+      upload: 上传新的头像！
     photo: 
       view_all: "查看 %{name} 所有的照片"
     show: 
@@ -557,18 +565,15 @@ zh-CN:
       show_original_post: "Show original post"
       update_photo: "更新照片"
     update: 
-      error: "照片更新失败。"
-      notice: "照片更新成功。"
-  post_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."
+      error: 照片更新失败。
+      notice: 照片更新成功。
   posts: 
     show: 
       destroy: "Delete"
       not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   previous: "上一步"
+  privacy: "Privacy"
   profile: "个人档案"
   profiles: 
     edit: 
@@ -605,9 +610,9 @@ zh-CN:
     edit: 
       cancel_my_account: "取消我的帐号"
       edit: "编辑 %{name}"
-      leave_blank: "(不想变更时请留空)"
-      password_to_confirm: "(我们需要您现在的密码以确认您要变更)"
-      unhappy: "不满意？"
+      leave_blank: (不想变更时请留空)
+      password_to_confirm: (我们需要您现在的密码以确认您要变更)
+      unhappy: 不满意？
       update: "更新"
     new: 
       create_my_account: "Create my account"
@@ -622,22 +627,22 @@ zh-CN:
       sending: "发送中"
       sent: "您已经请求与 %{name} 分享。他们下次登入 Diaspora 时就会看见您的请求。"
     destroy: 
-      error: "请选择一个视图！"
-      ignore: "忽略建立好友的请求。"
-      success: "你们现在互相分享了。"
+      error: 请选择一个视图！
+      ignore: 忽略建立好友的请求。
+      success: 你们现在互相分享了。
     helper: 
       new_requests: 
         few: "%{count}个新请求！"
         many: "%{count}个新请求！"
-        one: "新的请求！"
+        one: 新的请求！
         other: "%{count}个新请求！"
         two: "%{count} new requests!"
         zero: "没有新请求"
     manage_aspect_contacts: 
       existing: "当前好友"
-      manage_within: "管理好友："
+      manage_within: 管理好友：
     new_request_to_person: 
-      sent: "发送成功！"
+      sent: 发送成功！
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
@@ -660,9 +665,9 @@ zh-CN:
     create: 
       already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
       failure: "Authentication failed."
-      success: "验证成功。"
+      success: 验证成功。
     destroy: 
-      success: "验证删除成功。"
+      success: 验证删除成功。
     failure: 
       error: "与该服务连接时有错误"
     finder: 
@@ -685,11 +690,15 @@ zh-CN:
       not_on_diaspora: "Not yet on Diaspora"
       resend: "重新发送"
   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 帐号搜索"
-      diaspora_handle: "diaspora@handle.org"
+      diaspora_handle: diaspora@handle.org
       enter_a_diaspora_username: "输入 Diaspora 帐号："
       know_email: "知道他们的电子信箱吗？ 你可以邀请他们加入。"
       your_diaspora_username_is: "您的 Diaspora 帐号是: %{diaspora_handle}"
@@ -709,7 +718,7 @@ zh-CN:
       your_aspects: "您的视图"
     invitations: 
       by_email: "通过电子邮件"
-      dont_have_now: "目前你还不能邀请任何人，但很快就可以了！"
+      dont_have_now: 目前你还不能邀请任何人，但很快就可以了！
       from_facebook: "从 Facebook"
       invitations_left: "(剩余%{count}张)"
       invite_someone: "邀请别人"
@@ -737,12 +746,12 @@ zh-CN:
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "在 %{aspect} 发布讯息"
-      posting: "发布中……"
-      publishing_to: "发布至："
+      posting: 发布中……
+      publishing_to: 发布至：
       share: "分享"
-      share_with: "与他分享："
+      share_with: 与他分享：
       upload_photos: "Upload photos"
-      whats_on_your_mind: "你想到了什么？"
+      whats_on_your_mind: 你想到了什么？
     reshare: 
       reshare: "重新分享"
     stream_element: 
@@ -750,6 +759,8 @@ zh-CN:
       currently_unavailable: "commenting currently unavailable"
       dislike: "不喜欢"
       hide_and_mute: "Hide and Mute"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "喜欢"
       shared_with: "Shared with: %{aspect_names}"
       unlike: "不喜欢"
@@ -761,7 +772,7 @@ zh-CN:
     destroy: 
       failure: "删除内容失败"
     helper: 
-      no_message_to_display: "没有信息可显示。"
+      no_message_to_display: 没有信息可显示。
     new: 
       mentioning: "提及发布中: %{person}"
     too_long: 
@@ -830,21 +841,21 @@ zh-CN:
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-  undo: "撤消？"
+  undo: 撤消？
   username: "帐号"
   users: 
     confirm_email: 
       email_confirmed: "E-Mail %{email} activated"
       email_not_confirmed: "E-Mail could not be activated. Wrong link?"
-    destroy: "帐号关闭成功。"
+    destroy: 帐号关闭成功。
     edit: 
-      also_commented: "……当有人也对您的好友的内容发表评论时？"
+      also_commented: ……当有人也对您的好友的内容发表评论时？
       change: "更改"
       change_email: "Change E-Mail"
       change_language: "更改语言"
       change_password: "更改密码"
       close_account: "关闭帐号"
-      comment_on_post: "……当有人对您的内容发表评论时？"
+      comment_on_post: ……当有人对您的内容发表评论时？
       current_password: "当前密码"
       download_photos: "下载我的照片"
       download_xml: "下载我的 xml"
@@ -852,16 +863,16 @@ zh-CN:
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "资料导出"
       getting_started: "New User Prefrences"
-      liked: "…有人喜欢您发布的内容？"
-      mentioned: "……当贴文中提到您时？"
+      liked: …有人喜欢您发布的内容？
+      mentioned: ……当贴文中提到您时？
       new_password: "新密码"
       photo_export_unavailable: "Photo exporting currently unavailable"
-      private_message: "……当收到私人信息时？"
-      receive_email_notifications: "是否要在以下情况收到电子邮件通知……"
+      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: "…有人开始与您分享？"
+      started_sharing: …有人开始与您分享？
       stream_preferences: "Stream Preferences"
       your_email: "您的电子邮箱"
       your_handle: "您的 diaspora 帐号"
@@ -871,7 +882,7 @@ zh-CN:
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
       hooking_up_fb: "hooking up your Facebook account"
-      saved: "Saved!"
+      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?"
@@ -883,6 +894,10 @@ zh-CN:
       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} 这个用户！"
     update: 
@@ -901,4 +916,4 @@ zh-CN:
     no_person_constructed: "从这份 hcard 资料无法组建出联络人。"
     not_enabled: "%{account} 的主机似乎没有启用 webfinger"
     xrd_fetch_failed: "从 %{account} 这个帐号取得 xrd 时发生错误"
-  welcome: "Welcome!"
+  welcome: Welcome!
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index bc3a3a88c..1a23b7f3a 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -17,15 +17,15 @@ zh-TW:
         contact: 
           attributes: 
             person_id: 
-              taken: "對此使用者必須為不重複的聯絡人."
+              taken: 對此使用者必須為不重複的聯絡人.
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "已經被使用了."
+              taken: 已經被使用了.
         request: 
           attributes: 
             from_id: 
-              taken: "與已經存在了的請求重複."
+              taken: 與已經存在了的請求重複.
         reshare: 
           attributes: 
             root_guid: 
@@ -33,12 +33,12 @@ zh-TW:
         user: 
           attributes: 
             email: 
-              taken: "已經被使用了."
+              taken: 已經被使用了.
             person: 
-              invalid: "不合格."
+              invalid: 不合格.
             username: 
               invalid: "不被接受. 只能夠使用字母, 數字, 以及底線符號."
-              taken: "已經被使用了."
+              taken: 已經被使用了.
   ago: "%{time}前"
   all_aspects: "所有面向"
   application: 
@@ -47,7 +47,7 @@ zh-TW:
       unknown_person: "不明聯絡人"
       video_title: 
         unknown: "影片標題不明"
-  are_you_sure: "你確定嗎?"
+  are_you_sure: 你確定嗎?
   aspect_memberships: 
     destroy: 
       failure: "從面向中移除聯絡人失敗"
@@ -55,8 +55,8 @@ zh-TW:
       success: "從面向中移除聯絡人成功"
   aspects: 
     add_to_aspect: 
-      failure: "將聯絡人加入至面向失敗."
-      success: "將聯絡人加入至面向成功."
+      failure: 將聯絡人加入至面向失敗.
+      success: 將聯絡人加入至面向成功.
     aspect_contacts: 
       done_editing: "編輯完成"
     aspect_listings: 
@@ -67,10 +67,10 @@ zh-TW:
     aspect_stream: 
       stay_updated: "隨時保持最新狀態"
       stay_updated_explanation: "你的主要流水帳會充滿了你的聯絡人, 追蹤的標籤, 以及一些有創意的社群成員的貼文."
-    contacts_not_visible: "此面向中的聯絡人無法看見彼此."
-    contacts_visible: "此面向中的聯絡人可以看見彼此."
+    contacts_not_visible: 此面向中的聯絡人無法看見彼此.
+    contacts_visible: 此面向中的聯絡人可以看見彼此.
     create: 
-      failure: "創造面向失敗."
+      failure: 創造面向失敗.
       success: "新的面向 %{name} 已經造出來了"
     destroy: 
       failure: "無法刪除 %{name} 因為它不是空的."
@@ -79,16 +79,16 @@ zh-TW:
       add_existing: "加入既有聯絡人"
       aspect_list_is_not_visible: "面向中的其他人無法看見聯絡人列表"
       aspect_list_is_visible: "面向中的其他人可以看見聯絡人列表"
-      confirm_remove_aspect: "你確定要刪除這個面向?"
+      confirm_remove_aspect: 你確定要刪除這個面向?
       done: "完成"
-      make_aspect_list_visible: "讓面向中的聯絡人可以互相看得到?"
+      make_aspect_list_visible: 讓面向中的聯絡人可以互相看得到?
       remove_aspect: "刪除這個面向"
       rename: "改名"
       update: "更新"
       updating: "更新中"
     few: "%{count}個面向"
     helper: 
-      are_you_sure: "你確定要刪除這個面向?"
+      are_you_sure: 你確定要刪除這個面向?
       aspect_not_empty: "面向不是空的"
       remove: "刪除"
     index: 
@@ -109,7 +109,7 @@ zh-TW:
         find_a_bug: "...找到一隻 %{link}?"
         have_a_question: "...有個 %{link}?"
         here_to_help: "Diaspora 社群就在這裡!"
-        need_help: "要幫忙嗎?"
+        need_help: 要幫忙嗎?
         satisfaction: "%{link}: 社群支援的客服網站"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "這是你的流水帳. 跳進來介紹你自己吧."
@@ -135,14 +135,14 @@ zh-TW:
       success: "聯絡人移至新的面向了"
     new: 
       create: "建立"
-      name: "名字(只有你自己看得到)"
+      name: 名字(只有你自己看得到)
     no_contacts_message: 
       community_spotlight: "社群焦點"
       or_spotlight: "或者你也可以和 %{link} 分享"
-      try_adding_some_more_contacts: "你可以搜尋或邀請更多聯絡人."
-      you_should_add_some_more_contacts: "新增更多聯絡人吧!"
+      try_adding_some_more_contacts: 你可以搜尋或邀請更多聯絡人.
+      you_should_add_some_more_contacts: 新增更多聯絡人吧!
     no_posts_message: 
-      start_talking: "都還沒有人出聲!"
+      start_talking: 都還沒有人出聲!
     one: "1個面向"
     other: "%{count}個面向"
     seed: 
@@ -151,8 +151,8 @@ zh-TW:
       friends: "朋友"
       work: "工作"
     selected_contacts: 
-      manage_your_aspects: "管理你的面向."
-      no_contacts: "你在這裡還沒有任何聯絡人."
+      manage_your_aspects: 管理你的面向.
+      no_contacts: 你在這裡還沒有任何聯絡人.
       view_all_community_spotlight: "看所有的社群焦點"
       view_all_contacts: "檢視所有聯絡人"
     show: 
@@ -164,9 +164,16 @@ zh-TW:
     zero: "沒有面向"
   authorizations: 
     index: 
-      no_applications: "尚未註冊任何應用程式."
+      no_applications: 尚未註冊任何應用程式.
       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: 
     explanation: "%{link}加入書籤後可對任何網站使用."
     explanation_link_text: "這個連結"
@@ -179,7 +186,7 @@ zh-TW:
     many: "%{count}則意見"
     new_comment: 
       comment: "發表意見"
-      commenting: "意見發表中..."
+      commenting: 意見發表中...
     one: "1則意見"
     other: "%{count}則意見"
     two: "%{count}則回應"
@@ -195,7 +202,7 @@ zh-TW:
       check_out: "看看"
       many_people_are_you_sure: "你確定要進行跟%{suggested_limit}個聯絡人的私人對話? 貼文到該面向可能是跟他們聯絡比較好的方式."
       my_contacts: "我的聯絡人"
-      no_contacts: "你好像應該要多加點聯絡人!"
+      no_contacts: 你好像應該要多加點聯絡人!
       only_sharing_with_me: "和我分享的人"
       remove_person_from_aspect: "將 %{person_name} 從\"%{aspect_name}\"中移除"
       start_a_conversation: "開始對話"
@@ -232,9 +239,9 @@ zh-TW:
       no_conversation_selected: "未選取任何對話"
       no_messages: "沒有訊息"
     new: 
-      abandon_changes: "放棄目前變動?"
+      abandon_changes: 放棄目前變動?
       send: "傳送"
-      sending: "傳送中..."
+      sending: 傳送中...
       subject: "主旨"
       to: "收件人"
     new_message: 
@@ -242,7 +249,7 @@ zh-TW:
     show: 
       delete: "刪除並中止對話"
       reply: "回覆"
-      replying: "回應中..."
+      replying: 回應中...
   date: 
     formats: 
       birthday: "%B %d"
@@ -252,14 +259,14 @@ zh-TW:
   email: "電子郵件"
   error_messages: 
     helper: 
-      correct_the_following_errors_and_try_again: "修正以下錯誤後再試一次."
+      correct_the_following_errors_and_try_again: 修正以下錯誤後再試一次.
       invalid_fields: "欄位無效"
   fill_me_out: "填寫我"
   find_people: "找人或 #標籤"
   hide: "隱藏"
   home: 
     show: 
-      already_account: "已經有帳號了嗎?"
+      already_account: 已經有帳號了嗎?
       choice: "選擇"
       choice_explanation: "Diaspora 讓你將你的關係以\"面向\"來分類. 面向是 Diaspora 的獨創, 用來確保你的相片,遭遇和笑話, 只和你所希望的人分享."
       learn_about_host: "學習如何架設你自己的 Diaspora 伺服器."
@@ -270,21 +277,21 @@ zh-TW:
       simplicity: "簡單"
       simplicity_explanation: "Diaspora 讓分享變得單純且簡單, 而隱私也是一樣. 以隱私為出發點, Diaspora 讓你不必千辛萬苦的調整設定, 才能保護你的個人檔案安全."
       tagline_first_half: "分享你想分享的東西,"
-      tagline_second_half: "給你想分享的人."
+      tagline_second_half: 給你想分享的人.
   invitations: 
     a_facebook_user: "Facebook 使用者"
     check_token: 
       not_found: "找不到該邀請信物"
     create: 
       already_contacts: "你已經和這個人相連了"
-      already_sent: "你邀請過這個人了."
-      no_more: "你沒有邀請函了."
-      own_address: "不能寄邀請函到你自己的信箱."
+      already_sent: 你邀請過這個人了.
+      no_more: 你沒有邀請函了.
+      own_address: 不能寄邀請函到你自己的信箱.
       rejected: "下列電子信箱有問題: "
       sent: "邀請函已經寄給: "
     edit: 
       accept_your_invitation: "接受邀請"
-      your_account_awaits: "你的帳號在等你!"
+      your_account_awaits: 你的帳號在等你!
     new: 
       already_invited: "這些人尚未接受你的邀請:"
       aspect: "面向"
@@ -302,7 +309,7 @@ zh-TW:
       powered_by: "強力配置 DIASPORA*"
       public_feed: "%{name} 的 Diaspora 公開資訊源"
       toggle: "行動切換"
-      whats_new: "有什麼新消息?"
+      whats_new: 有什麼新消息?
       your_aspects: "你的面向"
     header: 
       admin: "管理"
@@ -440,7 +447,7 @@ zh-TW:
       two: "%{actors} 開始和你分享了."
       zero: "%{actors}開始跟你分享了."
   notifier: 
-    a_post_you_shared: "一則貼文."
+    a_post_you_shared: 一則貼文.
     click_here: "按這裡"
     comment_on_post: 
       reply: "回或看 %{name} 的貼文 >"
@@ -464,7 +471,7 @@ zh-TW:
       admin: "為您服務的 Diaspora 管理員"
       subject: "關於你的 Diaspora 帳號的訊息:"
     started_sharing: 
-      sharing: "開始跟你分享了!"
+      sharing: 開始跟你分享了!
       subject: "%{name} 開始在 Diaspora* 跟你分享了"
       view_profile: "看 %{name} 的個人檔案"
     thanks: "謝謝,"
@@ -494,7 +501,7 @@ zh-TW:
       add_contact: "加入聯絡人"
       already_connected: "已經連結了"
       pending_request: "請求等候中"
-      thats_you: "那是你耶!"
+      thats_you: 那是你耶!
     profile_sidebar: 
       bio: "自我介紹"
       born: "生日"
@@ -505,8 +512,9 @@ zh-TW:
       remove_contact: "刪除聯絡人"
       remove_from: "要從 %{aspect} 刪除 %{name} 嗎?"
     show: 
-      does_not_exist: "聯絡人不存在!"
+      does_not_exist: 聯絡人不存在!
       has_not_shared_with_you_yet: "%{name} 尚未跟你分享任何貼文!"
+      ignoring: "You are ignoring all posts from %{name}."
       incoming_request: "%{name} 希望能和你分享"
       mention: "指指點點"
       message: "送訊息"
@@ -516,11 +524,11 @@ zh-TW:
       return_to_aspects: "回你的面向主頁"
       see_all: "看全部"
       start_sharing: "開始分享"
-      to_accept_or_ignore: "接受或不管它."
+      to_accept_or_ignore: 接受或不管它.
     sub_header: 
       add_some: "加入一些"
       edit: "編輯"
-      you_have_no_tags: "你沒有任何標籤!"
+      you_have_no_tags: 你沒有任何標籤!
     two: "%{count}個人"
     webfinger: 
       fail: "抱歉, 找不到 %{handle}."
@@ -532,20 +540,20 @@ zh-TW:
       runtime_error: "相片上傳失敗. 你確定安全帶有扣上嗎?"
       type_error: "相片上傳失敗. 你確定有加入任何圖片嗎?"
     destroy: 
-      notice: "相片刪掉了."
+      notice: 相片刪掉了.
     edit: 
       editing: "編輯中"
     new: 
       back_to_list: "回列表"
       new_photo: "新相片"
-      post_it: "發表!"
+      post_it: 發表!
     new_photo: 
       empty: "檔案 {file} 是空的, 請重新挑選檔案, 且不要再選它."
       invalid_ext: "檔案 {file} 的副檔名不合格. 只接受{extensions}."
       size_error: "檔案 {file} 太大了, 上限是{sizeLimit}."
     new_profile_photo: 
       or_select_one: "或從既有相片中挑選一張"
-      upload: "上傳新的個人照!"
+      upload: 上傳新的個人照!
     photo: 
       view_all: "檢視 %{name} 所有的相片"
     show: 
@@ -557,25 +565,22 @@ zh-TW:
       show_original_post: "顯示原文"
       update_photo: "更新相片"
     update: 
-      error: "相片編輯失敗."
-      notice: "相片更新成功."
-  post_visibilites: 
-    update: 
-      post_hidden_and_muted: "%{name} 的貼文設定為隱藏了, 且異動時不會送出消息通知."
-      see_it_on_their_profile: "如果你想要看這篇貼文的異動, 請見 %{name} 的個人檔案頁面."
+      error: 相片編輯失敗.
+      notice: 相片更新成功.
   posts: 
     show: 
       destroy: "刪除"
       not_found: "抱歉,找不到該則貼文."
       permalink: "靜態連結"
   previous: "前面"
+  privacy: "Privacy"
   profile: "個人檔案"
   profiles: 
     edit: 
       allow_search: "讓別人可以在 Diaspora 搜尋到你"
       edit_profile: "編輯個人檔案"
-      first_name: "名字(前)"
-      last_name: "名字(後)"
+      first_name: 名字(前)
+      last_name: 名字(後)
       update_profile: "更新個人檔案"
       your_bio: "你的自我介紹"
       your_birthday: "你的生日"
@@ -605,31 +610,31 @@ zh-TW:
     edit: 
       cancel_my_account: "取消我的帳號"
       edit: "編輯 %{name}"
-      leave_blank: "(不想變更則請留白)"
-      password_to_confirm: "(我們需要你目前的密碼以確認你要變更)"
-      unhappy: "不滿意?"
+      leave_blank: (不想變更則請留白)
+      password_to_confirm: (我們需要你目前的密碼以確認你要變更)
+      unhappy: 不滿意?
       update: "更新"
     new: 
-      create_my_account: "開我的帳號!"
+      create_my_account: 開我的帳號!
       enter_email: "輸入電子信箱"
       enter_password: "輸入密碼"
       enter_password_again: "輸入與前面相同的密碼"
       enter_username: "選個使用者名稱(名稱只能包含拉丁字母,數字,以及底線字元)"
-      join_the_movement: "參加這個行動!"
-      sign_up_message: "有♥的社交網路"
+      join_the_movement: 參加這個行動!
+      sign_up_message: 有♥的社交網路
   requests: 
     create: 
       sending: "傳送中"
       sent: "你已經要求要和 %{name} 分享了. 他們下次登入 Diaspora 時就會看見."
     destroy: 
-      error: "請選一個面向!"
-      ignore: "忽略建立聯繫的請求."
-      success: "你們現在互相分享了."
+      error: 請選一個面向!
+      ignore: 忽略建立聯繫的請求.
+      success: 你們現在互相分享了.
     helper: 
       new_requests: 
         few: "%{count}個新請求!"
         many: "%{count}個新請求!"
-        one: "新的請求!"
+        one: 新的請求!
         other: "%{count}個新請求!"
         two: "%{count}個新請求!"
         zero: "沒有新請求"
@@ -637,13 +642,13 @@ zh-TW:
       existing: "既有聯絡人"
       manage_within: "管理聯絡人於"
     new_request_to_person: 
-      sent: "送出去了!"
+      sent: 送出去了!
   reshares: 
     comment_email_subject: "%{resharer} 轉貼了 %{author} 的貼文"
     create: 
-      failure: "轉貼這篇貼文時發生錯誤."
+      failure: 轉貼這篇貼文時發生錯誤.
     reshare: 
-      deleted: "原貼文已經被作者刪除了."
+      deleted: 原貼文已經被作者刪除了.
       reshare: 
         few: "被轉貼%{count}次"
         many: "被轉貼%{count}次"
@@ -659,10 +664,10 @@ zh-TW:
   services: 
     create: 
       already_authorized: "已經有 Diaspora 識別碼為 %{diaspora_id} 的使用者被授權使用該 %{service_name} 帳號了."
-      failure: "認證失敗."
-      success: "認證成功."
+      failure: 認證失敗.
+      success: 認證成功.
     destroy: 
-      success: "認證刪除成功."
+      success: 認證刪除成功.
     failure: 
       error: "與該服務連結時有錯誤"
     finder: 
@@ -675,7 +680,7 @@ zh-TW:
       disconnect: "切斷連結"
       edit_services: "編輯服務"
       logged_in_as: "已經登入為"
-      no_services: "你還沒有任何連結了的服務."
+      no_services: 你還沒有任何連結了的服務.
       really_disconnect: "切斷與 %{service} 的連結?"
     inviter: 
       click_link_to_accept_invitation: "使用這個連結來接受邀請"
@@ -685,11 +690,15 @@ zh-TW:
       not_on_diaspora: "還沒來 Diaspora"
       resend: "重送"
   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: "加入新聯絡人"
       create_request: "以 Diaspora 識別碼搜尋"
-      diaspora_handle: "diaspora@pod.org"
+      diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "輸入 Diaspora 使用者名稱:"
       know_email: "知道他們的電子信箱嗎? 你應該邀請他們來"
       your_diaspora_username_is: "你的 Diaspora 使用者名稱是: %{diaspora_handle}"
@@ -737,12 +746,12 @@ zh-TW:
         i_like: "我對 %{tags} 有興趣."
         invited_by: "Thanks for the invite, "
       post_a_message_to: "在 %{aspect} 發表訊息"
-      posting: "發表中..."
+      posting: 發表中...
       publishing_to: "發表至: "
       share: "分享"
       share_with: "跟他/她分享:"
       upload_photos: "上傳照片"
-      whats_on_your_mind: "在想什麼?"
+      whats_on_your_mind: 在想什麼?
     reshare: 
       reshare: "轉貼"
     stream_element: 
@@ -750,6 +759,8 @@ zh-TW:
       currently_unavailable: "目前無法回應"
       dislike: "遜"
       hide_and_mute: "隱藏且消音"
+      ignore_user: "Ignore %{name}"
+      ignore_user_description: "Ignore and remove user from all aspects?"
       like: "讚"
       shared_with: "分享給: %{aspect_names}"
       unlike: "收回讚"
@@ -761,7 +772,7 @@ zh-TW:
     destroy: 
       failure: "刪除貼文失敗"
     helper: 
-      no_message_to_display: "沒有訊息可顯示."
+      no_message_to_display: 沒有訊息可顯示.
     new: 
       mentioning: "指指點點中: %{person}"
     too_long: 
@@ -823,14 +834,14 @@ zh-TW:
       connecting_is_simple: "跟 Diapora 帳號連結很簡單! 只要從 cubbies <a href='%{href_link}'>設定頁面</a>輸入你的 Diaspora 識別碼, 再按下\"連結\"就可以了."
       daniels_account: "Daniel的 Diaspora 帳號"
       log_in_with_diaspora_is_comming: "很快你就可以使用 Diaspora 帳號連線至新的應用程式, 而不用另外再開新的帳號了."
-      love_to_try: "希望你能試試看."
+      love_to_try: 希望你能試試看.
       making_the_connection: "建立連結"
       screenshot_explanation: "%{link1}. 這個cubby頁面是連結至%{link2}."
-      sign_up_today: "今天就來註冊!"
+      sign_up_today: 今天就來註冊!
       typical_userpage: "典型的 cubbi.es 個人頁面"
       via: "(經由%{link})"
       what_is_cubbies: "Cubbi.es 是世界上第一個 Diaspora 應用程式. 它也是收集線上照片的最佳方式."
-  undo: "復原?"
+  undo: 復原?
   username: "使用者名稱"
   users: 
     confirm_email: 
@@ -840,7 +851,7 @@ zh-TW:
     edit: 
       also_commented: "...當有人也對你的聯絡人的貼文發表意見時?"
       change: "更改"
-      change_email: "更改E-Mail"
+      change_email: 更改E-Mail
       change_language: "更改語言"
       change_password: "更改密碼"
       close_account: "關閉帳號"
@@ -857,9 +868,9 @@ zh-TW:
       new_password: "新的密碼"
       photo_export_unavailable: "相片目前無法匯出"
       private_message: "...當收到私人訊息時?"
-      receive_email_notifications: "是否要在以下時機透過電子郵件接收消息..."
+      receive_email_notifications: 是否要在以下時機透過電子郵件接收消息...
       reshared: "...有人轉貼你的貼文時?"
-      show_community_spotlight: "要在流水帳中顯示社群焦點?"
+      show_community_spotlight: 要在流水帳中顯示社群焦點?
       show_getting_started: "重跑入門指南"
       started_sharing: "...當有人開始和你分享時?"
       stream_preferences: "流水帳偏好設定"
@@ -871,18 +882,22 @@ zh-TW:
       hashtag_explanation: "標籤讓你可以討論及追蹤你的興趣. 並且也是在 Diaspora 找到新朋友的好方法."
       hashtag_suggestions: "試試看追蹤像是 #藝術, #電影, #gif 等標籤."
       hooking_up_fb: "連接你的 Facebook 帳號"
-      saved: "存好了!"
+      saved: 存好了!
       we_can_speed_things_up: "我們可以藉由"
       well_hello_there: "嗨, 你好!"
-      what_are_you_in_to: "你對什麼有興趣?"
+      what_are_you_in_to: 你對什麼有興趣?
       what_facebook_does: "讓你儘快開始使用 Diaspora. 這個步驟會拿你在 Facebook 的名字和照片來用, 並開啟多重發表."
-      who_are_you: "你是誰?"
+      who_are_you: 你是誰?
     logged_out: 
-      go_mobile: "開始行動瀏覽."
+      go_mobile: 開始行動瀏覽.
       on_your_mobile_device: "就可以使用 Diaspora* 行動版."
       signed_out: "你已經登出 Diaspora* 了"
       simply_visit: "只要在你的行動設備上輸入"
       works_on_modern: "適用於所有新潮的智慧型手機"
+    privacy_settings: 
+      ignored_users: "Ignored Users"
+      stop_ignoring: "Stop ignoring"
+      title: "Privacy Settings"
     public: 
       does_not_exist: "不存在 %{username} 這個使用者!"
     update: 
@@ -894,11 +909,11 @@ zh-TW:
       settings_not_updated: "設定更新失敗"
       settings_updated: "設定更新了"
       unconfirmed_email_changed: "E-Mail更改了. 必須要啟動使用."
-      unconfirmed_email_not_changed: "E-Mail更改失敗"
+      unconfirmed_email_not_changed: E-Mail更改失敗
   webfinger: 
     fetch_failed: "擷取 %{profile_url} 的 webfinger 個人檔案失敗"
     hcard_fetch_failed: "擷取 %{account} 的 hcard 資料時發生錯誤"
     no_person_constructed: "從這份 hcard 資料無法組出聯絡人."
     not_enabled: "%{account} 的主機似乎沒有啟用 webfinger"
     xrd_fetch_failed: "從 %{account} 這個帳號取得 xrd 時發生錯誤"
-  welcome: "歡迎光臨!"
+  welcome: 歡迎光臨!
diff --git a/config/locales/javascript/javascript.ar.yml b/config/locales/javascript/javascript.ar.yml
index b092168ff..725a42c12 100644
--- a/config/locales/javascript/javascript.ar.yml
+++ b/config/locales/javascript/javascript.ar.yml
@@ -8,6 +8,7 @@ ar:
     aspect_dropdown: 
       add_to_aspect: "أضف إلى فئة"
       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}}."
diff --git a/config/locales/javascript/javascript.bg.yml b/config/locales/javascript/javascript.bg.yml
index 853b69990..43c78a189 100644
--- a/config/locales/javascript/javascript.bg.yml
+++ b/config/locales/javascript/javascript.bg.yml
@@ -8,6 +8,7 @@ bg:
     aspect_dropdown: 
       add_to_aspect: "Избиране на аспект(и)"
       all_aspects: "Във всеки аспект"
+      error: "Не е възможно започване на споделяне с {{name}}.  Вероятно ги игнорирате?"
       select_aspects: "Избиране на аспект(и)"
       started_sharing_with: "Започнахте да споделяте с {{name}}!"
       stopped_sharing_with: "Престанахте да споделяте с {{name}}."
diff --git a/config/locales/javascript/javascript.br.yml b/config/locales/javascript/javascript.br.yml
index df4dd5d61..c733220c9 100644
--- a/config/locales/javascript/javascript.br.yml
+++ b/config/locales/javascript/javascript.br.yml
@@ -8,6 +8,7 @@ br:
     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}}."
@@ -60,7 +61,7 @@ br:
       prefixFromNow: ""
       seconds: "dindan ur vunutenn"
       suffixAgo: "zo"
-      suffixFromNow: "diwar-vremañ"
+      suffixFromNow: diwar-vremañ
       year: "war-dro ur bloavezh"
       years: "%d a vloavezhioù"
     videos: 
diff --git a/config/locales/javascript/javascript.cs.yml b/config/locales/javascript/javascript.cs.yml
index 160878c12..e5cb5d632 100644
--- a/config/locales/javascript/javascript.cs.yml
+++ b/config/locales/javascript/javascript.cs.yml
@@ -8,6 +8,7 @@ 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?"
       select_aspects: "Select aspects"
       started_sharing_with: "You have started sharing with {{name}}!"
       stopped_sharing_with: "You have stopped sharing with {{name}}."
diff --git a/config/locales/javascript/javascript.cy.yml b/config/locales/javascript/javascript.cy.yml
index 51f07a9a0..bc2b6101b 100644
--- a/config/locales/javascript/javascript.cy.yml
+++ b/config/locales/javascript/javascript.cy.yml
@@ -8,6 +8,7 @@ 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}}."
diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml
index 33b0d6848..201ca5e03 100644
--- a/config/locales/javascript/javascript.da.yml
+++ b/config/locales/javascript/javascript.da.yml
@@ -8,6 +8,7 @@ da:
     aspect_dropdown: 
       add_to_aspect: "Tilføj kontakt"
       all_aspects: "Alle aspekter"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       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}}."
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index 31f1080c0..e532661af 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -8,6 +8,7 @@ de:
     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ähle Aspekte aus"
       started_sharing_with: "Du hast angefangen, mit {{name}} zu teilen!"
       stopped_sharing_with: "Du hast aufgehört, mit {{name}} zu teilen!"
diff --git a/config/locales/javascript/javascript.de_formal.yml b/config/locales/javascript/javascript.de_formal.yml
index 609054c40..20cff5d80 100644
--- a/config/locales/javascript/javascript.de_formal.yml
+++ b/config/locales/javascript/javascript.de_formal.yml
@@ -8,6 +8,7 @@ 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!"
diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml
index 8cf47eff0..97203db6d 100644
--- a/config/locales/javascript/javascript.el.yml
+++ b/config/locales/javascript/javascript.el.yml
@@ -8,6 +8,7 @@ el:
     aspect_dropdown: 
       add_to_aspect: "Προσθήκη σε πτυχή"
       all_aspects: "Όλες οι πτυχές"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Επιλογή πτυχών"
       started_sharing_with: "You have started sharing with {{name}}!"
       stopped_sharing_with: "You have stopped sharing with {{name}}."
@@ -26,7 +27,7 @@ el:
       hide: "απόκρυψη σχολίων"
       show: "προβολή όλων των σχολίων"
     confirm_dialog: "Είστε σίγουρος/η;"
-    failed_to_like: "Αποτυχία!"
+    failed_to_like: Αποτυχία!
     failed_to_post_message: "Αποτυχία δημοσίευσης μηνύματος!"
     getting_started: 
       alright_ill_wait: "Alright, I'll wait."
diff --git a/config/locales/javascript/javascript.en_1337.yml b/config/locales/javascript/javascript.en_1337.yml
index a1d118700..73afc05d3 100644
--- a/config/locales/javascript/javascript.en_1337.yml
+++ b/config/locales/javascript/javascript.en_1337.yml
@@ -8,6 +8,7 @@ en_1337:
     aspect_dropdown: 
       add_to_aspect: "4DD N00B"
       all_aspects: "4LL 45P3C75"
+      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}}."
@@ -25,7 +26,7 @@ en_1337:
     comments: 
       hide: "H1D3 5P4M5!"
       show: "5H0W 4LL 5P4M5!"
-    confirm_dialog: "5UR3?"
+    confirm_dialog: 5UR3?
     failed_to_like: "F41L3D 2 <3!"
     failed_to_post_message: "F41L3D 2 53ND 5P4M!"
     getting_started: 
@@ -67,4 +68,4 @@ en_1337:
       unknown: "UNK0WN V1D30 7YP3"
       watch: "W47CH 7H15 V1D30 0N {{provider}}"
     web_sockets: 
-      disconnected: "D15C0NN3C73D!"
+      disconnected: D15C0NN3C73D!
diff --git a/config/locales/javascript/javascript.en_pirate.yml b/config/locales/javascript/javascript.en_pirate.yml
index dd110b0ca..1a110be38 100644
--- a/config/locales/javascript/javascript.en_pirate.yml
+++ b/config/locales/javascript/javascript.en_pirate.yml
@@ -8,6 +8,7 @@ en_pirate:
     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}}."
diff --git a/config/locales/javascript/javascript.en_shaw.yml b/config/locales/javascript/javascript.en_shaw.yml
index 0fc93d3ad..15f90b108 100644
--- a/config/locales/javascript/javascript.en_shaw.yml
+++ b/config/locales/javascript/javascript.en_shaw.yml
@@ -8,6 +8,7 @@ en_shaw:
     aspect_dropdown: 
       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}}."
diff --git a/config/locales/javascript/javascript.eo.yml b/config/locales/javascript/javascript.eo.yml
index 70ef0b84e..a45a01fe8 100644
--- a/config/locales/javascript/javascript.eo.yml
+++ b/config/locales/javascript/javascript.eo.yml
@@ -8,6 +8,7 @@ eo:
     aspect_dropdown: 
       add_to_aspect: "Aldoni al aspekto"
       all_aspects: "Ĉiuj aspektoj"
+      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}}."
diff --git a/config/locales/javascript/javascript.es-AR.yml b/config/locales/javascript/javascript.es-AR.yml
index 95bb10685..28f2a6c7e 100644
--- a/config/locales/javascript/javascript.es-AR.yml
+++ b/config/locales/javascript/javascript.es-AR.yml
@@ -8,6 +8,7 @@ es-AR:
     aspect_dropdown: 
       add_to_aspect: "Agregar al aspecto"
       all_aspects: "Todos los aspectos"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Selecciona aspectos"
       started_sharing_with: "You have started sharing with {{name}}!"
       stopped_sharing_with: "You have stopped sharing with {{name}}."
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index 6094b1cd8..2a7bc82e7 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -8,6 +8,7 @@ es:
     aspect_dropdown: 
       add_to_aspect: "Añadir contacto"
       all_aspects: "Todos los aspectos"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Elige los aspectos"
       started_sharing_with: "¡Has empezado a compartir con {{name}}!"
       stopped_sharing_with: "Ya no compartes más con {{name}}."
diff --git a/config/locales/javascript/javascript.eu.yml b/config/locales/javascript/javascript.eu.yml
index 0dd04c9b3..3a486f70a 100644
--- a/config/locales/javascript/javascript.eu.yml
+++ b/config/locales/javascript/javascript.eu.yml
@@ -8,6 +8,7 @@ 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."
diff --git a/config/locales/javascript/javascript.fi.yml b/config/locales/javascript/javascript.fi.yml
index 75eca8a53..87feabbf8 100644
--- a/config/locales/javascript/javascript.fi.yml
+++ b/config/locales/javascript/javascript.fi.yml
@@ -8,6 +8,7 @@ fi:
     aspect_dropdown: 
       add_to_aspect: "Lisää näkymään"
       all_aspects: "Kaikki näkymät"
+      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}}."
diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml
index 5dfbeb7e9..93960872f 100644
--- a/config/locales/javascript/javascript.fr.yml
+++ b/config/locales/javascript/javascript.fr.yml
@@ -8,6 +8,7 @@ fr:
     aspect_dropdown: 
       add_to_aspect: "Ajouter le contact"
       all_aspects: "Tous les aspects"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       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}}."
@@ -57,7 +58,7 @@ fr:
       month: "environ un mois"
       months: "environ %d mois"
       prefixAgo: "il y a"
-      prefixFromNow: "d'ici"
+      prefixFromNow: d'ici
       seconds: "moins d'une minute"
       suffixAgo: ""
       suffixFromNow: ""
diff --git a/config/locales/javascript/javascript.he.yml b/config/locales/javascript/javascript.he.yml
index 496655f7e..cce2b9028 100644
--- a/config/locales/javascript/javascript.he.yml
+++ b/config/locales/javascript/javascript.he.yml
@@ -8,6 +8,7 @@ he:
     aspect_dropdown: 
       add_to_aspect: "הוספה להיבט"
       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}}."
@@ -25,7 +26,7 @@ he:
     comments: 
       hide: "הסתרת תגובות"
       show: "הצגת כל התגובות"
-    confirm_dialog: "בבטחה?"
+    confirm_dialog: בבטחה?
     failed_to_like: "הסימון ב'אהבתי' נכשל!"
     failed_to_post_message: "פרסום ההודעה נכשל!"
     getting_started: 
diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml
index b0e81494e..45d7b4960 100644
--- a/config/locales/javascript/javascript.hu.yml
+++ b/config/locales/javascript/javascript.hu.yml
@@ -8,6 +8,7 @@ hu:
     aspect_dropdown: 
       add_to_aspect: "Hozzáadás a csoporthoz"
       all_aspects: "Összes csoport"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Csoportok kiválasztása"
       started_sharing_with: "Mostantól megosztassz vele: {{name}}!"
       stopped_sharing_with: "Nem osztassz meg többé vele: {{name}}."
diff --git a/config/locales/javascript/javascript.id.yml b/config/locales/javascript/javascript.id.yml
index 2e719ad1f..6c5ce41b2 100644
--- a/config/locales/javascript/javascript.id.yml
+++ b/config/locales/javascript/javascript.id.yml
@@ -8,6 +8,7 @@ id:
     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}}."
diff --git a/config/locales/javascript/javascript.is.yml b/config/locales/javascript/javascript.is.yml
index f92aa52e6..864543743 100644
--- a/config/locales/javascript/javascript.is.yml
+++ b/config/locales/javascript/javascript.is.yml
@@ -8,6 +8,7 @@ is:
     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}}."
diff --git a/config/locales/javascript/javascript.it.yml b/config/locales/javascript/javascript.it.yml
index d026467d4..a0ab657ee 100644
--- a/config/locales/javascript/javascript.it.yml
+++ b/config/locales/javascript/javascript.it.yml
@@ -8,6 +8,7 @@ it:
     aspect_dropdown: 
       add_to_aspect: "Aggiungi"
       all_aspects: "Tutti gli aspetti"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Scegli gli aspetti"
       started_sharing_with: "Hai iniziato a condividere con {{name}}!"
       stopped_sharing_with: "Hai smesso di condividere con {{name}}."
@@ -44,7 +45,7 @@ it:
     reshares: 
       duplicate: "Bello eh? Ma hai già condiviso quel post!"
     search_for: "Ricerca per {{name}}"
-    show_more: "continua..."
+    show_more: continua...
     tags: 
       wasnt_that_interesting: "OK, immagino che #{{tagName}} non fosse così interessante..."
     timeago: 
diff --git a/config/locales/javascript/javascript.ja.yml b/config/locales/javascript/javascript.ja.yml
index 34ef647fc..2d19028d3 100644
--- a/config/locales/javascript/javascript.ja.yml
+++ b/config/locales/javascript/javascript.ja.yml
@@ -8,6 +8,7 @@ ja:
     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}}."
@@ -25,7 +26,7 @@ ja:
     comments: 
       hide: "hide comments"
       show: "show all comments"
-    confirm_dialog: "本当にいいですか。"
+    confirm_dialog: 本当にいいですか。
     failed_to_like: "Failed to like!"
     failed_to_post_message: "Failed to post message!"
     getting_started: 
@@ -34,11 +35,11 @@ ja:
       no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
       preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
-      no_more: "投稿はこれ以上ありません。"
+      no_more: 投稿はこれ以上ありません。
     photo_uploader: 
       looking_good: "OMG, you look awesome!"
     publisher: 
-      at_least_one_aspect: "アスペクトを選択してから投稿してください。"
+      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: 
@@ -51,7 +52,7 @@ ja:
       day: "1日"
       days: "%d日"
       hour: "大体1時間"
-      hours: "大体%d時間"
+      hours: 大体%d時間
       minute: "約1分"
       minutes: "%d分"
       month: "大体1ヶ月"
@@ -67,4 +68,4 @@ ja:
       unknown: "動画の種類が不明です"
       watch: "{{provider}}で動画を視聴する"
     web_sockets: 
-      disconnected: "接続が解除されました。投稿のリアルタイム更新を中断します。"
+      disconnected: 接続が解除されました。投稿のリアルタイム更新を中断します。
diff --git a/config/locales/javascript/javascript.ko.yml b/config/locales/javascript/javascript.ko.yml
index 651a8d8a1..d3364bb3e 100644
--- a/config/locales/javascript/javascript.ko.yml
+++ b/config/locales/javascript/javascript.ko.yml
@@ -8,6 +8,7 @@ ko:
     aspect_dropdown: 
       add_to_aspect: "애스펙에 넣기"
       all_aspects: "모든 에스팩"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "에스팩 선택"
       started_sharing_with: "{{name}}님과의 공유를 시작합니다!"
       stopped_sharing_with: "{{name}}님과의 공유를 멈췄습니다."
@@ -25,7 +26,7 @@ ko:
     comments: 
       hide: "댓글 감추기"
       show: "모든 댓글 보기"
-    confirm_dialog: "확실합니까?"
+    confirm_dialog: 확실합니까?
     failed_to_like: "좋아요를 실패했습니다!"
     failed_to_post_message: "공유물 올리기를 실패했습니다!"
     getting_started: 
diff --git a/config/locales/javascript/javascript.nb.yml b/config/locales/javascript/javascript.nb.yml
index 98fd6f52e..c6922107d 100644
--- a/config/locales/javascript/javascript.nb.yml
+++ b/config/locales/javascript/javascript.nb.yml
@@ -8,6 +8,7 @@ nb:
     aspect_dropdown: 
       add_to_aspect: "Legg til kategori"
       all_aspects: "Alle kategorier"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Velg kategori"
       started_sharing_with: "You have started sharing with {{name}}!"
       stopped_sharing_with: "You have stopped sharing with {{name}}."
diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml
index d79cd6740..2e87d2e3b 100644
--- a/config/locales/javascript/javascript.nl.yml
+++ b/config/locales/javascript/javascript.nl.yml
@@ -8,6 +8,7 @@ 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}}."
diff --git a/config/locales/javascript/javascript.nn.yml b/config/locales/javascript/javascript.nn.yml
index 2cf2ef50e..ffc3bbade 100644
--- a/config/locales/javascript/javascript.nn.yml
+++ b/config/locales/javascript/javascript.nn.yml
@@ -8,6 +8,7 @@ nn:
     aspect_dropdown: 
       add_to_aspect: "Legg til kontakt"
       all_aspects: "Alle aspekta"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Vel aspekt"
       started_sharing_with: "Du har byrja å dela med {{name}}."
       stopped_sharing_with: "Du deler ikkje lenger med {{name}}."
diff --git a/config/locales/javascript/javascript.pl.yml b/config/locales/javascript/javascript.pl.yml
index 028b16509..01864f874 100644
--- a/config/locales/javascript/javascript.pl.yml
+++ b/config/locales/javascript/javascript.pl.yml
@@ -8,6 +8,7 @@ pl:
     aspect_dropdown: 
       add_to_aspect: "Dodaj kontakt"
       all_aspects: "Wszystkie aspekty"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Wybierz aspekty"
       started_sharing_with: "Od teraz dzielisz się z {{name}}!"
       stopped_sharing_with: "Nie dzielisz się już z {{name}}."
diff --git a/config/locales/javascript/javascript.pt-BR.yml b/config/locales/javascript/javascript.pt-BR.yml
index 588d10a33..bf069156e 100644
--- a/config/locales/javascript/javascript.pt-BR.yml
+++ b/config/locales/javascript/javascript.pt-BR.yml
@@ -8,6 +8,7 @@ pt-BR:
     aspect_dropdown: 
       add_to_aspect: "Adicione para aspecto"
       all_aspects: "Todos aspectos"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Selecione os aspectos"
       started_sharing_with: "You have started sharing with {{name}}!"
       stopped_sharing_with: "You have stopped sharing with {{name}}."
diff --git a/config/locales/javascript/javascript.pt-PT.yml b/config/locales/javascript/javascript.pt-PT.yml
index a78b7c140..26ebcb664 100644
--- a/config/locales/javascript/javascript.pt-PT.yml
+++ b/config/locales/javascript/javascript.pt-PT.yml
@@ -8,6 +8,7 @@ pt-PT:
     aspect_dropdown: 
       add_to_aspect: "Adicionar contacto"
       all_aspects: "Todos os aspectos"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Seleccionar aspectos"
       started_sharing_with: "Começou a partilhar com {{name}}!"
       stopped_sharing_with: "Deixou de partilhar com {{name}}."
diff --git a/config/locales/javascript/javascript.ro.yml b/config/locales/javascript/javascript.ro.yml
index 3f901e248..459019a37 100644
--- a/config/locales/javascript/javascript.ro.yml
+++ b/config/locales/javascript/javascript.ro.yml
@@ -8,6 +8,7 @@ ro:
     aspect_dropdown: 
       add_to_aspect: "Adaugă la aspect"
       all_aspects: "Toate aspectele"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Selectează aspecte"
       started_sharing_with: "You have started sharing with {{name}}!"
       stopped_sharing_with: "You have stopped sharing with {{name}}."
diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml
index 023af62fc..455fa6eed 100644
--- a/config/locales/javascript/javascript.ru.yml
+++ b/config/locales/javascript/javascript.ru.yml
@@ -8,6 +8,7 @@ ru:
     aspect_dropdown: 
       add_to_aspect: "Добавить контакт"
       all_aspects: "Все аспекты"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Выбрать аспекты"
       started_sharing_with: "Вы начали делиться с {{name}}!"
       stopped_sharing_with: "Вы перестали делиться с {{name}}."
diff --git a/config/locales/javascript/javascript.sk.yml b/config/locales/javascript/javascript.sk.yml
index d5f2f5b6b..a65a9acb0 100644
--- a/config/locales/javascript/javascript.sk.yml
+++ b/config/locales/javascript/javascript.sk.yml
@@ -8,6 +8,7 @@ sk:
     aspect_dropdown: 
       add_to_aspect: "Pridať kontakt"
       all_aspects: "Všetky kategórie"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Vyberte si kategórie"
       started_sharing_with: "You have started sharing with {{name}}!"
       stopped_sharing_with: "You have stopped sharing with {{name}}."
diff --git a/config/locales/javascript/javascript.sl.yml b/config/locales/javascript/javascript.sl.yml
index d8ec30ad0..ede185999 100644
--- a/config/locales/javascript/javascript.sl.yml
+++ b/config/locales/javascript/javascript.sl.yml
@@ -1,4 +1,4 @@
-#   Copyright (c) 2011, Diaspora Inc.  This file is
+#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
@@ -6,49 +6,84 @@
 sl: 
   javascripts: 
     aspect_dropdown: 
-      add_to_aspect: "Add to aspect"
-      all_aspects: "All aspects"
+      add_to_aspect: "Dodaj pogledu"
+      all_aspects: "Vsi pogledi"
+      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"
-        two: "In {{count}} aspects"
-        zero: "Add to aspect"
+        few: "V {{count}} pogledih"
+        many: "V {{count}} pogledih"
+        one: "V {{count}} pogledu"
+        other: "V {{count}} pogledih"
+        two: "V {{count}} pogledih"
+        zero: "Dodaj pogledu"
+    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: "Are you sure?"
-    failed_to_like: "Failed to like!"
-    failed_to_post_message: "Failed to post message!"
+      hide: "skrij komentarje"
+      show: !binary |
+          cHJpa2GeaSB2c2Uga29tZW50YXJqZQ==
+    confirm_dialog: !binary |
+        U3RlIHByZXByaehhbmk=
+    failed_to_like: !binary |
+        T3puYehldmFuamUgbmkgdXNwZWxvIQ==
+    failed_to_post_message: "Objava ni uspela!"
+    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 personialized stream..."
     infinite_scroll: 
-      no_more: "No more posts."
+      no_more: "Konec objav."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
-      at_least_one_aspect: "You must publish to at least one aspect"
-      limited: "Limited - your post will only be seen by people you are sharing with"
-      public: "Public - your post will be visible to everyone and found by search engines"
+      at_least_one_aspect: "Objaviti morate v vsaj enem pogledu"
+      limited: !binary |
+          T21lamVubyAtIFZhmmEgb2JqYXZhIGJvIHZpZG5hIGxlIGxqdWRlbSwgcyBr
+          YXRlcmltaSBkZWxpdGU=
+      public: !binary |
+          SmF2bm8gLSBWYZphIG9iamF2YSBibyB2aWRuYSB2c2VtLCBwcmlrYXphbmEg
+          Ym8gdHVkaSB2IHNwbGV0bmloICBpc2thbG5pa2lo
     reshares: 
-      duplicate: "You've already reshared that post!"
-    search_for: "Search for {{name}}"
-    show_more: "show more"
+      duplicate: !binary |
+          VG8gb2JqYXZvIHN0ZSCeZSBwb25vdm5vIGRlbGlsaQ==
+    search_for: !binary |
+        SZroaSB7e25hbWV9fQ==
+    show_more: !binary |
+        cG9rYZ5pIHZl6A==
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
-      day: "a day"
-      days: "%d days"
-      hour: "about an hour"
-      hours: "about %d hours"
-      minute: "about a minute"
-      minutes: "%d minutes"
-      month: "about a month"
-      months: "%d months"
+      day: !binary |
+          duhlcmFq
+      days: "pred %d dnem"
+      hour: !binary |
+          cHJlZCBwcmlibGmebm8gdXJv
+      hours: !binary |
+          cHJlZCBwcmlibGmebm8gJWQgdXJhbWk=
+      minute: !binary |
+          cHJlZHByaWJsaZ5ubyBtaW51dG8=
+      minutes: "pred %d minutami"
+      month: !binary |
+          cHJlZCBwcmlibGmebm8gbWVzZWNlbQ==
+      months: "pred %d meseci"
       prefixAgo: ""
       prefixFromNow: ""
-      seconds: "less than a minute"
-      suffixAgo: "ago"
-      suffixFromNow: "from now"
-      year: "about a year"
-      years: "%d years"
+      seconds: "pred manj kot minuto"
+      suffixAgo: ""
+      suffixFromNow: ""
+      year: !binary |
+          cHJlZCBwcmlibGmebm8gbGV0b20gZG5p
+      years: "pred %d leti"
     videos: 
-      unknown: "Unknown video type"
-      watch: "Watch this video on {{provider}}"
+      unknown: "Neznan tip videa"
+      watch: "Glej ta video na {{provider}}"
     web_sockets: 
-      disconnected: "The websocket is closed; posts will no longer be streamed live."
+      disconnected: !binary |
+          VGEgd2Vic29ja2V0IGplIHphcHJ0OyBvYmphdmUgc2UgbmUgYm9kbyB2Zegg
+          cHJlbmGaYWxlIHYgIJ5pdm8u
diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml
index a59543aef..d18aaa4d8 100644
--- a/config/locales/javascript/javascript.sv.yml
+++ b/config/locales/javascript/javascript.sv.yml
@@ -8,6 +8,7 @@ sv:
     aspect_dropdown: 
       add_to_aspect: "Lägg till kontakt"
       all_aspects: "Alla aspekter"
+      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}}."
diff --git a/config/locales/javascript/javascript.tr.yml b/config/locales/javascript/javascript.tr.yml
index dcb1dff9f..2dc77b322 100644
--- a/config/locales/javascript/javascript.tr.yml
+++ b/config/locales/javascript/javascript.tr.yml
@@ -8,6 +8,7 @@ tr:
     aspect_dropdown: 
       add_to_aspect: "Yönüne ekle"
       all_aspects: "Tüm yönler"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Yönleri seç"
       started_sharing_with: "{{name}} sizinle paylaşıma başladı!"
       stopped_sharing_with: "{{name}} sizinle paylaşımı durdurdu."
diff --git a/config/locales/javascript/javascript.uk.yml b/config/locales/javascript/javascript.uk.yml
index 153a4b0b5..306de717b 100644
--- a/config/locales/javascript/javascript.uk.yml
+++ b/config/locales/javascript/javascript.uk.yml
@@ -8,6 +8,7 @@ uk:
     aspect_dropdown: 
       add_to_aspect: "Додати контакт"
       all_aspects: "Усі аспекти"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Вибрати аспекти"
       started_sharing_with: "You have started sharing with {{name}}!"
       stopped_sharing_with: "You have stopped sharing with {{name}}."
diff --git a/config/locales/javascript/javascript.vi.yml b/config/locales/javascript/javascript.vi.yml
index f9e7595b0..1b59721f6 100644
--- a/config/locales/javascript/javascript.vi.yml
+++ b/config/locales/javascript/javascript.vi.yml
@@ -8,6 +8,7 @@ vi:
     aspect_dropdown: 
       add_to_aspect: "Add contact"
       all_aspects: "All aspects"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Select aspects"
       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}}."
diff --git a/config/locales/javascript/javascript.zh-CN.yml b/config/locales/javascript/javascript.zh-CN.yml
index bb608c4fb..e5002f0a8 100644
--- a/config/locales/javascript/javascript.zh-CN.yml
+++ b/config/locales/javascript/javascript.zh-CN.yml
@@ -8,6 +8,7 @@ zh-CN:
     aspect_dropdown: 
       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}}."
@@ -25,16 +26,16 @@ zh-CN:
     comments: 
       hide: "隐藏评论"
       show: "显示所有评论"
-    confirm_dialog: "你确定吗？"
-    failed_to_like: "表示喜欢失败！"
-    failed_to_post_message: "发布消息失败！"
+    confirm_dialog: 你确定吗？
+    failed_to_like: 表示喜欢失败！
+    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 personialized stream..."
     infinite_scroll: 
-      no_more: "没有更多的内容了。"
+      no_more: 没有更多的内容了。
     photo_uploader: 
       looking_good: "OMG, you look awesome!"
     publisher: 
@@ -51,7 +52,7 @@ zh-CN:
       day: "1天"
       days: "%d天"
       hour: "约1小时"
-      hours: "约%d小时"
+      hours: 约%d小时
       minute: "约1分钟"
       minutes: "%d分钟"
       month: "约1个月"
@@ -67,4 +68,4 @@ zh-CN:
       unknown: "未知视频格式"
       watch: "在 {{provider}} 上看观看视频"
     web_sockets: 
-      disconnected: "websocket已关闭，内容不会再实时更新。"
+      disconnected: websocket已关闭，内容不会再实时更新。
diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml
index 01b119174..9180e58ca 100644
--- a/config/locales/javascript/javascript.zh-TW.yml
+++ b/config/locales/javascript/javascript.zh-TW.yml
@@ -8,6 +8,7 @@ zh-TW:
     aspect_dropdown: 
       add_to_aspect: "加聯絡人"
       all_aspects: "所有面向"
+      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "選面向"
       started_sharing_with: "你開始和 {{name}} 分享了!"
       stopped_sharing_with: "你停止和 {{name}} 分享了."
@@ -25,16 +26,16 @@ zh-TW:
     comments: 
       hide: "隱藏意見"
       show: "顯示所有意見"
-    confirm_dialog: "你確定嗎?"
-    failed_to_like: "說讚失敗!"
-    failed_to_post_message: "貼文失敗!"
+    confirm_dialog: 你確定嗎?
+    failed_to_like: 說讚失敗!
+    failed_to_post_message: 貼文失敗!
     getting_started: 
       alright_ill_wait: "好吧, 以後再說."
       hey: "嘿, {{name}}!"
       no_tags: "嘿, 你還沒有追蹤任何標籤! 要往下一步嗎?"
-      preparing_your_stream: "整理你個人的流水帳..."
+      preparing_your_stream: 整理你個人的流水帳...
     infinite_scroll: 
-      no_more: "沒有貼文了."
+      no_more: 沒有貼文了.
     photo_uploader: 
       looking_good: "天啊, 你看起來真帥!"
     publisher: 
@@ -51,7 +52,7 @@ zh-TW:
       day: "一天"
       days: "%d天"
       hour: "約一小時"
-      hours: "約%d小時"
+      hours: 約%d小時
       minute: "約一分鐘"
       minutes: "%d分鐘"
       month: "約一個月"
author	Jonne Hass <mrzyx@mrzyx.de>	2011-11-04 02:10:07 +0400
committer	Jonne Hass <mrzyx@mrzyx.de>	2011-11-04 02:10:07 +0400
commit	b4e974161b88089cd41b333251fa365dc8c26e73 (patch)
tree	e2195d55af37da3c92b8c050d6c9520557517ea5 /config/locales
parent	dca370d3ffc9bbb87b9668bc1028095b70cc1fa1 (diff)