Change placeholder in translations for #8037

71 files changed, 141 insertions, 141 deletions

diff --git a/config/locales/devise/devise.ar.yml b/config/locales/devise/devise.ar.yml
index 67d8f4b7c..592780548 100644
--- a/config/locales/devise/devise.ar.yml
+++ b/config/locales/devise/devise.ar.yml
@@ -32,7 +32,7 @@ ar:
         confirm: "أكّد حسابي"
         subject: "إرشادات التّأكيد"
         you_can_confirm: "يمكنك تأكيد حسابك عبر الوصلة الآتية:"
-      hello: "أهلًا %{email}!"
+      hello: "أهلًا %{username}!"
       inviter:
         accept_at: ", %{url}, يمكنك قبولها عبر الرابط التالي"
         has_invited_you: "%{name} يدعوك للإنضمام إلى دياسبرا"
@@ -50,7 +50,7 @@ ar:
         click_to_unlock: "انقر الوصلة أدناه لفكّ الحساب:"
         subject: "إرشادات فكّ القفل"
         unlock: "فكّ حسابي"
-      welcome: "مرحبًا %{email}!"
+      welcome: "مرحبًا %{username}!"
     omniauth_callbacks:
       failure: "لا يمكنك الاستيثاق من ‎%{kind}‎ بسبب \"‎%{reason}‎\"."
       success: "استثقت من حساب ‎%{kind}‎ بنجاح"
diff --git a/config/locales/devise/devise.art-nvi.yml b/config/locales/devise/devise.art-nvi.yml
index a15ca9cdf..668da956e 100644
--- a/config/locales/devise/devise.art-nvi.yml
+++ b/config/locales/devise/devise.art-nvi.yml
@@ -14,7 +14,7 @@ art-nvi:
       unauthenticated: "Ngal kin 'ivastengyem ayoeti fu fpxäkim ayoe fte salew Diasporaru."
       unconfirmed: "Ngal kin stiveftxaw ngeyä Diasporati fte fpxäkim."
     mailer:
-      hello: "Kaltxì %{email}!"
+      hello: "Kaltxì %{username}!"
       inviter:
         has_invited_you: "%{name}"
         have_invited_you: "%{names} polawm ngati txo säpung Diasporaru"
@@ -22,7 +22,7 @@ art-nvi:
         change: "Latem oeyä ftemlì'u"
         someone_requested: "Tsengeäo lu fte nga tsun livatem ngeyä ftemlì'u talun tuteo pìmawm ayoe txo tìng fì'uti ngaur."
         subject: "aysänume fte zeyko oeyä ftemlì'uti"
-      welcome: "Zola'u nìprrte, ma %{email}!"
+      welcome: "Zola'u nìprrte, ma %{username}!"
     passwords:
       edit:
         change_password: "Leykatem oeyä ftemlì'ut"
diff --git a/config/locales/devise/devise.bg.yml b/config/locales/devise/devise.bg.yml
index fc711e86c..981df4985 100644
--- a/config/locales/devise/devise.bg.yml
+++ b/config/locales/devise/devise.bg.yml
@@ -28,7 +28,7 @@ bg:
         confirm: "Потвърждаване на акаунта"
         subject: "Инструкции за потвърждаване"
         you_can_confirm: "Можете да потвърдите акаунта си чрез долната връзка:"
-      hello: "Здравейте %{email}!"
+      hello: "Здравейте %{username}!"
       inviter:
         accept_at: "от %{url}, можете да приемете чрез връзката по-долу в писмото."
         has_invited_you: "%{name}"
@@ -44,7 +44,7 @@ bg:
         click_to_unlock: "За отключване на акаунта кликнете върху долната връзка:"
         subject: "Инструкции за отключване"
         unlock: "Отключване на акаунта"
-      welcome: "Добре дошли %{email}!"
+      welcome: "Добре дошли %{username}!"
     passwords:
       edit:
         change_password: "Промяна на паролата"
diff --git a/config/locales/devise/devise.br.yml b/config/locales/devise/devise.br.yml
index 5304bc37f..a05f89d32 100644
--- a/config/locales/devise/devise.br.yml
+++ b/config/locales/devise/devise.br.yml
@@ -29,7 +29,7 @@ br:
         confirm: "Kadarnaat ma c'hont"
         subject: "Titouroù kadarnaat"
         you_can_confirm: "Gallout a rit kadarnaat ho kont gant al liamm dindan:"
-      hello: "Demat deoc'h, %{email}!"
+      hello: "Demat deoc'h, %{username}!"
       inviter:
         accept_at: "e %{url}, gallout a rit e zegemer dre al liamm a-is."
         has_invited_you: "%{name}"
@@ -45,7 +45,7 @@ br:
         click_to_unlock: "Klikit war al liamm dindan evit dibrennañ ho kont:"
         subject: "Titouroù dibrennañ"
         unlock: "Dibrennañ ma c'hont"
-      welcome: "Donemat deoc'h, %{email}!"
+      welcome: "Donemat deoc'h, %{username}!"
     passwords:
       edit:
         change_password: "Cheñch ma ger-tremen"
diff --git a/config/locales/devise/devise.bs.yml b/config/locales/devise/devise.bs.yml
index 8397de68c..1ed5736ee 100644
--- a/config/locales/devise/devise.bs.yml
+++ b/config/locales/devise/devise.bs.yml
@@ -29,7 +29,7 @@ bs:
         confirm: "Potvrdi moj račun"
         subject: "Uputstva za potvrdu"
         you_can_confirm: "Možete potvrditi svoj račun sa vezom ispod:"
-      hello: "Zdravo %{email}!"
+      hello: "Zdravo %{username}!"
       inviter:
         accept_at: "na %{url}, možete prihvatiti vezom ispod."
         has_invited_you: "%{name}"
@@ -45,7 +45,7 @@ bs:
         click_to_unlock: "Kliknite na vezu ispod da bi otključali vaš račun."
         subject: "Otključaj Uputstva"
         unlock: "Otključaj moj račun"
-      welcome: "Dobrodošli %{email}!"
+      welcome: "Dobrodošli %{username}!"
     passwords:
       edit:
         change_password: "Promjeni moju šifru"
diff --git a/config/locales/devise/devise.ca.yml b/config/locales/devise/devise.ca.yml
index 470ac6802..cca2be2a5 100644
--- a/config/locales/devise/devise.ca.yml
+++ b/config/locales/devise/devise.ca.yml
@@ -28,7 +28,7 @@ ca:
         confirm: "Confirma el meu compte"
         subject: "Instruccions per a la confirmació"
         you_can_confirm: "Podeu confirmar el vostre compte mitjançant l'enllaç següent:"
-      hello: "Hola, %{email}!"
+      hello: "Hola, %{username}!"
       inviter:
         accept_at: "a %{url}, podeu acceptar-ho mitjançant l'enllaç següent."
         has_invited_you: "%{name}"
@@ -44,7 +44,7 @@ ca:
         click_to_unlock: "Feu clic a l'enllaç següent per desblocar el vostre compte:"
         subject: "Instruccions per al desblocatge"
         unlock: "Desbloca el meu compte"
-      welcome: "Benvingut/da, %{email}!"
+      welcome: "Benvingut/da, %{username}!"
     passwords:
       edit:
         change_password: "Canvia la contrasenya"
diff --git a/config/locales/devise/devise.cs.yml b/config/locales/devise/devise.cs.yml
index 7988eda06..da42c11d3 100644
--- a/config/locales/devise/devise.cs.yml
+++ b/config/locales/devise/devise.cs.yml
@@ -32,7 +32,7 @@ cs:
         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}!"
+      hello: "Zdravím %{username}!"
       inviter:
         accept_at: "na %{url}, přijmout pozvání můžete pomocí odkazu níže."
         has_invited_you: "%{name}"
@@ -50,7 +50,7 @@ cs:
         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}!"
+      welcome: "Vítej %{username}!"
     omniauth_callbacks:
       failure: "Nelze vás autentikovat z %{kind}, protože \"%{reason}\""
       success: "Úspěšně jsme vás ověřili z účtu %{kind}."
diff --git a/config/locales/devise/devise.cy.yml b/config/locales/devise/devise.cy.yml
index ec5fa7e31..a2b4969f5 100644
--- a/config/locales/devise/devise.cy.yml
+++ b/config/locales/devise/devise.cy.yml
@@ -25,13 +25,13 @@ cy:
     mailer:
       confirmation_instructions:
         subject: "Cyfarwyddiadau Cadarnhad"
-      hello: "Helo %{email}!"
+      hello: "Helo %{username}!"
       reset_password_instructions:
         change: "Newid y cyfrinair"
       unlock_instructions:
         subject: "Cyfarwyddiadau i ddatgloi"
         unlock: "Datgloi fy nghyfrif"
-      welcome: "Croeso %{email}!"
+      welcome: "Croeso %{username}!"
     passwords:
       edit:
         change_password: "Newid fy nghyfrinair"
diff --git a/config/locales/devise/devise.da.yml b/config/locales/devise/devise.da.yml
index eb68bee89..2ca6cfca2 100644
--- a/config/locales/devise/devise.da.yml
+++ b/config/locales/devise/devise.da.yml
@@ -32,7 +32,7 @@ da:
         confirm: "Bekræft min konto"
         subject: "Bekræftelsesinstruktioner"
         you_can_confirm: "Du kan bekræfte din konto via nedenstående link:"
-      hello: "Hej %{email}!"
+      hello: "Hej %{username}!"
       inviter:
         accept_at: "på %{url}, du kan acceptere ved at følge linket nedenunder."
         has_invited_you: "%{name}"
@@ -50,7 +50,7 @@ da:
         click_to_unlock: "Klik på linket nedenfor for at aktivere din konto:"
         subject: "Aktiver instruktioner"
         unlock: "Aktiver min konto"
-      welcome: "Velkommen %{email}!"
+      welcome: "Velkommen %{username}!"
     omniauth_callbacks:
       failure: "Kunne ikke godkende dig fra %{kind} fordi \"%{reason}\"."
       success: "Godkendelse modtaget fra %{kind} kontoen."
diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
index 8c2148a60..cc4df0133 100644
--- a/config/locales/devise/devise.de.yml
+++ b/config/locales/devise/devise.de.yml
@@ -32,7 +32,7 @@ de:
         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}!"
+      hello: "Hallo %{username}!"
       inviter:
         accept_at: "unter %{url}, kannst du sie über den untenstehenden Link akzeptieren."
         has_invited_you: ""
@@ -50,7 +50,7 @@ de:
         click_to_unlock: "Folge dem unten aufgeführten Link, um dein Konto zu entsperren:"
         subject: "Anweisungen zum Entsperren"
         unlock: "Mein Konto entsperren"
-      welcome: "Willkommen %{email}!"
+      welcome: "Willkommen %{username}!"
     omniauth_callbacks:
       failure: "Konnte dich nicht mittels %{kind} authentifizieren, denn „%{reason}“."
       success: "Erfolgreich authentifiziert mittels %{kind}-Konto."
diff --git a/config/locales/devise/devise.de_formal.yml b/config/locales/devise/devise.de_formal.yml
index 116d5f9ca..3db6b1989 100644
--- a/config/locales/devise/devise.de_formal.yml
+++ b/config/locales/devise/devise.de_formal.yml
@@ -32,7 +32,7 @@ de_formal:
         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}!"
+      hello: "Hallo %{username}!"
       inviter:
         accept_at: "unter %{url}, können Sie sie über den untenstehenden Link akzeptieren."
         has_invited_you: "%{name}"
@@ -50,7 +50,7 @@ de_formal:
         click_to_unlock: "Folgen Sie dem unten aufgeführten Link, um Ihr Konto zu entsperren:"
         subject: "Anweisungen zum Entsperren"
         unlock: "Mein Konto entsperren"
-      welcome: "Willkommen %{email}!"
+      welcome: "Willkommen %{username}!"
     omniauth_callbacks:
       failure: "Konnte Sie nicht mittels %{kind} authentifizieren, denn „%{reason}”."
       success: "Erfolgreich authentifiziert mittels %{kind}-Konto."
diff --git a/config/locales/devise/devise.de_moo.yml b/config/locales/devise/devise.de_moo.yml
index 2dd464770..5fcb87af4 100644
--- a/config/locales/devise/devise.de_moo.yml
+++ b/config/locales/devise/devise.de_moo.yml
@@ -32,7 +32,7 @@ de_moo:
         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}!"
+      hello: "Hallo %{username}!"
       inviter:
         accept_at: "unter %{url}, kannst du sie über den untenstehenden Link akzeptieren."
         has_invited_you: "%{name}"
@@ -50,7 +50,7 @@ de_moo:
         click_to_unlock: "Folge dem unten aufgeführten Link, um dein Konto zu entsperren:"
         subject: "Anweisungen zum Entsperren"
         unlock: "Mein Konto entsperren"
-      welcome: "Willkommen %{email}!"
+      welcome: "Willkommen %{username}!"
     omniauth_callbacks:
       failure: "Konnte dich nicht mittels %{kind} authentifizieren, denn „%{reason}“."
       success: "Erfolgreich authentifiziert mittels %{kind}-Konto."
diff --git a/config/locales/devise/devise.el.yml b/config/locales/devise/devise.el.yml
index 24f5fe522..84aa82caf 100644
--- a/config/locales/devise/devise.el.yml
+++ b/config/locales/devise/devise.el.yml
@@ -29,7 +29,7 @@ el:
         confirm: "Επιβεβαίωση του λογαριασμού μου"
         subject: "Οδηγίες επιβεβαίωσης"
         you_can_confirm: "Μπορείτε να επιβεβαιώσετε τον λογαριασμό σας μέσω του παρακάτω συνδέσμου:"
-      hello: "Γειά σου %{email}!"
+      hello: "Γειά σου %{username}!"
       inviter:
         accept_at: "στο %{url}, μπορείτε να το αποδεχτείτε μέσω του παρακάτω συνδέσμου."
         has_invited_you: "%{name}"
@@ -45,7 +45,7 @@ el:
         click_to_unlock: "Κάντε κλικ στον παρακάτω σύνδεσμο για να ξεκλειδώσετε το λογαριασμό σας:"
         subject: "Οδηγίες Ξεκλειδώματος"
         unlock: "Ξεκλείδωμα του λογαριασμού μου"
-      welcome: "Καλώς ήρθατε %{email}!"
+      welcome: "Καλώς ήρθατε %{username}!"
     passwords:
       edit:
         change_password: "Αλλαγή του κωδικού μου"
diff --git a/config/locales/devise/devise.en_1337.yml b/config/locales/devise/devise.en_1337.yml
index 3f78ebae3..27b3b7944 100644
--- a/config/locales/devise/devise.en_1337.yml
+++ b/config/locales/devise/devise.en_1337.yml
@@ -27,7 +27,7 @@ en_1337:
         confirm: "C0NF1RM3 MY 4CC!"
         subject: "C0NF1RM471ON 1N57RUC71ONS"
         you_can_confirm: "4CC C0MF1RM471ON -> L1NK B3L0W"
-      hello: "H3Y %{email}!"
+      hello: "H3Y %{username}!"
       inviter:
         accept_at: "@ %{url}, U C4N 4CC3P7 17 -> L1NK!"
         have_invited_you: "%{names} H4V3 1NV173D Y0U 2 J01N!"
@@ -42,7 +42,7 @@ en_1337:
         click_to_unlock: "T0 J01N -> CL1CK 7H3 L1NK B3L0W!"
         subject: "UNL0CK 1N57RUC71ON5"
         unlock: "P0WN MY 4CC!"
-      welcome: "W3LC0M3 %{email}!"
+      welcome: "W3LC0M3 %{username}!"
     passwords:
       edit:
         change_password: "CH4NG3 MY *****"
diff --git a/config/locales/devise/devise.en_shaw.yml b/config/locales/devise/devise.en_shaw.yml
index bcc5e08d0..5d46c6ab2 100644
--- a/config/locales/devise/devise.en_shaw.yml
+++ b/config/locales/devise/devise.en_shaw.yml
@@ -28,7 +28,7 @@ en_shaw:
         confirm: "𐑒𐑩𐑯𐑓𐑻𐑥 𐑥𐑲 𐑩𐑒𐑬𐑯𐑑"
         subject: "𐑒𐑪𐑯𐑓𐑼𐑥𐑱𐑖𐑩𐑯 𐑦𐑯𐑕𐑑𐑮𐑳𐑒𐑖𐑩𐑯𐑟"
         you_can_confirm: "𐑿 𐑒𐑨𐑯 𐑒𐑩𐑯𐑓𐑻𐑥 𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑔𐑮𐑵 𐑞 𐑤𐑦𐑙𐑒 𐑚𐑦𐑤𐑴:"
-      hello: "𐑣𐑧𐑤𐑴 %{email}!"
+      hello: "𐑣𐑧𐑤𐑴 %{username}!"
       reset_password_instructions:
         change: "𐑗𐑱𐑯𐑡 𐑥𐑲 𐑐𐑨𐑕𐑢𐑼𐑛"
         ignore: "𐑦𐑓 𐑿 𐑛𐑦𐑛𐑯𐑑 𐑮𐑦𐑒𐑢𐑧𐑕𐑑 𐑞𐑦𐑕, 𐑐𐑤𐑰𐑟 𐑦𐑜𐑯𐑹 𐑞𐑦𐑕 𐑦-𐑥𐑱𐑤."
@@ -40,7 +40,7 @@ en_shaw:
         click_to_unlock: "𐑒𐑤𐑦𐑒 𐑞 𐑤𐑦𐑙𐑒 𐑚𐑦𐑤𐑴 𐑑 𐑩𐑯𐑤𐑪𐑒 𐑿𐑼 𐑩𐑒𐑬𐑯𐑑:"
         subject: "𐑩𐑯𐑤𐑪𐑒 𐑦𐑯𐑕𐑑𐑮𐑳𐑒𐑖𐑩𐑯𐑟"
         unlock: "𐑩𐑯𐑤𐑪𐑒 𐑥𐑲 𐑩𐑒𐑬𐑯𐑑"
-      welcome: "𐑢𐑧𐑤𐑒𐑩𐑥 %{email}!"
+      welcome: "𐑢𐑧𐑤𐑒𐑩𐑥 %{username}!"
     passwords:
       edit:
         change_password: "𐑗𐑱𐑯𐑡 𐑥𐑲 𐑐𐑨𐑕𐑢𐑼𐑛"
diff --git a/config/locales/devise/devise.en_valspeak.yml b/config/locales/devise/devise.en_valspeak.yml
index 51159c2d4..8730f850e 100644
--- a/config/locales/devise/devise.en_valspeak.yml
+++ b/config/locales/devise/devise.en_valspeak.yml
@@ -30,7 +30,7 @@ en_valspeak:
         confirm: "Confirm mah account!!"
         subject: "Stuff liek, tellin u how 2 confirm ur account n stuff..."
         you_can_confirm: "U can confirm ur account through teh link below:"
-      hello: "Ohai %{email}!!"
+      hello: "Ohai %{username}!!"
       inviter:
         accept_at: "so like, @ %{url} u can accept it through the link below. Kay? <3"
         has_invited_you: "%{name}"
@@ -48,7 +48,7 @@ en_valspeak:
         click_to_unlock: "Click teh link below 2 unlock ur account, kay?:"
         subject: "Unlock ur stuff info"
         unlock: "Unlock mah account!!!"
-      welcome: "OHAI! %{email}!"
+      welcome: "OHAI! %{username}!"
     passwords:
       edit:
         change_password: "Change mah passwerddd"
diff --git a/config/locales/devise/devise.eo.yml b/config/locales/devise/devise.eo.yml
index 614b286c9..ce9f15bcd 100644
--- a/config/locales/devise/devise.eo.yml
+++ b/config/locales/devise/devise.eo.yml
@@ -29,7 +29,7 @@ eo:
         confirm: "Konfirmi mian konton"
         subject: "Instrukcioj por konfirmi"
         you_can_confirm: "Vi povas konfirmi vian konton per la suba ligilo:"
-      hello: "Saluton, %{email}!"
+      hello: "Saluton, %{username}!"
       inviter:
         accept_at: "ĉe %{url}, vi povas akcepti ĝin per la suba ligilo."
         has_invited_you: "%{name}"
@@ -47,7 +47,7 @@ eo:
         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}!"
+      welcome: "Bonvenon %{username}!"
     passwords:
       edit:
         change_password: "Ŝanĝi mian pasvorton"
diff --git a/config/locales/devise/devise.es-AR.yml b/config/locales/devise/devise.es-AR.yml
index c22f4d628..aac87b8ab 100644
--- a/config/locales/devise/devise.es-AR.yml
+++ b/config/locales/devise/devise.es-AR.yml
@@ -32,7 +32,7 @@ es-AR:
         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}!"
+      hello: "¡Hola %{username}!"
       inviter:
         accept_at: "en %{url}, podes aceptarlo desde el link  de abajo "
         has_invited_you: "%{name} te ha invitado a unirte a Diaspora"
@@ -50,7 +50,7 @@ es-AR:
         click_to_unlock: "Hacé click en el siguiente enlace para desbloquear tu cuenta:"
         subject: "Instrucciones para desbloquear la cuenta"
         unlock: "Desbloquear mi cuenta"
-      welcome: "¡Bienvenid@ %{email}!"
+      welcome: "¡Bienvenid@ %{username}!"
     omniauth_callbacks:
       failure: "Podrías no ser autenticado desde %{kind} porque \"%{reason}\"."
       success: "Autenticado correctamente desde la cuenta %{kind}."
diff --git a/config/locales/devise/devise.es-CL.yml b/config/locales/devise/devise.es-CL.yml
index 1f2e1a2d5..b0e634093 100644
--- a/config/locales/devise/devise.es-CL.yml
+++ b/config/locales/devise/devise.es-CL.yml
@@ -31,7 +31,7 @@ es-CL:
         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}!"
+      hello: "Hola %{username}!"
       inviter:
         accept_at: "en %{url}, puedes aceptar en el enlace inferior."
         has_invited_you: "%{name}"
@@ -49,7 +49,7 @@ es-CL:
         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: "Bienvenid@ %{email}!"
+      welcome: "Bienvenid@ %{username}!"
     omniauth_callbacks:
       failure: "No se pudo autenticar desde %{kind} porque \"%{reason}\"."
       success: "Autenticado correctamente desde %{kind} cuenta."
diff --git a/config/locales/devise/devise.es-MX.yml b/config/locales/devise/devise.es-MX.yml
index 398ea72e6..b74727659 100644
--- a/config/locales/devise/devise.es-MX.yml
+++ b/config/locales/devise/devise.es-MX.yml
@@ -29,7 +29,7 @@ es-MX:
         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}!"
+      hello: "¡Hola %{username}!"
       inviter:
         accept_at: "en %{url} puedes aceptarlo a través del siguiente enlace."
         has_invited_you: "%{name}"
@@ -45,7 +45,7 @@ es-MX:
         click_to_unlock: "Haz clic en el siguiente enlace para desbloquear tu cuenta:"
         subject: "Instrucciones de desbloqueo"
         unlock: "Desbloquear mi cuenta"
-      welcome: "¡Bienvenido/a %{email}!"
+      welcome: "¡Bienvenido/a %{username}!"
     passwords:
       edit:
         change_password: "Cambiar mi contraseña"
diff --git a/config/locales/devise/devise.es-VE.yml b/config/locales/devise/devise.es-VE.yml
index 00db4f0bc..0303f84a3 100644
--- a/config/locales/devise/devise.es-VE.yml
+++ b/config/locales/devise/devise.es-VE.yml
@@ -28,7 +28,7 @@ es-VE:
         confirm: "Confirmar mi cuenta"
         subject: "Instrucciones para la confirmación"
         you_can_confirm: "Puedes confirmar tu cuenta a través del siguiente enlace:"
-      hello: "¡Hola %{email}!"
+      hello: "¡Hola %{username}!"
       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 en una forma totalmente nueva."
@@ -73,7 +73,7 @@ es-VE:
         click_to_unlock: "Haz clic en el siguiente enlace para desbloquear tu cuenta:"
         subject: "Instrucciones para desbloquear tu cuenta"
         unlock: "Desbloquear mi cuenta"
-      welcome: "¡Bienvenid@ %{email}!"
+      welcome: "¡Bienvenid@ %{username}!"
     passwords:
       edit:
         change_password: "Cambiar mi contraseña"
diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml
index 797f02f9d..44303ef20 100644
--- a/config/locales/devise/devise.es.yml
+++ b/config/locales/devise/devise.es.yml
@@ -32,7 +32,7 @@ es:
         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}!"
+      hello: "¡Hola %{username}!"
       inviter:
         accept_at: "en %{url}, puedes aceptar en el enlace inferior."
         has_invited_you: "%{name} te ha invitado a unirte a Diaspora"
@@ -50,7 +50,7 @@ es:
         click_to_unlock: "Sigue el siguiente enlace para desbloquear tu cuenta:"
         subject: "Instrucciones para desbloquear la cuenta"
         unlock: "Desbloquear mi cuenta"
-      welcome: "¡Bienvenid@ %{email}!"
+      welcome: "¡Bienvenid@ %{username}!"
     omniauth_callbacks:
       failure: "No pudimos identificarte desde %{kind} por \"%{reason}\"."
       success: "Identificado correctamente desde la cuenta %{kind}."
diff --git a/config/locales/devise/devise.et.yml b/config/locales/devise/devise.et.yml
index a049c4b77..bbafd8293 100644
--- a/config/locales/devise/devise.et.yml
+++ b/config/locales/devise/devise.et.yml
@@ -28,7 +28,7 @@ et:
         confirm: "Kinnita mu konto"
         subject: "Kinnitamise juhised"
         you_can_confirm: "Sa saad oma konto kinnitada järgneva lingi abil:"
-      hello: "Tere %{email}!"
+      hello: "Tere %{username}!"
       inviter:
         accept_at: "aadressil %{url}, sa saad kutse aksepteerida.kasutades alljärgnevat linki."
         has_invited_you: "%{name}"
@@ -36,7 +36,7 @@ et:
       reset_password_instructions:
         change: "Muuda mu parooli"
         subject: "Parooli taastamise juhised"
-      welcome: "%{email}, tere tulemast!"
+      welcome: "%{username}, tere tulemast!"
     passwords:
       edit:
         change_password: "Muuda parooli"
diff --git a/config/locales/devise/devise.eu.yml b/config/locales/devise/devise.eu.yml
index 80e01cefc..05af2ed5d 100644
--- a/config/locales/devise/devise.eu.yml
+++ b/config/locales/devise/devise.eu.yml
@@ -28,7 +28,7 @@ eu:
         confirm: "Kontua baieztatu"
         subject: "Baieztapen argibideak"
         you_can_confirm: "Zure kontua baieztatu dezakezu esteka hau jarraituz:"
-      hello: "Kaixo %{email}!"
+      hello: "Kaixo %{username}!"
       inviter:
         accept_at: "%{url}(e)n, onartu dezakezu beheko esteka jarraituz."
         has_invited_you: "%{name}"
@@ -44,7 +44,7 @@ eu:
         click_to_unlock: "Sakatu honako estekan zure kontua askatzeko:"
         subject: "Askatu argibideak"
         unlock: "Askatu nire kontua"
-      welcome: "Ongietorri, %{email}!"
+      welcome: "Ongietorri, %{username}!"
     passwords:
       edit:
         change_password: "Nire pasahitza aldatu"
diff --git a/config/locales/devise/devise.fi.yml b/config/locales/devise/devise.fi.yml
index d102a6455..f9fd1390d 100644
--- a/config/locales/devise/devise.fi.yml
+++ b/config/locales/devise/devise.fi.yml
@@ -32,7 +32,7 @@ fi:
         confirm: "Vahvista käyttäjätilini"
         subject: "Vahvistamisohjeet"
         you_can_confirm: "Voit vahvistaa käyttäjätilisi alla olevan linkin kautta:"
-      hello: "Hei, %{email}!"
+      hello: "Hei, %{username}!"
       inviter:
         accept_at: "osoitteessa %{url}, hyväksyminen alla olevasta linkistä."
         has_invited_you: "%{names}"
@@ -50,7 +50,7 @@ fi:
         click_to_unlock: "Poista käyttäjätilisi lukitus alla olevasta linkistä:"
         subject: "Lukituksen poisto-ohjeet"
         unlock: "Poista käyttäjätilini lukitus"
-      welcome: "Tervetuloa %{email}!"
+      welcome: "Tervetuloa %{username}!"
     passwords:
       edit:
         change_password: "Vaihda salasanani"
diff --git a/config/locales/devise/devise.fil.yml b/config/locales/devise/devise.fil.yml
index 158c75fdb..e66f43896 100644
--- a/config/locales/devise/devise.fil.yml
+++ b/config/locales/devise/devise.fil.yml
@@ -7,7 +7,7 @@
 fil:
   devise:
     mailer:
-      hello: "Kumusta %{email}!"
+      hello: "Kumusta %{username}!"
     sessions:
       new:
         remember_me: "Tandaan Ako"
diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index c50dcf6d9..b3d03c1d0 100644
--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -32,7 +32,7 @@ fr:
         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} !"
+      hello: "Bonjour %{username} !"
       inviter:
         accept_at: "à %{url}, vous pouvez l'accepter à travers le lien ci-dessous."
         has_invited_you: "%{name}"
@@ -50,7 +50,7 @@ fr:
         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} !"
+      welcome: "Bienvenue %{username} !"
     omniauth_callbacks:
       failure: "Impossible de vous authentifier depuis %{kind} car \"%{reason}\"."
       success: "Authentification réussie depuis le compte %{kind}."
diff --git a/config/locales/devise/devise.fy.yml b/config/locales/devise/devise.fy.yml
index 712881761..3423d65fb 100644
--- a/config/locales/devise/devise.fy.yml
+++ b/config/locales/devise/devise.fy.yml
@@ -12,13 +12,13 @@ fy:
     mailer:
       confirmation_instructions:
         confirm: "Myn akkount befêstigje"
-      hello: "Guoi %{email}!"
+      hello: "Guoi %{username}!"
       inviter:
         has_invited_you: "%{name}"
         have_invited_you: "%{names} ha dy útnoadige om jin oan te slute by Diaspora"
       reset_password_instructions:
         change: "Feroarje myn wachtwurd"
-      welcome: "Wolkom %{email}!"
+      welcome: "Wolkom %{username}!"
     passwords:
       edit:
         change_password: "Feroarje myn wachtwurd"
diff --git a/config/locales/devise/devise.ga.yml b/config/locales/devise/devise.ga.yml
index c4e432ee7..f126525f3 100644
--- a/config/locales/devise/devise.ga.yml
+++ b/config/locales/devise/devise.ga.yml
@@ -7,8 +7,8 @@
 ga:
   devise:
     mailer:
-      hello: "Haileo %{email}!"
-      welcome: "Fáilte %{email}!"
+      hello: "Haileo %{username}!"
+      welcome: "Fáilte %{username}!"
     sessions:
       new:
         login: "Logáil isteach"
diff --git a/config/locales/devise/devise.gl.yml b/config/locales/devise/devise.gl.yml
index 3e0da9575..8a6cfe541 100644
--- a/config/locales/devise/devise.gl.yml
+++ b/config/locales/devise/devise.gl.yml
@@ -32,7 +32,7 @@ gl:
         confirm: "Confirmar a conta"
         subject: "Instrucións de confirmación"
         you_can_confirm: "Pode confirmar a súa conta mediante a seguinte ligazón:"
-      hello: "Ola, %{email}!"
+      hello: "Ola, %{username}!"
       inviter:
         accept_at: "en %{url}, pode aceptar seguindo a seguinte ligazón."
         has_invited_you: "%{name}"
@@ -50,7 +50,7 @@ gl:
         click_to_unlock: "Siga a seguinte ligazón para desbloqueala:"
         subject: "Instrucións para desbloquear a conta"
         unlock: "Desbloquear a conta"
-      welcome: "Benvido, %{email}!"
+      welcome: "Benvido, %{username}!"
     omniauth_callbacks:
       failure: "Non se puido autenticar desde %{kind} debido a \"%{reason}\"."
       success: "Autenticada correctamente desde a conta %{kind}"
diff --git a/config/locales/devise/devise.he.yml b/config/locales/devise/devise.he.yml
index d17dae6ac..e39698c11 100644
--- a/config/locales/devise/devise.he.yml
+++ b/config/locales/devise/devise.he.yml
@@ -29,7 +29,7 @@ he:
         confirm: "אימות החשבון שלי"
         subject: "הנחיות לאימות"
         you_can_confirm: "באפשרותך לאמת את החשבון שלך באמצעות הקישור שלהלן:"
-      hello: "שלום %{email}!"
+      hello: "שלום %{username}!"
       inviter:
         accept_at: "בכתובת %{url}, באפשרותך לקבל זאת באמצעות הקישור שלהלן."
         has_invited_you: "%{name}"
@@ -45,7 +45,7 @@ he:
         click_to_unlock: "יש ללחוץ על הקישור שלהלן כדי לשחרר את חשבונך:"
         subject: "הנחיות לביטול הנעילה"
         unlock: "שחרור החשבון שלי"
-      welcome: "ברוך בואך %{email}!"
+      welcome: "ברוך בואך %{username}!"
     passwords:
       edit:
         change_password: "שינוי הסיסמה שלי"
diff --git a/config/locales/devise/devise.hu.yml b/config/locales/devise/devise.hu.yml
index e7730cba2..77188ada4 100644
--- a/config/locales/devise/devise.hu.yml
+++ b/config/locales/devise/devise.hu.yml
@@ -29,7 +29,7 @@ hu:
         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}!"
+      hello: "Szia %{username}!"
       inviter:
         accept_at: "Meghívás elfogadása: %{url}"
         has_invited_you: "%{name} meghívott a Diaspora* közösségi oldalra."
@@ -45,7 +45,7 @@ hu:
         click_to_unlock: "Kattints az alábbi linkre, hogy feloldd a fiókod:"
         subject: "Feloldási utasítások"
         unlock: "Fiókom feloldása"
-      welcome: "Üdv %{email}!"
+      welcome: "Üdv %{username}!"
     passwords:
       edit:
         change_password: "Megváltoztatom a jelszavamat"
diff --git a/config/locales/devise/devise.hye-classical.yml b/config/locales/devise/devise.hye-classical.yml
index 50a0953c0..30ac5ad91 100644
--- a/config/locales/devise/devise.hye-classical.yml
+++ b/config/locales/devise/devise.hye-classical.yml
@@ -32,7 +32,7 @@ hye-classical:
         confirm: "Հաստատել իմ հաշիւը"
         subject: "Հաստատման ցուցումներ"
         you_can_confirm: "Կարող ես հաշիւդ հաստատել հետեւեալ յղմամբ՝"
-      hello: "Ողջո՜յն, %{email}"
+      hello: "Ողջո՜յն, %{username}"
       inviter:
         accept_at: "%{url} հասցէով, որը կարող ես հաստատել ստորև բերուած յղման միջոցով։"
         have_invited_you: "%{names} հրաւիրել է քեզ՝ միանալու դիասպորա*֊ին"
@@ -49,7 +49,7 @@ hye-classical:
         click_to_unlock: "Սեղմիր ներքեւի յղումը, որպէսզի ապաարգելափակես հաշիւդ։"
         subject: "Ապաարգելափակման ցուցումներ"
         unlock: "Ապաարգելափակել հաշիւս"
-      welcome: "Բարի գալո՜ւստ, %{email}"
+      welcome: "Բարի գալո՜ւստ, %{username}"
     omniauth_callbacks:
       failure: "Չյաջողուեց նոյնականացնել քեզ %{kind}֊ից զի՝ %{reason}"
       success: "Յաջողութեամբ նոյնականացումն անցար %{kind} հաշուով։"
diff --git a/config/locales/devise/devise.hye.yml b/config/locales/devise/devise.hye.yml
index a16917e5d..ebc5af203 100644
--- a/config/locales/devise/devise.hye.yml
+++ b/config/locales/devise/devise.hye.yml
@@ -32,7 +32,7 @@ hye:
         confirm: "Հաստատել իմ հաշիվը"
         subject: "Հաստատման ցուցումներ"
         you_can_confirm: "Կարող ես հաշիվդ հաստատել հետևյալ հղմամբ՝"
-      hello: "Ողջու՜յն, %{email}"
+      hello: "Ողջու՜յն, %{username}"
       inviter:
         accept_at: "%{url} հասցեով, որը կարող ես հաստատել ստորև բերված հղման միջոցով։"
         has_invited_you: "%{name}"
@@ -50,7 +50,7 @@ hye:
         click_to_unlock: "Սեղմիր ներքևի հղումը, որպեսզի ապաարգելափակես հաշիվդ։"
         subject: "Ապաարգելափակման ցուցումներ"
         unlock: "Ապաարգելափակել հաշիվս"
-      welcome: "Բարի գալու՜ստ, %{email}"
+      welcome: "Բարի գալու՜ստ, %{username}"
     passwords:
       edit:
         change_password: "Փոխել իմ գաղտնաբառը"
diff --git a/config/locales/devise/devise.ia.yml b/config/locales/devise/devise.ia.yml
index b950b6a63..687179ade 100644
--- a/config/locales/devise/devise.ia.yml
+++ b/config/locales/devise/devise.ia.yml
@@ -32,7 +32,7 @@ ia:
         confirm: "Confirmar mi conto"
         subject: "Instructiones pro confirmar"
         you_can_confirm: "Tu pote confirmar tu conto per le ligamine sequente:"
-      hello: "Salute, %{email}!"
+      hello: "Salute, %{username}!"
       inviter:
         accept_at: "a %{url}, tu pote acceptar lo per le ligamine sequente."
         has_invited_you: "%{name}"
@@ -50,7 +50,7 @@ ia:
         click_to_unlock: "Clicca sur le ligamine sequente pro disblocar tu conto:"
         subject: "Instructiones pro disblocar"
         unlock: "Disblocar mi conto"
-      welcome: "Benvenite, %{email}!"
+      welcome: "Benvenite, %{username}!"
     omniauth_callbacks:
       failure: "Impossibile authenticar te a partir de %{kind} perque \"%{reason}\"."
       success: "Authentication a partir del conto %{kind} succedite."
diff --git a/config/locales/devise/devise.id.yml b/config/locales/devise/devise.id.yml
index ba9c6d945..88f8b6adb 100644
--- a/config/locales/devise/devise.id.yml
+++ b/config/locales/devise/devise.id.yml
@@ -28,7 +28,7 @@ id:
         confirm: "Konfirmasi akun saya"
         subject: "Instruksi pengesahan / konfirmasi"
         you_can_confirm: "Anda dapat mengkonfirmasi akun anda melalui link (tautan) di bawah ini:"
-      hello: "Halo %{email}!"
+      hello: "Halo %{username}!"
       inviter:
         accept_at: "di %{url}, anda dapat menerimanya melalui link (tautan) di bawah ini."
         has_invited_you: "%{name}"
@@ -44,7 +44,7 @@ id:
         click_to_unlock: "Klik link (tautan) di bawah untuk mengaktifkan akun anda:"
         subject: "Instruksi untuk membuka kunci"
         unlock: "Aktifkan akun saya"
-      welcome: "Selamat datang %{email}!"
+      welcome: "Selamat datang %{username}!"
     passwords:
       edit:
         change_password: "Ubah kata sandi saya"
diff --git a/config/locales/devise/devise.is.yml b/config/locales/devise/devise.is.yml
index 9ffef47bb..eeef6baae 100644
--- a/config/locales/devise/devise.is.yml
+++ b/config/locales/devise/devise.is.yml
@@ -29,7 +29,7 @@ is:
         confirm: "Staðfesta aðganginn minn"
         subject: "Leiðbeiningar um staðfestingu"
         you_can_confirm: "Þú getur staðfest aðganginn þinn með því að elta hlekkinn hér fyrir neðan:"
-      hello: "Halló %{email}!"
+      hello: "Halló %{username}!"
       inviter:
         accept_at: "á %{url}. Þú getur þegið boðið með því að fylgja hlekknum hér fyrir neðan."
         has_invited_you: "%{name}"
@@ -45,7 +45,7 @@ is:
         click_to_unlock: "Eltu hlekkinn hér fyrir neðan til að taka aðgang þinn úr lás."
         subject: "Leiðbeiningar fyrir aflæsingu"
         unlock: "Taka aðgang minn úr lás"
-      welcome: "Velkomin/n %{email}!"
+      welcome: "Velkomin/n %{username}!"
     passwords:
       edit:
         change_password: "Breyta lykilorði"
diff --git a/config/locales/devise/devise.it.yml b/config/locales/devise/devise.it.yml
index ad7e1a328..2d25e5073 100644
--- a/config/locales/devise/devise.it.yml
+++ b/config/locales/devise/devise.it.yml
@@ -29,7 +29,7 @@ it:
         confirm: "Conferma il mio account"
         subject: "Istruzioni per la conferma"
         you_can_confirm: "Puoi confermare il tuo account attraverso il link sottostante:"
-      hello: "Ciao %{email}!"
+      hello: "Ciao %{username}!"
       inviter:
         accept_at: "su %{url}, puoi accettare dal link qua sotto."
         has_invited_you: "%{name} ti ha invitato ad entrare in Diaspora"
@@ -47,7 +47,7 @@ it:
         click_to_unlock: "Clicca il link sottostante per sbloccare il tuo account:"
         subject: "Istruzioni di sblocco"
         unlock: "Sblocca il mio account"
-      welcome: "Benvenuto %{email}!"
+      welcome: "Benvenuto %{username}!"
     passwords:
       edit:
         change_password: "Cambia la mia password"
diff --git a/config/locales/devise/devise.ja.yml b/config/locales/devise/devise.ja.yml
index 3cd4aaf70..7e475a511 100644
--- a/config/locales/devise/devise.ja.yml
+++ b/config/locales/devise/devise.ja.yml
@@ -32,7 +32,7 @@ ja:
         confirm: "アカウントを認証する"
         subject: "認証手続き"
         you_can_confirm: "次のリンクからアカウントが認証できます。"
-      hello: "%{email}さん、こんにちは！"
+      hello: "%{username}さん、こんにちは！"
       inviter:
         accept_at: "%{url} で、下のリンクから受け入れることができます。"
         has_invited_you: "%{name}さん"
@@ -50,7 +50,7 @@ ja:
         click_to_unlock: "アカウントのロックを解除するのに下記のリンクにクリックしてください。"
         subject: "ロック解除説明"
         unlock: "アカウントのロックを解除する"
-      welcome: "%{email}さん、ようこそ！"
+      welcome: "%{username}さん、ようこそ！"
     omniauth_callbacks:
       failure: "\"%{reason}\" のため、%{kind} から認証できませんでした。"
       success: "%{kind} のアカウントから正常に認証しました。"
diff --git a/config/locales/devise/devise.ka.yml b/config/locales/devise/devise.ka.yml
index abe1c3e0e..5b4f3d2f9 100644
--- a/config/locales/devise/devise.ka.yml
+++ b/config/locales/devise/devise.ka.yml
@@ -28,7 +28,7 @@ ka:
         confirm: "ჩემი ანგარიშის დადასტურება"
         subject: "დადასტურების ინსტუქცია"
         you_can_confirm: "თქვენ, თქვენი ანგარიშის დადასტურება შეგიძლიათ ქვემოთ მოცემული ბმულით:"
-      hello: "გამარჯობა %{email}!"
+      hello: "გამარჯობა %{username}!"
       inviter:
         accept_at: "%{url}, თქვენ შეგიძლიათ დაეთანხმოთ ქვემოთ მოცემული ბმულის გამოყენებით."
         has_invited_you: "%{name}"
@@ -44,7 +44,7 @@ ka:
         click_to_unlock: "ანგარიშის გასახსნელად დააწკაპუნეთ ქვემოთ მოცემულ ბმულს:"
         subject: "გახსნის ინსტრუქციები"
         unlock: "ჩემი ანგარიშის გახსნა"
-      welcome: "მოგესალმებით %{email}!"
+      welcome: "მოგესალმებით %{username}!"
     passwords:
       edit:
         change_password: "ჩემი პაროლის შეცვლა"
diff --git a/config/locales/devise/devise.ko.yml b/config/locales/devise/devise.ko.yml
index 576f65508..69755cae3 100644
--- a/config/locales/devise/devise.ko.yml
+++ b/config/locales/devise/devise.ko.yml
@@ -29,7 +29,7 @@ ko:
         confirm: "내 계정 확인하기"
         subject: "확인 절차"
         you_can_confirm: "아래 링크로 계정을 확인할 수 있습니다:"
-      hello: "%{email}님!"
+      hello: "%{username}님!"
       inviter:
         accept_at: "%{URL}에서, 아래의 링크를 통해 확인할 수 있습니다."
         has_invited_you: "%{name}"
@@ -45,7 +45,7 @@ ko:
         click_to_unlock: "아래 링크로 계정을 풀을 수 있습니다:"
         subject: "계정 풀기 안내"
         unlock: "내 계정 풀기"
-      welcome: "%{email}님 환영합니다!"
+      welcome: "%{username}님 환영합니다!"
     passwords:
       edit:
         change_password: "암호 바꾸기"
diff --git a/config/locales/devise/devise.lt.yml b/config/locales/devise/devise.lt.yml
index 2461cb093..13d2a7102 100644
--- a/config/locales/devise/devise.lt.yml
+++ b/config/locales/devise/devise.lt.yml
@@ -28,7 +28,7 @@ lt:
         confirm: "Patvirtinti paskyrą"
         subject: "Nurodymai, kaip patvirtinti paskyrą"
         you_can_confirm: "Paskyrą galite patvirtinti paspaudę nuorodą pateiktą žemiau:"
-      hello: "Labas, %{email}!"
+      hello: "Labas, %{username}!"
       inviter:
         accept_at: "priimti kvietimą galite paspaudę nuorodą žemiau %{url}"
         has_invited_you: ""
@@ -44,7 +44,7 @@ lt:
         click_to_unlock: "Spustelk šią nuorodą ir paskyra bus atrakinta:"
         subject: "Nurodymai, kaip atrakinti"
         unlock: "Atrakinti mano paskyrą"
-      welcome: "Labas, %{email}!"
+      welcome: "Labas, %{username}!"
     passwords:
       edit:
         change_password: "Keisti mano slaptažodį"
diff --git a/config/locales/devise/devise.mk.yml b/config/locales/devise/devise.mk.yml
index 2c648a3ed..c8251a5b9 100644
--- a/config/locales/devise/devise.mk.yml
+++ b/config/locales/devise/devise.mk.yml
@@ -28,7 +28,7 @@ mk:
         confirm: "Потврди ја мојата корисничка сметка"
         subject: "Инструкции за потврдување"
         you_can_confirm: "Можете да ја потврдите вашата корисничка сметка на долниот линк:"
-      hello: "Здраво %{email}!"
+      hello: "Здраво %{username}!"
       reset_password_instructions:
         change: "Промени лозинка"
         ignore: "Ако не го побаравте ова, ве молиме игнорирајте го овој е-маил."
@@ -40,7 +40,7 @@ mk:
         click_to_unlock: "Кликнете го долниот линк за отклучување на вашата сметка:"
         subject: "Инструкции за отклучување"
         unlock: "Отклучи ја мојата сметка"
-      welcome: "Добредојде %{email}!"
+      welcome: "Добредојде %{username}!"
     passwords:
       edit:
         change_password: "Промена на лозинка"
diff --git a/config/locales/devise/devise.ml.yml b/config/locales/devise/devise.ml.yml
index 17d777049..bbd0e0cb9 100644
--- a/config/locales/devise/devise.ml.yml
+++ b/config/locales/devise/devise.ml.yml
@@ -29,7 +29,7 @@ ml:
         confirm: "എന്റെ അക്കൌണ്ട് സ്ഥിരീകരിക്കുക"
         subject: "സ്ഥിരീകരണത്തിനുള്ള വിവരങ്ങള്‍"
         you_can_confirm: "താഴെയുള്ള കണ്ണിയിലൂടെ താങ്കള്‍ക്ക് അക്കൌണ്ട് സ്ഥിരീകരിക്കാവുന്നതാണ്:"
-      hello: "നമസ്ക്കാരം %{email}!"
+      hello: "നമസ്ക്കാരം %{username}!"
       inviter:
         has_invited_you: "%{name}"
         have_invited_you: "%{names} എന്നിവര്‍ താങ്കളെ ഡയസ്പോറയില്‍ ചേരാന്‍ ക്ഷണിച്ചിരിക്കുന്നു"
@@ -43,7 +43,7 @@ ml:
         click_to_unlock: "നിങ്ങളുടെ അക്കൌണ്ട് തുറക്കുന്നതിനായി താഴെയുള്ള കണ്ണി തെരഞ്ഞെടുക്കുക:"
         subject: "അക്കൌണ്ട് തുറക്കുന്നതിനുള്ള വിവരങ്ങള്‍"
         unlock: "എന്റെ ആക്കൌണ്ട് തുറക്കുക"
-      welcome: "സ്വാഗതം %{email}!"
+      welcome: "സ്വാഗതം %{username}!"
     passwords:
       edit:
         change_password: "എന്റെ രഹസ്യവാക്ക് മാറ്റുക"
diff --git a/config/locales/devise/devise.ms.yml b/config/locales/devise/devise.ms.yml
index bb90cd9bd..426592f62 100644
--- a/config/locales/devise/devise.ms.yml
+++ b/config/locales/devise/devise.ms.yml
@@ -29,7 +29,7 @@ ms:
         confirm: "Sahkan akaun saya"
         subject: "pengesahan tunjuk-cara"
         you_can_confirm: "Anda boleh mengesahkan akaun anda melalui link di bawah:"
-      hello: "Hello %{email}!"
+      hello: "Hello %{username}!"
       inviter:
         accept_at: "pada% {url}, anda boleh menerimanya melalui link di bawah."
         have_invited_you: "%{names} telah menjemput anda untuk menyertai Diaspora"
@@ -44,7 +44,7 @@ ms:
         click_to_unlock: "Klik pautan di bawah untuk membuka akaun anda:"
         subject: "Arahan Membuka Kunci"
         unlock: "Buka kunci akaun saya"
-      welcome: "Selamat Datang %{email}!"
+      welcome: "Selamat Datang %{username}!"
     passwords:
       edit:
         change_password: "Tukar kata laluan saya"
diff --git a/config/locales/devise/devise.nb.yml b/config/locales/devise/devise.nb.yml
index acea84092..2cfb7a1b9 100644
--- a/config/locales/devise/devise.nb.yml
+++ b/config/locales/devise/devise.nb.yml
@@ -32,7 +32,7 @@ nb:
         confirm: "Bekreft kontoen min"
         subject: "Bekreftelsesinstrukser"
         you_can_confirm: "Du kan bekrefte kontoen via linken nedenfor:"
-      hello: "Hei %{email}!"
+      hello: "Hei %{username}!"
       inviter:
         accept_at: "via %{url}, kan du akseptere lenken du ser under"
         has_invited_you: "%{name}"
@@ -50,7 +50,7 @@ nb:
         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}!"
+      welcome: "Velkommen %{username}!"
     omniauth_callbacks:
       failure: "Kunne ikke autentisere deg fra %{kind} på grunn av «%{reason}»."
       success: "Du ble autentisert fra %{kind}-konto."
diff --git a/config/locales/devise/devise.nds.yml b/config/locales/devise/devise.nds.yml
index d3ef320d4..87475e9c2 100644
--- a/config/locales/devise/devise.nds.yml
+++ b/config/locales/devise/devise.nds.yml
@@ -20,7 +20,7 @@ nds:
       send_instructions: "Diene Inlodung is afschickt worn."
       updated: "Dien Passwoort is erfolgriek set worn. Du bist nu anmeld."
     mailer:
-      hello: "Hallo %{email}!"
+      hello: "Hallo %{username}!"
       inviter:
         has_invited_you: "%{name}"
       reset_password_instructions:
@@ -28,7 +28,7 @@ nds:
       unlock_instructions:
         subject: "Anwisungen ton Entsparn"
         unlock: "Mien Konto entsparn"
-      welcome: "Willkomen %{email}!"
+      welcome: "Willkomen %{username}!"
     passwords:
       edit:
         change_password: "Änner mien Passwoort"
diff --git a/config/locales/devise/devise.ne.yml b/config/locales/devise/devise.ne.yml
index 5e3ec732b..c3f75fa4b 100644
--- a/config/locales/devise/devise.ne.yml
+++ b/config/locales/devise/devise.ne.yml
@@ -7,12 +7,12 @@
 ne:
   devise:
     mailer:
-      hello: "नमस्ते %{email} !"
+      hello: "नमस्ते %{username} !"
       inviter:
         has_invited_you: "%{name}"
       reset_password_instructions:
         change: "पासवर्ड परिवर्तन गर्नुहोस्"
-      welcome: "स्वागतम %{email} !"
+      welcome: "स्वागतम %{username} !"
     passwords:
       edit:
         change_password: "पासवर्ड परिवर्तन गर्नुहोस्"
diff --git a/config/locales/devise/devise.nl.yml b/config/locales/devise/devise.nl.yml
index 6106d5a8d..7a7f110d9 100644
--- a/config/locales/devise/devise.nl.yml
+++ b/config/locales/devise/devise.nl.yml
@@ -30,7 +30,7 @@ nl:
         confirm: "Bevestig mijn account"
         subject: "Bevestigingsinstructies"
         you_can_confirm: "Je kunt je account bevestigen via onderstaande link:"
-      hello: "Hallo %{email}!"
+      hello: "Hallo %{username}!"
       inviter:
         accept_at: "op %{url}, je kunt deze accepteren via onderstaande link."
         has_invited_you: "%{name}"
@@ -48,7 +48,7 @@ nl:
         click_to_unlock: "Klik op onderstaande link om je account te ontgrendelen:"
         subject: "Ontgrendelingsinstructies"
         unlock: "Ontgrendel mijn account"
-      welcome: "Welkom %{email}!"
+      welcome: "Welkom %{username}!"
     passwords:
       edit:
         change_password: "Wijzig mijn wachtwoord"
diff --git a/config/locales/devise/devise.nn.yml b/config/locales/devise/devise.nn.yml
index f7a936c0f..1e5def6ef 100644
--- a/config/locales/devise/devise.nn.yml
+++ b/config/locales/devise/devise.nn.yml
@@ -28,7 +28,7 @@ nn:
         confirm: "Stadfest kontoen min"
         subject: "Stadfestingsrettleiing"
         you_can_confirm: "Du kan stadfesta kontoen din ved å nytta lenkja nedanfor:"
-      hello: "Hei %{email}."
+      hello: "Hei %{username}."
       inviter:
         accept_at: "på %{url}, du kan godta det gjennom lenkja nedanfor."
         has_invited_you: "%{name}"
@@ -44,7 +44,7 @@ nn:
         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}."
+      welcome: "Velkomen %{username}."
     passwords:
       edit:
         change_password: "Endra passordet mitt"
diff --git a/config/locales/devise/devise.oc.yml b/config/locales/devise/devise.oc.yml
index 7c3d8d285..cc0eaff96 100644
--- a/config/locales/devise/devise.oc.yml
+++ b/config/locales/devise/devise.oc.yml
@@ -32,7 +32,7 @@ oc:
         confirm: "Confirmar mon compte"
         subject: "Instruccions de confirmacion"
         you_can_confirm: "Podètz confirmar vòstre compte en clicant sul ligam çaijós :"
-      hello: "Adieusiatz %{email} !"
+      hello: "Adieusiatz %{username} !"
       inviter:
         accept_at: "a %{url}, lo podètz acceptar a travèrs lo ligal çaijós."
         has_invited_you: "%{name}"
@@ -50,7 +50,7 @@ oc:
         click_to_unlock: "Clicatz sul ligam çaijós per desblocar vòstre compte :"
         subject: "Instruccions de desverrolhatge"
         unlock: "Desverrolhar mon compte"
-      welcome: "Benvenguda %{email} !"
+      welcome: "Benvenguda %{username} !"
     omniauth_callbacks:
       failure: "Impossible de vos indentificar de %{kind} perque %{reason}"
       success: "Autentificacion capitada de lo compte %{kind}."
diff --git a/config/locales/devise/devise.pa.yml b/config/locales/devise/devise.pa.yml
index 90d4af823..e47d5726e 100644
--- a/config/locales/devise/devise.pa.yml
+++ b/config/locales/devise/devise.pa.yml
@@ -23,7 +23,7 @@ pa:
       confirmation_instructions:
         confirm: "ਮੇਰੇ ਅਕਾਊਂਟ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"
         subject: "ਪੁਸ਼ਟੀ ਹਦਾਇਤਾਂ"
-      hello: "ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ %{email}!"
+      hello: "ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ %{username}!"
       inviter:
         has_invited_you: "%{name}"
         have_invited_you: "%{names} ਨੇ ਤੁਹਾਨੂੰ ਡਿਆਸਪਰਾ ਨਾਲ ਜੁੜਨ ਲਈ ਸੱਦਿਆ ਹੈ"
@@ -34,7 +34,7 @@ pa:
         click_to_unlock: "ਆਪਣਾ ਅਕਾਊਂਟ ਅਣ-ਲਾਕ ਕਰਨ ਲਈ ਹੇਠਲੇ ਲਿੰਕ ਉੱਤੇ ਕਲਿੱਕ ਕਰੋ:"
         subject: "ਅਣ-ਲਾਕ ਹਦਾਇਤਾਂ"
         unlock: "ਮੇਰਾ ਅਕਾਊਂਟ ਅਣ-ਲਾਕ ਕਰੋ"
-      welcome: "%{email} ਜੀ ਆਇਆਂ ਨੂੰ!"
+      welcome: "%{username} ਜੀ ਆਇਆਂ ਨੂੰ!"
     passwords:
       edit:
         change_password: "ਮੇਰਾ ਪਾਸਵਰਡ ਬਦਲੋ"
diff --git a/config/locales/devise/devise.pl.yml b/config/locales/devise/devise.pl.yml
index 9c420e58e..896727def 100644
--- a/config/locales/devise/devise.pl.yml
+++ b/config/locales/devise/devise.pl.yml
@@ -32,7 +32,7 @@ pl:
         confirm: "Aktywuj moje konto"
         subject: "Instrukcja aktywacji"
         you_can_confirm: "Możesz aktywować swoje konto klikając poniższe łącze:"
-      hello: "Cześć %{email}!"
+      hello: "Cześć %{username}!"
       inviter:
         accept_at: "na %{url}, możesz je zaakceptować używając poniższego łącza."
         has_invited_you: "%{name}"
@@ -50,7 +50,7 @@ pl:
         click_to_unlock: "Kliknij poniższe łącze, aby odblokować konto:"
         subject: "Instrukcja odblokowania"
         unlock: "Odblokuj moje konto"
-      welcome: "Witaj %{email}!"
+      welcome: "Witaj %{username}!"
     omniauth_callbacks:
       failure: "Nie udało się uwierzytelnić Cię z %{kind} z powodu „%{reason}”."
       success: "Pomyślnie uwierzytelniono kontem %{kind}."
diff --git a/config/locales/devise/devise.pt-BR.yml b/config/locales/devise/devise.pt-BR.yml
index dcfce4184..0d01fd1d5 100644
--- a/config/locales/devise/devise.pt-BR.yml
+++ b/config/locales/devise/devise.pt-BR.yml
@@ -32,7 +32,7 @@ pt-BR:
         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}!"
+      hello: "Oi %{username}!"
       inviter:
         accept_at: "em %{url}, você pode aceitar através do link abaixo."
         has_invited_you: "%{name}"
@@ -50,7 +50,7 @@ pt-BR:
         click_to_unlock: "Clique no link abaixo para desbloquear a sua conta:"
         subject: "Instruções para desbloqueio"
         unlock: "Desbloquear minha conta"
-      welcome: "Bem-vindo(a) %{email}!"
+      welcome: "Bem-vindo(a) %{username}!"
     omniauth_callbacks:
       failure: "Não foi possível autenticar você pelo %{kind} porque \"%{reason}\"."
       success: "Autenticação com conta do %{kind} bem-sucedida."
diff --git a/config/locales/devise/devise.pt-PT.yml b/config/locales/devise/devise.pt-PT.yml
index b617786ae..6761ee657 100644
--- a/config/locales/devise/devise.pt-PT.yml
+++ b/config/locales/devise/devise.pt-PT.yml
@@ -28,7 +28,7 @@ pt-PT:
         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}!"
+      hello: "Olá %{username}!"
       inviter:
         accept_at: "em %{url}, pode aceitá-lo através da hiperligação abaixo."
         has_invited_you: "%{name}"
@@ -44,7 +44,7 @@ pt-PT:
         click_to_unlock: "Clique na seguinte hiperligação para desbloquear a sua conta:"
         subject: "Instruções de desbloqueio"
         unlock: "Desbloquear a minha conta"
-      welcome: "Bem-vindo(a) %{email}!"
+      welcome: "Bem-vindo(a) %{username}!"
     passwords:
       edit:
         change_password: "Alterar a minha palavra-passe"
diff --git a/config/locales/devise/devise.ro.yml b/config/locales/devise/devise.ro.yml
index 3060240e8..098e33bb6 100644
--- a/config/locales/devise/devise.ro.yml
+++ b/config/locales/devise/devise.ro.yml
@@ -29,7 +29,7 @@ ro:
         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}!"
+      hello: "Bună %{username}!"
       inviter:
         accept_at: "la adresa %{url}, poţi accepta prin folosirea legăturii de mai jos."
         has_invited_you: "%{name}"
@@ -45,7 +45,7 @@ ro:
         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}!"
+      welcome: "Bine ai revenit %{username}!"
     passwords:
       edit:
         change_password: "Schimbă-mi parola"
diff --git a/config/locales/devise/devise.ru.yml b/config/locales/devise/devise.ru.yml
index 8e4721f5d..7940fc8ee 100644
--- a/config/locales/devise/devise.ru.yml
+++ b/config/locales/devise/devise.ru.yml
@@ -32,7 +32,7 @@ ru:
         confirm: "Подтвердить мой аккаунт"
         subject: "Инструкции по подтверждению"
         you_can_confirm: "Вы можете подтвердить ваш аккаунт, перейдя по ссылке:"
-      hello: "Привет %{email}!"
+      hello: "Привет %{username}!"
       inviter:
         accept_at: "в %{url}, вы можете принять его по ссылке ниже."
         has_invited_you: "%{name}"
@@ -50,7 +50,7 @@ ru:
         click_to_unlock: "Используйте ссылку, чтобы разблокировать аккаунт:"
         subject: "Инструкции по разблокированию"
         unlock: "Разблокировать мой аккаунт"
-      welcome: "Добро пожаловать, %{email}!"
+      welcome: "Добро пожаловать, %{username}!"
     omniauth_callbacks:
       failure: "Не удалось аутентифицировать вас через %{kind}  по причине %{reason}."
       success: "Учетная запись %{kind} успешно аутентифицирована."
diff --git a/config/locales/devise/devise.sc.yml b/config/locales/devise/devise.sc.yml
index 3df2ef529..4a20f61bb 100644
--- a/config/locales/devise/devise.sc.yml
+++ b/config/locales/devise/devise.sc.yml
@@ -32,7 +32,7 @@ sc:
         confirm: "Cunfirma su contu meu"
         subject: "Istrutziones pro sa cunfirma"
         you_can_confirm: "Podes cunfirmare su contu tuo pro mèdiu de su ligàmene inoghe in suta:"
-      hello: "Salude %{email}!"
+      hello: "Salude %{username}!"
       inviter:
         accept_at: "in %{url}, lu podes atzetare pro mèdiu de su ligàmene inoghe in suta."
         has_invited_you: "%{name}"
@@ -50,7 +50,7 @@ sc:
         click_to_unlock: "Incarca in su ligàmene inoghe pro isblocare su contu tuo:"
         subject: "Istrutziones de isblocu"
         unlock: "Isbloca su contu meu"
-      welcome: "Bene bènnidu %{email}!"
+      welcome: "Bene bènnidu %{username}!"
     omniauth_callbacks:
       failure: "Impossìbile fàghere s'autenticatzione pro tie dae %{kind}, ca \"%{reason}\"."
       success: "Autenticatzione dae su contu %{kind} resissida."
diff --git a/config/locales/devise/devise.si.yml b/config/locales/devise/devise.si.yml
index affafe96d..92276e398 100644
--- a/config/locales/devise/devise.si.yml
+++ b/config/locales/devise/devise.si.yml
@@ -14,13 +14,13 @@ si:
     invitations:
       send_instructions: "ඔබගේ ආරාධනාව යැවුවා."
     mailer:
-      hello: "කොහොමද %{email}!"
+      hello: "කොහොමද %{username}!"
       inviter:
         has_invited_you: "%{name}"
       reset_password_instructions:
         change: "මගේ මුරපදය මාරු කරන්න"
         subject: "මුරපදය නැවත සකසන උපදෙස්"
-      welcome: "ආයුබෝවන් %{email}!"
+      welcome: "ආයුබෝවන් %{username}!"
     passwords:
       edit:
         change_password: "මගේ මුරපදය මාරු කරන්න"
diff --git a/config/locales/devise/devise.sk.yml b/config/locales/devise/devise.sk.yml
index 5f8a5f94b..cb6183c52 100644
--- a/config/locales/devise/devise.sk.yml
+++ b/config/locales/devise/devise.sk.yml
@@ -30,7 +30,7 @@ sk:
         confirm: "Potvrdiť svoj účet"
         subject: "Pokyny na potvrdenie"
         you_can_confirm: "Svoj účet môžeš potvrdiť kliknutím na tento odkaz:"
-      hello: "Ahoj %{email}!"
+      hello: "Ahoj %{username}!"
       inviter:
         accept_at: "Kliknutím na odkaz na stránku %{url} ju môžeš prijať."
         has_invited_you: "%{name}"
@@ -46,7 +46,7 @@ sk:
         click_to_unlock: "Klikni na tento odkaz a tvoj účet sa odomkne:"
         subject: "Pokyny na odomknutie"
         unlock: "Odomknúť môj účet"
-      welcome: "Vitaj %{email}!"
+      welcome: "Vitaj %{username}!"
     passwords:
       edit:
         change_password: "Zmeniť moje heslo"
diff --git a/config/locales/devise/devise.sl.yml b/config/locales/devise/devise.sl.yml
index 93ce69bea..9dc6a57d0 100644
--- a/config/locales/devise/devise.sl.yml
+++ b/config/locales/devise/devise.sl.yml
@@ -28,7 +28,7 @@ sl:
         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}!"
+      hello: "Pozdravljeni %{username}!"
       inviter:
         accept_at: "na %{url}, sprejmete lahko preko spodnje povezave."
         has_invited_you: "%{name}"
@@ -44,7 +44,7 @@ sl:
         click_to_unlock: "Odklenite svoj 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}!"
+      welcome: "Dobrodošli %{username}!"
     passwords:
       edit:
         change_password: "Spremeni geslo"
diff --git a/config/locales/devise/devise.sq.yml b/config/locales/devise/devise.sq.yml
index e2778ef2b..e9edc727b 100644
--- a/config/locales/devise/devise.sq.yml
+++ b/config/locales/devise/devise.sq.yml
@@ -32,7 +32,7 @@ sq:
         confirm: "Ripohim i llogarisë time"
         subject: "Udhëzime ripohimi"
         you_can_confirm: "Llogarinë tuaj mund të ripohoni përmes lidhjes më poshtë:"
-      hello: "Tungjatjeta %{email}!"
+      hello: "Tungjatjeta %{username}!"
       inviter:
         accept_at: "te %{url}, mund ta pranoni përmes lidhjes më poshtë."
         has_invited_you: "%{name}"
@@ -50,7 +50,7 @@ sq:
         click_to_unlock: "Që të shkyçni llogarinë tuaj, klikoni lidhjen më poshtë:"
         subject: "Udhëzime shkyçjeje"
         unlock: "Shkyçe llogarinë time"
-      welcome: "Mirë se vini %{email}!"
+      welcome: "Mirë se vini %{username}!"
     omniauth_callbacks:
       failure: "S’u bë dot mirëfilltësimi juaj me %{kind}, ngaqë \"%{reason}\"."
       success: "Mirëfilltësimi u bë me sukses me llogarinë %{kind}."
diff --git a/config/locales/devise/devise.sr.yml b/config/locales/devise/devise.sr.yml
index 004f438e9..3dfedea6b 100644
--- a/config/locales/devise/devise.sr.yml
+++ b/config/locales/devise/devise.sr.yml
@@ -28,7 +28,7 @@ sr:
         confirm: "Потврди мој налог"
         subject: "Упутство за потврђивање"
         you_can_confirm: "Можеш потврдити свој налог путем овог линка:"
-      hello: "Здраво, %{email}!"
+      hello: "Здраво, %{username}!"
       inviter:
         accept_at: "на %{url}. Можеш прихватити на доњем линку."
         has_invited_you: "%{name} те позива"
@@ -44,7 +44,7 @@ sr:
         click_to_unlock: "Кликни доњи линк да откључаш свој налог:"
         subject: "Упутство за откључавање"
         unlock: "Откључај ми налог"
-      welcome: "Добродошли, %{email}!"
+      welcome: "Добродошли, %{username}!"
     passwords:
       edit:
         change_password: "Промени лозинку"
diff --git a/config/locales/devise/devise.sv.yml b/config/locales/devise/devise.sv.yml
index c06282c09..5c39ed955 100644
--- a/config/locales/devise/devise.sv.yml
+++ b/config/locales/devise/devise.sv.yml
@@ -32,7 +32,7 @@ sv:
         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}!"
+      hello: "Hej %{username}!"
       inviter:
         accept_at: "via %{url}. Du accepterar genom att klicka på länken nedan."
         has_invited_you: "%{name}"
@@ -50,7 +50,7 @@ sv:
         click_to_unlock: "Klicka på länken nedan för att låsa upp ditt konto:"
         subject: "Upplåsningsinstruktioner"
         unlock: "Lås upp mitt konto"
-      welcome: "Välkommen %{email}!"
+      welcome: "Välkommen %{username}!"
     omniauth_callbacks:
       failure: "Kunde inte autentisera dig från %{kind} på grund av: %{reason}"
       success: "Lyckades autentisera från kontot %{kind}."
diff --git a/config/locales/devise/devise.te.yml b/config/locales/devise/devise.te.yml
index 5d48241d1..be280ffb0 100644
--- a/config/locales/devise/devise.te.yml
+++ b/config/locales/devise/devise.te.yml
@@ -29,7 +29,7 @@ te:
         confirm: "నా ఖాతాను నిర్థారించండి"
         subject: "నిర్ధారణ సూచనలు"
         you_can_confirm: "మీరు క్రింది లింకు ద్వారా మీ ఖాతాను నిర్ధారించవచ్చు:"
-      hello: "హలో %{email}!"
+      hello: "హలో %{username}!"
       inviter:
         accept_at: "%{url} వద్ద, మీరు క్రింది లింకు ద్వారా అంగీకరించవచ్చు"
         has_invited_you: "%{name}"
@@ -45,7 +45,7 @@ te:
         click_to_unlock: "మీ ఖాతాను అన్లాక్ చేయటానికి కింది లింకును క్లిక్ చేయండి:"
         subject: "అన్​లాక్ సూచనలు"
         unlock: "నా ఖాతాను అన్లాక్ చెయ్యి"
-      welcome: "స్వాగతం %{email}!"
+      welcome: "స్వాగతం %{username}!"
     passwords:
       edit:
         change_password: "నా సంకేతపదాన్ని మార్చు"
diff --git a/config/locales/devise/devise.tr.yml b/config/locales/devise/devise.tr.yml
index 0e2da8375..ae8db3617 100644
--- a/config/locales/devise/devise.tr.yml
+++ b/config/locales/devise/devise.tr.yml
@@ -28,7 +28,7 @@ tr:
         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}!"
+      hello: "Merhaba %{username}!"
       inviter:
         accept_at: "%{url}, aşağıdaki bağlantıya tıklayarak bunu kabul edebilirsiniz."
         has_invited_you: "%{name}"
@@ -44,7 +44,7 @@ tr:
         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ş geldin%{email}!"
+      welcome: "Hoş geldin%{username}!"
     passwords:
       edit:
         change_password: "Parola değiştirme"
diff --git a/config/locales/devise/devise.uk.yml b/config/locales/devise/devise.uk.yml
index 7ffdf12af..f3294e410 100644
--- a/config/locales/devise/devise.uk.yml
+++ b/config/locales/devise/devise.uk.yml
@@ -32,7 +32,7 @@ uk:
         confirm: "Підтвердити мій аккаунт"
         subject: "Інструкції з підтвердження"
         you_can_confirm: "Ви можете підтвердити свій аккаунт за посиланням нижче:"
-      hello: "Привіт %{email}!"
+      hello: "Привіт %{username}!"
       inviter:
         accept_at: "на %{url}, ви можете прийняти його за посиланням нижче."
         has_invited_you: "%{name}"
@@ -50,7 +50,7 @@ uk:
         click_to_unlock: "Використайте посилання, щоб розблоковувати аккаунт:"
         subject: "Інструкції з розблокування"
         unlock: "Розблоковувати мій аккаунт"
-      welcome: "Ласкаво просимо %{email}!"
+      welcome: "Ласкаво просимо %{username}!"
     omniauth_callbacks:
       failure: "Неможливо аутентифікувати %{kind} тому що \"%{reason}\"."
       success: "Успішно пройдено перевірку автентичності %{kind} аккаунту."
diff --git a/config/locales/devise/devise.vi.yml b/config/locales/devise/devise.vi.yml
index 3d96d69b6..1a33f9a7d 100644
--- a/config/locales/devise/devise.vi.yml
+++ b/config/locales/devise/devise.vi.yml
@@ -32,7 +32,7 @@ vi:
         confirm: "Xác thực tài khoản của tôi"
         subject: "Hướng dẫn xác thực"
         you_can_confirm: "Bạn có thể xác thực tài khoản thông qua liên kết sau:"
-      hello: "Xin chào %{email}!"
+      hello: "Xin chào %{username}!"
       inviter:
         accept_at: "tại %{url}, bạn có thể chấp nhận nó qua đường dẫn bên dưới."
         has_invited_you: "%{name}"
@@ -50,7 +50,7 @@ vi:
         click_to_unlock: "Nhấn vào liên kết bên dưới để mở khoá tài khoản:"
         subject: "Hướng dẫn mở khoá"
         unlock: "Mở khoá tài khoản"
-      welcome: "Chào mừng %{email}!"
+      welcome: "Chào mừng %{username}!"
     omniauth_callbacks:
       failure: "Không thể cấp phép bạn từ %{kind} vì lý do \"%{reason}\"."
       success: "Cấp phép thành công từ tài khoản %{kind}."
diff --git a/config/locales/devise/devise.wo.yml b/config/locales/devise/devise.wo.yml
index ab2b34447..e4934da3c 100644
--- a/config/locales/devise/devise.wo.yml
+++ b/config/locales/devise/devise.wo.yml
@@ -7,10 +7,10 @@
 wo:
   devise:
     mailer:
-      hello: "Na nga def %{email}?"
+      hello: "Na nga def %{username}?"
       reset_password_instructions:
         change: "Soppil sama baatujàll"
-      welcome: "Dalal-jàmm %{email}!"
+      welcome: "Dalal-jàmm %{username}!"
     passwords:
       edit:
         change_password: "Soppil sama baatujàll"
diff --git a/config/locales/devise/devise.zh-CN.yml b/config/locales/devise/devise.zh-CN.yml
index 58bf44649..24d863d27 100644
--- a/config/locales/devise/devise.zh-CN.yml
+++ b/config/locales/devise/devise.zh-CN.yml
@@ -28,7 +28,7 @@ zh-CN:
         confirm: "确认帐号"
         subject: "帐号确认步骤"
         you_can_confirm: "您可以点击下面的链接确认帐号："
-      hello: "您好, %{email}!"
+      hello: "您好, %{username}!"
       inviter:
         accept_at: "在 %{url}， 您可以通过以下链接接受"
         has_invited_you: "%{name}"
@@ -44,7 +44,7 @@ zh-CN:
         click_to_unlock: "点击下面的链接以解锁您的帐号："
         subject: "帐号解锁步骤"
         unlock: "解锁帐号"
-      welcome: "欢迎您, %{email}!"
+      welcome: "欢迎您, %{username}!"
     passwords:
       edit:
         change_password: "修改密码"
diff --git a/config/locales/devise/devise.zh-TW.yml b/config/locales/devise/devise.zh-TW.yml
index 44f636034..6a6558980 100644
--- a/config/locales/devise/devise.zh-TW.yml
+++ b/config/locales/devise/devise.zh-TW.yml
@@ -32,7 +32,7 @@ zh-TW:
         confirm: "帳號確認"
         subject: "確認步驟"
         you_can_confirm: "你可以使用以下連結確認帳號："
-      hello: "你好，%{email}！"
+      hello: "你好，%{username}！"
       inviter:
         accept_at: "於 %{url}，你可以透過以下連結來接受。"
         has_invited_you: "%{name}"
@@ -50,7 +50,7 @@ zh-TW:
         click_to_unlock: "點一下以下連結來將你的帳號解鎖："
         subject: "解鎖步驟"
         unlock: "帳號解鎖"
-      welcome: "歡迎你，%{email}！"
+      welcome: "歡迎你，%{username}！"
     omniauth_callbacks:
       failure: "跟 %{kind} 認證失敗，原因是：%{reason}。"
       success: "%{kind} 帳號認證成功。"