Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 1141-optional-additional-2fa-auth

2018-04-22 07:14:05 +02:00
parent 156260c7a9 baec034909
commit de0e588cf3
56 changed files with 605 additions and 123 deletions
@@ -99,6 +99,8 @@ email:
    send_failure: 'Съобщението не беше изпратено. Моля свържете се с администратора.'
    # TODO change_password_expired: 'You cannot change your password using this command anymore.'
    email_cooldown_error: '&cВече е бил изпратен имейл адрес. Трябва а изчакаш %time преди да пратиш нов.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -102,6 +102,8 @@ email:
    send_failure: '&cO e-mail não pôde ser enviado, reporte isso a um administrador!'
    change_password_expired: 'Você não pode mais usar esse comando de recuperação de senha!'
    email_cooldown_error: '&cUm e-mail já foi enviado, espere mais %time antes de enviar novamente!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -99,6 +99,8 @@ email:
    send_failure: 'Email nemohl být odeslán. Kontaktujte prosím admina.'
    change_password_expired: 'Nemůžeš si změnit heslo pomocí toho příkazu.'
    email_cooldown_error: '&cEmail už byl nedávno odeslán. Musíš čekat %time před odesláním nového.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -99,6 +99,8 @@ email:
    send_failure: 'Die E-Mail konnte nicht gesendet werden. Bitte kontaktiere einen Administrator.'
    change_password_expired: 'Mit diesem Befehl kannst du dein Passwort nicht mehr ändern.'
    email_cooldown_error: '&cEine E-Mail wurde erst kürzlich versendet. Du musst %time warten, bevor du eine neue anfordern kannst.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -97,6 +97,8 @@ email:
  add_email_request: '&3Please add your email to your account with the command: /email add <yourEmail> <confirmEmail>'
  change_password_expired: 'You cannot change your password using this command anymore.'
  email_cooldown_error: '&cAn email was already sent recently. You must wait %time before you can send a new one.'
+  add_not_allowed: '&cAdding email was not allowed'
+  change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -99,6 +99,8 @@ email:
    send_failure: 'La retpoŝto ne estis sendita. Bonvolu kontakti administranto.'
    change_password_expired: 'Vi ne povas ŝanĝi vian pasvorton per tiu ĉi komando plu.'
    email_cooldown_error: '&cRetmesaĝon jam sendita lastatempe. Vi devas atendi %time antaŭ vi povas sendi novan.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -80,7 +80,7 @@ on_join_validation:
    country_banned: '¡Tu país ha sido baneado de este servidor!'
    not_owner_error: 'No eres el propietario de esta cuenta. ¡Por favor, elije otro nombre!'
    invalid_name_case: 'Solo puedes unirte mediante el nombre de usuario %valid, no %invalid.'
-    # TODO quick_command: 'You used a command too fast! Please, join the server again and wait more before using any command.'
+    quick_command: 'Has usado el comando demasiado rápido! Porfavor, entra al servidor de nuevo y espera un poco antes de usar cualquier comando.'

 # Email
 email:
@@ -100,6 +100,8 @@ email:
    send_failure: 'No se ha podido enviar el correo electrónico. Por favor, contacta con un administrador.'
    change_password_expired: 'No puedes cambiar la contraseña utilizando este comando.'
    email_cooldown_error: '&cEl correo ha sido enviado recientemente. Debes esperar %time antes de volver a enviar uno nuevo.'
+    add_not_allowed: '&cNo se permite añadir un Email'
+    change_not_allowed: '&cNo se permite el cambio de Email'

 # Password recovery by email
 recovery:
@@ -99,6 +99,8 @@ email:
    send_failure: 'Meili ei õnnestunud saata. Kontakteeru meeskonnaga.'
    change_password_expired: '&3Enam ei saa vahetada oma parooli kasutades seda käsklust.'
    email_cooldown_error: '&cEmail juba saadeti. Sa pead ootama %time ennem, kui saad uuesti saata.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -99,6 +99,8 @@ email:
    # 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.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -99,6 +99,8 @@ email:
    # 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.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -102,6 +102,8 @@ email:
    send_failure: '&cLe mail n''a pas pu être envoyé. Veuillez contacter un admin.'
    change_password_expired: 'Vous ne pouvez pas changer votre mot de passe avec cette commande.'
    email_cooldown_error: '&cUn mail de récupération a déjà été envoyé récemment. Veuillez attendre %time pour le demander de nouveau.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -99,6 +99,8 @@ email:
    # 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.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -99,6 +99,8 @@ email:
    send_failure: 'Nem sikerült elküldeni az emailt. Lépj kapcsolatba egy adminnal.'
    change_password_expired: 'Ezzel a paranccsal már nem módosíthatja jelszavát.'
    email_cooldown_error: '&cEgy emailt már kiküldtünk. Következő email küldése előtt várnod kell: %time.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -99,6 +99,8 @@ email:
    # 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.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -4,8 +4,6 @@
 # %username% - Sostituisce il nome dell'utente che riceve il messaggio.
 # %displayname% - Sostituisce il nickname (e i colori) dell'utente che riceve il messaggio.

-# Registrazione
-
 # Registration
 registration:
    disabled: '&cLa registrazione tramite i comandi di gioco è disabilitata.'
@@ -82,7 +80,7 @@ on_join_validation:
    country_banned: '&4Il tuo paese è bandito da questo server!'
    not_owner_error: 'Non sei il proprietario di questo account. Per favore scegli un altro nome!'
    invalid_name_case: 'Dovresti entrare con questo nome utente "%valid", al posto di "%invalid".'
-    # TODO quick_command: 'You used a command too fast! Please, join the server again and wait more before using any command.'
+    quick_command: 'Hai usato un comando troppo velocemente dal tuo accesso! Per favore, rientra nel server e aspetta un po'' di più prima di usare un qualsiasi comando.'

 # Email
 email:
@@ -102,10 +100,12 @@ email:
    send_failure: 'Non è stato possibile inviare l''email di recupero. Per favore contatta un amministratore.'
    change_password_expired: 'Non puoi più cambiare la tua password con questo comando.'
    email_cooldown_error: '&cUna email di recupero ti è già stata inviata recentemente. Devi attendere %time prima di poterne richiedere una nuova.'
+    add_not_allowed: '&cNon hai il permesso di aggiungere un indirizzo email'
+    change_not_allowed: '&cNon hai il permesso di cambiare l''indirizzo email'

 # Password recovery by email
 recovery:
-    forgot_password_hint: '&3Hai dimenticato la tua password? Puoi recuperarla eseguendo il comando: /email recovery <email>'
+    forgot_password_hint: '&3Hai dimenticato la tua password? Puoi recuperarla usando il comando: /email recovery <email>'
    command_usage: '&cUtilizzo: /email recovery <email>'
    email_sent: '&2Una email di recupero è stata appena inviata al tuo indirizzo email!'
    code:
@@ -101,6 +101,8 @@ email:
    send_failure: '이메일을 보낼 수 없습니다. 관리자에게 알려주세요.'
    change_password_expired: '더 이상 이 명령어를 통해 비밀번호를 변경할 수 없습니다.'
    email_cooldown_error: '&c이메일을 이미 발송했습니다. %time 후에 다시 발송할 수 있습니다.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -99,6 +99,8 @@ email:
    # 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.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -99,6 +99,8 @@ email:
    send_failure: 'De e-mail kon niet verzonden worden. Neem contact op met een administrator.'
    change_password_expired: 'Je kunt je wachtwoord niet meer veranderen met dit commando.'
    email_cooldown_error: '&cEr is recent al een e-mail verzonden. Je moet %time wachten voordat je een nieuw bericht kunt versturen.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -99,6 +99,8 @@ email:
    send_failure: 'Nie można wysłać e-maila. Skontaktuj się z administracją.'
    change_password_expired: 'Nie zmienisz już hasła przy użyciu tej komendy.'
    email_cooldown_error: '&cE-mail został wysłany, musisz poczekać %time przed wysłaniem następnego.'
+    add_not_allowed: '&cMożliwość dodania adresu e-mail jest wyłączona.'
+    change_not_allowed: '&cMożliwość zmiany adresu e-mail jest wyłączona.'

 # Password recovery by email
 recovery:
@@ -99,6 +99,8 @@ email:
    send_failure: 'Não foi possivel enviar o email. Por favor contate um administrador.'
    change_password_expired: 'Você não pode mais alterar a sua password usando este comando.'
    email_cooldown_error: '&cUm email já foi enviado recentemente.Por favor, espere %time antes de enviar novamente'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -99,6 +99,8 @@ email:
    send_failure: 'Email-ul nu a putut fi trimis. Ta rugam contactatezi un administrator.'
    change_password_expired: 'Nu mai iti poti schimba parola folosind aceasta comanda.'
    email_cooldown_error: '&cAi primit deja un mail pentru schimbarea parolei. Trebuie sa astepti %time inainte de a trimite unul nou.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -79,7 +79,7 @@ on_join_validation:
    country_banned: '&4Вход с IP-адресов вашей страны запрещён на этом сервере.'
    not_owner_error: 'Вы не являетесь владельцем данной уч. записи. Выберите себе другое имя!'
    invalid_name_case: 'Неверное имя! Зайдите под именем %valid, а не %invalid.'
-    # TODO quick_command: 'You used a command too fast! Please, join the server again and wait more before using any command.'
+    quick_command: 'Вы вводили команды слишком часто! Пожалуйста заходите снова и вводите команды помедленнее.'

 # Email
 email:
@@ -99,6 +99,8 @@ email:
    send_failure: 'Письмо не может быть отправлено. Свяжитесь в администратором.'
    change_password_expired: 'Больше нельзя сменить свой пароль, используя эту команду.'
    email_cooldown_error: '&cПисьмо было отправлено недавно. Подождите %time, прежде чем отправить новое.'
+    add_not_allowed: '&cДобавление электронной почты не было разрешено.'
+    change_not_allowed: '&cИзменение электронной почты не было разрешено.'

 # Password recovery by email
 recovery:
@@ -117,8 +119,8 @@ captcha:
    usage_captcha: '&3Необходимо ввести текст с каптчи. Используйте «/captcha %captcha_code»'
    wrong_captcha: '&cНеверно! Используйте «/captcha %captcha_code».'
    valid_captcha: '&2Вы успешно решили каптчу!'
-    # 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'
+    captcha_for_registration: 'Чтобы зарегистрироваться, решите каптчу используя команду: «/captcha %captcha_code»'
+    register_captcha_valid: '&2Вы успешно решили каптчу! Теперь вы можете зарегистрироваться командой «/register»'

 # Verification code
 verification:
@@ -105,6 +105,8 @@ email:
    send_failure: 'Email nemohol byť poslaný. Prosím kontaktuj Administrátora.'
    change_password_expired: 'Už nemôžeš zmeniť svoje heslo týmto príkazom.'
    email_cooldown_error: '&cEmail bol nedávno poslaný. Musíš počkať %time predtým ako ti pošleme nový.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -99,6 +99,8 @@ email:
    send_failure: 'Eposta gonderilemedi. Yetkili ile iletisime gec.'
    # TODO change_password_expired: 'You cannot change your password using this command anymore.'
    email_cooldown_error: '&cKisa bir sure once eposta gonderildi. Yeni bir eposta almak icin %time beklemelisin.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -95,10 +95,12 @@ email:
    # 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.'
    already_used: '&4До цієї електронної пошти прив’язано забагато акаунтів!'
-    incomplete_settings: '&4[AuthMe] Error: Не всі необхідні налаштування є встановленими, щоб надсилати електронну пошту. Будь ласка, повідомте адміністратора!'
+    incomplete_settings: '&4Не всі необхідні налаштування є встановленими, щоб надсилати електронну пошту. Будь ласка, повідомте адміністратора!'
    # 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.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -99,6 +99,8 @@ email:
    send_failure: 'Không thể gửi thư. Vui lòng liên hệ với ban quản trị.'
    change_password_expired: '&cBạn không thể thay đổi mật khẩu bằng lệnh này từ nay.'
    email_cooldown_error: '&cMột bức thư đã được gửi gần đây. Bạn phải chờ %time trước khi có thể gửi một bức thư mới.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -99,6 +99,8 @@ email:
    send_failure: '邮件发送失败，请联系管理员'
    change_password_expired: '您不能使用此命令更改密码'
    email_cooldown_error: '&c邮件已在几分钟前发送，您需要等待 %time 后才能再次请求发送'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -102,6 +102,8 @@ email:
    send_failure: '&8[&6用戶系統&8] &c電郵系統錯誤，請聯絡伺服器管理員。 &7(err: smtperr)'
    change_password_expired: '&8[&6用戶系統&8] 此指令已過期，請重新辦理。'
    email_cooldown_error: '&8[&6用戶系統&8] &c你已經辦理過重寄郵件，請等待 %time 後再嘗試吧。'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -99,6 +99,8 @@ email:
    # 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.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery:
@@ -101,6 +101,8 @@ email:
    send_failure: '&b【AuthMe】&4無法傳送電子郵件，請聯絡管理員.'
    change_password_expired: '&b【AuthMe】&6您現在不能使用這個指令變更密碼了.'
    email_cooldown_error: '&b【AuthMe】&c電子郵件已經寄出了. 您只能在 %time 後才能傳送.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
+    # TODO change_not_allowed: '&cChanging email was not allowed'

 # Password recovery by email
 recovery: