updated 135 locale files [ci skip]

46 files changed, 1189 insertions, 1189 deletions

diff --git a/config/locales/devise/devise.ar.yml b/config/locales/devise/devise.ar.yml
index 69e781894..d46710d98 100644
--- a/config/locales/devise/devise.ar.yml
+++ b/config/locales/devise/devise.ar.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-ar: 
-  devise: 
-    confirmations: 
+ar:
+  devise:
+    confirmations:
       confirmed: "تم تأكيد حسابك، وتسجيل دخولك"
-      new: 
+      new:
         resend_confirmation: "أعِد إرسال لتعليمات التأكيد"
       send_instructions: "ستصلك في بضع دقائق رسالة إلكترونية تحوي تعليمات تأكيد الحساب الخاص بك"
-    failure: 
+    failure:
       inactive: ".لم يتم تفعيل حسابك بعد"
       invalid: ".المعرف غير صالح أو كلمة المرور غير صحيحة"
       invalid_token: ".الإقليد غير صالح"
@@ -18,17 +18,17 @@ ar:
       timeout: ".انقضت مدة جلستك، رجاء لُج من جديد للمتابعة"
       unauthenticated: ".لُج أو سجل قبل المتابعة"
       unconfirmed: ".أكِد حسابك قبل المتابعة"
-    invitations: 
+    invitations:
       invitation_token_invalid: "إقليد الدعوة غير صالحة"
       send_instructions: "تم إرسال دعوتك"
       updated: "تم إنشاء كلمة المرور بنجاح، أنت الآن متصل"
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "أكِد حسابي"
         subject: "تعليمات التأكيد"
         you_can_confirm: "يمكنك تأكيد حسابك عبر الرابط التالي"
       hello: "مرحبا %{email}!"
-      invitation_instructions: 
+      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"
@@ -57,37 +57,37 @@ ar:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: ", %{url}, يمكنك قبولها عبر الرابط التالي"
         has_invited_you: "%{name} يدعوك للإنضمام إلى دياسبرا"
         have_invited_you: "%{names} يدعونك للإنضمام إلى دياسبرا"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "غيِر كلمة المرور"
         ignore: "إذا لم تكن من طلب هذا، رجاء تجاهل هذا البريد"
         someone_requested: "أحدهم طلب رابطا لتغيير كلمة مرورك, ويمكنك فعل هذا عبر الرابط الآتي"
         subject: "تعليمات إعادة إدخال كلمة المرور"
         wont_change: "كلمة مرورك لن تتغير قبل أن تنقر الرابط التالي وتدخل كلمة مرور جديدة"
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "لقد تم حظر حسابك ظرفيا بسبب العدد المفرط من محاولات الدخول الفاشلة"
         click_to_unlock: "انقر الرابط التالي لإعادة فتح حسابك"
         subject: "تعليمات إعادة فتح حسابك"
         unlock: "أعد فتح حسابي"
       welcome: "مرحبا %{email} !"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "غيِر كلمة المرور"
-      new: 
+      new:
         forgot_password: "نسيت كلمة المرور؟"
         no_account: "هذا البريد الإلكتروني غير مرتبط بأي حساب. إذا كنت تنتظر دعوة, فنحن نقوم بتوزيعها بأسرع وسيلة لتصل الجميع"
         send_password_instructions: "أعِد تعيين كلمة المرور"
       send_instructions: "ستصلك في بضع دقائق رسالة إلكترونية تحوي تعليمات إعادة تعيين كلمة المرور الخاصة بك"
       updated: "تم تغيير كلمة السر خاصتك بنجاح. أنت الآن متصل"
-    registrations: 
+    registrations:
       destroyed: ".وداعا! تم إلغاء حسابك بنجاح. ونأمل أن نراكم مرة أخرى قريبا"
       signed_up: ".تمت عملية تسجيلك بنجاح. ستصلك رسالة إلكترونية حال تفعيله"
       updated: ".قمت بتحديث حسابك بنجاح"
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "أنت على وشك استخدام برنامج تجريبي ألفا"
         bugs_and_feedback: "للتذكير، ستواجه خلال تجربتك بعض المشاكل التقنية.  نشجعك على استخدام زر التبليغ -الموجود بالجانب الأيمن من متصفحك- من أجل تنبيه المطورين لأي معضلة واجهتها, وسنعمل بأسرع ما يمكن لحل أي مشكلة تقنية تم الإبلاغ عنها."
         bugs_and_feedback_mobile: "للتذكير، ستواجه خلال تجربتك بعض المشاكل التقنية.  نشجعك على استخدام زر التبليغ من أجل تنبيه المطورين لأي معضلة واجهتها, وسنعمل بأسرع ما يمكن لحل أي مشكلة تقنية تم الإبلاغ عنها"
@@ -99,23 +99,23 @@ ar:
         username: "المعرف"
       signed_in: "تم تسجيل الدخول بنجاح"
       signed_out: "تم تسجيل الخروج بنجاح"
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "نسيت كلمة المرور؟"
         receive_confirmation: "لم تصلك تعليمات تأكيد حسابك؟"
         receive_unlock: "لم تصلك تعليمات إعادة فتح حسابك؟"
         sign_in: لُج
         sign_up: سجِل
         sign_up_closed: "التسجيلات مغلقة حاليا"
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "سجل في قائمة انتظار الدعوات"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "أعِد إرسال تعليمات إعادة فتح حسابك"
       send_instructions: "ستصلك رسالة إلكترونية خلال لحظات تحوي تعليمات إعادة فتح حسابك"
       unlocked: "تم إعادة فتح حسابك بنجاح، أنت الآن متصل"
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "تم تأكيد إعادة فتح حسابك مسبقا"
       not_found: "غير موجود"
       not_locked: "لم يكن مغلقا"
diff --git a/config/locales/devise/devise.bg.yml b/config/locales/devise/devise.bg.yml
index d5a5d3c18..6477a304b 100644
--- a/config/locales/devise/devise.bg.yml
+++ b/config/locales/devise/devise.bg.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-bg: 
-  devise: 
-    confirmations: 
+bg:
+  devise:
+    confirmations:
       confirmed: "Акаунтът е потвърден. Сега сте вписани."
-      new: 
+      new:
         resend_confirmation: "Повторно изпращане на инструкциите за отключване"
       send_instructions: "След няколко минути ще получите ел. писмо съдържащо инструкции как да потвърдите акаунта си."
-    failure: 
+    failure:
       inactive: "Акаунтът все още не е активиран."
       invalid: "Невалидно потребителско име или парола."
       invalid_token: "Данните за удостоверяване не са валидни."
@@ -18,17 +18,17 @@ bg:
       timeout: "Сесията ви изтече, моля впишете се отново, за да продължите."
       unauthenticated: "Впишете се или се регистрирайте, за да продължите."
       unconfirmed: "Потвърдете акаунта, за да продължите."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Предоставените данни за поканата не са валидни!"
       send_instructions: "Поканата ви е изпратена."
       updated: "Паролата е зададена. Сега сте вписани."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Потвърждаване на акаунта"
         subject: "Инструкции за потвърждаване"
         you_can_confirm: "Можете да потвърдите акаунта си чрез долната връзка:"
       hello: "Здравейте %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Приемане на поканата"
         arrived: "Социалната мрежа, която сте очаквали е вече реалност. Подобрена, по-сигурна и развлекателна, %{strong_diaspora} е насреща когато желаете да споделяте и изследвате мрежата по нов начин."
         be_yourself: "Бъдете себе си"
@@ -57,37 +57,37 @@ bg:
         team_diaspora: "Екипът на Diaspora"
         unsubscribe: "За да прекратите абонамента кликнете %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "от %{url}, можете да приемете чрез връзката по-долу в писмото."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} ви кани да се присъедините към Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Промяна на паролата"
         ignore: "Ако не сте заявили промяната, моля игнорирайте писмото."
         someone_requested: "Някой е заявил връзка за промяна на паролата. Можете да я промените чрез долната връзка."
         subject: "Инструкции за възстановяване на паролата"
         wont_change: "Паролата ви няма да бъде променена докато не посетите горната връзка и не зададете нова парола."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Акаунтът ви е заключен поради голям брой неуспешни опити за вписване."
         click_to_unlock: "За отключване на акаунта кликнете върху долната връзка:"
         subject: "Инструкции за отключване"
         unlock: "Отключване на акаунта"
       welcome: "Добре дошли %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Промяна на паролата"
-      new: 
+      new:
         forgot_password: "Забравена парола?"
         no_account: "Не съществува акаунт с въведената ел. поща.  Ако очаквате покана, знайте че ние ги раздаваме възможно най-бързо"
         send_password_instructions: "Изпращане на инструкции за възстановяване на паролата"
       send_instructions: "Ще получите ел. писмо с инструкции за промяна на паролата."
       updated: "Паролата е променена успешно. Сега сте вписани."
-    registrations: 
+    registrations:
       destroyed: "Довиждане! Акаунтът ви е изтрит успешно. Надяваме се да се видим отново."
       signed_up: "Регистрирахте се успешно. Ако е включена опцията за потвърждаване ще получите ел. писмо с инструкции."
       updated: "Обновихте успешно акаунта си."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Ще ползвате софтуерен продукт в ранен етап на развитие."
         bugs_and_feedback: "Имайте предвид, че ще се сблъскате със софтуерни грешки.  Препоръчваме ви да ползвате бутона Feedback (в десния край на страницата) за да съобщавате за всеки проблем!  Ще се потрудим да отстраним всеки проблем, за който ни съобщите, възможно най-бързо."
         bugs_and_feedback_mobile: "Имайте предвид, че ще се сблъскате със софтуерни грешки. Препоръчваме ви да съобщавате за всеки проблем! Ще се потрудим да отстраним всеки проблем, за който ни съобщите, възможно най-бързо."
@@ -99,23 +99,23 @@ bg:
         username: "Потребителско име"
       signed_in: "Вписахте се успешно."
       signed_out: "Отписахте се успешно."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Забравена парола?"
         receive_confirmation: "Не сте получили инструкциите за отключване?"
         receive_unlock: "Не сте получили инструкциите за отключване?"
         sign_in: "Вписване"
         sign_up: "Регистриране"
         sign_up_closed: "За сега регистрациите не са възможни."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Резервирайте си покана!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Повторно изпращане на инструкциите за отключване"
       send_instructions: "След няколко минути ще получите ел. писмо съдържащо инструкции как да отключите акаунта си."
       unlocked: "Акаунтът е отключен. Сега сте вписани."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "вече е потвърдено"
       not_found: "не е открито"
       not_locked: "не е заключена"
diff --git a/config/locales/devise/devise.br.yml b/config/locales/devise/devise.br.yml
index 7dfef55a9..533b7f605 100644
--- a/config/locales/devise/devise.br.yml
+++ b/config/locales/devise/devise.br.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-br: 
-  devise: 
-    confirmations: 
+br:
+  devise:
+    confirmations:
       confirmed: "Ho kont zo bet kadarnaet. Emaoc'h luget."
-      new: 
+      new:
         resend_confirmation: "Kas titouroù-kadarnaat en dro"
       send_instructions: "Emaoc'h o vont da reseviñ ur postel gant titouroù a-benn goût penaos kadarnaat ho kont a-benn nebeut."
-    failure: 
+    failure:
       inactive: "N'eo ket bet lakaet ho kont war-elum."
       invalid: "Fazi zo gant ar postel pe gant ar ger-kuzh."
       invalid_token: "Fazi zo gant ar bilhed gwiriañ."
@@ -18,17 +18,17 @@ br:
       timeout: "Diamzeret eo hoc'h abadenn, dav eo deoc'h mont e-barzh en dro a-benn kendalc'hen."
       unauthenticated: "Dav eo deoc'h mont e-barzh pe lakaat hoc'h anv a-raok kendalc'hen ganti."
       unconfirmed: "Dav eo deoc'h kadarnaat ho kont a-raok mont pelloc'h."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Ar bilhed-pediñ kaset deoc'h zo divalav!"
       send_instructions: "Kaset eo bet ho pedadenn."
       updated: "Kaset eo bet mat ho ker-kuzh. Emaoc'h luget."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Kadarnaat ma c'hont"
         subject: Titouroù-kadarnaat
         you_can_confirm: "Moaien zo deoc'h kadarnaat ho kont gant al liamm dindan:"
       hello: "Demat, %{email}!"
-      invitation_instructions: 
+      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"
@@ -57,37 +57,37 @@ br:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} have invited you to join Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Cheñch ma ger-kuzh"
         ignore: "M'ho peus ket goulennet an dra-se n'ho peus ket nemet leuskel an dra-se a-gostez."
         someone_requested: "Unan bennak en deus goulennet kaout ul liamm da cheñch ho ker-kuzh, moaien zo deoc'h hen ober dre al liamm a-is."
         subject: "Titouroù evit nulañ ar ger-kuzh"
         wont_change: "Ne cheñcho ket ho ker-kuzh keit ma n'ho po ket kliket war al liamm dindan ha dibabet unan all."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Prennet eo bet ho kont abalamour m'ho peus klasket mont e-barzh en un ober re a daolioù-gwenn."
         click_to_unlock: "Klikit war al liamm dindan a-benn dibrennañ ho kont:"
         subject: "Dibrennañ Titouroù"
         unlock: "Dibrennañ ma c'hont"
       welcome: "Degemer mat, %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Cheñch ma ger-kuzh"
-      new: 
+      new:
         forgot_password: "Disoñjet ho ker-kuzh ganeoc'h?"
         no_account: "N'eus kont ebet gant ar postel-mañ. M'emaoc'h o c'hortoz da vezañ pedet, deoc'h da c'hoût e klaskomp astennañ ar pedadennoù da'n abretañ ar gwellañ"
         send_password_instructions: "Kasit din titouroù evit nulañ ar ger-kuzh"
       send_instructions: "Emaoc'h o vont da reseviñ ur postel gant titouroù evit goût penaos nulañ ho ker-kuzh a-benn nebeut."
       updated: "Cheñchet mat ho ker-kuzh. Emaoc'h luget."
-    registrations: 
+    registrations:
       destroyed: "Kenavo! Ho kont zo bet nullet. Emichañs e voc'h gwelet en dro a-benn nebeut."
       signed_up: "Enskrivet hoc'h bet mat. M'ho peus dibabet e vo kaset deoc'h ur postel-kadarnaat."
       updated: "Adnevezet eo bet ho kont ganeoc'h."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Emaoc'h o vont da implij ar meziant alpha."
         bugs_and_feedback: "Deoc'h da c'hoût e vo kavet vioù-koukoug ganeoc'h. Reiñ a reomp ton deoc'h evit implij ar boton Feedback a zo e tu dehoù ar bajenn a-benn kelaouiñ ac'hanomp ma vez fazioù! Labourat a rimp ar buanañ a c'hellomp evit diluziañ ar c'hudennoù bet meneget ganeoc'h."
         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."
@@ -99,23 +99,23 @@ br:
         username: Anv-implijer
       signed_in: "Luget mat."
       signed_out: "Diluget mat."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Disoñjet ho ker-kuzh ganeoc'h?"
         receive_confirmation: "N'ho peus ket resevet titouroù-kadarnaat?"
         receive_unlock: "N'ho peus ket resevet titouroù-dibrenn?"
         sign_in: "Mont e-barzh"
         sign_up: "Lakait hoc'h anv"
         sign_up_closed: "Klozet eo an enskrivadurioù evit poent."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Lakait hoc'h anv evit bezañ pedet!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Kas titouroù-dibrennañ en dro"
       send_instructions: "Emaoc'h o vont da reseviñ ur postel gant titouroù evit goût penaos dibrennañ ho kont a-benn nebeut."
       unlocked: "Ho kont zo bet dibrennet mat. Emaoc'h luget."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "zo bet kadarnet dija"
       not_found: "n'eo ket bet kavet"
       not_locked: "n'eo ket bet prennet"
diff --git a/config/locales/devise/devise.cs.yml b/config/locales/devise/devise.cs.yml
index 187f114dd..b5d77d03c 100644
--- a/config/locales/devise/devise.cs.yml
+++ b/config/locales/devise/devise.cs.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-cs: 
-  devise: 
-    confirmations: 
+cs:
+  devise:
+    confirmations:
       confirmed: "Váš účet byl uspěšně potvrzen. Nyní jste přihlášeni."
-      new: 
+      new:
         resend_confirmation: "Zaslat instrukce o potvrzení"
       send_instructions: "Během několika minut obdržíte email s instrukcemi k potvrzení vašeho účtu."
-    failure: 
+    failure:
       inactive: "Váš účet ještě nebyl aktivován."
       invalid: "Neplatné uživatelské jméno nebo heslo."
       invalid_token: "Neplatný autentizační token."
@@ -18,17 +18,17 @@ cs:
       timeout: "Vaše sezení vypršelo, pro pokračování se prosím přihlašte znovu."
       unauthenticated: "Pro pokračování se musíte přihlásit nebo si vytvořit účet."
       unconfirmed: "Před pokračováním musíte potvrdit svůj účet."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Pozvánka je neplatná!"
       send_instructions: "Vaše pozvánka byla odeslána."
       updated: "Vaše heslo bylo úspěšně změněno. Nyní jste přihlášen."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Potvrdit můj účet"
         subject: "Informace o potvrzení"
         you_can_confirm: "Váš účet můžete potvrdit kliknutím na tento odkaz:"
       hello: "Zdravím %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Přijmout pozvání"
         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"
@@ -57,37 +57,37 @@ cs:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} have invited you to join Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Změnit moje heslo"
         ignore: "Pokud nechcete potvrdit pozvání, tento e-mail prosím ignorujte."
         someone_requested: "Vyžádali jste si změnu hesla, kterou můžete provést kliknutím na níže uvedený odkaz."
         subject: "Instrukce ke změně hesla"
         wont_change: "Vaše heslo není možné změnit dokud nekliknete na uvedený odkaz a nevytvoříte si nové."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Váš účet byl zablokovaný kvůli vysokému počtu neúspěšných přihlášení."
         click_to_unlock: "Kliknutím na uvedený odkaz odemknete svůj účet:"
         subject: "Instrukce k odemknutí účtu."
         unlock: "Odemknout můj účet"
       welcome: "Vítej %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Změnit heslo"
-      new: 
+      new:
         forgot_password: "Zapomněli jste heslo?"
         no_account: "S touto emailovou adresou neexistuje žádný účet. Pokud čekáte na pozvání, budeme je vydávat co nejdříve to bude možné"
         send_password_instructions: "Zaslat instrukce k zaslání nového hesla."
       send_instructions: "Běhěm několika minut obdržíte email s instrukcemi k resetnutí hesla."
       updated: "Vaše heslo bylo úspěšně změněno. Nyní jste přihlášeni"
-    registrations: 
+    registrations:
       destroyed: "Sbohem! Váš účet byl úspěšně zrušen. Brzy naviděnou."
       signed_up: "Úspěšně jste vytvořili účet. Pokud je tak server nastaven, byl vám zaslán potvrzovací email."
       updated: "Úspěšně jste upravili svůj účet."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Používáte testovací verzi."
         bugs_and_feedback: "Upozorňujeme na možnost výskytu chyb. Doporučujeme vám použít tlačítko Zpětná vazba na pravé straně vašeho prohlížeče pro nahlášení problémů! Budeme pracovat nejrychleji jak můžeme, abychom vyřešili nahlášené problémy."
         bugs_and_feedback_mobile: "Upozorňujeme na možnost výskytu chyb. Doporučujeme vám, abyste hlásili jakékoli problémy. Budeme pracovat nejrychleji jak můžeme, abychom vyřešili nahlášené problémy."
@@ -99,23 +99,23 @@ cs:
         username: "Uživatelské jméno"
       signed_in: "Přihlášení proběhlo úspěšně."
       signed_out: "Odhlášení proběhlo úspěšně."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Zapomněli jste heslo?"
         receive_confirmation: "Neobdrželi jste instrukce na potvrzení?"
         receive_unlock: "Neobdrželi jste instrukce na odblokování?"
         sign_in: "Přihlášení"
         sign_up: "Zapsat se"
         sign_up_closed: "Momentálně jsou další registrace pozastavené."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Požádat o pozvánku!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Instrukce ke změně hesla"
       send_instructions: "Během několika minut obdržíte email s instrukcemi k odemknutí vašeho účtu."
       unlocked: "Váš účet byl úspěšně odemknut. Nyní jste přihlášeni."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "již bylo potvrzeno"
       not_found: "nenalezeno"
       not_locked: "nebylo zamčeno"
diff --git a/config/locales/devise/devise.cy.yml b/config/locales/devise/devise.cy.yml
index 682211fa3..5dfcfac06 100644
--- a/config/locales/devise/devise.cy.yml
+++ b/config/locales/devise/devise.cy.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-cy: 
-  devise: 
-    confirmations: 
+cy:
+  devise:
+    confirmations:
       confirmed: "Cadarnhawyd eich cyfrif yn llwyddiannus. Rydych chi wedi arwyddo i fewn."
-      new: 
+      new:
         resend_confirmation: "Anfon eto cyfarwyddiadau am sut i gadarnhau eich cyfrif"
       send_instructions: "Byddwch yn derbyn e-bost â chyfarwyddiadau ar sut i gadarnhau eich cyfrif mewn ychydig funudau."
-    failure: 
+    failure:
       inactive: "Nid yw eich cyfrif wedi'i actifadu."
       invalid: "E-bost neu gyfrinair annilys."
       invalid_token: "Tocyn dilysu annilys."
@@ -18,17 +18,17 @@ cy:
       timeout: "Mae eich sesiwn wedi dod i ben, arwyddwch i mewn eto i barhau."
       unauthenticated: "Mae angen i chi arwyddo i mewn neu ymuno cyn parhau."
       unconfirmed: "Rhaid i chi gadarnhau eich cyfrif cyn parhau."
-    invitations: 
+    invitations:
       invitation_token_invalid: "The invitation token provided is not valid!"
       send_instructions: "Mae eich gwahoddiad wedi cael ei anfon."
       updated: "Your password was set successfully. You are now signed in."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Confirm my account"
         subject: "Cyfarwyddiadau Cadarnhad"
         you_can_confirm: "You can confirm your account through the link below:"
       hello: "Helo %{email}!"
-      invitation_instructions: 
+      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"
@@ -57,37 +57,37 @@ cy:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} have invited you to join Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Newid y cyfrinair"
         ignore: "If you didn't request this, please ignore this email."
         someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
         subject: "Reset password instructions"
         wont_change: "Your password won't change until you access the link above and create a new one."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
         click_to_unlock: "Click the link below to unlock your account:"
-        subject: "Unlock Instructions"
-        unlock: "Unlock my account"
+        subject: "Cyfarwyddiadau i ddatgloi"
+        unlock: "Datgloi fy nghyfrif"
       welcome: "Croeso %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Newid fy nghyfrinair"
-      new: 
+      new:
         forgot_password: "Wedi anghofio eich cyfrinair?"
         no_account: "Dim cyfrif gyda e-bost hwn yn bodoli. Os ydych yn aros am wahodd, rhaid i chi aros hwyrach bach..."
         send_password_instructions: "Send me reset password instructions"
       send_instructions: "Byddwch yn derbyn e-bost â chyfarwyddiadau ar sut i gadarnhau eich cyfrif mewn ychydig funudau."
       updated: "Newidiwyd eich cyfrinair yn llwyddiannus. Rydych chi wedi arwyddo i fewn."
-    registrations: 
+    registrations:
       destroyed: "Hwyl fawr! Canslwyd eich cyfrif yn llwyddiannus. Rydym yn gobeithio gweld chi eto yn fuan."
       signed_up: "Rydych chi wedi arwyddo i fyny yn llwyddiannus. Anfonwyd cadarnhad at eich e-bost os yw wedi'i alluogi."
       updated: "Diweddarwyd eich cyfrif yn llwyddiannus."
-    sessions: 
-      new: 
+    sessions:
+      new:
         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."
@@ -99,23 +99,23 @@ cy:
         username: "Enw Defnyddiwr"
       signed_in: "Arwyddwyd i fewn yn llwyddiannus."
       signed_out: "Arwyddwyd allan yn llwyddiannus."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Wedi anghofio eich cyfrinair?"
         receive_confirmation: "Didn't receive confirmation instructions?"
         receive_unlock: "Didn't receive unlock instructions?"
         sign_in: "Mewngofnodi"
         sign_up: "Cofrestrwch"
         sign_up_closed: "Open signups are closed at this time."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Sign up for an invite!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Resend unlock instructions"
       send_instructions: "Byddwch yn derbyn e-bost gyda cyfarwyddiadau ar sut i agor eich cyfrif mewn ychydig funudau."
       unlocked: "Datglowyd eich cyfrif yn llwyddiannus. Rydych chi wedi arwyddo i fewn."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "cadarnhawyd eisioes"
       not_found: "ni chanfuwyd"
       not_locked: "heb ei gloi"
diff --git a/config/locales/devise/devise.da.yml b/config/locales/devise/devise.da.yml
index 0ce50f77e..215ec6c0c 100644
--- a/config/locales/devise/devise.da.yml
+++ b/config/locales/devise/devise.da.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-da: 
-  devise: 
-    confirmations: 
+da:
+  devise:
+    confirmations:
       confirmed: "Din konto er blevet bekræftet. Du er nu logget ind"
-      new: 
+      new:
         resend_confirmation: "Send bekræftelse igen"
       send_instructions: "Du vil modtage en e-mail med instruktioner om hvordan du bekræfter din konto om et par minutter."
-    failure: 
+    failure:
       inactive: "Din konto er endnu ikke aktiveret."
       invalid: "Forkert brugernavn eller adgangskode."
       invalid_token: "Ugyldig token."
@@ -18,17 +18,17 @@ da:
       timeout: "Du har været inaktiv for længe. Log ind for at fortsætte."
       unauthenticated: "Du skal logge ind eller oprette en konto for at fortsætte."
       unconfirmed: "Du skal bekræfte din konto for at fortsætte."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Invitationen er ikke gyldig!"
       send_instructions: "Din invitation er blevet sendt."
       updated: "Din adgangskode blev sat korrekt. Du er nu logget ind."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Bekræft min konto"
         subject: "Bekræftelsesinstruktioner"
         you_can_confirm: "Du kan bekræfte din konto via nedenstående link:"
       hello: "Hej %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Accepter 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"
@@ -57,37 +57,37 @@ da:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "på %{url}, du kan acceptere ved at følge linket nedenunder."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} har inviteret dig til at deltage i Diaspora."
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Skift min adgangskode"
         ignore: "Hvis du ikke har anmodet om dette, bedes du ignorere denne e-mail."
         someone_requested: "Nogen har anmodet om et link til at ændre din adgangskode. Du kan gøre dette via linket nedenfor."
         subject: "Instruktioner til nulstilling af adgangskode"
         wont_change: "Din adgangskode vil ikke blive ændret før du klikker på linket ovenfor og opretter en ny."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Din konto er blevet låst på grund af en stor mængde mislykkede log ind forsøg."
         click_to_unlock: "Klik på linket nedenfor for at aktivere din konto:"
         subject: "Aktiveringsinstruktioner"
         unlock: "Aktivér min konto"
       welcome: "Velkommen %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "skift adgangskode"
-      new: 
+      new:
         forgot_password: "Glemt din adgangskode?"
         no_account: "Ingen konto med den email adresse eksisterer. Hvis du venter på invitation, så åbner vi så snart som muligt"
         send_password_instructions: "Send mig instruktioner til nulstilning af adgangskode"
       send_instructions: "Du vil modtage en e-mail med instruktioner om hvordan du kan nulstille din adgangskode om et par minutter."
       updated: "Dit adgangskode er nu ændret. Du er nu logget ind."
-    registrations: 
+    registrations:
       destroyed: "Farvel! Din konto er nu lukket. Vi håber at se dig igen snart."
       signed_up: "Du har nu tilmeldt dig. En bekræftelse er blevet sendt til din e-mail, hvis den er aktiveret."
       updated: "Din konto er nu opdateret."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Du er ved at starte alpha software."
         bugs_and_feedback: "Vær opmærksom på at du vil opleve fejl og mangler. Vi opfordrer dig til at bruge feedbackknappen i højre side af din browser til at melde de fejl du støder på. Vi arbejder så hurtigt vi kan på at løse de problemer du melder."
         bugs_and_feedback_mobile: "Vær opmærksom på at du vil opleve fejl. Vi opfordrer dig til at melde enhver fejl du støder på. Vi vil arbejde så hurtigt som muligt for at løse ethvert problem du melder."
@@ -99,23 +99,23 @@ da:
         username: "Brugernavn"
       signed_in: "Du er nu logget ind."
       signed_out: "Du er nu logget ud."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Glemt din adgangskode?"
         receive_confirmation: "Modtog du ikke bekræftelsen? "
         receive_unlock: "Modtog du ikke aktiveringsvejledningen?"
         sign_in: "Log ind"
         sign_up: "Opret en profil"
         sign_up_closed: "Der er på nuværende tidspunkt lukket for fri tilmelding."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Anmod om en invitation!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Send vejledningen til aktivering af konto igen"
       send_instructions: "Du vil modtage en e-mail om et par minutter med instruktioner om hvordan du kan låse din konto op."
       unlocked: "Din konto er blevet låst op. Du er nu logget ind."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "var allerede bekræftet"
       not_found: "ikke fundet"
       not_locked: "blev ikke låst"
diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
index f4cc4c3cc..544359bfb 100644
--- a/config/locales/devise/devise.de.yml
+++ b/config/locales/devise/devise.de.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-de: 
-  devise: 
-    confirmations: 
+de:
+  devise:
+    confirmations:
       confirmed: "Dein Konto wurde erfolgreich bestätigt. Du bist nun angemeldet."
-      new: 
+      new:
         resend_confirmation: "Anweisungen zum Bestätigen erneut senden"
       send_instructions: "Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto bestätigst."
-    failure: 
+    failure:
       inactive: "Dein Konto wurde noch nicht aktiviert."
       invalid: "Ungültiger Benutzername oder ungültiges Kennwort."
       invalid_token: "Ungültiger Authentifizierungstoken."
@@ -18,17 +18,17 @@ de:
       timeout: "Deine Sitzung ist abgelaufen! Um fortzufahren, melde dich bitte erneut an."
       unauthenticated: "Du musst dich anmelden oder registrieren, um fortzufahren."
       unconfirmed: "Du musst dein Konto bestätigen, um fortzufahren."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Das Einladungstoken ist ungültig!"
       send_instructions: "Deine Einladung wurde versandt."
       updated: "Dein Kennwort wurde akzeptiert. Du bist nun angemeldet."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Mein Konto bestätigen"
         subject: "Bestätigung deines Diaspora-Kontos"
         you_can_confirm: "Du kannst dein Konto über den nachfolgenden Link bestätigen:"
       hello: "Hallo %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Einladung annehmen"
         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"
@@ -57,37 +57,37 @@ de:
         team_diaspora: Diaspora-Team
         unsubscribe: "Zum Abbestellen bitte %{link} klicken."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "unter %{url}, kannst du sie über den untenstehenden Link akzeptieren."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} hat Dich eingeladen Diaspora beizutreten"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Mein Kennwort ändern"
         ignore: "Wenn du dies nicht angefordert hast, ignoriere bitte diese E-Mail."
         someone_requested: "Jemand hat einen Link angefordert, um dein Kennwort zu ändern und du kannst das durch den unten aufgeführten Link tun."
         subject: "Setze dein Passwort zurück"
         wont_change: "Dein Kennwort bleibt unverändert, bis du es über den Link änderst und ein neues erstellst."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Dein Konto wurde aufgrund von zu vielen fehlgeschlagenen Anmeldeversuchen gesperrt."
         click_to_unlock: "Folge dem unten aufgeführten Link, um dein Konto zu entsperren:"
         subject: "Anweisungen entsperren"
         unlock: "Mein Konto entsperren"
       welcome: "Willkommen %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Mein Kennwort ändern"
-      new: 
+      new:
         forgot_password: "Kennwort vergessen?"
         no_account: "Es existiert kein Benutzerkonto mit dieser E-Mail-Adresse. Falls du auf eine Einladung wartest, dann geben wir dir sobald wie möglich eine"
         send_password_instructions: "Anleitung zum Zurücksetzen des Кennworts anfordern"
       send_instructions: "Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Kennwort zurücksetzt."
       updated: "Dein Kennwort wurde erfolgreich geändert. Du bist nun angemeldet."
-    registrations: 
+    registrations:
       destroyed: "Tschüss! Dein Konto wurde erfolgreich geschlossen. Wir hoffen, dich bald wiederzusehen."
       signed_up: "Du hast dich erfolgreich registriert. Sofern aktiviert, wurde dir eine Bestätigung per E-Mail zugesandt."
       updated: "Dein Konto wurde aktualisiert."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Diese Software befindet sich im Alpha-Stadium."
         bugs_and_feedback: "Sei gewarnt, Fehler werden auftreten. Wir empfehlen dir, den Feedback-Knopf am rechten Browserrand zu nutzen, um alle Störungen zu berichten. Wir werden so schnell wir können arbeiten, um alle Probleme, die du meldest, zu lösen."
         bugs_and_feedback_mobile: "Sei gewarnt, Fehler werden auftreten. Wir empfehlen dir, alle Störungen zu melden! Wir werden so schnell wir können arbeiten, um alle Probleme, die du meldest, zu lösen."
@@ -99,23 +99,23 @@ de:
         username: "Benutzername"
       signed_in: Angemeldet.
       signed_out: Abgemeldet.
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Kennwort vergessen?"
         receive_confirmation: "Keine Bestätigungsanleitung erhalten?"
         receive_unlock: "Keine Entsperr-Anweisungen erhalten?"
         sign_in: "Anmelden"
         sign_up: "Registrieren"
         sign_up_closed: "Öffentliche Registrierungen sind momentan nicht möglich."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Registriere dich für eine Einladung!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Entsperr-Anweisungen erneut senden"
       send_instructions: "Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto entsperren kannst."
       unlocked: "Dein Konto wurde erfolgreich entsperrt. Du bist nun angemeldet."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "wurde bereits bestätigt"
       not_found: "wurde nicht gefunden"
       not_locked: "war nicht gesperrt"
diff --git a/config/locales/devise/devise.de_formal.yml b/config/locales/devise/devise.de_formal.yml
index cba57e073..0fddfbe90 100644
--- a/config/locales/devise/devise.de_formal.yml
+++ b/config/locales/devise/devise.de_formal.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-de_formal: 
-  devise: 
-    confirmations: 
+de_formal:
+  devise:
+    confirmations:
       confirmed: "Ihr Konto wurde erfolgreich bestätigt. Sie sind nun angemeldet."
-      new: 
+      new:
         resend_confirmation: "Anweisungen zum Bestätigen erneut senden"
       send_instructions: "Sie werden in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie Sie Ihr Konto bestätigen."
-    failure: 
+    failure:
       inactive: "Ihr Konto wurde noch nicht aktiviert."
       invalid: "Ungültiger Benutzername oder ungültiges Kennwort."
       invalid_token: "Ungültiger Authentifizierungstoken."
@@ -18,17 +18,17 @@ de_formal:
       timeout: "Ihre Sitzung ist abgelaufen! Um fortzufahren, melden Sie sich bitte erneut an."
       unauthenticated: "Sie müssen sich anmelden oder registrieren, um fortzufahren."
       unconfirmed: "Sie müssen ihr Konto bestätigen, um fortzufahren."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Das Einladungstoken ist ungültig!"
       send_instructions: "Ihre Einladung wurde versandt."
       updated: "Ihr Kennwort wurde akzeptiert. Sie sind nun angemeldet."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Mein Konto bestätigen"
         subject: "Bestätigung Ihres Diaspora-Kontos"
         you_can_confirm: "Sie können Ihr Konto über den nachfolgenden Link bestätigen:"
       hello: "Hallo %{email}!"
-      invitation_instructions: 
+      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"
@@ -57,37 +57,37 @@ de_formal:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "unter %{url}, können Sie sie über den untenstehenden Link akzeptieren."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} hat Sie eingeladen Diaspora beizutreten"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Mein Kennwort ändern"
         ignore: "Wenn Sie dies nicht angefordert haben, ignorieren Sie bitte diese E-Mail."
         someone_requested: "Jemand hat einen Link angefordert, um Ihr Kennwort zu ändern und Sie können das durch den unten aufgeführten Link tun."
         subject: "Setzen Sie Ihr Passwort zurück"
         wont_change: "Ihr Kennwort bleibt unverändert, bis Sie es über den Link ändern und ein neues erstellen."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Ihr Konto wurde aufgrund von zu vielen fehlgeschlagenen Anmeldeversuchen gesperrt."
         click_to_unlock: "Folgen Sie dem unten aufgeführten Link, um Ihr Konto zu entsperren:"
         subject: "Anweisungen entsperren"
         unlock: "Mein Konto entsperren"
       welcome: "Willkommen %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Mein Kennwort ändern"
-      new: 
+      new:
         forgot_password: "Kennwort vergessen?"
         no_account: "Es existiert kein Benutzerkonto mit dieser E-Mail-Adresse. Falls Sie auf eine Einladung warten, dann geben wir Ihnen sobald wie möglich eine"
         send_password_instructions: "Anleitung zum Zurücksetzen des Кennworts anfordern"
       send_instructions: "Sie werden in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie Sie Ihr Kennwort zurücksetzen."
       updated: "Ihr Kennwort wurde erfolgreich geändert. Sie sind nun angemeldet."
-    registrations: 
+    registrations:
       destroyed: "Tschüss! Ihr Konto wurde erfolgreich geschlossen. Wir hoffen, Sie bald wiederzusehen."
       signed_up: "Sie haben sich erfolgreich registriert. Sofern aktiviert, wurde Ihnen eine Bestätigung per E-Mail zugesandt."
       updated: "Ihr Konto wurde aktualisiert."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Diese Software befindet sich im Alpha-Stadium."
         bugs_and_feedback: "Seien Sie gewarnt, Fehler werden auftreten. Wir empfehlen Ihnen, den Feedback-Knopf am rechten Browserrand zu nutzen, um alle Störungen zu berichten. Wir werden so schnell wir können arbeiten, um alle Probleme, die Sie melden, zu lösen."
         bugs_and_feedback_mobile: "Seien Sie gewarnt, Fehler werden auftreten. Wir empfehlen Ihnen, alle Störungen zu melden! Wir werden so schnell wir können arbeiten, um alle Probleme, die Sie melden, zu lösen."
@@ -99,23 +99,23 @@ de_formal:
         username: "Benutzername"
       signed_in: Angemeldet.
       signed_out: Abgemeldet.
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Kennwort vergessen?"
         receive_confirmation: "Keine Bestätigungsanleitung erhalten?"
         receive_unlock: "Keine Entsperr-Anweisungen erhalten?"
         sign_in: "Anmelden"
         sign_up: "Registrieren"
         sign_up_closed: "Öffentliche Registrierungen sind momentan nicht möglich."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Registrieren Sie sich für eine Einladung!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Entsperr-Anweisungen erneut senden"
       send_instructions: "Sie werden in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie Sie Ihr Konto entsperren können."
       unlocked: "Ihr Konto wurde erfolgreich entsperrt. Sie sind nun angemeldet."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "wurde bereits bestätigt"
       not_found: "wurde nicht gefunden"
       not_locked: "war nicht gesperrt"
diff --git a/config/locales/devise/devise.el.yml b/config/locales/devise/devise.el.yml
index 486957501..bdd3a9ba3 100644
--- a/config/locales/devise/devise.el.yml
+++ b/config/locales/devise/devise.el.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-el: 
-  devise: 
-    confirmations: 
+el:
+  devise:
+    confirmations:
       confirmed: "Η επιβεβαίωση του λογαριασμού σας ολοκληρώθηκε με επιτυχία. Έχετε πλέον συνδεθεί."
-      new: 
+      new:
         resend_confirmation: "Νέα αποστολή οδηγιών επιβεβαίωσης"
       send_instructions: "Σε λίγα λεπτά θα λάβετε ένα email με οδηγίες για το πώς να επιβεβαιώσετε τον λογαριασμό σας."
-    failure: 
+    failure:
       inactive: "Ο λογαριασμός σας δεν έχει ενεργοποιηθεί ακόμα."
       invalid: "Άκυρο όνομα χρήστη ή κωδικός."
       invalid_token: "Άκυρο σύμβολο ταυτότητας."
@@ -18,17 +18,17 @@ el:
       timeout: "Η σύνδεσή σας έληξε, παρακαλώ συνδεθείτε ξανά για να συνεχίσετε."
       unauthenticated: "Θα πρέπει να συνδεθείτε ή να εγγραφείτε πριν συνεχίσετε."
       unconfirmed: "Πρέπει να επιβεβαιώσετε τον λογαριασμό σας πριν συνεχίσετε."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Το σύμβολο της πρόσκλησης δεν είναι έγκυρο!"
       send_instructions: "Η πρόσκληση σας έχει σταλεί."
       updated: "Ο κωδικός πρόσβασης σας τέθηκε με επιτυχία. Είστε πλέον συνδεδεμένοι."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Επιβεβαίωση του λογαριασμού μου"
         subject: "Οδηγίες επιβεβαίωσης"
         you_can_confirm: "Μπορείτε να επιβεβαιώσετε τον λογαριασμό σας μέσω του παρακάτω συνδέσμου:"
       hello: "Γειά σου %{email}!"
-      invitation_instructions: 
+      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"
@@ -57,37 +57,37 @@ el:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "στο %{url}, μπορείτε να το αποδεχτείτε μέσω του παρακάτω συνδέσμου."
         has_invited_you: "%{name}"
         have_invited_you: "οι χρήστες %{names} σας προσκάλεσαν να συνδεθείτε στο Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Αλλαγή του κωδικού μου"
         ignore: "Εάν δεν το ζητήσατε, παρακαλούμε να αγνοήσετε αυτό το μήνυμα."
         someone_requested: "Κάποιος έχει ζητήσει ένα σύνδεσμο για να αλλάξει τον κωδικό πρόσβασης σας. Μπορείτε να το κάνετε αυτό μέσω του παρακάτω συνδέσμου."
         subject: "Οδηγίες επαναφοράς κωδικού πρόσβασης"
         wont_change: "Ο κωδικός πρόσβασής σας δεν θα αλλάξει μέχρι να επισκεφθείτε τον παραπάνω σύνδεσμο και να δημιουργήσετε έναν νέο."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Ο λογαριασμός σας έχει κλειδωθεί λόγω υπερβολικού πλήθους ανεπιτυχών απόπειρων να συνδεθείτε."
         click_to_unlock: "Κάντε κλικ στον παρακάτω σύνδεσμο για να ξεκλειδώσετε το λογαριασμό σας:"
         subject: "Οδηγίες Ξεκλειδώματος"
         unlock: "Ξεκλείδωμα του λογαριασμού μου"
       welcome: "Καλώς ήρθες %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Αλλαγή του κωδικού μου"
-      new: 
+      new:
         forgot_password: "Ξεχάσατε τον κωδικό σας;"
         no_account: "Δεν υπάρχει λογαριασμός με αυτό το email. Αν περιμένετε για πρόσκληση, θα γίνουν αποστολές το συντομότερο δυνατόν"
         send_password_instructions: "Στείλτε μου οδηγίες επαναφοράς κωδικού"
       send_instructions: "Θα λάβετε ένα email με οδηγίες για το πως να επαναφέρετε τον κωδικό πρόσβασης σας σε λίγα λεπτά."
       updated: "Ο κωδικός σας άλλαξε με επιτυχία. Έχετε πλέον συνδεθεί."
-    registrations: 
+    registrations:
       destroyed: "Αντίο! Η ακύρωση του λογαριασμού σας ολοκληρώθηκε με επιτυχία. Ελπίζουμε να σας ξαναδούμε σύντομα."
       signed_up: "Έχετε εγγραφεί επιτυχώς. Εάν η εγγραφή σας είναι ενεργοποιημένη, θα λάβετε μία επιβεβαίωση στο e-mail σας."
       updated: "Έχετε ενημερώσει το λογαριασμό σας με επιτυχία."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Επρόκειτο να χρησιμοποιήσετε λογισμικό σε δοκιμαστική (alpha) φάση."
         bugs_and_feedback: "Να γνωρίζετε ότι θα αντιμετωπίσετε σφάλματα. Σας ενθαρρύνουμε να χρησιμοποιήσετε το κουμπί \"Feedback\" στη δεξιά πλευρά του browser σας για να αναφέρετε οποιοδήποτε σφάλμα! Θα εργαστούμε όσο πιο γρήγορα μπορούμε για να την επίλυση οποιουδήποτε ζητήματος μας πείτε."
         bugs_and_feedback_mobile: "Σας συμβουλεύουμε, θα συναντήσετε σφάλματα. Σας ενθαρρύνουμε να αναφέρετε οποιοδήποτε πρόβλημα! Θα δουλέψουμε όσο πιο γρήγορα γίνεται για να λύσουμε όποιο θέμα αναφέρετε."
@@ -99,23 +99,23 @@ el:
         username: "Όνομα Χρήστη"
       signed_in: "Επιτυχής σύνδεση."
       signed_out: "Επιτυχής αποσύνδεση."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Ξεχάσατε τον κωδικό σας;"
         receive_confirmation: "Δεν λάβατε οδηγίες για την επιβεβαίωση;"
         receive_unlock: "Δεν λάβατε τις οδηγίες ξεκλειδώματος;"
         sign_in: "Συνδεθείτε"
         sign_up: "Εγγραφή"
         sign_up_closed: "Οι εγγραφές είναι κλειστές αυτή τη στιγμή."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Εγγραφείτε για μια πρόσκληση!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Ξαναστείλτε τις οδηγίες ξεκλειδώματος"
       send_instructions: "Σε λίγα λεπτά θα λάβετε ένα email με οδηγίες για το πως να ξεκλειδώσετε το λογαριασμό σας."
       unlocked: "Ο λογαριασμός σας ξεκλειδώθηκε με επιτυχία. Έχετε πλέον συνδεθεί."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "έχει ήδη επιβεβαιωθεί"
       not_found: "δεν βρέθηκε"
       not_locked: "δεν ήταν κλειδωμένο"
diff --git a/config/locales/devise/devise.en_1337.yml b/config/locales/devise/devise.en_1337.yml
index 4633124af..49ebe8feb 100644
--- a/config/locales/devise/devise.en_1337.yml
+++ b/config/locales/devise/devise.en_1337.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-en_1337: 
-  devise: 
-    confirmations: 
+en_1337:
+  devise:
+    confirmations:
       confirmed: "M41L 0K"
-      new: 
+      new:
         resend_confirmation: "R353ND C0NF1RM471ON!"
       send_instructions: ""
-    failure: 
+    failure:
       inactive: "4CC N07 4C71V3 Y37!"
       invalid: "N1CK C0LLU510N!"
       invalid_token: "1NV5L1D 5U7H3N71F1C4710N 70K3N"
@@ -18,17 +18,17 @@ en_1337:
       timeout: "401 - 4U7H3N71F1C471ON R3QU1R3D"
       unauthenticated: "G37 4 U53RN4M3!"
       unconfirmed: "47H3N71F1C5710N R3QU1R3D!"
-    invitations: 
+    invitations:
       invitation_token_invalid: "1NV174710N 1NV4L1D!"
       send_instructions: "1NV173 53N7"
       updated: "***** 537!"
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "C0NF1RM3 MY 4CC!"
         subject: "C0NF1RM471ON 1N57RUC71ONS"
         you_can_confirm: "4CC C0MF1RM471ON -> L1NK B3L0W"
       hello: "H3Y %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         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"
@@ -57,37 +57,37 @@ en_1337:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "@ %{url}, U C4N 4CC3P7 17 -> L1NK!"
         has_invited_you: "%{name}"
         have_invited_you: "%{names} H4V3 1NV173D Y0U 2 J01N!"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "CH4NG3 *****!"
         ignore: "F33L FR33 T0 1GN0R3 7H15 M41L!"
         someone_requested: "4 N00B W4N7S 70 0WN Y0UR ***** -> L1NK B3L0W!"
         subject: "R3537 *****!"
         wont_change: "***** W0N7 CH4NG3 UN71L U CL1CK 7H3 L1NK!"
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "U G07 K1CK3D -> 2 M4NY L0G1N5!"
         click_to_unlock: "T0 J01N -> CL1CK 7H3 L1NK B3L0W!"
         subject: "UNL0CK 1N57RUC71ON5"
         unlock: "P0WN MY 4CC!"
       welcome: "W3LC0M3 %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "CH4NG3 MY *****"
-      new: 
+      new:
         forgot_password: "F0RG07 Y0UR *****?"
         no_account: "404 - Not Found"
         send_password_instructions: "R3537 MY *****!!"
       send_instructions: "G0NN4 R3C113V3 R3537 1N57RUC71ON5 BY M41L!"
       updated: "***** CH4NG3D"
-    registrations: 
+    registrations:
       destroyed: "4CC D3L373D, N00B!"
       signed_up: "51GN3D UP 5UCC35FULLY!"
       updated: "4CC UPD473 C0NF1RM3D!"
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "U U53 3XP3R3M3NT4L 57UFF!"
         bugs_and_feedback: "G0NN4 3XP3R13NC3 BUGZ!"
         bugs_and_feedback_mobile: "G0NN4 3XP3R13NC3 BUGZ!"
@@ -99,23 +99,23 @@ en_1337:
         username: "N1CK"
       signed_in: G07CH4!
       signed_out: "KTHXB41"
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "F0RG07 Y0UR *****?"
         receive_confirmation: "G07 P0WN3D BY 7H3 M41L 53RV1C3? (N0 1NV1T471ON)"
         receive_unlock: "G07 P0WN3D BY 7H3 M41L 53RV1C3? (N0 UNL0CK)"
         sign_in: "51GN 1N!"
         sign_up: "51GN UP!"
         sign_up_closed: "N0 N00BZ!"
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "W4NNA J01N? -> 51GN UP!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "R353ND UNL0CK 1N57RUC71ON5!"
       send_instructions: "G0NN4 R3C113V3 UNL0CK 1N57RUC71ON5 BY M41L!"
       unlocked: "4CC UNL0CK3D!"
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "409 - Conflicting Request"
       not_found: "404 - Not Found"
       not_locked: "1337 - Not Locked"
diff --git a/config/locales/devise/devise.en_pirate.yml b/config/locales/devise/devise.en_pirate.yml
index 4a6b2eff4..e85bf539d 100644
--- a/config/locales/devise/devise.en_pirate.yml
+++ b/config/locales/devise/devise.en_pirate.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-en_pirate: 
-  devise: 
-    confirmations: 
+en_pirate:
+  devise:
+    confirmations:
       confirmed: "Your account was successfully confirmed. You are now signed in."
-      new: 
+      new:
         resend_confirmation: "Resend confirmation instructions"
       send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
-    failure: 
+    failure:
       inactive: "Your account was not activated yet."
       invalid: "Invalid username or password."
       invalid_token: "Invalid authentication token."
@@ -18,17 +18,17 @@ en_pirate:
       timeout: "Your session expired, please sign in again to continue."
       unauthenticated: "You need to sign in or sign up before continuing."
       unconfirmed: "You have to confirm your account before continuing."
-    invitations: 
+    invitations:
       invitation_token_invalid: "The invitation token provided is not valid!"
       send_instructions: "Your invitation has been sent."
       updated: "Your password was set successfully. You are now signed in."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Confirm my account"
         subject: "Confirmation instructions"
         you_can_confirm: "You can confirm your account through the link below:"
       hello: "Hello %{email}!"
-      invitation_instructions: 
+      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"
@@ -57,37 +57,37 @@ en_pirate:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} have invited you to join Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Change my password"
         ignore: "If you didn't request this, please ignore this email."
         someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
         subject: "Reset password instructions"
         wont_change: "Your password won't change until you access the link above and create a new one."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
         click_to_unlock: "Click the link below to unlock your account:"
         subject: "Unlock Instructions"
         unlock: "Unlock my account"
       welcome: "Welcome %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Change my password"
-      new: 
+      new:
         forgot_password: "Forgot your password?"
         no_account: "No account with this email exists.  If you are waiting for an invite, we are rolling them out as soon as possible"
         send_password_instructions: "Send me reset password instructions"
       send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
       updated: "Your password was changed successfully. You are now signed in."
-    registrations: 
+    registrations:
       destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
       signed_up: "You have signed up successfully. If enabled, a confirmation was sent to your e-mail."
       updated: "You updated your account successfully."
-    sessions: 
-      new: 
+    sessions:
+      new:
         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."
@@ -99,23 +99,23 @@ en_pirate:
         username: "Username"
       signed_in: "Signed in successfully."
       signed_out: "Signed out successfully."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Forgot your password?"
         receive_confirmation: "Didn't receive confirmation instructions?"
         receive_unlock: "Didn't receive unlock instructions?"
         sign_in: "Sign in"
         sign_up: "Sign up"
         sign_up_closed: "Open signups are closed at this time."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Sign up for an invite!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Resend unlock instructions"
       send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
       unlocked: "Your account was successfully unlocked. You are now signed in."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "was already confirmed"
       not_found: "not found"
       not_locked: "was not locked"
diff --git a/config/locales/devise/devise.en_shaw.yml b/config/locales/devise/devise.en_shaw.yml
index e97d7ec03..847165f7f 100644
--- a/config/locales/devise/devise.en_shaw.yml
+++ b/config/locales/devise/devise.en_shaw.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-en_shaw: 
-  devise: 
-    confirmations: 
+en_shaw:
+  devise:
+    confirmations:
       confirmed: "𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑢𐑪𐑟 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑒𐑩𐑯𐑓𐑻𐑥𐑛. 𐑿 𐑸 𐑯𐑬 𐑕𐑲𐑯𐑛 𐑦𐑯."
-      new: 
+      new:
         resend_confirmation: "𐑮𐑦𐑕𐑧𐑯𐑛 𐑒𐑪𐑯𐑓𐑼𐑥𐑱𐑖𐑩𐑯 𐑦𐑯𐑕𐑑𐑮𐑳𐑒𐑖𐑩𐑯𐑟"
       send_instructions: "𐑿 𐑢𐑦𐑤 𐑮𐑦𐑕𐑰𐑝 𐑩𐑯 𐑦-𐑥𐑱𐑤 𐑢𐑦𐑞 𐑦𐑯𐑕𐑑𐑮𐑳𐑒𐑖𐑩𐑯𐑟 𐑩𐑚𐑬𐑑 𐑣𐑬 𐑑 𐑒𐑩𐑯𐑓𐑻𐑥 𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑦𐑯 𐑩 𐑓𐑿 𐑥𐑦𐑯𐑩𐑑𐑕."
-    failure: 
+    failure:
       inactive: "𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑢𐑪𐑟 𐑯𐑪𐑑 𐑨𐑒𐑑𐑦𐑝𐑱𐑑𐑩𐑛 𐑘𐑧𐑑."
       invalid: "𐑦𐑯𐑝𐑨𐑤𐑦𐑛 𐑿𐑟𐑼𐑯𐑱𐑥 𐑹 𐑐𐑨𐑕𐑢𐑼𐑛."
       invalid_token: "𐑦𐑯𐑝𐑨𐑤𐑦𐑛 𐑷𐑔𐑧𐑯𐑑𐑦𐑒𐑱𐑖𐑩𐑯 𐑑𐑴𐑒𐑩𐑯."
@@ -18,17 +18,17 @@ en_shaw:
       timeout: "𐑿𐑼 𐑕𐑧𐑖𐑩𐑯 𐑣𐑨𐑟 𐑧𐑒𐑕𐑐𐑲𐑮𐑛, 𐑐𐑤𐑰𐑟 𐑕𐑲𐑯 𐑦𐑯 𐑩𐑜𐑧𐑯 𐑑 𐑒𐑩𐑯𐑑𐑦𐑯𐑿."
       unauthenticated: "𐑿 𐑯𐑰𐑛 𐑑 𐑕𐑲𐑯 𐑦𐑯 𐑹 𐑕𐑲𐑯 𐑳𐑐 𐑚𐑦𐑓𐑹 𐑒𐑩𐑯𐑑𐑦𐑯𐑿𐑦𐑙"
       unconfirmed: "𐑿 𐑣𐑨𐑝 𐑑 𐑒𐑩𐑯𐑓𐑻𐑥 𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑚𐑦𐑓𐑹 𐑒𐑩𐑯𐑑𐑦𐑯𐑿𐑦𐑙."
-    invitations: 
+    invitations:
       invitation_token_invalid: "𐑞 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯 𐑑𐑴𐑒𐑩𐑯 𐑐𐑼𐑝𐑲𐑑𐑩𐑛 𐑦𐑟 𐑯𐑪𐑑 𐑝𐑨𐑤𐑦𐑛!"
       send_instructions: "𐑿𐑼 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯 𐑣𐑨𐑟 𐑚𐑧𐑯 𐑕𐑧𐑯𐑑."
       updated: "𐑿𐑼 𐑐𐑨𐑕𐑢𐑼𐑛 𐑢𐑪𐑟 𐑕𐑧𐑑 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦. 𐑿 𐑸 𐑯𐑬 𐑕𐑲𐑯𐑛 𐑦𐑯."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "𐑒𐑩𐑯𐑓𐑻𐑥 𐑥𐑲 𐑩𐑒𐑬𐑯𐑑"
         subject: "𐑒𐑪𐑯𐑓𐑼𐑥𐑱𐑖𐑩𐑯 𐑦𐑯𐑕𐑑𐑮𐑳𐑒𐑖𐑩𐑯𐑟"
         you_can_confirm: "𐑿 𐑒𐑨𐑯 𐑒𐑩𐑯𐑓𐑻𐑥 𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑔𐑮𐑵 𐑞 𐑤𐑦𐑙𐑒 𐑚𐑦𐑤𐑴:"
       hello: "𐑣𐑧𐑤𐑴 %{email}!"
-      invitation_instructions: 
+      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"
@@ -57,37 +57,37 @@ en_shaw:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} have invited you to join Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "𐑗𐑱𐑯𐑡 𐑥𐑲 𐑐𐑨𐑕𐑢𐑼𐑛"
         ignore: "𐑦𐑓 𐑿 𐑛𐑦𐑛𐑯𐑑 𐑮𐑦𐑒𐑢𐑧𐑕𐑑 𐑞𐑦𐑕, 𐑐𐑤𐑰𐑟 𐑦𐑜𐑯𐑹 𐑞𐑦𐑕 𐑦-𐑥𐑱𐑤."
         someone_requested: "𐑕𐑳𐑥𐑢𐑩𐑯 𐑣𐑨𐑟 𐑮𐑦𐑒𐑢𐑧𐑕𐑑𐑩𐑛 𐑩 𐑤𐑦𐑙𐑒 𐑑 𐑗𐑱𐑯𐑡 𐑿𐑼 𐑐𐑨𐑕𐑢𐑼𐑛, 𐑯 𐑿 𐑒𐑨𐑯 𐑛𐑵 𐑞𐑦𐑕 𐑔𐑮𐑵 𐑞 𐑤𐑦𐑙𐑒 𐑤𐑦𐑙𐑒 𐑚𐑦𐑤𐑴."
         subject: "𐑮𐑦𐑕𐑧𐑑 𐑐𐑨𐑕𐑢𐑼𐑛 𐑦𐑯𐑕𐑑𐑮𐑳𐑒𐑖𐑩𐑯𐑟"
         wont_change: "𐑿𐑼 𐑐𐑨𐑕𐑢𐑼𐑛 𐑢𐑴𐑯𐑑 𐑗𐑱𐑯𐑡 𐑩𐑯𐑑𐑦𐑤 𐑿 𐑨𐑒𐑕𐑧𐑕 𐑞 𐑤𐑦𐑙𐑒 𐑩𐑚𐑳𐑝 𐑯 𐑒𐑮𐑦𐑱𐑑 𐑩 𐑯𐑿 𐑢𐑳𐑯."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑣𐑨𐑟 𐑚𐑧𐑯 𐑤𐑪𐑒𐑑 𐑛𐑵 𐑑 𐑩𐑯 𐑧𐑒𐑕𐑧𐑕𐑦𐑝 𐑩𐑥𐑬𐑯𐑑 𐑝 𐑩𐑯𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤 𐑕𐑲𐑯 𐑦𐑯 𐑩𐑑𐑧𐑥𐑐𐑑𐑕."
         click_to_unlock: "𐑒𐑤𐑦𐑒 𐑞 𐑤𐑦𐑙𐑒 𐑚𐑦𐑤𐑴 𐑑 𐑩𐑯𐑤𐑪𐑒 𐑿𐑼 𐑩𐑒𐑬𐑯𐑑:"
         subject: "𐑩𐑯𐑤𐑪𐑒 𐑦𐑯𐑕𐑑𐑮𐑳𐑒𐑖𐑩𐑯𐑟"
         unlock: "𐑩𐑯𐑤𐑪𐑒 𐑥𐑲 𐑩𐑒𐑬𐑯𐑑"
       welcome: "𐑢𐑧𐑤𐑒𐑩𐑥 %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "𐑗𐑱𐑯𐑡 𐑥𐑲 𐑐𐑨𐑕𐑢𐑼𐑛"
-      new: 
+      new:
         forgot_password: "𐑓𐑹𐑜𐑪𐑑 𐑿𐑼 𐑐𐑨𐑕𐑢𐑼𐑛?"
         no_account: "𐑯𐑴 𐑩𐑒𐑬𐑯𐑑 𐑢𐑦𐑞 𐑞𐑦𐑕 𐑦-𐑥𐑱𐑤 𐑧𐑜𐑟𐑦𐑕𐑑𐑕. 𐑦𐑓 𐑿 𐑸 𐑢𐑱𐑑𐑦𐑙 𐑓𐑹 𐑩𐑯 𐑦𐑯𐑝𐑲𐑑, 𐑢𐑰 𐑸 𐑮𐑴𐑤𐑦𐑙 𐑞𐑧𐑥 𐑬𐑑 𐑨𐑟 𐑕𐑵𐑯 𐑨𐑟 𐑐𐑪𐑕𐑦𐑚𐑩𐑤"
         send_password_instructions: "𐑕𐑧𐑯𐑛 𐑥𐑰 𐑮𐑦𐑕𐑧𐑑 𐑐𐑨𐑕𐑢𐑼𐑛 𐑦𐑯𐑕𐑑𐑮𐑳𐑒𐑖𐑩𐑯𐑟"
       send_instructions: "𐑿 𐑢𐑦𐑤 𐑮𐑦𐑕𐑰𐑝 𐑩𐑯 𐑦-𐑥𐑱𐑤 𐑢𐑦𐑞 𐑦𐑯𐑕𐑑𐑮𐑳𐑒𐑖𐑩𐑯𐑟 𐑩𐑚𐑬𐑑 𐑣𐑬 𐑑 𐑮𐑦𐑕𐑧𐑑 𐑿𐑼 𐑐𐑨𐑕𐑢𐑼𐑛 𐑦𐑯 𐑩 𐑓𐑿 𐑥𐑦𐑯𐑩𐑑𐑕."
       updated: "𐑿𐑼 𐑐𐑨𐑕𐑢𐑼𐑛 𐑢𐑪𐑟 𐑗𐑱𐑯𐑡𐑛 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦. 𐑿 𐑸 𐑯𐑬 𐑕𐑲𐑯𐑛 𐑦𐑯."
-    registrations: 
+    registrations:
       destroyed: "𐑚𐑲! 𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑢𐑪𐑟 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑒𐑨𐑯𐑕𐑩𐑤𐑛. 𐑢𐑰 𐑣𐑴𐑐 𐑑 𐑕𐑰 𐑿 𐑩𐑜𐑧𐑯 𐑕𐑵𐑯."
       signed_up: "𐑿 𐑣𐑨𐑝 𐑕𐑲𐑯𐑛 𐑳𐑐 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦. 𐑦𐑓 𐑦𐑯𐑱𐑚𐑤𐑛, 𐑩 𐑒𐑪𐑯𐑓𐑼𐑥𐑱𐑖𐑩𐑯 𐑢𐑪𐑟 𐑕𐑧𐑯𐑑 𐑑 𐑿𐑼 𐑦-𐑥𐑱𐑤."
       updated: "𐑿 𐑳𐑐𐑛𐑱𐑑𐑩𐑛 𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "𐑿 𐑸 𐑩𐑚𐑬𐑑 𐑑 𐑿𐑟 𐑨𐑤𐑓𐑩 𐑕𐑪𐑓𐑑𐑢𐑺."
         bugs_and_feedback: "𐑚𐑰 𐑩𐑛𐑝𐑲𐑟𐑛, 𐑿 𐑢𐑦𐑤 𐑧𐑒𐑕𐑐𐑽𐑾𐑯𐑕 𐑚𐑳𐑜𐑟.  𐑢𐑰 𐑦𐑙𐑒𐑻𐑩𐑡 𐑿 𐑑 𐑿𐑟 𐑞 𐑓𐑰𐑛𐑚𐑨𐑒 𐑚𐑳𐑑𐑩𐑯 𐑪𐑯 𐑞 𐑮𐑲𐑑 𐑣𐑨𐑯𐑛 𐑕𐑲𐑛 𐑝 𐑿𐑼 𐑚𐑮𐑬𐑟𐑼 𐑑 𐑮𐑦𐑐𐑹𐑑 𐑨𐑯𐑦 𐑣𐑦𐑒𐑩𐑐𐑕!  𐑢𐑰 𐑢𐑦𐑤 𐑢𐑻𐑒 𐑨𐑟 𐑓𐑨𐑕𐑑 𐑨𐑟 𐑢𐑰 𐑒𐑨𐑯 𐑑 𐑮𐑦𐑟𐑪𐑤𐑝 𐑨𐑯𐑦 𐑦𐑖𐑵𐑟 𐑿 𐑮𐑦𐑐𐑹𐑑."
         bugs_and_feedback_mobile: "𐑚𐑰 𐑩𐑛𐑝𐑲𐑟𐑛, 𐑿 𐑢𐑦𐑤 𐑧𐑕𐑒𐑐𐑽𐑾𐑯𐑕 𐑚𐑳𐑜𐑟.  𐑢𐑰 𐑦𐑙𐑒𐑻𐑩𐑡 𐑿 𐑑 𐑮𐑦𐑐𐑹𐑑 𐑨𐑯𐑦 𐑣𐑦𐑒𐑩𐑐𐑕!  𐑢𐑰 𐑢𐑦𐑤 𐑢𐑻𐑒 𐑨𐑟 𐑓𐑨𐑕𐑑 𐑨𐑟 𐑢𐑰 𐑒𐑨𐑯 𐑑 𐑮𐑦𐑟𐑪𐑤𐑝 𐑨𐑯𐑦 𐑦𐑖𐑵𐑟 𐑿 𐑮𐑦𐑐𐑹𐑑."
@@ -99,23 +99,23 @@ en_shaw:
         username: "𐑿𐑟𐑼𐑯𐑱𐑥"
       signed_in: "𐑕𐑲𐑯𐑛 𐑦𐑯 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦."
       signed_out: "𐑕𐑲𐑥𐑛 𐑬𐑑 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "𐑓𐑼𐑜𐑪𐑑 𐑿𐑼 𐑐𐑨𐑕𐑢𐑼𐑛?"
         receive_confirmation: "𐑛𐑦𐑛𐑯𐑑 𐑮𐑦𐑕𐑰𐑝 𐑒𐑪𐑯𐑓𐑼𐑥𐑱𐑖𐑩𐑯 𐑦𐑯𐑕𐑑𐑮𐑳𐑒𐑖𐑩𐑯𐑟?"
         receive_unlock: "𐑛𐑦𐑛𐑯𐑑 𐑮𐑦𐑕𐑰𐑝 𐑩𐑯𐑤𐑪𐑒 𐑦𐑯𐑕𐑑𐑮𐑳𐑒𐑖𐑩𐑯𐑟?"
         sign_in: "𐑕𐑲𐑯 𐑦𐑯"
         sign_up: "𐑕𐑲𐑯 𐑳𐑐"
         sign_up_closed: "𐑴𐑐𐑩𐑯 𐑕𐑲𐑯𐑩𐑐𐑕 𐑸 𐑒𐑤𐑴𐑟𐑛 𐑨𐑑 𐑞𐑦𐑕 𐑑𐑲𐑥."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "𐑕𐑲𐑯 𐑳𐑐 𐑓𐑹 𐑩𐑯 𐑦𐑯𐑝𐑲𐑑!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "𐑮𐑦𐑕𐑧𐑯𐑛 𐑩𐑯𐑤𐑪𐑒 𐑦𐑯𐑕𐑑𐑮𐑳𐑒𐑖𐑩𐑯𐑟"
       send_instructions: "𐑿 𐑢𐑦𐑤 𐑮𐑦𐑕𐑰𐑝 𐑩𐑯 𐑦-𐑥𐑱𐑤 𐑢𐑦𐑞 𐑦𐑯𐑕𐑑𐑮𐑳𐑒𐑖𐑩𐑯𐑟 𐑩𐑚𐑬𐑑 𐑣𐑬 𐑑 𐑩𐑯𐑤𐑪𐑒 𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑦𐑯 𐑩 𐑓𐑿 𐑥𐑦𐑯𐑩𐑑𐑕."
       unlocked: "𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑢𐑪𐑟 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑩𐑯𐑤𐑪𐑒𐑑. 𐑿 𐑸 𐑯𐑬 𐑕𐑲𐑯𐑛 𐑦𐑯."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "𐑢𐑪𐑟 𐑷𐑤𐑮𐑧𐑛𐑦 𐑒𐑩𐑯𐑓𐑻𐑥𐑛"
       not_found: "𐑯𐑪𐑑 𐑓𐑬𐑯𐑛"
       not_locked: "𐑢𐑪𐑟 𐑥𐑪𐑑 𐑤𐑪𐑒𐑑"
diff --git a/config/locales/devise/devise.eo.yml b/config/locales/devise/devise.eo.yml
index cb78ffd2f..4b95f6033 100644
--- a/config/locales/devise/devise.eo.yml
+++ b/config/locales/devise/devise.eo.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-eo: 
-  devise: 
-    confirmations: 
+eo:
+  devise:
+    confirmations:
       confirmed: "Via konto estis sukcese konfirmita. Vi nun estas ensalutinta."
-      new: 
+      new:
         resend_confirmation: "Resendu instruojn por konfirmi"
       send_instructions: "Vi post kelkaj minutoj ricevos instrukciojn pri kiel konfirmi vian konton."
-    failure: 
+    failure:
       inactive: "Via konto ne jam estas konfirmita."
       invalid: "Nevalida uzantnomo aŭ pasvorto."
       invalid_token: "Malvalida aŭtentoindiko."
@@ -18,17 +18,17 @@ eo:
       timeout: "Via sesio finis. Bonvolu reensaluti por daŭri."
       unauthenticated: "Vi devas ensaluti aŭ fari konton antaŭ ol daŭri."
       unconfirmed: "Vi devas konfirmi vian konton antaŭ ol daŭri."
-    invitations: 
+    invitations:
       invitation_token_invalid: "La invita ĵetono, kiun vi provizis, ne estas valida!"
       send_instructions: "Via invito estas sendita."
       updated: "Vi sukcese faris pasvorton. Vi nun estas ensalutinta. "
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Konfirmi mian konton"
         subject: "Instrukcioj por konfirmi"
         you_can_confirm: "Vi povas konfirmi vian konton per la suba ligilo:"
       hello: "Saluton, %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Akcepti inviton"
         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"
@@ -57,37 +57,37 @@ eo:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "ĉe %{url}, vi povas akcepti ĝin per la posta ligilo."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} invitis vin aniĝi DIASPORA*"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Ŝanĝi mian pasvorton"
         ignore: "Se vi ne petis tiun ĉi, bonvolu ignori tiun ĉi retpoŝton."
         someone_requested: "Iu petis ligilon por ŝanĝi vian pasvorton, kaj vi povas fari tiun per la malsupre ligilo."
         subject: "Instruoj por reŝargi pasvorton"
         wont_change: "Via pasvorto ne ŝanĝiĝos ĝis vi eniros la supre ligilon kaj kreos nonan pasvorton."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Via konto estas ŝlosita pro tro da malsukcesaj ensalutprovoj."
         click_to_unlock: "Alklaku la suban ligilon por malŝlosi vian konton:"
         subject: "Instrukcioj por malŝlosi"
         unlock: "Malŝlosi mian konton."
       welcome: "Bonvenon %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Ŝanĝi mian pasvorton"
-      new: 
+      new:
         forgot_password: "Forgesis vian pasvorton?"
         no_account: "Ne konto kun tiu ĉi retpoŝtadreso ekzistas.  Se vi ĝisatendas por invito, ni plejrapide sendas ilin"
         send_password_instructions: "Sendu al mi instrukcioj por fari novan pasvorton"
       send_instructions: "Post kelkaj minutoj vi ricevos retpoŝton kun instrukcioj pri kiel fari novan pasvorton."
       updated: "Vi sukcese ŝanĝis vian pasvorton. Vi nun estas ensalutinta."
-    registrations: 
+    registrations:
       destroyed: "Adiaŭ! Via konto estis sukcese forigita. Ni esperas baldaŭ denove vin vidi."
       signed_up: "Vi sukcese faris novan konton. Se ebligita, konfirmo estis sendita al via retpoŝtadreso."
       updated: "Vi sukcese ĝisdatigis vian konton."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Vi estas uzonta alfaprogramaron."
         bugs_and_feedback: "Memoru, vi trovos erarojn.  Bonvolu uzi la „Feedback“ butonon dekstre por informi nin pri iuj ajn eraroj!  Ni tre rapide laboros, por ke ni riparu la erarojn, pri kiuj vi informis nin."
         bugs_and_feedback_mobile: "Memoru, vi trovos erarojn.  Bonvolu informi nin pri iuj ajn eraroj!  Ni tre rapide laboros, por ke ni riparu la erarojn, pri kiuj vi informis nin."
@@ -99,23 +99,23 @@ eo:
         username: "Uzantnomo"
       signed_in: "Sukcese ensalutis."
       signed_out: "Sukcese elsalutis."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Forgesis vian pasvorton?"
         receive_confirmation: "Ĉu vi ne ricevis instruojn por konfirmi?"
         receive_unlock: "Ĉu vi ne ricevis instruojn por malŝlosi?"
         sign_in: "Ensaluti"
         sign_up: "Registriĝi"
         sign_up_closed: "Nun ne estas libera registrado."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Petu inviton!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Resendu instruojn por malŝlosi"
       send_instructions: "Vi ricevos retpoŝton, kiu havos instruoj pri tiel, kiel malŝlosi vian konton, post kelkaj minutoj."
       unlocked: "Via konto sukcese malŝlosiĝis.  Vi nun ensalutas."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "jam konfirmita"
       not_found: "ne trovita"
       not_locked: "ne estis ŝlosita"
diff --git a/config/locales/devise/devise.es-AR.yml b/config/locales/devise/devise.es-AR.yml
index e97df70a9..4751aea2b 100644
--- a/config/locales/devise/devise.es-AR.yml
+++ b/config/locales/devise/devise.es-AR.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-es-AR: 
-  devise: 
-    confirmations: 
+es-AR:
+  devise:
+    confirmations:
       confirmed: "Tu cuenta se confirmó sin problemas. Ya estás conectado."
-      new: 
+      new:
         resend_confirmation: "Reenviarme instrucciones para confirmar mi cuenta"
       send_instructions: "En unos minutos vas a recibir un correo electrónico con instrucciones para confirmar tu cuenta."
-    failure: 
+    failure:
       inactive: "Tu cuenta todavía no fue activada."
       invalid: "La contraseña o el nombre de usuario están mal."
       invalid_token: "El identificador de autenticación no es válido."
@@ -18,17 +18,17 @@ es-AR:
       timeout: "Tu sesión expiró, por favor conectate de nuevo."
       unauthenticated: "Necesitás conectarte a tu cuenta, o registrarse, para continuar."
       unconfirmed: "Necesitás confirmar tu cuenta para continuar."
-    invitations: 
+    invitations:
       invitation_token_invalid: "¡El identificador de la invitación no es válido!"
       send_instructions: "Ya se envió tu invitacíon."
       updated: "Tu contraseña se estableció sin problemas. Ya estás conectado."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Confirmar mi cuenta"
         subject: "Instrucciones para la confirmación"
         you_can_confirm: "Podés confirmar tu cuenta a través del siguiente enlace:"
       hello: "¡Hola %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Aceptar la invitación"
         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"
@@ -57,37 +57,37 @@ es-AR:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "en %{url}, podes aceptarlo desde el link  de abajo "
         has_invited_you: "%{name} te ha invitado a unirte a Diaspora"
         have_invited_you: "%{names} te han invitado a unirte a Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Cambiar mi contraseña"
         ignore: "Si vos no hiciste la solicitud, por favor ignorá este correo."
         someone_requested: "Alguien solicitó un enlace para cambiar tu contraseña, podés hacerlo a través del siguiente enlace."
         subject: "Instrucciones para cambiar la contraseña"
         wont_change: "Tu contraseña no cambiará hasta que no accedas al enlace anterior e indiques una nueva."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Tu cuenta fue bloqueada a causa de excesivos intentos de conectarse con una contraseña incorrecta."
         click_to_unlock: "Hacé click en el siguiente enlace para desbloquear tu cuenta:"
         subject: "Instrucciones para desbloquear la cuenta"
         unlock: "Desbloquear mi cuenta"
       welcome: "¡Bienvenido %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Cambiar mi contraseña"
-      new: 
+      new:
         forgot_password: "¿Olvidaste tu contraseña?"
         no_account: "No hay ninguna cuenta con esta dirección de correo electrónico.  Si estás esperando una invitación, te la enviaremos tan pronto como sea posible"
         send_password_instructions: "Enviame instrucciones para cambiar mi password"
       send_instructions: "En unos minutos vas a recibir un correo electrónico con instrucciones para cambiar tu contraseña."
       updated: "Tu contraseña se cambió sin problemas. Ya estás conectado."
-    registrations: 
+    registrations:
       destroyed: "¡Chau! Tu cuenta se canceló sin problemas. Esperamos volver a verte pronto."
       signed_up: "Fuiste registrado sin problemas. Si está habilitado, te enviamos un correo electrónico con instrucciones para confirmar tu cuenta."
       updated: "Tu cuenta fue actualizada sin problemas."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Estás por usuar un software en estado alfa."
         bugs_and_feedback: "Tené en cuenta que podés experimentar errores.  ¡Te alentamos a usar el botón de \"Feedback\" situado a la derecha de tu navegador para reportarnos cualquier inconveniente!  Trabajaremos tan rápido como podamos para resolver cualquier problema que reportes."
         bugs_and_feedback_mobile: "Tené en cuenta que podés experimentar errores.  ¡Te alentamos informarnos cualquier inconveniente!  Trabajaremos tan rápido como podamos para resolver cualquier problema que reportes."
@@ -99,23 +99,23 @@ es-AR:
         username: "Nombre de usuario"
       signed_in: "Te conectaste sin problemas."
       signed_out: "Te desconectaste sin problemas."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "¿Olvidaste tu contraseña?"
         receive_confirmation: "¿No recibiste tus instrucciones para confirmar tu cuenta?"
         receive_unlock: "¿No recibiste tus instrucciones para desbloquear tu cuenta?"
         sign_in: "Conectarse"
         sign_up: "Registrarse"
         sign_up_closed: "El registro sin invitacíon está cerrado en este momento."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "¡Registrate por una invitación!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Reenviarme instrucciones para desbloquear mi cuenta"
       send_instructions: "En unos minutos vas a recibir un correo electrónico con instrucciones para desbloquear tu cuenta."
       unlocked: "Tu cuenta fue desbloqueado sin problemas. Ya estás conectado."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "ya había sido confirmada"
       not_found: "no fue encontrada"
       not_locked: "no estaba bloqueada"
diff --git a/config/locales/devise/devise.es-CL.yml b/config/locales/devise/devise.es-CL.yml
index 885e9eac4..fdef17542 100644
--- a/config/locales/devise/devise.es-CL.yml
+++ b/config/locales/devise/devise.es-CL.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-es-CL: 
-  devise: 
-    confirmations: 
+es-CL:
+  devise:
+    confirmations:
       confirmed: "Tu cuenta ha sido confirmada. Ya has entrado a tu cuenta."
-      new: 
+      new:
         resend_confirmation: "Reenviar las instrucciones de confirmación"
       send_instructions: "Recibirás un correo con instrucciones acerca de como confirmar tu cuenta en pocos minutos."
-    failure: 
+    failure:
       inactive: "Tu cuenta aún no ha sido activada."
       invalid: "Correo electrónico o contraseña no válidos."
       invalid_token: "Identificador de autenticación inválido."
@@ -18,17 +18,17 @@ es-CL:
       timeout: "Tu sesión terminó, por favor, accede de nuevo para continuar."
       unauthenticated: "Necesitas iniciar sesión o registrarte antes de continuar."
       unconfirmed: "Tienes que confirmar tu cuenta antes de continuar."
-    invitations: 
+    invitations:
       invitation_token_invalid: "¡El identificador de la invitacion no es válido!"
       send_instructions: "Tu invitación ha sido enviada."
       updated: "Tu contraseña ha sido modificada. Ya has entrado a tu cuenta."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Confirmar mi cuenta"
         subject: "Instrucciones de confirmación"
         you_can_confirm: "Puedes confirmar tu cuenta a través del siguiente enlace:"
       hello: "Hola %{email}!"
-      invitation_instructions: 
+      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"
@@ -57,37 +57,37 @@ es-CL:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} have invited you to join Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Cambiar mi contraseña"
         ignore: "Si no has solicitado esto, por favor, ignora este correo."
         someone_requested: "Alguien a solicitado un enlace para cambiar tu contraseña, y tu puedes hacerlo a través del siguiente enlace."
         subject: "Instrucciones para cambiar tu contraseña"
         wont_change: "Tu contraseña no cambiará hasta que accedas al enlace anterior y crees una nueva."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Tu cuenta ha sido bloqueada debido a un excesivo numero de ingresos de intentos fallidos."
         click_to_unlock: "Haz click en el enlace de abajo para desbloquear tu cuenta:"
         subject: "Instrucciones para desbloquear tu cuenta"
         unlock: "Desbloquear mi cuenta"
       welcome: "Bienvenido %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Cambiar mi contraseña"
-      new: 
+      new:
         forgot_password: "¿Olvidaste tu contraseña?"
         no_account: "No existe una cuenta asociada con ese email. Si estas esperando una invitación, la enviaremos a la brevedad"
         send_password_instructions: "Envíame instrucciones para restablecer la contraseña"
       send_instructions: "Recibirás un correo con instrucciones para restablecer tu contraseña en pocos minutos."
       updated: "Tu contraseña ha sido modificada. Ya has entrado a tu cuenta."
-    registrations: 
+    registrations:
       destroyed: "¡Adiós! Tu cuenta ha sido cancelada. Esperamos volver a verte pronto."
       signed_up: "Te has registrado correctamente. Si está disponible, te hemos enviado un correo de confirmación."
       updated: "Tu cuenta ha sido actualizada."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Estás a punto de usar la versión alpha."
         bugs_and_feedback: "Ten en cuenta que puedes experimentar errores. ¡Te animamos a que utilices el botón de Feedback ubicado a la derecha de tu navegador para informar cualquier fallo! Trabajaremos tan rápido como podamos para resolver cualquier problema que tú nos informes."
         bugs_and_feedback_mobile: "Ten en cuenta, puedes recibir errores. ¡Te animamos a que nos informes de cualquier error! Vamos a trabajar tan rápido como nos sea posible para resolver cualquier problema que nos informes."
@@ -99,23 +99,23 @@ es-CL:
         username: "Nombre de usuario"
       signed_in: "Has entrado correctamente."
       signed_out: "Has salido correctamente."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "¿Olvidaste tu contraseña?"
         receive_confirmation: "¿No has recibido las instrucciones de confirmación?"
         receive_unlock: "¿No has recibido las instrucciones de desbloqueo?"
         sign_in: "Entrar"
         sign_up: "Registrarse"
         sign_up_closed: "Los registros no estan disponibles en este momento."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "¡Regístrate para ser invitado!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Reenviar instrucciones de desbloqueo"
       send_instructions: "Recibirás un correo con instrucciones acerca de como desbloquear tu cuenta en pocos minutos"
       unlocked: "Tu cuenta ha sido desbloqueada. Ya has entrado a tu cuenta."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "Ya confirmado"
       not_found: "No encontrado"
       not_locked: "No fue bloqueado"
diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml
index 9881b3ae7..ea2d6bbeb 100644
--- a/config/locales/devise/devise.es.yml
+++ b/config/locales/devise/devise.es.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-es: 
-  devise: 
-    confirmations: 
+es:
+  devise:
+    confirmations:
       confirmed: "Tu cuenta ha sido confirmada. Ya has accedido a tu cuenta."
-      new: 
+      new:
         resend_confirmation: "Volver a enviar instrucciones de confirmación"
       send_instructions: "Recibirás un correo con instrucciones para confirmar tu cuenta en pocos minutos."
-    failure: 
+    failure:
       inactive: "Tu cuenta aún no ha sido activada."
       invalid: "Nombre de usuario o contraseña incorrectos."
       invalid_token: "Identificador de autenticación incorrecto."
@@ -18,17 +18,17 @@ es:
       timeout: "Tu sesión ha expirado, por favor accede de nuevo para continuar."
       unauthenticated: "Necesitas acceder a tu cuenta o registrarte antes de continuar."
       unconfirmed: "Necesitas confirmar tu cuenta antes de continuar."
-    invitations: 
+    invitations:
       invitation_token_invalid: "¡El identificador de la invitación no es valido!"
       send_instructions: "Tu invitación se ha enviado."
       updated: "Tu contraseña ha sido establecida con éxito. Ahora has accedido."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Confirmar mi cuenta"
         subject: "Instrucciones de confirmación"
         you_can_confirm: "Puedes confirmar tu cuenta a través del siguiente enlace:"
       hello: "Hola %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Aceptar invitación"
         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"
@@ -57,37 +57,37 @@ es:
         team_diaspora: "Equipo de Diaspora*"
         unsubscribe: "Para anular tu suscripción por favor haz clic en %{link}."
         view_in: "Ver en"
-      inviter: 
+      inviter:
         accept_at: "en %{url}, puedes aceptar en el enlace inferior."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} te ha invitado a unirte a Diaspora*"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Cambiar mi contraseña"
         ignore: "Si no has solicitado esto, por favor ignora este mensaje."
         someone_requested: "Alguien ha solicitado un enlace para cambiar tu contraseña, y tú puedes hacerlo con el siguiente enlace."
         subject: "Instrucciones para cambiar tu contraseña"
         wont_change: "Tu contraseña no cambiará hasta que accedas al enlace anterior y crees una nueva."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Tu cuenta ha sido bloqueada debido a una excesiva cantidad de intentos de ingreso fallidos."
         click_to_unlock: "Pulsa en el enlace de abajo para desbloquear tu cuenta:"
         subject: "Instrucciones para desbloquear tu cuenta"
         unlock: "Desbloquear mi cuenta"
       welcome: "¡Bienvenido %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Cambiar mi contraseña"
-      new: 
+      new:
         forgot_password: "¿Olvidaste tu contraseña?"
         no_account: "No existe una cuenta con ese correo. Si estás esperando una invitación, las haremos llegar tan pronto como nos sea posible."
         send_password_instructions: "Envíame instrucciones para restablecer la contraseña"
       send_instructions: "Recibirás un correo con instrucciones para cambiar tu contraseña en pocos minutos."
       updated: "Tu contraseña ha sido modificada. Ya has accedido a tu cuenta."
-    registrations: 
+    registrations:
       destroyed: "¡Adiós! Tu cuenta ha sido cancelada. Esperamos volver a verte pronto."
       signed_up: "Te has registrado con éxito. Un mensaje de confirmación ha sido enviada a tu email."
       updated: "Has actualizado tu cuenta con éxito."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Estás a punto de utilizar software en versión alpha."
         bugs_and_feedback: "Ten en cuenta que puedes sufrir errores. ¡Te animamos a que utilices el botón de Feedback situado a la derecha de tu navegador para informar cualquier fallo! Trabajaremos tan rápido como nos sea posible para resolver cualquier problema que nos remitas."
         bugs_and_feedback_mobile: "Ten en cuenta que puedes sufrir errores. ¡Te animamos a informar de cualquier fallo! Trabajaremos tan rápido como nos sea posible para resolver cualquier problema que nos remitas."
@@ -99,23 +99,23 @@ es:
         username: "Nombre de usuario"
       signed_in: "Accediste con éxito."
       signed_out: "Saliste con éxito."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "¿Olvidaste tu contraseña?"
         receive_confirmation: "¿No has recibido instrucciones de confirmación?"
         receive_unlock: "¿No has recibido las instrucciones de desbloqueo?"
         sign_in: "Acceder"
         sign_up: "Regístrate"
         sign_up_closed: "Los registros están cerrados temporalmente."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "¡Regístrate para ser invitado!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Volver a enviar las instrucciones de desbloqueo."
       send_instructions: "Recibirás un correo con instrucciones para desbloquear tu cuenta en pocos minutos."
       unlocked: "Tu cuenta ha sido desbloqueada. Ya has accedido a tu cuenta."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "Ya ha sido confirmada"
       not_found: "No encontrado"
       not_locked: "No fue bloqueado"
diff --git a/config/locales/devise/devise.eu.yml b/config/locales/devise/devise.eu.yml
index 31a8a3428..2215b36d4 100644
--- a/config/locales/devise/devise.eu.yml
+++ b/config/locales/devise/devise.eu.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-eu: 
-  devise: 
-    confirmations: 
+eu:
+  devise:
+    confirmations:
       confirmed: "Zure kontua baieztatu da. Sartu egin zara."
-      new: 
+      new:
         resend_confirmation: "Berbidali baieztapen argibideak"
       send_instructions: "Minutu batzuetan kontua baieztatzeko argibideak jasoko dituzu e-postan."
-    failure: 
+    failure:
       inactive: "Zure kontua ez da aktibatu oraindik."
       invalid: "Erabiltzaile edo pasahitz okerra."
       invalid_token: "Autentikazio datu akasduna."
@@ -18,17 +18,17 @@ eu:
       timeout: "Zure sesioa bukatu da, autentikatu berriz jarraitzeko."
       unauthenticated: "Izena eman edo autentikatu behar duzu jarraitu aurretik"
       unconfirmed: "Zure kontua baieztatu behar duzu jarraitu aurretik."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Gonbidapen kodea ez da baliozkoa!"
       send_instructions: "Gonbidapena bidali duzu."
       updated: "Zure pasahitza arrakastaz ezarri duzu. Sartu egin zara."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Kontua baieztatu"
         subject: "Baieztapen argibideak"
         you_can_confirm: "Zure kontua baieztatu dezakezu esteka hau jarraituz:"
       hello: "Kaixo %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Gonbidapena"
         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"
@@ -57,37 +57,37 @@ eu:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "%{url}(e)n, onartu dezakezu beheko esteka jarraituz."
         has_invited_you: "%{name}"
         have_invited_you: "%{names}(e)k Diasporara batzera gonbidatu zaituzte"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Pasahitza aldatu"
         ignore: "Hau eskatu ez bazenuen, mesedez gutxietsi mezu hau."
         someone_requested: "Norbaitek pasahitz aldaketarako esteka bat eskatu du, hau egin dezakezu esteka honako esteka jarraituz:"
         subject: "Pasahitz berreskuraketaren argibideak"
         wont_change: "Zure pasahitza ez da aldatuko honako esteka jarraitu eta berri bat ezartzen duzun arte."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Zure kontua blokeatu da autentikazio akasdun askoren ondoren."
         click_to_unlock: "Sakatu honako estekan zure kontua askatzeko:"
         subject: "Askatu argibideak"
         unlock: "Askatu nire kontua"
       welcome: "Ongietorri, %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Nire pasahitza aldatu"
-      new: 
+      new:
         forgot_password: "Pasahitza ahaztu duzu?"
         no_account: "Ez da konturik e-posta horrekin. Gonbidapen baten zain bazaude, ahal dugun azkarren bidaliko dizugu bat"
         send_password_instructions: "Bidali iezadazu pasahitzaren berrezarpenerako argibideak"
       send_instructions: "Hurrengo minutuetan email bat jasoko dituzu pasahitza berrezartzeko argibideekin."
       updated: "Zure pasahitza arrakastaz aldatu duzu. Autentikatuta zaude orain."
-    registrations: 
+    registrations:
       destroyed: "Agur! Zure kontua arrakastaz ezabatu duzu. Laister berriro ikustea espero dugu."
       signed_up: "Arrakastaz eman duzu izena. Ahal bazen, mezu bat bidalia izan da zure sarrera-ontzira."
       updated: "Kontua arrakastaz eguneratu duzu."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Alpha softwarea erabiltzear zaude."
         bugs_and_feedback: "Jakin dezazula aktsak aurkituko dituzula. Feedback botoia erabiltzera animatzen zaitugu (eskubian) edozein akats bidaltzeko! Ahal dugun azkarren konponduko dugu."
         bugs_and_feedback_mobile: "Jakin dezazula akatsak aurkitu dituzula. Akatsak bidaltzera animatzen zaitugu! Ahal dugun azkarren egingo dugu lan horiek konpontzeko."
@@ -99,23 +99,23 @@ eu:
         username: "Erabiltzailea"
       signed_in: "Arrakastaz sartu zara."
       signed_out: "Arrakastaz atera zara."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Zure pasahitza ahaztu duzu?"
         receive_confirmation: "Ez duzu baieztapen emailik jaso?"
         receive_unlock: "Ez duzu askapen argibiderik jaso?"
         sign_in: "Sartu"
         sign_up: "Izena eman"
         sign_up_closed: "Izen-emate irekiak ez daude erabilgarri momentu hontan."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Izena eman gonbidapen bat jasotzeko!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Desblokeatzeko argibideak bidali"
       send_instructions: "Zure kontua berriro aktibatzeko argibidedun mezu bat jasoko duzu e-postan minutu batzuetan."
       unlocked: "Zure kontua berraktibatu duzu. Orain sartu egin zara."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "jadanik baieztatua zegoen"
       not_found: "ez da aurkitu"
       not_locked: "ez zegoen giltzapetuta"
diff --git a/config/locales/devise/devise.fi.yml b/config/locales/devise/devise.fi.yml
index 14bf41448..a1cb57fec 100644
--- a/config/locales/devise/devise.fi.yml
+++ b/config/locales/devise/devise.fi.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-fi: 
-  devise: 
-    confirmations: 
+fi:
+  devise:
+    confirmations:
       confirmed: "Käyttäjätilisi on varmistettu onnistuneesti. Olet nyt kirjautunut sisään."
-      new: 
+      new:
         resend_confirmation: "Lähetä vahvistusohjeet uudelleen"
       send_instructions: "Saat hetken päästä sähköpostiisi ohjeet siitä, miten vahvistat käyttäjätilisi."
-    failure: 
+    failure:
       inactive: "Käyttätiliäsi ei ole vielä aktivoitu."
       invalid: "Virheellinen käyttäjätunnus tai salasana."
       invalid_token: "Virheellinen todennustunnus."
@@ -18,17 +18,17 @@ fi:
       timeout: "Istunto on vanhentunut, kirjaudu uudelleen jatkaaksesi."
       unauthenticated: "Sinun tulee rekisteröityä ja/tai kirjautua ennen jatkamista."
       unconfirmed: "Sinun täytyy vahvistaa käyttäjätilisi ennen kuin voit jatkaa"
-    invitations: 
+    invitations:
       invitation_token_invalid: "Kutsun vahvistustunnus on virheellinen!"
       send_instructions: "Kutsusi on lähetetty."
       updated: "Salasanasi on asetettu onnistuneesti. Olet kirjautunut sisään."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Vahvista käyttäjätilini"
         subject: "Vahvistamisohjeet"
         you_can_confirm: "Voit vahvistaa käyttäjätilisi alla olevan linkin kautta:"
       hello: "Hei, %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Hyväksy kutsu"
         arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
         be_yourself: "Be Yourself"
@@ -57,37 +57,37 @@ fi:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "osoitteessa %{url}, hyväksyminen alla olevasta linkistä."
         has_invited_you: "%{names}"
         have_invited_you: "%{names} on kutsunut sinut Diasporan käyttäjäksi"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Vaihda salasanani"
         ignore: "Jos et pyytänyt tätä, voit jättää viestin huomiotta."
         someone_requested: "Joku on pyytänyt linkkiä salasanasi vaihtamiseksi. Voit tehdä sen alla olevan linkin kautta. "
         subject: "Salasanan palautusohjeet"
         wont_change: "Salasanasi ei vaihdu, ennen kuin luot uuden yllä olevan linkin kautta."
-      unlock_instructions: 
+      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
         unlock: "Poista käyttäjätilini lukitus"
       welcome: "Tervetuloa %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Vaihda salasanani"
-      new: 
+      new:
         forgot_password: "Unohditko salasanasi?"
         no_account: "Tunnusta tälle sähköpostille ei ole olemassa. Mikäli odotat vielä kutsua, pyrimme lähettämänää sen niin pian kuin mahdollista."
         send_password_instructions: "Lähetä minulle salasanan uudelleenasettamisohjeet"
       send_instructions: "Saat hetken päästä sähköpostiisi ohjeet siitä, miten voit asettaa salasanasi uudelleen."
       updated: "Salasanasi on vaihdettu onnistuneesti. Olet nyt kirjautunut sisään."
-    registrations: 
+    registrations:
       destroyed: "Näkemiin! Käyttäjätilisi on onnistuneesti peruutettu. Toivottavasti näemme sinut pian uudelleen."
       signed_up: "Käyttäjätilin luominen onnistui. Mahdollinen vahvistus on lähetetty sähköpostiisi."
       updated: "Päivitit käyttäjätilisi onnistuneesti."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Olet aikeissa käyttää alpha-versiota ohjelmistosta."
         bugs_and_feedback: "Ota huomioon, että tulet kohtaamaan ohjelmistovirheitä. Kannustamme sinua ilmoittamaan kaikki huomaamasi virheet oikealla olevan Feedback-nappulan kautta! Työskentelemme niin nopeasti kuin voimme selvittääksemme ilmoittamasi virheet."
         bugs_and_feedback_mobile: "Tulet todennäköisesti kohtaamaan ohjelmistovirheitä. Kerro mahdollisista ongelmatilanteista ja virheistä meille. Pyrimme korjaamaan ilmoittamasi virheet niin nopeasti kuin voimme."
@@ -99,23 +99,23 @@ fi:
         username: "Käyttäjänimi"
       signed_in: "Sisäänkirjautuminen onnistui."
       signed_out: "Uloskirjautuminen onnistui."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Unohditko salasanasi?"
         receive_confirmation: "Etkö saanut vahvistusohjeita?"
         receive_unlock: "Etkö saanut lukituksenpoisto-ohjeita?"
         sign_in: "Kirjaudu"
         sign_up: "Rekisteröidy"
         sign_up_closed: "Avoin rekisteröityminen on tällä hetkellä suljettu."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Rekisteröidy saadaksesi kutsu!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Lähetä lukituksenpoisto-ohjeet uudelleen"
       send_instructions: "Saat hetken kuluttua sähköpostiisi ohjeet siitä, miten avaat käyttäjätilisi lukituksen."
       unlocked: "Käyttäjätilisi lukitus on avattu onnistuneesti. Olet nyt kirjautunut sisään."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "oli jo varmistettu"
       not_found: "ei löytynyt"
       not_locked: "ei ollut lukittu"
diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index 5b94a0869..7e3e53296 100644
--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-fr: 
-  devise: 
-    confirmations: 
+fr:
+  devise:
+    confirmations:
       confirmed: "Votre compte a été confirmé. Vous êtes à présent connecté(e)."
-      new: 
+      new:
         resend_confirmation: "Renvoyer les instructions de confirmation"
       send_instructions: "Vous allez recevoir dans quelques minutes un e-mail contenant les instructions pour confirmer votre compte."
-    failure: 
+    failure:
       inactive: "Votre compte n’a pas encore été activé."
       invalid: "Pseudo ou mot de passe invalide."
       invalid_token: "Jeton d’authentification invalide."
@@ -18,17 +18,17 @@ fr:
       timeout: "Votre session a expiré, veuillez vous connecter de nouveau afin de continuer."
       unauthenticated: "Vous devez vous connecter ou vous inscrire avant de continuer."
       unconfirmed: "Vous devez confirmer votre compte avant de continuer."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Le jeton d’invitation fourni n’est pas valide !"
       send_instructions: "Votre invitation a été envoyée."
       updated: "Votre mot de passe a été créé. Vous êtes à présent connecté(e)."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Confirmer mon compte"
         subject: "Instructions de confirmation"
         you_can_confirm: "Vous pouvez confirmer votre compte en cliquant sur le lien ci-dessous :"
       hello: "Bonjour %{email} !"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Accepter l'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"
@@ -57,37 +57,37 @@ fr:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "à %{url}, vous pouvez l'accepter à travers le lien ci-dessous."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} vous a invité à rejoindre Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Changer mon mot de passe"
         ignore: "Si vous n'avez pas demandé cela, merci d'ignorer cet e-mail."
         someone_requested: "Quelqu'un a demandé un lien pour changer votre mot de passe, vous pouvez effectuer cela en cliquant sur le lien ci-dessous."
         subject: "Instructions de réinitialisation de mot de passe"
         wont_change: "Votre mot de passe ne changera pas avant que vous n'en créiez un nouveau en accédant au lien ci-dessus. "
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Votre compte a été bloqué à cause d'un nombre excessif de tentatives infructueuses de connexion."
         click_to_unlock: "Cliquez sur le lien ci-dessous pour débloquer votre compte :"
         subject: "Instructions de déverrouillage"
         unlock: "Débloquer mon compte"
       welcome: "Bienvenue %{email} !"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Changer mon mot de passe"
-      new: 
+      new:
         forgot_password: "Mot de passe oublié ?"
         no_account: "Aucun compte n'est associé à cette adresse de courrier électronique. Si vous attendez une invitation, nous les distribuons aussi vite que possible."
         send_password_instructions: "Envoyez-moi les instructions de réinitialisation de mot de passe"
       send_instructions: "Vous allez recevoir dans quelques minutes un e-mail contenant les instructions pour réinitialiser votre mot de passe."
       updated: "Votre mot de passe a été modifié. Vous êtes à présent connecté(e)."
-    registrations: 
+    registrations:
       destroyed: "Au revoir ! Votre compte a été résilié. Nous espérons vous revoir très bientôt."
       signed_up: "Votre inscription a été effectuée. Si cette dernière est activée, une confirmation a été envoyée sur votre adresse e-mail."
       updated: "Vous avez mis à jour votre compte."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Vous êtes sur le point d'utiliser une application en version alpha."
         bugs_and_feedback: "Ne vous étonnez pas, vous allez rencontrer des bugs. Nous vous encourageons à utiliser le bouton Feedback sur le côté droit de votre navigateur pour signaler tout dysfonctionnement ! Nous travaillerons au plus vite pour régler chaque problème que vous signalerez."
         bugs_and_feedback_mobile: "Ne vous étonnez pas, vous allez rencontrer des bugs. Nous vous encourageons à nous signaler tout dysfonctionnement ! Nous travaillerons au plus vite pour régler chaque problème que vous signalerez."
@@ -99,23 +99,23 @@ fr:
         username: "Nom d'utilisateur"
       signed_in: "Vous êtes à présent connecté(e)."
       signed_out: "Vous êtes à présent déconnecté(e)."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Mot de passe oublié ?"
         receive_confirmation: "Vous n'avez pas reçu les instructions de confirmation ?"
         receive_unlock: "Vous n'avez pas reçu les instructions de déblocage ?"
         sign_in: "Connexion"
         sign_up: "Inscription"
         sign_up_closed: "Les inscriptions sont fermées pour l'instant."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Demander une invitation !"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Renvoyer les instructions de déblocage"
       send_instructions: "Vous allez recevoir dans quelques minutes un e-mail contenant les instructions pour déverrouiller votre compte."
       unlocked: "Votre compte a été déverrouillé. Vous êtes à présent connecté(e)."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "a déjà été confirmé"
       not_found: "introuvable"
       not_locked: "n’a pas été verrouillé"
diff --git a/config/locales/devise/devise.ga.yml b/config/locales/devise/devise.ga.yml
index 80811eb27..4a4dc5000 100644
--- a/config/locales/devise/devise.ga.yml
+++ b/config/locales/devise/devise.ga.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-ga: 
-  devise: 
-    confirmations: 
+ga:
+  devise:
+    confirmations:
       confirmed: "D'éirigh le do cúntas deimhniú. Tá tú sínithe isteach anois."
-      new: 
+      new:
         resend_confirmation: "Seol treoireacha deimhniú arís"
       send_instructions: "Gheobhaidh tú ríomhphost le treoireacha ar conas do cúntas a deimhniú i cúpla nóiméad."
-    failure: 
+    failure:
       inactive: "Ní rabih do cúntas curtha i gníomh fós."
       invalid: "Seoladh ríomhphost nó pasfhocal neamhbhailí"
       invalid_token: "Ceadchomhartha fíordheimhniú neamhbhailí"
@@ -18,17 +18,17 @@ ga:
       timeout: "Tá do seisiún tar éis dul as feidhm, síniú isteach arís chun leanúint ar aghaidh"
       unauthenticated: "Tá ort síniú isteach nó síníus suas roimh a leanann tú ar aghaidh"
       unconfirmed: "Tá ort do cúntas a dheimniú roimh a leanann tú ar aghaidh"
-    invitations: 
+    invitations:
       invitation_token_invalid: "Níl an ceadchomhartha cuireadh bailí!"
       send_instructions: "Bhí do cuireadh sheolta."
       updated: "D'eirigh le do pasfhocal a socrú. Tá tú sínithe isteach anois."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Deimhnigh mo cúntas"
         subject: "Treoiracha deimhniú"
         you_can_confirm: "Tá tú ábalta do cúntas a deimhniú tríd an nasc faoi:"
       hello: "Haileo %{email}!"
-      invitation_instructions: 
+      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"
@@ -57,37 +57,37 @@ ga:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} have invited you to join Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Athraigh mo pasfhocal"
         ignore: "Muna chur tú iarratas ar seo, déan neamhaird den ríomhphost seo más é do thoill é."
         someone_requested: "Tá duine tar éis iarratas a chur ar nasc chun do pasfhocal a athrú, agus is éidir leat é seo a dhéanamh tríd an nasc faoi."
         subject: "Treoireacha athshocrú pasfhocal"
         wont_change: "Ní athreoidh do pasfhocal muna rochtain tú an nasc thar agus cruthaíonn tú ceann nua."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Bhí do cúntas ghlasáilte de réir an méid iarrachtaí síniú isteach."
         click_to_unlock: "Cliceáil an nasc faoi chun do cúntas a díghlasáil."
         subject: "Treoracha Díghlasáil"
         unlock: "Díghlasáil mo cúntas"
       welcome: "Fáilte %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Athraigh mo pasfhocal"
-      new: 
+      new:
         forgot_password: "Dearmaid déanta ar do pasfhocail?"
         no_account: "No account with this email exsists.  If you are waiting for an invite, we are rolling them out as soon as possible"
         send_password_instructions: "Seol treoireacha athshocrú pasfhocal dom."
       send_instructions: "Gheobhaid tú ríomhphost le treoireacha ar conas do pasfhocail a athshocrú i cúpla nóiméad."
       updated: "D'eirigh leat do pasfhocal a athrú. Tá tú sínithe isteach anois."
-    registrations: 
+    registrations:
       destroyed: "Slán! D'eirigh le do cúntas a chealú. Tá súil againn go bhfeicfimid tú arís go luath."
       signed_up: "D'eirigh leat síniú suas. Bhí deimhniú seolta chuig do sheoladh ríomhphost."
       updated: "D'eirigh cúntas nuashonrú"
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Tá tú díreach chun bhogearraí alfa a úsáid."
         bugs_and_feedback: "Cuimhnigh tá tú chun fadbhanna a fheiceáil. Molaimid duit úsáid a bhaint as an cnaipe Aiseolas ar an taobh deis don brabhsálaí, chun tuarisc a chur ar fáil faoi aon fadbhanna! Beidhmid ag obair comh tapa is gur féidir lin aon fadbhanna a réitíu."
         bugs_and_feedback_mobile: "Cuimhnigh, tá tú chun fabhtanna a fheiceáil. Molaimid duit tuaraisc a chur ar fáil faoin aon fadhbhanna! Beidhmid ag obair chomh tapa is gur féidir lin aon fadbhanna a réitiú."
@@ -99,23 +99,23 @@ ga:
         username: "Ainm úsáideora"
       signed_in: "D'éirigh leis an síniú isteach"
       signed_out: "D'éirigh leis an síniú amach"
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Dearmad déanta ar do pasfhocal?"
         receive_confirmation: "Níor bhfuar tú treoireacha deimhniú?"
         receive_unlock: "Níor bhfuar tú treoireach díghlasáil?"
         sign_in: "Síniú isteach"
         sign_up: "Sign up"
         sign_up_closed: "Tá síniú oscailte críochnaithe ag an t-am seo."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Síniú suas do cuireadh!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Sheol treoireacha dhíghlasáil arís"
       send_instructions: "Gheobhaidh tú ríomphoist le treoireacha ar chonas do chúntas a dhíghlasáil i cúpla nóiméad."
       unlocked: "D'eirigh le do cúntas a dhíghlasáil."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "deimnithe cheanna féin"
       not_found: "níl sé ann"
       not_locked: "ní raibh glasáilte"
diff --git a/config/locales/devise/devise.he.yml b/config/locales/devise/devise.he.yml
index 62d8538d5..e46d2e60f 100644
--- a/config/locales/devise/devise.he.yml
+++ b/config/locales/devise/devise.he.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-he: 
-  devise: 
-    confirmations: 
+he:
+  devise:
+    confirmations:
       confirmed: "חשבונך אומת בהצלחה. נכנסת כעת."
-      new: 
+      new:
         resend_confirmation: "שליחת הוראות אימות מחדש"
       send_instructions: "בעוד מספר דקות תתקבל לתיבת הדוא״ל שלך הודעה עם הנחיות כיצד לאמת את חשבונך."
-    failure: 
+    failure:
       inactive: "חשבונך לא הופעל עדיין."
       invalid: "שם המשתמש או הססמה שגויים."
       invalid_token: "אסימון האימות שגוי."
@@ -18,17 +18,17 @@ he:
       timeout: "ההפעלה שלך פגה, נא להיכנס שוב כדי להמשיך."
       unauthenticated: "עליך להיכנס או להירשם לפני המשך הפעילות."
       unconfirmed: "עליך לאמת את חשבונך לפי המשך הפעילות."
-    invitations: 
+    invitations:
       invitation_token_invalid: "אסימון ההזמנה שסופק אינו תקף!"
       send_instructions: "ההזמנה שלך נשלחה."
       updated: "הססמה שלך הוגדרה בהצלחה. נכנסת כעת."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "אימות החשבון שלי"
         subject: "הנחיות לאימות"
         you_can_confirm: "באפשרותך לאמת את החשבון שלך באמצעות הקישור שלהלן:"
       hello: "שלום %{email}!"
-      invitation_instructions: 
+      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"
@@ -57,37 +57,37 @@ he:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "בכתובת %{url}, באפשרותך לקבל זאת באמצעות הקישור שלהלן."
         has_invited_you: "%{name}"
         have_invited_you: "הוזמנת על-ידי %{names} להצטרף לדיאספורה"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "החלפת הססמה שלי"
         ignore: "אם לא ביקשת זאת, ניתן להתעלם מהודעה זו."
         someone_requested: "התקבלה בקשה לקישור לשינוי הססמה שלך, ניתן לעשות זאת דרך הקישור שלהלן."
         subject: "הנחיות לאיפוס הססמה"
         wont_change: "הססמה שלך לא תוחלף עד לכניסה לקישור שלהלן ויצירת אחת חדשה."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "חשבונך ננעל עקב מספר רב של ניסיונות כניסה כושלים."
         click_to_unlock: "יש ללחוץ על הקישור שלהלן כדי לשחרר את חשבונך:"
         subject: "הנחיות לשחרור"
         unlock: "שחרור החשבון שלי"
       welcome: "ברוך בואך %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "החלפת הססמה שלי"
-      new: 
+      new:
         forgot_password: "שכחת את ססמתך?"
         no_account: "לא נמצא חשבון עם כתובת דוא״ל זו.  אם הנך בהמתנה להזמנה, אנו נשתדל להפיץ את ההזמנות במהירות האפשרית"
         send_password_instructions: "שליחת הנחיות איפוס הססמה אלי"
       send_instructions: "בעוד מספר דקות תתקבל לתיבת הדוא״ל שלך הודעה עם הנחיות כיצד לאפס את ססמתך."
       updated: "ססמתך הוחלפה בהצלחה. נכנסת כעת."
-    registrations: 
+    registrations:
       destroyed: "להתראות! חשבונך בוטל בהצלחה. מקווים לראותך שוב בקרוב."
       signed_up: "נרשמת בהצלחה. הודעת אימות תישלח אליך לדוא״ל במידה שהוגדרה."
       updated: "חשבונך עודכן בהצלחה."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "התכנה בה ברצונך לעשות שימוש היא בשלב פיתוח אלפא."
         bugs_and_feedback: "לידיעתך, יתכן שיתרחשו תקלות במהלך ההפעלה. אנו ממליצים לך להשתמש בלחצן המשוב (Feedback) שבצדו הימני של הדפדפן שלך כדי לדווח על טעויות כלשהן! אנו נפעל במהירות האפשרית לתיקון התקלות שידווחו על ידיך."
         bugs_and_feedback_mobile: "לידיעתך, עלולים להופיע באגים.  אנו ממליצים לך לדווח על כל תקלה שהיא!  אנו נעבוד במהירות האפשרית לתיקון הבעיה עליה דיווחת."
@@ -99,23 +99,23 @@ he:
         username: "שם משתמש"
       signed_in: "נכנסת בהצלחה."
       signed_out: "יצאת בהצלחה."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "שכחת את ססמתך?"
         receive_confirmation: "לא קיבלת הוראות אישור?"
         receive_unlock: "לא קיבלת הוראות שחרור?"
         sign_in: "כניסה"
         sign_up: "הרשמה"
         sign_up_closed: "לא ניתן להירשם באופן חופשי נכון לעכשיו."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "ניתן להירשם לקבלת הזמנה!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "שליחת הוראות שחרור מחדש"
       send_instructions: "בעוד מספר דקות תתקבל לתיבת הדוא״ל שלך הודעה עם הנחיות כיצד לשחרר את חשבונך."
       unlocked: "חשבונך שוחרר בהצלחה. נכנסת כעת."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "כבר אושר"
       not_found: "לא נמצא"
       not_locked: "לא ננעל"
diff --git a/config/locales/devise/devise.hu.yml b/config/locales/devise/devise.hu.yml
index 3665f63cc..91c892c91 100644
--- a/config/locales/devise/devise.hu.yml
+++ b/config/locales/devise/devise.hu.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-hu: 
-  devise: 
-    confirmations: 
+hu:
+  devise:
+    confirmations:
       confirmed: "Fiókod megerősítve. Be vagy jelentkezve."
-      new: 
+      new:
         resend_confirmation: "Megerősítési utasítások újraküldése"
       send_instructions: "Pár percen belül kapsz egy e-mailt, benne a megerősítéshez szükséges utasításokkal."
-    failure: 
+    failure:
       inactive: "A fiókod nem aktiváltad még."
       invalid: "Érvénytelen felhasználónév vagy jelszó."
       invalid_token: "Érvénytelen hitelesítési token."
@@ -18,17 +18,17 @@ hu:
       timeout: "A munkamenet lejárt, kérjük jelentkezz be újra."
       unauthenticated: "Be kell jelentkezned, vagy regisztrálj."
       unconfirmed: "Előbb meg kell erősítened fiókodat."
-    invitations: 
+    invitations:
       invitation_token_invalid: "A Token által adott meghívóazonosító nem érvényes!"
       send_instructions: "A meghívód elküldve."
       updated: "A jelszó módosítva. Be vagy jelentkezve."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Fiókom megerősítése"
         subject: "Megerősítési utasítások"
         you_can_confirm: "Megerősítheted a fiókod ezen a linken keresztül:"
       hello: "Szia %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Elfogadom a meghívót"
         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"
@@ -57,37 +57,37 @@ hu:
         team_diaspora: "Diaspora* Csapat"
         unsubscribe: "Leiratkozáshoz kattints %{link}."
         view_in: "Megtekintés"
-      inviter: 
+      inviter:
         accept_at: "Meghívás elfogadása: %{url}"
         has_invited_you: "%{name}"
         have_invited_you: "%{names} meghívott a Diaspora* közösségi oldalra."
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Jelszavam módosítása"
         ignore: "Ha nem kérted ezt, hagyd figyelmen kívül ezt a levelet."
         someone_requested: "Valaki jelszóváltoztatást kért, és ezen a linken keresztül tudod megtenni."
         subject: "Utasítások jelszó alaphelyzetbe állításához"
         wont_change: "A jelszavad addig nem változik meg, amíg a fenti linken keresztül nem hozol létre egy újat."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Fiókod zárolva lett a túl sokszori hibás bejelentkezési kísérlet miatt."
         click_to_unlock: "Kattints az alábbi linkre, hogy felold a fiókod:"
         subject: "Feloldási utasítások"
         unlock: "Fiókom feloldása"
       welcome: "Üdv %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Megváltoztatom a jelszavamat"
-      new: 
+      new:
         forgot_password: "Elfelejtetted a jelszavad?"
         no_account: "Ehhez az emailhez nincs fiók regisztrálva. Ha meghívóra vársz, akkor légy türelmes. Hamarosan osztogatunk."
         send_password_instructions: "Küldd el nekem jelszó alaphelyzetbe állításához szükséges utasítások"
       send_instructions: "Néhány perc múlva kapni fog egy e-mailt arról, hogy miként állítsa alaphelyzetbe a jelszavát."
       updated: "A jelszavad megváltozott. Be vagy jelentkezve vele."
-    registrations: 
+    registrations:
       destroyed: "Viszlát! A fiókod törölve. Reméljük hamarosan újra látunk. =)"
       signed_up: "Sikeresen regisztrált. Ha engedélyezve van, akkor egy megerősítő e-mailt küldünk."
       updated: "Fiókod frissítve."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Alfa állapotú szoftvert fogsz használni."
         bugs_and_feedback: "Légy felkészülve, hogy találsz majd hibákat a rendszerben. Ajánljuk, hogy használd a Visszajelzés gombot a jobb oldalon, hogy jelezd a hibákat felénk. Mi minden tőlünk telhetőt megteszünk, hogy minél gyorsabban kijavítsuk a hibát."
         bugs_and_feedback_mobile: "Légy türelmes, hibákat fogsz találni. Szeretnénk, ha minden hibát jelentenél nekünk. Megpróbáljuk olyan gyorsan megoldani őket, ahogy csak tudjuk."
@@ -99,23 +99,23 @@ hu:
         username: "Felhasználónév"
       signed_in: "Sikeresen bejelentkeztél."
       signed_out: "Sikeresen kijelentkeztél."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Elfelejtetted a jelszavad?"
         receive_confirmation: "Nem kaptál megerősítési utasítást?"
         receive_unlock: "Nem kaptad meg feloldási utasítást?"
         sign_in: "Bejelentkezés"
         sign_up: "Regisztrálj"
         sign_up_closed: "Nincs nyílt regisztráció jelenleg."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Iratkozz fel egy meghívóra!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Feloldási utasítások újraküldése"
       send_instructions: "Pár percen belül kapsz egy e-mailt, benne a feloldáshoz szükséges utasításokkal."
       unlocked: "A fiókod sikeresen feloldva. Be vagy jelentkezve."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "már megerősítette"
       not_found: "nem található"
       not_locked: "nem volt bezárva"
diff --git a/config/locales/devise/devise.id.yml b/config/locales/devise/devise.id.yml
index 6694e87ff..8f32f1437 100644
--- a/config/locales/devise/devise.id.yml
+++ b/config/locales/devise/devise.id.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-id: 
-  devise: 
-    confirmations: 
+id:
+  devise:
+    confirmations:
       confirmed: "Akun Anda telah berhasil disahkan. Anda sekarang telah masuk."
-      new: 
+      new:
         resend_confirmation: "Kirim ulang instruksi untuk pengesahan"
       send_instructions: "Anda akan menerima email berisi instruksi bagaimana mengkonfirmasi akun Anda dalam beberapa menit."
-    failure: 
+    failure:
       inactive: "Akun anda belum diaktifkan."
       invalid: "E-mail atau kata sandi tidak valid."
       invalid_token: "Token otentikasi tidak valid."
@@ -18,17 +18,17 @@ id:
       timeout: "Sesi anda telah berakhir, silahkan masuk lagi untuk melanjutkan."
       unauthenticated: "Anda harus masuk atau mendaftar sebelum melanjutkan."
       unconfirmed: "Anda harus mengkonfirmasi akun Anda sebelum melanjutkan."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Bukti undangan yang diberikan tidak valid!"
       send_instructions: "Undangan anda telah dikirimkan."
       updated: "Kata sandi anda berhasil dibuat. Sekarang anda sudah terdaftar."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Sahkan akun saya"
         subject: "Instruksi pengesahan"
         you_can_confirm: "Anda dapat mengesahkan akun anda melalui tautan di bawah ini:"
       hello: "Halo %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Setuju menerima undangan"
         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"
@@ -57,37 +57,37 @@ id:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "di %{url}, anda dapat menerimanya melalui tautan di bawah ini."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} telah mengundang anda untuk bergabung di Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Ubah kata sandi saya"
         ignore: "Tolong abaikan e-mail ini jika anda tidak memintanya."
         someone_requested: "Seseorang telah meminta tautan untuk mengubah kata sandi anda, anda dapat melakukannya melalui tautan di bawah ini."
         subject: "Instruksi untuk membuat ulang kata sandi"
         wont_change: "Kata sandi anda tidak akan berubah sampai anda mengakses tautan di atas dan membuat yang baru."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Akun anda sekarang terkunci karena berkali-kali gagal saat mencoba masuk."
         click_to_unlock: "Klik tautan di bawah untuk mengaktifkan akun anda:"
         subject: "Instruksi untuk membuka kunci"
         unlock: "Aktifkan akun saya"
       welcome: "Selamat datang %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Ubah kata sandi saya"
-      new: 
+      new:
         forgot_password: "Lupa kata sandi anda?"
         no_account: "Tidak ditemukan akun dengan E-mail. Jika anda menunggu undangan, kami akan menyebarkannya secepatnya"
         send_password_instructions: "Kirimkan saya instruksi untuk membuat ulang kata sandi"
       send_instructions: "Anda akan menerima email berisi petunjuk cara membuat ulang kata sandi Anda dalam beberapa menit."
       updated: "Kata kunci Anda telah berhasil diubah. Anda sekarang sudah masuk."
-    registrations: 
+    registrations:
       destroyed: "Selamat tinggal! Akun Anda telah berhasil dibatalkan. Kami berharap dapat melihat Anda lagi."
       signed_up: "Anda telah berhasil mendaftar. Jika diaktifkan, konfirmasi dikirim ke e-mail Anda."
       updated: "Anda berhasil memperbarui akun anda."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Anda akan menggunakan perangkat lunak alpha."
         bugs_and_feedback: "Dapat dipastikan, anda akan mengalami gangguan. Kami mendorong anda untuk menggunakan tombol Umpan balik yang berada di bagian kanan penjelajah internet anda untuk melaporkan gangguan sekecil apapun! Kami akan bekerja secepat mungkin untuk menyelesaikan masalah apapun yang anda laporkan."
         bugs_and_feedback_mobile: "Dapat dipastikan, Anda akan mengalami gangguan. Kami mendorong Anda untuk melaporkan gangguan kecil apapun! Kami akan bekerja secepat mungkin untuk menyelesaikan masalah apapun yang Anda laporkan."
@@ -99,23 +99,23 @@ id:
         username: "Nama pengguna"
       signed_in: "Berhasil masuk."
       signed_out: "Berhasil keluar."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Lupa kata sandi anda?"
         receive_confirmation: "Tidak menerima instruksi pengesahan?"
         receive_unlock: "Tidak menerima instruksi untuk membuka?"
         sign_in: "Masuk"
         sign_up: "Mendaftar"
         sign_up_closed: "Pendaftaran terbuka sedang ditutup saat ini."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Mendaftar untuk undangan!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Kirim ulang instruksi untuk membuka"
       send_instructions: "Anda akan menerima email berisi instruksi bagaimana membuka akun Anda dalam beberapa menit."
       unlocked: "Akun Anda telah berhasil dibuka. Anda sekarang sudah masuk."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "sudah dikonfirmasi"
       not_found: "tidak ditemukan"
       not_locked: "tidak terkunci"
diff --git a/config/locales/devise/devise.is.yml b/config/locales/devise/devise.is.yml
index b2622fd5d..9df069f9c 100644
--- a/config/locales/devise/devise.is.yml
+++ b/config/locales/devise/devise.is.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-is: 
-  devise: 
-    confirmations: 
+is:
+  devise:
+    confirmations:
       confirmed: "Aðgangur þinn er nú staðfestur. Þú ert nú skráð/ur inn."
-      new: 
+      new:
         resend_confirmation: "Endursenda staðfestingarleiðbeiningar"
       send_instructions: "Þú munt fá tölvupóst innan fárra mínútna, með leiðbeiningum um hvernig þú staðfestir aðgang þinn."
-    failure: 
+    failure:
       inactive: "Aðgangur þinn hefur enn ekki verið gerður virkur."
       invalid: "Ógilt netfang eða lykilorð."
       invalid_token: "Ógildur staðfestingarlykill."
@@ -18,17 +18,17 @@ is:
       timeout: "Tími þinn er útrunninn, vinsamlegast skráðu þig aftur inn til að geta haldið áfram."
       unauthenticated: "Þú þarft að skrá þig inn eða búa þér til aðgang áður en þú getur haldið áfram."
       unconfirmed: "Þú þarft að staðfesta aðgang þinn áður en þú getur haldið áfram."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Boðslykillinn er ekki gildur!"
       send_instructions: "Boð þitt hefur verið sent."
       updated: "Nú er búið að stilla lykilorð þitt og þú hér með skráð/ur inn."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Staðfesta aðgang minn"
         subject: "Staðfestingarleiðbeiningar"
         you_can_confirm: "Þú getur staðfest aðgang þinn með því að elta hlekkinn hér fyrir neðan:"
       hello: "Halló %{email}!"
-      invitation_instructions: 
+      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"
@@ -57,37 +57,37 @@ is:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} have invited you to join Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Breyta lykilorðinu mínu"
         ignore: "Ef þú baðst ekki um þetta, vinsamlegast gefðu þessum tölvupósti þá engan gaum."
         someone_requested: "Einhver hefur beðið um hlekk til að breyta lykilorðinu þínu og þú getur gert það með því að elta hlekkinn hér fyrir neðan."
         subject: "Leiðbeiningar um endurstillingu lykilorðs"
         wont_change: "Lykilorð þitt mun ekki breytast fyrr en þú eltir hlekkinn hér fyrir ofan og býrð til nýtt."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Aðgangi þínum hefur verið læst vegna þess að of oft hefur verið að reynt að opna hann án árangurs."
         click_to_unlock: "Eltu hlekkinn hér fyrir neðan til að taka aðgang þinn úr lás."
         subject: "Aflæsingarleiðbeiningar"
         unlock: "Taka aðgang minn úr lás"
       welcome: "Velkomin/n %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Breyta lykilorði mínu"
-      new: 
+      new:
         forgot_password: "Gleymdirðu lykilorðinu þínu?"
         no_account: "Enginn notandi með þetta netfang ert til. Ef þú ert að bíða eftir boði, þá erum við að senda þau út eins fljótt og auðið er"
         send_password_instructions: "Senda mér leiðbeiningar um hvernig ég get endurstillt lykilorðið mitt"
       send_instructions: "Þú munt fá tölvupóst innan fárra mínútna, með leiðbeiningum um hvernig þú getur endurstillt lykilorð þitt."
       updated: "Lykilorði þínu hefur hér með verið breytt. Þú ert nú skráð/ur inn."
-    registrations: 
+    registrations:
       destroyed: "Bæ! Aðgangur þinn hefur hér með verið afturkallaður. Við vonumst til þess að sjá þig brátt aftur."
       signed_up: "Þú hefur hér með stofnað aðgang. Staðfesting var send á tölvupóstfang þitt, ef kveikt er á þeim möguleika."
       updated: "Þú hefur nú uppfært aðgang þinn."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Þú ert í þann veginn að nota alpha-hugbúnað (það þýðir að hann hefur ekki verið fullreyndur)."
         bugs_and_feedback: "Hafðu fyrirvara um að þú munt rekast á galla í forritinu. Við hvetjum þig til að nota Feedback-hnappinn þér á hægri hönd til þess að tilkynna hvers kyns hiksta! Við munum vinna eins hratt og við getum að því að leysa þau mál sem þú tilkynnir."
         bugs_and_feedback_mobile: "Hafðu fyrirvara um að þú munt rekast á galla í forritinu. Við hvetjum þig til að tilkynna hvers kyns hiksta! Við munum vinna eins hratt og við getum að því að leysa þau mál sem þú tilkynnir."
@@ -99,23 +99,23 @@ is:
         username: "Notandanafn"
       signed_in: "Þú ert nú skráð/ur inn."
       signed_out: "Þú hefur verið skráð/ur út."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Gleymdirðu lykilorðinu þínu?"
         receive_confirmation: "Fékkstu ekki staðfestingarleiðbeiningarnar?"
         receive_unlock: "Fékkstu ekki leiðbeiningarnar um hvernig þú getur tekið úr lás?"
         sign_in: "Innskrá"
         sign_up: "Stofna aðgang"
         sign_up_closed: "Ekki er hægt að stofna aðgang án boðslykils eins og er."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Fá boðslykil!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Endursenda leiðbeiningar um hvernig ég get tekið úr lás"
       send_instructions: "Þú færð tölvupóst innan fárra mínútna, með leiðbeiningum um hvernig þú getur tekið aðgang þinn úr lás."
       unlocked: "Aðgangur þinn hefur hér með verið opnaður. Þú ert nú skráð/ur inn."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "var nú þegar staðfestur"
       not_found: "fannst ekki"
       not_locked: "var ekki læstur"
diff --git a/config/locales/devise/devise.it.yml b/config/locales/devise/devise.it.yml
index d6fc2562f..305977fce 100644
--- a/config/locales/devise/devise.it.yml
+++ b/config/locales/devise/devise.it.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-it: 
-  devise: 
-    confirmations: 
+it:
+  devise:
+    confirmations:
       confirmed: "Il tuo account è stato confermato con successo. Hai appena effettuato l'accesso."
-      new: 
+      new:
         resend_confirmation: "Invia di nuovo le informazioni per la confema"
       send_instructions: "Tra pochi minuti riceverai una email per confermare il tuo account."
-    failure: 
+    failure:
       inactive: "Il tuo account non è ancora stato attivato."
       invalid: "Nome utente o password errati."
       invalid_token: "Token di autenticazione errato."
@@ -18,17 +18,17 @@ it:
       timeout: "La tua sessione è scaduta, effettua di nuovo l'accesso per continuare."
       unauthenticated: "Devi effettuare l'accesso o registrarti prima di continuare."
       unconfirmed: "Devi confermare il tuo account prima di continuare."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Il codice d'invito che hai fornito non è valido!"
       send_instructions: "Il tuo invito è stato inoltrato."
       updated: "La tua password è stata impostata correttamente. Hai effettuato l'accesso."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Conferma il mio account"
         subject: "Istruzioni di conferma"
         you_can_confirm: "Puoi confermare il tuo account attraverso il link sottostante:"
       hello: "Ciao %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Accetta l'invito"
         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"
@@ -57,37 +57,37 @@ it:
         team_diaspora: "Il team di Diaspora"
         unsubscribe: "Per rimuoverti clicca %{link}."
         view_in: "Vedi"
-      inviter: 
+      inviter:
         accept_at: "su %{url}, puoi accettare dal link qua sotto."
         has_invited_you: "%{name} ti ha invitato ad entrare in Diaspora"
         have_invited_you: "%{names} ti hanno invitato ad entrare in Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Cambia la mia password"
         ignore: "Se non hai effettuato la richiesta, per favore ignora questa email."
         someone_requested: "qualcuno ha richiesto un link per cambiare la tua password, puoi farlo cliccando sul link sottostante."
         subject: "Istruzioni per reimpostare la password"
         wont_change: "La tua password non verrà cambiata finché non visiti il link sopra e ne crei una nuova."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Il tuo account è stato bloccato per i troppi tentativi di accesso falliti."
         click_to_unlock: "Clicca il link sottostante per sbloccare il tuo account:"
         subject: "Istruzioni di sblocco"
         unlock: "sblocca il mio account"
       welcome: "Benvenuto %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Cambia la mia password"
-      new: 
+      new:
         forgot_password: "Hai dimenticato la password?"
         no_account: "Non esiste un account per questo indirizzo email. Se sei in attesa di un invito, sappi che li stiamo spedendo il più velocemente possibile."
         send_password_instructions: "Inviami le istruzioni per reimpostare la password."
       send_instructions: "Tra pochi minuti riceverai una email con le istruzioni su come cambiare la tua password."
       updated: "La tua password è stata modificata. Hai appena effettuato l'accesso."
-    registrations: 
+    registrations:
       destroyed: "Ciao! Il tuo account è stato rimosso. Speriamo tornerai a trovarci presto."
       signed_up: "Iscrizione eseguita. Se il servizio è disponibile, riceverai una conferma via email."
       updated: "Hai aggiornato il tuo account."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Stai per usare software in alpha."
         bugs_and_feedback: "Stai attento, troverai dei bug. Incoraggiamo gli utenti a usare il pulsante di Feedback sulla destra del browser per segnalare qualunque errore! Lavoreremo più veloce possibile per risolvere i problemi che segnali."
         bugs_and_feedback_mobile: "Stai attento, troverai dei bug. Incoraggiamo gli utenti a usare il pulsante Feedback sulla destra del browser per segnalare qualunque errore! Lavoreremo il più velocemente possibile per risolvere i problemi che ci segnali."
@@ -99,23 +99,23 @@ it:
         username: "Nome utente"
       signed_in: "Accesso effettuato con successo."
       signed_out: "Disconnessione effettuata con successo."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Hai dimenticato la password?"
         receive_confirmation: "Non hai ricevuto le istruzioni per la conferma?"
         receive_unlock: "Non hai ricevuto le istruzioni per lo sblocco?"
         sign_in: "Accedi"
         sign_up: "Registrati"
         sign_up_closed: "Le iscrizioni pubbliche sono chiuse al momento."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Registrati per ricevere un invito!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Invia di nuovo le istruzioni per lo sblocco"
       send_instructions: "Tra pochi minuti riceverai una mail con le istruzioni su come sbloccare il tuo account."
       unlocked: "Il tuo account è stato sbloccato. Hai appena effettuato l'accesso."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "è già stato confermato"
       not_found: "non trovato"
       not_locked: "non era bloccato"
diff --git a/config/locales/devise/devise.ja.yml b/config/locales/devise/devise.ja.yml
index 25bd35cb5..1c47b5422 100644
--- a/config/locales/devise/devise.ja.yml
+++ b/config/locales/devise/devise.ja.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-ja: 
-  devise: 
-    confirmations: 
+ja:
+  devise:
+    confirmations:
       confirmed: アカウントの認証に成功しました。既にログイン済みです。
-      new: 
+      new:
         resend_confirmation: "認証メールを再送する"
       send_instructions: 数分後にアカウント認証の手続きメールが届きます。
-    failure: 
+    failure:
       inactive: アカウントはまだ承認されていません。
       invalid: ユーザ名またはパスワードが不正です。
       invalid_token: 無効な認証トークンです。
@@ -18,17 +18,17 @@ ja:
       timeout: セッション切れになりました。続くにはもう一度ログインしてください。
       unauthenticated: 進むにはログインまたは新規登録する必要があります。
       unconfirmed: 進にはアカウントを確認する必要があります。
-    invitations: 
+    invitations:
       invitation_token_invalid: ご使用の招待トークンは無効です！
       send_instructions: 招待メールを送信しました。
       updated: パスワードの設定に成功しました。既にログイン済みです。
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "アカウントを認証する"
         subject: "認証手続き"
         you_can_confirm: 次のリンクからアカウントが認証できます。
       hello: "%{email}さん、こんにちは！"
-      invitation_instructions: 
+      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"
@@ -57,37 +57,37 @@ ja:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} have invited you to join Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "パスワードを変更する"
         ignore: 再設定を申請した覚えがない場合はこのメールを無視してください。
         someone_requested: パスワード変更リンクの申請を預かりました。下のリンクから変更可能です。
         subject: "パスワード再設定手続き"
         wont_change: 上のリンクをアクセスして新しいパスワードを登録するまではパスワードが変更されません。
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: ログイン失敗が多すぎたため、アカウントがロックされました。
         click_to_unlock: アカウントのロックを解除するのに下記のリンクにクリックしてください。
         subject: "ロック解除説明"
         unlock: "アカウントのロックを解除する"
       welcome: "%{email}さん、ようこそ！"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "パスワードを変更する"
-      new: 
+      new:
         forgot_password: パスワードを忘れましたか。
         no_account: このメールアドレスに一致するアカウントは存在しません。招待待ちの方は、なるべく早く出せるように努力していますので、もう少々お待ちください。
         send_password_instructions: パスワード再発行の手続きメールを送ってください。
       send_instructions: 数分後にパスワード再発行の手続きメールが届きます。
       updated: パスワードの変更に成功しました。既にログイン済みです。
-    registrations: 
+    registrations:
       destroyed: さようなら！アカウントの取消しに成功しました。またのご参加をお待ちしています。
       signed_up: 新規登録に成功しました。設定が有効な場合、確認メールも送信されました。
       updated: アカウントの更新に成功しました。
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: これから使うソフトはアルファ版です。
         bugs_and_feedback: バク発生に覚悟してください。小さな支障でもページ右側の「フィードバック」ボタンからご報告願います！頂いた問題報告はなるべく早く解決できるよう努力します。
         bugs_and_feedback_mobile: バク発生に覚悟してください。小さな支障でもご報告願います！頂いた問題報告はなるべく早く解決できるよう努力します。
@@ -99,23 +99,23 @@ ja:
         username: "ユーザ名"
       signed_in: ログインに成功しました。
       signed_out: ログアウトに成功しました。
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: パスワードを忘れましたか。
         receive_confirmation: 認証手続きメールが届きませんでしたか。
         receive_unlock: ロック解除の説明が届きませんでしたか。
         sign_in: "ログイン"
         sign_up: "新規登録"
         sign_up_closed: 一般の新規登録は現在受け付けていません。
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: 参加招待の希望者として登録したい！
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "ロック解除手続きメールを再送する"
       send_instructions: 数分後にアカウントロック解除の手続きメールが届きます。
       unlocked: アカウントのロック解除に成功しました。既にログイン済みです。
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: 既に認証済みです。
       not_found: 見つかりませんでした。
       not_locked: ロックされませんでした。
diff --git a/config/locales/devise/devise.ko.yml b/config/locales/devise/devise.ko.yml
index 67fdc1b4d..3a0c7c8cf 100644
--- a/config/locales/devise/devise.ko.yml
+++ b/config/locales/devise/devise.ko.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-ko: 
-  devise: 
-    confirmations: 
+ko:
+  devise:
+    confirmations:
       confirmed: "계정을 성공적으로 확인한 뒤 로그인했습니다."
-      new: 
+      new:
         resend_confirmation: "확인 메일 다시 보내기"
       send_instructions: "몇 분 안으로 계정을 확인하기 위한 메일이 도착합니다."
-    failure: 
+    failure:
       inactive: "아직 계정이 활성화되지 않았습니다."
       invalid: "유효하지 않은 사용자명과 암호"
       invalid_token: "유효하지 않은 인증 토큰"
@@ -18,17 +18,17 @@ ko:
       timeout: "세션이 만료되었습니다. 다시 로그인하세요."
       unauthenticated: "더 나아가려면 로그인하거나 가입해야 합니다."
       unconfirmed: "더 나아가기 전에 계정을 확인해야 합니다."
-    invitations: 
+    invitations:
       invitation_token_invalid: "초대장 토큰이 유효하지 않습니다!"
       send_instructions: "초대장을 보냈습니다"
       updated: "암호를 성공적으로 바꾼 뒤 로그인했습니다."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "계정 확인하기"
         subject: "확인 안내"
         you_can_confirm: "아래 링크로 계정을 확인할 수 있습니다:"
       hello: "%{email} 님 환영합니다!"
-      invitation_instructions: 
+      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"
@@ -57,37 +57,37 @@ ko:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "%{URL}에서, 아래의 링크를 통해 확인할 수 있습니다."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} 님이 당신을 디아스포라로 초대했습니다"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "암호 바꾸기"
         ignore: "암호 초기화를 요청하지 않았다면 이 메일을 무시하세요."
         someone_requested: "아래 링크로 암호를 다시 정할 수 었습니다:"
         subject: "암호 초기화 안내"
         wont_change: "암호는 링크를 클릭해서 새 암호를 만들기 전까지 바뀌지 않습니다."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "귀하의 계정은 로그인을 여러번 실패해 잠겼습니다."
         click_to_unlock: "아래 링크로 계정을 풀을 수 있습니다."
         subject: "계정 풀기 안내"
         unlock: "계정 풀기"
       welcome: "%{email} 님 환영합니다!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "암호 바꾸기"
-      new: 
+      new:
         forgot_password: "암호를 잊었습니까?"
         no_account: "등록되지 않은 이메일 주소입니다."
         send_password_instructions: "암호 초기화 메일 보내기"
       send_instructions: "몇 분 안으로 암호를 초기화하기 위한 메일이 도착합니다."
       updated: "암호를 성공적으로 바꾼 뒤 로그인했습니다."
-    registrations: 
+    registrations:
       destroyed: "계정을 성공적으로 없앴습니다. 다시 만나길."
       signed_up: "성공적으로 가입했습니다. 활성화되었다면 확인 메일이 보내집니다."
       updated: "계정을 성공적으로 갱신했습니다."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "이 소프트웨어는 알파 실험 단계입니다."
         bugs_and_feedback: "여러 버그를 경험하실 수 있습니다. 오른쪽의 피드백 단추로 문제점을 보고해주세요! 보고하신 문제점을 빠르게 해결하기 위해 최선을 다하겠습니다."
         bugs_and_feedback_mobile: "여러 버그를 경험하실 수 있습니다. 문제점을 보고해주세요! 보고하신 문제점을 빠르게 해결하기 위해 최선을 다하겠습니다."
@@ -99,23 +99,23 @@ ko:
         username: "사용자명"
       signed_in: "성공적으로 로그인했습니다."
       signed_out: "성공적으로 로그아웃했습니다."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "암호를 잊었습니까?"
         receive_confirmation: "확인 안내를 받지 못했습니까?"
         receive_unlock: "풀기 안내를 받지 못했습니까?"
         sign_in: "로그인"
         sign_up: "가입하기"
         sign_up_closed: "공개 가입이 닫혀있습니다."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "초대받고 싶으면 이메일 주소를 등록해두세요!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "풀기 메일 다시 보내기"
       send_instructions: "몇 분 안으로 계정을 풀기 위한 메일이 도착합니다."
       unlocked: "계정을 성공적으로 풀은 뒤 로그인했습니다."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: ": 이미 확인되었습니다"
       not_found: ": 찾을 수 없습니다"
       not_locked: ": 잠겨있지 않습니다"
diff --git a/config/locales/devise/devise.lt.yml b/config/locales/devise/devise.lt.yml
index 69577b039..3364d8d72 100644
--- a/config/locales/devise/devise.lt.yml
+++ b/config/locales/devise/devise.lt.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-lt: 
-  devise: 
-    confirmations: 
+lt:
+  devise:
+    confirmations:
       confirmed: "Paskyra patvirtinta. Prisijungta."
-      new: 
+      new:
         resend_confirmation: "Siųsti patvirtinimo nurodymus iš naujo"
       send_instructions: "Netrukus bus išsiųstas el. laiškas su nurodymais, kaip patvirtinti paskyrą."
-    failure: 
+    failure:
       inactive: "Paskyra dar neaktyvuota."
       invalid: "Neteisingas el. pašto adresas arba slaptažodis."
       invalid_token: "Neteisingas prisijungimo raktas."
@@ -18,17 +18,17 @@ lt:
       timeout: "Sesija baigėsi. Norint tęsti, reikia prisijungti iš naujo."
       unauthenticated: "Norint tęsti, reikia prisijungti arba susikurti paskyrą."
       unconfirmed: "Norint prisijungti, reikia patvirtinti savo paskyrą."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Neteisingas pakvietimo raktas!"
       send_instructions: "Pakvietimas išsiųstas."
       updated: "Slaptažodis pakeistas sėkmingai. Prisijungta."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Patvirtinti paskyrą"
         subject: "Patvirtinimo nurodymai"
         you_can_confirm: "Paskyrą galima patvirtinti žemiau pateikta nuoroda:"
       hello: "Labas, %{email}!"
-      invitation_instructions: 
+      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"
@@ -57,37 +57,37 @@ lt:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} have invited you to join Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Keisti slaptažodį"
         ignore: "Jei tu to neprašei, nekreipk dėmesio į šį laišką."
         someone_requested: "Kažkas paprašė pakeisti tavo slaptažodį. Tai galima padaryti naudojatis žemiau pateikta nuoroda."
         subject: "Nurodymai, kaip atstatyti slaptažodį"
         wont_change: "Slaptažodis liks nepakeistas, kol nebus pasinaudota aukščiau esančia nuoroda ir sukurtas naujas slaptažodis."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Paskyra užrakinta dėl per daug bandymų prisijungti."
         click_to_unlock: "Spustelk šią nuorodą ir paskyra bus atrakinta:"
         subject: "Nurodymai, kaip atrakinti"
         unlock: "Atrakinti mano paskyrą"
       welcome: "Labas, %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Keisti mano slaptažodį"
-      new: 
+      new:
         forgot_password: "Pamiršai slaptažodį?"
         no_account: "No account with this email exsists.  If you are waiting for an invite, we are rolling them out as soon as possible"
         send_password_instructions: "Siųsti nurodymus, kaip atstatyti slaptažodį"
       send_instructions: "Netrukus gausite el. laišką su nurodymais, kaip atstatyti slaptažodį."
       updated: "Slaptažodis pakeistas sėkmingai. Prisijungta."
-    registrations: 
+    registrations:
       destroyed: "Paskyra sėkmingai atšaukta. Iki pasimatymo!"
       signed_up: "Prisijungta sėkmingai. Jei nustatyta, patvirtinimas nusiųstas į el. paštą."
       updated: "Paskyra atnaujinta sėkmingai."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Ši programinė įranga nėra pilnai užbaigta."
         bugs_and_feedback: "Naudojantis gali pasitaikyti klaidų. Apie pasitaikiusius nesklandumus galima praneštis naudojantis mygtuku naršyklės dešinėje. Klaidas stengsimės ištaisyti kuo skubiau."
         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."
@@ -99,23 +99,23 @@ lt:
         username: "Vartotojo vardas"
       signed_in: "Sėkmingai prisijungta."
       signed_out: "Sėkmingai atsijungta."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Pamiršai slaptažodį?"
         receive_confirmation: "Negavai nurodymų, kaip patvirtinti paskyrą?"
         receive_unlock: "Negavai nurodymų, kaip atrakinti paskyrą?"
         sign_in: "Prisijungti"
         sign_up: "Registruotis"
         sign_up_closed: "Atviri prisijungimai šiuo metu uždaryti."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Sign up for an invite!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Siųsti nurodymus, kaip atrakinti, iš naujo"
       send_instructions: "Netrukus bus išsiųstas el. laiškas su nurodymais, kaip atrakinti paskyrą."
       unlocked: "Paskyra atrakinta. Prisijungta."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "jau patvirtinta"
       not_found: "nerasta"
       not_locked: "nebuvo užrakinta"
diff --git a/config/locales/devise/devise.mk.yml b/config/locales/devise/devise.mk.yml
index c2d3c3e5b..32adc01ed 100644
--- a/config/locales/devise/devise.mk.yml
+++ b/config/locales/devise/devise.mk.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-mk: 
-  devise: 
-    confirmations: 
+mk:
+  devise:
+    confirmations:
       confirmed: "Вашата корисничка сметка беше успешно потврдена. Сега сте најавени."
-      new: 
+      new:
         resend_confirmation: "Повторно прати ги инструкциите за потврда"
       send_instructions: "Ќе добиете е-маил со инструкции за начинот на кој треба да ја потврдите вашата корисничка сметка во наредните неколку минути."
-    failure: 
+    failure:
       inactive: "Вашата сметка сеуште не е активирана."
       invalid: "Погрешен е-маил или лозинка."
       invalid_token: "Погрешен токен за автентификација."
@@ -18,17 +18,17 @@ mk:
       timeout: "Вашата сесија истече, ве молиме најавете се повторно."
       unauthenticated: "Треба да се најавите или регистрирате за да продолжите понатаму."
       unconfirmed: "Треба да ја потврдите вашата сметка за да продолжите."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Токенот за покана не е валиден!"
       send_instructions: "Вашата покана беше испратена."
       updated: "Вашата лозинка беше успешно внесена. Сега сте најавени."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Потврди ја мојата корисничка сметка"
         subject: "Инструкции за потврдување"
         you_can_confirm: "Можете да ја потврдите вашата корисничка сметка на долниот линк:"
       hello: "Здраво %{email}!"
-      invitation_instructions: 
+      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"
@@ -57,37 +57,37 @@ mk:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} have invited you to join Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Промени лозинка"
         ignore: "Ако не го побаравте ова, ве молиме игнорирајте го овој е-маил."
         someone_requested: "Некој побара линк за промена на вашата лозинка, промената може да ја извршите на линкот подолу."
         subject: "Инструкции за ресетирање на лозинката"
         wont_change: "Вашата лозинка нема да биде променета доколку не пристапите на горниот линк и креирате нова лозинка."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Вашата корисничка сметка беше заклучена поради големиот број на неуспешни обиди за најава."
         click_to_unlock: "Кликнете го долниот линк за отклучување на вашата сметка:"
         subject: "Инструкции за отклучување"
         unlock: "Отклучи ја мојата сметка"
       welcome: "Добредојде %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Промена на лозинка"
-      new: 
+      new:
         forgot_password: "Ја заборавивте лозинката?"
         no_account: "No account with this email exsists.  If you are waiting for an invite, we are rolling them out as soon as possible"
         send_password_instructions: "Испрати ми ги инструкциите за ресетирање на лозинката"
       send_instructions: "За неколку минути ќе добиете е-маил со инструкции за начинот на кој може да ја ресетирате вашата лозинка."
       updated: "Вашата лозинка беше успешно променета. Сега сте најавени."
-    registrations: 
+    registrations:
       destroyed: "Довидување! Вашата корисничка сметка беше успешно откажана. Се надеваме дека ќе се видиме повторно."
       signed_up: "Се регистриравте успешно. Ако е овозможено, потврдата ќе ви стигне на е-маил."
       updated: "Ажурирањето на вашата корисничка сметка е успешно."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "На пат сте на користење на експериментален софтвер."
         bugs_and_feedback: "Внимание, ќе искусите софтверски грешки. За пријавување на такви грешки, можете да го користите Feedback копчето на десната страна од вашиот прелистувач! Ние ќе се потрудиме што побргу да го решиме пријавениот проблем."
         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."
@@ -99,23 +99,23 @@ mk:
         username: "Корисничко име"
       signed_in: "Најавувањето е успешно."
       signed_out: "Одјавувањето е успешно."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Ја заборавивте лозинката?"
         receive_confirmation: "Не примивте инструкции за потврда?"
         receive_unlock: "Не примивте инструкции за отклучување?"
         sign_in: "Најави се"
         sign_up: "Регистрирај се"
         sign_up_closed: "Отворените регистрации привремено се затворени."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Sign up for an invite!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Повторно испрати инструкции за отклучување"
       send_instructions: "Ќе добиете е-маил со инструкции за начинот на кој треба да ја отклучите вашата корисничка сметка во наредните неколку минути."
       unlocked: "Вашата корисничка сметка беше отклучена успешно. Сега сте најавени."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "веќе е потврдена"
       not_found: "не е пронајдено"
       not_locked: "не беше заклучена"
diff --git a/config/locales/devise/devise.nb.yml b/config/locales/devise/devise.nb.yml
index 536d58114..d86df7576 100644
--- a/config/locales/devise/devise.nb.yml
+++ b/config/locales/devise/devise.nb.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-nb: 
-  devise: 
-    confirmations: 
+nb:
+  devise:
+    confirmations:
       confirmed: "Brukeren din er nå bekrefta, og du er logga inn."
-      new: 
+      new:
         resend_confirmation: "Send bekreftelses-instruksjoner på nytt"
       send_instructions: "Du vil få en e-post med instrukser om hvordan du bekrefter brukeren din om kort tid."
-    failure: 
+    failure:
       inactive: "Brukeren din er ikke aktivert ennå."
       invalid: "Ugyldig e-postadresse eller passord."
       invalid_token: "Ugyldig aktiveringskode."
@@ -18,76 +18,76 @@ nb:
       timeout: "Økta har løpt ut, logg inn igjen for å fortsette."
       unauthenticated: "Du må logge inn eller lage en bruker før du kan fortsette."
       unconfirmed: "Du må bekrefte brukeren din før du kan fortsette."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Den oppgitte aktiveringskoden er ugyldig!"
       send_instructions: "Invitasjonen er sendt."
       updated: "Passordet ble satt vellykket. Du er nå logget inn"
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Bekreft kontoen min"
         subject: "Bekreftelsesinstrukser"
         you_can_confirm: "Du kan bekrefte kontoen via linken nedenfor:"
       hello: "Hei %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Takk ja til invitasjonen"
-        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
-        be_yourself: "Be Yourself"
-        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        arrived: "Det sosiale nettverket som du har ventet på har kommet. Med nytt utseende, bedre sikkerhet, og mer moro - %{strong_diaspora} er klar for å hjelpe deg dele og utforske nettet på en hel ny måte."
+        be_yourself: "Vær deg selv"
+        be_yourself_paragraph: "Nettet har gitt oss enestående nye måter for å uttrykke oss selv på. %{strong_diaspora} lar deg være deg selv og dele akkurat som du vil det, med eller uten ditt ekte navn."
         cubbies: Cubbi.es
-        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        displaying_correctly: "E-post vises ikke riktig? %{link} i din 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..."
+        email_us: "For generelle spørsmål eller hjelp med din Diaspora-konto, send oss en e-post på %{email}."
+        finally: "Endelig - det er her"
+        friends_saying: "Det vennene dine sier..."
         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"
+        get_connected_paragraph: "Som en internasjonal bevegelse som deler en visjon om et bedre internett, %{strong_diaspora}'s #1 egenskap er felleskapet. Møt nye mennesker, finn vennene dine, og bli med på moroa. "
+        have_fun: "Ha det gøy"
+        have_fun_paragraph: "%{strong_diaspora} handler om å finne utrolig nytt innhold og nye mennesker online. %{link}, den første %{strong_diaspora} applikasjonen i verden, er bare begynnelsen. Finn og del alt som gjør nettet til et fantastisk sted."
+        help_fund: "hjelp med å finansiere Diaspora"
+        here: "her"
         ignore: "Hvis du ikke ønsker å godta invitasjonen, kan du se bort fra denne e-posten."
-        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: "Bli med på laget"
+        love: "Hilsen,"
+        made_by_people: "%{strong_diaspora} er lagd av folk som er like glade i Internet som du er. %{jointeam}, eller %{helpfund}!"
+        more_people: "Enda flere mennesker er glade for å se deg!"
         no_account_till: "Brukeren din vil ikke opprettes før du besøker lenken over og registrerer deg."
-        or: "or"
-        sign_up_now: "Sign up now →"
+        or: "eller"
+        sign_up_now: "Registrer deg nå →"
         subject: "Du har blitt invitert til Diaspora!"
         team_diaspora: "Team Diaspora"
-        unsubscribe: "To unsubscribe please click %{link}."
-        view_in: "View in"
-      inviter: 
+        unsubscribe: "For å avregistrere deg klikk på %{link}."
+        view_in: "Se i"
+      inviter:
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} har invitert deg til Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Endre passordet mitt"
         ignore: "Hvis du ikke har bedt om det, kan du overse denne e-posten."
         someone_requested: "Noen har bedt om en lenke for å endre passordet ditt, og du kan gjøre dette via linken nedenfor."
         subject: "Instruksjoner for å tilbakestille passord"
         wont_change: "Ditt passord vil ikke endres før du klikker på linken over og lager et nytt."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Kontoen din er låst på grunn av for mange mislykkede påloggingsforsøk"
         click_to_unlock: "Klikk på linken nedenfor for å låse opp kontoen:"
         subject: "Instrukser for å låse opp"
         unlock: "Lås opp kontoen min"
       welcome: "Velkommen %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Endre passordet mitt"
-      new: 
+      new:
         forgot_password: "Glemt passordet?"
         no_account: "Det finnes ingen bruker med denne e-postadressen. Hvis du venter på en invitasjon, sender vi dem ut så snart vi kan."
         send_password_instructions: "Send meg instruksjoner for å tilbakestille passordet"
       send_instructions: "Du vil få en e-post med instrukser om hvordan du tilbakestiller passordet ditt om kort tid."
       updated: "Passordet ditt er nå endra, og du har logga inn."
-    registrations: 
+    registrations:
       destroyed: "Ha det! Brukeren din er nå sagt opp. Vi håper å se deg igjen snart."
       signed_up: "Du har nå laga en bruker. Hvis du valgte å få en e-post med bekreftelse på dette, er den nå sendt."
       updated: "Du har oppdatert brukeren din."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Du er i ferd med å bruke alpha-programvare."
         bugs_and_feedback: "Vær advart, du vil oppleve feil. Vi oppfordrer deg til å bruke feedback knappen på høyre side av nettleseren til å melde feil! Vi vil arbeide så fort vi kan for å løse eventuelle problemer du rapporterer."
         bugs_and_feedback_mobile: "Vær advart, du vil oppleve bugs. Vi oppfordrer deg til å rapportere feil! Vi vil arbeide så fort vi kan for å løse eventuelle problemer du rapporterer."
@@ -99,23 +99,23 @@ nb:
         username: "Brukernavn"
       signed_in: "Innlogginga var vellykka."
       signed_out: "Utlogginga var vellykka."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Glemt passordet?"
         receive_confirmation: "Fikk du ingen bekreftelsesinstrukser?"
         receive_unlock: "Fikk du ingen instrukser for å låse opp?"
         sign_in: "Logg inn"
         sign_up: "Registrer deg"
         sign_up_closed: "Åpen påmelding er stengt."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Registrer deg for en invitasjon!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Send instruksene for å låse opp på nytt"
       send_instructions: "Du vil få en e-post med instrukser om hvordan du låser opp brukeren din om kort tid."
       unlocked: "Brukeren din er nå låst opp, og du er logga in."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "er allerede bekrefta"
       not_found: "ble ikke funnet"
       not_locked: "er ikke låst"
diff --git a/config/locales/devise/devise.nl.yml b/config/locales/devise/devise.nl.yml
index 8e45a38bf..4cac1f53f 100644
--- a/config/locales/devise/devise.nl.yml
+++ b/config/locales/devise/devise.nl.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-nl: 
-  devise: 
-    confirmations: 
+nl:
+  devise:
+    confirmations:
       confirmed: "Je account is geactiveerd. Je bent nu ingelogd."
-      new: 
+      new:
         resend_confirmation: "Stuur bevestigingsinstructies nogmaals"
       send_instructions: "Je ontvangt een e-mail met instructies om je account te activeren."
-    failure: 
+    failure:
       inactive: "Je account is nog niet geactiveerd."
       invalid: "De gebruikersnaam of het wachtwoord is ongeldig"
       invalid_token: "Ongeldige authenticatietoken."
@@ -18,17 +18,17 @@ nl:
       timeout: "Je sessie is verlopen, log opnieuw in om verder te gaan."
       unauthenticated: "Log in of registreer om verder te gaan."
       unconfirmed: "Activeer je account om verder te gaan."
-    invitations: 
+    invitations:
       invitation_token_invalid: "De opgegeven uitnodigingstoken is ongeldig!"
       send_instructions: "Je uitnodiging is verzonden."
       updated: "Wachtwoord succesvol veranderd. Je bent nu ingelogd."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Bevestig mijn account"
         subject: "Bevestigingsinstructies"
         you_can_confirm: "Je kunt je account bevestigen via onderstaande link:"
       hello: "Hallo %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Accepteer uitnodiging"
         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: "Wees jezelf"
@@ -57,37 +57,37 @@ nl:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "op %{url}, je kunt deze accepteren via onderstaande link."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} hebben je uitgenodigd om lid te worden van Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Wijzig mijn wachtwoord"
         ignore: "Als je hier niet om hebt gevraagd kun je deze mail gewoon negeren."
         someone_requested: "Iemand heeft een aanvraag gedaan om je wachtwoord te wijzigen. Je kunt dit doen via onderstaande link."
         subject: "Wachtwoord reset instructies"
         wont_change: "Je wachtwoord zal niet worden gewijzigd totdat je via bovenstaande link een nieuwe hebt gekozen."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Je account is vergrendeld vanwege te veel mislukte aanmeldpogingen."
         click_to_unlock: "Klik op onderstaande link om je account te ontgrendelen:"
         subject: "Ontgrendelingsinstructies"
         unlock: "Ontgrendel mijn account"
       welcome: "Welkom %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Wijzig mijn wachtwoord"
-      new: 
+      new:
         forgot_password: "Wachtwoord vergeten?"
         no_account: "Er bestaat geen account met dit e-mailadres.  Mocht je op een uitnodiging wachten; deze komen zo snel mogelijk beschikbaar."
         send_password_instructions: "Stuur mij instructies om mijn wachtwoord te resetten"
       send_instructions: "Je ontvangt een e-mail met instructies om je wachtwoord opnieuw in te stellen."
       updated: "Je wachtwoord is veranderd. Je bent nu ingelogd."
-    registrations: 
+    registrations:
       destroyed: "Tot ziens! Je account is succesvol verwijderd. We hopen je snel terug te zien."
       signed_up: "Je bent succesvol geregistreerd. Indien geactiveerd, ontvang je een bevestigingsmail."
       updated: "Je account is succesvol geüpdate."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Je staat op het punt om alpha software te gebruiken."
         bugs_and_feedback: "In dit stadium zul je waarschijnlijk nog bugs tegenkomen. We raden je aan de Feedback-button aan de rechterzijde van je browser te gebruiken om deze bugs te melden (in het Engels)!  Vervolgens zullen wij zo hard mogelijk werken om deze op te lossen."
         bugs_and_feedback_mobile: "Wees ervan bewust dat je zeker weten bugs zult tegenkomen.  We raden je aan deze vooral te rapporteren!  We doen ons uiterste best om deze problemen zo snel mogelijk op te lossen."
@@ -99,23 +99,23 @@ nl:
         username: "Gebruikersnaam"
       signed_in: "Je bent succesvol ingelogd."
       signed_out: "Je bent succesvol uitgelogd."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Wachtwoord vergeten?"
         receive_confirmation: "Geen bevestigingsinstructies ontvangen?"
         receive_unlock: "Geen ontgrendelinstructies ontvangen?"
         sign_in: "Inloggen"
         sign_up: "Registreer"
         sign_up_closed: "Vrij registreren is momenteel niet mogelijk."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Meld je aan voor een uitnodiging!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Stuur ontgrendelinstructies nogmaals"
       send_instructions: "Je ontvangt een e-mail met instructies om je account te deblokkeren."
       unlocked: "Je account is succesvol gedeblokkeerd. Je bent nu ingelogd."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "is al geactiveerd"
       not_found: "niet gevonden"
       not_locked: "is niet geblokkeerd"
diff --git a/config/locales/devise/devise.nn.yml b/config/locales/devise/devise.nn.yml
index 090bbdbb2..b53df9ffb 100644
--- a/config/locales/devise/devise.nn.yml
+++ b/config/locales/devise/devise.nn.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-nn: 
-  devise: 
-    confirmations: 
+nn:
+  devise:
+    confirmations:
       confirmed: "Kontoen din er stadfesta. Du kan no logga deg på."
-      new: 
+      new:
         resend_confirmation: "Send stadfestingsrettleiinga på nytt"
       send_instructions: "Om ei lita stund vil du få ei e-postmelding med rettleiing om korleis du stadfestar kontoen din."
-    failure: 
+    failure:
       inactive: "Kontoen din var ikkje teken i bruk."
       invalid: "Brukarnamnet eller passordet er ugyldig."
       invalid_token: "Ugyldig autentisering."
@@ -18,17 +18,17 @@ nn:
       timeout: "Økta finst ikkje lenger. Logg deg på att."
       unauthenticated: "Du må logga deg på eller melda deg inn før du kan halda fram."
       unconfirmed: "Du må stadfesta kontoen din før du kan halda fram."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Invitasjonsførespurnaden er ikkje gyldig."
       send_instructions: "Invitasjonen din er vorten send."
       updated: "Passordet ditt vart lagra. Du kan no logga deg på."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Stadfest kontoen min"
         subject: "Stadfestingsrettleiing"
         you_can_confirm: "Du kan stadfesta kontoen din ved å nytta lenkja nedanfor:"
       hello: "Hei %{email}."
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Godta invitasjonen"
         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"
@@ -57,37 +57,37 @@ nn:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "på %{url}, du kan godta det gjennom lenkja nedanfor."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} har invitert deg til å verta med i Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Endra passordet mitt"
         ignore: "Om du ikkje bad om dette, kan du berre sjå vekk frå meldinga."
         someone_requested: "Nokon har spurt etter ei lenkje for å nullstilla passordet ditt. Du kan gjera dette ved hjelp av lenkja nedanfor."
         subject: "Nullstill passordrettleiinga"
         wont_change: "Passordet vil ikkje verta endra før du nyttar lenkja ovanfor og lagar eit nytt eit."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Kontoen din er låst grunna for mange mislykka påloggingsforsøk."
         click_to_unlock: "Klikk på lenkja nedanfor for å låsa opp kontoen din:"
         subject: "Opplåsingsrettleiing"
         unlock: "Lås opp kontoen min"
       welcome: "Velkomen %{email}."
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Endra passordet mitt"
-      new: 
+      new:
         forgot_password: "Har du gløymt passordet ditt?"
         no_account: "Det finst ingen konto med denne e-postadressa. Om du ventar på ein invitasjon, skal du veta at vi sender dei ut så fort vi kan."
         send_password_instructions: "Send meg opplysningar om korleis nullstilla passordet"
       send_instructions: "Om ei lita stund vil du få ei e-postmelding med opplysningar om korleis du kan nullstilla passordet ditt."
       updated: "Passordet ditt vart endra. Du er no pålogga."
-    registrations: 
+    registrations:
       destroyed: "Ha det! Kontoen din vart sletta. Vi vonar vi ser deg att snart."
       signed_up: "Du er no påmeld. Om du slo på valet, vil det koma ei stadfesting til e-postkontoen din."
       updated: "Kontoen din vart oppdatert."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Du er på veg til å ta i bruk alfa-program."
         bugs_and_feedback: "Ver merksam på at du vil oppleva feil. Vi ber deg om å rapportera dei til oss ved å nytta tilbakemeldingsknappen på nettlesaren si høgre side. Så skal vi prøva å ordna dei så fort råd er."
         bugs_and_feedback_mobile: "Ver merksam på at du vil oppleva feil. Vi ber deg om å rapportera dei til oss. Så skal vi prøva å ordna dei så fort råd er."
@@ -99,23 +99,23 @@ nn:
         username: "Brukarnamn"
       signed_in: "Er pålogga."
       signed_out: "Er utlogga."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Har du gløymt passordet ditt?"
         receive_confirmation: "Har du ikkje fått stadfestingsrettleiinga?"
         receive_unlock: "Fekk du ikkje nullstillingsrettleiinga?"
         sign_in: "Logg på"
         sign_up: "Påmelding"
         sign_up_closed: "Du kan ikkje melda deg på no."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Meld deg på for å få ein invitasjon."
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Send opplåsingrettleiinga på nytt"
       send_instructions: "Om ei lita stund vil du få ei e-postmelding med rettleiing om korleis låsa opp att kontoen din."
       unlocked: "Kontoen din vart låst opp. Du kan no logga deg på."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "var allereie stadfesta"
       not_found: "ikkje funnen"
       not_locked: "vart ikkje låst"
diff --git a/config/locales/devise/devise.pa.yml b/config/locales/devise/devise.pa.yml
index 17c8e1ea2..05b2cc555 100644
--- a/config/locales/devise/devise.pa.yml
+++ b/config/locales/devise/devise.pa.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-pa: 
-  devise: 
-    confirmations: 
+pa:
+  devise:
+    confirmations:
       confirmed: "Your account was successfully confirmed. You are now signed in."
-      new: 
+      new:
         resend_confirmation: "Resend confirmation instructions"
       send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
-    failure: 
+    failure:
       inactive: "ਤੁਹਾਡਾ ਅਕਾਊਂਟ ਹਾਲੇ ਐਕਟੀਵੇਟ ਨਹੀਂ ਹੋਇਆ ਹੈ।"
       invalid: "ਗਲਤ ਈਮੇਲ ਜਾਂ ਪਾਸਵਰਡ ਹੈ।"
       invalid_token: "Invalid authentication token."
@@ -18,17 +18,17 @@ pa:
       timeout: "ਤੁਹਾਡੇ ਸ਼ੈਸ਼ਨ ਦੀ ਮਿਆਦ ਪੁੱਗ ਗਈ ਹੈ, ਜਾਰੀ ਰੱਖਣ ਲਈ ਫੇਰ ਲਾਗਇਨ ਕਰੋ ਜੀ।"
       unauthenticated: "ਤੁਹਾਨੂੰ ਜਾਰੀ ਰੱਖਣ ਤੋਂ ਪਹਿਲਾਂ ਲਾਗਇਨ ਕਰਨਾ ਪਵੇਗਾ ਜਾਂ ਸਾਇਨ ਅੱਪ"
       unconfirmed: "ਜਾਰੀ ਰੱਖਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਨੂੰ ਆਪਣੇ ਅਕਾਊਂਟ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨੀ ਪੈਣੀ ਹੈ।"
-    invitations: 
+    invitations:
       invitation_token_invalid: "The invitation token provided is not valid!"
       send_instructions: "Your invitation has been sent."
       updated: "Your password was set successfully. You are now signed in."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "ਮੇਰੇ ਅਕਾਊਂਟ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"
         subject: "ਪੁਸ਼ਟੀ ਹਦਾਇਤਾਂ"
         you_can_confirm: "You can confirm your account through the link below:"
       hello: "Hello %{email}!"
-      invitation_instructions: 
+      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"
@@ -57,37 +57,37 @@ pa:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} have invited you to join Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Change my password"
         ignore: "If you didn't request this, please ignore this email."
         someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
         subject: "Reset password instructions"
         wont_change: "Your password won't change until you access the link above and create a new one."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
         click_to_unlock: "ਆਪਣਾ ਅਕਾਊਂਟ ਅਣ-ਲਾਕ ਕਰਨ ਲਈ ਹੇਠਲੇ ਲਿੰਕ ਉੱਤੇ ਕਲਿੱਕ ਕਰੋ:"
         subject: "ਅਣ-ਲਾਕ ਹਦਾਇਤਾਂ"
         unlock: "ਮੇਰਾ ਅਕਾਊਂਟ ਅਣ-ਲਾਕ ਕਰੋ"
       welcome: "%{email} ਜੀ ਆਇਆਂ ਨੂੰ!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "ਮੇਰਾ ਪਾਸਵਰਡ ਬਦਲੋ"
-      new: 
+      new:
         forgot_password: "ਆਪਣਾ ਪਾਸਵਰਡ ਭੁੱਲ ਗਏ ਹੋ?"
         no_account: "No account with this email exsists.  If you are waiting for an invite, we are rolling them out as soon as possible"
         send_password_instructions: "Send me reset password instructions"
       send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
       updated: "ਤੁਹਾਡਾ ਪਾਸਵਰਡ ਠੀਕ ਤਹ੍ਹਾਂ ਬਦਲਿਆ ਗਿਆ ਹੈ। ਹੁਣ ਤੁਸੀਂ ਸਾਈਨ ਇਨ ਕਰ ਸਕਦੇ ਹੋ।"
-    registrations: 
+    registrations:
       destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
       signed_up: "You have signed up successfully. If enabled, a confirmation was sent to your e-mail."
       updated: "You updated your account successfully."
-    sessions: 
-      new: 
+    sessions:
+      new:
         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."
@@ -99,23 +99,23 @@ pa:
         username: "Username"
       signed_in: "Signed in successfully."
       signed_out: "Signed out successfully."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "ਆਪਣਾ ਪਾਸਵਰਡ ਭੁੱਲ ਗਏ?"
         receive_confirmation: "Didn't receive confirmation instructions?"
         receive_unlock: "Didn't receive unlock instructions?"
         sign_in: "ਸਾਇਨ ਇਨ"
         sign_up: "ਸਾਇਨ ਅੱਪ"
         sign_up_closed: "Open signups are closed at this time."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Sign up for an invite!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Resend unlock instructions"
       send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
       unlocked: "Your account was successfully unlocked. You are now signed in."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "ਪਹਿਲਾਂ ਹੀ ਪੁਸ਼ਟੀ ਹੋ ਚੁੱਕੀ ਸੀ"
       not_found: "ਨਹੀਂ ਲੱਭਿਆ"
       not_locked: "ਲਾਕ ਨਹੀਂ ਹੈ"
diff --git a/config/locales/devise/devise.pl.yml b/config/locales/devise/devise.pl.yml
index 3a86b4841..2e30a7ed3 100644
--- a/config/locales/devise/devise.pl.yml
+++ b/config/locales/devise/devise.pl.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-pl: 
-  devise: 
-    confirmations: 
+pl:
+  devise:
+    confirmations:
       confirmed: "Konto zostało aktywowane. Zalogowano Cię w Diasporze."
-      new: 
+      new:
         resend_confirmation: "Wyślij ponownie instrukcję aktywacji"
       send_instructions: "W ciągu kilku minut otrzymasz wiadomość zawierającą instrukcję aktywacji konta."
-    failure: 
+    failure:
       inactive: "Twoje konto nie zostało jeszcze aktywowane."
       invalid: "Nieprawidłowa nazwa użytkownika lub hasło."
       invalid_token: "Nieprawidłowy token uwierzytelnienia."
@@ -18,17 +18,17 @@ pl:
       timeout: "Sesja wygasła, aby kontynuować zaloguj się ponownie."
       unauthenticated: "Przed kontynuacją musisz się zalogować lub zarejestrować."
       unconfirmed: "Musisz aktywować swoje konto."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Token zaproszenia jest nieprawidłowy!"
       send_instructions: "Zaproszenie zostało wysłane."
       updated: "Hasło zostało pomyślnie zmienione. Zalogowano."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Aktywuj konto"
         subject: "Instrukcja aktywacji"
         you_can_confirm: "Możesz aktywować swoje konto klikając poniższe łącze:"
       hello: "Cześć %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Przyjmij zaproszenie"
         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ą"
@@ -57,37 +57,37 @@ pl:
         team_diaspora: "Zespół Diaspory"
         unsubscribe: "Aby zrezygnować z subskrypcji kliknij %{link}."
         view_in: "Wyświetl w"
-      inviter: 
+      inviter:
         accept_at: "na %{url}, możesz je zaakceptować używając poniższego łącza."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} zaprosili Cię do Diaspory"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Zmiana hasła"
         ignore: "Jeśli nie chcesz zmienić hasła, zignoruj tę wiadomość."
         someone_requested: "Odebraliśmy zgłoszenie zmiany hasła, jeśli chcesz to zrobić kliknij poniższy odnośnik:"
         subject: "Instrukcja resetowania hasła"
         wont_change: "Hasło nie zostanie zmienione do momentu kliknięcia powyższego łącza i utworzenia nowego."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Konto zostało zablokowane, ponieważ przekroczono limit nieudanych prób logowania."
         click_to_unlock: "Kliknij poniższy link, aby odblokować konto:"
         subject: "Instrukcja odblokowania"
         unlock: "Odblokuj moje konto"
       welcome: "Witaj %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Zmień hasło"
-      new: 
+      new:
         forgot_password: "Nie pamiętasz hasła?"
         no_account: "Konto z przypisanym podanym adresem e-mail nie istnieje. Jeżeli czekasz na nowe zaproszenia, wysyłamy je tak szybko, jak to tylko możliwe."
         send_password_instructions: "Wyślij mi instrukcje resetowania hasła"
       send_instructions: "W ciągu kilku minut otrzymasz e-maila zawierającego instrukcjie dotyczące zresetowania hasła."
       updated: "Hasło zostało zmienione. Zalogowano pomyślnie."
-    registrations: 
+    registrations:
       destroyed: "Do widzenia! Konto zostało pomyślnie zamknięte. Mamy nadzieję, że wkrótce zobaczymy Cię ponownie!"
       signed_up: "Rejestracja przebiegła pomyślnie. Jeśli aktywowano odpowiednią opcję, wyślemy do Ciebie e-mail potwierdzający ten fakt."
       updated: "Pomyślnie zaktualizowano konto."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Masz zamiar korzystać z oprogramowania w wersji alfa."
         bugs_and_feedback: "Miej świadomość, że napotkasz na błędy. Zachęcamy do korzystania z łącza \"Feedback\" umieszczonego po prawej stronie okna przeglądarki, aby zgłaszać wszelkie problemy. Pracujemy najszybciej jak się da, aby rozwiązać wszystkie zgłaszane problemy."
         bugs_and_feedback_mobile: "Informujemy o możliwości występowania błędów.  Zachęcamy do informowania o nich! Postaramy się jak najszybciej je zlikwidować. "
@@ -99,23 +99,23 @@ pl:
         username: "Nazwa użytkownika"
       signed_in: "Zalogowano pomyślnie."
       signed_out: "Pomyślnie wylogowano."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Nie pamiętasz hasła?"
         receive_confirmation: "Nie otrzymano instrukcji aktywacji?"
         receive_unlock: "Nie otrzymano instrukcji odblokowywania?"
         sign_in: "Zaloguj się"
         sign_up: "Zarejestruj się"
         sign_up_closed: "Otwarta rejestracja jest w tym momencie wyłączona."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Zgłoś się po zaproszenie!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Wyślij ponownie instrukcje odblokowywania"
       send_instructions: "W ciągu kilku minut otrzymasz wiadomość z instrukcją odblokowania konta."
       unlocked: "Konto zostało pomyślnie odblokowane. Pomyślnie zalogowano."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "już potwierdzone"
       not_found: "nie znaleziono"
       not_locked: "nie był(a) zablokowany/a"
diff --git a/config/locales/devise/devise.pt-BR.yml b/config/locales/devise/devise.pt-BR.yml
index 690aeac3c..bcaca30f7 100644
--- a/config/locales/devise/devise.pt-BR.yml
+++ b/config/locales/devise/devise.pt-BR.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-pt-BR: 
-  devise: 
-    confirmations: 
+pt-BR:
+  devise:
+    confirmations:
       confirmed: "Sua conta foi confirmada com sucesso. Seja bem-vindo(a)!"
-      new: 
+      new:
         resend_confirmation: "Reenviar as instruções de confirmação."
       send_instructions: "Em poucos minutos, você receberá um email com as instruções sobre como confirmar a sua conta."
-    failure: 
+    failure:
       inactive: "Sua conta ainda não foi ativada."
       invalid: "Nome de usuário ou senha inválidos."
       invalid_token: "Token de autenticação inválido."
@@ -18,76 +18,76 @@ pt-BR:
       timeout: "Sua sessão expirou; por favor, entre novamente para continuar."
       unauthenticated: "Você precisa entrar ou se cadastrar antes de continuar."
       unconfirmed: "Você deve confirmar a sua conta antes de continuar."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Seu convite é inválido!"
       send_instructions: "Seu convite foi enviado."
       updated: "Sua senha foi definida com sucesso. Seja bem-vindo(a)!"
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Confirmar minha conta"
         subject: "Instruções para confirmação"
         you_can_confirm: "Você pode confirmar a sua conta através do link abaixo:"
       hello: "Oi %{email}!"
-      invitation_instructions: 
+      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."
+        arrived: "Finalmente a rede social que você estava esperando chegou. Renovada, mais segura e mais divertida, %{strong_diaspora} está pronta para ajudar você a compartilhar e a explorar a Web de uma forma totalmente nova."
         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."
+        be_yourself_paragraph: "A Internet criou novas formas originais para que possamos nos expressar. %{strong_diaspora} permite que você seja você mesmo(a) e que compartilhe como quiser, com ou sem o seu nome verdadeiro."
         cubbies: Cubbi.es
-        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        displaying_correctly: "E-mail não está sendo exibido corretamente? %{link} no seu navegador"
         email_address: questions@joindiaspora.com
-        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        email_us: "Para maiores informações ou suporte sobre a sua conta, por favor envie um e-mail para %{email}."
         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"
+        get_connected: "Ser Conectado"
+        get_connected_paragraph: "Um movimento internacional com uma visão compartilhada para uma Web melhor, %{strong_diaspora}'s #1 características é a sua comunidade. Conhecer novas pessoas, se conectar com os amigos e se divertir."
+        have_fun: Divirta-se
+        have_fun_paragraph: "%{strong_diaspora} é tudo sobre as novas descobertas dos conteúdos incríveis e pessoas online. %{link}, o primeiro mundo %{strong_diaspora} aplicação é apenas o começo. Coletar e compartilhar a Web em toda a sua glória."
+        help_fund: "ajudar a financiar Diaspora"
         here: "aqui"
         ignore: "Se você não quer aceitar o convite, por favor ignore este e-mail."
-        join_team: "Join our Team"
-        love: "Love,"
+        join_team: "Junte-se a Equipe"
+        love: "Amor,"
         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!"
+        more_people: "Mais pessoas estão animadas para ver você!"
         no_account_till: "Sua conta não pode ser criada até que você acesse o link acima e se cadastre."
-        or: "or"
-        sign_up_now: "Sign up now →"
+        or: "ou"
+        sign_up_now: "Registre-se já →"
         subject: "Você foi convidado(a) para participar em Diaspora!"
-        team_diaspora: "Team Diaspora"
-        unsubscribe: "To unsubscribe please click %{link}."
-        view_in: "View in"
-      inviter: 
+        team_diaspora: "Equipe Diaspora"
+        unsubscribe: "Para se desinscrever clique %{link}."
+        view_in: "Ver em "
+      inviter:
         accept_at: "em %{url}, você pode aceitar através do link abaixo."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} convidou você para participar em Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Alterar minha senha"
         ignore: "Se você não fez esta solicitação, por favor ignore este email."
         someone_requested: "Recebemos um pedido para alterar a sua senha, e você pode fazer isso através do link abaixo."
         subject: "Instruções para redefinir senha"
         wont_change: "Sua senha permanecerá a mesma até que você acesse o link acima e a altere."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Sua conta foi bloqueada devido a uma quantidade excessiva de tentativas de entrar."
         click_to_unlock: "Clique no link abaixo para desbloquear a sua conta:"
         subject: "Instruções para Desbloquear"
         unlock: "Desbloquear minha conta"
       welcome: "Bem-vindo(a) %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Mudar minha senha"
-      new: 
+      new:
         forgot_password: "Esqueceu sua senha?"
         no_account: "Não há nenhuma conta com este email. Se você aguarda por um convite, seja paciente: estamos trabalhando para enviá-lo o quanto antes."
         send_password_instructions: "Me envie instruções para redefinir minha senha."
       send_instructions: "Você receberá em breve um email com instruções sobre como redefinir sua senha."
       updated: "Sua senha foi alterada com sucesso."
-    registrations: 
+    registrations:
       destroyed: "Sua conta foi cancelada com sucesso. Esperamos vê-lo novamente em breve."
       signed_up: "Você se inscreveu com êxito. Se habilitado, a confirmação foi enviada para seu e-mail."
       updated: "Você atualizou a sua conta com sucesso."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Você está prestes a usar um software alpha."
         bugs_and_feedback: "Atenção, ainda há muitos defeitos para corrigir. Se algo de errado acontecer com você, pedimos que nos informe através do botão de Feedback à direita de seu navegador. Trabalharemos o mais rápido que pudermos para resolver qualquer problema que você reportar."
         bugs_and_feedback_mobile: "Atenção, ainda há muito problemas para corrigir. Se algo de errado acontecer com você, pedimos que nos informe. Trabalharemos o mais rápido que pudermos para resolver qualquer problema que você reportar."
@@ -99,23 +99,23 @@ pt-BR:
         username: "Nome de usuário"
       signed_in: "Você entrou com sucesso."
       signed_out: "Você saiu com sucesso."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Esqueceu sua senha?"
         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_closed: "Registros abertos estão encerrados no momento."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Registre-se para receber um convite!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Reenviar instruções de desbloqueio"
       send_instructions: "Você receberá em breve um email com as instruções sobre como desbloquear a sua conta."
       unlocked: "Sua conta foi desbloqueada com sucesso. Seja bem-vindo!"
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "já foi confirmado"
       not_found: "não encontrado"
       not_locked: "não foi bloqueado"
diff --git a/config/locales/devise/devise.pt-PT.yml b/config/locales/devise/devise.pt-PT.yml
index 0f7e46b0a..4a4dad424 100644
--- a/config/locales/devise/devise.pt-PT.yml
+++ b/config/locales/devise/devise.pt-PT.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-pt-PT: 
-  devise: 
-    confirmations: 
+pt-PT:
+  devise:
+    confirmations:
       confirmed: "A sua conta foi confirmada com sucesso. A sessão foi iniciada."
-      new: 
+      new:
         resend_confirmation: "Reenviar instruções de confirmação"
       send_instructions: "Receberá um email com instruções sobre como confirmar a sua conta dentro de alguns minutos."
-    failure: 
+    failure:
       inactive: "A sua conta ainda não foi activada."
       invalid: "Endereço de email ou senha inválidos."
       invalid_token: "Código de de autentificação inválido."
@@ -18,17 +18,17 @@ pt-PT:
       timeout: "A sua sessão expirou, por favor inicie sessão novamente para continuar."
       unauthenticated: "É necessário iniciar sessão ou registar-se antes de continuar."
       unconfirmed: "Precisa de confirmar a sua conta antes de continuar."
-    invitations: 
+    invitations:
       invitation_token_invalid: "O código de convite que introduziu não é válido!"
       send_instructions: "O seu convite foi enviado."
       updated: "A sua palavra-passe foi definida com sucesso. A sessão foi iniciada."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Confirmar a minha conta"
         subject: "Instruções de confirmação"
         you_can_confirm: "Pode confirmar a sua conta através da seguinte hiperligação:"
       hello: "Olá, %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Aceitar o convite"
         arrived: "A rede social de que estava à espera chegou. Renovada, mais segura e mais divertida, %{strong_diaspora} está pronta para o(a) ajudar a partilhar e explorar a Web de forma totalmente nova."
         be_yourself: "Seja você mesmo"
@@ -57,37 +57,37 @@ pt-PT:
         team_diaspora: "Equipa Diaspora"
         unsubscribe: "Para cancelar a subscrição clique %{link}."
         view_in: "Ver em"
-      inviter: 
+      inviter:
         accept_at: "em %{url}, pode aceitá-lo através da ligação abaixo."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} convidaram-no para se juntar ao Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Alterar a minha palavra-passe"
         ignore: "Se não fez este pedido, por favor ignore este email."
         someone_requested: "Alguém pediu para alterar a sua palavra-passe, isso pode ser feito através da hiperligação abaixo."
         subject: "Instruções de reposição da palavra-passe"
         wont_change: "A sua palavra-passe não será alterada até que aceda à hiperligação acima e crie uma nova palavra-passe. "
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "A sua conta foi bloqueada devido a um número excessivo de tentativas de inicio de sessão falhadas."
         click_to_unlock: "Clique na hiperligação abaixo para desbloquear a sua conta:"
         subject: "Instruções de Desbloqueio"
         unlock: "Desbloquear a minha conta"
       welcome: "Bem-vindo(a), %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Alterar a minha palavra-passe"
-      new: 
+      new:
         forgot_password: "Esqueceu-se da sua palavra-passe?"
         no_account: "Não existe nenhuma conta com este endereço de email.  Se está a esperar por um convite, estamos a distribuí-los tão rapidamente quanto é possível"
         send_password_instructions: "Enviem-me as instruções para modificar a minha palavra-passe"
       send_instructions: "Vai receber um email com instruções sobre como alterar a sua palavra-passe dentro de alguns minutos."
       updated: "A sua palavra-passe foi alterada com sucesso. A sessão foi iniciada."
-    registrations: 
+    registrations:
       destroyed: "Adeus! A sua conta foi cancelada com sucesso. Esperamos vê-lo de novo brevemente."
       signed_up: "Foi registado com sucesso. Caso tenha seleccionado essa opção, uma confirmação foi enviada para o seu endereço de email."
       updated: "Actualizou a sua conta com sucesso."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Está prestes a utilizar software em fase \"alfa\"."
         bugs_and_feedback: "Tenha em conta que irão ocorrer erros. Encorajamo-lo a usar o botão de Feedback na margem direita do seu navegador para relatar quaisquer anomalias! Trabalharemos o mais rapidamente possível para resolver os problemas que relatar."
         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."
@@ -99,23 +99,23 @@ pt-PT:
         username: "Nome de Utilizador"
       signed_in: "A sessão foi iniciada com sucesso."
       signed_out: "A sessão foi terminada com sucesso."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Esqueceu-se da sua palavra-passe?"
         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_closed: "Os registos abertos não estão disponíveis por agora."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Inscreva-se para receber um convite!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Reenviar instruções de desbloqueio"
       send_instructions: "Receberá um email sobre como desbloquear a sua conta dentro de alguns minutos."
       unlocked: "A sua conta foi desbloqueada com sucesso. A sessão foi iniciada."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "já foi confirmado"
       not_found: "não foi encontrado"
       not_locked: "não foi bloqueado"
diff --git a/config/locales/devise/devise.ro.yml b/config/locales/devise/devise.ro.yml
index bb3d68004..10a6db89d 100644
--- a/config/locales/devise/devise.ro.yml
+++ b/config/locales/devise/devise.ro.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-ro: 
-  devise: 
-    confirmations: 
+ro:
+  devise:
+    confirmations:
       confirmed: "Contul dvs. a fost confirmat cu succes. Sunteți acum autentificat(ă)."
-      new: 
+      new:
         resend_confirmation: "Retrimite instrucţiunile de confirmare"
       send_instructions: "În scurt timp veți primi un email cu instrucțiuni pentru confirmarea contului."
-    failure: 
+    failure:
       inactive: "Contul dvs. încă nu a fost activat."
       invalid: "Email sau parolă incorectă."
       invalid_token: "Cheie de autentificare invalidă."
@@ -18,17 +18,17 @@ ro:
       timeout: "Sesiunea dvs. a expirat, autentificați-vă din nou pentru a continua."
       unauthenticated: "Pentru a continuna, înregistrați-vă."
       unconfirmed: "Pentru a continua, confirmați contul dvs."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Invitaţia furnizată nu este valabilă!"
       send_instructions: "Invitaţia dvs. a fost trimisă."
       updated: "Parola dvs. a fost stabilită cu succes. Sunteţi acum logat"
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Confirmă contul meu"
         subject: "Instrucţiuni de confirmare"
         you_can_confirm: "Puteţi confirma contul dvs. prin intermediul link-ul de mai jos:"
       hello: "Bună %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Acceptă invitaţia"
         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"
@@ -57,37 +57,37 @@ ro:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} have invited you to join Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Schimbă-mi parola"
         ignore: "Dacă nu aţi facut aceasta petiţie, vă rugăm să ignoraţi acest e-mail."
         someone_requested: "Cineva a solicitat un link pentru a schimba parola, puteţi face acest lucru prin intermediul link-ul de mai jos."
         subject: "Instrucţiuni pentru a reseta parola"
         wont_change: "Parola dvs. nu se va schimba până când nu veţi accesa linkul de mai sus şi veţi crea una nouă."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Contul dvs. a fost blocat din cauza unei cantitaţi excesive de încercări nereuşite de autentificare."
         click_to_unlock: "Clic pe link-ul de mai jos pentru a debloca contul dvs."
         subject: "Instrucţiuni pentru a debloca"
         unlock: "Deblochează-mi contul"
       welcome: "Bine ai revenit %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Schimbă-mi parola"
-      new: 
+      new:
         forgot_password: "Aţi uitat parola?"
         no_account: "Nici un cont cu acest e-mail există. Dacă sunteţi în aşteptare pentru o invitaţie, le vom trimite cât mai curând posibil.\n"
         send_password_instructions: "Trimite-mi instrucţiunile pentru a reseta parola"
       send_instructions: "În scurt timp veți primi un email cu instrucțiuni pentru resetarea parolei."
       updated: "Parolă schimbată cu success. Sunteți acum autentificat(ă)."
-    registrations: 
+    registrations:
       destroyed: "La revedere! Contul dvs. a fost dezactivat cu succes. Sperăm să vă revedem în curând."
       signed_up: "Sunteți autentificat(ă). Dacă este cazul, un mesaj de confirmare a fost trimis pe email-ul dvs."
       updated: "Cont actualizat cu succes."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Sunteţi pe cale de a utiliza software alfa."
         bugs_and_feedback: "Aveţi grijă, puteţi experimenta probleme. Vă încurajăm să utilizaţi butonul Feedback de pe partea dreaptă a browser-ului pentru a raporta orice problemă! Vom lucra cât mai repede posibil pentru a rezolva orice dificultăţi veţi întâmpina."
         bugs_and_feedback_mobile: "Aveţi grijă, veţi experimenta probleme. Vă încurajăm să raportaţi orice problemă! Vom lucra cât mai repede posibil pentru a rezolva orice dificultăţi veţi întâmpina."
@@ -99,23 +99,23 @@ ro:
         username: "Nume de utilizator"
       signed_in: "Autentificare cu succes."
       signed_out: "Deconectare cu succes."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Aţi uitat parola?"
         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_closed: "Înscrierile sunt închise în acest moment."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Înscrie-te pentru o invitaţie!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Retrimite-mi instrucţiunile de deblocare"
       send_instructions: "În scurt timp veți primi un email cu instrucțiuni pentru deblocarea contului."
       unlocked: "Cont deblocat cu succes. Sunteți acum autentificat(ă)."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "a fost deja confirmat"
       not_found: "Inexistent"
       not_locked: "nu a fost blocat"
diff --git a/config/locales/devise/devise.ru.yml b/config/locales/devise/devise.ru.yml
index 6f45e0a1a..664e60d01 100644
--- a/config/locales/devise/devise.ru.yml
+++ b/config/locales/devise/devise.ru.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-ru: 
-  devise: 
-    confirmations: 
+ru:
+  devise:
+    confirmations:
       confirmed: "Ваш аккаунт подтверждён. Добро пожаловать."
-      new: 
+      new:
         resend_confirmation: "Выслать повторно инструкции по подтверждению"
       send_instructions: "Вы получите письмо с указаниями по подтверждению учётной записи в течение нескольких минут."
-    failure: 
+    failure:
       inactive: "Ваш аккаунт ещё не активирован."
       invalid: "Неверный email или пароль."
       invalid_token: "Неверная проверка подлинности."
@@ -18,17 +18,17 @@ ru:
       timeout: "Срок вашего сеанса истёк, пожалуйста войдите в систему вновь."
       unauthenticated: "Вы должны войти или зарегистрироваться, прежде чем продолжить."
       unconfirmed: "Вам необходимо подтвердить ваш аккаунт, прежде чем продолжить."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Введённый вами код приглашения не действителен!"
       send_instructions: "Ваше приглашение отправлено."
       updated: "Пароль установлен. Добро пожаловать."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Подтвердить мой аккаунт"
         subject: "Инструкции по подтверждению"
         you_can_confirm: "Вы можете подтвердить ваш аккаунт перейдя по ссылке:"
       hello: "Привет %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Принять приглашение"
         arrived: "Социальная сеть, которую вы так долго ждали, наконец, появилась. Обновленная, более защищенная и более дружелюбная, %{strong_diaspora} готова помочь вам делиться и исследовать Сеть по-новому."
         be_yourself: "Будьте собой"
@@ -57,37 +57,37 @@ ru:
         team_diaspora: "Команда Диаспоры"
         unsubscribe: "Чтобы отписаться, нажмите %{link}."
         view_in: "Открыть в"
-      inviter: 
+      inviter:
         accept_at: "в %{url}, вы можете принять его по ссылке ниже."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} пригласил[а,и] вас присоединиться к диаспоре"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Изменить пароль"
         ignore: "Если вы не совершали запрос, проигнорируйте это письмо."
         someone_requested: "Кто то создал запрос смены вашего пароля, и вы можете сделать это перейдя по ссылке ниже."
         subject: "Инструкции по сбросу пароля"
         wont_change: "Ваш пароль не изменится, пока вы не перейдёте по ссылке и не создадите новый."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Ваш аккаунт из-за чрезмерного количества неудачных попыток входа заблокирован."
         click_to_unlock: "Используйте ссылку, чтобы разблокировать аккаунт:"
         subject: "Инструкции по разблокированию"
         unlock: "Разблокировать мой аккаунт"
       welcome: "Добро пожаловать %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Изменить пароль"
-      new: 
+      new:
         forgot_password: "Забыли пароль?"
         no_account: "Нет ни одного контакта с этим email. Если вы ожидаете приглашения, мы отправим их как можно скорее"
         send_password_instructions: "Отправить мне инструкции по сбросу пароля"
       send_instructions: "Вы получите email с инструкцией по сбросу пароля в течении нескольких минут."
       updated: "Ваш пароль изменён."
-    registrations: 
+    registrations:
       destroyed: "До свиданья! Ваш аккаунт удалён. Мы будем рады видеть вас вновь."
       signed_up: "Регистрация аккаунта завершена. Вам отправлен email с дальнейшими указаниями."
       updated: "Ваш аккаунт обновлён."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Вы собираетесь использовать альфа версию программного обеспечения."
         bugs_and_feedback: "Имейте в виду, вы будете сталкиваться с ошибками. Мы рекомендуем вам использовать кнопку Обратная связь с правой стороны браузера! Мы будем решать ошибки так быстро, как сможем."
         bugs_and_feedback_mobile: "Будьте готовый столкнуться с ошибками. О которых мы просим вас сообщать незамедлительно! Мы постараемся решить вашу проблему в кротчайшие сроки."
@@ -99,23 +99,23 @@ ru:
         username: "Имя пользователя"
       signed_in: Вошли.
       signed_out: Вышли.
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Забыли пароль?"
         receive_confirmation: "Не получили инструкции по подтверждению?"
         receive_unlock: "Не получили инструкции по разблокированию?"
         sign_in: "Войти"
         sign_up: "Регистрация"
         sign_up_closed: "Регистрация на данный момент не доступна."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Зарегистрируйтесь для приглашения!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Отправить инструкции по разблокированию повторно"
       send_instructions: "Вы получите email с указаниями по разблокированию учётной записи в течение нескольких минут."
       unlocked: "Ваш аккаунт разблокированна. С возвращением."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "уже подтверждено"
       not_found: "не найдено"
       not_locked: "не заблокирована"
diff --git a/config/locales/devise/devise.sk.yml b/config/locales/devise/devise.sk.yml
index 69b2809b5..ebc3a4e5d 100644
--- a/config/locales/devise/devise.sk.yml
+++ b/config/locales/devise/devise.sk.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-sk: 
-  devise: 
-    confirmations: 
+sk:
+  devise:
+    confirmations:
       confirmed: "Váš účet bol úspešne potvrdený. Teraz ste prihlásený."
-      new: 
+      new:
         resend_confirmation: "Zaslať pokyny na potvrdenie"
       send_instructions: "O niekoľko minút dostanete e-mail s pokynmi na potvrdenie svojho účtu."
-    failure: 
+    failure:
       inactive: "Váš účet ešte nebol aktivovaný."
       invalid: "Neplatné používateľské meno alebo heslo."
       invalid_token: "Neplatný autentifikačný token."
@@ -18,17 +18,17 @@ sk:
       timeout: "Čas vášho sedenia uplynul; ak chcete pokračovať, znovu sa prihláste, prosím."
       unauthenticated: "Ak chcete pokračovať, musíte sa prihlásiť, alebo zaregistrovať."
       unconfirmed: "Predtým, ako budete môcť pokračovať, musíte potvrdiť svoj účet."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Vami zadaný token je neplatný!"
       send_instructions: "Vaša pozvánka bola odoslaná."
       updated: "Vaše heslo bolo úspešné zmenené. Teraz ste prihlásený."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Potvrdiť svoj účet"
         subject: "Pokyny na potvrdenie"
         you_can_confirm: "Svoj účet môžete potvrdiť kliknutím na tento odkaz:"
       hello: "Ahoj, %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Prijať pozvanie"
         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"
@@ -57,37 +57,37 @@ sk:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "Kliknutím na odkaz na stránku %{url} ho môžete prijať."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} vás pozvali na Diasporu"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Zmeniť si heslo"
         ignore: "Ak ste o to nežiadali, tento e-mail, prosím, ignorujte."
         someone_requested: "Požiadali ste o zmenu hesla, môžete to urobiť kliknutím na tento odkaz."
         subject: "Pokyny na zmenu hesla"
         wont_change: "Vaše heslo sa nedá zmeniť, kým nekliknete na uvedený odkaz a nevytvoríte si nové."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Váš účet bol zablokovaný kvôli vysokému počtu neúspešných prihlásení."
         click_to_unlock: "Kliknite na tento odkaz a váš účet sa odomkne:"
         subject: "Pokyny na odomknutie účtu"
         unlock: "Odomknúť môj účet"
       welcome: "Vitajte, %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Zmeniť moje heslo"
-      new: 
+      new:
         forgot_password: "Zabudli ste heslo?"
         no_account: "Takúto e-mailovú adresu nemá žiaden účet. Ak čakáte na pozvánku, mala by vám prísť každú chvíľu."
         send_password_instructions: "Pošlite mi pokyny na zmenu hesla"
       send_instructions: "O niekoľko minút dostanete e-mail s pokynmi, ako si zmeniť heslo."
       updated: "Vaše heslo bolo úspešne zmenené. Teraz ste prihlásení."
-    registrations: 
+    registrations:
       destroyed: "Dovidenia! Váš účet bol úspešne zrušený. Dúfame, že vás čoskoro znova uvidíme."
       signed_up: "Úspešne ste sa zaregistrovali. Ak je táto možnosť aktivovaná, e-mailom vám to potvrdíme."
       updated: "Úspešne ste si aktualizovali účet."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Chystáte sa použiť alfa verziu programu."
         bugs_and_feedback: "Tlačidlom Feedback na pravej strane prehliadača upozornite prosím na chyby, ktoré pri používaní objavíte. Budeme sa ich snažiť odstrániť tak skoro, ako to len pôjde."
         bugs_and_feedback_mobile: "Je možné, že občas narazíte na chyby. Ak nám ich nahlásite, budeme sa ich snažiť čo najrýchlejšie opraviť."
@@ -99,23 +99,23 @@ sk:
         username: "Používateľské meno"
       signed_in: "Úspešne ste sa prihlásili."
       signed_out: "Úspešne ste sa odhlásili."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Zabudli ste heslo?"
         receive_confirmation: "Nedostali ste pokyny na potvrdenie?"
         receive_unlock: "Nedostali ste pokyny na odomknutie účtu?"
         sign_in: "Prihlásiť sa"
         sign_up: "Zaregistrovať sa"
         sign_up_closed: "Momentálne sú ďalšie registrácie pozastavené."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Požiadať o pozvánku!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Znova poslať pokyny na odomknutie účtu"
       send_instructions: "O niekoľko minút dostanete e-mail s pokynmi, ako si odomknúť svoj účet."
       unlocked: "Váš účet bol úspešne odomknutý. Teraz ste prihlásení."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "už bol potvrdený"
       not_found: "nenájdený"
       not_locked: "nebol zamknutý"
diff --git a/config/locales/devise/devise.sl.yml b/config/locales/devise/devise.sl.yml
index 078bf27ae..22b50f3bc 100644
--- a/config/locales/devise/devise.sl.yml
+++ b/config/locales/devise/devise.sl.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-sl: 
-  devise: 
-    confirmations: 
+sl:
+  devise:
+    confirmations:
       confirmed: "Vaš uporabniški račun je uspešno potrjen. Zdaj ste prijavljeni."
-      new: 
+      new:
         resend_confirmation: "Ponovno pošlji navodila za potrditev uporabniškega računa"
       send_instructions: "V naslednjih nekaj minutah boste prejeli e-pošto z  navodili, kako potrditi vaš uporabniški račun."
-    failure: 
+    failure:
       inactive: "Vaš račun še ni aktiviran."
       invalid: "Napačno uporabniško ime ali geslo."
       invalid_token: "Preverjanje pristnosti ni mogoče."
@@ -18,17 +18,17 @@ sl:
       timeout: "Vaša seja je potekla. Za nadaljevanje se ponovno prijavite."
       unauthenticated: "Za nadaljevanje se prijavite ali registrirajte."
       unconfirmed: "Za nadaljevanje potrdite vaš račun."
-    invitations: 
+    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."
-    mailer: 
-      confirmation_instructions: 
+    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:"
       hello: "Pozdravljeni %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Sprejmi povabilo"
         arrived: "Socialno omrežje, ki ste ga že čakali je prispelo. Prenovljeno, varnejše in bolj zabavo, %{strong_diaspora} je pripravljena, da vam pomaga deliti in raziskati splet na povsem nov način."
         be_yourself: "Bodi to kar si"
@@ -57,37 +57,37 @@ sl:
         team_diaspora: "Tim Diaspore"
         unsubscribe: "Za odjavo kliknite %{link}."
         view_in: "Poglej v"
-      inviter: 
+      inviter:
         accept_at: "na %{url}, sprejmete lahko preko spodnje povezave."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} so vas povabili v omrežje Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Spremeni geslo"
         ignore: "V kolikor tega niste zahtevali, jemljite to e-pošto kot brezpredmetno."
         someone_requested: "Nekdo je zahteval povezavo za spremembo vašega gesla, kar lahko storite s pomočjo spodnje povezave."
         subject: "Navodila za ponastavitev gesla"
         wont_change: "Vaše geslo lahko spremenite s pomočjo zgornje povezave ter z vpisom novega gesla."
-      unlock_instructions: 
+      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}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Spremeni geslo"
-      new: 
+      new:
         forgot_password: "Ste pozabili geslo?"
         no_account: "Uporabniški račun s tem e-naslovom ne obstaja. V kolikor še čakate na povabilo, vas prosimo za potrpljenje."
         send_password_instructions: "Pošlji navodila za ponastavitev gesla"
       send_instructions: "V nekaj minutah boste prejeli e-pošto z navodili za ponastavitev vašega gesla."
       updated: "Vaše geslo je bilo uspešno spremenjeno. Zdaj ste prijavljeni."
-    registrations: 
+    registrations:
       destroyed: "Nasvidenje! Vaš uporabniški račun je uspešno preklican. Vljudno vas vabimo, 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."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Uporabili boste alpha različico programa."
         bugs_and_feedback: "Opozarjamo vas, da lahko naletite na hrošče. Veseli bomo vsake prijavljene 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 prijavljene napake, ki jo bomo poskusili obravnavati in rešiti v najkrajšem možnem času."
@@ -99,23 +99,23 @@ sl:
         username: "Uporabniško ime"
       signed_in: "Vaša prijava je uspešna."
       signed_out: "Vaša odjava je uspešna."
-    shared: 
-      links: 
+    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?"
         sign_in: "Prijava"
         sign_up: "Vpis"
         sign_up_closed: "Vpis trenutno ni omogočen."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Prijava na čakalno listo za povabila!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Ponovno pošlji navodila za odklepanje uporabniškega računa"
       send_instructions: "V nekaj minutah boste prejeli e-pošto z navodili za odklepanje vašega uporabniškega računa."
       unlocked: "Vaš uporabniški račun je bil uspešno odklenjen. Zdaj ste prijavljeni."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "je že bilo potrjeno"
       not_found: "ni bilo mogoče najti"
       not_locked: "ni bilo zaklenjeno"
diff --git a/config/locales/devise/devise.sv.yml b/config/locales/devise/devise.sv.yml
index 985b64b35..7229c6f8b 100644
--- a/config/locales/devise/devise.sv.yml
+++ b/config/locales/devise/devise.sv.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-sv: 
-  devise: 
-    confirmations: 
+sv:
+  devise:
+    confirmations:
       confirmed: "Ditt konto har verifierats och du är inloggad."
-      new: 
+      new:
         resend_confirmation: "Skicka instruktioner för att bekräfta kontot igen"
       send_instructions: "Du kommer att få ett mail med instruktioner för att verifiera ditt konto inom några minuter."
-    failure: 
+    failure:
       inactive: "Ditt konto är inte aktiverat."
       invalid: "Felaktigt användarnamn eller lösenord."
       invalid_token: "Ogiltig identifiering."
@@ -18,17 +18,17 @@ sv:
       timeout: "Din session är avslutad, var vänlig logga in igen."
       unauthenticated: "Du måste logga in innan du kan fortsätta."
       unconfirmed: "Du måste verifiera ditt konto innan du kan fortsätta."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Denna inbjudan är ej giltig!"
       send_instructions: "Din inbjudan är nu skickad."
       updated: "Ditt lösenord är nu inställt och du är inloggad."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Aktivera mitt konto"
         subject: "Instruktioner för att aktivera ditt konto"
         you_can_confirm: "Klicka på länken nedan för att aktivera ditt konto:"
       hello: "Hej %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Acceptera inbjudan"
         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"
@@ -57,37 +57,37 @@ sv:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "via %{url}. Du accepterar genom att klicka på länken nedan."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} har bjudit in dig att gå med i Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Återställ mitt lösenord"
         ignore: "Om det inte är du som vill byta lösenord så kan du ignorera det här mailet."
         someone_requested: "Någon har efterfrågat en länk för att återställa ditt lösenord. För att återställa lösenordet, klicka på länken nedan."
         subject: "Instruktioner för att återställa lösenordet"
         wont_change: "Dit lösenord kommer inte ändras förrän du klickat på länken och ändrat det."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Ditt konto har låsts eftersom du eller någon annan har angett fel lösenord för många gånger."
         click_to_unlock: "Klicka på länken nedan för att låsa upp ditt konto:"
         subject: "Instruktioner för upplåsning"
         unlock: "Lås upp mitt konto"
       welcome: "Välkommen %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Ändra mitt lösenord"
-      new: 
+      new:
         forgot_password: "Glömt ditt lösenord?"
         no_account: "Det finns inget konto med den här mailadressen. Väntar du på en inbjudan så skickar vi ut dem så snart som möjligt."
         send_password_instructions: "Skicka information om hur jag återställer lösenordet"
       send_instructions: "Du kommer att få ett mail med instruktioner för att återställa lösenordet inom några minuter."
       updated: "Ditt lösenord har ändrats och du är inloggad."
-    registrations: 
+    registrations:
       destroyed: "Ditt konto är avslutat. Välkommen åter!"
       signed_up: "Du har skapat ett konto. Beroende på dina inställningar kan ett mail ha skickats till dig."
       updated: "Ditt konto har uppdateras."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Du är på väg att använda mjukvara i alpha-stadium."
         bugs_and_feedback: "Var beredd på att stöta på buggar och problem. Använd gärna feedback-knappen till vänster för att rapportera dessa, vi kommer att försöka ordna problemen så snart som möjligt."
         bugs_and_feedback_mobile: "Tänk på att du kommer att uppleva buggar.Vi uppmanar dig att rapportera alla fel! Vi kommer att arbeta så fort som möjligt med att lösa dom problem som du rapporterar."
@@ -99,23 +99,23 @@ sv:
         username: "Användarnamn"
       signed_in: "Inloggning ok."
       signed_out: "Utloggning ok."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Glömt ditt lösenord?"
         receive_confirmation: "Fick du inget bekräftelsemail?"
         receive_unlock: "Fick du inga upplåsningsinstruktioner?"
         sign_in: "Logga in"
         sign_up: "Registrera dig"
         sign_up_closed: "Formuläret för att bli medlem är tyvärr stängt."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Begär en inbjudan!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Skicka upplåsningsinstruktioner igen"
       send_instructions: "Du kommer att få ett mail med instruktioner för att låsa upp ditt konto inom några minuter."
       unlocked: "Ditt konto har är nu upplåst och du är inloggad"
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "är redan bekräftad"
       not_found: "kan ej hitta"
       not_locked: "var ej låst"
diff --git a/config/locales/devise/devise.tr.yml b/config/locales/devise/devise.tr.yml
index ef57b0568..c1ba61519 100644
--- a/config/locales/devise/devise.tr.yml
+++ b/config/locales/devise/devise.tr.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-tr: 
-  devise: 
-    confirmations: 
+tr:
+  devise:
+    confirmations:
       confirmed: "Hesabınız başarıyla doğrulanmıştır. Şu anda giriş yapmış bulunuyorsunuz."
-      new: 
+      new:
         resend_confirmation: "Doğrulama yönergelerini tekrar gönder"
       send_instructions: "Kısa bir süre içerisinde hesabınızı nasıl doğrulayacağınıza dair bir e-posta alacaksınız."
-    failure: 
+    failure:
       inactive: "Hesabınız henüz aktive edilmemiştir."
       invalid: "Yanlış e-posta ya da parola."
       invalid_token: "Yanlış doğrulama kodu."
@@ -18,17 +18,17 @@ tr:
       timeout: "Zaman aşımı oldu, devam etmek için lütfen tekrar giriş yapın."
       unauthenticated: "Devam etmeden önce bir hesap açtırmalı veya hesabınızla giriş yapmalısınız."
       unconfirmed: "Devam etmeden önce hesabınızı doğrulamalısınız."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Davet kodu doğrulanamadı!"
       send_instructions: "Davetiniz gönderildi."
       updated: "Parolanız başarıyla ayarlandı. Şu anda giriş yapmış bulunuyorsunuz."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Hesabımı doğrula"
         subject: "Doğrulama talimatları"
         you_can_confirm: "Hesabınızı aşağıdaki bağlantı ile doğrulayabilirsiniz:"
       hello: "Merhaba %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Daveti kabul et"
         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"
@@ -57,37 +57,37 @@ tr:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "%{url}, aşağıdaki bağlantıya tıklayarak bunu kabul edebilirsiniz."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} Diaspora'ya katılmanız için davet edildiniz"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Parolamı değiştir"
         ignore: "Eğer bunu siz talep etmediyseniz, lütfen bu e-postayı yoksayın."
         someone_requested: "Parola değiştirme talep edildi, parolanızı değiştirmek için aşağıdaki bağlantıya tıklayın."
         subject: "Parola yenileme yönergeleri"
         wont_change: "Parolanız siz yukarıdaki bağlantıya tıklayıp yeni bir parola oluşturana kadar değişmeyecektir."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Hesabınız çok fazla yanlış giriş yaptığınız için kilitlendi."
         click_to_unlock: "Hesabınızın kilidini açmak için aşağıdaki bağlantıya tıklayın:"
         subject: "Kilit Açma Yönergeleri"
         unlock: "Hesabımın kilidini aç"
       welcome: "Hoş geldiniz %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Parola değiştirme"
-      new: 
+      new:
         forgot_password: "Parolanızı mı unuttunuz?"
         no_account: "Bu e-posta adresiyle alınmış hesap bulunmamaktadır. Eğer bir davetiye için bekliyorsanız, en kısa zamanda size ulaştıracağız."
         send_password_instructions: "Bana parola yenileme talimatları gönder"
       send_instructions: "Bir kaç dakika içerisinde parolanızı nasıl sıfırlayacağınızı açıklıyan bir e-posta alacaksınız."
       updated: "Parolanız değiştirilmiştir. Şu anda giriş yapmış bulunuyorsunuz."
-    registrations: 
+    registrations:
       destroyed: "Hoşçakalın! Hesabınız iptal edildi. Umarız sizi yakında tekrar görürüz."
       signed_up: "Başarıyla kayıt yaptınız. Doğrulama, e-postanıza gönderilmiştir."
       updated: "Hesabınızı başarılı bir şekilde yenilediniz."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Alfa programını kullanmak üzeresiniz."
         bugs_and_feedback: "Sitede bazı hatalarla karşılaşabilirsiniz. Karşılaştığınız herhangi hata için sağ üstteki Geri Bildirim düğmesini kullanmanızı tavsiye ederiz. Raporlarınız bize ulaşır ulaşmaz, sorunu düzeltmek için çalışacağız."
         bugs_and_feedback_mobile: "Aklınızda bulunsun, hatalarla karşılacaksınız. Karşılaştığınız hataları bildirmenizi istiyoruz.  Bildiriminizi alır almaz konu hakkında çalışmaya başlayacağız."
@@ -99,23 +99,23 @@ tr:
         username: "Kullanıcı Adı"
       signed_in: "Başarıyla giriş yaptınız."
       signed_out: "Başarıyla çıkış yaptınız."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Parolanızı mı unuttunuz?"
         receive_confirmation: "Hesap doğrulama yönergelerini almadınız mı?"
         receive_unlock: "Kilit açma yönergelerini almadınız mı?"
         sign_in: "Giriş yap"
         sign_up: "Kayıt ol"
         sign_up_closed: "Şu an için yeni kayıt alınamıyor."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Bir davetiye için kaydolun!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Tekrar gönder"
       send_instructions: "Bir kaç dakika içerisinde hesabınızın kilidini nasıl açabileceğinize dair bir e-posta alacaksınız."
       unlocked: "Hesabınızın kilidi açılmıştır. Şu anda giriş yapmış bulunuyorsunuz."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "zaten doğrulandı"
       not_found: "bulunamadı"
       not_locked: "kilitlenmedi"
diff --git a/config/locales/devise/devise.uk.yml b/config/locales/devise/devise.uk.yml
index 632296f0e..03f616c94 100644
--- a/config/locales/devise/devise.uk.yml
+++ b/config/locales/devise/devise.uk.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-uk: 
-  devise: 
-    confirmations: 
+uk:
+  devise:
+    confirmations:
       confirmed: "Ваш аккаунт підтверджений. Ласкаво просимо."
-      new: 
+      new:
         resend_confirmation: "Вислати повторно інструкції по підтвердженню"
       send_instructions: "Ви отримаєте лист з вказівками по підтвердженню облікового запису впродовж декількох хвилин."
-    failure: 
+    failure:
       inactive: "Ваш аккаунт ще не активований."
       invalid: "Невірний email або пароль."
       invalid_token: "Невірна перевірка достовірності."
@@ -18,17 +18,17 @@ uk:
       timeout: "Ваша сесія закінчилася, будь ласка, увійдіть в раз, щоб продовжити."
       unauthenticated: "Ви повинні увійти або зареєструватися, перш ніж продовжити."
       unconfirmed: "Вам необхідно підтвердити ваш аккаунт, перш ніж продовжити."
-    invitations: 
+    invitations:
       invitation_token_invalid: "Введений вами код запрошення не дійсний!"
       send_instructions: "Ваше запрошення було надіслано."
       updated: "Пароль встановлений. Ласкаво просимо."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Підтвердити мій аккаунт"
         subject: "Інструкції по підтвердженню"
         you_can_confirm: "Ви можете підтвердити свій аккаунт за посиланням нижче:"
       hello: "Привіт %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "Прийняти запрошення"
         arrived: "Соціальна мережа, яку ви так довго чекали, нарешті, з'явилася. Оновлена, захищеніша і доброзичливіша %{strong_diaspora} готова допомогти вам ділитися і досліджувати Мережу по-новому."
         be_yourself: "Будьте собою"
@@ -57,37 +57,37 @@ uk:
         team_diaspora: "Команда Діаспори"
         unsubscribe: "Щоб відписатися, натисніть %{link}."
         view_in: "Відкрити в"
-      inviter: 
+      inviter:
         accept_at: "в %{url}, ви можете прийняти його по посиланню нижче."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} запросив[а, и] вас приєднатися до діаспори"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Змінити пароль"
         ignore: "Якщо ви не здійснювали запит, проігноруйте цей лист."
         someone_requested: "Хтось створив запит зміни вашого пароля, і ви можете зробити це через посилання нижче."
         subject: "Інструкції по скиданню пароля"
         wont_change: "Ваш пароль не зміниться, поки ви не перейдете по посиланню і не створите новий."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Ваш аккаунт заблокований через надмірну кількість невдалих спроб входу."
         click_to_unlock: "Використайте посилання, щоб розблоковувати аккаунт:"
         subject: "Інструкції по розблокуванню"
         unlock: "Розблоковувати мій аккаунт"
       welcome: "Ласкаво просимо %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Змінити пароль"
-      new: 
+      new:
         forgot_password: "Забули пароль?"
         no_account: "Немає жодного контакту з цим email. Якщо ви чекаєте запрошення, ми відправимо їх якнайскоріше"
         send_password_instructions: "Відправити мені інструкції по скиданню пароля"
       send_instructions: "Ви отримаєте email з інструкцією по скиданню пароля на протязі декількох хвилин."
       updated: "Ваш пароль був успішно змінений."
-    registrations: 
+    registrations:
       destroyed: "До побачення! Ваш аккаунт видалений. Ми будемо раді бачити вас знову."
       signed_up: "Реєстрація аккаунта завершена. Вам відправлений email з подальшими вказівками."
       updated: "Ваш аккаунт оновлено."
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: "Ви збираєтеся використати альфа версію програмного забезпечення."
         bugs_and_feedback: "Майте на увазі, ви стикатиметеся з помилками. Ми рекомендуємо вам використати кнопку Зворотний зв'язок з правого боку браузеру! Ми вирішуватимемо помилки так швидко, як зможемо."
         bugs_and_feedback_mobile: "Будьте готовий зіткнутися з помилками. Про які ми просимо вас повідомляти негайно! Ми постараємося вирішити вашу проблему в найкоротші терміни."
@@ -99,23 +99,23 @@ uk:
         username: "Ім'я користувача"
       signed_in: Увійшли.
       signed_out: Вишли.
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Забули пароль?"
         receive_confirmation: "Не отримали інструкції по підтвердженню?"
         receive_unlock: "Не отримали інструкції по розблокуванню?"
         sign_in: "Увійти"
         sign_up: "Реєстрація"
         sign_up_closed: "Реєстрація на даний момент не доступна."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Зареєструйтеся для запрошення!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Переслати інструкції з розблокування"
       send_instructions: "Ви отримаєте email з вказівками по розблокуванню облікового запису впродовж декількох хвилин."
       unlocked: "Ваш акаунт був успішно розблокований. Тепер ви увійшли в систему."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "вже підтверджено"
       not_found: "не знайдено"
       not_locked: "не заблокована"
diff --git a/config/locales/devise/devise.vi.yml b/config/locales/devise/devise.vi.yml
index 277a198d7..339c23030 100644
--- a/config/locales/devise/devise.vi.yml
+++ b/config/locales/devise/devise.vi.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-vi: 
-  devise: 
-    confirmations: 
+vi:
+  devise:
+    confirmations:
       confirmed: "Your account was successfully confirmed. You are now signed in."
-      new: 
+      new:
         resend_confirmation: "Resend confirmation instructions"
       send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
-    failure: 
+    failure:
       inactive: "Your account was not activated yet."
       invalid: "Invalid username or password."
       invalid_token: "Invalid authentication token."
@@ -18,17 +18,17 @@ vi:
       timeout: "Your session expired, please sign in again to continue."
       unauthenticated: "You need to sign in or sign up before continuing."
       unconfirmed: "You have to confirm your account before continuing."
-    invitations: 
+    invitations:
       invitation_token_invalid: "The invitation token provided is not valid!"
       send_instructions: "Your invitation has been sent."
       updated: "Your password was set successfully. You are now signed in."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "Confirm my account"
         subject: "Confirmation instructions"
         you_can_confirm: "You can confirm your account through the link below:"
       hello: "Hello %{email}!"
-      invitation_instructions: 
+      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"
@@ -57,37 +57,37 @@ vi:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} have invited you to join Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "Change my password"
         ignore: "If you didn't request this, please ignore this email."
         someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
         subject: "Reset password instructions"
         wont_change: "Your password won't change until you access the link above and create a new one."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
         click_to_unlock: "Click the link below to unlock your account:"
         subject: "Unlock Instructions"
         unlock: "Unlock my account"
       welcome: "Welcome %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "Change my password"
-      new: 
+      new:
         forgot_password: "Forgot your password?"
         no_account: "No account with this email exists.  If you are waiting for an invite, we are rolling them out as soon as possible"
         send_password_instructions: "Send me reset password instructions"
       send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
       updated: "Your password was changed successfully. You are now signed in."
-    registrations: 
+    registrations:
       destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
       signed_up: "You have signed up successfully. If enabled, a confirmation was sent to your e-mail."
       updated: "You updated your account successfully."
-    sessions: 
-      new: 
+    sessions:
+      new:
         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."
@@ -99,23 +99,23 @@ vi:
         username: "Username"
       signed_in: "Signed in successfully."
       signed_out: "Signed out successfully."
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: "Forgot your password?"
         receive_confirmation: "Didn't receive confirmation instructions?"
         receive_unlock: "Didn't receive unlock instructions?"
         sign_in: "Sign in"
         sign_up: "Sign up"
         sign_up_closed: "Open signups are closed at this time."
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: "Sign up for an invite!"
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "Resend unlock instructions"
       send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
       unlocked: "Your account was successfully unlocked. You are now signed in."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "was already confirmed"
       not_found: "not found"
       not_locked: "was not locked"
diff --git a/config/locales/devise/devise.zh-CN.yml b/config/locales/devise/devise.zh-CN.yml
index 8adc378e4..ad4227fe0 100644
--- a/config/locales/devise/devise.zh-CN.yml
+++ b/config/locales/devise/devise.zh-CN.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-zh-CN: 
-  devise: 
-    confirmations: 
+zh-CN:
+  devise:
+    confirmations:
       confirmed: 帐号确认成功。您已经成功登录。
-      new: 
+      new:
         resend_confirmation: "重送发送帐号确认邮件"
       send_instructions: 您会在几分钟内收到一封邮件，它将指引您完成帐号确认步骤。
-    failure: 
+    failure:
       inactive: 你的帐号尚未激活。
       invalid: 邮箱或密码有误。
       invalid_token: 验证信息不合法。
@@ -18,17 +18,17 @@ zh-CN:
       timeout: 会话超时。若要继续，请重新登录。
       unauthenticated: 请您登录或注册。
       unconfirmed: 你必须先验证帐号才能继续。
-    invitations: 
+    invitations:
       invitation_token_invalid: 邀请码验证失败。
       send_instructions: 邀请发送成功。
       updated: 密码设定成功。您已经成功登录。
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "确认帐号"
         subject: "帐号确认步骤"
         you_can_confirm: 你可以点击下面的链接确认帐号：
       hello: "您好, %{email}!"
-      invitation_instructions: 
+      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"
@@ -57,37 +57,37 @@ zh-CN:
         team_diaspora: "Team Diaspora"
         unsubscribe: "To unsubscribe please click %{link}."
         view_in: "View in"
-      inviter: 
+      inviter:
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} have invited you to join Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "重置密码"
         ignore: "如果您并没有请求重置密码, 请忽略这封信件。"
         someone_requested: 有人请求重置您的密码，若确实要这么做，请点击下面的链接。
         subject: "密码重置步骤"
         wont_change: 在点击以上链接重置密码后，您的密码才会改变。
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: 您的帐号因为登录失败次数异常而被锁定。
         click_to_unlock: 点击下面的链接以解锁您的帐号：
         subject: "帐号解锁步骤"
         unlock: "解锁帐号"
       welcome: "欢迎您, %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "修改密码"
-      new: 
+      new:
         forgot_password: 忘记密码？
         no_account: "没有与此邮箱关联的帐号。如果您在等待邀请函, 我们将尽快寄出."
         send_password_instructions: "请向我发送密码重置步骤"
       send_instructions: 几分钟内您将收到一封包含密码重置步骤的邮件。
       updated: 密码修改成功。您已经登入了。
-    registrations: 
+    registrations:
       destroyed: 再见！您的帐号已经关闭。希望不久后再会。
       signed_up: "您已经成功注册。如果有设定的话, 确认信会送到您的邮箱。"
       updated: 帐号更新成功。
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: 你即将使用处于开发初期的功能。
         bugs_and_feedback: "给您一个提醒, 你将可能遇到bug。 遇到任何问题，都请您点击浏览器右边的\"反馈\"按钮向我们反馈！ 我们会尽快处理您反馈的任何问题。"
         bugs_and_feedback_mobile: "给您一个提醒, 你将可能遇到bug。 遇到任何问题都请你向我们反馈! 我们会尽快处理你反馈的任何问题."
@@ -99,23 +99,23 @@ zh-CN:
         username: "用户名"
       signed_in: 登录成功。
       signed_out: 登出成功。
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: 忘记密码？
         receive_confirmation: 没有收到确认步骤？
         receive_unlock: 没有收到重置步骤？
         sign_in: "登录"
         sign_up: "注册"
         sign_up_closed: 目前不开放公开注册。
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: 凭邀请函注册！
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "重新发送解锁步骤"
       send_instructions: 几分钟后您将收到一封邮件，它将指引您解锁您的帐号。
       unlocked: 帐号解锁成功。你已经登录。
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "已确认"
       not_found: "未找到"
       not_locked: "未锁定"
diff --git a/config/locales/devise/devise.zh-TW.yml b/config/locales/devise/devise.zh-TW.yml
index 7dda159b6..4df853877 100644
--- a/config/locales/devise/devise.zh-TW.yml
+++ b/config/locales/devise/devise.zh-TW.yml
@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-zh-TW: 
-  devise: 
-    confirmations: 
+zh-TW:
+  devise:
+    confirmations:
       confirmed: "帳號已確認成功. 你已經登入了."
-      new: 
+      new:
         resend_confirmation: "重送確認步驟"
       send_instructions: 幾分鐘內你會收到一封說明如何確認帳號的信件.
-    failure: 
+    failure:
       inactive: 你的帳號尚未開通.
       invalid: 用戶名稱或密碼有誤.
       invalid_token: 認證信物無效.
@@ -18,17 +18,17 @@ zh-TW:
       timeout: "工作階段已逾時, 若要繼續請重新登入."
       unauthenticated: 繼續之前你必須先登入或登記.
       unconfirmed: 你必須先確認帳號才能繼續.
-    invitations: 
+    invitations:
       invitation_token_invalid: 提供的邀請信物無效!
       send_instructions: 邀請函已寄出.
       updated: "密碼已設定成功. 你已經登入了."
-    mailer: 
-      confirmation_instructions: 
+    mailer:
+      confirmation_instructions:
         confirm: "帳號確認"
         subject: "確認步驟"
         you_can_confirm: "你可以使用以下連結確認帳號:"
       hello: "你好, %{email}!"
-      invitation_instructions: 
+      invitation_instructions:
         accept: "接受邀請"
         arrived: "你一直在等待的社交網路來了. 精心修整, 更安全, 也更好玩, %{strong_diaspora} 已經準備好要幫助你, 用一種嶄新的方式來分享與探索網路世界."
         be_yourself: "做自己"
@@ -57,37 +57,37 @@ zh-TW:
         team_diaspora: "Diaspora 團隊"
         unsubscribe: "要取消訂閱請按%{link}."
         view_in: "檢視看看"
-      inviter: 
+      inviter:
         accept_at: "於 %{url}, 你可以透過以下連結來接受."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} 邀請你加入 Diaspora"
-      reset_password_instructions: 
+      reset_password_instructions:
         change: "更改密碼"
         ignore: "如果你沒請求過, 請忽略這封信件."
         someone_requested: "有人要求更改你的密碼, 若確定要這麼做, 請使用以下連結."
         subject: "密碼重設步驟"
         wont_change: "在使用以上連結設定新的密碼後, 你的密碼才會改變."
-      unlock_instructions: 
+      unlock_instructions:
         account_locked: 你的帳號因為登入失敗太多次而被鎖定了.
         click_to_unlock: "點一下以下連結以將你的帳號解鎖:"
         subject: "解鎖步驟"
         unlock: "帳號解鎖"
       welcome: "歡迎你, %{email}!"
-    passwords: 
-      edit: 
+    passwords:
+      edit:
         change_password: "更改密碼"
-      new: 
+      new:
         forgot_password: 忘記密碼?
         no_account: "無此電子信箱關聯的帳號. 如果你是在等邀請函, 我們會盡快寄出."
         send_password_instructions: "傳送密碼重設的步驟給我"
       send_instructions: 幾分鐘內你會收到一封說明如何重設密碼的信件.
       updated: "密碼更改成功. 你已經登入了."
-    registrations: 
+    registrations:
       destroyed: "再會! 你的帳號已經取消了. 希望不久後再見."
       signed_up: "你已經成功登記了. 如果有設定的話, 確認信會送到你的信箱."
       updated: 帳號更新成功.
-    sessions: 
-      new: 
+    sessions:
+      new:
         alpha_software: 你將要使用剛開發的軟體.
         bugs_and_feedback: "給你個忠告, 你將會遭遇到臭蟲. 遇到任何不順, 都請你使用瀏覽器右手邊的\"回饋\"按鈕向我們回報! 我們會盡快處理你回報的任何問題."
         bugs_and_feedback_mobile: "給你個忠告, 你將會遭遇到臭蟲. 遇到任何不順都請你向我們回報! 我們會盡快處理你回報的任何問題."
@@ -99,23 +99,23 @@ zh-TW:
         username: "用戶名稱"
       signed_in: 登入成功.
       signed_out: 登出成功.
-    shared: 
-      links: 
+    shared:
+      links:
         forgot_your_password: 忘記密碼?
         receive_confirmation: 沒收到確認步驟?
         receive_unlock: 沒收到解鎖步驟?
         sign_in: "登入"
         sign_up: "登記"
         sign_up_closed: 目前不開放公開登記.
-      mail_signup_form: 
+      mail_signup_form:
         sign_up_for_an_invite: 邀請函登記!
-    unlocks: 
-      new: 
+    unlocks:
+      new:
         resend_unlock: "重送解鎖步驟"
       send_instructions: 幾分鐘後你將收到一封說明如何將你的帳號解鎖的信件.
       unlocked: "帳號解鎖成功. 你已經登入了."
-  errors: 
-    messages: 
+  errors:
+    messages:
       already_confirmed: "已確認"
       not_found: "沒找到"
       not_locked: "沒鎖定"