From aff9ba29e7b5506a86fec79976694e313733e1fd Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Thu, 4 Aug 2022 14:58:13 +0200 Subject: [PATCH] Admin: Ask for IMAP login credentials when testing, idea for #477 --- dev/View/Popup/Ask.js | 29 ++++++-- dev/View/Popup/Domain.js | 69 +++++++++++-------- .../app/libraries/RainLoop/ActionsAdmin.php | 8 +++ .../v/0.0.0/app/localization/ar-SA/user.json | 1 + .../v/0.0.0/app/localization/bg-BG/user.json | 1 + .../v/0.0.0/app/localization/cs-CZ/admin.json | 5 +- .../v/0.0.0/app/localization/cs-CZ/user.json | 1 + .../v/0.0.0/app/localization/da-DK/admin.json | 5 +- .../v/0.0.0/app/localization/da-DK/user.json | 1 + .../v/0.0.0/app/localization/de-DE/admin.json | 5 +- .../v/0.0.0/app/localization/de-DE/user.json | 1 + .../v/0.0.0/app/localization/el-GR/user.json | 1 + .../v/0.0.0/app/localization/en-GB/user.json | 1 + .../v/0.0.0/app/localization/en/admin.json | 5 +- .../v/0.0.0/app/localization/en/user.json | 1 + .../v/0.0.0/app/localization/es-ES/admin.json | 5 +- .../v/0.0.0/app/localization/es-ES/user.json | 1 + .../v/0.0.0/app/localization/et-EE/user.json | 1 + .../v/0.0.0/app/localization/fa-IR/admin.json | 5 +- .../v/0.0.0/app/localization/fa-IR/user.json | 1 + .../v/0.0.0/app/localization/fi-FI/admin.json | 5 +- .../v/0.0.0/app/localization/fi-FI/user.json | 1 + .../v/0.0.0/app/localization/fr-FR/admin.json | 5 +- .../v/0.0.0/app/localization/fr-FR/user.json | 1 + .../v/0.0.0/app/localization/hu-HU/admin.json | 5 +- .../v/0.0.0/app/localization/hu-HU/user.json | 1 + .../v/0.0.0/app/localization/id-ID/admin.json | 5 +- .../v/0.0.0/app/localization/id-ID/user.json | 1 + .../v/0.0.0/app/localization/is-IS/user.json | 1 + .../v/0.0.0/app/localization/it-IT/admin.json | 5 +- .../v/0.0.0/app/localization/it-IT/user.json | 1 + .../v/0.0.0/app/localization/ja-JP/admin.json | 5 +- .../v/0.0.0/app/localization/ja-JP/user.json | 1 + .../v/0.0.0/app/localization/ko-KR/user.json | 1 + .../v/0.0.0/app/localization/lt-LT/admin.json | 5 +- .../v/0.0.0/app/localization/lt-LT/user.json | 1 + .../v/0.0.0/app/localization/lv-LV/user.json | 1 + .../v/0.0.0/app/localization/nb-NO/admin.json | 5 +- .../v/0.0.0/app/localization/nb-NO/user.json | 1 + .../v/0.0.0/app/localization/nl-NL/admin.json | 5 +- .../v/0.0.0/app/localization/nl-NL/user.json | 1 + .../v/0.0.0/app/localization/pl-PL/admin.json | 5 +- .../v/0.0.0/app/localization/pl-PL/user.json | 1 + .../v/0.0.0/app/localization/pt-BR/admin.json | 5 +- .../v/0.0.0/app/localization/pt-BR/user.json | 1 + .../v/0.0.0/app/localization/pt-PT/admin.json | 5 +- .../v/0.0.0/app/localization/pt-PT/user.json | 1 + .../v/0.0.0/app/localization/pt/admin.json | 5 +- .../v/0.0.0/app/localization/pt/user.json | 1 + .../v/0.0.0/app/localization/ro-RO/user.json | 1 + .../v/0.0.0/app/localization/ru-RU/admin.json | 5 +- .../v/0.0.0/app/localization/ru-RU/user.json | 1 + .../v/0.0.0/app/localization/sk-SK/admin.json | 5 +- .../v/0.0.0/app/localization/sk-SK/user.json | 1 + .../v/0.0.0/app/localization/sl-SI/admin.json | 5 +- .../v/0.0.0/app/localization/sl-SI/user.json | 1 + .../v/0.0.0/app/localization/sv-SE/admin.json | 5 +- .../v/0.0.0/app/localization/sv-SE/user.json | 1 + .../v/0.0.0/app/localization/tr-TR/user.json | 1 + .../v/0.0.0/app/localization/uk-UA/user.json | 1 + .../v/0.0.0/app/localization/vi-VN/admin.json | 5 +- .../v/0.0.0/app/localization/vi-VN/user.json | 1 + .../v/0.0.0/app/localization/zh-CN/admin.json | 5 +- .../v/0.0.0/app/localization/zh-CN/user.json | 1 + .../v/0.0.0/app/localization/zh-TW/user.json | 1 + .../app/templates/Views/Common/PopupsAsk.html | 8 ++- 66 files changed, 214 insertions(+), 62 deletions(-) diff --git a/dev/View/Popup/Ask.js b/dev/View/Popup/Ask.js index 680139f49..cb848e3f5 100644 --- a/dev/View/Popup/Ask.js +++ b/dev/View/Popup/Ask.js @@ -11,6 +11,8 @@ export class AskPopupView extends AbstractViewPopup { askDesc: '', yesButton: '', noButton: '', + username: '', + askUsername: false, passphrase: '', askPass: false }); @@ -40,15 +42,19 @@ export class AskPopupView extends AbstractViewPopup { * @param {boolean=} focusOnShow = true * @returns {void} */ - onShow(sAskDesc, fYesFunc = null, fNoFunc = null, focusOnShow = true, askPass = false, btnText = '') { + onShow(sAskDesc, fYesFunc = null, fNoFunc = null, focusOnShow = true, ask = 0, btnText = '') { this.askDesc(sAskDesc || ''); - this.askPass(askPass); + this.askUsername(ask & 2); + this.askPass(ask & 1); + this.username(''); this.passphrase(''); this.yesButton(i18n(btnText || 'GLOBAL/YES')); - this.noButton(i18n(askPass ? 'GLOBAL/CANCEL' : 'GLOBAL/NO')); + this.noButton(i18n(ask ? 'GLOBAL/CANCEL' : 'GLOBAL/NO')); this.fYesAction = fYesFunc; this.fNoAction = fNoFunc; - this.focusOnShow = focusOnShow ? (askPass ? 'input[type="password"]' : '.buttonYes') : ''; + this.focusOnShow = focusOnShow + ? (ask ? 'input[type="'+(ask&2?'text':'password')+'"]' : '.buttonYes') + : ''; } afterShow() { @@ -80,7 +86,20 @@ AskPopupView.password = function(sAskDesc, btnText) { () => resolve(this.__vm.passphrase()), () => resolve(null), true, - true, + 1, + btnText + ]); + }); +} + +AskPopupView.credentials = function(sAskDesc, btnText) { + return new Promise(resolve => { + this.showModal([ + sAskDesc, + () => resolve({username:this.__vm.username(), password:this.__vm.passphrase()}), + () => resolve(null), + true, + 3, btnText ]); }); diff --git a/dev/View/Popup/Domain.js b/dev/View/Popup/Domain.js index dbe07bc03..258f4552b 100644 --- a/dev/View/Popup/Domain.js +++ b/dev/View/Popup/Domain.js @@ -8,6 +8,8 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews'; import { DomainAdminStore } from 'Stores/Admin/Domain'; +import { AskPopupView } from 'View/Popup/Ask'; + const domainToParams = oDomain => ({ Name: oDomain.name(), @@ -179,39 +181,46 @@ export class DomainPopupView extends AbstractViewPopup { testConnectionCommand() { this.clearTesting(false); - this.testing(true); + // https://github.com/the-djmaze/snappymail/issues/477 + AskPopupView.credentials('IMAP', 'GLOBAL/TEST').then(credentials => { + if (credentials) { + this.testing(true); + const params = domainToParams(this); + params.username = credentials.username; + params.password = credentials.password; + Remote.request('AdminDomainTest', + (iError, oData) => { + this.testing(false); + if (iError) { + this.testingImapError(true); + this.testingSieveError(true); + this.testingSmtpError(true); + } else { + this.testingDone(true); + this.testingImapError(true !== oData.Result.Imap); + this.testingSieveError(true !== oData.Result.Sieve); + this.testingSmtpError(true !== oData.Result.Smtp); - Remote.request('AdminDomainTest', - (iError, oData) => { - this.testing(false); - if (iError) { - this.testingImapError(true); - this.testingSieveError(true); - this.testingSmtpError(true); - } else { - this.testingDone(true); - this.testingImapError(true !== oData.Result.Imap); - this.testingSieveError(true !== oData.Result.Sieve); - this.testingSmtpError(true !== oData.Result.Smtp); + if (this.testingImapError() && oData.Result.Imap) { + this.testingImapErrorDesc(''); + this.testingImapErrorDesc(oData.Result.Imap); + } - if (this.testingImapError() && oData.Result.Imap) { - this.testingImapErrorDesc(''); - this.testingImapErrorDesc(oData.Result.Imap); - } + if (this.testingSieveError() && oData.Result.Sieve) { + this.testingSieveErrorDesc(''); + this.testingSieveErrorDesc(oData.Result.Sieve); + } - if (this.testingSieveError() && oData.Result.Sieve) { - this.testingSieveErrorDesc(''); - this.testingSieveErrorDesc(oData.Result.Sieve); - } - - if (this.testingSmtpError() && oData.Result.Smtp) { - this.testingSmtpErrorDesc(''); - this.testingSmtpErrorDesc(oData.Result.Smtp); - } - } - }, - domainToParams(this) - ); + if (this.testingSmtpError() && oData.Result.Smtp) { + this.testingSmtpErrorDesc(''); + this.testingSmtpErrorDesc(oData.Result.Smtp); + } + } + }, + params + ); + } + }); } onDomainCreateOrSaveResponse(iError) { diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php index 101a9b9bb..e26f0cd59 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php @@ -300,6 +300,14 @@ class ActionsAdmin extends Actions $oSettings->type = $oDomain->IncSecure(); $oImapClient->Connect($oSettings); + $sUsername = $this->GetActionParam('username', ''); + if ($sUsername) { + $oImapClient->Login([ + 'Login' => $sUsername, + 'Password' => $this->GetActionParam('password', '') + ]); + } + $oImapClient->Disconnect(); $bImapResult = true; } 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 e9cf30be6..3de5af250 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,6 +20,7 @@ "NAME": "البريد الوارد", "NONE": "None", "NOT_SPAM": "ليست رسائل غير مرغوب فيها", + "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 b2f3911fa..37c611ab2 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,6 +20,7 @@ "NAME": "Вх. кутия", "NONE": "Няма", "NOT_SPAM": "Не е спам", + "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 34d6f3b72..1c197dff6 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 @@ -4,7 +4,10 @@ "CLOSE": "Zavřít", "SAVE": "Uložit", "TEST": "Test", - "UPDATE": "Aktualizovat" + "UPDATE": "Aktualizovat", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 e78d1a732..6933703ca 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,6 +20,7 @@ "NAME": "Přijaté", "NONE": "Žádný", "NOT_SPAM": "Není to spam", + "USERNAME": "Username", "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 41c1f2ff4..0c9861507 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 @@ -4,7 +4,10 @@ "CLOSE": "Luk", "SAVE": "Gem", "TEST": "Test", - "UPDATE": "Opdater" + "UPDATE": "Opdater", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 a2c73afd7..0e85b8b0c 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,6 +20,7 @@ "NAME": "Indbakke", "NONE": "Ingen", "NOT_SPAM": "Ikke uønsket", + "USERNAME": "Username", "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 68d4e5e84..11d0a3e9a 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 @@ -4,7 +4,10 @@ "CLOSE": "Schließen", "SAVE": "Speichern", "TEST": "Testen", - "UPDATE": "Aktualisieren" + "UPDATE": "Aktualisieren", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 193808512..efcf8fb5f 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,6 +20,7 @@ "NAME": "Name", "NONE": "Keine", "NOT_SPAM": "Kein Spam", + "USERNAME": "Username", "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 26b2f5d4c..6ae799dc0 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,6 +20,7 @@ "NAME": "Εισερχόμενα", "NONE": "Κανένα", "NOT_SPAM": "Όχι ανεπιθύμητο", + "USERNAME": "Username", "PASSWORD": "Κωδικός πρόσβασης", "REPLY_TO": "Απάντηση στον", "SAVE": "Αποθήκευση", diff --git a/snappymail/v/0.0.0/app/localization/en-GB/user.json b/snappymail/v/0.0.0/app/localization/en-GB/user.json index ac9abce8d..0200e4a9a 100644 --- a/snappymail/v/0.0.0/app/localization/en-GB/user.json +++ b/snappymail/v/0.0.0/app/localization/en-GB/user.json @@ -20,6 +20,7 @@ "NAME": "Name", "NONE": "None", "NOT_SPAM": "Not Spam", + "USERNAME": "Username", "PASSWORD": "Password", "REPLY_TO": "Reply-To", "SAVE": "Save", diff --git a/snappymail/v/0.0.0/app/localization/en/admin.json b/snappymail/v/0.0.0/app/localization/en/admin.json index 512af6812..e709c1778 100644 --- a/snappymail/v/0.0.0/app/localization/en/admin.json +++ b/snappymail/v/0.0.0/app/localization/en/admin.json @@ -4,7 +4,10 @@ "CLOSE": "Close", "SAVE": "Save", "TEST": "Test", - "UPDATE": "Update" + "UPDATE": "Update", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "LOGIN": { "LABEL_LOGIN": "Login", diff --git a/snappymail/v/0.0.0/app/localization/en/user.json b/snappymail/v/0.0.0/app/localization/en/user.json index 6f40b748e..48119d670 100644 --- a/snappymail/v/0.0.0/app/localization/en/user.json +++ b/snappymail/v/0.0.0/app/localization/en/user.json @@ -20,6 +20,7 @@ "NAME": "Name", "NONE": "None", "NOT_SPAM": "Not Spam", + "USERNAME": "Username", "PASSWORD": "Password", "REPLY_TO": "Reply-To", "SAVE": "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 70536a3ae..dea6724f5 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 @@ -4,7 +4,10 @@ "CLOSE": "Cerrar", "SAVE": "Guardar", "TEST": "Probar", - "UPDATE": "Actualizar" + "UPDATE": "Actualizar", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 0392437c8..b0a0e2c24 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,6 +20,7 @@ "NAME": "Nombre", "NONE": "Ninguno", "NOT_SPAM": "Correo no deseado", + "USERNAME": "Username", "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 c84999bba..fdded9b7c 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,6 +20,7 @@ "NAME": "Saabunud kirjad", "NONE": "Puuduvad", "NOT_SPAM": "Ei ole rämpspost", + "USERNAME": "Username", "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 8ede5a534..9ed304a98 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 @@ -4,7 +4,10 @@ "CLOSE": "بستن", "SAVE": "ذخیره", "TEST": "تست", - "UPDATE": "بروزرسانی" + "UPDATE": "بروزرسانی", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "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 1480d191a..917c12389 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,6 +20,7 @@ "NAME": "صندوق ورودی", "NONE": "هیچ‌کدام", "NOT_SPAM": "هرزنامه نیست", + "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 2eb92feac..ba48b014e 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 @@ -4,7 +4,10 @@ "CLOSE": "Sulje", "SAVE": "Tallenna", "TEST": "Testi", - "UPDATE": "Päivitä" + "UPDATE": "Päivitä", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 7116958eb..ef7f757ee 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,6 +20,7 @@ "NAME": "Postilaatikko", "NONE": "Ei mitään", "NOT_SPAM": "Ei roskapostia", + "USERNAME": "Username", "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 6fcf73008..5f122ab25 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 @@ -4,7 +4,10 @@ "CLOSE": "Fermer", "SAVE": "Enregistrer", "TEST": "Test", - "UPDATE": "Mettre à jour" + "UPDATE": "Mettre à jour", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 f64d33372..c28f6c073 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,6 +20,7 @@ "NAME": "Nom", "NONE": "Aucun", "NOT_SPAM": "Acceptable", + "USERNAME": "Username", "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 596d9f08b..b468bb148 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 @@ -4,7 +4,10 @@ "CLOSE": "Bezár", "SAVE": "Mentés", "TEST": "Teszt", - "UPDATE": "Frissítés" + "UPDATE": "Frissítés", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 8678ce058..488db7e00 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,6 +20,7 @@ "NAME": "Beérkező levelek", "NONE": "Semmi", "NOT_SPAM": "Nem szemét", + "USERNAME": "Username", "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 5b94512e6..9aec205b2 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 @@ -4,7 +4,10 @@ "CLOSE": "Tutup", "SAVE": "Simpan", "TEST": "Ujicoba", - "UPDATE": "Pembaruan" + "UPDATE": "Pembaruan", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 c98ac4357..c5fbde9ca 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,6 +20,7 @@ "NAME": "Kotak Masuk", "NONE": "Tidak ada", "NOT_SPAM": "Bukan Spam", + "USERNAME": "Username", "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 ed4ff4254..53fdf34e7 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,6 +20,7 @@ "NAME": "Innhólf", "NONE": "Ekkert", "NOT_SPAM": "Ekki ruslpóstur", + "USERNAME": "Username", "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 d979858ef..7d1f6d49f 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 @@ -4,7 +4,10 @@ "CLOSE": "Close", "SAVE": "Save", "TEST": "Test", - "UPDATE": "Aggiorna" + "UPDATE": "Aggiorna", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 8fcc3b73e..0d57e1147 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,6 +20,7 @@ "NAME": "Nome", "NONE": "Nessuno", "NOT_SPAM": "Segnala come non spam", + "USERNAME": "Username", "PASSWORD": "Password", "REPLY_TO": "Rispondi a", "SAVE": "Salva", diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json b/snappymail/v/0.0.0/app/localization/ja-JP/admin.json index 5d8d5d26c..ea5741d25 100644 --- a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json +++ b/snappymail/v/0.0.0/app/localization/ja-JP/admin.json @@ -4,7 +4,10 @@ "CLOSE": "閉じる", "SAVE": "保存", "TEST": "テスト", - "UPDATE": "更新" + "UPDATE": "更新", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "LOGIN": { "LABEL_LOGIN": "ログイン", diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/user.json b/snappymail/v/0.0.0/app/localization/ja-JP/user.json index b0531eca6..741102a24 100644 --- a/snappymail/v/0.0.0/app/localization/ja-JP/user.json +++ b/snappymail/v/0.0.0/app/localization/ja-JP/user.json @@ -20,6 +20,7 @@ "NAME": "受信トレイ", "NONE": "なし", "NOT_SPAM": "迷惑メールを解除", + "USERNAME": "Username", "PASSWORD": "パスワード", "REPLY_TO": "Reply-To", "SAVE": "保存", 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 91c332c9c..fa4a03795 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,6 +20,7 @@ "NAME": "받은 편지함", "NONE": "없음", "NOT_SPAM": "스팸 아님", + "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 b9f3cb8b8..a6fca5802 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 @@ -4,7 +4,10 @@ "CLOSE": "Uždaryti", "SAVE": "Saugoti", "TEST": "Bandymas", - "UPDATE": "Atnaujinti" + "UPDATE": "Atnaujinti", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 293ff87a8..a53ce4974 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,6 +20,7 @@ "NAME": "Gautieji", "NONE": "Nieko", "NOT_SPAM": "Ne šlamštas", + "USERNAME": "Username", "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 53b71efc1..64cae419e 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,6 +20,7 @@ "NAME": "Iesūtne", "NONE": "None", "NOT_SPAM": "Not Spam", + "USERNAME": "Username", "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 78c0f25b4..11e4d37d0 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 @@ -4,7 +4,10 @@ "CLOSE": "Lukk", "SAVE": "Lagre", "TEST": "Test", - "UPDATE": "Oppdater" + "UPDATE": "Oppdater", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 e88a2b1e0..a0d5600e9 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,6 +20,7 @@ "NAME": "Innboks", "NONE": "Ingen", "NOT_SPAM": "Ikke søppelpost", + "USERNAME": "Username", "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 c0fcb1274..824b87dc2 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 @@ -4,7 +4,10 @@ "CLOSE": "Sluiten", "SAVE": "Opslaan", "TEST": "Test", - "UPDATE": "Updaten" + "UPDATE": "Updaten", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 bbf4bdc9d..96fc63aed 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,6 +20,7 @@ "NAME": "Naam", "NONE": "Geen", "NOT_SPAM": "Geen ongewenste e-mail", + "USERNAME": "Username", "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 eef7aeace..e6ebce913 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 @@ -4,7 +4,10 @@ "CLOSE": "Zamknij", "SAVE": "Zapisz", "TEST": "Testuj", - "UPDATE": "Zaktualizuj" + "UPDATE": "Zaktualizuj", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 39d9d15ca..46bbfb1d0 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,6 +20,7 @@ "NAME": "Odebrane", "NONE": "Brak", "NOT_SPAM": "Oznacz jako pożądane", + "USERNAME": "Username", "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 dc39f03b8..e794ca8e7 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 @@ -4,7 +4,10 @@ "CLOSE": "Fechar", "SAVE": "Salvar", "TEST": "Testar", - "UPDATE": "Atualizar" + "UPDATE": "Atualizar", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 a5414d80b..156f51392 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,6 +20,7 @@ "NAME": "Caixa de Entrada", "NONE": "Nenhum", "NOT_SPAM": "Não é Lixo Eletrônico", + "USERNAME": "Username", "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 856aab164..d5d31f738 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 @@ -4,7 +4,10 @@ "CLOSE": "Fechar", "SAVE": "Guardar", "TEST": "Testar", - "UPDATE": "Atualizar" + "UPDATE": "Atualizar", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 994c068c8..5f45a36ae 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,6 +20,7 @@ "NAME": "Nome", "NONE": "Nenhum", "NOT_SPAM": "Não é spam", + "USERNAME": "Username", "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 856aab164..d5d31f738 100644 --- a/snappymail/v/0.0.0/app/localization/pt/admin.json +++ b/snappymail/v/0.0.0/app/localization/pt/admin.json @@ -4,7 +4,10 @@ "CLOSE": "Fechar", "SAVE": "Guardar", "TEST": "Testar", - "UPDATE": "Atualizar" + "UPDATE": "Atualizar", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 994c068c8..5f45a36ae 100644 --- a/snappymail/v/0.0.0/app/localization/pt/user.json +++ b/snappymail/v/0.0.0/app/localization/pt/user.json @@ -20,6 +20,7 @@ "NAME": "Nome", "NONE": "Nenhum", "NOT_SPAM": "Não é spam", + "USERNAME": "Username", "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 f6a0dcf27..b32f34a79 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,6 +20,7 @@ "NAME": "Intrări", "NONE": "None", "NOT_SPAM": "Not SPAM", + "USERNAME": "Username", "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 74cea96f3..d4d157b92 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 @@ -4,7 +4,10 @@ "CLOSE": "Закрыть", "SAVE": "Сохранить", "TEST": "Тест", - "UPDATE": "Обновить" + "UPDATE": "Обновить", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "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 d5b24b0fa..8fe08f996 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,6 +20,7 @@ "NAME": "Входящие", "NONE": "Ничего", "NOT_SPAM": "Не спам", + "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 7eae867ca..598417ace 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 @@ -4,7 +4,10 @@ "CLOSE": "Zatvoriť", "SAVE": "Uložiť", "TEST": "Test", - "UPDATE": "Aktualizovať" + "UPDATE": "Aktualizovať", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 b7f65b03e..e1d1372ad 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,6 +20,7 @@ "NAME": "Prijaté", "NONE": "Žiadny", "NOT_SPAM": "Nie je spam", + "USERNAME": "Username", "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 c0f314c92..6345f7922 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 @@ -4,7 +4,10 @@ "CLOSE": "Zapri", "SAVE": "Shrani", "TEST": "Preizkus", - "UPDATE": "Posodobi" + "UPDATE": "Posodobi", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 9c7b36ccc..5f5f7c398 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,6 +20,7 @@ "NAME": "Prejeto", "NONE": "Nobeno", "NOT_SPAM": "Ni vsiljena pošta", + "USERNAME": "Username", "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 358585cbe..86acfbefc 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 @@ -4,7 +4,10 @@ "CLOSE": "Stäng", "SAVE": "Spara", "TEST": "Test", - "UPDATE": "Uppdatera" + "UPDATE": "Uppdatera", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 ecbf077b4..76fc9e2e7 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,6 +20,7 @@ "NAME": "Inkorg", "NONE": "Ingen", "NOT_SPAM": "Inte spam", + "USERNAME": "Username", "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 96b201562..60b239d5e 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,6 +20,7 @@ "NAME": "Gelen Kutusu", "NONE": "None", "NOT_SPAM": "Spam Değil", + "USERNAME": "Username", "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 0052c5375..b240cf625 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,6 +20,7 @@ "NAME": "Вхідні", "NONE": "None", "NOT_SPAM": "Не спам", + "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 61067b500..b244bf1a5 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 @@ -4,7 +4,10 @@ "CLOSE": "Đóng", "SAVE": "Lưu", "TEST": "Thử", - "UPDATE": "Cập nhật" + "UPDATE": "Cập nhật", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "Cancel" }, "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 89049db22..352117b3b 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,6 +20,7 @@ "NAME": "Tên gọi", "NONE": "Trống", "NOT_SPAM": "Không phải thư rác", + "USERNAME": "Username", "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 eeeb36229..0ea3caf01 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 @@ -4,7 +4,10 @@ "CLOSE": "关闭", "SAVE": "保存", "TEST": "测试", - "UPDATE": "更新" + "UPDATE": "更新", + "USERNAME": "Username", + "PASSWORD": "Password", + "CANCEL": "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 f89a3dc85..6301857af 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,6 +20,7 @@ "NAME": "名称", "NONE": "无", "NOT_SPAM": "这不是垃圾邮件", + "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 48a76dbe5..104013c7c 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,6 +20,7 @@ "NAME": "收件箱", "NONE": "None", "NOT_SPAM": "Not Spam", + "USERNAME": "Username", "PASSWORD": "密碼", "REPLY_TO": "Reply-To", "SAVE": "保存", diff --git a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsAsk.html b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsAsk.html index 68781b61e..0398a9f1f 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsAsk.html +++ b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsAsk.html @@ -1,7 +1,11 @@
-
-
+ +
+ + +
+