From cc0d16c7e1a7ccb763d918bf281a1c652ca73a9d Mon Sep 17 00:00:00 2001 From: ljacqu Date: Mon, 9 Jan 2017 21:16:53 +0100 Subject: [PATCH] Remove redundant and unused message - Remove 'reg_voluntarily' - Remove 'user_unknown' in favor of 'unknown_user' - but move text from old 'user_unknown' to 'unknown_user' Found by @Twonox --- .../authme/command/executable/authme/AccountsCommand.java | 2 +- .../authme/command/executable/authme/LastLoginCommand.java | 2 +- src/main/java/fr/xephi/authme/message/MessageKey.java | 6 ------ .../fr/xephi/authme/process/login/AsynchronousLogin.java | 2 +- src/main/resources/messages/messages_bg.yml | 6 ++---- src/main/resources/messages/messages_br.yml | 4 +--- src/main/resources/messages/messages_cz.yml | 4 +--- src/main/resources/messages/messages_de.yml | 4 +--- src/main/resources/messages/messages_en.yml | 4 +--- src/main/resources/messages/messages_es.yml | 4 +--- src/main/resources/messages/messages_eu.yml | 6 ++---- src/main/resources/messages/messages_fi.yml | 4 +--- src/main/resources/messages/messages_gl.yml | 5 +---- src/main/resources/messages/messages_hu.yml | 4 +--- src/main/resources/messages/messages_id.yml | 6 ++---- src/main/resources/messages/messages_it.yml | 4 +--- src/main/resources/messages/messages_ko.yml | 6 ++---- src/main/resources/messages/messages_lt.yml | 6 ++---- src/main/resources/messages/messages_nl.yml | 6 ++---- src/main/resources/messages/messages_pl.yml | 4 +--- src/main/resources/messages/messages_pt.yml | 6 ++---- src/main/resources/messages/messages_ro.yml | 6 ++---- src/main/resources/messages/messages_ru.yml | 6 ++---- src/main/resources/messages/messages_sk.yml | 6 ++---- src/main/resources/messages/messages_tr.yml | 6 ++---- src/main/resources/messages/messages_uk.yml | 6 ++---- src/main/resources/messages/messages_vn.yml | 6 ++---- src/main/resources/messages/messages_zhcn.yml | 6 ++---- src/main/resources/messages/messages_zhhk.yml | 6 ++---- src/main/resources/messages/messages_zhmc.yml | 6 ++---- src/main/resources/messages/messages_zhtw.yml | 6 ++---- .../command/executable/authme/AccountsCommandTest.java | 2 +- .../command/executable/authme/LastLoginCommandTest.java | 2 +- .../xephi/authme/process/login/AsynchronousLoginTest.java | 2 +- 34 files changed, 50 insertions(+), 111 deletions(-) diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java index 073655746..d5b3d9f79 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java @@ -56,7 +56,7 @@ public class AccountsCommand implements ExecutableCommand { List accountList = dataSource.getAllAuthsByIp(auth.getIp()); if (accountList.isEmpty()) { - commonService.send(sender, MessageKey.USER_NOT_REGISTERED); + commonService.send(sender, MessageKey.UNKNOWN_USER); } else if (accountList.size() == 1) { sender.sendMessage("[AuthMe] " + playerName + " is a single account player"); } else { diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java index a7b622d3b..48a311a08 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/LastLoginCommand.java @@ -29,7 +29,7 @@ public class LastLoginCommand implements ExecutableCommand { PlayerAuth auth = dataSource.getAuth(playerName); if (auth == null) { - commonService.send(sender, MessageKey.USER_NOT_REGISTERED); + commonService.send(sender, MessageKey.UNKNOWN_USER); return; } diff --git a/src/main/java/fr/xephi/authme/message/MessageKey.java b/src/main/java/fr/xephi/authme/message/MessageKey.java index aea47cc70..1e6b338f1 100644 --- a/src/main/java/fr/xephi/authme/message/MessageKey.java +++ b/src/main/java/fr/xephi/authme/message/MessageKey.java @@ -26,9 +26,6 @@ public enum MessageKey { /** You're not logged in! */ NOT_LOGGED_IN("not_logged_in"), - /** You can register yourself to the server with the command "/register <password> <ConfirmPassword>" */ - REGISTER_VOLUNTARILY("reg_voluntarily"), - /** Usage: /login <password> */ USAGE_LOGIN("usage_log"), @@ -77,9 +74,6 @@ public enum MessageKey { /** Password changed successfully! */ PASSWORD_CHANGED_SUCCESS("pwd_changed"), - /** This user isn't registered! */ - USER_NOT_REGISTERED("user_unknown"), - /** Passwords didn't match, check them again! */ PASSWORD_MATCH_ERROR("password_error"), diff --git a/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java b/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java index 80b12a200..db85b8581 100644 --- a/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java +++ b/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java @@ -117,7 +117,7 @@ public class AsynchronousLogin implements AsynchronousProcess { PlayerAuth auth = dataSource.getAuth(name); if (auth == null) { - service.send(player, MessageKey.USER_NOT_REGISTERED); + service.send(player, MessageKey.UNKNOWN_USER); // Recreate the message task to immediately send the message again as response // and to make sure we send the right register message (password vs. email registration) limboPlayerTaskManager.registerMessageTask(name, false); diff --git a/src/main/resources/messages/messages_bg.yml b/src/main/resources/messages/messages_bg.yml index 66316719d..64b8141c3 100644 --- a/src/main/resources/messages/messages_bg.yml +++ b/src/main/resources/messages/messages_bg.yml @@ -1,7 +1,6 @@ -unknown_user: '&fПотребителя не е в БД' +unknown_user: '&cПотребителя не е регистриран' unsafe_spawn: '&fТвоята локация когато излезе не беше безопасна, телепортиран си на Spawn!' not_logged_in: '&cНе си влязъл!' -reg_voluntarily: '&fМоже да се регистрираш с тази команда: "/register парола парола"' usage_log: '&cКоманда: /login парола' wrong_pwd: '&cГрешна парола!' unregistered: '&cУспешно от-регистриран!' @@ -19,7 +18,6 @@ login_msg: '&cМоля влез с "/login парола"' reg_msg: '&cМоля регистрирай се с "/register <парола> <парола>"' usage_unreg: '&cКоманда: /unregister парола' pwd_changed: '&cПаролата е променена!' -user_unknown: '&cПотребителя не е регистриран' password_error: '&fПаролата не съвпада' reg_only: '&fСамо за регистрирани! Моля посети http://example.com за регистрация' logged_in: '&cВече сте влязъл!' @@ -74,4 +72,4 @@ antibot_auto_disabled: '[AuthMe] AntiBotMod автоматично изключ # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.' # TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' # TODO recovery_code_sent: 'A recovery code to reset your password has been sent to your email.' -# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' \ No newline at end of file +# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' diff --git a/src/main/resources/messages/messages_br.yml b/src/main/resources/messages/messages_br.yml index 32872c5ad..1e33390a8 100644 --- a/src/main/resources/messages/messages_br.yml +++ b/src/main/resources/messages/messages_br.yml @@ -5,10 +5,9 @@ denied_command: '&cPara utilizar este comando é necessário estar logado!' same_ip_online: 'Um jogador com o mesmo IP já está no servidor!' denied_chat: '&cPara utilizar o chat, você deve estar logado!' kick_antibot: 'O AntiBot está ativo, espere alguns minutos antes de entrar no servidor!' -unknown_user: '&cEsse usuário não existe na database!' +unknown_user: '&cEste usuário não está registrado!' unsafe_spawn: '&cVocê deslogou em um local inseguro e foi teleportado parao Spawn do servidor!' not_logged_in: '&cVocê não está logado!' -reg_voluntarily: 'Você pode registar-se no servidor com o comando "/register "' usage_log: '&cUse: /login ' wrong_pwd: '&cSenha incorreta!' unregistered: '&cConta deletada!' @@ -25,7 +24,6 @@ login_msg: '&cPor favor, faça o login com o comando "/login "' reg_msg: '&3Por favor, registre-se com o comando "/register "' usage_unreg: '&cUse: /unregister ' pwd_changed: '&2Senha alterada com sucesso!' -user_unknown: '&cEste usuário não está registrado!' password_error: '&cAs senhas não coincidem, verifique novamente!' password_error_nick: '&Você não pode usar o seu nome como senha, por favor, escolha outra senha...' password_error_unsafe: '&cA senha escolhida não é segura, por favor, escolha outra...' diff --git a/src/main/resources/messages/messages_cz.yml b/src/main/resources/messages/messages_cz.yml index 01126df1e..d3bee24f3 100644 --- a/src/main/resources/messages/messages_cz.yml +++ b/src/main/resources/messages/messages_cz.yml @@ -2,10 +2,9 @@ denied_command: '&cPokud chceš použít tento příkaz musíš být přihláše same_ip_online: 'Hráč se stejnou IP adresou nyní hraje na serveru!' denied_chat: '&cNemůžeš psát do chatu dokuď se nepřihlásíš/nezaregistruješ!' kick_antibot: 'Bezpečnostní mód AntiBot je zapnut! Musíš počkat několik minut než se budeš moct připojit znovu na server.' -unknown_user: '&cHráč není zaregistrovaný.' +unknown_user: '&cUživatelské jméno není zaregistrováno.' unsafe_spawn: '&cTvoje pozice při posledním odpojení byla nebezpečná, teleportuji tě proto na spawn!' not_logged_in: '&cNejsi přihlášený!' -reg_voluntarily: '&cZaregistruj se příkazem "/register heslo ZnovuHeslo".' usage_log: '&cPoužij: "/login TvojeHeslo".' wrong_pwd: '&cŠpatné heslo.' unregistered: '&cÚspěšně odregistrován!' @@ -22,7 +21,6 @@ login_msg: '&cProsím přihlaš se pomocí "/login TvojeHeslo".' reg_msg: '&cProsím zaregistruj se pomocí "/register "' usage_unreg: '&cPoužij: "/unregister TvojeHeslo".' pwd_changed: '&cHeslo změněno!' -user_unknown: '&cUživatelské jméno není zaregistrováno.' password_error: '&cHesla se neshodují!' password_error_nick: '&cNemůžeš použít tvoje jméno jako heslo, prosím zvol si jiné heslo...' password_error_unsafe: '&cToto heslo není bezpečné, prosím zvol si jiné heslo...' diff --git a/src/main/resources/messages/messages_de.yml b/src/main/resources/messages/messages_de.yml index cedf8ba6f..09d5ec432 100644 --- a/src/main/resources/messages/messages_de.yml +++ b/src/main/resources/messages/messages_de.yml @@ -1,7 +1,6 @@ -unknown_user: '&cBenutzer ist nicht in der Datenbank' +unknown_user: '&cBenutzername nicht registriert!' unsafe_spawn: '&cDeine Logoutposition war unsicher, du wurdest zum Spawn teleportiert' not_logged_in: '&cNicht eingeloggt!' -reg_voluntarily: 'Du kannst dich mit folgendem Befehl registrieren: "/register "' usage_log: '&cBenutze: /login ' wrong_pwd: '&cFalsches Passwort' unregistered: '&cBenutzerkonto erfolgreich gelöscht!' @@ -18,7 +17,6 @@ login_msg: '&cBitte logge dich ein mit "/login "' reg_msg: '&3Bitte registriere dich mit "/register "' usage_unreg: '&cBenutze: /unregister ' pwd_changed: '&2Passwort geändert!' -user_unknown: '&cBenutzername nicht registriert!' password_error: '&cPasswörter stimmen nicht überein!' password_error_nick: '&cDu kannst deinen Namen nicht als Passwort verwenden!' password_error_unsafe: '&cPasswort unsicher! Bitte wähle ein anderes.' diff --git a/src/main/resources/messages/messages_en.yml b/src/main/resources/messages/messages_en.yml index ad1358652..0d6e789e7 100644 --- a/src/main/resources/messages/messages_en.yml +++ b/src/main/resources/messages/messages_en.yml @@ -2,10 +2,9 @@ denied_command: '&cIn order to use this command you must be authenticated!' same_ip_online: 'A player with the same IP is already in game!' denied_chat: '&cIn order to chat you must be authenticated!' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' -unknown_user: '&cCan''t find the requested user in the database!' +unknown_user: '&cThis user isn''t registered!' unsafe_spawn: '&cYour quit location was unsafe, you have been teleported to the world''s spawnpoint.' not_logged_in: '&cYou''re not logged in!' -reg_voluntarily: 'You can register yourself to the server with the command "/register "' usage_log: '&cUsage: /login ' wrong_pwd: '&cWrong password!' unregistered: '&cSuccessfully unregistered!' @@ -22,7 +21,6 @@ login_msg: '&cPlease, login with the command "/login "' reg_msg: '&3Please, register to the server with the command "/register "' usage_unreg: '&cUsage: /unregister ' pwd_changed: '&2Password changed successfully!' -user_unknown: '&cThis user isn''t registered!' password_error: '&cPasswords didn''t match, check them again!' password_error_nick: '&cYou can''t use your name as password, please choose another one...' password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...' diff --git a/src/main/resources/messages/messages_es.yml b/src/main/resources/messages/messages_es.yml index 71e1f21d2..a0d627ce3 100644 --- a/src/main/resources/messages/messages_es.yml +++ b/src/main/resources/messages/messages_es.yml @@ -1,8 +1,7 @@ # This file must be in ANSI if win, or UTF-8 if linux. -unknown_user: '&fEl usuario no está en la base de datos' +unknown_user: '&cUsuario no registrado' unsafe_spawn: '&fTu lugar de desconexión es inseguro, teletransportándote al punto inicial del mundo' not_logged_in: '&c¡No has iniciado sesión!' -reg_voluntarily: '&fRegístrate con: "/register Contraseña confirmarContraseña"' usage_log: '&cUso: /login contraseña' wrong_pwd: '&cContraseña incorrecta' unregistered: '&c¡Cuenta eliminada del registro!' @@ -20,7 +19,6 @@ login_msg: '&cInicia sesión con "/login contraseña"' reg_msg: '&cPor favor, regístrate con "/register ' usage_unreg: '&cUso: /unregister contraseña' pwd_changed: '&c¡Contraseña cambiada!' -user_unknown: '&cUsuario no registrado' password_error: '&fLas contraseñas no son iguales' password_error_chars: '&cTu contraseña tiene carácteres no admitidos, los cuales son: REG_EX' invalid_session: '&fLos datos de sesión no corresponden. Por favor espera a terminar la sesión.' diff --git a/src/main/resources/messages/messages_eu.yml b/src/main/resources/messages/messages_eu.yml index c79fddf8f..c8094b535 100644 --- a/src/main/resources/messages/messages_eu.yml +++ b/src/main/resources/messages/messages_eu.yml @@ -1,7 +1,6 @@ -unknown_user: '&fErabiltzailea ez dago datu basean' +unknown_user: '&cErabiltzailea ez dago erregistratuta' unsafe_spawn: '&fSpawn-era telegarraiatu zara' not_logged_in: '&cSaioa hasi gabe!' -reg_voluntarily: '&fZure erabiltzailea erregistratu dezakezu:"/register pasahitza pasahitza"' usage_log: '&cErabili: /login pasahitza' wrong_pwd: '&cPasahitz okerra' unregistered: '&cZure erregistroa ezabatu duzu!' @@ -19,7 +18,6 @@ login_msg: '&cMesedez erabili "/login pasahitza" saioa hasteko' reg_msg: '&cMesedez erabili "/register pasahitza pasahitza" erregistratzeko' usage_unreg: '&cErabili: /unregister password' pwd_changed: '&cPasahitza aldatu duzu!' -user_unknown: '&cErabiltzailea ez dago erregistratuta' password_error: '&fPasahitzak ez datoz bat' reg_only: '&fErregistratuako erabiltzaileak bakarrik! Mesedez bisitatu http://example.com erregistratzeko' logged_in: '&cDagoeneko saioa hasita!' @@ -74,4 +72,4 @@ country_banned: '[AuthMe] Zure herrialdea blokeatuta dago zerbitzari honetan' # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.' # TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' # TODO recovery_code_sent: 'A recovery code to reset your password has been sent to your email.' -# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' \ No newline at end of file +# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' diff --git a/src/main/resources/messages/messages_fi.yml b/src/main/resources/messages/messages_fi.yml index 031e96e69..ec626bbdd 100644 --- a/src/main/resources/messages/messages_fi.yml +++ b/src/main/resources/messages/messages_fi.yml @@ -1,7 +1,6 @@ -unknown_user: '&fKäyttäjä ei ole tietokannassa!' +unknown_user: '&cSalasanat eivät täsmää' unsafe_spawn: '&fHengenvaarallinen poistumispaikka! Siirsimme sinut spawnille!' not_logged_in: '&cEt ole kirjautunut sisään!' -reg_voluntarily: '&fNyt voit rekisteröidä pelaajasi palvelimellemme: "/register salasana salasana"' usage_log: '&cKäyttötapa: /login salasana' wrong_pwd: '&cVäärä salasana' unregistered: '&cPelaajatili poistettu onnistuneesti!' @@ -19,7 +18,6 @@ login_msg: '&cKirjaudu palvelimmelle komennolla "/login salasana"' reg_msg: '&cRekisteröidy palvelimellemme komennolla "/register "' usage_unreg: '&cKäyttötapa: /unregister password' pwd_changed: '&cSalasana vaihdettu!!' -user_unknown: '&cSalasanat eivät täsmää' password_error: '&fSalasanat ei täsmää' invalid_session: '&fIstunto ei täsmää! Ole hyvä ja odota istunnon loppuun' reg_only: '&fMene sivustolle: http://example.com rekisteröityäksesi!' diff --git a/src/main/resources/messages/messages_gl.yml b/src/main/resources/messages/messages_gl.yml index 75ca8c57a..1e1d8e30e 100644 --- a/src/main/resources/messages/messages_gl.yml +++ b/src/main/resources/messages/messages_gl.yml @@ -1,8 +1,6 @@ -unknown_user: '&fO usuario non está na base de datos' +unknown_user: '&cEse nome de usuario non está rexistrado' unsafe_spawn: '&fA localización dende a que saíches era insegura, teletransportándote ao spawn do mundo' not_logged_in: '&cNon te identificaches!' -reg_voluntarily: '&fPodes rexistrar o teu nome no servidor co comando - "/register "' usage_log: '&cUso: /login ' wrong_pwd: '&cContrasinal equivocado' unregistered: '&cFeito! Xa non estás rexistrado!' @@ -20,7 +18,6 @@ login_msg: '&cPor favor, identifícate con "/login "' reg_msg: '&cPor favor, rexístrate con "/register "' usage_unreg: '&cUso: /unregister ' pwd_changed: '&cCambiouse o contrasinal!' -user_unknown: '&cEse nome de usuario non está rexistrado' password_error: '&fO contrasinal non coincide' invalid_session: '&fOs datos de sesión non corresponden, por favor, espere a que remate a sesión' reg_only: '&fSó xogadores rexistrados! Por favor, visita http://example.com para rexistrarte' diff --git a/src/main/resources/messages/messages_hu.yml b/src/main/resources/messages/messages_hu.yml index 26d3c2a90..8f8e5e1da 100644 --- a/src/main/resources/messages/messages_hu.yml +++ b/src/main/resources/messages/messages_hu.yml @@ -6,8 +6,7 @@ login_msg: '&cKérlek jelentkezz be: "/login "' not_logged_in: '&cNem vagy bejelentkezve!' logout: '&cSikeresen kijelentkeztél!' usage_log: '&cBejelentkezés: "/login "' -unknown_user: '&cA kért felhasználó nem található az adatbázisban!' -reg_voluntarily: 'Regisztrálhatod magad a szerveren a következö parancsal "/register "' +unknown_user: '&cEz a felhasználó nincs regisztrálva!' reg_disabled: '&cRegisztráció letiltva!' no_perm: '&cNincs jogod ehhez!' usage_reg: '&cHasználat: "/register "' @@ -23,7 +22,6 @@ error: 'Hiba lépett fel! Lépj kapcsolatba a szerver tulajával sürgősen!' logged_in: '&cMár be vagy jelentkezve!' login: '&aSikeresen beléptél!' wrong_pwd: '&4Hibás jelszó!' -user_unknown: '&cEz a felhasználó nincs regisztrálva!' reg_msg: '&cKérlek Regisztrálj: "/register "' unsafe_spawn: 'A kilépési helyzeted nem biztonságos, ezért elteleportálunk a kezdő pozícióra.' max_reg: '&cElérted a maximálisan beregisztrálható karakterek számát. (%reg_count/%max_acc %reg_names)!' diff --git a/src/main/resources/messages/messages_id.yml b/src/main/resources/messages/messages_id.yml index b1afe4b75..35334989f 100644 --- a/src/main/resources/messages/messages_id.yml +++ b/src/main/resources/messages/messages_id.yml @@ -1,7 +1,6 @@ -unknown_user: '&cTidak dapat menemukan user yg diminta di database!' +unknown_user: '&cUser ini belum terdaftar!' unsafe_spawn: '&cLokasi quit kamu tidak aman, kamu telah diteleport ke titik spawn world.' not_logged_in: '&cKamu belum login!' -reg_voluntarily: 'Kamu bisa register menggunakan command "/register "' usage_log: '&cUsage: /login ' wrong_pwd: '&cPassword salah!' unregistered: '&cUnregister berhasil!' @@ -17,7 +16,6 @@ error: '&4Terjadi kesalahan tak dikenal, silahkan hubungi Administrator!' login_msg: '&cSilahkan login menggunakan command "/login "' reg_msg: '&3Silahkan mendaftar ke server menggunakan command "/register "' pwd_changed: '&2Berhasil mengubah password!' -user_unknown: '&cUser ini belum terdaftar!' password_error: '&cPassword tidak cocok, silahkan periksa dan ulangi kembali!' password_error_nick: '&cKamu tidak bisa menggunakan namamu sebagai password, silahkan coba yg lain...' password_error_unsafe: '&cPassword yg kamu pilih tidak aman, silahkan coba yg lain...' @@ -74,4 +72,4 @@ antibot_auto_disabled: '&2[AntiBotService] AntiBot dimatikan setelah %m menit!' # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.' # TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' # TODO recovery_code_sent: 'A recovery code to reset your password has been sent to your email.' -# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' \ No newline at end of file +# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' diff --git a/src/main/resources/messages/messages_it.yml b/src/main/resources/messages/messages_it.yml index 62a41607c..c00dc866e 100644 --- a/src/main/resources/messages/messages_it.yml +++ b/src/main/resources/messages/messages_it.yml @@ -3,10 +3,9 @@ denied_command: '&cPer poter usare questo comando devi essere autenticato!' same_ip_online: 'Un giocatore con il tuo stesso IP è già connesso sul server!' denied_chat: '&cPer poter scrivere messaggi in chat devi essere autenticato!' kick_antibot: 'Il servizio di AntiBot è attualmente attivo! Devi aspettare qualche minuto prima di poter entrare nel server.' -unknown_user: '&cL''utente non è presente nel database.' +unknown_user: '&cL''utente non ha ancora eseguito la registrazione.' unsafe_spawn: '&cIl tuo punto di disconnessione risulta ostruito o insicuro, sei stato teletrasportato al punto di rigenerazione!' not_logged_in: '&cNon hai ancora eseguito l''autenticazione!' -reg_voluntarily: 'Puoi eseguire la registrazione al server con il comando: "/register "' usage_log: '&cUtilizzo: /login ' wrong_pwd: '&cPassword non corretta!' unregistered: '&2Sei stato correttamente rimosso dal database!' @@ -23,7 +22,6 @@ login_msg: '&cPer favore, esegui l''autenticazione con il comando: "/login "' usage_unreg: '&cUtilizzo: /unregister ' pwd_changed: '&2Password cambiata correttamente!' -user_unknown: '&cL''utente non ha ancora eseguito la registrazione.' password_error: '&cLe password non corrispondono!' password_error_nick: '&cNon puoi usare il tuo nome utente come password, per favore scegline un''altra...' password_error_unsafe: '&cLa password che hai inserito non è sicura, per favore scegline un''altra...' diff --git a/src/main/resources/messages/messages_ko.yml b/src/main/resources/messages/messages_ko.yml index 1e8ddec76..71d84146c 100644 --- a/src/main/resources/messages/messages_ko.yml +++ b/src/main/resources/messages/messages_ko.yml @@ -1,10 +1,9 @@ # Korean translate by wolfwork # # wolfdate25@gmail.com # # 16.08.2014 Thanks for use # -unknown_user: '&f사용자가 데이터베이스에 존재하지 않습니다' +unknown_user: '&c사용자이름은 가입되지 않았습니다' unsafe_spawn: '&f당신이 종료한 위치는 안전하지 않았습니다, 세계의 소환지점으로 이동합니다' not_logged_in: '&c접속되어있지 않습니다!' -reg_voluntarily: '&f당신은 당신의 이름을 "/register 비밀번호 비밀번호확인" 명령어로 가입하실 수 있습니다' usage_log: '&c사용법: /login 비밀번호' wrong_pwd: '&c잘못된 비밀번호입니다' unregistered: '&c성공적으로 탈퇴했습니다!' @@ -22,7 +21,6 @@ login_msg: '&c접속 하실려면 "/login 비밀번호"를 치세요' reg_msg: '&c가입하실려면 "/register 비밀번호 비밀번호재입력"을 치세요' usage_unreg: '&c사용법: /unregister 비밀번호' pwd_changed: '&c비밀번호를 변경했습니다!' -user_unknown: '&c사용자이름은 가입되지 않았습니다' password_error: '&f비밀번호가 일치하지 않습니다' invalid_session: '&f세션일자가 적합하지 않습니다. 세션이 종료될 때까지 기다려주세요' reg_only: '&f가입한 플레이어만이 가능합니다! 가입하실려면 http://example.com 에 방문해주세요' @@ -77,4 +75,4 @@ antibot_auto_disabled: '[AuthMe] 봇차단모드가 %m 분 후에 자동적으 # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.' # TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' # TODO recovery_code_sent: 'A recovery code to reset your password has been sent to your email.' -# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' \ No newline at end of file +# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' diff --git a/src/main/resources/messages/messages_lt.yml b/src/main/resources/messages/messages_lt.yml index 6b2e9e3b6..688eec40c 100644 --- a/src/main/resources/messages/messages_lt.yml +++ b/src/main/resources/messages/messages_lt.yml @@ -1,7 +1,6 @@ -unknown_user: '&cNaudotojo nera duombazeje' +unknown_user: '&cVartotojas neprisiregistraves' unsafe_spawn: '&6Atsijungimo vieta nesaugi, perkeliame jus i atsiradimo vieta.' not_logged_in: '&cTu neprisijunges!' -reg_voluntarily: '&ePrisiregistruokite: /register slaptazodis pakartotiSlaptazodi' usage_log: '&eKomandos panaudojimas: /login slaptazodis' wrong_pwd: '&cNeteisingas slaptazosdis' unregistered: '&aSekmingai issiregistravote!' @@ -19,7 +18,6 @@ login_msg: '&ePrasome prisijungti: /login slaptazodis' reg_msg: '&ePrasome prisiregistruoti: /register slaptazodis pakartotiSlaptazodi' usage_unreg: '&ePanaikinti registracija: "/unregister slaptazodis"' pwd_changed: '&aSlaptazodis pakeistas' -user_unknown: '&cVartotojas neprisiregistraves' password_error: '&cSlaptazodziai nesutampa' invalid_session: '&cSesijos laikai nesutampa, prasome palaukti kol secija baigsis.' reg_only: '&cTik prisiregistravusiem zaidejams: apsilankykite: http://example.com tam kad uzsiregistruoti.' @@ -74,4 +72,4 @@ kick_fullserver: '&cServeris yra pilnas, Atsiprasome.' # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.' # TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' # TODO recovery_code_sent: 'A recovery code to reset your password has been sent to your email.' -# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' \ No newline at end of file +# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' diff --git a/src/main/resources/messages/messages_nl.yml b/src/main/resources/messages/messages_nl.yml index c59cfef65..6a9d083c3 100644 --- a/src/main/resources/messages/messages_nl.yml +++ b/src/main/resources/messages/messages_nl.yml @@ -1,7 +1,6 @@ -unknown_user: Gebruiker is niet gevonden in de database +unknown_user: '&cGebruikersnaam niet geregistreerd' unsafe_spawn: De locatie waar je de vorige keer het spel verliet was gevaarlijk, je bent geteleporteerd naar de spawn not_logged_in: '&cNiet ingelogt!' -reg_voluntarily: Je kunt je gebruikersnaam registreren met "/register " usage_log: '&cGebruik: /login ' wrong_pwd: '&cFout wachtwoord' unregistered: '&cRegistratie succesvol ongedaan gemaakt!' @@ -21,7 +20,6 @@ login_msg: '&cLog in met "/login "' reg_msg: '&cRegistreer met "/register "' usage_unreg: '&cGebruik: /unregister password' pwd_changed: '&cWachtwoord aangepast!' -user_unknown: '&cGebruikersnaam niet geregistreerd' password_error: 'Wachtwoord incorrect!' password_error_chars: '&cJouw wachtwoord bevat illegale tekens. Toegestaane karakters: REG_EX' invalid_session: 'Sessie beschadigd, wacht tot de sessie is verlopen en verbindt opnieuw.' @@ -75,4 +73,4 @@ two_factor_create: '&2Je geheime code is %code' # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.' # TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' # TODO recovery_code_sent: 'A recovery code to reset your password has been sent to your email.' -# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' \ No newline at end of file +# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' diff --git a/src/main/resources/messages/messages_pl.yml b/src/main/resources/messages/messages_pl.yml index 08adf800e..c37641603 100644 --- a/src/main/resources/messages/messages_pl.yml +++ b/src/main/resources/messages/messages_pl.yml @@ -4,7 +4,6 @@ reg_disabled: '&4Rejestracja jest wylaczona' user_regged: '&4Gracz juz jest zarejestrowany' usage_reg: '&4Uzycie: /register haslo powtorzHaslo' usage_log: '&cUzycie: /login haslo' -user_unknown: '&fGracz nie jest zarejestrowany' pwd_changed: '&fHaslo zostalo zmienione!' reg_only: '&fTylko zarejestrowani uzytkownicy maja do tego dostep!' valid_session: '&cSesja logowania' @@ -19,10 +18,9 @@ unregistered: '&4Pomyslnie odrejestrowany!' login: '&aHaslo zaakceptowane!' no_perm: '&4Nie masz uprawnien' same_nick: '&fTen nick juz gra' -reg_voluntarily: '&fMozesz zarejestrowac swoj nick na serwerze przy uzyciu "/register haslo powtorzHaslo"' reload: '&fKonfiguracja bazy danych zostala przeladowana' error: '&fBlad prosimy napisac do aministracji' -unknown_user: '&fUzytkownika nie ma w bazie danych' +unknown_user: '&fGracz nie jest zarejestrowany' unsafe_spawn: '&fTwoje pozycja jest niebezpieczna. Zostaniesz przeniesiony na bezpieczny spawn.' invalid_session: '&fSesja zakonczona!' # TODO max_reg: Missing tags %reg_count, %max_acc, %reg_names diff --git a/src/main/resources/messages/messages_pt.yml b/src/main/resources/messages/messages_pt.yml index 0378512c6..5af8bb7da 100644 --- a/src/main/resources/messages/messages_pt.yml +++ b/src/main/resources/messages/messages_pt.yml @@ -1,7 +1,6 @@ -unknown_user: '&fUtilizador não existente na base de dados' +unknown_user: '&cUsername não registado' unsafe_spawn: '&fA sua localização na saída não é segura, será tele-portado para a Spawn' not_logged_in: '&cNão autenticado!' -reg_voluntarily: '&fPode registar o seu nickname no servidor com o comando "/register password ConfirmePassword"' usage_log: '&cUse: /login password' wrong_pwd: '&cPassword errada!' unregistered: '&cRegisto eliminado com sucesso!' @@ -19,7 +18,6 @@ login_msg: '&cIdentifique-se com "/login password"' reg_msg: '&cPor favor registe-se com "/register password confirmePassword"' usage_unreg: '&cUse: /unregister password' pwd_changed: '&cPassword alterada!' -user_unknown: '&cUsername não registado' password_error: '&fAs passwords não coincidem' invalid_session: '&fDados de sessão não correspondem. Por favor aguarde o fim da sessão' reg_only: '&fApenas jogadores registados! Visite http://example.com para se registar' @@ -74,4 +72,4 @@ invalid_name_case: 'Deve se juntar usando nome de usuário %valid, não %invalid # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.' # TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' # TODO recovery_code_sent: 'A recovery code to reset your password has been sent to your email.' -# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' \ No newline at end of file +# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' diff --git a/src/main/resources/messages/messages_ro.yml b/src/main/resources/messages/messages_ro.yml index 1409b9b9b..7e8e409b8 100644 --- a/src/main/resources/messages/messages_ro.yml +++ b/src/main/resources/messages/messages_ro.yml @@ -1,8 +1,7 @@ kick_antibot: 'Protectia AntiBot-ului este activata! Trebuie sa astepti cateva minute pentru a intra pe server.' -unknown_user: '&cNu putem gasi jucatorul in baza de date!' +unknown_user: '&cAcest jucator nu este inregistrat!' unsafe_spawn: '&cLocatia in care esti acum nu este sigura, ai fost teleportat la spawn.' not_logged_in: '&cNu te-ai logat!' -reg_voluntarily: 'Te poti inregista pe server folosind comanda "/register "' usage_log: '&cFoloseste: /login pentru a te loga.' wrong_pwd: '&cParola gresita!' unregistered: '&cTe-ai unregistart cu succes!' @@ -19,7 +18,6 @@ max_reg: '&cTe-ai inregistrat cu prea multe counturi (%reg_count/%max_acc %reg_n usage_reg: '&cFoloseste comanda: /register ' usage_unreg: '&cFoloseste comanda: /unregister ' pwd_changed: '&2Parola a fost inregistrata cu succes!' -user_unknown: '&cAcest jucator nu este inregistrat!' password_error: '&cParolele nu corespund, verifica-le din nou!' password_error_nick: '&cNu poti folosi numele ca si parola, te rugam incearca alta...' password_error_unsafe: '&cParola aleasa nu este sigura, te rugam alege alta...' @@ -73,4 +71,4 @@ kicked_admin_registered: 'Un administrator tocmai te-a inregistrat, te rog auten incomplete_email_settings: 'Eroare: nu toate setarile necesare pentru trimiterea email-ului sunt facute! Te rugam contacteaza un administrator.' recovery_code_sent: 'Un cod de recuperare a parolei a fost trimis catre email-ul tau.' recovery_code_incorrect: 'Codul de recuperare nu este corect! Foloseste /email recovery [email] pentru a genera unul nou.' -# TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' \ No newline at end of file +# TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' diff --git a/src/main/resources/messages/messages_ru.yml b/src/main/resources/messages/messages_ru.yml index 252c9d725..5d23d2b16 100644 --- a/src/main/resources/messages/messages_ru.yml +++ b/src/main/resources/messages/messages_ru.yml @@ -1,7 +1,6 @@ -unknown_user: '&fПользователь не найден в Базе Данных' +unknown_user: '&c&lТакой игрок не зарегистрирован' unsafe_spawn: '&eВаше расположение перед выходом было опасным - вы перенесены на спавн' not_logged_in: '&c&lВы еще не вошли!' -reg_voluntarily: '&aЧтобы зарегистрироваться введите: &e&l/reg ПАРОЛЬ ПОВТОР_ПАРОЛЯ' usage_log: '&eСинтаксис: &d/login ПАРОЛЬ' wrong_pwd: '&c&lНеправильный пароль!' unregistered: '&6Вы успешно удалили свой аккаунт!' @@ -22,7 +21,6 @@ password_error_unsafe: '&c&lВы не можете использовать не regex: '&c&lВаш пароль содержит запрещенные символы. Разрешенные символы: REG_EX' usage_unreg: '&c&lИспользование: &e&l/unregister ПАРОЛЬ' pwd_changed: '&2Пароль изменен!' -user_unknown: '&c&lТакой игрок не зарегистрирован' password_error: '&c&lПароль не совпадает' invalid_session: '&c&lСессия некорректна. Дождитесь, пока она закончится' reg_only: '&c&lТолько для зарегистрированных! Посетите http://сайт_сервера.com/register/ для регистрации' @@ -75,4 +73,4 @@ email_show: '&2Ваш текущий адрес электронной почт show_no_email: '&2В данный момент к вашему аккаунте не привязана электронная почта.' recovery_code_sent: 'Код восстановления для сброса пароля был отправлен на вашу электронную почту.' recovery_code_incorrect: 'Код восстановления неверный! Введите /email recovery [email], чтобы отправить новый код' -# TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' \ No newline at end of file +# TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' diff --git a/src/main/resources/messages/messages_sk.yml b/src/main/resources/messages/messages_sk.yml index 7d71a470f..872dea2c3 100644 --- a/src/main/resources/messages/messages_sk.yml +++ b/src/main/resources/messages/messages_sk.yml @@ -7,7 +7,6 @@ reg_disabled: '&cRegistrácia nie je povolená' user_regged: '&cZadané meno je uz zaregistrované' usage_reg: '&cPríkaz: /register heslo zopakujHeslo' usage_log: '&cPríkaz: /login heslo' -user_unknown: '&cZadané meno nie je zaregistrované!' pwd_changed: '&cHeslo zmenené!' reg_only: '&fVstup iba pre registrovanych! Navstiv http://example.com pre registráciu' valid_session: '&cZapamätané prihlásenie' @@ -22,10 +21,9 @@ unregistered: '&cUcet bol vymazany!' login: '&cBol si úspesne prihláseny!' no_perm: '&cZiadne' same_nick: '&fHrác s tymto nickom uz hrá!' -reg_voluntarily: '&fZaregistruj sa pomocou príkazu "/register heslo zopakujHeslo"' reload: '&fKonfigurácia a databáza bola obnovená' error: '&fNastala chyba; Kontaktujte administrátora' -unknown_user: '&fHrac nie je v databázi' +unknown_user: '&cZadané meno nie je zaregistrované!' unsafe_spawn: '&fTvoj pozícia bol nebezpecná, teleportujem hraca na spawn' invalid_session: '&fZapamätane casove data nie su doveryhodne. Cakaj na ukoncenie spojenia' # TODO max_reg: Missing tags %reg_count, %max_acc, %reg_names @@ -77,4 +75,4 @@ recovery_email: '&cZabudol si heslo? Pouzi príkaz /email recovery ' # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.' # TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' # TODO recovery_code_sent: 'A recovery code to reset your password has been sent to your email.' -# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' \ No newline at end of file +# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' diff --git a/src/main/resources/messages/messages_tr.yml b/src/main/resources/messages/messages_tr.yml index 68c13b468..cfb9fb554 100644 --- a/src/main/resources/messages/messages_tr.yml +++ b/src/main/resources/messages/messages_tr.yml @@ -1,8 +1,7 @@ kick_antibot: 'AntiBot koruma modu aktif! Birkac dakika sonra tekrar girmeyi deneyin.' -unknown_user: '&cVeritabaninda kullanici bulunamadi!' +unknown_user: '&cBu oyuncu kayitli degil!' unsafe_spawn: '&cOyundan ciktigin yer guvenli degil, baslangic noktasina isinlaniyorsun.' not_logged_in: '&cGiris yapmadin!' -reg_voluntarily: 'Kendini sunucuya kaydetmek icin komut kullan, "/register "' usage_log: '&cKullanim: /login ' wrong_pwd: '&cYanlis sifre!' unregistered: '&cKayit basariyla kaldirildi!' @@ -19,7 +18,6 @@ login_msg: '&cLutfen giris komutunu kullanin "/login "' reg_msg: '&3Lutfen kayit komutunu kullanin "/register "' usage_unreg: '&cKullanim: /unregister ' pwd_changed: '&2Sifre basariyla degistirildi!' -user_unknown: '&cBu oyuncu kayitli degil!' password_error: '&cSifre eslesmiyor, tekrar deneyin!' password_error_nick: '&cSifrenize adinizi koyamazsiniz, lutfen farkli bir sifre secin...' password_error_unsafe: '&cSectiginiz sifre guvenli degil, lutfen farkli bir sifre secin...' @@ -73,4 +71,4 @@ invalid_name_case: 'Oyuna %valid isminde katilmalisin. %invalid ismini kullanara # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.' # TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' # TODO recovery_code_sent: 'A recovery code to reset your password has been sent to your email.' -# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' \ No newline at end of file +# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' diff --git a/src/main/resources/messages/messages_uk.yml b/src/main/resources/messages/messages_uk.yml index 5cbf8bd0d..d92e24d45 100644 --- a/src/main/resources/messages/messages_uk.yml +++ b/src/main/resources/messages/messages_uk.yml @@ -2,10 +2,9 @@ denied_command: '&cДля використання цієї команди по same_ip_online: 'Перевищено ліміт на авторизацію з одного IP.' denied_chat: '&cДля доступу до чату потрібна авторизація.' kick_antibot: 'На сервер здійснено DDoS атаку. Будь ласка, зачекайте декілька хвилин доки активність спаде.' -unknown_user: '&cТакого користувача немає в базі даних.' +unknown_user: '&cЦей гравець не є зареєстрованим.' unsafe_spawn: '&cВаше останнє місцезнаходження не є безпечним. Вас було переміщено на точку спавна.' not_logged_in: '&cВи не авторизовані!' -reg_voluntarily: 'Можете зареєструватись за допомогою команди "/register <пароль> <повторПароля>"' usage_log: '&cСинтаксис: /login <пароль>' wrong_pwd: '&cНевірний пароль!' unregistered: '&cДані про реєстрацію успішно видалено' @@ -22,7 +21,6 @@ login_msg: '&cДля авторизації, введіть команду "/log reg_msg: '&3Перш ніж почати гру, вам потрібно зареєструвати свій нікнейм!%nl%&3Для цього просто введіть команду "/register <пароль> <повторПароля>"' usage_unreg: '&cСинтаксис: /unregister <пароль>' pwd_changed: '&2Пароль успішно змінено!' -user_unknown: '&cЦей гравець не є зареєстрованим.' password_error: '&cПаролі не співпадають!' password_error_nick: '&cНе можна використовувати свій нікнейм у якості пароля! Будь ласка, виберіть щось інакше...' password_error_unsafe: '&cЦей пароль надто простий! Будь ласка, придумайте інакший...' @@ -73,4 +71,4 @@ incomplete_email_settings: '&4[AuthMe] Error: Не всі необхідні н # TODO show_no_email: '&2You currently don''t have email address associated with this account.' # TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' # TODO recovery_code_sent: 'A recovery code to reset your password has been sent to your email.' -# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' \ No newline at end of file +# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' diff --git a/src/main/resources/messages/messages_vn.yml b/src/main/resources/messages/messages_vn.yml index 9ac38cca9..85d0d938f 100644 --- a/src/main/resources/messages/messages_vn.yml +++ b/src/main/resources/messages/messages_vn.yml @@ -1,8 +1,7 @@ kick_antibot: 'Chế độ AntiBot đã được kích hoạt! Bạn phải đợi vài phút trước khi tham gia vào máy chủ.' -unknown_user: '&cTài khoản không có trong cơ sở dữ liệu' +unknown_user: '&cNgười dùng này đã được đăng ký!' unsafe_spawn: '&cBạn đang ở vị trí không an toàn, bạn đã được dịch chuyển về Spawn.' not_logged_in: '&cBạn chưa đăng nhập!' -reg_voluntarily: 'Bạn cần đăng ký tài khoản để tham gia máy chủ với lệnh "/register "' usage_log: '&cSử dụng: /login ' wrong_pwd: '&cSai mật khẩu!' unregistered: '&cHủy đăng ký thành công!' @@ -19,7 +18,6 @@ login_msg: '&cXin vui lòng đăng nhập bằng lệnh "/login "' reg_msg: '&2Xin vui lòng đăng ký tài khoản với lệnh "/register "' usage_unreg: '&cSử dụng: /unregister ' pwd_changed: '&2Thay đổi mật khẩu thành công!' -user_unknown: '&cNgười dùng này đã được đăng ký!' password_error: '&cMật khẩu không hợp, xin vui lòng kiễm tra lại!' password_error_nick: '&cBạn không thể đặt mật khẩu bằng tên của mình, vui lòng đặt lại...' password_error_unsafe: '&cMật khẩu của bạn vừa đặt không an toàn, vui lòng đặt lại...' @@ -74,4 +72,4 @@ invalid_name_case: 'Bạn nên vào máy chủ với tên đăng nhập là %val # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.' # TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' # TODO recovery_code_sent: 'A recovery code to reset your password has been sent to your email.' -# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' \ No newline at end of file +# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' diff --git a/src/main/resources/messages/messages_zhcn.yml b/src/main/resources/messages/messages_zhcn.yml index a0cbeb992..8bf0a382c 100644 --- a/src/main/resources/messages/messages_zhcn.yml +++ b/src/main/resources/messages/messages_zhcn.yml @@ -2,10 +2,9 @@ # Last modif: 1459528742 UTC # # -------------------------------------------- # kick_antibot: '&8[&6玩家系统&8] &f防机器人程序已启用 !请稍等几分钟後才再次进入服务器' -unknown_user: '&8[&6玩家系统&8] &f&f数据库里找不到此用户' +unknown_user: '&8[&6玩家系统&8] &c此用户名还未注册过' unsafe_spawn: '&8[&6玩家系统&8] &f你退出服务器时的位置不安全，正在传送你到此世界的出生点' not_logged_in: '&8[&6玩家系统&8] &c你还未登录！' -reg_voluntarily: '&8[&6玩家系统&8] &f你可以在服务器里使用这个指令以注册：“/register <密码> <再输入一次以确定密码>”' usage_log: '&8[&6玩家系统&8] &c正确用法：“/login <密码>”' wrong_pwd: '&8[&6玩家系统&8] &c错误的密码' unregistered: '&8[&6玩家系统&8] &c成功删除此用户！' @@ -23,7 +22,6 @@ login_msg: '&8[&6玩家系统&8] &c请输入“/login <密码>”以登录' reg_msg: '&8[&6玩家系统&8] &c请输入“/register <密码> <再输入一次以确定密码>”以注册' usage_unreg: '&8[&6玩家系统&8] &c正确用法：“/unregister <密码>”' pwd_changed: '&8[&6玩家系统&8] &c密码已成功修改！' -user_unknown: '&8[&6玩家系统&8] &c此用户名还未注册过' password_error: '&8[&6玩家系统&8] &f密码不相同' password_error_nick: '&8[&6玩家系统&8] &f你不能使用你的名字作为密码。 ' password_error_unsafe: '&8[&6玩家系统&8] &f你不能使用安全性过低的码。 ' @@ -77,4 +75,4 @@ invalid_name_case: '&8[&6玩家系统&8] &c你应该使用「%valid」而并非 # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.' # TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' # TODO recovery_code_sent: 'A recovery code to reset your password has been sent to your email.' -# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' \ No newline at end of file +# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' diff --git a/src/main/resources/messages/messages_zhhk.yml b/src/main/resources/messages/messages_zhhk.yml index 2eeeff9b3..cb6b0c693 100644 --- a/src/main/resources/messages/messages_zhhk.yml +++ b/src/main/resources/messages/messages_zhhk.yml @@ -2,10 +2,9 @@ # Last modif: 1459528742 UTC # # -------------------------------------------- # kick_antibot: '&8[&6用戶系統&8] &c伺服器錯誤！請稍候再嘗試登入吧。 &7(err: kick_due2_bot)' -unknown_user: '&8[&6用戶系統&8] &f用戶資料並不存在。' +unknown_user: '&8[&6用戶系統&8] &c此用戶名沒有已登記資料。' unsafe_spawn: '&8[&6用戶系統&8] &f你的登出位置不安全，現在將傳送你到重生點。' not_logged_in: '&8[&6用戶系統&8] &c你還沒有登入 ！' -reg_voluntarily: '&8[&6用戶系統&8] &f你可以使用這個指令來註冊： 《 /register <密碼> <重覆密碼> 》' usage_log: '&8[&6用戶系統&8] &f用法： 《 /login <密碼> 》' wrong_pwd: '&8[&6用戶系統&8] &c你輸入了錯誤的密碼。' unregistered: '&8[&6用戶系統&8] &c你已成功刪除會員註冊記錄。' @@ -23,7 +22,6 @@ login_msg: '&8[&6用戶系統&8] &c請使用這個指令來登入： 《 /login reg_msg: '&8[&6用戶系統&8] &c請使用這個指令來註冊： 《 /register <密碼> <重覆密碼> 》' usage_unreg: '&8[&6用戶系統&8] &f用法： 《 /unregister <密碼> 》' pwd_changed: '&8[&6用戶系統&8] &c你成功更換了你的密碼 ！' -user_unknown: '&8[&6用戶系統&8] &c此用戶名沒有已登記資料。' password_error: '&8[&6用戶系統&8] &f密碼不符合。' password_error_nick: '&8[&6用戶系統&8] &c這個密碼太不安全了！' password_error_unsafe: '&8[&6用戶系統&8] &c這個密碼太不安全了！' @@ -77,4 +75,4 @@ invalid_name_case: '&8[&6用戶系統&8] &4警告！&c你應該使用「%valid # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.' # TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' # TODO recovery_code_sent: 'A recovery code to reset your password has been sent to your email.' -# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' \ No newline at end of file +# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' diff --git a/src/main/resources/messages/messages_zhmc.yml b/src/main/resources/messages/messages_zhmc.yml index d27c8a33e..a95e1a3e7 100644 --- a/src/main/resources/messages/messages_zhmc.yml +++ b/src/main/resources/messages/messages_zhmc.yml @@ -2,10 +2,9 @@ denied_command: '&c你必須得到權限來使用此指令!' same_ip_online: '一位同一IP的玩家已在遊戲中!' denied_chat: '&c你必須得到權限來使用聊天功能!' kick_antibot: '伺服器正在啟用AntiBot保護模式！ 您必須等待幾分鐘才能加入服務器。' -unknown_user: '&c在數據庫中找不到請求的用戶名！' +unknown_user: '&c此用戶尚未注冊!' unsafe_spawn: '&c你的登出地點並不安全，你已經被傳送到世界的重生點。' not_logged_in: '&c你尚未登入!' -reg_voluntarily: '您可以使用命令 "/register [你的密碼] [重覆確認你的密碼]" 向服務器註冊' usage_log: '&b使用方法: 輸入"/login [你的密碼]" 來登入' wrong_pwd: '&c密碼錯誤!' unregistered: '&c帳戶已刪除!' @@ -22,7 +21,6 @@ login_msg: '&c [請先登入] 請按T , 然後輸入 "/login [你的密碼]" 。 reg_msg: '&3[請先注冊] 請按T , 然後輸入 "/register [你的密碼] [重覆確認你的密碼]" 來注冊。' usage_unreg: '&c使用方法: "/unregister <你的密碼>"' pwd_changed: '&2密碼已更變!' -user_unknown: '&c此用戶尚未注冊!' password_error: '&密碼錯誤!' password_error_nick: '&c你不能使用你的用戶名作密碼,請 choose another one...' password_error_unsafe: '&c所選的你的密碼並不安全的，請選擇另一個...' @@ -73,4 +71,4 @@ recovery_code_sent: '已將重設密碼的恢復代碼發送到您的電子郵 recovery_code_incorrect: '恢復代碼錯誤!使用指令: "/email recovery [電郵地址]" 生成新的一個恢復代碼。' # TODO email_show: '&2Your current email address is: &f%email' # TODO show_no_email: '&2You currently don''t have email address associated with this account.' -# TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' \ No newline at end of file +# TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' diff --git a/src/main/resources/messages/messages_zhtw.yml b/src/main/resources/messages/messages_zhtw.yml index 8e2f42c1f..a94cf7eaf 100644 --- a/src/main/resources/messages/messages_zhtw.yml +++ b/src/main/resources/messages/messages_zhtw.yml @@ -2,10 +2,9 @@ # Last modif: 1459528742 UTC # # -------------------------------------------- # kick_antibot: '&b【AuthMe】&cAntiBotMod 正在啟用中，請稍後再嘗試登入吧！' -unknown_user: "&b【AuthMe】&6沒有在資料庫內找到該玩家。" +unknown_user: '&b【AuthMe】&6這個帳號還沒有註冊過' unsafe_spawn: '&b【AuthMe】&6你登出的地點不安全，已傳送你到安全的地點。' not_logged_in: '&b【AuthMe】&6你還沒有登入!' -reg_voluntarily: '&b【AuthMe】&6使用 &c"/register <密碼> <確認密碼>" &6來註冊你的暱稱' usage_log: '&b【AuthMe】&6用法: &c"/login <密碼>"' wrong_pwd: '&b【AuthMe】&6密碼錯誤!' unregistered: '&b【AuthMe】&6你已經成功取消註冊。' @@ -23,7 +22,6 @@ login_msg: '&b【AuthMe】&6請使用 &c"/login <密碼>" &6來登入。' reg_msg: '&b【AuthMe】&6請使用 "&c/register <密碼> <確認密碼>" 來註冊。' usage_unreg: '&b【AuthMe】&6用法: &c"/unregister <密碼>"' pwd_changed: '&b【AuthMe】&6密碼變更成功!' -user_unknown: '&b【AuthMe】&6這個帳號還沒有註冊過' password_error: '&b【AuthMe】&6兩次輸入的密碼不一致!' password_error_nick: '&b【AuthMe】&6你不可以用你的 ID ( 名稱 ) 來當作密碼 !' password_error_unsafe: '&b【AuthMe】&6你不可以使用這個不安全的密碼' @@ -77,4 +75,4 @@ invalid_name_case: '&b【AuthMe】&4警告！&c你應該使用「%valid」而並 # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.' # TODO email_send_failure: 'The email could not be sent. Please contact an administrator.' # TODO recovery_code_sent: 'A recovery code to reset your password has been sent to your email.' -# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' \ No newline at end of file +# TODO recovery_code_incorrect: 'The recovery code is not correct! Use /email recovery [email] to generate a new one' diff --git a/src/test/java/fr/xephi/authme/command/executable/authme/AccountsCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/authme/AccountsCommandTest.java index 29a07be88..7e341723c 100644 --- a/src/test/java/fr/xephi/authme/command/executable/authme/AccountsCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/authme/AccountsCommandTest.java @@ -89,7 +89,7 @@ public class AccountsCommandTest { runInnerRunnable(bukkitService); // then - verify(service).send(sender, MessageKey.USER_NOT_REGISTERED); + verify(service).send(sender, MessageKey.UNKNOWN_USER); verify(sender, never()).sendMessage(anyString()); } diff --git a/src/test/java/fr/xephi/authme/command/executable/authme/LastLoginCommandTest.java b/src/test/java/fr/xephi/authme/command/executable/authme/LastLoginCommandTest.java index 494de2cc0..43099db6b 100644 --- a/src/test/java/fr/xephi/authme/command/executable/authme/LastLoginCommandTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/authme/LastLoginCommandTest.java @@ -54,7 +54,7 @@ public class LastLoginCommandTest { // then verify(dataSource).getAuth(player); - verify(service).send(sender, MessageKey.USER_NOT_REGISTERED); + verify(service).send(sender, MessageKey.UNKNOWN_USER); } @Test diff --git a/src/test/java/fr/xephi/authme/process/login/AsynchronousLoginTest.java b/src/test/java/fr/xephi/authme/process/login/AsynchronousLoginTest.java index d2a605297..12d4fee7a 100644 --- a/src/test/java/fr/xephi/authme/process/login/AsynchronousLoginTest.java +++ b/src/test/java/fr/xephi/authme/process/login/AsynchronousLoginTest.java @@ -98,7 +98,7 @@ public class AsynchronousLoginTest { // then verify(playerCache, only()).isAuthenticated(name); - verify(commonService).send(player, MessageKey.USER_NOT_REGISTERED); + verify(commonService).send(player, MessageKey.UNKNOWN_USER); verify(dataSource, only()).getAuth(name); }