diff --git a/docs/commands.md b/docs/commands.md index ef8f28a8a..542b09c09 100644 --- a/docs/commands.md +++ b/docs/commands.md @@ -1,5 +1,5 @@ - + ## AuthMe Commands You can use the following commands to use the features of AuthMe. Mandatory arguments are marked with `< >` @@ -24,9 +24,9 @@ brackets; optional arguments are enclosed in square brackets (`[ ]`).
Requires `authme.admin.changemail` - **/authme getip** <player>: Get the IP address of the specified online player.
Requires `authme.admin.getip` -- **/authme totp** <player>: Returns whether the specified player has enabled two-factor authentication +- **/authme totp** <player>: Returns whether the specified player has enabled two-factor authentication.
Requires `authme.admin.totpviewstatus` -- **/authme disabletotp** <player>: Disable two-factor authentication for a player +- **/authme disabletotp** <player>: Disable two-factor authentication for a player.
Requires `authme.admin.totpdisable` - **/authme spawn**: Teleport to the spawn.
Requires `authme.admin.spawn` @@ -105,7 +105,6 @@ brackets; optional arguments are enclosed in square brackets (`[ ]`).
Requires `authme.player.security.verificationcode` - **/verification help** [query]: View detailed help for /verification commands. - --- -This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Fri Aug 02 16:25:51 CEST 2019 +This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sat May 16 15:10:08 CEST 2020 diff --git a/docs/translations.md b/docs/translations.md index 33142daf1..22be81b39 100644 --- a/docs/translations.md +++ b/docs/translations.md @@ -1,5 +1,5 @@ - + # AuthMe Translations The following translations are available in AuthMe. Set `messagesLanguage` to the language code @@ -14,10 +14,10 @@ Code | Language | Translated |   [de](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_de.yml) | German | 99% | 99 [eo](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_eo.yml) | Esperanto | 79% | 79 [es](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_es.yml) | Spanish | 99% | 99 -[et](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_et.yml) | Estonian | 99% | 99 +[et](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_et.yml) | Estonian | 100% | 100 [eu](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_eu.yml) | Basque | 42% | 42 [fi](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fi.yml) | Finnish | 45% | 45 -[fr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fr.yml) | French | 99% | 99 +[fr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fr.yml) | French | 100% | 100 [gl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_gl.yml) | Galician | 48% | 48 [hu](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_hu.yml) | Hungarian | 99% | 99 [id](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_id.yml) | Indonesian | 93% | 93 @@ -26,13 +26,13 @@ Code | Language | Translated |   [lt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_lt.yml) | Lithuanian | 36% | 36 [nl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_nl.yml) | Dutch | 100% | 100 [pl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pl.yml) | Polish | 99% | 99 -[pt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pt.yml) | Portuguese | 99% | 99 +[pt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pt.yml) | Portuguese | 100% | 100 [ro](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ro.yml) | Romanian | 79% | 79 [ru](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ru.yml) | Russian | 100% | 100 [si](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_si.yml) | Slovenian | 99% | 99 [sk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_sk.yml) | Slovakian | 79% | 79 [sr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_sr.yml) | Serbian | 99% | 99 -[tr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_tr.yml) | Turkish | 99% | 99 +[tr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_tr.yml) | Turkish | 100% | 100 [uk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_uk.yml) | Ukrainian | 100% | 100 [vn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_vn.yml) | Vietnamese | 77% | 77 [zhcn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhcn.yml) | Chinese (China) | 100% | 100 @@ -42,4 +42,4 @@ Code | Language | Translated |   --- -This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sat Dec 28 12:03:51 CET 2019 +This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sat May 16 15:10:13 CEST 2020 diff --git a/pom.xml b/pom.xml index 8547310f9..314ee62e1 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 @@ -282,7 +282,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.2 + 3.2.4 package @@ -389,7 +389,7 @@ org.apache.maven.plugins maven-site-plugin - 3.9.0 + 3.9.1 @@ -405,6 +405,18 @@ + + + apache-snapshots + https://repository.apache.org/content/repositories/snapshots/ + + false + + + true + + + spigotmc-repo @@ -532,7 +544,7 @@ org.apache.commons commons-email - 1.5 + 1.6-SNAPSHOT true @@ -548,7 +560,7 @@ com.zaxxer HikariCP - 3.4.2 + 3.4.5 true @@ -577,7 +589,7 @@ de.mkammerer argon2-jvm-nolibs - 2.6 + 2.7 true @@ -671,7 +683,7 @@ net.luckperms api - 5.0 + 5.1 provided @@ -856,7 +868,7 @@ org.postgresql postgresql - 42.2.11 + 42.2.14 @@ -879,7 +891,7 @@ org.mockito mockito-core test - 3.3.0 + 3.3.3 hamcrest-core @@ -892,7 +904,7 @@ org.checkerframework checker-qual - 3.3.0 + 3.4.1 test @@ -900,7 +912,7 @@ org.xerial sqlite-jdbc - 3.30.1 + 3.32.3 test diff --git a/src/main/java/fr/xephi/authme/listener/PlayerListener.java b/src/main/java/fr/xephi/authme/listener/PlayerListener.java index 1a41c5236..f0d7638e4 100644 --- a/src/main/java/fr/xephi/authme/listener/PlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/PlayerListener.java @@ -488,7 +488,7 @@ public class PlayerListener implements Listener { return false; } Set whitelist = settings.getProperty(RestrictionSettings.UNRESTRICTED_INVENTORIES); - return whitelist.contains(ChatColor.stripColor(inventory.getTitle())); + return whitelist.contains(ChatColor.stripColor(inventory.getTitle()).toLowerCase()); } @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) diff --git a/src/main/resources/messages/help_et.yml b/src/main/resources/messages/help_et.yml index 14791c1fc..03a702134 100644 --- a/src/main/resources/messages/help_et.yml +++ b/src/main/resources/messages/help_et.yml @@ -5,14 +5,14 @@ common: header: '==========[ AuthMeReloaded ABI ]==========' optional: 'Valikuline' - hasPermission: 'Sul on õigus' - noPermission: 'Pole õigust' + hasPermission: 'Sul on luba' + noPermission: 'Pole luba' default: 'Vaikimisi' result: 'Tulemus' defaultPermissions: - notAllowed: 'Pole õigust' + notAllowed: 'Pole luba' opOnly: 'Ainult operaatorid' - allowed: 'Õigus kõigil' + allowed: 'Luba kõigil' # ------------------------------------------------------- # Titles of the individual help sections @@ -23,7 +23,7 @@ section: description: 'Lühike kirjeldus' detailedDescription: 'Detailne kirjeldus' arguments: 'Argumendid' - permissions: 'Õigused' + permissions: 'Load' alternatives: 'Alternatiivid' children: 'Käsklused' diff --git a/src/main/resources/messages/help_eu.yml b/src/main/resources/messages/help_eu.yml new file mode 100644 index 000000000..52fad8025 --- /dev/null +++ b/src/main/resources/messages/help_eu.yml @@ -0,0 +1,23 @@ +# Translation config for the AuthMe help, e.g. when /authme help or /authme help register is called + +# ------------------------------------------------------- +# List of texts used in the help section +common: + header: '==========[ AuthMeReloaded LAGUNTZA ]==========' + optional: 'Hautazkoa' + hasPermission: 'Baimena daukazu' + noPermission: 'Ez daukazu baimenik' + default: 'Lehenetsia' + result: 'Emaitza' + defaultPermissions: + notAllowed: 'Baimenik ez' + opOnly: 'OP bakarrik' + allowed: 'Edonor baimenduta' +section: + command: 'Komandoa' + description: 'Deskribapen laburra' + detailedDescription: 'Deskribapen xehakatua' + arguments: 'Argumentuak' + permissions: 'Baimenak' + alternatives: 'Alternatibak' + children: 'Komandoak' diff --git a/src/main/resources/messages/messages_br.yml b/src/main/resources/messages/messages_br.yml index 1ea30781b..fd59f5383 100644 --- a/src/main/resources/messages/messages_br.yml +++ b/src/main/resources/messages/messages_br.yml @@ -4,16 +4,16 @@ # Lista de tags globais: # %nl% - Pula uma linha # %username% - Substitui pelo nome do jogador que está recebendo a mensagem -# %displayname% - Substitui o nickname (e cores) do jogador que está recebendo a mensagem +# %displayname% - Substitui pelo nickname (e cores) do jogador que está recebendo a mensagem # Registro registration: register_request: '&3Por favor, registre-se com o comando "/register "' command_usage: '&cUse: /register ' reg_only: '&4Somente usuários registrados podem entrar no servidor! Por favor visite www.seusite.com para se registrar!' - success: '&2Registrado com êxito!' - kicked_admin_registered: 'Um administrador registrou você. Por favor faça login novamente' - disabled: '&cO registro está desativado nesse servidor!' + success: '&2Registrado com sucesso!' + kicked_admin_registered: 'Um administrador registrou você. Por favor, faça login novamente' + disabled: '&cRegistrar-se está desativado neste servidor!' name_taken: '&cVocê já registrou este nome de usuário!' # Erros de senha ao registrar-se @@ -70,17 +70,17 @@ misc: # Mensagens de sessão session: valid_session: '&2Você deslogou recentemente, então sua sessão foi retomada!' - invalid_session: '&O seu IP foi alterado e sua sessão expirou!' + invalid_session: '&fO seu IP foi alterado e sua sessão expirou!' # Mensagens de erro ao entrar on_join_validation: - name_length: '&4Seu nome de usuário ou é muito curto ou muito longo!' + name_length: '&4Seu nome de usuário ou é muito curto ou é muito longo!' characters_in_name: '&4Seu nome de usuário contém caracteres inválidos. Caracteres permitidos: %valid_chars' - country_banned: '&4O seu país está banido neste servidor!' + country_banned: '&4O seu país está banido deste servidor!' not_owner_error: 'Você não é o proprietário da conta. Por favor, escolha outro nome!' kick_full_server: '&4O servidor está cheio, tente novamente mais tarde!' - same_nick_online: '&4O mesmo nome de usuário já está jogando no servidor!' - invalid_name_case: 'Você deve se juntar usando o nome de usuário %valid, não %invalid.' + same_nick_online: '&4Alguém com o mesmo nome de usuário já está jogando no servidor!' + invalid_name_case: 'Você deve entrar usando o nome de usuário %valid, não %invalid.' same_ip_online: 'Um jogador com o mesmo IP já está no servidor!' quick_command: 'Você usou o comando muito rápido! Por favor, entre no servidor e aguarde antes de usar um comando novamente.' @@ -92,7 +92,7 @@ email: old_email_invalid: '&cE-mail antigo inválido, tente novamente!' invalid: '&E-mail inválido, tente novamente!' added: '&2E-mail adicionado com sucesso!' - request_confirmation: '&cPor favor confirme seu endereço de e-mail!' + request_confirmation: '&cPor favor, confirme o seu endereço de e-mail!' changed: '&2E-mail alterado com sucesso!' email_show: '&2O seu endereço de e-mail atual é: &f%email' incomplete_settings: 'Erro: Nem todas as configurações necessárias estão definidas para o envio de e-mails. Entre em contato com um administrador.' @@ -107,7 +107,7 @@ email: # Recuperação de senha por e-mail recovery: - forgot_password_hint: '&3Esqueceu sua senha? Por favor, use o comando "/email recovery "' + forgot_password_hint: '&3Esqueceu a sua senha? Use o comando "/email recovery "' command_usage: '&cUse: /email recovery ' email_sent: '&2E-mail de recuperação enviado! Por favor, verifique sua caixa de entrada!' code: @@ -120,7 +120,7 @@ recovery: # Captcha captcha: usage_captcha: '&3Para iniciar sessão você tem que resolver um captcha, utilize o comando "/captcha %captcha_code"' - wrong_captcha: '&cCaptcha incorreto, por favor, escreva "/captcha %captcha_code" no chat!' + wrong_captcha: '&cCaptcha incorreto. Por favor, escreva "/captcha %captcha_code" no chat!' valid_captcha: '&2Captcha correto!' captcha_for_registration: 'Para se registrar você tem que resolver um código captcha, utilize o comando "/captcha %captcha_code"' register_captcha_valid: '&2Captcha correto! Agora você pode se registrar usando /register !' @@ -130,9 +130,9 @@ verification: code_required: '&3Esse comando é sensível e precisa de uma verificação via e-mail! Verifique sua caixa de entrada e siga as instruções do e-mail.' command_usage: '&cUse: /verification ' incorrect_code: '&cCódigo incorreto, utilize "/verification " com o código que você recebeu por e-mail!' - success: '&2Sua identidade foi verificada, agora você pode usar todos os comandos nessa sessão.' - already_verified: '&2Você já pode executar comandos sensíveis nessa sessão!' - code_expired: '&3Seu código expirou! Execute outro comando sensível para gerar outro código.' + success: '&2Sua identidade foi verificada, agora você pode usar todos os comandos durante esta sessão.' + already_verified: '&2Você já pode executar comandos sensíveis durante esta sessão!' + code_expired: '&3O seu código expirou! Execute outro comando sensível para gerar um outro código.' email_needed: '&3Para verificar sua identidade, você precisa vincular um e-mail à sua conta!' # Verificação em duas etapas diff --git a/src/main/resources/messages/messages_et.yml b/src/main/resources/messages/messages_et.yml index 3c388b7cd..080f02bf8 100644 --- a/src/main/resources/messages/messages_et.yml +++ b/src/main/resources/messages/messages_et.yml @@ -5,21 +5,21 @@ # Registration registration: - disabled: '&cMängusisene registreerimine on välja lülitatud!' - name_taken: '&cSee kasutaja on juba registreeritud!' register_request: '&3Palun registreeri käsklusega: /register ' command_usage: '&cKasutus: /register ' - reg_only: '&4Vaid registreeritud mängijad saavad liituda serveriga! Külasta http://example.com enda kasutaja registreerimiseks!' - success: '&2Edukalt registreeritud!' + reg_only: '&4Vaid registreeritud mängijad saavad serveriga liituda! Enda kasutaja registreerimiseks külasta http://example.com!' kicked_admin_registered: 'Administraator registreeris su kasutaja, palun logi uuesti sisse.' + success: '&2Edukalt registreeritud!' + disabled: '&cMängusisene registreerimine on välja lülitatud!' + name_taken: '&cSee kasutaja on juba registreeritud!' # Password errors on registration password: match_error: '&cParoolid ei kattu, palun proovi uuesti!' - name_in_password: '&cSa ei saa kasutada oma kasutajanime paroolina, palun vali mõni teine parool.' + name_in_password: '&cSa ei saa oma kasutajanime paroolina kasutada, palun vali mõni teine parool.' unsafe_password: '&cSee parool ei ole turvaline, palun vali mõni teine parool.' - forbidden_characters: '&4Su parool sisaldab keelatud tähemärke. Lubatud tähemärgid: %valid_chars' - wrong_length: '&cSu parool on liiga pikk või lühike, palun vali mõni teine parool.' + forbidden_characters: '&4Sinu parool sisaldab keelatud tähemärke. Lubatud tähemärgid: %valid_chars' + wrong_length: '&cSinu parool on liiga pikk või lühike, palun vali mõni teine parool.' # Login login: @@ -27,80 +27,79 @@ login: wrong_password: '&cVale parool!' success: '&2Edukalt sisselogitud!' login_request: '&cPalun logi sisse kasutades käsklust: /login ' - timeout_error: '&4Sisselogimiseks antud aeg on läbi, palun proovi uuesti!' + timeout_error: '&4Sisselogimiseks antud aeg on läbi ning sind on serverist välja visatud, palun proovi uuesti!' # Errors error: - denied_command: '&cSelle käskluse kasutamiseks pead sisse logima!' - denied_chat: '&cRääkimiseks pead sisse logima!' unregistered_user: '&cSee kasutaja ei ole registreeritud!' + denied_command: '&cSelle käskluse kasutamiseks pead olema sisselogitud!' + denied_chat: '&cVestlemiseks pead olema sisselogitud!' not_logged_in: '&cSa ei ole sisselogitud!' - no_permission: '&4Sul ei ole õigust selle käskluse kasutamiseks.' - unexpected_error: '&4Süsteemis tekkis viga, teata sellest administraatorile!' - max_registration: '&cSu IP aadressile on registreeritud liiga palju kasutajaid! (%reg_count/%max_acc %reg_names)' + tempban_max_logins: '&cSind on ajutiselt serverist blokeeritud, kuna sisestasid mitu korda vale parooli.' + max_registration: '&cSinu IP-aadressile on registreeritud liiga palju kasutajaid! (%reg_count/%max_acc %reg_names)' + no_permission: '&4Sul puudub selle käskluse kasutamiseks luba.' + unexpected_error: '&4Esines ootamatu tõrge, palun teavita administraatorit!' + kick_for_vip: '&3VIP-mängija liitus serveriga ajal, mil see oli täis!' logged_in: '&cSa oled juba sisselogitud!' - kick_for_vip: '&3VIP mängija liitus serveriga ajal, mil see oli täis!' - # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!' - tempban_max_logins: '&cSind blokeeriti ajutiselt serverist, sest sisestasid mitu korda vale parooli.' + kick_unresolved_hostname: '&cEsines tõrge: mängija hostinimi on lahendamata!' # AntiBot antibot: - kick_antibot: 'AntiBot kaitse sisse lülitatud! Pead ootama mõne minuti enne kui serveriga liituda saad.' - auto_enabled: '&4[AntiBotKaitse] AntiBot sisselülitatud!' - auto_disabled: '&2[AntiBotKaitse] AntiBot välja lülitatud peale %m minutit!' + kick_antibot: 'AntiBot-kaitse sisse lülitatud! Pead ootama mõne minuti enne kui serveriga liituda saad.' + auto_enabled: '&4[AntiBotTeenus] AntiBot sisselülitatud!' + auto_disabled: '&2[AntiBotTeenus] AntiBot välja lülitatud peale %m minutit!' -# Unregister unregister: success: '&cKasutaja edukalt kustutatud!' command_usage: '&cKasutus: /unregister ' # Other messages misc: - account_not_activated: '&cSu konto ei ole veel aktiveeritud, kontrolli oma meili!' - password_changed: '&2Parool vahetatud!' - logout: '&2Edukalt välja logitud!' - reload: '&2Andmebaas edukalt laetud!' - usage_change_password: '&cKasutus: /changepassword ' accounts_owned_self: 'Sa omad %count kontot:' accounts_owned_other: 'Mängijal %name on %count kontot:' + account_not_activated: '&cSinu konto ei ole veel aktiveeritud, kontrolli oma meili!' + password_changed: '&2Parool edukalt vahetatud!' + logout: '&2Edukalt välja logitud!' + reload: '&2Seadistused ning andmebaas on edukalt taaslaaditud!' + usage_change_password: '&cKasutus: /changepassword ' # Session messages session: + invalid_session: '&cSinu IP-aadress muutus, seega sinu sessioon aegus!' valid_session: '&2Sisse logitud sessiooni jätkumise tõttu.' - invalid_session: '&cSu IP aadress muutus mistõttu sinu sessioon aegus!' # Error messages when joining on_join_validation: - same_ip_online: 'Sama IP aadressiga mängija juba mängib!' - same_nick_online: '&4Sama kasutaja on juba ühendatud serveriga!' - name_length: '&4Su kasutajanimi on liiga pikk või lühike!' - characters_in_name: '&4Su kasutajanimi sisaldab keelatud tähemärke. Lubatud tähemärgid: %valid_chars' - kick_full_server: '&4Server täis, proovi uuesti!' - country_banned: '&4Sinu riigist ei ole võimalik ühenduda sellesse serverisse!' - not_owner_error: 'Sa ei ole selle kasutaja omanik. Vali teine nimi!!' + name_length: '&4Sinu kasutajanimi on liiga pikk või liiga lühike!' + characters_in_name: '&4Sinu kasutajanimi sisaldab keelatud tähemärke. Lubatud tähemärgid: %valid_chars' + country_banned: '&4Sinu riigist ei ole võimalik sellesse serverisse ühenduda!' + not_owner_error: 'Sa ei ole selle konto omanik. Vali teine nimi!' + kick_full_server: '&4Server on täis, proovi hiljem uuesti!' + same_nick_online: '&4Sama kasutaja on juba serveriga ühendatud!' invalid_name_case: 'Sa peaksid liituma nimega %valid, mitte nimega %invalid.' - quick_command: 'Sa kasutasid käsklust liiga kiiresti! Palun liitu serveriga ja oota kauem enne kui käsklust kasutad.' + same_ip_online: 'Sama IP-aadressiga mängija juba mängib!' + quick_command: 'Sa kasutasid käsklust liiga kiiresti! Palun liitu serveriga uuesti ning oota enne mõne käskluse kasutamist kauem.' # Email email: - add_email_request: '&3Palun seo oma kasutajaga meiliaadress kasutades käsklust: /email add ' usage_email_add: '&cKasutus: /email add ' usage_email_change: '&cKasutus: /email change ' - new_email_invalid: '&cUus meiliaadress on vale, proovi uuesti!' - old_email_invalid: '&cVana meiliaadress on vale, proovi uuesti!' - invalid: '&cVale meiliaadress, proovi uuesti!' + new_email_invalid: '&cUus meiliaadress on sobimatu, proovi uuesti!' + old_email_invalid: '&cVana meiliaadress on sobimatu, proovi uuesti!' + invalid: '&cSobimatu meiliaadress, proovi uuesti!' added: '&2Meiliaadress edukalt lisatud!' - add_not_allowed: '&cMeiliaadressi lisamine ei ole lubatud.' request_confirmation: '&cPalun kinnita oma meiliaadress!' changed: '&2Meiliaadress edukalt muudetud!' - change_not_allowed: '&cMeiliaadressi muutmine ei ole lubatud.' - email_show: '&2Su praegune meiliaadress on: &f%email' - no_email_for_account: '&2Selle kasutajaga ei ole seotud ühtegi meiliaadressi.' + email_show: '&2Sinu praegune meiliaadress on: &f%email' + incomplete_settings: 'Viga: meili saatmiseks pole kõik vajalikud seaded seadistatud. Teata sellest administraatorit.' already_used: '&4See meiliaadress on juba kasutuses!' - incomplete_settings: 'Viga: meili saatmiseks pole kõik vajalikud seaded seadistatud. Teata sellest administraatorile.' - send_failure: 'Meili ei õnnestunud saata. Teata sellest administraatorile.' + send_failure: 'Meili ei õnnestunud saata. Teata sellest administraatorit.' + no_email_for_account: '&2Selle kasutajaga ei ole seotud ühtegi meiliaadressi.' + add_email_request: '&3Palun seo oma kasutajaga meiliaadress kasutades käsklust: /email add ' change_password_expired: 'Selle käsklusega ei saa sa enam parooli muuta.' email_cooldown_error: '&cMeil on juba saadetud. Sa pead ootama %time enne kui saad küsida uue saatmist.' + add_not_allowed: '&cMeiliaadressi lisamine ei ole lubatud.' + change_not_allowed: '&cMeiliaadressi muutmine ei ole lubatud.' # Password recovery by email recovery: @@ -109,29 +108,42 @@ recovery: email_sent: '&2Konto taastamiseks vajalik meil saadetud! Vaata oma postkasti.' code: code_sent: 'Konto taastamise kood on saadetud!' - incorrect: 'Kood vale! Sul on %count katset jäänud.' + incorrect: 'Kood on vale! Sul on %count katset jäänud.' tries_exceeded: 'Sul on katsed otsas. Kasuta käsklust "/email recovery [email]" uue koodi saamiseks.' correct: 'Kood õigesti sisestatud!' - change_password: 'Palun kasuta käsklust /email setpassword parooli muutmiseks.' + change_password: 'Palun kasuta parooli muutmiseks käsklust /email setpassword .' # Captcha captcha: - usage_captcha: '&3Sisselogimiseks lahenda captcha käsklusega: /captcha %captcha_code' - wrong_captcha: '&cVale captcha, kasuta käsklust "/captcha %captcha_code"!' - valid_captcha: '&2Captcha lahendatud!' - captcha_for_registration: 'Registreerimiseks lahenda captcha kasutades käsklust: /captcha %captcha_code' - register_captcha_valid: '&2Captcha lahendatud! Võid nüüd registreerida kasutades käsklust /register' + usage_captcha: '&3Sisselogimiseks lahenda robotilõks käsklusega: /captcha %captcha_code' + wrong_captcha: '&cVale robotilõks, kasuta käsklust "/captcha %captcha_code"!' + valid_captcha: '&2Robotilõks lahendatud!' + captcha_for_registration: 'Registreerimiseks lahenda robotilõks kasutades käsklust: /captcha %captcha_code' + register_captcha_valid: '&2Robotilõks lahendatud! Võid nüüd registreerida kasutades käsklust /register' # Verification code verification: code_required: '&3See käsklus on ohtlik mistõttu saatsime sulle meili. Kontrolli oma meili ja järgi saadetud meili juhiseid.' command_usage: '&cKasutus: /verification ' incorrect_code: '&cVale kood, palun kasuta käsklust "/verification " koodiga, mille saatsime sulle meilile.' - success: '&2Konto kinnitatud!' + success: '&2Sinu identiteet on kinnitatud! Sa saad nüüd praeguse sessiooni jal kasutada kõiki käsklusi.' already_verified: '&2Sa juba saad kasutada kõiki ohtlikke käsklusi!' - code_expired: '&3Kood aegunud! Kasuta mõnda ohtlikku käsklust, et saada uus kood!' + code_expired: '&3Kood on aegunud! Kasuta mõnda ohtlikku käsklust, et saada uus kood!' email_needed: '&3Konto kinnitamiseks pead siduma oma kontoga enda meiliaadressi!' +# Two-factor authentication +two_factor: + code_created: '&2Sinu privaatne kood on %code. Sa saad selle skännida aadressil %url' + confirmation_required: 'Palun kinnita oma kaheastmeline autentimise kood käsklusega /2fa confirm ' + code_required: 'Palun sisesta kaheastmeline autentimise kood kasutades /2fa code ' + already_enabled: 'Kaheastmeline autentimine on juba sisselülitatud!' + enable_error_no_code: '2FA võtit ei ole genereeritud või on see aegunud. Kasuta käsklust /2fa add' + enable_success: 'Kaheastmeline autentimine edukalt sisselülitatud!' + enable_error_wrong_code: 'Vale kood või kood on aegunud. Kasuta käsklust /2fa add' + not_enabled_error: 'Kaheastmeline autentimine ei ole su kontol sisse lülitatud. Kasuta käsklust /2fa add' + removed_success: 'Sinu kontolt on edukalt eemaldatud kaheastmeline autentimine.' + invalid_code: 'Vale kood!' + # Time units time: second: 'sekund' @@ -142,16 +154,3 @@ time: hours: 'tundi' day: 'päev' days: 'päeva' - -# Two-factor authentication -two_factor: - code_created: '&2Sinu privaatne kood on %code. Sa saad selle skännida aadressil %url' - confirmation_required: 'Palun kinnita oma kaheastmeline autentimise kood käsklusega /2fa confirm ' - code_required: 'Palun sisesta kaheastmeline autentimise kood kasutades /2fa code ' - already_enabled: 'Kaheastmeline autentimine on juba sisselülitatud!' - enable_error_no_code: '2fa võtit ei ole genereeritud või on see aegunud. Kasuta käsklust /2fa add' - enable_success: 'Kaheastmeline autentimine edukalt sisselülitatud!' - enable_error_wrong_code: 'Vale kood või kood on aegunud. Kasuta käsklust /2fa add' - not_enabled_error: 'Kaheastmeline autentimine ei ole su kontol sisse lülitatud. Kasuta käsklust /2fa add' - removed_success: 'Sinu kontolt on edukalt eemaldatud kaheastmeline autentimine.' - invalid_code: 'Vale kood!' diff --git a/src/main/resources/messages/messages_eu.yml b/src/main/resources/messages/messages_eu.yml index a32386d7e..b3b6b665e 100644 --- a/src/main/resources/messages/messages_eu.yml +++ b/src/main/resources/messages/messages_eu.yml @@ -5,153 +5,153 @@ # Registration registration: - disabled: '&cErregistroa desgaitua' - name_taken: '&cErabiltzailea dagoeneko erregistratua' - register_request: '&cMesedez erabili "/register pasahitza pasahitza" erregistratzeko' - command_usage: '&cErabili: /register pasahitza pasahitza' - reg_only: '&fErregistratuako erabiltzaileak bakarrik! Mesedez bisitatu http://example.com erregistratzeko' - success: '&cOndo erregistratu zara!' - # TODO kicked_admin_registered: 'An admin just registered you; please log in again' + disabled: '&cIzen ematea itxita dago!' + name_taken: '&cDagoeneko badago erabiltzaile izen hori duen norbait.' + register_request: '&cMesedez erabili "/register " izena emateko' + command_usage: '&cErabilera: /register ' + reg_only: '&fIzena eman duten jokalariak bakarrik sartu daitezke! Mesedez, eman izena https://example.com webgunean' + success: '&cEskerrik asko izena emateagatik!' + kicked_admin_registered: 'Administratzaile batek izena eman dizu, mesedez irten eta sartu zerbitzaritik.' # Password errors on registration password: - match_error: '&fPasahitzak ez datoz bat' - # TODO name_in_password: '&cYou can''t use your name as password, please choose another one...' - # TODO unsafe_password: '&cThe chosen password isn''t safe, please choose another one...' - # TODO forbidden_characters: '&4Your password contains illegal characters. Allowed chars: %valid_chars' + match_error: '&fBi pasahitzak ez datoz bat' + name_in_password: '&cPasahitza eta erabiltzaile izena ezin dira berdinak izan. Mesedez, aukeratu beste pasahitz bat...' + unsafe_password: '&cAukeratutako pasahitza ez da segurua.Mesedez, aukeratu beste bat...' + forbidden_characters: '&4Pasahitzak ondorengo karaktereak bakarrik izan ditzake: %valid_chars' wrong_length: '&fZure pasahitza motzegia edo luzeegia da' # Login login: - command_usage: '&cErabili: /login pasahitza' + command_usage: '&cErabilera: /login pasahitza' wrong_password: '&cPasahitz okerra' - success: '&cOngi etorri!' + success: '&cSaioa hasi duzu!' login_request: '&cMesedez erabili "/login pasahitza" saioa hasteko' - timeout_error: '&fDenbora gehiegi egon zara saioa hasi gabe' + timeout_error: '&fDenbora gehiegi egon zara saioa hasi gabe.' # Errors error: - # TODO denied_command: '&cIn order to use this command you must be authenticated!' - # TODO denied_chat: '&cIn order to chat you must be authenticated!' - unregistered_user: '&cErabiltzailea ez dago erregistratuta' - not_logged_in: '&cSaioa hasi gabe!' - no_permission: '&cBaimenik ez' - unexpected_error: '&fErrorea; Mesedez jarri kontaktuan administratzaile batekin' - max_registration: '&fKontuko 2 erabiltzaile bakarrik izan ditzakezu' - logged_in: '&cDagoeneko saioa hasita!' - kick_for_vip: '&cVIP erabiltzaile bat sartu da zerbitzaria beteta zegoenean!' - # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!' - # TODO tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.' + denied_command: '&cHori egiteko ezinbestekoa da saioa hastea!' + denied_chat: '&cTxatean hitz egiteko ezinbestekoa da saioa hastea!' + unregistered_user: '&cErabiltzaileak ez du izena eman!' + not_logged_in: '&cEz duzu saioa hasi!' + no_permission: '&cEz daukazu baimenik' + unexpected_error: '&fUstekabeko errore bat gertatu da. Mesedez jarri harremanetan administratzaile batekin.' + max_registration: '&fKonexioko gehienezko erabiltzaile kopurua gainditu duzu (%reg_count/%max_acc %reg_names)' + logged_in: '&cDagoeneko saioa hasita duzu!' + kick_for_vip: '&cVIP erabiltzaile bati lekua egiteko kanporatua izan zara!' + kick_unresolved_hostname: '&cErrore bat geratu da: ezin izan da erabiltzailearen ostalari izena lortu!' + tempban_max_logins: '&cDenbora baterako kanporatua izan zara, pasahitza behin baino gehiagotan gaizki sartzeagatik.' # AntiBot antibot: - # TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' - # TODO auto_enabled: '&4[AntiBotService] AntiBot enabled due to the huge number of connections!' - # TODO auto_disabled: '&2[AntiBotService] AntiBot disabled after %m minutes!' + kick_antibot: 'AntiBot babesa aktibatuta dago! Minutu batzuk itxaron beharko dituzu berriro sartu aurretik.' + auto_enabled: '&4[AntiBotZerbitzua] AntiBot babesa aktibatu da konexio kopurua handia delako!' + auto_disabled: '&2[AntiBotZerbitzua] AntiBot babesa desaktibatu da %m minutuz martxan egon ondoren!' # Unregister unregister: - success: '&cZure erregistroa ezabatu duzu!' - command_usage: '&cErabili: /unregister password' + success: '&cZure kontua ezabatu duzu!' + command_usage: '&cErabilera: /unregister ' # Other messages misc: - account_not_activated: '&fZure kontua aktibatu gabe dago, konfirmatu zure emaila!' - password_changed: '&cPasahitza aldatu duzu!' - logout: '&cAtera zara' - reload: '&fConfiguration and database has been reloaded' - usage_change_password: '&fErabili: /changepassword pasahitzZaharra pasahitzBerria' - # TODO accounts_owned_self: 'You own %count accounts:' - # TODO accounts_owned_other: 'The player %name has %count accounts:' + account_not_activated: '&fZure kontua aktibatu gabe dago. Mesedez, berretsi zure posta elektronikoa!' + password_changed: '&cPasahitza ondo aldatu duzu!' + logout: '&cSaioa itxi duzu' + reload: '&fEzarpenak eta datu-basea berrabiarazi dira' + usage_change_password: '&fErabilera: /changepassword ' + accounts_owned_self: '%count kontu dituzu:' + accounts_owned_other: '%name erabiltzaileak %count kontu ditu:' # Session messages session: - valid_session: '&cSession login' - # TODO invalid_session: '&cYour IP has been changed and your session data has expired!' + valid_session: '&cSesioa mantendu eta beraz ez daukazu saioa hasi beharrik.' + invalid_session: '&cZure IP helbidea aldatu da, eta horregatik zure sesioa iraungi da!' # Error messages when joining on_join_validation: - # TODO same_ip_online: 'A player with the same IP is already in game!' - same_nick_online: '&fZure izen berdina duen erabiltzaile bat zerbitzarian jolasten dago' + same_ip_online: 'IP helbide bera duen beste erabiltzaile bat dago zerbitzarian!' + same_nick_online: '&fErabiltzaile izen bera duen erabailtzaile bat dago zerbitzarian' name_length: '&cZure erabiltzaile izena motzegia edo luzeegia da' - characters_in_name: '&cZure erabiltzaileak karaktere debekatuak ditu. Karaktere onartuak: %valid_chars' - kick_full_server: '&cZerbitzaria beteta dago, Barkatu!' - country_banned: '[AuthMe] Zure herrialdea blokeatuta dago zerbitzari honetan' - # TODO not_owner_error: 'You are not the owner of this account. Please choose another name!' - # TODO invalid_name_case: 'You should join using username %valid, not %invalid.' - # TODO quick_command: 'You used a command too fast! Please, join the server again and wait more before using any command.' + characters_in_name: '&cZure erabiltzaileak debekatutako karaktereak ditu. Ondorengoak bakarrik onartzen ditugu: %valid_chars' + kick_full_server: '&cZerbitzaria beteta dago. Sentitzen dugu!' + country_banned: 'Zure herrialdetik ezin zara zerbitzari honetan sartu' + not_owner_error: 'Kontu hau ez da zurea! Erabili beste bat!' + invalid_name_case: '%valid erabiltzailea erabili beharko duzu, ez %invalid.' + quick_command: 'Komandoa azkarregi exekutatu duzu! Mesdez, sartu zerbitzarian berriro eta itxaron pixka bat ezer idatzi aurretik.' # Email email: - add_email_request: '&cMesedez gehitu zure emaila : /email add yourEmail confirmEmail' - usage_email_add: '&fErabili: /email add ' - usage_email_change: '&fErabili: /email change ' - new_email_invalid: '[AuthMe] Email okerra!' - old_email_invalid: '[AuthMe] Email zaharra okerra!' - invalid: '[AuthMe] Email okerrea' - added: '[AuthMe] Emaila gehitu duzu !' - # TODO add_not_allowed: '&cAdding email was not allowed' - request_confirmation: '[AuthMe] Konfirmatu zure emaila !' - changed: '[AuthMe] Emaila aldatua!' - # TODO change_not_allowed: '&cChanging email was not allowed' - # TODO email_show: '&2Your current email address is: &f%email' - # TODO no_email_for_account: '&2You currently don''t have email address associated with this account.' - # TODO already_used: '&4The email address is already being used' - # TODO incomplete_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.' - # TODO send_failure: 'The email could not be sent. Please contact an administrator.' - # TODO change_password_expired: 'You cannot change your password using this command anymore.' - # TODO email_cooldown_error: '&cAn email was already sent recently. You must wait %time before you can send a new one.' + add_email_request: '&cMesedez, sartu zure posta elektroniko helbidea : /email add ' + usage_email_add: '&fErabilera: /email add ' + usage_email_change: '&fErabilera: /email change ' + new_email_invalid: 'Helbide berria okerra da!' + old_email_invalid: 'Lehengo helbidea ez dator bat!' + invalid: 'Helbide okerra' + added: 'Helbidea ondo sartu duzu' + add_not_allowed: '&cEzin duzu posta helbiderik sartu' + request_confirmation: 'Berretsi zure posta helbidea!' + changed: 'Posta helbidea ondo aldatu duzu' + change_not_allowed: '&cEzin duzu posta helbidea aldatu' + email_show: '&2Zure posta helbidea ondorengoa da: &f%email' + no_email_for_account: '&2Ez daukazu posta helbiderik kontu honetara lotuta.' + already_used: '&4Posta helbide hori dagoeneko badarabil norbaitek' + incomplete_settings: 'Errorea: posta elektronikoak bidaltzeko ezparpen guztiak ez daude konfiguratu. Mesedez, jarri harremanetan administratzaile batekin.' + send_failure: 'Ezin izan da mezua bidali. Mesedez, jarri harremanetan administratzaile batekin.' + change_password_expired: 'Pasahitza aldatzeko denbora iraungi da.' + email_cooldown_error: '&cMezu bat bidali dizugu duela denbora gutxik. %time itxaron behar duzu berriro bidaltzeko eskatu aurretik.' # Password recovery by email recovery: - forgot_password_hint: '&cPasahitza ahaztu duzu? Erabili /email recovery ' - command_usage: '&fErabili: /email recovery ' - email_sent: '[AuthMe] Berreskuratze emaila bidalita !' + forgot_password_hint: '&cPasahitza ahaztu duzu? Berreskuratzeko erabili /email recovery ' + command_usage: '&fErabili: /email recovery ' + email_sent: 'Berreskuratze mezua bidali dizugu. Mesedez begiratu sarrera ontzia!' code: - # TODO code_sent: 'A recovery code to reset your password has been sent to your email.' - # TODO incorrect: 'The recovery code is not correct! You have %count tries remaining.' - # TODO tries_exceeded: 'You have exceeded the maximum number attempts to enter the recovery code. Use "/email recovery [email]" to generate a new one.' - # TODO correct: 'Recovery code entered correctly!' - # TODO change_password: 'Please use the command /email setpassword to change your password immediately.' + code_sent: 'Pasahitza berreskuratzeko kode bat bidali dizugu zure posta elektronikora.' + incorrect: 'Berreskuratze kodea ez da zuzena! %count saiakera dituzu.' + tries_exceeded: 'Berreskuratze kodea sartzeko gehienezko saiakera kopurua gainditu duzu. Erabili "/email recovery [helbidea]" berri bat jasotzeko.' + correct: 'Kode zuzena!' + change_password: 'Mesedez, erabili "/email setpassword pasahitza aldatzeko.' # Captcha captcha: - # TODO usage_captcha: '&3To log in you have to solve a captcha code, please use the command: /captcha %captcha_code' - # TODO wrong_captcha: '&cWrong captcha, please type "/captcha %captcha_code" into the chat!' - # TODO valid_captcha: '&2Captcha code solved correctly!' - # TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha %captcha_code' - # TODO register_captcha_valid: '&2Valid captcha! You may now register with /register' + usage_captcha: '&3Sartzeko captcha asmatu beharko duzu. Mesedez erabaili /captcha %captcha_code' + wrong_captcha: '&cCaptacha okerra, mesedez, idatzi "/captcha %captcha_code" txatean!' + valid_captcha: '&2Captcha asmatu duzu!' + captcha_for_registration: 'Izena emateko captcha asmatu beharko duzu, mesedez erabili ondorengo komandoa: /captcha %captcha_code' + register_captcha_valid: '&2Captcha zuzena! Orain izena eman dezakezu /register erabilita' # Verification code verification: - # TODO code_required: '&3This command is sensitive and requires an email verification! Check your inbox and follow the email''s instructions.' - # TODO command_usage: '&cUsage: /verification ' - # TODO incorrect_code: '&cIncorrect code, please type "/verification " into the chat, using the code you received by email' - # TODO success: '&2Your identity has been verified! You can now execute all commands within the current session!' - # TODO already_verified: '&2You can already execute every sensitive command within the current session!' - # TODO code_expired: '&3Your code has expired! Execute another sensitive command to get a new code!' - # TODO email_needed: '&3To verify your identity you need to link an email address with your account!!' + code_required: '&3Komando hori babestuta dago, eta horregatik eposta berrespena beharrazkoa da! Begiratu zure sarrera ontzia, eta jarraitu bertan adierazitako pausoak.' + command_usage: '&cErabilera: /verification ' + incorrect_code: '&cKode okerra, mesedez idatzi "/verification " txatean, postan jaso duzun kodea erabilita' + success: '&2Zure identitatea berretsi duzu! Orain komando babestuak erabiltzeko baimena daukazu sesioak irauten duen bitartean!' + already_verified: '&2Dagoeneko badaukazu komando babestuak erabiltzeko baimena sesio honek irauten duen bitartean!' + code_expired: '&3Kodea iraungi egin da! Exekutatu beste komando babestu bat kode berri bat lortzeko!' + email_needed: '&3Zure identitatea berresteko beharrezkoa da zure kontuan posta elektronikoa konfiguratuta izatea!!' # Time units time: - # TODO second: 'second' - # TODO seconds: 'seconds' - # TODO minute: 'minute' - # TODO minutes: 'minutes' - # TODO hour: 'hour' - # TODO hours: 'hours' - # TODO day: 'day' - # TODO days: 'days' + second: 'segundu' + seconds: 'segundu' + minute: 'minutu' + minutes: 'minutu' + hour: 'ordu' + hours: 'ordu' + day: 'egun' + days: 'egun' # Two-factor authentication two_factor: - # TODO code_created: '&2Your secret code is %code. You can scan it from here %url' - # TODO confirmation_required: 'Please confirm your code with /2fa confirm ' - # TODO code_required: 'Please submit your two-factor authentication code with /2fa code ' - # TODO already_enabled: 'Two-factor authentication is already enabled for your account!' - # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add' - # TODO enable_success: 'Successfully enabled two-factor authentication for your account' - # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add' - # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add' - # TODO removed_success: 'Successfully removed two-factor auth from your account' - # TODO invalid_code: 'Invalid code!' + code_created: '&2Zure kode sekretua %code da. Hemen eskaneatu dezakezu: %url' + confirmation_required: 'Mesedez, berretsi kodea ondorengoa erabilita: /2fa confirm ' + code_required: 'Mesedez, bidali zure bi faktoreko autentikazio kodea ondorengoa erabilita: /2fa code ' + already_enabled: 'Dagoeneko badaukazu bi faktoreko autentikazioa aktibatuta!' + enable_error_no_code: 'Ez duzu 2fa koderik sortu, edo iraungita dago. Mesedez, erabili /2fa add' + enable_success: '2 faktoreko autentikazioa aktibatu duzu' + enable_error_wrong_code: 'Kode okerra, edo iraungita dago. Mesedez erabili /2fa add' + not_enabled_error: 'Ez duzu 2 faktore autentikazioa konfiguratu. Erabaili /2fa add' + removed_success: '2 faktoreko autentikazioa desaktibatu duzu' + invalid_code: 'Kode okerra!' diff --git a/src/main/resources/messages/messages_ru.yml b/src/main/resources/messages/messages_ru.yml index 644dd53ac..6d9b68602 100644 --- a/src/main/resources/messages/messages_ru.yml +++ b/src/main/resources/messages/messages_ru.yml @@ -1,17 +1,17 @@ # Registration registration: disabled: '&cРегистрация отключена.' - name_taken: '&cИгрок с таким именем уже зарегистрирован.' + name_taken: '&cИгрок с таким никнеймом уже зарегистрирован.' register_request: '&3Регистрация: /reg <пароль> <повтор пароля>' command_usage: '&cИспользование: /reg <пароль> <повтор пароля>' reg_only: '&4Вход только для зарегистрированных! Посетите http://сайт_сервера.ru для регистрации.' success: '&2Вы успешно зарегистрировались!' - kicked_admin_registered: 'Администратор зарегистрировал вас. Авторизируйтесь снова.' + kicked_admin_registered: 'Администратор зарегистрировал вас. Авторизуйтесь снова.' # Password errors on registration password: match_error: '&cПароли не совпадают.' - name_in_password: '&cНельзя использовать своё имя в качестве пароля.' + name_in_password: '&cНельзя использовать свой никнейм в качестве пароля.' unsafe_password: '&cТакой пароль небезопасен.' forbidden_characters: '&4Пароль содержит запрещённые символы. Разрешённые: %valid_chars' wrong_length: '&cПароль слишком длинный/короткий.' @@ -52,7 +52,7 @@ unregister: # Other messages misc: account_not_activated: '&cВаша уч. запись ещё не активирована. Проверьте электронную почту!' - password_changed: '&2Пароль изменён!' + password_changed: '&2Ваш пароль изменён!' logout: '&2Вы успешно вышли.' reload: '&6Конфигурация и база данных перезагружены.' usage_change_password: '&cИспользование: /changepassword <пароль> <новый пароль>' @@ -67,14 +67,14 @@ session: # Error messages when joining on_join_validation: same_ip_online: 'Игрок с данным IP-адресом уже играет на сервере!' - same_nick_online: '&4Игрок с данным именем уже играет на сервере!' - name_length: '&4Ваше имя слишком длинное/короткое.' - characters_in_name: '&4Пароль содержит запрещённые символы. Разрешённые: %valid_chars' + same_nick_online: '&4Игрок с данным никнеймом уже играет на сервере!' + name_length: '&4Ваш никнейм слишком длинный/короткий.' + characters_in_name: '&4Ваш никнейм содержит запрещённые символы. Разрешённые: %valid_chars' kick_full_server: '&4Сервер полон. Попробуйте зайти позже!' country_banned: '&4Вход с IP-адресов вашей страны запрещён на этом сервере.' - not_owner_error: 'Вы не являетесь владельцем данной уч. записи. Выберите себе другое имя!' - invalid_name_case: 'Неверное имя! Зайдите под именем %valid, а не %invalid.' - quick_command: 'Вы вводили команды слишком часто! Пожалуйста заходите снова и вводите команды помедленнее.' + not_owner_error: 'Вы не являетесь владельцем данной уч. записи. Выберите себе другой никнейм!' + invalid_name_case: 'Неверный никнейм! Зайдите под никнеймом %valid, а не %invalid.' + quick_command: 'Вы вводили команды слишком часто! Пожалуйста, переподключитесь и вводите команды медленнее.' # Email email: diff --git a/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java b/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java index 6929bc3d0..5f8986518 100644 --- a/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java +++ b/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java @@ -952,6 +952,7 @@ public class PlayerListenerTest { // given HumanEntity player = mock(Player.class); InventoryView transaction = mock(InventoryView.class); + given(transaction.getTitle()).willReturn("Spawn"); given(settings.getProperty(RestrictionSettings.UNRESTRICTED_INVENTORIES)).willReturn(Collections.emptySet()); InventoryOpenEvent event = new InventoryOpenEvent(transaction); given(event.getPlayer()).willReturn(player); diff --git a/src/test/java/fr/xephi/authme/security/totp/TotpAuthenticatorTest.java b/src/test/java/fr/xephi/authme/security/totp/TotpAuthenticatorTest.java index 0e7d9c37f..8df994084 100644 --- a/src/test/java/fr/xephi/authme/security/totp/TotpAuthenticatorTest.java +++ b/src/test/java/fr/xephi/authme/security/totp/TotpAuthenticatorTest.java @@ -60,8 +60,8 @@ public class TotpAuthenticatorTest { TotpGenerationResult key2 = totpAuthenticator.generateTotpKey(player); // then - assertThat(key1.getTotpKey(), stringWithLength(16)); - assertThat(key2.getTotpKey(), stringWithLength(16)); + assertThat(key1.getTotpKey(), stringWithLength(32)); + assertThat(key2.getTotpKey(), stringWithLength(32)); assertThat(key1.getAuthenticatorQrCodeUrl(), startsWith("https://api.qrserver.com/v1/create-qr-code/?data=")); assertThat(key1.getAuthenticatorQrCodeUrl(), containsString("MCtopia")); assertThat(key2.getAuthenticatorQrCodeUrl(), startsWith("https://api.qrserver.com/v1/create-qr-code/?data="));