diff --git a/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java b/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java index 4feb42f45e..3d5c5451cf 100755 --- a/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java +++ b/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java @@ -792,7 +792,7 @@ public class AuthenticationProcessor { ServicesLogger.LOGGER.failedAuthentication(e); event.error(Errors.USER_TEMPORARILY_DISABLED); if (e.getResponse() != null) return e.getResponse(); - return ErrorPage.error(session,authenticationSession, Response.Status.BAD_REQUEST, Messages.INVALID_USER); + return ErrorPage.error(session,authenticationSession, Response.Status.BAD_REQUEST, Messages.ACCOUNT_TEMPORARILY_DISABLED); } else if (e.getError() == AuthenticationFlowError.INVALID_CLIENT_SESSION) { ServicesLogger.LOGGER.failedAuthentication(e); diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/AbstractUsernameFormAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/AbstractUsernameFormAuthenticator.java index 66da3971a5..48f6565551 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/AbstractUsernameFormAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/AbstractUsernameFormAuthenticator.java @@ -83,8 +83,11 @@ public abstract class AbstractUsernameFormAuthenticator extends AbstractFormAuth return form.createLoginUsernamePassword(); } - protected String disabledByBruteForceError() { - return Messages.INVALID_USER; + protected String disabledByBruteForceError(String error) { + if(Errors.USER_TEMPORARILY_DISABLED.equals(error)) { + return Messages.ACCOUNT_TEMPORARILY_DISABLED; + } + return Messages.ACCOUNT_PERMANENTLY_DISABLED; } protected String disabledByBruteForceFieldError(){ @@ -240,7 +243,7 @@ public abstract class AbstractUsernameFormAuthenticator extends AbstractFormAuth if (bruteForceError != null) { context.getEvent().user(user); context.getEvent().error(bruteForceError); - Response challengeResponse = challenge(context, disabledByBruteForceError(), disabledByBruteForceFieldError()); + Response challengeResponse = challenge(context, disabledByBruteForceError(bruteForceError), disabledByBruteForceFieldError()); context.forceChallenge(challengeResponse); return true; } diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/OTPFormAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/OTPFormAuthenticator.java index 1b2670a956..9989bfd9a5 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/OTPFormAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/OTPFormAuthenticator.java @@ -125,8 +125,11 @@ public class OTPFormAuthenticator extends AbstractUsernameFormAuthenticator impl } @Override - protected String disabledByBruteForceError() { - return Messages.INVALID_TOTP; + protected String disabledByBruteForceError(String error) { + if(Errors.USER_TEMPORARILY_DISABLED.equals(error)) { + return Messages.ACCOUNT_TEMPORARILY_DISABLED_TOTP; + } + return Messages.ACCOUNT_PERMANENTLY_DISABLED_TOTP; } @Override diff --git a/services/src/main/java/org/keycloak/services/messages/Messages.java b/services/src/main/java/org/keycloak/services/messages/Messages.java index 1f87eb3e15..17f31b89ac 100755 --- a/services/src/main/java/org/keycloak/services/messages/Messages.java +++ b/services/src/main/java/org/keycloak/services/messages/Messages.java @@ -47,6 +47,12 @@ public class Messages { public static final String ACCOUNT_TEMPORARILY_DISABLED = "accountTemporarilyDisabledMessage"; + public static final String ACCOUNT_PERMANENTLY_DISABLED = "accountPermanentlyDisabledMessage"; + + public static final String ACCOUNT_TEMPORARILY_DISABLED_TOTP = "accountTemporarilyDisabledMessageTotp"; + + public static final String ACCOUNT_PERMANENTLY_DISABLED_TOTP = "accountPermanentlyDisabledMessageTotp"; + public static final String EXPIRED_CODE = "expiredCodeMessage"; public static final String EXPIRED_ACTION = "expiredActionMessage"; diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_ar.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_ar.properties index bf328ca4f9..c6488c30e6 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_ar.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_ar.properties @@ -219,7 +219,10 @@ invalidUsernameOrEmailMessage=اسم المستخدم أو البريد الإل invalidPasswordMessage=كلمة المرور غير صالحة. invalidEmailMessage=البريد الإلكتروني غير صالح. accountDisabledMessage=الحساب معطل، تواصل مع مسؤول النظام. -accountTemporarilyDisabledMessage=الحساب معطل مؤقتًا، تواصل مع مسؤول النظام أو حاول مرة أخرى لاحقًا. +accountTemporarilyDisabledMessage=اسم المستخدم أو كلمة مرور غير صالحة. +accountPermanentlyDisabledMessage=اسم المستخدم أو كلمة مرور غير صالحة. +accountTemporarilyDisabledMessageTotp=رمز التحقق غير صالح. +accountPermanentlyDisabledMessageTotp=رمز التحقق غير صالح. expiredCodeMessage=نفذ الوقت المسموح للدخول. الرجاء تسجيل الدخول مرة أخرى. expiredActionMessage=انتهى الإجراء. الرجاء الاستمرار في تسجيل الدخول الآن. expiredActionTokenNoSessionMessage=انتهى الإجراء. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_ca.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_ca.properties index 9f1be0f3f3..c567fe2986 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_ca.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_ca.properties @@ -197,7 +197,10 @@ invalidUsernameOrEmailMessage=El nom d''usuari o correu electrònic no són vàl invalidPasswordMessage=La contrasenya no és vàlida. invalidEmailMessage=L''adreça de correu electrònic no és vàlida. accountDisabledMessage=El compte està inhabilitat, contacteu amb l''administrador. -accountTemporarilyDisabledMessage=El compte està temporalment inhabilitat, contacteu amb l''administrador o intenteu-ho de nou més tard. +accountTemporarilyDisabledMessage=El nom d''usuari o contrasenya no són vàlids. +accountPermanentlyDisabledMessage=El nom d''usuari o contrasenya no són vàlids. +accountTemporarilyDisabledMessageTotp=El codi d''autenticació no és vàlid. +accountPermanentlyDisabledMessageTotp=El codi d''autenticació no és vàlid. expiredCodeMessage=S''ha esgotat el temps màxim per a la identificació. Identifiqueu-vos de nou. expiredActionMessage=L''acció ha caducat. Continueu ara amb l''entrada. expiredActionTokenNoSessionMessage=L''acció ha caducat. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_cs.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_cs.properties index dc636ea1d8..17d73bc655 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_cs.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_cs.properties @@ -219,7 +219,10 @@ invalidUsernameOrEmailMessage=Neplatné jméno nebo e-mail. invalidPasswordMessage=Neplatné heslo. invalidEmailMessage=Neplatný e-mail. accountDisabledMessage=Účet je neplatný, kontaktujte administrátora. -accountTemporarilyDisabledMessage=Účet je dočasně deaktivován, kontaktujte administrátora nebo zkuste později. +accountTemporarilyDisabledMessage=Neplatné jméno nebo heslo. +accountPermanentlyDisabledMessage=Neplatné jméno nebo heslo. +accountTemporarilyDisabledMessageTotp=Neplatný kód ověřování. +accountPermanentlyDisabledMessageTotp=Neplatný kód ověřování. expiredCodeMessage=Platnost přihlášení vypršela. Přihlaste se znovu. expiredActionMessage=Akce vypršela. Pokračujte přihlášením. expiredActionTokenNoSessionMessage=Akce vypršela. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_da.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_da.properties index 70646109d4..d10f34b822 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_da.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_da.properties @@ -153,7 +153,10 @@ client_broker=Broker invalidUserMessage=Ugyldig brugernavn eller adgangskode. invalidEmailMessage=Ugyldig email adresse. accountDisabledMessage=Kontoen er deaktiveret, kontakt en administrator. -accountTemporarilyDisabledMessage=Kontoen er midlertidigt deaktiveret, kontakt en administrator eller prøv igen senere. +accountTemporarilyDisabledMessage=Ugyldig brugernavn eller adgangskode. +accountPermanentlyDisabledMessage=Ugyldig brugernavn eller adgangskode. +accountTemporarilyDisabledMessageTotp=Ugyldig autentificerings kode. +accountPermanentlyDisabledMessageTotp=Ugyldig autentificerings kode. expiredCodeMessage=Log ind tog for lang tid. Prøv igen. expiredActionMessage=Handlingen er udløbet. Fortsæt med log ind nu. expiredActionTokenNoSessionMessage=Handling udløbet. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_de.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_de.properties index 2f4b8c3bab..1ce5d5c866 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_de.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_de.properties @@ -192,7 +192,10 @@ invalidUsernameOrEmailMessage=Ungültiger Benutzername oder E-Mail. invalidPasswordMessage=Ungültiges Passwort. invalidEmailMessage=Ungültige E-Mail-Adresse. accountDisabledMessage=Ihr Benutzerkonto ist gesperrt, bitte kontaktieren Sie den Admin. -accountTemporarilyDisabledMessage=Ihr Benutzerkonto ist temporär gesperrt. Bitte kontaktieren Sie den Admin oder versuchen Sie es später noch einmal. +accountTemporarilyDisabledMessage=Ungültiger Benutzername oder Passwort. +accountPermanentlyDisabledMessage=Ungültiger Benutzername oder Passwort. +accountTemporarilyDisabledMessageTotp=Ungültiger One-time Code. +accountPermanentlyDisabledMessageTotp=Ungültiger One-time Code. expiredCodeMessage=Zeitüberschreitung bei der Anmeldung. Bitte melden Sie sich erneut an. expiredActionMessage=Die Aktion ist nicht mehr gültig. Bitte fahren Sie nun mit der Anmeldung fort. expiredActionTokenNoSessionMessage=Die Aktion ist nicht mehr gültig. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_el.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_el.properties index 91eaaecabb..7c1a5dde74 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_el.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_el.properties @@ -195,7 +195,10 @@ invalidUsernameOrEmailMessage=Μη έγκυρο όνομα χρήστη ή email invalidPasswordMessage=Μη έγκυρος κωδικός πρόσβασης. invalidEmailMessage=Μη έγκυρη διεύθυνση email. accountDisabledMessage=Ο λογαριασμός έχει απενεργοποιηθεί, επικοινωνήστε με τον διαχειριστή. -accountTemporarilyDisabledMessage=Ο λογαριασμός έχει απενεργοποιηθεί προσωρινά, επικοινωνήστε με τον διαχειριστή ή δοκιμάστε αργότερα. +accountTemporarilyDisabledMessage=Μη έγκυρο όνομα χρήστη ή κωδικός πρόσβασης. +accountPermanentlyDisabledMessage=Μη έγκυρο όνομα χρήστη ή κωδικός πρόσβασης. +accountTemporarilyDisabledMessageTotp=Μη έγκυρος κωδικός μίας χρήσης. +accountPermanentlyDisabledMessageTotp=Μη έγκυρος κωδικός μίας χρήσης. expiredCodeMessage=Λήξη χρόνου σύνδεσης. Παρακαλώ συνδεθείτε ξανά. expiredActionMessage=Η ενέργεια έληξε. Προχωρείστε τώρα με σύνδεση. expiredActionTokenNoSessionMessage=Η ενέργεια έληξε. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_es.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_es.properties index 5b560a25c0..2396761ef8 100755 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_es.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_es.properties @@ -129,7 +129,10 @@ client_broker=Broker invalidUserMessage=Usuario o contraseña incorrectos. invalidEmailMessage=Email no válido accountDisabledMessage=La cuenta está desactivada, contacta con el administrador. -accountTemporarilyDisabledMessage=La cuenta está temporalmente desactivada, contacta con el administrador o inténtalo de nuevo más tarde. +accountTemporarilyDisabledMessage=Usuario o contraseña incorrectos. +accountPermanentlyDisabledMessage=Usuario o contraseña incorrectos. +accountTemporarilyDisabledMessageTotp=El código de autenticación no es válido. +accountPermanentlyDisabledMessageTotp=El código de autenticación no es válido. expiredCodeMessage=Se agotó el tiempo máximo para la identificación. Por favor identificate de nuevo. expiredActionMessage=Acción caducada. Continúe con el inicio de sesión ahora. sessionLimitExceeded=Hay demasiadas sesiones. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_fa.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_fa.properties index 089e5c239f..8271b661df 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_fa.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_fa.properties @@ -215,7 +215,10 @@ invalidUsernameOrEmailMessage=.نام کاربری یا ایمیل نامعتب invalidPasswordMessage=رمز عبور نامعتبر invalidEmailMessage=.آدرس ایمیل نامعتبر است accountDisabledMessage=.حساب غیرفعال است، با سرپرست خود تماس بگیرید -accountTemporarilyDisabledMessage=.حساب به طور موقت غیرفعال شده است; با سرپرست خود تماس بگیرید یا بعداً دوباره امتحان کنید +accountTemporarilyDisabledMessage=.نام کاربری یا رمز عبور نامعتبر است +accountPermanentlyDisabledMessage=.نام کاربری یا رمز عبور نامعتبر است +accountTemporarilyDisabledMessageTotp=.کد احراز هویت نامعتبر است +accountPermanentlyDisabledMessageTotp=.کد احراز هویت نامعتبر است expiredCodeMessage=.اتمام مدت ورود. لطفاً دوباره وارد شوید expiredActionMessage=.اقدام منقضی شده است. لطفا همین الان با ورود به سیستم ادامه دهید expiredActionTokenNoSessionMessage=اقدام منقضی شده است. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_fi.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_fi.properties index e734a7a849..7fce2003e5 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_fi.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_fi.properties @@ -195,7 +195,10 @@ invalidUsernameOrEmailMessage=Väärä salasana tai sähköposti. invalidPasswordMessage=Väärä salasana. invalidEmailMessage=Virheellinen sähköpostiosoite. accountDisabledMessage=Tili on poistettu käytöstä, ota yhteyttä järjestelmänvalvojaan. -accountTemporarilyDisabledMessage=Tili on väliaikaisesti poissa käytöstä, ota yhteyttä järjestelmänvalvojaan tai yritä myöhemmin uudelleen. +accountTemporarilyDisabledMessage=Virheellinen käyttäjätunnus tai salasana. +accountPermanentlyDisabledMessage=Virheellinen käyttäjätunnus tai salasana. +accountTemporarilyDisabledMessageTotp=Väärä todentaja-koodi. +accountPermanentlyDisabledMessageTotp=Väärä todentaja-koodi. expiredCodeMessage=Kirjautuminen kesti liian kauan. Ole hyvä ja kirjaudu uudestaan. expiredActionMessage=Toiminto kesti liian kauan. Ole hyvä ja jatka kirjautumiseen. expiredActionTokenNoSessionMessage=Toiminto vanhentui. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_fr.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_fr.properties index f109dc1cff..92497fa3e3 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_fr.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_fr.properties @@ -186,7 +186,10 @@ invalidUsernameOrEmailMessage=Nom d''utilisateur ou courriel invalide. invalidPasswordMessage=Mot de passe invalide. invalidEmailMessage=Courriel invalide. accountDisabledMessage=Compte désactivé, contactez votre administrateur. -accountTemporarilyDisabledMessage=Ce compte est temporairement désactivé, contactez votre administrateur ou bien réessayez plus tard. +accountTemporarilyDisabledMessage=Nom d''utilisateur ou mot de passe invalide. +accountPermanentlyDisabledMessage=Nom d''utilisateur ou mot de passe invalide. +accountTemporarilyDisabledMessageTotp=Le code d''authentification est invalide. +accountPermanentlyDisabledMessageTotp=Le code d''authentification est invalide. expiredCodeMessage=Connexion expirée. Veuillez vous reconnecter. expiredActionMessage=Action expirée. Merci de continuer la connexion. expiredActionTokenNoSessionMessage=Action expirée. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_hu.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_hu.properties index d17b7cd48d..08c9a0a7a6 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_hu.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_hu.properties @@ -217,7 +217,10 @@ invalidUsernameOrEmailMessage=Érvénytelen felhasználónév vagy e-mail cím. invalidPasswordMessage=Érvénytelen jelszó. invalidEmailMessage=Érvénytelen e-mail cím. accountDisabledMessage=Felhasználói fiókja inaktív, kérem, vegye fel a kapcsolatot az alkalmazás adminisztrátorával. -accountTemporarilyDisabledMessage=Felhasználói fiókja átmenetileg inaktív, kérem, vegye fel a kapcsolatot az alkalmazás adminisztrátorával, vagy próbálkozzon később. +accountTemporarilyDisabledMessage=Érvénytelen felhasználónév vagy jelszó. +accountPermanentlyDisabledMessage=Érvénytelen felhasználónév vagy jelszó. +accountTemporarilyDisabledMessageTotp=Érvénytelen hitelesítő kód. +accountPermanentlyDisabledMessageTotp=Érvénytelen hitelesítő kód. expiredCodeMessage=Belépési időtúllépés, kérem, lépjen be újra. expiredActionMessage=A művelet érvényességi ideje lejárt. Kérem, lépjen be újra. expiredActionTokenNoSessionMessage=A művelet érvényességi ideje lejárt. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_it.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_it.properties index 00e0fa3e2b..0429d3374b 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_it.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_it.properties @@ -172,7 +172,10 @@ invalidUsernameOrEmailMessage=Username o email non validi. invalidPasswordMessage=Password non valida. invalidEmailMessage=Indirizzo email non valido. accountDisabledMessage=L''account è disabilitato, contatta il tuo amministratore. -accountTemporarilyDisabledMessage=L''account è temporaneamente disabilitato; contatta il tuo amministratore o prova più tardi. +accountTemporarilyDisabledMessage=Username o password non validi. +accountPermanentlyDisabledMessage=Username o password non validi. +accountTemporarilyDisabledMessageTotp=Codice di autenticazione non valido. +accountPermanentlyDisabledMessageTotp=Codice di autenticazione non valido. expiredCodeMessage=Login scaduto. Riprovare. expiredActionMessage=Azione scaduta. Continuare adesso con in login. expiredActionTokenNoSessionMessage=Azione scaduta. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_ja.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_ja.properties index ab3476dfd6..5e2be5719a 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_ja.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_ja.properties @@ -172,7 +172,10 @@ invalidUsernameOrEmailMessage=ユーザー名またはメールアドレスが invalidPasswordMessage=パスワードが無効です。 invalidEmailMessage=無効なメールアドレスです。 accountDisabledMessage=アカウントが無効です。管理者に連絡してください。 -accountTemporarilyDisabledMessage=アカウントが一時的に無効です。管理者に連絡するか、しばらく時間をおいてから再度お試しください。 +accountTemporarilyDisabledMessage=無効なユーザー名またはパスワードです。 +accountPermanentlyDisabledMessage=無効なユーザー名またはパスワードです。 +accountTemporarilyDisabledMessageTotp=無効なオーセンティケーター・コードです。 +accountPermanentlyDisabledMessageTotp=無効なオーセンティケーター・コードです。 expiredCodeMessage=ログイン・タイムアウトが発生しました。再度ログインしてください。 expiredActionMessage=アクションは期限切れです。今すぐログインしてください。 expiredActionTokenNoSessionMessage=アクションは期限切れです。 diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_ka.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_ka.properties index 3a11f2eedb..6ac5865ad2 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_ka.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_ka.properties @@ -62,7 +62,10 @@ emailInstructionUsername=შეიყვანეთ თქვენ მომ pageExpiredMsg2=შესვლის პროცესის გასაგრძელებლად role_manage-applications=აპლიკაციების მართვა role_offline-access=ინტერნეტგარეშე წვდომა -accountTemporarilyDisabledMessage=ანგარიში დროებით გათიშულია. დაუკავშირდით თქვენს ადმინისტრატორს ან მოგვიანებით სცადეთ. +accountTemporarilyDisabledMessage=არასწორი მომხმარებელი ან პაროლი. +accountPermanentlyDisabledMessage=არასწორი მომხმარებელი ან პაროლი. +accountTemporarilyDisabledMessageTotp=არასწორი ავთენტიკატორის კოდი. +accountPermanentlyDisabledMessageTotp=არასწორი ავთენტიკატორის კოდი. role_create-realm=რეალმის შექმნა role_create-client=კლიენტის შექმნა role_view-users=მომხმარებლების ნახვა diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_ko.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_ko.properties index 8605be3a1c..f33378de25 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_ko.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_ko.properties @@ -224,7 +224,10 @@ invalidUsernameOrEmailMessage=잘못된 사용자 이름 또는 이메일입니 invalidPasswordMessage=잘못된 비밀번호입니다. invalidEmailMessage=잘못된 이메일 주소입니다. accountDisabledMessage=계정이 비활성화되었습니다. 관리자에게 문의하세요. -accountTemporarilyDisabledMessage=계정이 일시적으로 비활성화되었습니다. 관리자에게 문의하거나 나중에 다시 시도하세요. +accountTemporarilyDisabledMessage=잘못된 사용자 이름 또는 비밀번호입니다. +accountPermanentlyDisabledMessage=잘못된 사용자 이름 또는 비밀번호입니다. +accountTemporarilyDisabledMessageTotp=잘못된 인증기 코드입니다. +accountPermanentlyDisabledMessageTotp=잘못된 인증기 코드입니다. expiredCodeMessage=로그인 시간 초과. 다시 로그인하세요. expiredActionMessage=작업이 만료되었습니다. 지금 로그인 절차를 계속하세요. expiredActionTokenNoSessionMessage=작업이 만료되었습니다. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_lt.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_lt.properties index 9b3bb9481b..cadc42b657 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_lt.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_lt.properties @@ -121,7 +121,10 @@ client_broker=Tarpininkas invalidUserMessage=Neteisingas naudotojo vardas arba slaptažodis. invalidEmailMessage=Neteisingas el. pašto adresas. accountDisabledMessage=Paskyros galiojimas sustabdytas, kreipkitės į administratorių. -accountTemporarilyDisabledMessage=Paskyros galiojimas laikinai sustabdytas. Kreipkitės į administratorių arba pabandykite vėliau. +accountTemporarilyDisabledMessage=Neteisingas naudotojo vardas arba slaptažodis. +accountPermanentlyDisabledMessage=Neteisingas naudotojo vardas arba slaptažodis. +accountTemporarilyDisabledMessageTotp=Neteisingas autentifikacijos kodas. +accountPermanentlyDisabledMessageTotp=Neteisingas autentifikacijos kodas. expiredCodeMessage=Prisijungimo laikas baigėsi. Bandykite dar kartą. missingFirstNameMessage=Prašome įvesti vardą. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_lv.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_lv.properties index ee2ee204e8..2fa73e7edb 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_lv.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_lv.properties @@ -152,7 +152,10 @@ client_broker=Brokeris invalidUserMessage=Nekorekts lietotājvārds vai parole. invalidEmailMessage=Nekorekta e-pasta adrese. accountDisabledMessage=Konts ir atspējots, sazinieties ar administratoru. -accountTemporarilyDisabledMessage=Konts ir uz laiku atspējots, sazinieties ar administratoru vai mēģiniet vēlāk. +accountTemporarilyDisabledMessage=Nekorekts lietotājvārds vai parole. +accountPermanentlyDisabledMessage=Nekorekts lietotājvārds vai parole. +accountTemporarilyDisabledMessageTotp=Neder?gs autentifik?cijas kods. +accountPermanentlyDisabledMessageTotp=Neder?gs autentifik?cijas kods. expiredCodeMessage=Pieslēgšanās noilgums. Lūdzu pieslēdzieties atkārtoti. expiredActionMessage=Darbība noilgusi. Lūdzu turpiniet ar pieslēgšanos. expiredActionTokenNoSessionMessage=Darbība noilgusi. @@ -169,6 +172,7 @@ notMatchPasswordMessage=Paroles nesakrīt. invalidPasswordExistingMessage=Nekorekta pašreizējā parole. invalidPasswordBlacklistedMessage=Nekorekta parole: parole ir melnajā sarakstā. invalidPasswordConfirmMessage=Paroles apstiprinājums nav pareizs. +invalidTotpMessage=Neder?gs autentifik?cijas kods. usernameExistsMessage=Lietotājvārds jau eksistē. emailExistsMessage=E-pasts jau eksistē. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_nl.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_nl.properties index fbe373de26..bde0f0f24a 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_nl.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_nl.properties @@ -165,7 +165,10 @@ client_broker=Broker invalidUserMessage=Ongeldige gebruikersnaam of wachtwoord. invalidEmailMessage=Ongeldig e-mailadres. accountDisabledMessage=Account is uitgeschakeld, neem contact op met beheer. -accountTemporarilyDisabledMessage=Account is tijdelijk uitgeschakeld, neem contact op met beheer of probeer het later opnieuw. +accountTemporarilyDisabledMessage=Ongeldige gebruikersnaam of wachtwoord. +accountPermanentlyDisabledMessage=Ongeldige gebruikersnaam of wachtwoord. +accountTemporarilyDisabledMessageTotp=Ongeldige authenticatiecode. +accountPermanentlyDisabledMessageTotp=Ongeldige authenticatiecode. expiredCodeMessage=Logintijd verlopen. Gelieve opnieuw in te loggen. expiredActionMessage=Actietijd verlopen. Log daarom opnieuw in. expiredActionTokenNoSessionMessage=Actietijd verlopen. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_no.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_no.properties index eac7566873..ebb9e2f397 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_no.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_no.properties @@ -120,7 +120,10 @@ client_broker=Broker invalidUserMessage=Ugyldig brukernavn eller passord. invalidEmailMessage=Ugyldig e-postadresse. accountDisabledMessage=Konto er deaktivert, kontakt administrator. -accountTemporarilyDisabledMessage=Konto er midlertidig deaktivert, kontakt administrator eller prøv på nytt senere. +accountTemporarilyDisabledMessage=Ugyldig brukernavn eller passord. +accountPermanentlyDisabledMessage=Ugyldig brukernavn eller passord. +accountTemporarilyDisabledMessageTotp=Ugyldig engangskode. +accountPermanentlyDisabledMessageTotp=Ugyldig engangskode. expiredCodeMessage=Login ble tidsavbrutt. Vennligst logg inn på nytt. missingFirstNameMessage=Vennligst oppgi fornavn. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_pl.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_pl.properties index 88c8f2c41b..283b5b77fc 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_pl.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_pl.properties @@ -177,7 +177,10 @@ invalidUsernameOrEmailMessage=Nieprawidłowa nazwa użytkownika lub hasło. invalidPasswordMessage=Nieprawidłowe hasło. invalidEmailMessage=Nieprawidłowy adres e-mail. accountDisabledMessage=Konto jest wyłączone, skontaktuj się z administratorem. -accountTemporarilyDisabledMessage=Konto jest tymczasowo wyłączone, skontaktuj się z administratorem lub spróbuj ponownie później. +accountTemporarilyDisabledMessage=Nieprawidłowa nazwa użytkownika lub hasło. +accountPermanentlyDisabledMessage=Nieprawidłowa nazwa użytkownika lub hasło. +accountTemporarilyDisabledMessageTotp=Nieprawidłowy kod uwierzytelnienia. +accountPermanentlyDisabledMessageTotp=Nieprawidłowy kod uwierzytelnienia. expiredCodeMessage=Przekroczono limit czasu logowania. Proszę Zaloguj się ponownie. expiredActionMessage=Akcja wygasła. Proszę kontynuować logowanie. expiredActionTokenNoSessionMessage=Akcja wygasła. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_pt.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_pt.properties index 1678e7543d..de49d95786 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_pt.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_pt.properties @@ -219,7 +219,10 @@ invalidUsernameOrEmailMessage=Nome de utilizador ou endereço de e-mail inválid invalidPasswordMessage=Palavra-passe inválida. invalidEmailMessage=Endereço de e-mail inválido. accountDisabledMessage=Conta desativada, por favor, contacte um administrador. -accountTemporarilyDisabledMessage=Conta temporariamente indisponível, por favor, contacte um administrador ou tente novamente mais tarde. +accountTemporarilyDisabledMessage=Nome de utilizador ou palavra-passe inválida. +accountPermanentlyDisabledMessage=Nome de utilizador ou palavra-passe inválida. +accountTemporarilyDisabledMessageTotp=Código de uso único inválido. +accountPermanentlyDisabledMessageTotp=Código de uso único inválido. expiredCodeMessage=Tempo de login expirado. Por favor, faça login novamente. expiredActionMessage=Ação expirada. Por favor, continue com o login agora. expiredActionTokenNoSessionMessage=Ação expirada. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_pt_BR.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_pt_BR.properties index 4ab33fbd50..64e882c9e3 100755 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_pt_BR.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_pt_BR.properties @@ -182,7 +182,10 @@ invalidUsernameOrEmailMessage=Nome de usuário ou endereço de e-mail inválido. invalidPasswordMessage=Senha inválida. invalidEmailMessage=Endereço de e-mail inválido. accountDisabledMessage=Conta desativada, por favor, contate um administrador. -accountTemporarilyDisabledMessage=Conta temporariamente indisponível, por favor, contate um administrador ou tente novamente mais tarde. +accountTemporarilyDisabledMessage=Nome de usuário ou senha inválida. +accountPermanentlyDisabledMessage=Nome de usuário ou senha inválida. +accountTemporarilyDisabledMessageTotp=Código de uso único inválido. +accountPermanentlyDisabledMessageTotp=Código de uso único inválido. expiredCodeMessage=Tempo de login expirado. Por favor, faça login novamente. expiredActionMessage=Ação expirada. Por favor, continue com o login agora. expiredActionTokenNoSessionMessage=Ação expirada. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_ru.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_ru.properties index 107a3dbc82..bd9ca05eb2 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_ru.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_ru.properties @@ -142,7 +142,10 @@ client_broker=Брокер invalidUserMessage=Неправильное имя пользователя или пароль. invalidEmailMessage=Неправильный E-mail. accountDisabledMessage=Учетная запись заблокирована, свяжитесь с администратором. -accountTemporarilyDisabledMessage=Учетная запись временно заблокирована, свяжитесь с администратором или попробуйте позже. +accountTemporarilyDisabledMessage=Неправильное имя пользователя или пароль. +accountPermanentlyDisabledMessage=Неправильное имя пользователя или пароль. +accountTemporarilyDisabledMessageTotp=Неверный код аутентификатора. +accountPermanentlyDisabledMessageTotp=Неверный код аутентификатора. expiredCodeMessage=Вход просрочен по таймауту. Пожалуйста, войдите снова. missingFirstNameMessage=Пожалуйста введите имя. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_sk.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_sk.properties index 335899f0a8..25c6a6c8a5 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_sk.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_sk.properties @@ -219,7 +219,10 @@ invalidUsernameOrEmailMessage=Neplatné používateľské meno alebo e-mail. invalidPasswordMessage=Neplatné heslo. invalidEmailMessage=Neplatná e-mailová adresa. accountDisabledMessage=Účet je zakázaný, kontaktujte administrátora. -accountTemporarilyDisabledMessage=Účet je dočasne zakázaný, kontaktujte administrátora alebo skúste neskôr. +accountTemporarilyDisabledMessage=Neplatné používateľské meno alebo heslo. +accountPermanentlyDisabledMessage=Neplatné používateľské meno alebo heslo. +accountTemporarilyDisabledMessageTotp=Neplatný kód autentifikátora. +accountPermanentlyDisabledMessageTotp=Neplatný kód autentifikátora. expiredCodeMessage=Platnosť prihlásenia vypršala. Prihláste sa znova. expiredActionMessage=Akcia vypršala. Pokračujte prihlásením. expiredActionTokenNoSessionMessage=Akcia vypršala. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_sv.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_sv.properties index a926d8ba6e..bbc738a05b 100755 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_sv.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_sv.properties @@ -117,7 +117,10 @@ client_realm-management=Realmhantering invalidUserMessage=Ogiltigt användarnamn eller lösenord. invalidEmailMessage=Ogiltig e-postadress. accountDisabledMessage=Kontot är inaktiverat, kontakta administratör. -accountTemporarilyDisabledMessage=Kontot är tillfälligt inaktiverat, kontakta administratör eller försök igen senare. +accountTemporarilyDisabledMessage=Ogiltigt användarnamn eller lösenord. +accountPermanentlyDisabledMessage=Ogiltigt användarnamn eller lösenord. +accountTemporarilyDisabledMessageTotp=Autentiseringskoden är ogiltig. +accountPermanentlyDisabledMessageTotp=Autentiseringskoden är ogiltig. expiredCodeMessage=Inloggningen nådde en maxtidsgräns. Vänligen försök igen. missingFirstNameMessage=Vänligen ange förnamn. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_th.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_th.properties index 5696b7c882..ee2165a462 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_th.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_th.properties @@ -217,7 +217,10 @@ invalidUsernameOrEmailMessage=ชื่อผู้ใช้งานหรื invalidPasswordMessage=รหัสผ่านไม่ถูกต้อง invalidEmailMessage=ที่อยู่อีเมลไม่ถูกต้อง accountDisabledMessage=บัญชีถูกปิดใช้งาน ติดต่อผู้ดูแลระบบของคุณ -accountTemporarilyDisabledMessage=บัญชีถูกปิดใช้งานชั่วคราว ติดต่อผู้ดูแลระบบของคุณหรือลองใหม่ในภายหลัง +accountTemporarilyDisabledMessage=ชื่อผู้ใช้งานหรือรหัสผ่านไม่ถูกต้อง +accountPermanentlyDisabledMessage=ชื่อผู้ใช้งานหรือรหัสผ่านไม่ถูกต้อง +accountTemporarilyDisabledMessageTotp=รหัส Authenticator ไม่ถูกต้อง +accountPermanentlyDisabledMessageTotp=รหัส Authenticator ไม่ถูกต้อง expiredCodeMessage=การเข้าสู่ระบบหมดเวลา กรุณาเข้าสู่ระบบอีกครั้ง expiredActionMessage=การกระทำหมดเวลา กรุณาเข้าสู่ระบบในตอนนี้ expiredActionTokenNoSessionMessage=การกระทำหมดเวลา diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_tr.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_tr.properties index 113ff13b3e..164e965b16 100755 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_tr.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_tr.properties @@ -224,7 +224,10 @@ invalidUsernameOrEmailMessage=Geçersiz kullanıcı adı veya e-posta. invalidPasswordMessage=Geçersiz şifre. invalidEmailMessage=Geçersiz e-posta adresi. accountDisabledMessage=Hesap devre dışı, yönetici ile iletişime geçin. -accountTemporarilyDisabledMessage=Hesabınız geçici olarak kilitlendi, lütfen yöneticiyle iletişime geçin veya daha sonra tekrar deneyin. +accountTemporarilyDisabledMessage=Geçersiz kullanıcı adı veya şifre. +accountPermanentlyDisabledMessage=Geçersiz kullanıcı adı veya şifre. +accountTemporarilyDisabledMessageTotp=Geçersiz kimlik doğrulama kodu. +accountPermanentlyDisabledMessageTotp=Geçersiz kimlik doğrulama kodu. expiredCodeMessage=Oturum zaman aşımına uğradı. Lütfen tekrar giriş yapın. expiredActionMessage=Eylem süresi doldu. Lütfen şimdi giriş yapmaya devam edin. expiredActionTokenNoSessionMessage=Eylemin süresi doldu. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_uk.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_uk.properties index d8c28a1144..057f9c9d5b 100755 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_uk.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_uk.properties @@ -212,7 +212,10 @@ invalidUsernameOrEmailMessage=Невірне ім''я користувача а invalidPasswordMessage=Невірний пароль. invalidEmailMessage=Невірна адреса електронної пошти. accountDisabledMessage=Обліковий запис заблоковано, зверніться до адміністратора. -accountTemporarilyDisabledMessage=Обліковий запис тимчасово заблоковано; зверніться до адміністратора або повторіть спробу пізніше. +accountTemporarilyDisabledMessage=Невірне ім''я користувача або пароль. +accountPermanentlyDisabledMessage=Невірне ім''я користувача або пароль. +accountTemporarilyDisabledMessageTotp=Невірний код автентифікатора. +accountPermanentlyDisabledMessageTotp=Невірний код автентифікатора. expiredCodeMessage=Час очікування входу закінчився. Увійдіть знову. expiredActionMessage=Термін дії закінчився. Будь ласка, увійдіть знову. expiredActionTokenNoSessionMessage=Термін дії закінчився. diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_zh_CN.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_zh_CN.properties index 498e3886d8..d11363bce4 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_zh_CN.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_zh_CN.properties @@ -219,7 +219,10 @@ invalidUsernameOrEmailMessage=无效的用户名或电子邮箱。 invalidPasswordMessage=无效的密码. invalidEmailMessage=无效的电子邮件地址 accountDisabledMessage=账户已被禁用，请联系您的管理员。 -accountTemporarilyDisabledMessage=账户被临时禁用，请联系管理员或稍后再试。 +accountTemporarilyDisabledMessage=无效的用户名或密码。 +accountPermanentlyDisabledMessage=无效的用户名或密码。 +accountTemporarilyDisabledMessageTotp=无效的验证码 +accountPermanentlyDisabledMessageTotp=无效的验证码 expiredCodeMessage=登录超时，请重新登录。 expiredActionMessage=操作已过期。请登录后继续。 expiredActionTokenNoSessionMessage=操作已过期。 diff --git a/themes/src/main/resources-community/theme/base/login/messages/messages_zh_TW.properties b/themes/src/main/resources-community/theme/base/login/messages/messages_zh_TW.properties index de99183f43..df7781184b 100644 --- a/themes/src/main/resources-community/theme/base/login/messages/messages_zh_TW.properties +++ b/themes/src/main/resources-community/theme/base/login/messages/messages_zh_TW.properties @@ -221,7 +221,10 @@ invalidUsernameOrEmailMessage=無效的使用者名稱或電子信箱。 invalidPasswordMessage=無效的密碼。 invalidEmailMessage=無效的電子信箱。 accountDisabledMessage=帳號已停用，請聯繫系統管理員。 -accountTemporarilyDisabledMessage=帳號被暫時停用，請聯繫系統管理員或稍後重試。 +accountTemporarilyDisabledMessage=無效的使用者名稱或密碼。 +accountPermanentlyDisabledMessage=無效的使用者名稱或密碼。 +accountTemporarilyDisabledMessageTotp=無效的驗證碼。 +accountPermanentlyDisabledMessageTotp=無效的驗證碼。 expiredCodeMessage=登入逾時，請重新登入。 expiredActionMessage=動作逾時，請繼續登入。 expiredActionTokenNoSessionMessage=動作逾時。 diff --git a/themes/src/main/resources/theme/base/login/messages/messages_en.properties b/themes/src/main/resources/theme/base/login/messages/messages_en.properties index 73c6676aa0..ee664cee6f 100644 --- a/themes/src/main/resources/theme/base/login/messages/messages_en.properties +++ b/themes/src/main/resources/theme/base/login/messages/messages_en.properties @@ -224,7 +224,12 @@ invalidUsernameOrEmailMessage=Invalid username or email. invalidPasswordMessage=Invalid password. invalidEmailMessage=Invalid email address. accountDisabledMessage=Account is disabled, contact your administrator. -accountTemporarilyDisabledMessage=Account is temporarily disabled; contact your administrator or retry later. +# These properties are deliberately the same as "invalidUsernameMessage", so by default, it is not possible to recognize the reason of failed authentication is temporarily disabled account +accountTemporarilyDisabledMessage=Invalid username or password. +accountPermanentlyDisabledMessage=Invalid username or password. +# These properties are deliberately the same as "invalidTotpMessage", so by default, it is not possible to recognize the reason of failed authentication is temporarily disabled account +accountTemporarilyDisabledMessageTotp=Invalid authenticator code. +accountPermanentlyDisabledMessageTotp=Invalid authenticator code. expiredCodeMessage=Login timeout. Please sign in again. expiredActionMessage=Action expired. Please continue with login now. expiredActionTokenNoSessionMessage=Action expired.