diff --git a/snappymail/v/0.0.0/app/localization/ar-SA/user.json b/snappymail/v/0.0.0/app/localization/ar-SA/user.json
index 3de5af250..f393659f1 100644
--- a/snappymail/v/0.0.0/app/localization/ar-SA/user.json
+++ b/snappymail/v/0.0.0/app/localization/ar-SA/user.json
@@ -20,7 +20,7 @@
 		"NAME": "البريد الوارد",
 		"NONE": "None",
 		"NOT_SPAM": "ليست رسائل غير مرغوب فيها",
-		"USERNAME": "Username",
+		"USERNAME": "اسم المستخدم",
 		"PASSWORD": "كلمة السر",
 		"REPLY_TO": "الرد-الى",
 		"SAVE": "حفظ",
diff --git a/snappymail/v/0.0.0/app/localization/bg-BG/user.json b/snappymail/v/0.0.0/app/localization/bg-BG/user.json
index 37c611ab2..d6d238850 100644
--- a/snappymail/v/0.0.0/app/localization/bg-BG/user.json
+++ b/snappymail/v/0.0.0/app/localization/bg-BG/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Вх. кутия",
 		"NONE": "Няма",
 		"NOT_SPAM": "Не е спам",
-		"USERNAME": "Username",
+		"USERNAME": "Потребителско име",
 		"PASSWORD": "Парола",
 		"REPLY_TO": "Отговори на",
 		"SAVE": "Запази",
diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json b/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
index f61bbfb63..29b81856a 100644
--- a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
+++ b/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Uložit",
 		"TEST": "Test",
 		"UPDATE": "Aktualizovat",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Uživatelské jméno",
+		"PASSWORD": "Heslo",
+		"CANCEL": "Zrušit"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
index 6933703ca..9cb8a840d 100644
--- a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
+++ b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Přijaté",
 		"NONE": "Žádný",
 		"NOT_SPAM": "Není to spam",
-		"USERNAME": "Username",
+		"USERNAME": "Uživatelské jméno",
 		"PASSWORD": "Heslo",
 		"REPLY_TO": "Adresa odpovědi",
 		"SAVE": "Uložit",
diff --git a/snappymail/v/0.0.0/app/localization/da-DK/admin.json b/snappymail/v/0.0.0/app/localization/da-DK/admin.json
index 1007845fb..0a0e800fd 100644
--- a/snappymail/v/0.0.0/app/localization/da-DK/admin.json
+++ b/snappymail/v/0.0.0/app/localization/da-DK/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Gem",
 		"TEST": "Test",
 		"UPDATE": "Opdater",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Brugernavn",
+		"PASSWORD": "Adgangskode",
+		"CANCEL": "Annuller"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Log ind",
diff --git a/snappymail/v/0.0.0/app/localization/da-DK/user.json b/snappymail/v/0.0.0/app/localization/da-DK/user.json
index 0e85b8b0c..97558fc4a 100644
--- a/snappymail/v/0.0.0/app/localization/da-DK/user.json
+++ b/snappymail/v/0.0.0/app/localization/da-DK/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Indbakke",
 		"NONE": "Ingen",
 		"NOT_SPAM": "Ikke uønsket",
-		"USERNAME": "Username",
+		"USERNAME": "Brugernavn",
 		"PASSWORD": "Adgangskode",
 		"REPLY_TO": "Svar til",
 		"SAVE": "Gem",
diff --git a/snappymail/v/0.0.0/app/localization/de-DE/admin.json b/snappymail/v/0.0.0/app/localization/de-DE/admin.json
index e0f03466d..d4f152a62 100644
--- a/snappymail/v/0.0.0/app/localization/de-DE/admin.json
+++ b/snappymail/v/0.0.0/app/localization/de-DE/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Speichern",
 		"TEST": "Testen",
 		"UPDATE": "Aktualisieren",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Nutzername",
+		"PASSWORD": "Passwort",
+		"CANCEL": "Abbrechen"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Benutzer",
diff --git a/snappymail/v/0.0.0/app/localization/de-DE/user.json b/snappymail/v/0.0.0/app/localization/de-DE/user.json
index efcf8fb5f..da43b879e 100644
--- a/snappymail/v/0.0.0/app/localization/de-DE/user.json
+++ b/snappymail/v/0.0.0/app/localization/de-DE/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Name",
 		"NONE": "Keine",
 		"NOT_SPAM": "Kein Spam",
-		"USERNAME": "Username",
+		"USERNAME": "Nutzername",
 		"PASSWORD": "Passwort",
 		"REPLY_TO": "Antwort an",
 		"SAVE": "Speichern",
diff --git a/snappymail/v/0.0.0/app/localization/el-GR/user.json b/snappymail/v/0.0.0/app/localization/el-GR/user.json
index 6ae799dc0..0c7d6be9e 100644
--- a/snappymail/v/0.0.0/app/localization/el-GR/user.json
+++ b/snappymail/v/0.0.0/app/localization/el-GR/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Εισερχόμενα",
 		"NONE": "Κανένα",
 		"NOT_SPAM": "Όχι ανεπιθύμητο",
-		"USERNAME": "Username",
+		"USERNAME": "Όνομα χρήστη",
 		"PASSWORD": "Κωδικός πρόσβασης",
 		"REPLY_TO": "Απάντηση στον",
 		"SAVE": "Αποθήκευση",
diff --git a/snappymail/v/0.0.0/app/localization/es-ES/admin.json b/snappymail/v/0.0.0/app/localization/es-ES/admin.json
index c62e76b20..d7813cce3 100644
--- a/snappymail/v/0.0.0/app/localization/es-ES/admin.json
+++ b/snappymail/v/0.0.0/app/localization/es-ES/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Guardar",
 		"TEST": "Probar",
 		"UPDATE": "Actualizar",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Nombre de usuario",
+		"PASSWORD": "Contraseña",
+		"CANCEL": "Cancelar"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Ingresar",
diff --git a/snappymail/v/0.0.0/app/localization/es-ES/user.json b/snappymail/v/0.0.0/app/localization/es-ES/user.json
index b0a0e2c24..63bde175b 100644
--- a/snappymail/v/0.0.0/app/localization/es-ES/user.json
+++ b/snappymail/v/0.0.0/app/localization/es-ES/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Nombre",
 		"NONE": "Ninguno",
 		"NOT_SPAM": "Correo no deseado",
-		"USERNAME": "Username",
+		"USERNAME": "Nombre de usuario",
 		"PASSWORD": "Contraseña",
 		"REPLY_TO": "Responder",
 		"SAVE": "Guardar",
diff --git a/snappymail/v/0.0.0/app/localization/et-EE/user.json b/snappymail/v/0.0.0/app/localization/et-EE/user.json
index fdded9b7c..bd5331481 100644
--- a/snappymail/v/0.0.0/app/localization/et-EE/user.json
+++ b/snappymail/v/0.0.0/app/localization/et-EE/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Saabunud kirjad",
 		"NONE": "Puuduvad",
 		"NOT_SPAM": "Ei ole rämpspost",
-		"USERNAME": "Username",
+		"USERNAME": "Kasutajanimi",
 		"PASSWORD": "Salasõna",
 		"REPLY_TO": "Vastuse saaja",
 		"SAVE": "Salvesta",
diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json b/snappymail/v/0.0.0/app/localization/fa-IR/admin.json
index 5bf1bbd6c..c9329d1d6 100644
--- a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fa-IR/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "ذخیره",
 		"TEST": "تست",
 		"UPDATE": "بروزرسانی",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "نام کاربری",
+		"PASSWORD": "گذرواژه",
+		"CANCEL": "انصراف"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "ورود",
diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/user.json b/snappymail/v/0.0.0/app/localization/fa-IR/user.json
index 917c12389..a509fa937 100644
--- a/snappymail/v/0.0.0/app/localization/fa-IR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fa-IR/user.json
@@ -20,7 +20,7 @@
 		"NAME": "صندوق ورودی",
 		"NONE": "هیچ‌کدام",
 		"NOT_SPAM": "هرزنامه نیست",
-		"USERNAME": "Username",
+		"USERNAME": "نام کاربری",
 		"PASSWORD": "گذرواژه",
 		"REPLY_TO": "پاسخ به",
 		"SAVE": "ذخیره کن",
diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json b/snappymail/v/0.0.0/app/localization/fi-FI/admin.json
index 1098fe2b5..9a2edcbe3 100644
--- a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fi-FI/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Tallenna",
 		"TEST": "Testi",
 		"UPDATE": "Päivitä",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Käyttäjätunnus",
+		"PASSWORD": "Salasana",
+		"CANCEL": "Peruuta"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Tunnus",
diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/user.json b/snappymail/v/0.0.0/app/localization/fi-FI/user.json
index ef7f757ee..f567bc4e4 100644
--- a/snappymail/v/0.0.0/app/localization/fi-FI/user.json
+++ b/snappymail/v/0.0.0/app/localization/fi-FI/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Postilaatikko",
 		"NONE": "Ei mitään",
 		"NOT_SPAM": "Ei roskapostia",
-		"USERNAME": "Username",
+		"USERNAME": "Käyttäjätunnus",
 		"PASSWORD": "Salasana",
 		"REPLY_TO": "Vastaa",
 		"SAVE": "Tallenna",
diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
index a04612b37..0ca8f855b 100644
--- a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Enregistrer",
 		"TEST": "Test",
 		"UPDATE": "Mettre à jour",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Nom d'utilisateur",
+		"PASSWORD": "Mot de passe",
+		"CANCEL": "Annuler"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Identifiant",
diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/user.json b/snappymail/v/0.0.0/app/localization/fr-FR/user.json
index c28f6c073..5e85704e4 100644
--- a/snappymail/v/0.0.0/app/localization/fr-FR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fr-FR/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Nom",
 		"NONE": "Aucun",
 		"NOT_SPAM": "Acceptable",
-		"USERNAME": "Username",
+		"USERNAME": "Nom d'utilisateur",
 		"PASSWORD": "Mot de passe",
 		"REPLY_TO": "Répondre à",
 		"SAVE": "Enregistrer",
diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json
index a0308fb91..0a6161033 100644
--- a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json
+++ b/snappymail/v/0.0.0/app/localization/hu-HU/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Mentés",
 		"TEST": "Teszt",
 		"UPDATE": "Frissítés",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Felhasználónév",
+		"PASSWORD": "Jelszó",
+		"CANCEL": "Mégse"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Belépés",
diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/user.json b/snappymail/v/0.0.0/app/localization/hu-HU/user.json
index 488db7e00..325306317 100644
--- a/snappymail/v/0.0.0/app/localization/hu-HU/user.json
+++ b/snappymail/v/0.0.0/app/localization/hu-HU/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Beérkező levelek",
 		"NONE": "Semmi",
 		"NOT_SPAM": "Nem szemét",
-		"USERNAME": "Username",
+		"USERNAME": "Felhasználónév",
 		"PASSWORD": "Jelszó",
 		"REPLY_TO": "Válaszcím",
 		"SAVE": "Mentés",
diff --git a/snappymail/v/0.0.0/app/localization/id-ID/admin.json b/snappymail/v/0.0.0/app/localization/id-ID/admin.json
index 29cec2de8..b2d9f5ec4 100644
--- a/snappymail/v/0.0.0/app/localization/id-ID/admin.json
+++ b/snappymail/v/0.0.0/app/localization/id-ID/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Simpan",
 		"TEST": "Ujicoba",
 		"UPDATE": "Pembaruan",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Nama belakang",
+		"PASSWORD": "Sandi",
+		"CANCEL": "Batal"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
diff --git a/snappymail/v/0.0.0/app/localization/id-ID/user.json b/snappymail/v/0.0.0/app/localization/id-ID/user.json
index c5fbde9ca..5eccc539e 100644
--- a/snappymail/v/0.0.0/app/localization/id-ID/user.json
+++ b/snappymail/v/0.0.0/app/localization/id-ID/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Kotak Masuk",
 		"NONE": "Tidak ada",
 		"NOT_SPAM": "Bukan Spam",
-		"USERNAME": "Username",
+		"USERNAME": "Nama belakang",
 		"PASSWORD": "Sandi",
 		"REPLY_TO": "Balas-Ke",
 		"SAVE": "Simpan",
diff --git a/snappymail/v/0.0.0/app/localization/is-IS/user.json b/snappymail/v/0.0.0/app/localization/is-IS/user.json
index 53fdf34e7..86248e7c7 100644
--- a/snappymail/v/0.0.0/app/localization/is-IS/user.json
+++ b/snappymail/v/0.0.0/app/localization/is-IS/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Innhólf",
 		"NONE": "Ekkert",
 		"NOT_SPAM": "Ekki ruslpóstur",
-		"USERNAME": "Username",
+		"USERNAME": "Notendanafn",
 		"PASSWORD": "Lykilorð",
 		"REPLY_TO": "Svara-til",
 		"SAVE": "Vista",
diff --git a/snappymail/v/0.0.0/app/localization/it-IT/admin.json b/snappymail/v/0.0.0/app/localization/it-IT/admin.json
index dd0a60646..32269b8e3 100644
--- a/snappymail/v/0.0.0/app/localization/it-IT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/it-IT/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Save",
 		"TEST": "Test",
 		"UPDATE": "Aggiorna",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Nome utente",
+		"PASSWORD": "Parola d'ordine",
+		"CANCEL": "Annulla"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
diff --git a/snappymail/v/0.0.0/app/localization/it-IT/user.json b/snappymail/v/0.0.0/app/localization/it-IT/user.json
index 0d57e1147..0d2b8e5f1 100644
--- a/snappymail/v/0.0.0/app/localization/it-IT/user.json
+++ b/snappymail/v/0.0.0/app/localization/it-IT/user.json
@@ -20,8 +20,8 @@
 		"NAME": "Nome",
 		"NONE": "Nessuno",
 		"NOT_SPAM": "Segnala come non spam",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
+		"USERNAME": "Nome utente",
+		"PASSWORD": "Parola d'ordine",
 		"REPLY_TO": "Rispondi a",
 		"SAVE": "Salva",
 		"SEARCH": "Cerca",
diff --git a/snappymail/v/0.0.0/app/localization/ko-KR/user.json b/snappymail/v/0.0.0/app/localization/ko-KR/user.json
index fa4a03795..15b0d063d 100644
--- a/snappymail/v/0.0.0/app/localization/ko-KR/user.json
+++ b/snappymail/v/0.0.0/app/localization/ko-KR/user.json
@@ -20,7 +20,7 @@
 		"NAME": "받은 편지함",
 		"NONE": "없음",
 		"NOT_SPAM": "스팸 아님",
-		"USERNAME": "Username",
+		"USERNAME": "사용자 이름",
 		"PASSWORD": "비밀번호",
 		"REPLY_TO": "회신 주소",
 		"SAVE": "저장",
diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json b/snappymail/v/0.0.0/app/localization/lt-LT/admin.json
index 1a759e398..e8a9cd2c2 100644
--- a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/lt-LT/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Saugoti",
 		"TEST": "Bandymas",
 		"UPDATE": "Atnaujinti",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Vartotojo vardas",
+		"PASSWORD": "Slaptažodis",
+		"CANCEL": "Atšaukti"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Prisijungimo vardas",
diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/user.json b/snappymail/v/0.0.0/app/localization/lt-LT/user.json
index a53ce4974..0ed947395 100644
--- a/snappymail/v/0.0.0/app/localization/lt-LT/user.json
+++ b/snappymail/v/0.0.0/app/localization/lt-LT/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Gautieji",
 		"NONE": "Nieko",
 		"NOT_SPAM": "Ne šlamštas",
-		"USERNAME": "Username",
+		"USERNAME": "Vartotojo vardas",
 		"PASSWORD": "Slaptažodis",
 		"REPLY_TO": "Kam atsakyti",
 		"SAVE": "Išsaugoti",
diff --git a/snappymail/v/0.0.0/app/localization/lv-LV/user.json b/snappymail/v/0.0.0/app/localization/lv-LV/user.json
index 64cae419e..71b975ed3 100644
--- a/snappymail/v/0.0.0/app/localization/lv-LV/user.json
+++ b/snappymail/v/0.0.0/app/localization/lv-LV/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Iesūtne",
 		"NONE": "None",
 		"NOT_SPAM": "Not Spam",
-		"USERNAME": "Username",
+		"USERNAME": "Lietotājvārds",
 		"PASSWORD": "Parole",
 		"REPLY_TO": "Reply-To",
 		"SAVE": "Saglabāt",
diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json b/snappymail/v/0.0.0/app/localization/nb-NO/admin.json
index 7a9663b08..4f92b2a07 100644
--- a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json
+++ b/snappymail/v/0.0.0/app/localization/nb-NO/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Lagre",
 		"TEST": "Test",
 		"UPDATE": "Oppdater",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Brukernavn",
+		"PASSWORD": "Passord",
+		"CANCEL": "Avbryt"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Brukernavn",
diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/user.json b/snappymail/v/0.0.0/app/localization/nb-NO/user.json
index a0d5600e9..4f6d5b88c 100644
--- a/snappymail/v/0.0.0/app/localization/nb-NO/user.json
+++ b/snappymail/v/0.0.0/app/localization/nb-NO/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Innboks",
 		"NONE": "Ingen",
 		"NOT_SPAM": "Ikke søppelpost",
-		"USERNAME": "Username",
+		"USERNAME": "Brukernavn",
 		"PASSWORD": "Passord",
 		"REPLY_TO": "Svar til",
 		"SAVE": "Lagre",
diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json
index 33412366b..ae1e06d6a 100644
--- a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json
+++ b/snappymail/v/0.0.0/app/localization/nl-NL/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Opslaan",
 		"TEST": "Test",
 		"UPDATE": "Updaten",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Gebruikersnaam",
+		"PASSWORD": "Wachtwoord",
+		"CANCEL": "Annuleer"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Inlognaam",
diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/user.json b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
index 96fc63aed..fb7485603 100644
--- a/snappymail/v/0.0.0/app/localization/nl-NL/user.json
+++ b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Naam",
 		"NONE": "Geen",
 		"NOT_SPAM": "Geen ongewenste e-mail",
-		"USERNAME": "Username",
+		"USERNAME": "Gebruikersnaam",
 		"PASSWORD": "Wachtwoord",
 		"REPLY_TO": "Antwoordadres",
 		"SAVE": "Opslaan",
diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json b/snappymail/v/0.0.0/app/localization/pl-PL/admin.json
index bcada22ab..d35e2d19c 100644
--- a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pl-PL/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Zapisz",
 		"TEST": "Testuj",
 		"UPDATE": "Zaktualizuj",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Nazwa użytkownika",
+		"PASSWORD": "Hasło",
+		"CANCEL": "Anuluj"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/user.json b/snappymail/v/0.0.0/app/localization/pl-PL/user.json
index 46bbfb1d0..8881da4fb 100644
--- a/snappymail/v/0.0.0/app/localization/pl-PL/user.json
+++ b/snappymail/v/0.0.0/app/localization/pl-PL/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Odebrane",
 		"NONE": "Brak",
 		"NOT_SPAM": "Oznacz jako pożądane",
-		"USERNAME": "Username",
+		"USERNAME": "Nazwa użytkownika",
 		"PASSWORD": "Hasło",
 		"REPLY_TO": "Odpisz do",
 		"SAVE": "Zapisz",
diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
index fee81ab71..7454c0025 100644
--- a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Salvar",
 		"TEST": "Testar",
 		"UPDATE": "Atualizar",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Nome de usuário",
+		"PASSWORD": "Senha",
+		"CANCEL": "Cancelar"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Usuário",
diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/user.json b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
index 156f51392..b875a45d9 100644
--- a/snappymail/v/0.0.0/app/localization/pt-BR/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Caixa de Entrada",
 		"NONE": "Nenhum",
 		"NOT_SPAM": "Não é Lixo Eletrônico",
-		"USERNAME": "Username",
+		"USERNAME": "Nome de usuário",
 		"PASSWORD": "Senha",
 		"REPLY_TO": "Responder para",
 		"SAVE": "Salvar",
diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/admin.json b/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
index 4165e2110..4dbb99ba2 100644
--- a/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt-PT/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Guardar",
 		"TEST": "Testar",
 		"UPDATE": "Atualizar",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Nome de usuário",
+		"PASSWORD": "Palavra-passe",
+		"CANCEL": "Cancelar"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Utilizador",
diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/user.json b/snappymail/v/0.0.0/app/localization/pt-PT/user.json
index 5f45a36ae..315be106c 100644
--- a/snappymail/v/0.0.0/app/localization/pt-PT/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-PT/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Nome",
 		"NONE": "Nenhum",
 		"NOT_SPAM": "Não é spam",
-		"USERNAME": "Username",
+		"USERNAME": "Nome de usuário",
 		"PASSWORD": "Palavra-passe",
 		"REPLY_TO": "Resp.-Para",
 		"SAVE": "Guardar",
diff --git a/snappymail/v/0.0.0/app/localization/pt/admin.json b/snappymail/v/0.0.0/app/localization/pt/admin.json
index 4165e2110..4dbb99ba2 100644
--- a/snappymail/v/0.0.0/app/localization/pt/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Guardar",
 		"TEST": "Testar",
 		"UPDATE": "Atualizar",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Nome de usuário",
+		"PASSWORD": "Palavra-passe",
+		"CANCEL": "Cancelar"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Utilizador",
diff --git a/snappymail/v/0.0.0/app/localization/pt/user.json b/snappymail/v/0.0.0/app/localization/pt/user.json
index 5f45a36ae..315be106c 100644
--- a/snappymail/v/0.0.0/app/localization/pt/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Nome",
 		"NONE": "Nenhum",
 		"NOT_SPAM": "Não é spam",
-		"USERNAME": "Username",
+		"USERNAME": "Nome de usuário",
 		"PASSWORD": "Palavra-passe",
 		"REPLY_TO": "Resp.-Para",
 		"SAVE": "Guardar",
diff --git a/snappymail/v/0.0.0/app/localization/ro-RO/user.json b/snappymail/v/0.0.0/app/localization/ro-RO/user.json
index b32f34a79..3a448c1a7 100644
--- a/snappymail/v/0.0.0/app/localization/ro-RO/user.json
+++ b/snappymail/v/0.0.0/app/localization/ro-RO/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Intrări",
 		"NONE": "None",
 		"NOT_SPAM": "Not SPAM",
-		"USERNAME": "Username",
+		"USERNAME": "Nume de utilizator",
 		"PASSWORD": "Parolă",
 		"REPLY_TO": "Reply-To",
 		"SAVE": "Salvează",
diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
index 6077265ae..33f18c98d 100644
--- a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
+++ b/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Сохранить",
 		"TEST": "Тест",
 		"UPDATE": "Обновить",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Имя пользователя",
+		"PASSWORD": "Пароль",
+		"CANCEL": "Отменить"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Логин",
diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/user.json b/snappymail/v/0.0.0/app/localization/ru-RU/user.json
index 8fe08f996..6d5c11024 100644
--- a/snappymail/v/0.0.0/app/localization/ru-RU/user.json
+++ b/snappymail/v/0.0.0/app/localization/ru-RU/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Входящие",
 		"NONE": "Ничего",
 		"NOT_SPAM": "Не спам",
-		"USERNAME": "Username",
+		"USERNAME": "Имя пользователя",
 		"PASSWORD": "Пароль",
 		"REPLY_TO": "Ответить-на",
 		"SAVE": "Сохранить",
diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json b/snappymail/v/0.0.0/app/localization/sk-SK/admin.json
index af0add410..23dce3bb9 100644
--- a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sk-SK/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Uložiť",
 		"TEST": "Test",
 		"UPDATE": "Aktualizovať",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Používateľské men",
+		"PASSWORD": "Heslo",
+		"CANCEL": "Zrušiť"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Prihlasovanie",
diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/user.json b/snappymail/v/0.0.0/app/localization/sk-SK/user.json
index e1d1372ad..0b644deff 100644
--- a/snappymail/v/0.0.0/app/localization/sk-SK/user.json
+++ b/snappymail/v/0.0.0/app/localization/sk-SK/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Prijaté",
 		"NONE": "Žiadny",
 		"NOT_SPAM": "Nie je spam",
-		"USERNAME": "Username",
+		"USERNAME": "Používateľské men",
 		"PASSWORD": "Heslo",
 		"REPLY_TO": "Adresa pre odpoveď",
 		"SAVE": "Uložiť",
diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json b/snappymail/v/0.0.0/app/localization/sl-SI/admin.json
index 31d476d4e..889dfbfb8 100644
--- a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sl-SI/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Shrani",
 		"TEST": "Preizkus",
 		"UPDATE": "Posodobi",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Uporabniško ime",
+		"PASSWORD": "Geslo",
+		"CANCEL": "Prekliči"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Prijava",
diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/user.json b/snappymail/v/0.0.0/app/localization/sl-SI/user.json
index 5f5f7c398..a928d7ac8 100644
--- a/snappymail/v/0.0.0/app/localization/sl-SI/user.json
+++ b/snappymail/v/0.0.0/app/localization/sl-SI/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Prejeto",
 		"NONE": "Nobeno",
 		"NOT_SPAM": "Ni vsiljena pošta",
-		"USERNAME": "Username",
+		"USERNAME": "Uporabniško ime",
 		"PASSWORD": "Geslo",
 		"REPLY_TO": "Odgovor na",
 		"SAVE": "Shrani",
diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json
index a53223c4e..397d3e4eb 100644
--- a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sv-SE/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Spara",
 		"TEST": "Test",
 		"UPDATE": "Uppdatera",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Användarnamn",
+		"PASSWORD": "Lösenord",
+		"CANCEL": "Avbryt"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Logga in",
diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/user.json b/snappymail/v/0.0.0/app/localization/sv-SE/user.json
index 76fc9e2e7..26aa5bec8 100644
--- a/snappymail/v/0.0.0/app/localization/sv-SE/user.json
+++ b/snappymail/v/0.0.0/app/localization/sv-SE/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Inkorg",
 		"NONE": "Ingen",
 		"NOT_SPAM": "Inte spam",
-		"USERNAME": "Username",
+		"USERNAME": "Användarnamn",
 		"PASSWORD": "Lösenord",
 		"REPLY_TO": "Svara till",
 		"SAVE": "Spara",
diff --git a/snappymail/v/0.0.0/app/localization/tr-TR/user.json b/snappymail/v/0.0.0/app/localization/tr-TR/user.json
index 60b239d5e..ea81795bd 100644
--- a/snappymail/v/0.0.0/app/localization/tr-TR/user.json
+++ b/snappymail/v/0.0.0/app/localization/tr-TR/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Gelen Kutusu",
 		"NONE": "None",
 		"NOT_SPAM": "Spam Değil",
-		"USERNAME": "Username",
+		"USERNAME": "Kullanıcı adı",
 		"PASSWORD": "Şifre",
 		"REPLY_TO": "Reply-To",
 		"SAVE": "Kaydet",
diff --git a/snappymail/v/0.0.0/app/localization/uk-UA/user.json b/snappymail/v/0.0.0/app/localization/uk-UA/user.json
index b240cf625..f8abb7bc6 100644
--- a/snappymail/v/0.0.0/app/localization/uk-UA/user.json
+++ b/snappymail/v/0.0.0/app/localization/uk-UA/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Вхідні",
 		"NONE": "None",
 		"NOT_SPAM": "Не спам",
-		"USERNAME": "Username",
+		"USERNAME": "Ім'я користувача",
 		"PASSWORD": "Пароль",
 		"REPLY_TO": "Reply-To",
 		"SAVE": "Зберегти",
diff --git a/snappymail/v/0.0.0/app/localization/vi-VN/admin.json b/snappymail/v/0.0.0/app/localization/vi-VN/admin.json
index 90d780df3..45efac211 100644
--- a/snappymail/v/0.0.0/app/localization/vi-VN/admin.json
+++ b/snappymail/v/0.0.0/app/localization/vi-VN/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "Lưu",
 		"TEST": "Thử",
 		"UPDATE": "Cập nhật",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "Tên tài khoản",
+		"PASSWORD": "Mật khẩu",
+		"CANCEL": "Hủy"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Đăng nhập",
diff --git a/snappymail/v/0.0.0/app/localization/vi-VN/user.json b/snappymail/v/0.0.0/app/localization/vi-VN/user.json
index 352117b3b..9c5d798da 100644
--- a/snappymail/v/0.0.0/app/localization/vi-VN/user.json
+++ b/snappymail/v/0.0.0/app/localization/vi-VN/user.json
@@ -20,7 +20,7 @@
 		"NAME": "Tên gọi",
 		"NONE": "Trống",
 		"NOT_SPAM": "Không phải thư rác",
-		"USERNAME": "Username",
+		"USERNAME": "Tên tài khoản",
 		"PASSWORD": "Mật khẩu",
 		"REPLY_TO": "Nhận thư phản hồi về",
 		"SAVE": "Lưu",
diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
index 13c8de88d..80d82b8f6 100644
--- a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
+++ b/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
@@ -5,9 +5,9 @@
 		"SAVE": "保存",
 		"TEST": "测试",
 		"UPDATE": "更新",
-		"USERNAME": "Username",
-		"PASSWORD": "Password",
-		"CANCEL": "Cancel"
+		"USERNAME": "用户名",
+		"PASSWORD": "密码",
+		"CANCEL": "取消"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "登录",
diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/user.json b/snappymail/v/0.0.0/app/localization/zh-CN/user.json
index 6301857af..81e4da6f8 100644
--- a/snappymail/v/0.0.0/app/localization/zh-CN/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-CN/user.json
@@ -20,7 +20,7 @@
 		"NAME": "名称",
 		"NONE": "无",
 		"NOT_SPAM": "这不是垃圾邮件",
-		"USERNAME": "Username",
+		"USERNAME": "用户名",
 		"PASSWORD": "密码",
 		"REPLY_TO": "回复",
 		"SAVE": "保存",
diff --git a/snappymail/v/0.0.0/app/localization/zh-TW/user.json b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
index 104013c7c..0f37817e3 100644
--- a/snappymail/v/0.0.0/app/localization/zh-TW/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
@@ -20,7 +20,7 @@
 		"NAME": "收件箱",
 		"NONE": "None",
 		"NOT_SPAM": "Not Spam",
-		"USERNAME": "Username",
+		"USERNAME": "用户名",
 		"PASSWORD": "密碼",
 		"REPLY_TO": "Reply-To",
 		"SAVE": "保存",