#1055 Reorder message files and update translations page

2024-09-30 23:47:42 +02:00 · 2017-01-11 21:31:01 +01:00 · 2017-01-11 21:31:01 +01:00 · d81592512e
commit d81592512e
parent d68c73799b
29 changed files with 1811 additions and 1315 deletions
--- a/docs/translations.md
+++ b/docs/translations.md
@ -1,5 +1,5 @@
 <!-- AUTO-GENERATED FILE! Do not edit this directly -->
-<!-- File auto-generated on Sat Jan 07 11:07:02 CET 2017. See docs/translations/translations.tpl.md -->
+<!-- File auto-generated on Wed Jan 11 21:24:50 CET 2017. See docs/translations/translations.tpl.md -->

 # AuthMe Translations
 The following translations are available in AuthMe. Set `messagesLanguage` to the language code
@ -8,35 +8,35 @@ in your config.yml to use the language, or use another language code to start a
 Code | Language | Translated | &nbsp;
 ---- | -------- | ---------: | ------
 [en](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_en.yml) | English | 100% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ff66&w=100&h=5&txtpad=1" alt="bar" />
-[bg](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_bg.yml) | Bulgarian | 70% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb8800&w=70&h=5&txtpad=1" alt="bar" />
+[bg](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_bg.yml) | Bulgarian | 69% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb8800&w=69&h=5&txtpad=1" alt="bar" />
 [br](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_br.yml) | Brazilian | 100% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ff66&w=100&h=5&txtpad=1" alt="bar" />
 [cz](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_cz.yml) | Czech | 100% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ff66&w=100&h=5&txtpad=1" alt="bar" />
-[de](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_de.yml) | German | 93% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=77dd44&w=93&h=5&txtpad=1" alt="bar" />
-[es](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_es.yml) | Spanish | 99% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ee55&w=99&h=5&txtpad=1" alt="bar" />
-[eu](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_eu.yml) | Basque | 63% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb7700&w=63&h=5&txtpad=1" alt="bar" />
-[fi](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fi.yml) | Finnish | 67% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb8800&w=67&h=5&txtpad=1" alt="bar" />
-[fr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fr.yml) | French | 93% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=77dd44&w=93&h=5&txtpad=1" alt="bar" />
-[gl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_gl.yml) | Galician | 71% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb8800&w=71&h=5&txtpad=1" alt="bar" />
+[de](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_de.yml) | German | 100% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ff66&w=100&h=5&txtpad=1" alt="bar" />
+[es](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_es.yml) | Spanish | 100% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ff66&w=100&h=5&txtpad=1" alt="bar" />
+[eu](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_eu.yml) | Basque | 62% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb7700&w=62&h=5&txtpad=1" alt="bar" />
+[fi](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fi.yml) | Finnish | 66% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb7700&w=66&h=5&txtpad=1" alt="bar" />
+[fr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fr.yml) | French | 100% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ff66&w=100&h=5&txtpad=1" alt="bar" />
+[gl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_gl.yml) | Galician | 70% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb8800&w=70&h=5&txtpad=1" alt="bar" />
 [hu](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_hu.yml) | Hungarian | 99% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ee55&w=99&h=5&txtpad=1" alt="bar" />
-[id](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_id.yml) | Indonesian | 71% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb8800&w=71&h=5&txtpad=1" alt="bar" />
+[id](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_id.yml) | Indonesian | 70% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb8800&w=70&h=5&txtpad=1" alt="bar" />
 [it](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_it.yml) | Italian | 100% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ff66&w=100&h=5&txtpad=1" alt="bar" />
 [ko](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ko.yml) | Korean | 72% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb8800&w=72&h=5&txtpad=1" alt="bar" />
-[lt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_lt.yml) | Lithuanian | 54% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb6600&w=54&h=5&txtpad=1" alt="bar" />
-[nl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_nl.yml) | Dutch | 78% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb9900&w=78&h=5&txtpad=1" alt="bar" />
+[lt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_lt.yml) | Lithuanian | 53% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb6600&w=53&h=5&txtpad=1" alt="bar" />
+[nl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_nl.yml) | Dutch | 77% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb9900&w=77&h=5&txtpad=1" alt="bar" />
 [pl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pl.yml) | Polish | 100% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ff66&w=100&h=5&txtpad=1" alt="bar" />
-[pt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pt.yml) | Portuguese | 87% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=99bb22&w=87&h=5&txtpad=1" alt="bar" />
+[pt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pt.yml) | Portuguese | 86% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=99bb22&w=86&h=5&txtpad=1" alt="bar" />
 [ro](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ro.yml) | Romanian | 99% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ee55&w=99&h=5&txtpad=1" alt="bar" />
 [ru](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ru.yml) | Russian | 99% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ee55&w=99&h=5&txtpad=1" alt="bar" />
-[sk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_sk.yml) | Slovakian | 47% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aa5500&w=47&h=5&txtpad=1" alt="bar" />
-[tr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_tr.yml) | Turkish | 82% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aaaa11&w=82&h=5&txtpad=1" alt="bar" />
+[sk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_sk.yml) | Slovakian | 46% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aa5500&w=46&h=5&txtpad=1" alt="bar" />
+[tr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_tr.yml) | Turkish | 81% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aaaa11&w=81&h=5&txtpad=1" alt="bar" />
 [uk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_uk.yml) | Ukrainian | 93% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=77dd44&w=93&h=5&txtpad=1" alt="bar" />
-[vn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_vn.yml) | Vietnamese | 82% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aaaa11&w=82&h=5&txtpad=1" alt="bar" />
-[zhcn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhcn.yml) | Chinese (China) | 82% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aaaa11&w=82&h=5&txtpad=1" alt="bar" />
-[zhhk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhhk.yml) | Chinese (Hong Kong) | 82% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aaaa11&w=82&h=5&txtpad=1" alt="bar" />
+[vn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_vn.yml) | Vietnamese | 100% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ff66&w=100&h=5&txtpad=1" alt="bar" />
+[zhcn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhcn.yml) | Chinese (China) | 81% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aaaa11&w=81&h=5&txtpad=1" alt="bar" />
+[zhhk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhhk.yml) | Chinese (Hong Kong) | 81% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aaaa11&w=81&h=5&txtpad=1" alt="bar" />
 [zhmc](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhmc.yml) | Chinese (Macau) | 96% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ee55&w=96&h=5&txtpad=1" alt="bar" />
-[zhtw](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhtw.yml) | Chinese (Taiwan) | 82% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aaaa11&w=82&h=5&txtpad=1" alt="bar" />
+[zhtw](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhtw.yml) | Chinese (Taiwan) | 81% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aaaa11&w=81&h=5&txtpad=1" alt="bar" />


 ---

-This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sat Jan 07 11:07:02 CET 2017
+This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Wed Jan 11 21:24:50 CET 2017
--- a/src/main/resources/messages/messages_bg.yml
+++ b/src/main/resources/messages/messages_bg.yml
@ -1,42 +1,74 @@
-unknown_user: '&cПотребителя не е регистриран'
-unsafe_spawn: '&fТвоята локация когато излезе не беше безопасна, телепортиран си на Spawn!'
-not_logged_in: '&cНе си влязъл!'
+# Registration
+reg_msg: '&cМоля регистрирай се с "/register <парола> <парола>"'
+usage_reg: '&cКоманда: /register парола парола'
+reg_only: '&fСамо за регистрирани! Моля посети http://example.com за регистрация'
+# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
+registered: '&cУспешно премахната регистрация!'
+reg_disabled: '&cРегистрациите са изключени!'
+user_regged: '&cПотребителското име е заето!'
+
+# Password errors on registration
+password_error: '&fПаролата не съвпада'
+# TODO password_error_nick: '&cYou can''t use your name as password, please choose another one...'
+# TODO password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...'
+# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
+pass_len: '&cВашета парола не е достатъчно дълга или къса.'
+
+# Login
 usage_log: '&cКоманда: /login парола'
 wrong_pwd: '&cГрешна парола!'
-unregistered: '&cУспешно от-регистриран!'
-reg_disabled: '&cРегистрациите са изключени!'
-valid_session: '&aСесията продължена!'
 login: '&cВход успешен!'
-vb_nonActiv: '&fТвоята регистрация не е активирана, моля провери своя Имейл!'
-user_regged: '&cПотребителското име е заето!'
-usage_reg: '&cКоманда: /register парола парола'
-# TODO max_reg: Missing tags %reg_count, %max_acc, %reg_names
+login_msg: '&cМоля влез с "/login парола"'
+timeout: '&fВремето изтече, опитай отново!'
+
+# Errors
+unknown_user: '&cПотребителя не е регистриран'
+# TODO denied_command: '&cIn order to use this command you must be authenticated!'
+# TODO denied_chat: '&cIn order to chat you must be authenticated!'
+not_logged_in: '&cНе си влязъл!'
+# TODO tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
+# TODO: Missing tags %reg_count, %max_acc, %reg_names
 max_reg: '&fТи достигна максималния брой регистрации!'
 no_perm: '&cНямаш Достъп!'
 error: '&fПолучи се грешка; Моля свържете се с админ'
-login_msg: '&cМоля влез с "/login парола"'
-reg_msg: '&cМоля регистрирай се с "/register <парола> <парола>"'
+unsafe_spawn: '&fТвоята локация когато излезе не беше безопасна, телепортиран си на Spawn!'
+kick_forvip: '&cVIP влезе докато сървъра е пълен, ти беше изгонен!'
+
+# AntiBot
+# TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
+antibot_auto_enabled: '[AuthMe] AntiBotMod автоматично включен, открита е потенциална атака!'
+antibot_auto_disabled: '[AuthMe] AntiBotMod автоматично изключване след %m Минути.'
+
+# Other messages
+unregistered: '&cУспешно от-регистриран!'
+# TODO accounts_owned_self: 'You own %count accounts:'
+# TODO accounts_owned_other: 'The player %name has %count accounts:'
+# TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
+# 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'
+vb_nonActiv: '&fТвоята регистрация не е активирана, моля провери своя Имейл!'
 usage_unreg: '&cКоманда: /unregister парола'
 pwd_changed: '&cПаролата е променена!'
-password_error: '&fПаролата не съвпада'
-reg_only: '&fСамо за регистрирани! Моля посети http://example.com за регистрация'
 logged_in: '&cВече сте влязъл!'
 logout: '&cУспешен изход от регистрацията!'
-same_nick: '&fПотребител с този никнейм е в игра'
-registered: '&cУспешно премахната регистрация!'
-pass_len: '&cВашета парола не е достатъчно дълга или къса.'
 reload: '&fКонфигурацията презаредена!'
-timeout: '&fВремето изтече, опитай отново!'
 usage_changepassword: '&fКоманда: /changepassword СтараПарола НоваПарола'
+
+# Session messages
+# TODO invalid_session: '&cYour IP has been changed and your session data has expired!'
+valid_session: '&aСесията продължена!'
+
+# Error messages when joining
 name_len: '&cТвоя никнейм е твърде малък или голям'
 regex: '&cТвоя никнейм съдържа забранени знацхи. Позволените са: REG_EX'
-add_email: '&cМоля добави своя имейл с : /email add имейл имейл'
-recovery_email: '&cЗабравихте своята парола? Моля използвай /email recovery <имейл>'
-usage_captcha: '&cYou need to type a captcha, please type: /captcha <theCaptcha>'
-wrong_captcha: '&cГрешен код, използвай : /captcha THE_CAPTCHA'
-valid_captcha: '&cТвоя код е валиден!'
-kick_forvip: '&cVIP влезе докато сървъра е пълен, ти беше изгонен!'
+country_banned: 'Твоята държава е забранена в този сървър!'
+# TODO not_owner_error: 'You are not the owner of this account. Please choose another name!'
 kick_fullserver: '&cСървъра е пълен, Съжеляваме!'
+same_nick: '&fПотребител с този никнейм е в игра'
+# TODO invalid_name_case: 'You should join using username %valid, not %invalid.'
+# TODO same_ip_online: 'A player with the same IP is already in game!'
+
+# Email
 usage_email_add: '&fКоманда: /email add <email> <confirmEmail> '
 usage_email_change: '&fКоманда: /email change <СтарИмейл> <НовИмейл> '
 usage_email_recovery: '&fКоманда: /email recovery <имейл>'
@ -47,29 +79,16 @@ email_added: '[AuthMe] Имейла добавен !'
 email_confirm: '[AuthMe] Потвърди своя имейл !'
 email_changed: '[AuthMe] Имейла е сменен !'
 email_send: '[AuthMe] Изпраен е имейл !'
-country_banned: 'Твоята държава е забранена в този сървър!'
-antibot_auto_enabled: '[AuthMe] AntiBotMod автоматично включен, открита е потенциална атака!'
-antibot_auto_disabled: '[AuthMe] AntiBotMod автоматично изключване след %m Минути.'
-# TODO denied_command: '&cIn order to use this command you must be authenticated!'
-# TODO same_ip_online: 'A player with the same IP is already in game!'
-# TODO denied_chat: '&cIn order to chat you must be authenticated!'
-# TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
-# TODO password_error_nick: '&cYou can''t use your name as password, please choose another one...'
-# TODO password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...'
-# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
-# TODO invalid_session: '&cYour IP has been changed and your session data has expired!'
-# 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_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:'
-# TODO email_already_used: '&4The email address is already being used'
-# TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
-# 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 tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
-# TODO accounts_owned_self: 'You own %count accounts:'
-# TODO accounts_owned_other: 'The player %name has %count accounts:'
-# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
+# TODO email_show: '&2Your current email address is: &f%email'
 # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.'
+# TODO email_already_used: '&4The email address is already being used'
 # 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'
+# TODO show_no_email: '&2You currently don''t have email address associated with this account.'
+add_email: '&cМоля добави своя имейл с : /email add имейл имейл'
+recovery_email: '&cЗабравихте своята парола? Моля използвай /email recovery <имейл>'
+
+# Captcha
+usage_captcha: '&cYou need to type a captcha, please type: /captcha <theCaptcha>'
+wrong_captcha: '&cГрешен код, използвай : /captcha THE_CAPTCHA'
+valid_captcha: '&cТвоя код е валиден!'
--- a/src/main/resources/messages/messages_br.yml
+++ b/src/main/resources/messages/messages_br.yml
@ -1,52 +1,77 @@
 #Tradução pt/br Authme Reloaded
 #Feito por GabrielDev(DeathRush) e Frani (PotterCraft_)
 # http://gamersboard.com.br/ | www.magitechserver.com
-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: '&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!'
-usage_log: '&cUse: /login <senha>'
-wrong_pwd: '&cSenha incorreta!'
-unregistered: '&cConta deletada!'
-reg_disabled: '&cO registro está desativado nesse servidor!'
-valid_session: '&2Você deslogou recentemente, então sua sessão foi resumida!'
-login: '&2Login realizado com sucesso!'
-vb_nonActiv: '&cA sua conta ainda não está ativada, por favor, verifique seus e-mails!'
-user_regged: '&cVocê já registrou este nome de usuário!'
-usage_reg: '&cUse: /register <senha> <senha>'
-max_reg: '&cVocê excedeu o número máximo de inscrições (%reg_count/%max_acc %reg_names) do seu IP!'
-no_perm: '&4Você não tem permissão para executar esta ação!'
-error: '&4Ocorreu um erro inesperado, por favor contacte um administrador!'
-login_msg: '&cPor favor, faça o login com o comando "/login <senha>"'
+
+# Registration
 reg_msg: '&3Por favor, registre-se com o comando "/register <senha> <senha>"'
-usage_unreg: '&cUse: /unregister <senha>'
-pwd_changed: '&2Senha alterada com sucesso!'
+usage_reg: '&cUse: /register <senha> <senha>'
+reg_only: '&4Somente usuários registrados podem entrar no servidor! Por favor visite www.seusite.com para se registrar!'
+kicked_admin_registered: 'Um administrador registrou você, por favor faça login novamente'
+registered: '&2Registrado com êxito!'
+reg_disabled: '&cO registro está desativado nesse servidor!'
+user_regged: '&cVocê já registrou este nome de usuário!'
+
+# Password errors on registration
 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...'
 password_error_chars: '&Sua senha contém caracteres ilegais. caracteres permitidos: REG_EX'
-invalid_session: '&O seu IP foi alterado e sua sessão expirou!'
-reg_only: '&4Somente usuários registrados podem entrar no servidor! Por favor visite www.seusite.com para se registrar!'
+pass_len: '&cSua senha é muito curta ou muito longa! Por favor, tente com outra!'
+
+# Login
+usage_log: '&cUse: /login <senha>'
+wrong_pwd: '&cSenha incorreta!'
+login: '&2Login realizado com sucesso!'
+login_msg: '&cPor favor, faça o login com o comando "/login <senha>"'
+timeout: '&4Tempo limite de sessão excedido, você foi expulso do servidor, por favor, tente novamente!'
+
+# Errors
+unknown_user: '&cEste usuário não está registrado!'
+denied_command: '&cPara utilizar este comando é necessário estar logado!'
+denied_chat: '&cPara utilizar o chat, você deve estar logado!'
+not_logged_in: '&cVocê não está logado!'
+tempban_max_logins: '&cVocê foi temporariamente banido por tentar logar muitas vezes.'
+max_reg: '&cVocê excedeu o número máximo de inscrições (%reg_count/%max_acc %reg_names) do seu IP!'
+no_perm: '&4Você não tem permissão para executar esta ação!'
+error: '&4Ocorreu um erro inesperado, por favor contacte um administrador!'
+unsafe_spawn: '&cVocê deslogou em um local inseguro e foi teleportado parao Spawn do servidor!'
+kick_forvip: '&3Um jogador VIP juntou-se ao servidor enquanto ele estava cheio!'
+
+# AntiBot
+kick_antibot: 'O AntiBot está ativo, espere alguns minutos antes de entrar no servidor!'
+antibot_auto_enabled: '&4O AntiBot foi ativado devido ao grande número de conexões!'
+antibot_auto_disabled: '&2Desativando o AntiBot passados %m minutos!'
+
+# Other messages
+unregistered: '&cConta deletada!'
+accounts_owned_self: 'Vecê tem %count contas:'
+accounts_owned_other: 'O jogador %name tem %count contas:'
+two_factor_create: '&2O seu código secreto é %code. Você pode verificá-lo a partir daqui %url'
+recovery_code_sent: 'Um código de recuperação para redefinir sua senha foi enviada para o seu e-mail.'
+recovery_code_incorrect: 'O código de recuperação esta incorreto! Use /email recovery [email] para gerar um novo!'
+vb_nonActiv: '&cA sua conta ainda não está ativada, por favor, verifique seus e-mails!'
+usage_unreg: '&cUse: /unregister <senha>'
+pwd_changed: '&2Senha alterada com sucesso!'
 logged_in: '&cVocê já está logado!'
 logout: '&2Desconectado com sucesso!'
-same_nick: '&4O mesmo nome de usuário já está jogando no servidor!'
-registered: '&2Registrado com êxito!'
-pass_len: '&cSua senha é muito curta ou muito longa! Por favor, tente com outra!'
 reload: '&2Configuração e o banco de dados foram recarregados corretamente!'
-timeout: '&4Tempo limite de sessão excedido, você foi expulso do servidor, por favor, tente novamente!'
 usage_changepassword: '&cUse: /changepassword <senhaVelha> <senhaNova>'
+
+# Session messages
+invalid_session: '&O seu IP foi alterado e sua sessão expirou!'
+valid_session: '&2Você deslogou recentemente, então sua sessão foi resumida!'
+
+# Error messages when joining
 name_len: '&4Seu nome de usuário ou é muito curto ou muito longo!'
 regex: '&4Seu nome de usuário contém caracteres inválidos. Caracteres permitidos: REG_EX'
-add_email: '&3Por favor, adicione seu e-mail para a sua conta com o comando "/email add <seuEmail> <seuEmail>"'
-recovery_email: '&3Esqueceu sua senha? Por favor, use o comando "/email recovery <seuEmail>"'
-usage_captcha: '&3Para iniciar sessão você tem que resolver um código captcha, utilize o comando "/captcha <theCaptcha>"'
-wrong_captcha: '&cCaptcha errado, por favor, escreva "/captcha THE_CAPTCHA" no chat!'
-valid_captcha: '&2Código Captcha resolvido corretamente!'
-kick_forvip: '&3Um jogador VIP juntou-se ao servidor enquanto ele estava cheio!'
+country_banned: '&4O seu país está banido neste servidor!'
+not_owner_error: 'Você não é o proprietário da conta. Por favor, escolha outro nome!'
 kick_fullserver: '&4O servidor está cheio, tente novamente mais tarde!'
+same_nick: '&4O mesmo nome de usuário já está jogando no servidor!'
+invalid_name_case: 'Você deve se juntar usando nome de usuário %valid, não %invalid.'
+same_ip_online: 'Um jogador com o mesmo IP já está no servidor!'
+
+# Email
 usage_email_add: '&cUse: /email add <email> <email>'
 usage_email_change: '&cUse: /email change <emailAntigo> <novoEmail>'
 usage_email_recovery: '&cUse: /email recovery <Email>'
@ -59,19 +84,14 @@ email_changed: '&2Troca de email com sucesso.!'
 email_send: '&2Recuperação de email enviada com sucesso! Por favor, verifique sua caixa de entrada de e-mail!'
 email_exists: '&cUm e-mail de recuperação já foi enviado! Você pode descartá-lo e enviar um novo usando o comando abaixo:'
 email_show: '&2O seu endereço de e-mail atual é: &f%email'
-show_no_email: '&2Você atualmente não têm endereço de e-mail associado a esta conta.'
-country_banned: '&4O seu país está banido neste servidor!'
-antibot_auto_enabled: '&4O AntiBot foi ativado devido ao grande número de conexões!'
-antibot_auto_disabled: '&2Desativando o AntiBot passados %m minutos!'
-email_already_used: '&4O endereço de e-mail já está sendo usado'
-two_factor_create: '&2O seu código secreto é %code. Você pode verificá-lo a partir daqui %url'
-not_owner_error: 'Você não é o proprietário da conta. Por favor, escolha outro nome!'
-invalid_name_case: 'Você deve se juntar usando nome de usuário %valid, não %invalid.'
-tempban_max_logins: '&cVocê foi temporariamente banido por tentar logar muitas vezes.'
-accounts_owned_self: 'Vecê tem %count contas:'
-accounts_owned_other: 'O jogador %name tem %count contas:'
-kicked_admin_registered: 'Um administrador registrou você, por favor faça login novamente'
 incomplete_email_settings: 'Erro: Nem todas as configurações necessárias estão definidas para o envio de e-mails. Entre em contato com um administrador.'
-recovery_code_sent: 'Um código de recuperação para redefinir sua senha foi enviada para o seu e-mail.'
-recovery_code_incorrect: 'O código de recuperação esta incorreto! Use /email recovery [email] para gerar um novo!'
+email_already_used: '&4O endereço de e-mail já está sendo usado'
 email_send_failure: '&cO e-mail não pôde ser enviado, reporte isso a um administrador!'
+show_no_email: '&2Você atualmente não têm endereço de e-mail associado a esta conta.'
+add_email: '&3Por favor, adicione seu e-mail para a sua conta com o comando "/email add <seuEmail> <seuEmail>"'
+recovery_email: '&3Esqueceu sua senha? Por favor, use o comando "/email recovery <seuEmail>"'
+
+# Captcha
+usage_captcha: '&3Para iniciar sessão você tem que resolver um código captcha, utilize o comando "/captcha <theCaptcha>"'
+wrong_captcha: '&cCaptcha errado, por favor, escreva "/captcha THE_CAPTCHA" no chat!'
+valid_captcha: '&2Código Captcha resolvido corretamente!'
--- a/src/main/resources/messages/messages_cz.yml
+++ b/src/main/resources/messages/messages_cz.yml
@ -1,49 +1,73 @@
-denied_command: '&cPokud chceš použít tento příkaz musíš být přihlášen/registrován!'
-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: '&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ý!'
-usage_log: '&cPoužij: "/login TvojeHeslo".'
-wrong_pwd: '&cŠpatné heslo.'
-unregistered: '&cÚspěšně odregistrován!'
-reg_disabled: '&cRegistrace je zakázána!'
-valid_session: '&cAutomatické znovupřihlášení.'
-login: '&cÚspěšně přihlášen!'
-vb_nonActiv: '&cTvůj účet není aktivovaný, zkontroluj si svůj E-mail.'
-user_regged: '&cUživatelské jméno je již zaregistrováno.'
-usage_reg: '&cPoužij: "/register heslo ZnovuHeslo".'
-max_reg: '&cPřekročil(a) jsi limit pro počet účtů (%reg_count/%max_acc %reg_names) z jedné IP adresy.'
-no_perm: '&cNa tento příkaz nemáš dostatečné pravomoce.'
-error: '&cVyskytla se chyba - kontaktujte prosím administrátora ...'
-login_msg: '&cProsím přihlaš se pomocí "/login TvojeHeslo".'
+# Registration
 reg_msg: '&cProsím zaregistruj se pomocí "/register <heslo> <ZnovuHeslo>"'
-usage_unreg: '&cPoužij: "/unregister TvojeHeslo".'
-pwd_changed: '&cHeslo změněno!'
+usage_reg: '&cPoužij: "/register heslo ZnovuHeslo".'
+reg_only: '&cServer je pouze pro registrované! Navštiv náší webovou stránku http://example.com.'
+kicked_admin_registered: 'Admin vás právě zaregistroval; Přihlašte se prosím znovu.'
+registered: '&cÚspěšně zaregistrován!'
+reg_disabled: '&cRegistrace je zakázána!'
+user_regged: '&cUživatelské jméno je již zaregistrováno.'
+
+# Password errors on registration
 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...'
 password_error_chars: '&4Tvoje heslo obsahuje nepovolené znaky. Přípustné znaky jsou: REG_EX'
-invalid_session: '&cChybná data při čtení, počkejte do vypršení.'
-reg_only: '&cServer je pouze pro registrované! Navštiv náší webovou stránku http://example.com.'
+pass_len: '&cTvoje heslo nedosahuje minimální délky (4).'
+
+# Login
+usage_log: '&cPoužij: "/login TvojeHeslo".'
+wrong_pwd: '&cŠpatné heslo.'
+login: '&cÚspěšně přihlášen!'
+login_msg: '&cProsím přihlaš se pomocí "/login TvojeHeslo".'
+timeout: '&cČas pro přihlášení vypršel!'
+
+# Errors
+unknown_user: '&cUživatelské jméno není zaregistrováno.'
+denied_command: '&cPokud chceš použít tento příkaz musíš být přihlášen/registrován!'
+denied_chat: '&cNemůžeš psát do chatu dokuď se nepřihlásíš/nezaregistruješ!'
+not_logged_in: '&cNejsi přihlášený!'
+tempban_max_logins: '&cByl jsi dočasně zabanován za příliš mnoho neúspěšných pokusů o přihlášení.'
+max_reg: '&cPřekročil(a) jsi limit pro počet účtů (%reg_count/%max_acc %reg_names) z jedné IP adresy.'
+no_perm: '&cNa tento příkaz nemáš dostatečné pravomoce.'
+error: '&cVyskytla se chyba - kontaktujte prosím administrátora ...'
+unsafe_spawn: '&cTvoje pozice při posledním odpojení byla nebezpečná, teleportuji tě proto na spawn!'
+kick_forvip: '&cOmlouváme se, ale VIP hráč se připojil na plný server!'
+
+# AntiBot
+kick_antibot: 'Bezpečnostní mód AntiBot je zapnut! Musíš počkat několik minut než se budeš moct připojit znovu na server.'
+antibot_auto_enabled: '[AuthMe] AntiBotMod automaticky spuštěn z důvodu masivních připojení!'
+antibot_auto_disabled: '[AuthMe] AntiBotMod automaticky ukončen po %m minutách, doufejme v konec invaze'
+
+# Other messages
+unregistered: '&cÚspěšně odregistrován!'
+accounts_owned_self: 'Vlastníš tyto účty (%count):'
+accounts_owned_other: 'Hráč %name vlastní tyto účty (%count):'
+two_factor_create: '&2Tvůj tajný kód je %code. Můžeš ho oskenovat zde %url'
+recovery_code_sent: 'Kód pro obnovení hesla byl odeslán na váš email.'
+recovery_code_incorrect: 'Kód pro není správný! Použijte příkaz /email recovery [email] pro vygenerování nového.'
+vb_nonActiv: '&cTvůj účet není aktivovaný, zkontroluj si svůj E-mail.'
+usage_unreg: '&cPoužij: "/unregister TvojeHeslo".'
+pwd_changed: '&cHeslo změněno!'
 logged_in: '&cJsi již přihlášen!'
 logout: '&cÚspěšně jsi se odhlásil.'
-same_nick: '&cUživatel s tímto jménem již hraje na serveru.'
-registered: '&cÚspěšně zaregistrován!'
-pass_len: '&cTvoje heslo nedosahuje minimální délky (4).'
 reload: '&cZnovu načtení nastavení AuthMe proběhlo úspěšně.'
-timeout: '&cČas pro přihlášení vypršel!'
 usage_changepassword: '&cPoužij: "/changepassword StaréHeslo NovéHeslo".'
+
+# Session messages
+invalid_session: '&cChybná data při čtení, počkejte do vypršení.'
+valid_session: '&cAutomatické znovupřihlášení.'
+
+# Error messages when joining
 name_len: '&cTvůj nick je přílíš krátký, nebo přílíš dlouhý'
 regex: '&cTvůj nick obsahuje nepovolené znaky. Přípustné znaky jsou: REG_EX'
-add_email: '&cPřidej prosím svůj email pomocí : /email add TvůjEmail TvůjEmail'
-recovery_email: '&cZapomněl jsi heslo? Napiš: /email recovery <TvůjEmail>'
-usage_captcha: '&cPoužij: /captcha <theCaptcha>'
-wrong_captcha: '&cŠpatné opsana Captcha, pouzij prosim: /captcha THE_CAPTCHA'
-valid_captcha: '&cZadaná captcha je v pořádku!'
-kick_forvip: '&cOmlouváme se, ale VIP hráč se připojil na plný server!'
+country_banned: 'Vaše země je na tomto serveru zakázána'
+not_owner_error: 'Nejsi majitelem tohoto účtu, prosím zvol si jiné jméno!'
 kick_fullserver: '&cServer je momentálně plný, zkus to prosím později!'
+same_nick: '&cUživatel s tímto jménem již hraje na serveru.'
+invalid_name_case: 'Měl by jsi použít jméno %valid, ne jméno %invalid.'
+same_ip_online: 'Hráč se stejnou IP adresou nyní hraje na serveru!'
+
+# Email
 usage_email_add: '&fPoužij: /email add <email> <potvrzení_emailu>'
 usage_email_change: '&fPoužij: /email change <StarýEmail> <NovýEmail>'
 usage_email_recovery: '&fPoužij: /email recovery <Email>'
@ -56,19 +80,14 @@ email_changed: '[AuthMe] Email změněn!'
 email_send: '[AuthMe] Email pro obnovení hesla odeslán!'
 email_exists: '&cNový email byl odeslán! Můžeš ho zahodit a poslat jiný pomocí tohoto příkazu:'
 email_show: '&2Váš aktuální email je: &f%email'
-show_no_email: '&2K tomuto účtu nemáte přidanou žádnou emailovou adresu.'
-country_banned: 'Vaše země je na tomto serveru zakázána'
-antibot_auto_enabled: '[AuthMe] AntiBotMod automaticky spuštěn z důvodu masivních připojení!'
-antibot_auto_disabled: '[AuthMe] AntiBotMod automaticky ukončen po %m minutách, doufejme v konec invaze'
-email_already_used: '&4Tato emailová adresa je již používána'
-two_factor_create: '&2Tvůj tajný kód je %code. Můžeš ho oskenovat zde %url'
-not_owner_error: 'Nejsi majitelem tohoto účtu, prosím zvol si jiné jméno!'
-invalid_name_case: 'Měl by jsi použít jméno %valid, ne jméno %invalid.'
-tempban_max_logins: '&cByl jsi dočasně zabanován za příliš mnoho neúspěšných pokusů o přihlášení.'
-accounts_owned_self: 'Vlastníš tyto účty (%count):'
-accounts_owned_other: 'Hráč %name vlastní tyto účty (%count):'
-kicked_admin_registered: 'Admin vás právě zaregistroval; Přihlašte se prosím znovu.'
 incomplete_email_settings: 'Chyba: chybí některé důležité informace pro odeslání emailu. Kontaktujte prosím admina.'
+email_already_used: '&4Tato emailová adresa je již používána'
 email_send_failure: 'Email nemohl být odeslán. Kontaktujte prosím admina.'
-recovery_code_sent: 'Kód pro obnovení hesla byl odeslán na váš email.'
-recovery_code_incorrect: 'Kód pro není správný! Použijte příkaz /email recovery [email] pro vygenerování nového.'
+show_no_email: '&2K tomuto účtu nemáte přidanou žádnou emailovou adresu.'
+add_email: '&cPřidej prosím svůj email pomocí : /email add TvůjEmail TvůjEmail'
+recovery_email: '&cZapomněl jsi heslo? Napiš: /email recovery <TvůjEmail>'
+
+# Captcha
+usage_captcha: '&cPoužij: /captcha <theCaptcha>'
+wrong_captcha: '&cŠpatné opsana Captcha, pouzij prosim: /captcha THE_CAPTCHA'
+valid_captcha: '&cZadaná captcha je v pořádku!'
--- a/src/main/resources/messages/messages_de.yml
+++ b/src/main/resources/messages/messages_de.yml
@ -1,45 +1,73 @@
-unknown_user: '&cBenutzername nicht registriert!'
-unsafe_spawn: '&cDeine Logoutposition war unsicher, du wurdest zum Spawn teleportiert'
-not_logged_in: '&cNicht eingeloggt!'
-usage_log: '&cBenutze: /login <passwort>'
-wrong_pwd: '&cFalsches Passwort'
-unregistered: '&cBenutzerkonto erfolgreich gelöscht!'
-reg_disabled: '&cRegistrierungen sind deaktiviert'
-valid_session: '&2Erfolgreich eingeloggt!'
-login: '&2Erfolgreich eingeloggt!'
-vb_nonActiv: '&cDein Account wurde noch nicht aktiviert. Bitte prüfe deine E-Mails!'
-user_regged: '&cDieser Benutzername ist schon vergeben'
-usage_reg: '&cBenutze: /register <passwort> <passwortBestätigen>'
-max_reg: '&cDu hast die maximale Anzahl an Accounts erreicht (%reg_count/%max_acc %reg_names).'
-no_perm: '&4Du hast keine Rechte, um diese Aktion auszuführen!'
-error: '&4Ein Fehler ist aufgetreten. Bitte kontaktiere einen Administrator.'
-login_msg: '&cBitte logge dich ein mit "/login <passwort>"'
+# Registration
 reg_msg: '&3Bitte registriere dich mit "/register <passwort> <passwortBestätigen>"'
-usage_unreg: '&cBenutze: /unregister <passwort>'
-pwd_changed: '&2Passwort geändert!'
+usage_reg: '&cBenutze: /register <passwort> <passwortBestätigen>'
+reg_only: '&4Nur für registrierte Spieler! Bitte besuche http://example.com um dich zu registrieren.'
+kicked_admin_registered: 'Ein Administrator hat dich bereits registriert; bitte logge dich erneut ein.'
+registered: '&2Erfolgreich registriert!'
+reg_disabled: '&cRegistrierungen sind deaktiviert'
+user_regged: '&cDieser Benutzername ist schon vergeben'
+
+# Password errors on registration
 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.'
 password_error_chars: '&4Dein Passwort enthält unerlaubte Zeichen. Zulässige Zeichen: REG_EX'
-invalid_session: '&cUngültige Session. Bitte starte das Spiel neu oder warte, bis die Session abgelaufen ist.'
-reg_only: '&4Nur für registrierte Spieler! Bitte besuche http://example.com um dich zu registrieren.'
+pass_len: '&cDein Passwort ist zu kurz oder zu lang!'
+
+# Login
+usage_log: '&cBenutze: /login <passwort>'
+wrong_pwd: '&cFalsches Passwort'
+login: '&2Erfolgreich eingeloggt!'
+login_msg: '&cBitte logge dich ein mit "/login <passwort>"'
+timeout: '&4Zeitüberschreitung beim Login'
+
+# Errors
+unknown_user: '&cBenutzername nicht registriert!'
+denied_command: '&cUm diesen Befehl zu nutzen musst du authentifiziert sein!'
+denied_chat: '&cDu musst eingeloggt sein, um chatten zu können!'
+not_logged_in: '&cNicht eingeloggt!'
+tempban_max_logins: '&cDu bist wegen zu vielen fehlgeschlagenen Login-Versuchen temporär gebannt!'
+max_reg: '&cDu hast die maximale Anzahl an Accounts erreicht (%reg_count/%max_acc %reg_names).'
+no_perm: '&4Du hast keine Rechte, um diese Aktion auszuführen!'
+error: '&4Ein Fehler ist aufgetreten. Bitte kontaktiere einen Administrator.'
+unsafe_spawn: '&cDeine Logoutposition war unsicher, du wurdest zum Spawn teleportiert'
+kick_forvip: '&3Ein VIP-Spieler hat den vollen Server betreten!'
+
+# AntiBot
+kick_antibot: 'AntiBotMod ist aktiviert! Bitte warte einige Minuten, bevor du dich mit dem Server verbindest.'
+antibot_auto_enabled: '&4[AntiBotService] AntiBotMod wurde aufgrund hoher Netzauslastung automatisch aktiviert!'
+antibot_auto_disabled: '&2[AntiBotService] AntiBotMod wurde nach %m Minuten deaktiviert, hoffentlich ist die Invasion vorbei.'
+
+# Other messages
+unregistered: '&cBenutzerkonto erfolgreich gelöscht!'
+accounts_owned_self: 'Du besitzt %count Accounts:'
+accounts_owned_other: 'Der Spieler %name hat %count Accounts:'
+two_factor_create: '&2Dein geheimer Code ist %code. Du kannst ihn hier abfragen: %url'
+recovery_code_sent: 'Ein Wiederherstellungscode zum Zurücksetzen deines Passworts wurde an deine E-Mail-Adresse geschickt.'
+recovery_code_incorrect: 'Der Wiederherstellungscode stimmt nicht! Nutze /email recovery [email] um einen neuen zu generieren.'
+vb_nonActiv: '&cDein Account wurde noch nicht aktiviert. Bitte prüfe deine E-Mails!'
+usage_unreg: '&cBenutze: /unregister <passwort>'
+pwd_changed: '&2Passwort geändert!'
 logged_in: '&cBereits eingeloggt!'
 logout: '&2Erfolgreich ausgeloggt'
-same_nick: '&4Jemand mit diesem Namen spielt bereits auf dem Server!'
-registered: '&2Erfolgreich registriert!'
-pass_len: '&cDein Passwort ist zu kurz oder zu lang!'
 reload: '&2Konfiguration und Datenbank wurden erfolgreich neu geladen.'
-timeout: '&4Zeitüberschreitung beim Login'
 usage_changepassword: '&cBenutze: /changepassword <altesPasswort> <neuesPasswort>'
+
+# Session messages
+invalid_session: '&cUngültige Session. Bitte starte das Spiel neu oder warte, bis die Session abgelaufen ist.'
+valid_session: '&2Erfolgreich eingeloggt!'
+
+# Error messages when joining
 name_len: '&4Dein Nickname ist zu kurz oder zu lang.'
 regex: '&4Dein Nickname enthält unerlaubte Zeichen. Zulässige Zeichen: REG_EX'
-add_email: '&3Bitte hinterlege deine E-Mail-Adresse: /email add <deineEmail> <emailBestätigen>'
-recovery_email: '&3Passwort vergessen? Nutze "/email recovery <deineEmail>" für ein neues Passwort'
-usage_captcha: '&3Um dich einzuloggen, tippe dieses Captcha so ein: /captcha <theCaptcha>'
-wrong_captcha: '&cFalsches Captcha, bitte nutze: /captcha THE_CAPTCHA'
-valid_captcha: '&2Das Captcha ist korrekt!'
-kick_forvip: '&3Ein VIP-Spieler hat den vollen Server betreten!'
+country_banned: '&4Dein Land ist gesperrt!'
+not_owner_error: 'Du bist nicht der Besitzer dieses Accounts. Bitte wähle einen anderen Namen!'
 kick_fullserver: '&4Der Server ist momentan voll, Sorry!'
+same_nick: '&4Jemand mit diesem Namen spielt bereits auf dem Server!'
+invalid_name_case: 'Dein registrierter Benutzername ist &2%valid&f - nicht &4%invalid&f.'
+same_ip_online: 'Ein Spieler mit derselben IP ist bereits online!'
+
+# Email
 usage_email_add: '&cBenutze: /email add <email> <bestätigeEmail>'
 usage_email_change: '&cBenutze: /email change <alteEmail> <neueEmail>'
 usage_email_recovery: '&cBenutze: /email recovery <Email>'
@ -51,24 +79,15 @@ email_confirm: '&cBitte bestätige deine E-Mail!'
 email_changed: '&2E-Mail aktualisiert!'
 email_send: '&2Wiederherstellungs-E-Mail wurde gesendet!'
 email_exists: '&cEine Wiederherstellungs-E-Mail wurde bereits versandt! Nutze folgenden Befehl um eine neue E-Mail zu versenden:'
-country_banned: '&4Dein Land ist gesperrt!'
-antibot_auto_enabled: '&4[AntiBotService] AntiBotMod wurde aufgrund hoher Netzauslastung automatisch aktiviert!'
-antibot_auto_disabled: '&2[AntiBotService] AntiBotMod wurde nach %m Minuten deaktiviert, hoffentlich ist die Invasion vorbei.'
-kick_antibot: 'AntiBotMod ist aktiviert! Bitte warte einige Minuten, bevor du dich mit dem Server verbindest.'
-two_factor_create: '&2Dein geheimer Code ist %code. Du kannst ihn hier abfragen: %url'
-email_already_used: '&4Diese E-Mail-Adresse wird bereits genutzt.'
-invalid_name_case: 'Dein registrierter Benutzername ist &2%valid&f - nicht &4%invalid&f.'
-not_owner_error: 'Du bist nicht der Besitzer dieses Accounts. Bitte wähle einen anderen Namen!'
-denied_chat: '&cDu musst eingeloggt sein, um chatten zu können!'
-same_ip_online: 'Ein Spieler mit derselben IP ist bereits online!'
-denied_command: '&cUm diesen Befehl zu nutzen musst du authentifiziert sein!'
-tempban_max_logins: '&cDu bist wegen zu vielen fehlgeschlagenen Login-Versuchen temporär gebannt!'
-accounts_owned_self: 'Du besitzt %count Accounts:'
-accounts_owned_other: 'Der Spieler %name hat %count Accounts:'
-incomplete_email_settings: 'Fehler: Es wurden nicht alle notwendigen Einstellungen vorgenommen, um E-Mails zu senden. Bitte kontaktiere einen Administrator.'
-kicked_admin_registered: 'Ein Administrator hat dich bereits registriert; bitte logge dich erneut ein.'
 email_show: '&2Deine aktuelle E-Mail-Adresse ist: &f%email'
-show_no_email: '&2Du hast zur Zeit keine E-Mail-Adresse für deinen Account hinterlegt.'
+incomplete_email_settings: 'Fehler: Es wurden nicht alle notwendigen Einstellungen vorgenommen, um E-Mails zu senden. Bitte kontaktiere einen Administrator.'
+email_already_used: '&4Diese E-Mail-Adresse wird bereits genutzt.'
 email_send_failure: 'Die E-Mail konnte nicht gesendet werden. Bitte kontaktiere einen Administrator.'
-recovery_code_sent: 'Ein Wiederherstellungscode zum Zurücksetzen deines Passworts wurde an deine E-Mail-Adresse geschickt.'
-recovery_code_incorrect: 'Der Wiederherstellungscode stimmt nicht! Nutze /email recovery [email] um einen neuen zu generieren.'
+show_no_email: '&2Du hast zur Zeit keine E-Mail-Adresse für deinen Account hinterlegt.'
+add_email: '&3Bitte hinterlege deine E-Mail-Adresse: /email add <deineEmail> <emailBestätigen>'
+recovery_email: '&3Passwort vergessen? Nutze "/email recovery <deineEmail>" für ein neues Passwort'
+
+# Captcha
+usage_captcha: '&3Um dich einzuloggen, tippe dieses Captcha so ein: /captcha <theCaptcha>'
+wrong_captcha: '&cFalsches Captcha, bitte nutze: /captcha THE_CAPTCHA'
+valid_captcha: '&2Das Captcha ist korrekt!'
--- a/src/main/resources/messages/messages_es.yml
+++ b/src/main/resources/messages/messages_es.yml
@ -1,45 +1,76 @@
 # This file must be in ANSI if win, or UTF-8 if linux.
-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!'
+
+# Registration
+reg_msg: '&cPor favor, regístrate con "/register <contraseña> <confirmarContraseña">'
+usage_reg: '&cUso: /register Contraseña ConfirmarContraseña'
+reg_only: '&f¡Sólo para jugadores registrados! Por favor visita http://www.example.com/ para registrarte'
+kicked_admin_registered: 'Un administrador te acaba de registrar; entra en la cuenta de nuevo'
+registered: '&c¡Registrado correctamente!'
+reg_disabled: '&cEl registro está desactivado'
+user_regged: '&cUsuario ya registrado'
+
+# Password errors on registration
+password_error: '&fLas contraseñas no son iguales'
+password_error_nick: '&cNo puedes utilizar tu nombre como contraseña, por favor elige otra...'
+password_error_unsafe: '&cLa contraseña elejida no es segura, por favor elige otra...'
+password_error_chars: '&cTu contraseña tiene carácteres no admitidos, los cuales son: REG_EX'
+pass_len: '&fTu contraseña es muy larga o muy corta'
+
+# Login
 usage_log: '&cUso: /login contraseña'
 wrong_pwd: '&cContraseña incorrecta'
-unregistered: '&c¡Cuenta eliminada del registro!'
-reg_disabled: '&cEl registro está desactivado'
-valid_session: '&cInicio de sesión'
 login: '&c¡Sesión iniciada!'
-vb_nonActiv: '&fTu cuenta no está activada aún, ¡revisa tu correo!'
-user_regged: '&cUsuario ya registrado'
-usage_reg: '&cUso: /register Contraseña ConfirmarContraseña'
-# TODO max_reg: Missing tags %reg_count, %max_acc, %reg_names
+login_msg: '&cInicia sesión con "/login contraseña"'
+timeout: '&fTiempo de espera para inicio de sesión excedido'
+
+# Errors
+unknown_user: '&cUsuario no registrado'
+denied_command: '&c¡Para utilizar este comando debes iniciar sesión!'
+denied_chat: '&c¡Para poder hablar en el chat debes iniciar sesión!'
+not_logged_in: '&c¡No has iniciado sesión!'
+tempban_max_logins: '&cHas sido expulsado temporalmente por intentar iniciar sesión demasiadas veces.'
+# TODO: Missing tags %reg_count, %max_acc, %reg_names
 max_reg: '&fHas excedido la cantidad máxima de registros para tu cuenta'
 no_perm: '&cNo tienes permiso'
 error: '&fHa ocurrido un error. Por favor contacta al administrador.'
-login_msg: '&cInicia sesión con "/login contraseña"'
-reg_msg: '&cPor favor, regístrate con "/register <contraseña> <confirmarContraseña">'
+unsafe_spawn: '&fTu lugar de desconexión es inseguro, teletransportándote al punto inicial del mundo'
+kick_forvip: '&c¡Un jugador VIP ha ingresado al servidor lleno!'
+
+# AntiBot
+kick_antibot: '¡El modo de protección AntiBot está habilitado! Tienes que esperar varios minutos antes de entrar en el servidor.'
+antibot_auto_enabled: '[AuthMe] AntiBotMod activado automáticamente debido a conexiones masivas!'
+antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automáticamente después de %m minutos. Esperamos que haya terminado'
+
+# Other messages
+unregistered: '&c¡Cuenta eliminada del registro!'
+accounts_owned_self: 'Eres propietario de %count cuentas:'
+accounts_owned_other: 'El jugador %name tiene %count cuentas:'
+two_factor_create: '&2Tu código secreto es %code. Lo puedes escanear desde aquí %url'
+recovery_code_sent: 'El código de recuperación para recuperar tu contraseña se ha enviado a tu correo.'
+recovery_code_incorrect: '¡El código de recuperación no es correcto! Usa "/email recovery [email]" para generar uno nuevo'
+vb_nonActiv: '&fTu cuenta no está activada aún, ¡revisa tu correo!'
 usage_unreg: '&cUso: /unregister contraseña'
 pwd_changed: '&c¡Contraseña cambiada!'
-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.'
-reg_only: '&f¡Sólo para jugadores registrados! Por favor visita http://www.example.com/ para registrarte'
 logged_in: '&c¡Ya has iniciado sesión!'
 logout: '&cDesconectado correctamente.'
-same_nick: '&fYa hay un usuario con ese nick conectado (posible error)'
-registered: '&c¡Registrado correctamente!'
-pass_len: '&fTu contraseña es muy larga o muy corta'
 reload: '&fLa configuración y la base de datos han sido recargados'
-timeout: '&fTiempo de espera para inicio de sesión excedido'
 usage_changepassword: '&fUso: /changepw contraseñaActual contraseñaNueva'
+
+# Session messages
+invalid_session: '&fLos datos de sesión no corresponden. Por favor espera a terminar la sesión.'
+valid_session: '&cInicio de sesión'
+
+# Error messages when joining
 name_len: '&cTu nombre de usuario es muy largo o muy corto.'
 regex: '&cTu usuario tiene carácteres no admitidos, los cuales son: REG_EX'
-add_email: '&cPor favor agrega tu e-mail con: /email add tuEmail confirmarEmail'
-recovery_email: '&c¿Olvidaste tu contraseña? Por favor usa /email recovery <tuEmail>'
-usage_captcha: '&cUso: /captcha <theCaptcha>'
-wrong_captcha: '&cCaptcha incorrecto, por favor usa: /captcha THE_CAPTCHA'
-valid_captcha: '&c¡ Captcha ingresado correctamente !'
-kick_forvip: '&c¡Un jugador VIP ha ingresado al servidor lleno!'
+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!'
 kick_fullserver: '&c¡El servidor está lleno, lo sentimos!'
+same_nick: '&fYa hay un usuario con ese nick conectado (posible error)'
+invalid_name_case: 'Solo puedes unirte mediante el nombre de usuario %valid, no %invalid.'
+same_ip_online: '¡Un jugador con la misma IP ya está en el juego!'
+
+# Email
 usage_email_add: '&fUso: /email add <email> <confirmaEmail> '
 usage_email_change: '&fUso: /email change <anteriorEmail> <nuevoEmail> '
 usage_email_recovery: '&fUso: /email recovery <Email>'
@ -50,27 +81,16 @@ email_added: '[AuthMe] Email agregado !'
 email_confirm: '[AuthMe] Confirma tu Email !'
 email_changed: '[AuthMe] Email cambiado !'
 email_send: '[AuthMe] Correo de recuperación enviado !'
-country_banned: '¡Tu país ha sido baneado de este servidor!'
-antibot_auto_enabled: '[AuthMe] AntiBotMod activado automáticamente debido a conexiones masivas!'
-antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automáticamente después de %m minutos. Esperamos que haya terminado'
-not_owner_error: 'No eres el propietario de esta cuenta. ¡Por favor, elije otro nombre!'
-recovery_code_incorrect: '¡El código de recuperación no es correcto! Usa "/email recovery [email]" para generar uno nuevo'
-two_factor_create: '&2Tu código secreto es %code. Lo puedes escanear desde aquí %url'
-accounts_owned_self: 'Eres propietario de %count cuentas:'
-email_already_used: '&4La dirección Email ya está siendo usada'
-denied_command: '&c¡Para utilizar este comando debes iniciar sesión!'
-same_ip_online: '¡Un jugador con la misma IP ya está en el juego!'
-tempban_max_logins: '&cHas sido expulsado temporalmente por intentar iniciar sesión demasiadas veces.'
-kicked_admin_registered: 'Un administrador te acaba de registrar; entra en la cuenta de nuevo'
-denied_chat: '&c¡Para poder hablar en el chat debes iniciar sesión!'
-password_error_unsafe: '&cLa contraseña elejida no es segura, por favor elige otra...'
-kick_antibot: '¡El modo de protección AntiBot está habilitado! Tienes que esperar varios minutos antes de entrar en el servidor.'
 email_exists: '&c¡El correo de recuperación ya ha sido enviado! Puedes descartarlo y enviar uno nuevo utilizando el siguiente comando:'
-password_error_nick: '&cNo puedes utilizar tu nombre como contraseña, por favor elige otra...'
-accounts_owned_other: 'El jugador %name tiene %count cuentas:'
-incomplete_email_settings: 'Error: no todos los ajustes necesarios se han configurado para enviar correos. Por favor, contacta con un administrador.'
-recovery_code_sent: 'El código de recuperación para recuperar tu contraseña se ha enviado a tu correo.'
-invalid_name_case: 'Solo puedes unirte mediante el nombre de usuario %valid, no %invalid.'
 email_show: '&2Tu dirección de E-Mail actual es: &f%email'
-show_no_email: '&2No tienes ningun E-Mail asociado en esta cuenta.'
+incomplete_email_settings: 'Error: no todos los ajustes necesarios se han configurado para enviar correos. Por favor, contacta con un administrador.'
+email_already_used: '&4La dirección Email ya está siendo usada'
 email_send_failure: 'No se ha podido enviar el correo electrónico. Por favor, contacta con un administrador.'
+show_no_email: '&2No tienes ningun E-Mail asociado en esta cuenta.'
+add_email: '&cPor favor agrega tu e-mail con: /email add tuEmail confirmarEmail'
+recovery_email: '&c¿Olvidaste tu contraseña? Por favor usa /email recovery <tuEmail>'
+
+# Captcha
+usage_captcha: '&cUso: /captcha <theCaptcha>'
+wrong_captcha: '&cCaptcha incorrecto, por favor usa: /captcha THE_CAPTCHA'
+valid_captcha: '&c¡ Captcha ingresado correctamente !'
--- a/src/main/resources/messages/messages_eu.yml
+++ b/src/main/resources/messages/messages_eu.yml
@ -1,39 +1,74 @@
-unknown_user: '&cErabiltzailea ez dago erregistratuta'
-unsafe_spawn: '&fSpawn-era telegarraiatu zara'
-not_logged_in: '&cSaioa hasi gabe!'
+# Registration
+reg_msg: '&cMesedez erabili "/register pasahitza pasahitza" erregistratzeko'
+usage_reg: '&cErabili: /register pasahitza pasahitza'
+reg_only: '&fErregistratuako erabiltzaileak bakarrik! Mesedez bisitatu http://example.com erregistratzeko'
+# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
+registered: '&cOndo erregistratu zara!'
+reg_disabled: '&cErregistroa desgaitua'
+user_regged: '&cErabiltzailea dagoeneko erregistratua'
+
+# Password errors on registration
+password_error: '&fPasahitzak ez datoz bat'
+# TODO password_error_nick: '&cYou can''t use your name as password, please choose another one...'
+# TODO password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...'
+# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
+pass_len: '&fZure pasahitza motzegia edo luzeegia da'
+
+# Login
 usage_log: '&cErabili: /login pasahitza'
 wrong_pwd: '&cPasahitz okerra'
-unregistered: '&cZure erregistroa ezabatu duzu!'
-reg_disabled: '&cErregistroa desgaitua'
-valid_session: '&cSession login'
 login: '&cOngi etorri!'
-vb_nonActiv: '&fZure kontua aktibatu gabe dago, konfirmatu zure emaila!'
-user_regged: '&cErabiltzailea dagoeneko erregistratua'
-usage_reg: '&cErabili: /register pasahitza pasahitza'
-# TODO max_reg: Missing tags %reg_count, %max_acc, %reg_names
+login_msg: '&cMesedez erabili "/login pasahitza" saioa hasteko'
+timeout: '&fDenbora gehiegi egon zara saioa hasi gabe'
+
+# Errors
+unknown_user: '&cErabiltzailea ez dago erregistratuta'
+# TODO denied_command: '&cIn order to use this command you must be authenticated!'
+# TODO denied_chat: '&cIn order to chat you must be authenticated!'
+not_logged_in: '&cSaioa hasi gabe!'
+# TODO tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
+# TODO: Missing tags %reg_count, %max_acc, %reg_names
 max_reg: '&fKontuko 2 erabiltzaile bakarrik izan ditzakezu'
 no_perm: '&cBaimenik ez'
 error: '&fErrorea; Mesedez jarri kontaktuan administratzaile batekin'
-login_msg: '&cMesedez erabili "/login pasahitza" saioa hasteko'
-reg_msg: '&cMesedez erabili "/register pasahitza pasahitza" erregistratzeko'
+unsafe_spawn: '&fSpawn-era telegarraiatu zara'
+kick_forvip: '&cVIP erabiltzaile bat sartu da zerbitzaria beteta zegoenean!'
+
+# AntiBot
+# TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
+# TODO antibot_auto_enabled: '&4[AntiBotService] AntiBot enabled due to the huge number of connections!'
+# TODO antibot_auto_disabled: '&2[AntiBotService] AntiBot disabled after %m minutes!'
+
+# Other messages
+unregistered: '&cZure erregistroa ezabatu duzu!'
+# TODO accounts_owned_self: 'You own %count accounts:'
+# TODO accounts_owned_other: 'The player %name has %count accounts:'
+# TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
+# 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'
+vb_nonActiv: '&fZure kontua aktibatu gabe dago, konfirmatu zure emaila!'
 usage_unreg: '&cErabili: /unregister password'
 pwd_changed: '&cPasahitza aldatu duzu!'
-password_error: '&fPasahitzak ez datoz bat'
-reg_only: '&fErregistratuako erabiltzaileak bakarrik! Mesedez bisitatu http://example.com erregistratzeko'
 logged_in: '&cDagoeneko saioa hasita!'
 logout: '&cAtera zara'
-same_nick: '&fZure izen berdina duen erabiltzaile bat zerbitzarian jolasten dago'
-registered: '&cOndo erregistratu zara!'
-pass_len: '&fZure pasahitza motzegia edo luzeegia da'
 reload: '&fConfiguration and database has been reloaded'
-timeout: '&fDenbora gehiegi egon zara saioa hasi gabe'
 usage_changepassword: '&fErabili: /changepassword pasahitzZaharra pasahitzBerria'
+
+# Session messages
+# TODO invalid_session: '&cYour IP has been changed and your session data has expired!'
+valid_session: '&cSession login'
+
+# Error messages when joining
 name_len: '&cZure erabiltzaile izena motzegia edo luzeegia da'
 regex: '&cZure erabiltzaileak karaktere debekatuak ditu. Karaktere onartuak: REG_EX'
-add_email: '&cMesedez gehitu zure emaila : /email add yourEmail confirmEmail'
-recovery_email: '&cPasahitza ahaztu duzu? Erabili /email recovery <zureemaila>'
-kick_forvip: '&cVIP erabiltzaile bat sartu da zerbitzaria beteta zegoenean!'
+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!'
 kick_fullserver: '&cZerbitzaria beteta dago, Barkatu!'
+same_nick: '&fZure izen berdina duen erabiltzaile bat zerbitzarian jolasten dago'
+# TODO invalid_name_case: 'You should join using username %valid, not %invalid.'
+# TODO same_ip_online: 'A player with the same IP is already in game!'
+
+# Email
 usage_email_add: '&fErabili: /email add <email> <confirmeEmail> '
 usage_email_change: '&fErabili: /email change <emailZaharra> <emailBerria> '
 usage_email_recovery: '&fErabili: /email recovery <Email>'
@ -44,32 +79,16 @@ email_added: '[AuthMe] Emaila gehitu duzu !'
 email_confirm: '[AuthMe] Konfirmatu zure emaila !'
 email_changed: '[AuthMe] Emaila aldatua!'
 email_send: '[AuthMe] Berreskuratze emaila bidalita !'
-country_banned: '[AuthMe] Zure herrialdea blokeatuta dago zerbitzari honetan'
-# TODO denied_command: '&cIn order to use this command you must be authenticated!'
-# TODO same_ip_online: 'A player with the same IP is already in game!'
-# TODO denied_chat: '&cIn order to chat you must be authenticated!'
-# TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
-# TODO password_error_nick: '&cYou can''t use your name as password, please choose another one...'
-# TODO password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...'
-# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
-# TODO invalid_session: '&cYour IP has been changed and your session data has expired!'
+# TODO email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:'
+# TODO email_show: '&2Your current email address is: &f%email'
+# TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.'
+# TODO email_already_used: '&4The email address is already being used'
+# TODO email_send_failure: 'The email could not be sent. Please contact an administrator.'
+# TODO show_no_email: '&2You currently don''t have email address associated with this account.'
+add_email: '&cMesedez gehitu zure emaila : /email add yourEmail confirmEmail'
+recovery_email: '&cPasahitza ahaztu duzu? Erabili /email recovery <zureemaila>'
+
+# Captcha
 # TODO usage_captcha: '&3To login you have to solve a captcha code, please use the command "/captcha <theCaptcha>"'
 # TODO wrong_captcha: '&cWrong captcha, please type "/captcha THE_CAPTCHA" into the chat!'
 # TODO valid_captcha: '&2Captcha code solved correctly!'
-# 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_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:'
-# TODO antibot_auto_enabled: '&4[AntiBotService] AntiBot enabled due to the huge number of connections!'
-# TODO antibot_auto_disabled: '&2[AntiBotService] AntiBot disabled after %m minutes!'
-# TODO email_already_used: '&4The email address is already being used'
-# TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
-# 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 tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
-# TODO accounts_owned_self: 'You own %count accounts:'
-# TODO accounts_owned_other: 'The player %name has %count accounts:'
-# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
-# 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'
--- a/src/main/resources/messages/messages_fi.yml
+++ b/src/main/resources/messages/messages_fi.yml
@ -1,43 +1,74 @@
-unknown_user: '&cSalasanat eivät täsmää'
-unsafe_spawn: '&fHengenvaarallinen poistumispaikka! Siirsimme sinut spawnille!'
-not_logged_in: '&cEt ole kirjautunut sisään!'
+# Registration
+reg_msg: '&cRekisteröidy palvelimellemme komennolla "/register <salasana> <salasana>"'
+usage_reg: '&cKäyttötapa: /register <salasana> <salasana>'
+reg_only: '&fMene sivustolle: http://example.com rekisteröityäksesi!'
+# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
+registered: '&cRekisteröidyit onnistuneesti!'
+reg_disabled: '&cRekisteröinti on suljettu!'
+user_regged: '&cPelaaja on jo rekisteröity'
+
+# Password errors on registration
+password_error: '&fSalasanat ei täsmää'
+# TODO password_error_nick: '&cYou can''t use your name as password, please choose another one...'
+# TODO password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...'
+# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
+pass_len: '&fSalasanasi on liian pitkä tai lyhyt.'
+
+# Login
 usage_log: '&cKäyttötapa: /login salasana'
 wrong_pwd: '&cVäärä salasana'
-unregistered: '&cPelaajatili poistettu onnistuneesti!'
-reg_disabled: '&cRekisteröinti on suljettu!'
-valid_session: '&cIstunto jatkettu!'
 login: '&cKirjauduit onnistuneesti'
-vb_nonActiv: '&fKäyttäjäsi ei ole vahvistettu!'
-user_regged: '&cPelaaja on jo rekisteröity'
-usage_reg: '&cKäyttötapa: /register <salasana> <salasana>'
-# TODO max_reg: Missing tags %reg_count, %max_acc, %reg_names
+login_msg: '&cKirjaudu palvelimmelle komennolla "/login salasana"'
+timeout: '&fKirjautumisaika meni umpeen.'
+
+# Errors
+unknown_user: '&cSalasanat eivät täsmää'
+# TODO denied_command: '&cIn order to use this command you must be authenticated!'
+# TODO denied_chat: '&cIn order to chat you must be authenticated!'
+not_logged_in: '&cEt ole kirjautunut sisään!'
+# TODO tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
+# TODO: Missing tags %reg_count, %max_acc, %reg_names
 max_reg: '&fSinulla ei ole oikeuksia tehdä enempää pelaajatilejä!'
 no_perm: '&cEi oikeuksia'
 error: '&fVirhe: Ota yhteys palveluntarjoojaan!'
-login_msg: '&cKirjaudu palvelimmelle komennolla "/login salasana"'
-reg_msg: '&cRekisteröidy palvelimellemme komennolla "/register <salasana> <salasana>"'
+unsafe_spawn: '&fHengenvaarallinen poistumispaikka! Siirsimme sinut spawnille!'
+kick_forvip: '&cVIP pelaaja liittyi täyteen palvelimeen!'
+
+# AntiBot
+# TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
+# TODO antibot_auto_enabled: '&4[AntiBotService] AntiBot enabled due to the huge number of connections!'
+# TODO antibot_auto_disabled: '&2[AntiBotService] AntiBot disabled after %m minutes!'
+
+# Other messages
+unregistered: '&cPelaajatili poistettu onnistuneesti!'
+# TODO accounts_owned_self: 'You own %count accounts:'
+# TODO accounts_owned_other: 'The player %name has %count accounts:'
+# TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
+# 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'
+vb_nonActiv: '&fKäyttäjäsi ei ole vahvistettu!'
 usage_unreg: '&cKäyttötapa: /unregister password'
 pwd_changed: '&cSalasana vaihdettu!!'
-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!'
 logged_in: '&cOlet jo kirjautunut!'
 logout: '&cKirjauduit ulos palvelimelta.'
-same_nick: '&COlet jo palvelimella! &COdota käyttäjän aikakatkaisua tai ota yhteyttä palveluntarjoojaan.'
-registered: '&cRekisteröidyit onnistuneesti!'
-pass_len: '&fSalasanasi on liian pitkä tai lyhyt.'
 reload: '&fAsetukset uudelleenladattu'
-timeout: '&fKirjautumisaika meni umpeen.'
 usage_changepassword: '&fKäyttötapa: /changepassword vanhaSalasana uusiSalasana'
+
+# Session messages
+invalid_session: '&fIstunto ei täsmää! Ole hyvä ja odota istunnon loppuun'
+valid_session: '&cIstunto jatkettu!'
+
+# Error messages when joining
 name_len: '&cPelaajanimesi on liian lyhyt tai pitkä'
 regex: '&cPelaajanimesi sisältää luvattomia merkkejä. Hyväksytyt merkit: REG_EX'
-add_email: '&cLisää sähköpostisi: /email add sähköpostisi sähköpostisiUudelleen'
-recovery_email: '&cUnohtuiko salasana? Käytä komentoa: /email recovery <Sähköpostisi>'
-usage_captcha: '&cKäyttötapa: /captcha <theCaptcha>'
-wrong_captcha: '&cVäärä varmistus, käytä : /captcha THE_CAPTCHA'
-valid_captcha: '&cSinun varmistus onnistui.!'
-kick_forvip: '&cVIP pelaaja liittyi täyteen palvelimeen!'
+# TODO country_banned: '&4Your country is banned from this server!'
+# TODO not_owner_error: 'You are not the owner of this account. Please choose another name!'
 kick_fullserver: '&cPalvelin on täynnä, Yritä pian uudelleen!'
+same_nick: '&COlet jo palvelimella! &COdota käyttäjän aikakatkaisua tai ota yhteyttä palveluntarjoojaan.'
+# TODO invalid_name_case: 'You should join using username %valid, not %invalid.'
+# TODO same_ip_online: 'A player with the same IP is already in game!'
+
+# Email
 usage_email_add: '&fKäyttötapa: /email add <email> <confirmEmail> '
 usage_email_change: '&fKäyttötapa: /email change <oldEmail> <newEmail> '
 usage_email_recovery: '&fKäyttötapa: /email recovery <Email>'
@ -48,28 +79,16 @@ email_added: '[AuthMe] Sähköposti lisätty!'
 email_confirm: '[AuthMe] Vahvistuta sähköposti!'
 email_changed: '[AuthMe] Sähköposti vaihdettu!'
 email_send: '[AuthMe] Palautus sähköposti lähetetty!'
-# TODO denied_command: '&cIn order to use this command you must be authenticated!'
-# TODO same_ip_online: 'A player with the same IP is already in game!'
-# TODO denied_chat: '&cIn order to chat you must be authenticated!'
-# TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
-# TODO password_error_nick: '&cYou can''t use your name as password, please choose another one...'
-# TODO password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...'
-# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
-# 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_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:'
-# TODO country_banned: '&4Your country is banned from this server!'
-# TODO antibot_auto_enabled: '&4[AntiBotService] AntiBot enabled due to the huge number of connections!'
-# TODO antibot_auto_disabled: '&2[AntiBotService] AntiBot disabled after %m minutes!'
-# TODO email_already_used: '&4The email address is already being used'
-# TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
-# 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 tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
-# TODO accounts_owned_self: 'You own %count accounts:'
-# TODO accounts_owned_other: 'The player %name has %count accounts:'
-# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
+# TODO email_show: '&2Your current email address is: &f%email'
 # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.'
+# TODO email_already_used: '&4The email address is already being used'
 # 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'
+# TODO show_no_email: '&2You currently don''t have email address associated with this account.'
+add_email: '&cLisää sähköpostisi: /email add sähköpostisi sähköpostisiUudelleen'
+recovery_email: '&cUnohtuiko salasana? Käytä komentoa: /email recovery <Sähköpostisi>'
+
+# Captcha
+usage_captcha: '&cKäyttötapa: /captcha <theCaptcha>'
+wrong_captcha: '&cVäärä varmistus, käytä : /captcha THE_CAPTCHA'
+valid_captcha: '&cSinun varmistus onnistui.!'
--- a/src/main/resources/messages/messages_fr.yml
+++ b/src/main/resources/messages/messages_fr.yml
@ -6,11 +6,11 @@
 # Inscription
 reg_msg: '&cPour vous inscrire, utilisez "/register <MotDePasse> <ConfirmerMotDePasse>"'
 usage_reg: '&cUsage: /register <MotDePasse> <ConfirmerMotDePasse>'
+reg_only: 'Seul les joueurs enregistrés sont admis!%nl%Veuillez vous rendre sur http://example.com pour plus d''infos.'
 kicked_admin_registered: 'Un admin vient de vous inscrire, veuillez vous reconnecter.'
 registered: '&aInscription effectué !'
 reg_disabled: '&cL''inscription est désactivé.'
 user_regged: '&cCet utilisateur est déjà inscrit.'
-max_reg: 'Vous avez atteint la limite d''inscription! &o(%reg_count/%max_acc : %reg_names)'

 # Erreurs MDP pour l'inscription
 password_error: '&cLe mot de passe de confirmation ne correspond pas.'
@ -22,10 +22,9 @@ pass_len: '&cVotre mot de passe est trop court ou trop long !'
 # Connexion
 usage_log: '&cUsage: /login <MotDePasse>'
 wrong_pwd: '&cMauvais mot de passe !'
-login_msg: '&cPour vous connecter, utilisez "/login <MotDePasse>"'
 login: '&aConnexion effectuée !'
+login_msg: '&cPour vous connecter, utilisez "/login <MotDePasse>"'
 timeout: 'Vous avez été expulsé car vous êtes trop lent pour vous enregistrer/connecter !'
-logged_in: '&aVous êtes déjà connecté.'

 # Erreurs
 unknown_user: '&cUtilisateur introuvable.'
@ -33,44 +32,45 @@ denied_command: '&cVous devez être connecté pour pouvoir utiliser cette comman
 denied_chat: '&cVous devez être connecté pour pouvoir écrire dans le chat.'
 not_logged_in: '&cUtilisateur non connecté !'
 tempban_max_logins: '&cVous êtes temporairement banni suite à plusieurs échecs de connexions !'
+max_reg: 'Vous avez atteint la limite d''inscription! &o(%reg_count/%max_acc : %reg_names)'
 no_perm: '&cVous n''êtes pas autorisé à utiliser cette commande.'
 error: '&cUne erreur est apparue, veuillez contacter un administrateur.'
 unsafe_spawn: 'Téléportation dans un endroit sûr.'
 kick_forvip: 'Un joueur VIP a rejoint le serveur à votre place (serveur plein).'

 # AntiBot
+kick_antibot: 'AntiBot est activé, veuillez attendre %m minutes avant de joindre le serveur.'
 antibot_auto_enabled: 'AntiBot activé automatiquement à cause de nombreuses connexions !'
 antibot_auto_disabled: 'AntiBot désactivé automatiquement après %m minutes, espérons que l''invasion soit arrêtée !'
-kick_antibot: 'AntiBot est activé, veuillez attendre %m minutes avant de joindre le serveur.'

 # Autres messages
-vb_nonActiv: '&fCe compte n''est pas actif, consultez vos emails !'
-usage_unreg: '&cPour supprimer votre compte, utilisez "/unregister <MotDePasse>"'
 unregistered: '&aCompte supprimé !'
-usage_changepassword: '&cPour changer de mot de passe, utilisez "/changepassword <AncienMotDePasse> <NouveauMotDePasse>"'
-pwd_changed: '&aMot de passe changé avec succès !'
-logout: '&cVous avez été déconnecté !'
-reload: '&aAuthMe a été relancé avec succès.'
-two_factor_create: '&aVotre code secret est &2%code&a. Vous pouvez le scanner depuis &2%url'
 accounts_owned_self: 'Vous avez %count comptes:'
 accounts_owned_other: 'Le joueur %name a %count comptes:'
+two_factor_create: '&aVotre code secret est &2%code&a. Vous pouvez le scanner depuis &2%url'
 recovery_code_sent: 'Un code de récupération a été envoyé à votre adresse email afin de réinitialiser votre mot de passe.'
 recovery_code_incorrect: '&cLe code de réinitialisation est incorrect!%nl%Faites "/email recovery [email]" pour en générer un nouveau.'
+vb_nonActiv: '&fCe compte n''est pas actif, consultez vos emails !'
+usage_unreg: '&cPour supprimer votre compte, utilisez "/unregister <MotDePasse>"'
+pwd_changed: '&aMot de passe changé avec succès !'
+logged_in: '&aVous êtes déjà connecté.'
+logout: '&cVous avez été déconnecté !'
+reload: '&aAuthMe a été relancé avec succès.'
+usage_changepassword: '&cPour changer de mot de passe, utilisez "/changepassword <AncienMotDePasse> <NouveauMotDePasse>"'

 # Messages de session
-valid_session: '&aVous avez été automatiquement connecté !'
 invalid_session: 'Session expirée suite à un changement d''IP.'
+valid_session: '&aVous avez été automatiquement connecté !'

 # Erreurs pour rejoindre le serveur
 name_len: 'Votre pseudo est trop long ou trop court.'
 regex: 'Caractères de pseudo autorisés: REG_EX'
-same_nick: 'Un joueur ayant le même pseudo est déjà connecté.'
 country_banned: 'Votre pays est banni de ce serveur.'
-same_ip_online: 'Un joueur avec la même adresse IP joue déjà !'
 not_owner_error: 'Vous n''êtes pas le propriétaire de ce compte. Veuillez utiliser un autre pseudo !'
 kick_fullserver: '&cLe serveur est actuellement plein, désolé !'
+same_nick: 'Un joueur ayant le même pseudo est déjà connecté.'
 invalid_name_case: 'Veuillez vous connecter avec "%valid" et non pas avec "%invalid".'
-reg_only: 'Seul les joueurs enregistrés sont admis!%nl%Veuillez vous rendre sur http://example.com pour plus d''infos.'
+same_ip_online: 'Un joueur avec la même adresse IP joue déjà !'

 # Email
 usage_email_add: '&fUsage: /email add <Email> <ConfirmeEmail> '
@ -86,11 +86,11 @@ email_send: '[AuthMe] Email de récupération envoyé !'
 email_exists: '&cUn email de restauration a déjà été envoyé ! Vous pouvez le jeter et vous en faire envoyez un nouveau en utilisant :'
 email_show: '&2Votre adresse email actuelle est: &f%email'
 incomplete_email_settings: '&cErreur : Tous les paramètres requis ne sont pas présent pour l''envoi de mail, veuillez contacter un admin.'
+email_already_used: '&cCette adresse email est déjà utilisée !'
+email_send_failure: '&cL''email n''a pas pu être envoyé. Veuillez contacter un admin.'
 show_no_email: 'Vous n''avez aucune adresse email enregistré sur votre compte.'
 add_email: '&cMerci d''ajouter votre email : /email add <votreEmail> <confirmerEmail>'
 recovery_email: '&cVous avez oublié votre Mot de Passe? Utilisez /email recovery <votreEmail>'
-email_already_used: '&cCette adresse email est déjà utilisée !'
-email_send_failure: '&cL''email n''a pas pu être envoyé. Veuillez contacter un admin.'

 # Captcha
 usage_captcha: '&cTrop de tentatives de connexion échouées, utilisez: /captcha <theCaptcha>'
--- a/src/main/resources/messages/messages_gl.yml
+++ b/src/main/resources/messages/messages_gl.yml
@ -1,43 +1,74 @@
-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!'
+# Registration
+reg_msg: '&cPor favor, rexístrate con "/register <contrasinal> <confirmarContrasinal>"'
+usage_reg: '&cUso: /register contrasinal confirmarContrasinal'
+reg_only: '&fSó xogadores rexistrados! Por favor, visita http://example.com para rexistrarte'
+# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
+registered: '&cRexistrado con éxito!'
+reg_disabled: '&cO rexistro está deshabilitado'
+user_regged: '&cEse nome de usuario xa está rexistrado'
+
+# Password errors on registration
+password_error: '&fO contrasinal non coincide'
+# TODO password_error_nick: '&cYou can''t use your name as password, please choose another one...'
+# TODO password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...'
+# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
+pass_len: '&fO teu contrasinal non alcanza a lonxitude mínima ou excede a lonxitude máxima'
+
+# Login
 usage_log: '&cUso: /login <contrasinal>'
 wrong_pwd: '&cContrasinal equivocado'
-unregistered: '&cFeito! Xa non estás rexistrado!'
-reg_disabled: '&cO rexistro está deshabilitado'
-valid_session: '&cIdentificado mediante a sesión'
 login: '&cIdentificación con éxito!'
-vb_nonActiv: '&fA túa conta aínda non está activada, comproba a túa bandexa de correo!!'
-user_regged: '&cEse nome de usuario xa está rexistrado'
-usage_reg: '&cUso: /register contrasinal confirmarContrasinal'
-# TODO max_reg: Missing tags %reg_count, %max_acc, %reg_names
+login_msg: '&cPor favor, identifícate con "/login <password>"'
+timeout: '&fRematou o tempo da autentificación'
+
+# Errors
+unknown_user: '&cEse nome de usuario non está rexistrado'
+# TODO denied_command: '&cIn order to use this command you must be authenticated!'
+# TODO denied_chat: '&cIn order to chat you must be authenticated!'
+not_logged_in: '&cNon te identificaches!'
+# TODO tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
+# TODO: Missing tags %reg_count, %max_acc, %reg_names
 max_reg: '&fExcediches o máximo de rexistros para a túa Conta'
 no_perm: '&cNon tes o permiso'
 error: '&fOcurriu un erro; contacta cun administrador'
-login_msg: '&cPor favor, identifícate con "/login <password>"'
-reg_msg: '&cPor favor, rexístrate con "/register <contrasinal> <confirmarContrasinal>"'
+unsafe_spawn: '&fA localización dende a que saíches era insegura, teletransportándote ao spawn do mundo'
+kick_forvip: '&cUn xogador VIP uniuse ao servidor cheo!'
+
+# AntiBot
+# TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
+antibot_auto_enabled: '[AuthMe] AntiBotMod conectouse automáticamente debido a conexións masivas!'
+antibot_auto_disabled: '[AuthMe] AntiBotMod  desactivouse automáticamente despois de %m minutos,  esperemos que a invasión se detivera'
+
+# Other messages
+unregistered: '&cFeito! Xa non estás rexistrado!'
+# TODO accounts_owned_self: 'You own %count accounts:'
+# TODO accounts_owned_other: 'The player %name has %count accounts:'
+# TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
+# 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'
+vb_nonActiv: '&fA túa conta aínda non está activada, comproba a túa bandexa de correo!!'
 usage_unreg: '&cUso: /unregister <contrasinal>'
 pwd_changed: '&cCambiouse o contrasinal!'
-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'
 logged_in: '&cXa estás identificado!'
 logout: '&cSesión pechada con éxito'
-same_nick: '&fXa está xogando alguén co mesmo nome'
-registered: '&cRexistrado con éxito!'
-pass_len: '&fO teu contrasinal non alcanza a lonxitude mínima ou excede a lonxitude máxima'
 reload: '&fRecargáronse a configuración e a base de datos'
-timeout: '&fRematou o tempo da autentificación'
 usage_changepassword: '&fUso: /changepassword <contrasinalVello> <contrasinalNovo>'
+
+# Session messages
+invalid_session: '&fOs datos de sesión non corresponden, por favor, espere a que remate a sesión'
+valid_session: '&cIdentificado mediante a sesión'
+
+# Error messages when joining
 name_len: '&cO teu nome é demasiado curto ou demasiado longo'
 regex: '&cO teu nome contén caracteres ilegais. Caracteres permitidos: REG_EX'
-add_email: '&cPor favor, engade o teu correo electrónico con: /email add <oTeuCorreo> <confirmarCorreo>'
-recovery_email: '&cOlvidaches o contrasinal? Por favor, usa /email recovery <oTeuCorreo>'
-usage_captcha: '&cNecesitas escribir un captcha, por favor escribe: /captcha <theCaptcha>'
-wrong_captcha: '&cCaptcha equivocado, por favor usa: /captcha THE_CAPTCHA'
-valid_captcha: '&cO teu captcha é válido !'
-kick_forvip: '&cUn xogador VIP uniuse ao servidor cheo!'
+country_banned: 'O teu país está bloqueado neste servidor'
+# TODO not_owner_error: 'You are not the owner of this account. Please choose another name!'
 kick_fullserver: '&cO servidor está actualmente cheo, sentímolo!'
+same_nick: '&fXa está xogando alguén co mesmo nome'
+# TODO invalid_name_case: 'You should join using username %valid, not %invalid.'
+# TODO same_ip_online: 'A player with the same IP is already in game!'
+
+# Email
 usage_email_add: '&fUso: /email add <correo> <confirmeCorreo> '
 usage_email_change: '&fUso: /email change <correoVello> <correoNovo> '
 usage_email_recovery: '&fUso: /email recovery <correo>'
@ -48,29 +79,16 @@ email_added: '[AuthMe] Correo engadido!'
 email_confirm: '[AuthMe] Confirma o teu correo!'
 email_changed: '[AuthMe] Cambiouse o correo!'
 email_send: '[AuthMe] Enviouse o correo de confirmación!'
-country_banned: 'O teu país está bloqueado neste servidor'
-antibot_auto_enabled: '[AuthMe] AntiBotMod conectouse automáticamente debido a conexións masivas!'
-antibot_auto_disabled: '[AuthMe] AntiBotMod  desactivouse automáticamente despois de %m minutos,
-  esperemos que a invasión se detivera'
-# TODO denied_command: '&cIn order to use this command you must be authenticated!'
-# TODO same_ip_online: 'A player with the same IP is already in game!'
-# TODO denied_chat: '&cIn order to chat you must be authenticated!'
-# TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
-# TODO password_error_nick: '&cYou can''t use your name as password, please choose another one...'
-# TODO password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...'
-# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
-# 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_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:'
-# TODO email_already_used: '&4The email address is already being used'
-# TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
-# 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 tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
-# TODO accounts_owned_self: 'You own %count accounts:'
-# TODO accounts_owned_other: 'The player %name has %count accounts:'
-# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
+# TODO email_show: '&2Your current email address is: &f%email'
 # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.'
+# TODO email_already_used: '&4The email address is already being used'
 # 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'
+# TODO show_no_email: '&2You currently don''t have email address associated with this account.'
+add_email: '&cPor favor, engade o teu correo electrónico con: /email add <oTeuCorreo> <confirmarCorreo>'
+recovery_email: '&cOlvidaches o contrasinal? Por favor, usa /email recovery <oTeuCorreo>'
+
+# Captcha
+usage_captcha: '&cNecesitas escribir un captcha, por favor escribe: /captcha <theCaptcha>'
+wrong_captcha: '&cCaptcha equivocado, por favor usa: /captcha THE_CAPTCHA'
+valid_captcha: '&cO teu captcha é válido !'
--- a/src/main/resources/messages/messages_hu.yml
+++ b/src/main/resources/messages/messages_hu.yml
@ -1,44 +1,73 @@
-reg_only: '&4Csak regisztrált játékosok tudnak csatlakozni a szerverhez! Kérlek kattints a  http://example.com weboldalra és regisztráld magad!'
-usage_unreg: '&cHasználat: "/unregister <jelszó>"'
-registered: '&aSikeres regisztráció.'
-user_regged: '&cEz a játékosnév már regisztrálva van!'
-login_msg: '&cKérlek jelentkezz be: "/login <jelszó>"'
-not_logged_in: '&cNem vagy bejelentkezve!'
-logout: '&cSikeresen kijelentkeztél!'
-usage_log: '&cBejelentkezés: "/login <jelszó>"'
-unknown_user: '&cEz a felhasználó nincs regisztrálva!'
-reg_disabled: '&cRegisztráció letiltva!'
-no_perm: '&cNincs jogod ehhez!'
+# Registration
+reg_msg: '&cKérlek Regisztrálj: "/register <jelszó> <jelszó ismét>"'
 usage_reg: '&cHasználat: "/register <jelszó> <jelszó ismét>"'
+reg_only: '&4Csak regisztrált játékosok tudnak csatlakozni a szerverhez! Kérlek kattints a  http://example.com weboldalra és regisztráld magad!'
+kicked_admin_registered: 'Adminisztrátor által regisztrálva lettél; kérlek lépj be újra!'
+registered: '&aSikeres regisztráció.'
+reg_disabled: '&cRegisztráció letiltva!'
+user_regged: '&cEz a játékosnév már regisztrálva van!'
+
+# Password errors on registration
+password_error: 'A két jelszó nem egyezik!'
 password_error_nick: '&cNem használhatod a felhasználóneved jelszónak, kérlek válassz másikat...'
 password_error_unsafe: '&cA választott jelszó nem biztonságos, kérlek válassz másikat...'
-unregistered: '&cRegisztráció sikeresen törölve!'
-same_nick: 'Ezzel a játékosnévvel már játszanak a szerveren.'
-valid_session: '&2A megadott időkereten belül csatlakoztál vissza így a rendszer automatikusan beléptetett.'
-pwd_changed: '&cJelszó sikeresen megváltoztatva!'
-reload: 'Beállítások és adatbázis újratöltve!'
-timeout: 'Bejelentkezési időtúllépés!'
-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ó!'
-reg_msg: '&cKérlek Regisztrálj: "/register <jelszó> <jelszó ismét>"'
-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)!'
-password_error: 'A két jelszó nem egyezik!'
-invalid_session: '&cAz IP címed megváltozott, ezért a visszacsatlakozási időkereted lejárt.'
+password_error_chars: '&4A választott jelszó nem engedélyezett karaktereket tartalmaz. Engedélyezett karakterek: REG_EX'
 pass_len: 'A jelszavad nem éri el a minimális hosszúságot!'
+
+# Login
+usage_log: '&cBejelentkezés: "/login <jelszó>"'
+wrong_pwd: '&4Hibás jelszó!'
+login: '&aSikeresen beléptél!'
+login_msg: '&cKérlek jelentkezz be: "/login <jelszó>"'
+timeout: 'Bejelentkezési időtúllépés!'
+
+# Errors
+unknown_user: '&cEz a felhasználó nincs regisztrálva!'
+denied_command: '&cAmíg nem vagy bejelentkezve, nem használhatod ezt a parancsot!'
+denied_chat: '&cAmíg nem vagy bejelentkezve, nem használhatod a csevegőt!'
+not_logged_in: '&cNem vagy bejelentkezve!'
+tempban_max_logins: '&cIdeiglenesen ki lettél tiltva mert túl sok alkalommal rontottad el a jelszavad!'
+max_reg: '&cElérted a maximálisan beregisztrálható karakterek számát. (%reg_count/%max_acc %reg_names)!'
+no_perm: '&cNincs jogod ehhez!'
+error: 'Hiba lépett fel! Lépj kapcsolatba a szerver tulajával sürgősen!'
+unsafe_spawn: 'A kilépési helyzeted nem biztonságos, ezért elteleportálunk a kezdő pozícióra.'
+kick_forvip: '&3VIP játékos csatlakozott a szerverhez!'
+
+# AntiBot
+kick_antibot: 'Az AntiBot védelem bekapcsolva! Kérlek várj pár percet mielőtt csatlakozol.'
+antibot_auto_enabled: '&4[AntiBot] Az AntiBot védelem bekapcsolt, mert a megszabott időn belül több felhasználó csatlakozott!'
+antibot_auto_disabled: '&2[AntiBot] Az AntiBot kikapcsol %m perc múlva!'
+
+# Other messages
+unregistered: '&cRegisztráció sikeresen törölve!'
+accounts_owned_self: '%count db regisztrációd van:'
+accounts_owned_other: 'A %name nevű játékosnak, %count db regisztrációja van:'
+two_factor_create: '&2A te titkos kódod a következő: %code. Vagy skenneld be a következő oldalról: %url'
+recovery_code_sent: 'A jelszavad visszaállításához szükséges kódot sikeresen kiküldtük az email címedre!'
+recovery_code_incorrect: 'A visszaállító kód helytelen volt! Használd a következő parancsot: /email recovery [email címed] egy új generálásához'
 vb_nonActiv: '&cA felhasználód aktiválása még nem történt meg, ellenőrizd a megadott emailed!'
+usage_unreg: '&cHasználat: "/unregister <jelszó>"'
+pwd_changed: '&cJelszó sikeresen megváltoztatva!'
+logged_in: '&cMár be vagy jelentkezve!'
+logout: '&cSikeresen kijelentkeztél!'
+reload: 'Beállítások és adatbázis újratöltve!'
 usage_changepassword: 'Használat: "/changepassword <régi jelszó> <új jelszó>"'
+
+# Session messages
+invalid_session: '&cAz IP címed megváltozott, ezért a visszacsatlakozási időkereted lejárt.'
+valid_session: '&2A megadott időkereten belül csatlakoztál vissza így a rendszer automatikusan beléptetett.'
+
+# Error messages when joining
 name_len: '&4A felhasználóneved túl hosszú, vagy túl rövid! Válassz másikat!'
 regex: '&4A felhasználóneved nem engedélyezett karaktereket tartalmaz. Engedélyezett karakterek: REG_EX'
-add_email: '&3Kérlek rendeld hozzá a felhasználódhoz az email címedet "/email add <email címed> <email címed ismét>"'
-recovery_email: '&3Ha elfelejtetted a jelszavad, használd az: "/email recovery <regisztrált email címed>"'
-usage_captcha: '&3A bejelentkezéshez CAPTCHA szükséges, kérlek használd a következő parancsot "/captcha <theCaptcha>"'
-wrong_captcha: '&cHibás CAPTCHA, kérlek írd be a következő parancsot: "/captcha THE_CAPTCHA"!'
-valid_captcha: '&2CAPTCHA sikeresen feloldva!'
-kick_forvip: '&3VIP játékos csatlakozott a szerverhez!'
+country_banned: '&4Az országod tiltólistán van ezen a szerveren!'
+not_owner_error: 'Ez nem a te felhasználód. Kérlek válassz másik nevet!'
 kick_fullserver: '&4A szerver megtelt, próbálj csatlakozni később!'
+same_nick: 'Ezzel a játékosnévvel már játszanak a szerveren.'
+invalid_name_case: '%valid a felhasználó neved nem? Akkor ne %invalid névvel próbálj feljönni.'
+same_ip_online: 'Már valaki csatlakozott a szerverhez ezzel az IP címmel!'
+
+# Email
 usage_email_add: '&cHasználat: "/email add <email> <email ismét>"'
 usage_email_change: '&cHasználat: "/email change <régi email> <új email>"'
 usage_email_recovery: '&cHasználat: "/email recovery <email>"'
@ -50,25 +79,15 @@ email_confirm: '&cKérlek ellenőrízd az email címedet!'
 email_changed: '&2Az email cím cseréje sikeresen megtörtént!'
 email_send: '&2A jelszó visszaállításhoz szükséges emailt elküldtük! Ellenőrízd a leveleidet!'
 email_exists: '&cA visszaállító emailt elküldtük! Hiba esetén újra kérheted az alábbi parancs segítségével:'
-email_already_used: '&4Ez az email cím már használatban van!'
-country_banned: '&4Az országod tiltólistán van ezen a szerveren!'
-antibot_auto_enabled: '&4[AntiBot] Az AntiBot védelem bekapcsolt, mert a megszabott időn belül több felhasználó csatlakozott!'
-antibot_auto_disabled: '&2[AntiBot] Az AntiBot kikapcsol %m perc múlva!'
-kick_antibot: 'Az AntiBot védelem bekapcsolva! Kérlek várj pár percet mielőtt csatlakozol.'
-not_owner_error: 'Ez nem a te felhasználód. Kérlek válassz másik nevet!'
-invalid_name_case: '%valid a felhasználó neved nem? Akkor ne %invalid névvel próbálj feljönni.'
-two_factor_create: '&2A te titkos kódod a következő: %code. Vagy skenneld be a következő oldalról: %url'
-denied_chat: '&cAmíg nem vagy bejelentkezve, nem használhatod a csevegőt!'
-denied_command: '&cAmíg nem vagy bejelentkezve, nem használhatod ezt a parancsot!'
-same_ip_online: 'Már valaki csatlakozott a szerverhez ezzel az IP címmel!'
-password_error_chars: '&4A választott jelszó nem engedélyezett karaktereket tartalmaz. Engedélyezett karakterek: REG_EX'
-tempban_max_logins: '&cIdeiglenesen ki lettél tiltva mert túl sok alkalommal rontottad el a jelszavad!'
-incomplete_email_settings: 'Hiba: nem lett beállítva az össze szükséges beállítás az email küldéshez. Vedd fel a kapcsolatot egy adminnal.'
-accounts_owned_other: 'A %name nevű játékosnak, %count db regisztrációja van:'
-kicked_admin_registered: 'Adminisztrátor által regisztrálva lettél; kérlek lépj be újra!'
-accounts_owned_self: '%count db regisztrációd van:'
-recovery_code_incorrect: 'A visszaállító kód helytelen volt! Használd a következő parancsot: /email recovery [email címed] egy új generálásához'
-recovery_code_sent: 'A jelszavad visszaállításához szükséges kódot sikeresen kiküldtük az email címedre!'
 email_show: '&2A jelenlegi email-ed a következő: &f%email'
-show_no_email: '&2Ehhez a felhasználóhoz jelenleg még nincs email hozzárendelve.'
+incomplete_email_settings: 'Hiba: nem lett beállítva az össze szükséges beállítás az email küldéshez. Vedd fel a kapcsolatot egy adminnal.'
+email_already_used: '&4Ez az email cím már használatban van!'
 # TODO email_send_failure: 'The email could not be sent. Please contact an administrator.'
+show_no_email: '&2Ehhez a felhasználóhoz jelenleg még nincs email hozzárendelve.'
+add_email: '&3Kérlek rendeld hozzá a felhasználódhoz az email címedet "/email add <email címed> <email címed ismét>"'
+recovery_email: '&3Ha elfelejtetted a jelszavad, használd az: "/email recovery <regisztrált email címed>"'
+
+# Captcha
+usage_captcha: '&3A bejelentkezéshez CAPTCHA szükséges, kérlek használd a következő parancsot "/captcha <theCaptcha>"'
+wrong_captcha: '&cHibás CAPTCHA, kérlek írd be a következő parancsot: "/captcha THE_CAPTCHA"!'
+valid_captcha: '&2CAPTCHA sikeresen feloldva!'
--- a/src/main/resources/messages/messages_id.yml
+++ b/src/main/resources/messages/messages_id.yml
@ -1,43 +1,74 @@
-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!'
-usage_log: '&cUsage: /login <password>'
-wrong_pwd: '&cPassword salah!'
-unregistered: '&cUnregister berhasil!'
-reg_disabled: '&cRegister dalam game tidak diaktifkan!'
-valid_session: '&2Otomatis login, karena sesi masih terhubung.'
-login: '&2Login berhasil!'
-vb_nonActiv: '&cAkunmu belum diaktifkan, silahkan periksa email kamu!'
-user_regged: '&cKamu telah mendaftarkan username ini!'
-# TODO max_reg: Missing tags %reg_count, %max_acc, %reg_names
-max_reg: '&Kamu telah mencapai batas maksimum pendaftaran di server ini!'
-no_perm: '&4Kamu tidak mempunyai izin melakukan ini!'
-error: '&4Terjadi kesalahan tak dikenal, silahkan hubungi Administrator!'
-login_msg: '&cSilahkan login menggunakan command "/login <password>"'
+# Registration
 reg_msg: '&3Silahkan mendaftar ke server menggunakan command "/register <password> <ulangiPassword>"'
-pwd_changed: '&2Berhasil mengubah password!'
+# TODO usage_reg: '&cUsage: /register <password> <ConfirmPassword>'
+reg_only: '&4Hanya pengguna terdaftar yg bisa bergabung! Silahkan kunjungi http://example.com untuk mendaftar!'
+# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
+registered: '&2Register berhasil!'
+reg_disabled: '&cRegister dalam game tidak diaktifkan!'
+user_regged: '&cKamu telah mendaftarkan username ini!'
+
+# Password errors on registration
 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...'
-invalid_session: '&cIP kamu telah berubah, dan sesi kamu telah berakhir!'
-reg_only: '&4Hanya pengguna terdaftar yg bisa bergabung! Silahkan kunjungi http://example.com untuk mendaftar!'
+# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
+pass_len: '&cPassword kamu terlalu panjang/pendek! Silahkan pilih yg lain!'
+
+# Login
+usage_log: '&cUsage: /login <password>'
+wrong_pwd: '&cPassword salah!'
+login: '&2Login berhasil!'
+login_msg: '&cSilahkan login menggunakan command "/login <password>"'
+timeout: '&4Jangka waktu login telah habis, kamu di keluarkan dari server. Silahkan coba lagi!'
+
+# Errors
+unknown_user: '&cUser ini belum terdaftar!'
+# TODO denied_command: '&cIn order to use this command you must be authenticated!'
+# TODO denied_chat: '&cIn order to chat you must be authenticated!'
+not_logged_in: '&cKamu belum login!'
+# TODO tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
+# TODO: Missing tags %reg_count, %max_acc, %reg_names
+max_reg: '&Kamu telah mencapai batas maksimum pendaftaran di server ini!'
+no_perm: '&4Kamu tidak mempunyai izin melakukan ini!'
+error: '&4Terjadi kesalahan tak dikenal, silahkan hubungi Administrator!'
+unsafe_spawn: '&cLokasi quit kamu tidak aman, kamu telah diteleport ke titik spawn world.'
+kick_forvip: '&3Player VIP mencoba masuk pada saat server sedang penuh!'
+
+# AntiBot
+# TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
+antibot_auto_enabled: '&4[AntiBotService] AntiBot diaktifkan dikarenakan banyak koneksi yg diterima!'
+antibot_auto_disabled: '&2[AntiBotService] AntiBot dimatikan setelah %m menit!'
+
+# Other messages
+unregistered: '&cUnregister berhasil!'
+# TODO accounts_owned_self: 'You own %count accounts:'
+# TODO accounts_owned_other: 'The player %name has %count accounts:'
+# TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
+# 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'
+vb_nonActiv: '&cAkunmu belum diaktifkan, silahkan periksa email kamu!'
+# TODO usage_unreg: '&cUsage: /unregister <password>'
+pwd_changed: '&2Berhasil mengubah password!'
 logged_in: '&cKamu telah login!'
 logout: '&2Berhasil logout!'
-same_nick: '&4Username yg sama telah bermain di server ini!'
-registered: '&2Register berhasil!'
-pass_len: '&cPassword kamu terlalu panjang/pendek! Silahkan pilih yg lain!'
 reload: '&2Konfigurasi dan database telah dimuat ulang!'
-timeout: '&4Jangka waktu login telah habis, kamu di keluarkan dari server. Silahkan coba lagi!'
 usage_changepassword: '&cUsage: /changepassword <passwordLama> <passwordBaru>'
+
+# Session messages
+invalid_session: '&cIP kamu telah berubah, dan sesi kamu telah berakhir!'
+valid_session: '&2Otomatis login, karena sesi masih terhubung.'
+
+# Error messages when joining
 name_len: '&4Username kamu terlalu panjang atau terlalu pendek!'
 regex: '&4Username kamu mengandung karakter illegal. Karakter yg diijinkan: REG_EX'
-add_email: '&3Silahkan tambahkan email ke akunmu menggunakan command "/email add <emailKamu> <ulangiEmail>"'
-recovery_email: '&3Lupa password? silahkan gunakan command "/email recovery <emailKamu>"'
-usage_captcha: '&3Kamu harus menyelesaikan kode captcha untuk login, silahkan gunakan command "/captcha <theCaptcha>"'
-wrong_captcha: '&cCaptcha salah, gunakan command "/captcha THE_CAPTCHA" pada chat!'
-valid_captcha: '&2Kode captcha terselesaikan!'
-kick_forvip: '&3Player VIP mencoba masuk pada saat server sedang penuh!'
+# TODO country_banned: '&4Your country is banned from this server!'
+# TODO not_owner_error: 'You are not the owner of this account. Please choose another name!'
 kick_fullserver: '&4Server sedang penuh, silahkan coba lagi nanti!'
+same_nick: '&4Username yg sama telah bermain di server ini!'
+# TODO invalid_name_case: 'You should join using username %valid, not %invalid.'
+# TODO same_ip_online: 'A player with the same IP is already in game!'
+
+# Email
 usage_email_add: '&cUsage: /email add <email> <ulangiEmail>'
 usage_email_change: '&cUsage: /email change <emailLama> <emailBaru>'
 usage_email_recovery: '&cUsage: /email recovery <Email>'
@ -49,27 +80,15 @@ email_confirm: '&cSilahkan konfirmasi alamat email kamu!'
 email_changed: '&2Alamat email telah diubah dengan benar!'
 email_send: '&2Email pemulihan akun telah dikirim! Silahkan periksa kotak masuk emailmu!'
 email_exists: '&cEmail pemulihan sudah dikirim! kamu bisa membatalkan dan mengirimkan yg baru dengan command dibawah:'
-antibot_auto_enabled: '&4[AntiBotService] AntiBot diaktifkan dikarenakan banyak koneksi yg diterima!'
-antibot_auto_disabled: '&2[AntiBotService] AntiBot dimatikan setelah %m menit!'
-# TODO denied_command: '&cIn order to use this command you must be authenticated!'
-# TODO same_ip_online: 'A player with the same IP is already in game!'
-# TODO denied_chat: '&cIn order to chat you must be authenticated!'
-# TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
-# TODO usage_reg: '&cUsage: /register <password> <ConfirmPassword>'
-# TODO usage_unreg: '&cUsage: /unregister <password>'
-# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
 # 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 country_banned: '&4Your country is banned from this server!'
-# TODO email_already_used: '&4The email address is already being used'
-# TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
-# 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 tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
-# TODO accounts_owned_self: 'You own %count accounts:'
-# TODO accounts_owned_other: 'The player %name has %count accounts:'
-# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
 # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.'
+# TODO email_already_used: '&4The email address is already being used'
 # 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'
+# TODO show_no_email: '&2You currently don''t have email address associated with this account.'
+add_email: '&3Silahkan tambahkan email ke akunmu menggunakan command "/email add <emailKamu> <ulangiEmail>"'
+recovery_email: '&3Lupa password? silahkan gunakan command "/email recovery <emailKamu>"'
+
+# Captcha
+usage_captcha: '&3Kamu harus menyelesaikan kode captcha untuk login, silahkan gunakan command "/captcha <theCaptcha>"'
+wrong_captcha: '&cCaptcha salah, gunakan command "/captcha THE_CAPTCHA" pada chat!'
+valid_captcha: '&2Kode captcha terselesaikan!'
--- a/src/main/resources/messages/messages_it.yml
+++ b/src/main/resources/messages/messages_it.yml
@ -1,50 +1,75 @@
 # Lingua Italiana creata da Maxetto e sgdc3.
-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 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!'
-usage_log: '&cUtilizzo: /login <password>'
-wrong_pwd: '&cPassword non corretta!'
-unregistered: '&2Sei stato correttamente rimosso dal database!'
-reg_disabled: '&cLa registrazione tramite i comandi di gioco è disabilitata.'
-valid_session: '&2Autenticato automaticamente attraverso la precedente sessione!'
-login: '&2Autenticazone eseguita correttamente!'
-vb_nonActiv: '&cIl tuo account non è stato ancora verificato, controlla fra le tue email per scoprire come attivarlo!'
-user_regged: '&cHai già eseguito la registrazione, non puoi eseguirla nuovamente.'
-usage_reg: '&cUtilizzo: /register <password> <confermaPassword>'
-max_reg: '&cHai raggiunto il numero massimo di registrazioni (%reg_count/%max_acc %reg_names) per questo indirizzo IP!'
-no_perm: '&4Non hai il permesso di eseguire questa operazione.'
-error: '&4Qualcosa è andato storto, riporta questo errore ad un amministratore!'
-login_msg: '&cPer favore, esegui l''autenticazione con il comando: "/login <password>"'
+
+# Registration
 reg_msg: '&3Per favore, esegui la registrazione con il comando: "/register <password> <confermaPassword>"'
-usage_unreg: '&cUtilizzo: /unregister <password>'
-pwd_changed: '&2Password cambiata correttamente!'
+usage_reg: '&cUtilizzo: /register <password> <confermaPassword>'
+reg_only: '&4Puoi giocare in questo server solo dopo aver eseguito la registrazione attraverso il sito web! Per favore, vai su http://esempio.it per procedere!'
+kicked_admin_registered: 'Un amministratore ti ha appena registrato, per favore rientra nel server'
+registered: '&2Registrato correttamente!'
+reg_disabled: '&cLa registrazione tramite i comandi di gioco è disabilitata.'
+user_regged: '&cHai già eseguito la registrazione, non puoi eseguirla nuovamente.'
+
+# Password errors on registration
 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...'
 password_error_chars: '&4La tua password contiene caratteri non consentiti. I caratteri consentiti sono: REG_EX'
-invalid_session: '&cIl tuo indirizzo IP è cambiato e la tua sessione è stata terminata!'
-reg_only: '&4Puoi giocare in questo server solo dopo aver eseguito la registrazione attraverso il sito web! Per favore, vai su http://esempio.it per procedere!'
+pass_len: '&cLa password che hai inserito è troppo corta o troppo lunga, per favore scegline un''altra...'
+
+# Login
+usage_log: '&cUtilizzo: /login <password>'
+wrong_pwd: '&cPassword non corretta!'
+login: '&2Autenticazone eseguita correttamente!'
+login_msg: '&cPer favore, esegui l''autenticazione con il comando: "/login <password>"'
+timeout: '&4Tempo scaduto per eseguire l''autenticazione, sei stato espulso dal server, per favore riprova!'
+
+# Errors
+unknown_user: '&cL''utente non ha ancora eseguito la registrazione.'
+denied_command: '&cPer poter usare questo comando devi essere autenticato!'
+denied_chat: '&cPer poter scrivere messaggi in chat devi essere autenticato!'
+not_logged_in: '&cNon hai ancora eseguito l''autenticazione!'
+tempban_max_logins: '&cSei stato temporaneamente bandito per aver fallito l''autenticazione troppe volte.'
+max_reg: '&cHai raggiunto il numero massimo di registrazioni (%reg_count/%max_acc %reg_names) per questo indirizzo IP!'
+no_perm: '&4Non hai il permesso di eseguire questa operazione.'
+error: '&4Qualcosa è andato storto, riporta questo errore ad un amministratore!'
+unsafe_spawn: '&cIl tuo punto di disconnessione risulta ostruito o insicuro, sei stato teletrasportato al punto di rigenerazione!'
+kick_forvip: '&3Un utente VIP è entrato mentre il server era pieno e ha preso il tuo posto!'
+
+# AntiBot
+kick_antibot: 'Il servizio di AntiBot è attualmente attivo! Devi aspettare qualche minuto prima di poter entrare nel server.'
+antibot_auto_enabled: '&4Il servizio di AntiBot è stato automaticamente abilitato a seguito delle numerose connessioni!'
+antibot_auto_disabled: "&2Il servizio di AntiBot è stato automaticamente disabilitato dopo %m minuti!"
+
+# Other messages
+unregistered: '&2Sei stato correttamente rimosso dal database!'
+accounts_owned_self: 'Possiedi %count account:'
+accounts_owned_other: 'Il giocatore %name possiede %count account:'
+two_factor_create: '&2Il tuo codice segreto è: &f%code%%nl%&2Puoi anche scannerizzare il codice QR da qui: &f%url'
+recovery_code_sent: 'Una email contenente il codice di recupero per reimpostare la tua password è stata appena inviata al tuo indirizzo email.'
+recovery_code_incorrect: 'Il codice di recupero inserito non è corretto! Scrivi /email recovery <email> per generarne uno nuovo'
+vb_nonActiv: '&cIl tuo account non è stato ancora verificato, controlla fra le tue email per scoprire come attivarlo!'
+usage_unreg: '&cUtilizzo: /unregister <password>'
+pwd_changed: '&2Password cambiata correttamente!'
 logged_in: '&cHai già eseguito l''autenticazione, non è necessario eseguirla nuovamente!'
 logout: '&2Disconnessione avvenuta correttamente!'
-same_nick: '&4Un giocatore con il tuo stesso nome utente è già connesso sul server!'
-registered: '&2Registrato correttamente!'
-pass_len: '&cLa password che hai inserito è troppo corta o troppo lunga, per favore scegline un''altra...'
 reload: '&2La configurazione e il database sono stati ricaricati correttamente!'
-timeout: '&4Tempo scaduto per eseguire l''autenticazione, sei stato espulso dal server, per favore riprova!'
 usage_changepassword: '&cUtilizzo: /changepassword <vecchiaPassword> <nuovaPassword>'
+
+# Session messages
+invalid_session: '&cIl tuo indirizzo IP è cambiato e la tua sessione è stata terminata!'
+valid_session: '&2Autenticato automaticamente attraverso la precedente sessione!'
+
+# Error messages when joining
 name_len: '&4Il tuo nome utente è troppo corto o troppo lungo!'
 regex: '&4Il tuo nome utente contiene caratteri non consentiti. I caratteri consentiti sono: REG_EX'
-add_email: '&3Per poter recuperare la password in futuro, aggiungi un indirizzo email al tuo account con il comando: "/email add <tuaEmail> <confermaEmail>"'
-recovery_email: '&3Hai dimenticato la tua password? Puoi recuperarla eseguendo il comando: "/email recovery <email>"'
-usage_captcha: '&3Per poterti autenticare devi risolvere un captcha, per favore scrivi: "/captcha <theCaptcha>"'
-wrong_captcha: '&cCaptcha sbagliato, per favore riprova scrivendo: "/captcha THE_CAPTCHA" in chat!'
-valid_captcha: '&2Il captcha inserito è valido!'
-kick_forvip: '&3Un utente VIP è entrato mentre il server era pieno e ha preso il tuo posto!'
+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!'
 kick_fullserver: '&4Il server è attualmente pieno, riprova più tardi!'
+same_nick: '&4Un giocatore con il tuo stesso nome utente è già connesso sul server!'
+invalid_name_case: 'Dovresti entrare con questo nome utente: "%valid", al posto di: "%invalid".'
+same_ip_online: 'Un giocatore con il tuo stesso IP è già connesso sul server!'
+
+# Email
 usage_email_add: '&cUtilizzo: /email add <email> <confermaEmail>'
 usage_email_change: '&cUtilizzo: /email change <vecchiaEmail> <nuovaEmail>'
 usage_email_recovery: '&cUtilizzo: /email recovery <email>'
@ -57,19 +82,14 @@ email_changed: '&2Indirizzo email cambiato correttamente!'
 email_send: '&2Una email contenente la tua nuova password è stata appena inviata al tuo indirizzo email!'
 email_exists: '&cL''email contenente la tua nuova password è già stata inviata! Se vuoi, puoi annullarla e mandarne un''altra con il seguente comando:'
 email_show: '&2Il tuo indirizzo email al momento è: &f%email'
-show_no_email: '&2Al momento non hai nessun indirizzo email associato al tuo account.'
-country_banned: '&4Il tuo paese è bandito da questo server!'
-antibot_auto_enabled: '&4Il servizio di AntiBot è stato automaticamente abilitato a seguito delle numerose connessioni!'
-antibot_auto_disabled: "&2Il servizio di AntiBot è stato automaticamente disabilitato dopo %m minuti!"
-email_already_used: '&4L''indirizzo email inserito è già in uso'
-two_factor_create: '&2Il tuo codice segreto è: &f%code%%nl%&2Puoi anche scannerizzare il codice QR da qui: &f%url'
-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".'
-tempban_max_logins: '&cSei stato temporaneamente bandito per aver fallito l''autenticazione troppe volte.'
-accounts_owned_self: 'Possiedi %count account:'
-accounts_owned_other: 'Il giocatore %name possiede %count account:'
-kicked_admin_registered: 'Un amministratore ti ha appena registrato, per favore rientra nel server'
 incomplete_email_settings: 'Errore: non tutte le impostazioni richieste per inviare le email sono state impostate. Per favore contatta un amministratore.'
+email_already_used: '&4L''indirizzo email inserito è già in uso'
 email_send_failure: 'Non è stato possibile inviare l''email contenente la tua nuova password. Per favore contatta un amministratore.'
-recovery_code_sent: 'Una email contenente il codice di recupero per reimpostare la tua password è stata appena inviata al tuo indirizzo email.'
-recovery_code_incorrect: 'Il codice di recupero inserito non è corretto! Scrivi /email recovery <email> per generarne uno nuovo'
+show_no_email: '&2Al momento non hai nessun indirizzo email associato al tuo account.'
+add_email: '&3Per poter recuperare la password in futuro, aggiungi un indirizzo email al tuo account con il comando: "/email add <tuaEmail> <confermaEmail>"'
+recovery_email: '&3Hai dimenticato la tua password? Puoi recuperarla eseguendo il comando: "/email recovery <email>"'
+
+# Captcha
+usage_captcha: '&3Per poterti autenticare devi risolvere un captcha, per favore scrivi: "/captcha <theCaptcha>"'
+wrong_captcha: '&cCaptcha sbagliato, per favore riprova scrivendo: "/captcha THE_CAPTCHA" in chat!'
+valid_captcha: '&2Il captcha inserito è valido!'
--- a/src/main/resources/messages/messages_ko.yml
+++ b/src/main/resources/messages/messages_ko.yml
@ -1,46 +1,78 @@
 #       Korean translate by wolfwork        #
 #           wolfdate25@gmail.com            #
 #         16.08.2014 Thanks for use         #
-unknown_user: '&c사용자이름은 가입되지 않았습니다'
-unsafe_spawn: '&f당신이 종료한 위치는 안전하지 않았습니다, 세계의 소환지점으로 이동합니다'
-not_logged_in: '&c접속되어있지 않습니다!'
+
+# Registration
+reg_msg: '&c가입하실려면 "/register 비밀번호 비밀번호재입력"을 치세요'
+usage_reg: '&c사용법: /register 비밀번호 비밀번호확인'
+reg_only: '&f가입한 플레이어만이 가능합니다! 가입하실려면 http://example.com 에 방문해주세요'
+# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
+registered: '&c성공적으로 가입했습니다!'
+reg_disabled: '&c가입이 비활성화 되어있습니다'
+user_regged: '&c사용자이름은 이미 가입했습니다'
+
+# Password errors on registration
+password_error: '&f비밀번호가 일치하지 않습니다'
+# TODO password_error_nick: '&cYou can''t use your name as password, please choose another one...'
+# TODO password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...'
+# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
+pass_len: '&f당신의 비밀번호는 최소 길이에 미치지 않거나 최대 길이를 초과했습니다'
+
+# Login
 usage_log: '&c사용법: /login 비밀번호'
 wrong_pwd: '&c잘못된 비밀번호입니다'
-unregistered: '&c성공적으로 탈퇴했습니다!'
-reg_disabled: '&c가입이 비활성화 되어있습니다'
-valid_session: '&c세션 로그인'
 login: '&c성공적인 접속입니다!'
-vb_nonActiv: '&f당신의 계정은 아직 활성화되어있지 않습니다, 당신의 이메일을 확인해보세요!'
-user_regged: '&c사용자이름은 이미 가입했습니다'
-usage_reg: '&c사용법: /register 비밀번호 비밀번호확인'
-# TODO max_reg: Missing tags %reg_count, %max_acc, %reg_names
+login_msg: '&c접속 하실려면 "/login 비밀번호"를 치세요'
+timeout: '&f접속시간 초과'
+
+# Errors
+unknown_user: '&c사용자이름은 가입되지 않았습니다'
+# TODO denied_command: '&cIn order to use this command you must be authenticated!'
+# TODO denied_chat: '&cIn order to chat you must be authenticated!'
+not_logged_in: '&c접속되어있지 않습니다!'
+# TODO tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
+# TODO: Missing tags %reg_count, %max_acc, %reg_names
 max_reg: '&f당신은 가입할 수 있는 계정의 최대 한도를 초과했습니다'
 no_perm: '&c권한이 없습니다'
 error: '&f오류가 발생했습니다; 관리자에게 문의해주세요'
-login_msg: '&c접속 하실려면 "/login 비밀번호"를 치세요'
-reg_msg: '&c가입하실려면 "/register 비밀번호 비밀번호재입력"을 치세요'
+unsafe_spawn: '&f당신이 종료한 위치는 안전하지 않았습니다, 세계의 소환지점으로 이동합니다'
+kick_forvip: '&c서버가 만원인 상태일때 VIP 플레이어들만 입장이 가능합니다!'
+
+# AntiBot
+# TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
+antibot_auto_enabled: '[AuthMe] 봇차단모드가 연결 개수 때문에 자동적으로 활성화됩니다!'
+antibot_auto_disabled: '[AuthMe] 봇차단모드가 %m 분 후에 자동적으로 비활성화됩니다'
+
+# Other messages
+unregistered: '&c성공적으로 탈퇴했습니다!'
+# TODO accounts_owned_self: 'You own %count accounts:'
+# TODO accounts_owned_other: 'The player %name has %count accounts:'
+# TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
+# 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'
+vb_nonActiv: '&f당신의 계정은 아직 활성화되어있지 않습니다, 당신의 이메일을 확인해보세요!'
 usage_unreg: '&c사용법: /unregister 비밀번호'
 pwd_changed: '&c비밀번호를 변경했습니다!'
-password_error: '&f비밀번호가 일치하지 않습니다'
-invalid_session: '&f세션일자가 적합하지 않습니다. 세션이 종료될 때까지 기다려주세요'
-reg_only: '&f가입한 플레이어만이 가능합니다! 가입하실려면 http://example.com 에 방문해주세요'
 logged_in: '&c이미 접속되었습니다!'
 logout: '&c성공적으로 접속해제하였습니다'
-same_nick: '&f같은 이름으로 이미 플레이하고 있습니다'
-registered: '&c성공적으로 가입했습니다!'
-pass_len: '&f당신의 비밀번호는 최소 길이에 미치지 않거나 최대 길이를 초과했습니다'
 reload: '&f설정과 데이터베이스는 갱신되었습니다'
-timeout: '&f접속시간 초과'
 usage_changepassword: '&f사용법: /changepassword 기존비밀번호 새로운비밀번호'
+
+# Session messages
+invalid_session: '&f세션일자가 적합하지 않습니다. 세션이 종료될 때까지 기다려주세요'
+valid_session: '&c세션 로그인'
+
+# Error messages when joining
 name_len: '&c당신의 이름은 너무 짧거나 너무 깁니다'
 regex: '&c당신의 이름에는 불법적인 글자들이 포함되어있습니다. 허용된 글자: REG_EX'
-add_email: '&c당신의 이메일을 추가해주세요 : /email add 당신의이메일 이메일재입력'
-recovery_email: '&c비밀번호를 잊어버리셨다고요? /email recovery <당신의이메일>을 사용하세요'
-usage_captcha: '&c보안문자 입력이 필요합니다, 입력해주세요: /captcha <theCaptcha>'
-wrong_captcha: '&c잘못된 보안문자, 사용해주세요 : /captcha THE_CAPTCHA'
-valid_captcha: '&c당신의 보안문자는 적합합니다!'
-kick_forvip: '&c서버가 만원인 상태일때 VIP 플레이어들만 입장이 가능합니다!'
+country_banned: '당신의 국가는 이 서버에서 차단당했습니다'
+# TODO not_owner_error: 'You are not the owner of this account. Please choose another name!'
 kick_fullserver: '&c서버가 만원입니다, 나중에 다시 시도해주세요'
+same_nick: '&f같은 이름으로 이미 플레이하고 있습니다'
+# TODO invalid_name_case: 'You should join using username %valid, not %invalid.'
+# TODO same_ip_online: 'A player with the same IP is already in game!'
+
+# Email
 usage_email_add: '&f사용법: /email add <이메일> <이메일확인> '
 usage_email_change: '&f사용법: /email change <기존이메일> <새로운이메일> '
 usage_email_recovery: '&f사용법: /email recovery <이메일>'
@ -52,27 +84,15 @@ email_confirm: '[AuthMe] 당신의 이메일을 확인하세요!'
 email_changed: '[AuthMe] 이메일이 변경되었습니다!'
 email_send: '[AuthMe] 복구 이메일을 보냈습니다!'
 email_exists: '[AuthMe] 당신의 계정에 이미 이메일이 존재합니다. 아래의 명령어를 통해 이메일을 변경하실 수 있습니다'
-country_banned: '당신의 국가는 이 서버에서 차단당했습니다'
-antibot_auto_enabled: '[AuthMe] 봇차단모드가 연결 개수 때문에 자동적으로 활성화됩니다!'
-antibot_auto_disabled: '[AuthMe] 봇차단모드가 %m 분 후에 자동적으로 비활성화됩니다'
-# TODO denied_command: '&cIn order to use this command you must be authenticated!'
-# TODO same_ip_online: 'A player with the same IP is already in game!'
-# TODO denied_chat: '&cIn order to chat you must be authenticated!'
-# TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
-# TODO password_error_nick: '&cYou can''t use your name as password, please choose another one...'
-# TODO password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...'
-# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
 # 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_already_used: '&4The email address is already being used'
-# TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
-# 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 tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
-# TODO accounts_owned_self: 'You own %count accounts:'
-# TODO accounts_owned_other: 'The player %name has %count accounts:'
-# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
 # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.'
+# TODO email_already_used: '&4The email address is already being used'
 # 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'
+# TODO show_no_email: '&2You currently don''t have email address associated with this account.'
+add_email: '&c당신의 이메일을 추가해주세요 : /email add 당신의이메일 이메일재입력'
+recovery_email: '&c비밀번호를 잊어버리셨다고요? /email recovery <당신의이메일>을 사용하세요'
+
+# Captcha
+usage_captcha: '&c보안문자 입력이 필요합니다, 입력해주세요: /captcha <theCaptcha>'
+wrong_captcha: '&c잘못된 보안문자, 사용해주세요 : /captcha THE_CAPTCHA'
+valid_captcha: '&c당신의 보안문자는 적합합니다!'
--- a/src/main/resources/messages/messages_lt.yml
+++ b/src/main/resources/messages/messages_lt.yml
@ -1,50 +1,74 @@
-unknown_user: '&cVartotojas neprisiregistraves'
-unsafe_spawn: '&6Atsijungimo vieta nesaugi, perkeliame jus i atsiradimo vieta.'
-not_logged_in: '&cTu neprisijunges!'
-usage_log: '&eKomandos panaudojimas: /login slaptazodis'
-wrong_pwd: '&cNeteisingas slaptazosdis'
-unregistered: '&aSekmingai issiregistravote!'
-reg_disabled: '&6Registracija yra isjungta'
-valid_session: '&aSesijos prisijungimas'
-login: '&aSekmingai prisijungete'
-vb_nonActiv: '&aJusu vartotojas nera patvirtintas, patikrinkite el.pasta.'
-user_regged: '&cVartotojo vardas jau uzregistruotas'
-usage_reg: '&eNaudojimas: /register slaptazodis pakartotiSlaptazodi'
-# TODO max_reg: Missing tags %reg_count, %max_acc, %reg_names
-max_reg: '&cJus pasiekete maksimalu registraciju skaiciu.'
-no_perm: '&cNera leidimo'
-error: '&cAtsirado klaida, praneskite adminstratoriui.'
-login_msg: '&ePrasome prisijungti: /login slaptazodis'
+# Registration
 reg_msg: '&ePrasome prisiregistruoti: /register slaptazodis pakartotiSlaptazodi'
-usage_unreg: '&ePanaikinti registracija: "/unregister slaptazodis"'
-pwd_changed: '&aSlaptazodis pakeistas'
-password_error: '&cSlaptazodziai nesutampa'
-invalid_session: '&cSesijos laikai nesutampa, prasome palaukti kol secija baigsis.'
+usage_reg: '&eNaudojimas: /register slaptazodis pakartotiSlaptazodi'
 reg_only: '&cTik prisiregistravusiem zaidejams: apsilankykite: http://example.com tam kad uzsiregistruoti.'
-logged_in: '&cTu aju prisijunges!'
-logout: '&aSekmingai atsijungete'
-same_nick: '&cKazkas situo vardu jau zaidzia.'
+# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
 registered: '&aSekmingai prisiregistravote.'
-pass_len: '&cJusu slaptazodis buvo per ilgas arba per trumpas.'
-reload: '&aNustatymai ir duomenu baze buvo perkrauta.'
-timeout: '&cNespejote prisijungti'
-usage_changepassword: '&ePanaudojimas: /changepassword senasSlaptazodis naujasSlaptazodis'
-name_len: '&cJusu varsdas yra per ilgas arba per trumpas.'
-regex: '&cJusu varde yra neledziamu simboliu, leidziami: REG_EX'
-add_email: '&ePrasau pridekite savo el.pasta : /email add Email confirmEmail'
-recovery_email: '&cPamirsote slaptazodi? Rasykite: /email recovery el.pastas'
-usage_captcha: '&cPanaudojimas: /captcha <theCaptcha>'
-wrong_captcha: '&cNeteisinga Captcha, naudokite : /captcha THE_CAPTCHA'
-valid_captcha: '&cJusu captcha Teisinga!'
-kick_forvip: '&cA VIP prisijunge i pilna serveri!'
-kick_fullserver: '&cServeris yra pilnas, Atsiprasome.'
-# TODO denied_command: '&cIn order to use this command you must be authenticated!'
-# TODO same_ip_online: 'A player with the same IP is already in game!'
-# TODO denied_chat: '&cIn order to chat you must be authenticated!'
-# TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
+reg_disabled: '&6Registracija yra isjungta'
+user_regged: '&cVartotojo vardas jau uzregistruotas'
+
+# Password errors on registration
+password_error: '&cSlaptazodziai nesutampa'
 # TODO password_error_nick: '&cYou can''t use your name as password, please choose another one...'
 # TODO password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...'
 # TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
+pass_len: '&cJusu slaptazodis buvo per ilgas arba per trumpas.'
+
+# Login
+usage_log: '&eKomandos panaudojimas: /login slaptazodis'
+wrong_pwd: '&cNeteisingas slaptazosdis'
+login: '&aSekmingai prisijungete'
+login_msg: '&ePrasome prisijungti: /login slaptazodis'
+timeout: '&cNespejote prisijungti'
+
+# Errors
+unknown_user: '&cVartotojas neprisiregistraves'
+# TODO denied_command: '&cIn order to use this command you must be authenticated!'
+# TODO denied_chat: '&cIn order to chat you must be authenticated!'
+not_logged_in: '&cTu neprisijunges!'
+# TODO tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
+# TODO: Missing tags %reg_count, %max_acc, %reg_names
+max_reg: '&cJus pasiekete maksimalu registraciju skaiciu.'
+no_perm: '&cNera leidimo'
+error: '&cAtsirado klaida, praneskite adminstratoriui.'
+unsafe_spawn: '&6Atsijungimo vieta nesaugi, perkeliame jus i atsiradimo vieta.'
+kick_forvip: '&cA VIP prisijunge i pilna serveri!'
+
+# AntiBot
+# TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
+# TODO antibot_auto_enabled: '&4[AntiBotService] AntiBot enabled due to the huge number of connections!'
+# TODO antibot_auto_disabled: '&2[AntiBotService] AntiBot disabled after %m minutes!'
+
+# Other messages
+unregistered: '&aSekmingai issiregistravote!'
+# TODO accounts_owned_self: 'You own %count accounts:'
+# TODO accounts_owned_other: 'The player %name has %count accounts:'
+# TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
+# 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'
+vb_nonActiv: '&aJusu vartotojas nera patvirtintas, patikrinkite el.pasta.'
+usage_unreg: '&ePanaikinti registracija: "/unregister slaptazodis"'
+pwd_changed: '&aSlaptazodis pakeistas'
+logged_in: '&cTu aju prisijunges!'
+logout: '&aSekmingai atsijungete'
+reload: '&aNustatymai ir duomenu baze buvo perkrauta.'
+usage_changepassword: '&ePanaudojimas: /changepassword senasSlaptazodis naujasSlaptazodis'
+
+# Session messages
+invalid_session: '&cSesijos laikai nesutampa, prasome palaukti kol secija baigsis.'
+valid_session: '&aSesijos prisijungimas'
+
+# Error messages when joining
+name_len: '&cJusu varsdas yra per ilgas arba per trumpas.'
+regex: '&cJusu varde yra neledziamu simboliu, leidziami: REG_EX'
+# TODO country_banned: '&4Your country is banned from this server!'
+# TODO not_owner_error: 'You are not the owner of this account. Please choose another name!'
+kick_fullserver: '&cServeris yra pilnas, Atsiprasome.'
+same_nick: '&cKazkas situo vardu jau zaidzia.'
+# TODO invalid_name_case: 'You should join using username %valid, not %invalid.'
+# TODO same_ip_online: 'A player with the same IP is already in game!'
+
+# Email
 # TODO usage_email_add: '&cUsage: /email add <email> <confirmEmail>'
 # TODO usage_email_change: '&cUsage: /email change <oldEmail> <newEmail>'
 # TODO usage_email_recovery: '&cUsage: /email recovery <Email>'
@ -54,22 +78,17 @@ kick_fullserver: '&cServeris yra pilnas, Atsiprasome.'
 # TODO email_added: '&2Email address successfully added to your account!'
 # TODO email_confirm: '&cPlease confirm your email address!'
 # TODO email_changed: '&2Email address changed correctly!'
-# 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: '&2Recovery email sent successfully! Please check your email inbox!'
 # TODO email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:'
-# TODO country_banned: '&4Your country is banned from this server!'
-# TODO antibot_auto_enabled: '&4[AntiBotService] AntiBot enabled due to the huge number of connections!'
-# TODO antibot_auto_disabled: '&2[AntiBotService] AntiBot disabled after %m minutes!'
-# TODO email_already_used: '&4The email address is already being used'
-# TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
-# 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 tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
-# TODO accounts_owned_self: 'You own %count accounts:'
-# TODO accounts_owned_other: 'The player %name has %count accounts:'
-# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
+# TODO email_show: '&2Your current email address is: &f%email'
 # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.'
+# TODO email_already_used: '&4The email address is already being used'
 # 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'
+# TODO show_no_email: '&2You currently don''t have email address associated with this account.'
+add_email: '&ePrasau pridekite savo el.pasta : /email add Email confirmEmail'
+recovery_email: '&cPamirsote slaptazodi? Rasykite: /email recovery el.pastas'
+
+# Captcha
+usage_captcha: '&cPanaudojimas: /captcha <theCaptcha>'
+wrong_captcha: '&cNeteisinga Captcha, naudokite : /captcha THE_CAPTCHA'
+valid_captcha: '&cJusu captcha Teisinga!'
--- a/src/main/resources/messages/messages_nl.yml
+++ b/src/main/resources/messages/messages_nl.yml
@ -1,46 +1,75 @@
-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!'
-usage_log: '&cGebruik: /login <wachtwoord>'
-wrong_pwd: '&cFout wachtwoord'
-unregistered: '&cRegistratie succesvol ongedaan gemaakt!'
+# Registration
+reg_msg: '&cRegistreer met "/register <wachtwoord> <herhaalWachtwoord>"'
+usage_reg: '&cGebruik: /register <wachtwoord> <herhaalWachtwoord>'
+reg_only: 'Alleen voor geregistreerde spelers! Bezoek http://example.com om te registreren'
+# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
+registered: '&cSuccesvol geregistreerd!'
 reg_disabled: '&cRegistratie is uitgeschakeld'
-valid_session: '&cSessie ingelogd'
-login: '&cSuccesvol ingelogd!'
+user_regged: '&cGebruikersnaam is al geregistreerd'
+
+# Password errors on registration
+password_error: 'Wachtwoord incorrect!'
 password_error_nick: '&fJe kunt je gebruikersnaam niet als wachtwoord gebruiken'
 password_error_unsafe: '&fJe kunt geen onveilige wachtwoorden gebruiken'
-vb_nonActiv: 'Je account is nog niet geactiveerd, controleer je mailbox!'
-user_regged: '&cGebruikersnaam is al geregistreerd'
-usage_reg: '&cGebruik: /register <wachtwoord> <herhaalWachtwoord>'
-# TODO max_reg: Missing tags %reg_count, %max_acc, %reg_names
+password_error_chars: '&cJouw wachtwoord bevat illegale tekens. Toegestaane karakters: REG_EX'
+pass_len: 'Je gekozen wachtwoord voldoet niet aan de minimum of maximum lengte'
+
+# Login
+usage_log: '&cGebruik: /login <wachtwoord>'
+wrong_pwd: '&cFout wachtwoord'
+login: '&cSuccesvol ingelogd!'
+login_msg: '&cLog in met "/login <wachtwoord>"'
+timeout: 'Login time-out: het duurde te lang voor je je inlogde.'
+
+# Errors
+unknown_user: '&cGebruikersnaam niet geregistreerd'
+# TODO denied_command: '&cIn order to use this command you must be authenticated!'
+# TODO denied_chat: '&cIn order to chat you must be authenticated!'
+not_logged_in: '&cNiet ingelogt!'
+# TODO tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
+# TODO: Missing tags %reg_count, %max_acc, %reg_names
 max_reg: 'Je hebt de maximale registraties van jouw account overschreden.'
 no_perm: '&cGeen toegang!'
 error: 'Error: neem contact op met een administrator!'
-login_msg: '&cLog in met "/login <wachtwoord>"'
-reg_msg: '&cRegistreer met "/register <wachtwoord> <herhaalWachtwoord>"'
+unsafe_spawn: De locatie waar je de vorige keer het spel verliet was gevaarlijk, je bent geteleporteerd naar de spawn
+kick_forvip: '&cEen VIP Gebruiker ga naar de volledige server!'
+
+# AntiBot
+kick_antibot: 'AntiBot is aangezet! Wacht alsjeblieft enkele minuten voor je met de server verbindt.'
+antibot_auto_enabled: '[AuthMe] AntiBotMod automatisch aangezet vanewge veel verbindingen!'
+antibot_auto_disabled: '[AuthMe] AntiBotMod automatisch uitgezet na %m minuten, hopelijk is de invasie gestopt'
+
+# Other messages
+unregistered: '&cRegistratie succesvol ongedaan gemaakt!'
+# TODO accounts_owned_self: 'You own %count accounts:'
+# TODO accounts_owned_other: 'The player %name has %count accounts:'
+# TODO: Missing tags %url
+two_factor_create: '&2Je geheime code is %code'
+# 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'
+vb_nonActiv: 'Je account is nog niet geactiveerd, controleer je mailbox!'
 usage_unreg: '&cGebruik: /unregister password'
 pwd_changed: '&cWachtwoord aangepast!'
-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.'
-reg_only: 'Alleen voor geregistreerde spelers! Bezoek http://example.com om te registreren'
 logged_in: '&cJe bent al ingelogd!'
 logout: '&cJe bent succesvol uitgelogd'
-same_nick: 'Er is al iemand met jouw gebruikersnaam online.'
-registered: '&cSuccesvol geregistreerd!'
-pass_len: 'Je gekozen wachtwoord voldoet niet aan de minimum of maximum lengte'
 reload: 'Configuratie en database is opnieuw opgestart'
-timeout: 'Login time-out: het duurde te lang voor je je inlogde.'
 usage_changepassword: 'Gebruik: /changepassword <oudWachtwoord> <nieuwWachtwoord>'
+
+# Session messages
+invalid_session: 'Sessie beschadigd, wacht tot de sessie is verlopen en verbindt opnieuw.'
+valid_session: '&cSessie ingelogd'
+
+# Error messages when joining
 name_len: '&cJe gebruikersnaam is te kort'
 regex: '&cJouw gebruikersnaam bevat illegale tekens. Toegestaane karakters: REG_EX'
-add_email: '&cVoeg uw E-mail alstublieft toe met: /email add <E-mail> <wachtwoord> <herhaalWachtwoord>'
-recovery_email: '&cWachtwoord vergeten? Gebruik alstublieft "/email recovery <E-mail>"'
-usage_captcha: '&cGebruik: /captcha <theCaptcha>'
-wrong_captcha: '&cVerkeerde Captcha, gebruik alstublieft: /captcha THE_CAPTCHA'
-valid_captcha: '&cDe captcha is geldig!'
-kick_forvip: '&cEen VIP Gebruiker ga naar de volledige server!'
+country_banned: 'Jouw land is geband op deze server'
+# TODO not_owner_error: 'You are not the owner of this account. Please choose another name!'
 kick_fullserver: '&cDe server is vol, sorry!'
+same_nick: 'Er is al iemand met jouw gebruikersnaam online.'
+# TODO invalid_name_case: 'You should join using username %valid, not %invalid.'
+# TODO same_ip_online: 'A player with the same IP is already in game!'
+
+# Email
 usage_email_add: '&fGebruik: /email add <E-mail> <herhaalE-mail>'
 usage_email_change: '&fGebruik: /email change <oudeE-mail> <nieuweE-mail>'
 usage_email_recovery: '&fGebruik: /email recovery <E-mail>'
@ -51,26 +80,16 @@ email_added: '[AuthMe] Bevestig jouw E-mail!'
 email_confirm: '[AuthMe] Bevestig jouw E-mail!'
 email_changed: '[AuthMe] Email Veranderd!'
 email_send: '[AuthMe] Herstel E-mail Verzonden!'
-country_banned: 'Jouw land is geband op deze server'
-antibot_auto_enabled: '[AuthMe] AntiBotMod automatisch aangezet vanewge veel verbindingen!'
-antibot_auto_disabled: '[AuthMe] AntiBotMod automatisch uitgezet na %m minuten, hopelijk is de invasie gestopt'
-kick_antibot: 'AntiBot is aangezet! Wacht alsjeblieft enkele minuten voor je met de server verbindt.'
-# TODO two_factor_create: Missing tag %url
-two_factor_create: '&2Je geheime code is %code'
-# TODO denied_command: '&cIn order to use this command you must be authenticated!'
-# TODO same_ip_online: 'A player with the same IP is already in game!'
-# TODO denied_chat: '&cIn order to chat you must be authenticated!'
-# 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_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:'
-# TODO email_already_used: '&4The email address is already being used'
-# 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 tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
-# TODO accounts_owned_self: 'You own %count accounts:'
-# TODO accounts_owned_other: 'The player %name has %count accounts:'
-# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
+# TODO email_show: '&2Your current email address is: &f%email'
 # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.'
+# TODO email_already_used: '&4The email address is already being used'
 # 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'
+# TODO show_no_email: '&2You currently don''t have email address associated with this account.'
+add_email: '&cVoeg uw E-mail alstublieft toe met: /email add <E-mail> <wachtwoord> <herhaalWachtwoord>'
+recovery_email: '&cWachtwoord vergeten? Gebruik alstublieft "/email recovery <E-mail>"'
+
+# Captcha
+usage_captcha: '&cGebruik: /captcha <theCaptcha>'
+wrong_captcha: '&cVerkeerde Captcha, gebruik alstublieft: /captcha THE_CAPTCHA'
+valid_captcha: '&cDe captcha is geldig!'
--- a/src/main/resources/messages/messages_pl.yml
+++ b/src/main/resources/messages/messages_pl.yml
@ -1,43 +1,74 @@
-logged_in: '&fJestes juz zalogowany!'
-not_logged_in: '&4Nie jestes zalogowany!'
+# Registration
+reg_msg: '&2Prosze sie zarejestrowac przy uzyciu &6/register <haslo> <powtorzHaslo>'
+usage_reg: '&4Uzycie: /register haslo powtorzHaslo'
+reg_only: '&fTylko zarejestrowani uzytkownicy maja do tego dostep!'
+kicked_admin_registered: 'Administrator zarejestrowal Ciebie, mozesz sie zalogowac.'
+registered: '&aPomyslnie zarejestrowany!'
 reg_disabled: '&4Rejestracja jest wylaczona'
 user_regged: '&4Gracz juz jest zarejestrowany'
-usage_reg: '&4Uzycie: /register haslo powtorzHaslo'
-usage_log: '&cUzycie: /login haslo'
-pwd_changed: '&fHaslo zostalo zmienione!'
-reg_only: '&fTylko zarejestrowani uzytkownicy maja do tego dostep!'
-valid_session: '&cSesja logowania'
-login_msg: '&2Prosze sie zalogowac przy uzyciu &6/login <haslo>'
-reg_msg: '&2Prosze sie zarejestrowac przy uzyciu &6/register <haslo> <powtorzHaslo>'
-timeout: '&fUplynal limit czasu zalogowania'
-wrong_pwd: '&cNiepoprawne haslo'
-logout: '&cPomyslnie wylogowany'
-usage_unreg: '&cUzycie: /unregister haslo'
-registered: '&aPomyslnie zarejestrowany!'
-unregistered: '&4Pomyslnie odrejestrowany!'
-login: '&aHaslo zaakceptowane!'
-no_perm: '&4Nie masz uprawnien'
-same_nick: '&fTen nick juz gra'
-reload: '&fKonfiguracja bazy danych zostala przeladowana'
-error: '&fBlad prosimy napisac do aministracji'
-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
-max_reg: '&fPrzekroczyles limit zarejestrowanych kont na serwerze.'
+
+# Password errors on registration
 password_error: '&fHaslo niepoprawne!'
+password_error_nick: '&cNie mozesz uzywac nicku jako hasla, wybierz inne...'
+password_error_unsafe: '&cTwoje haslo nie jest bezpieczne, wybierz inne...'
+password_error_chars: '&4W twoim hasle wystepuja niedozwolone znaki, dozwolone znaki to: REG_EX'
 pass_len: '&fTwoje haslo jest za krotkie lub za dlugie! Sprobuj ponownie...'
+
+# Login
+usage_log: '&cUzycie: /login haslo'
+wrong_pwd: '&cNiepoprawne haslo'
+login: '&aHaslo zaakceptowane!'
+login_msg: '&2Prosze sie zalogowac przy uzyciu &6/login <haslo>'
+timeout: '&fUplynal limit czasu zalogowania'
+
+# Errors
+unknown_user: '&fGracz nie jest zarejestrowany'
+denied_command: '&cAby uzyc tej komendy musisz sie zalogowac!'
+denied_chat: '&cAby pisac na chacie musisz sie zalogowac!'
+not_logged_in: '&4Nie jestes zalogowany!'
+tempban_max_logins: '&cZostales tymczasowo zbanowany za duza liczbe nieudanych logowan!'
+# TODO: Missing tags %reg_count, %max_acc, %reg_names
+max_reg: '&fPrzekroczyles limit zarejestrowanych kont na serwerze.'
+no_perm: '&4Nie masz uprawnien'
+error: '&fBlad prosimy napisac do aministracji'
+unsafe_spawn: '&fTwoje pozycja jest niebezpieczna. Zostaniesz przeniesiony na bezpieczny spawn.'
+kick_forvip: '&cA Gracz VIP dolaczyl do gry!'
+
+# AntiBot
+kick_antibot: 'AntyBot zostal wlaczony, musisz poczekac minute przed dolaczeniem do serwera'
+antibot_auto_enabled: '&4[AntiBotService] AntyBot wlaczony z powodu duzej liczby polaczen!'
+antibot_auto_disabled: '&2[AntiBotService] AntyBot zostanie wylaczony za %m minut!'
+
+# Other messages
+unregistered: '&4Pomyslnie odrejestrowany!'
+accounts_owned_self: 'Posiadasz %count kont:'
+accounts_owned_other: 'Gracz %name posiada %count kont:'
+two_factor_create: '&2Twoj sekretny kod to %code. Mozesz zeskanowac go tutaj %url'
+recovery_code_sent: 'Kod odzyskiwania hasla zostal wyslany na adres email przypisany do konta.'
+recovery_code_incorrect: 'Kod odzyskiwania hasla jest bledny! Uzyj /email recovery [email] aby wygenerowac nowy.'
 vb_nonActiv: '&fTwoje konto nie zostalo aktywowane! Sprawdz maila.'
+usage_unreg: '&cUzycie: /unregister haslo'
+pwd_changed: '&fHaslo zostalo zmienione!'
+logged_in: '&fJestes juz zalogowany!'
+logout: '&cPomyslnie wylogowany'
+reload: '&fKonfiguracja bazy danych zostala przeladowana'
 usage_changepassword: '&fUzycie: /changepassword starehaslo nowehaslo'
+
+# Session messages
+invalid_session: '&fSesja zakonczona!'
+valid_session: '&cSesja logowania'
+
+# Error messages when joining
 name_len: '&cTwoje konto ma za dluga badz za krotka nazwe'
 regex: '&cTwoje konto ma w nazwie niedozwolone znaki. Dozwolone znaki: REG_EX'
-add_email: '&cProsze dodac swoj email: /email add twojEmail powtorzEmail'
-recovery_email: '&cZapomniales hasla? Prosze uzyj komendy /email recovery <TwojEmail>'
-usage_captcha: '&cWpisz: /captcha <theCaptcha>'
-wrong_captcha: '&cZly kod, prosze wpisac: /captcha THE_CAPTCHA'
-valid_captcha: '&cTwoj kod jest nieprawidlowy!'
-kick_forvip: '&cA Gracz VIP dolaczyl do gry!'
+country_banned: '&4Ten kraj jest zbanowany na tym serwerze'
+not_owner_error: 'Nie jestes wlascicielem tego konta, wybierz inny nick!'
 kick_fullserver: '&cSerwer jest teraz zapelniony, przepraszamy!'
+same_nick: '&fTen nick juz gra'
+invalid_name_case: 'Powinienies dolaczyc do serwera z nicku %valid, a nie %invalid.'
+same_ip_online: 'Gracz z takim samym adresem ip jest aktualnie w grze!'
+
+# Email
 usage_email_add: '&fWpisz: /email add <email> <powtorzEmail> '
 usage_email_change: '&fWpisz: /email change <staryEmail> <nowyEmail> '
 usage_email_recovery: '&fWpisz: /email recovery <email>'
@ -48,28 +79,16 @@ email_added: '[AuthMe] Email dodany!'
 email_confirm: '[AuthMe] Potwierdz swoj email!'
 email_changed: '[AuthMe] Email zmieniony!'
 email_send: '[AuthMe] Email z odzyskaniem wyslany!'
-password_error_nick: '&cNie mozesz uzywac nicku jako hasla, wybierz inne...'
-email_already_used: '&4Ten adres email jest aktualnie uzywany!'
-password_error_unsafe: '&cTwoje haslo nie jest bezpieczne, wybierz inne...'
-kick_antibot: 'AntyBot zostal wlaczony, musisz poczekac minute przed dolaczeniem do serwera'
-invalid_name_case: 'Powinienies dolaczyc do serwera z nicku %valid, a nie %invalid.'
-accounts_owned_other: 'Gracz %name posiada %count kont:'
-antibot_auto_disabled: '&2[AntiBotService] AntyBot zostanie wylaczony za %m minut!'
-tempban_max_logins: '&cZostales tymczasowo zbanowany za duza liczbe nieudanych logowan!'
-password_error_chars: '&4W twoim hasle wystepuja niedozwolone znaki, dozwolone znaki to: REG_EX'
-denied_chat: '&cAby pisac na chacie musisz sie zalogowac!'
-denied_command: '&cAby uzyc tej komendy musisz sie zalogowac!'
-same_ip_online: 'Gracz z takim samym adresem ip jest aktualnie w grze!'
 email_exists: '&cEmail z haslem zostal wyslany, aby wyslac go ponownie uzyj:'
-country_banned: '&4Ten kraj jest zbanowany na tym serwerze'
-antibot_auto_enabled: '&4[AntiBotService] AntyBot wlaczony z powodu duzej liczby polaczen!'
-accounts_owned_self: 'Posiadasz %count kont:'
-two_factor_create: '&2Twoj sekretny kod to %code. Mozesz zeskanowac go tutaj %url'
-not_owner_error: 'Nie jestes wlascicielem tego konta, wybierz inny nick!'
 email_show: '&2Twoj aktualny adres email to: &f%email'
-show_no_email: '&2Nie posiadasz adresu email przypisanego do tego konta.'
-kicked_admin_registered: 'Administrator zarejestrowal Ciebie, mozesz sie zalogowac.'
 incomplete_email_settings: 'Error: Nie wszystkie opcje odpowiedzialne za wysylanie emaili zostaly ustawione. Skontaktuj sie z administracja.'
-recovery_code_sent: 'Kod odzyskiwania hasla zostal wyslany na adres email przypisany do konta.'
-recovery_code_incorrect: 'Kod odzyskiwania hasla jest bledny! Uzyj /email recovery [email] aby wygenerowac nowy.'
+email_already_used: '&4Ten adres email jest aktualnie uzywany!'
 email_send_failure: 'Nie mozna wyslac emaila. Skontaktuj sie z administracja.'
+show_no_email: '&2Nie posiadasz adresu email przypisanego do tego konta.'
+add_email: '&cProsze dodac swoj email: /email add twojEmail powtorzEmail'
+recovery_email: '&cZapomniales hasla? Prosze uzyj komendy /email recovery <TwojEmail>'
+
+# Captcha
+usage_captcha: '&cWpisz: /captcha <theCaptcha>'
+wrong_captcha: '&cZly kod, prosze wpisac: /captcha THE_CAPTCHA'
+valid_captcha: '&cTwoj kod jest nieprawidlowy!'
--- a/src/main/resources/messages/messages_pt.yml
+++ b/src/main/resources/messages/messages_pt.yml
@ -1,43 +1,74 @@
-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!'
+# Registration
+reg_msg: '&cPor favor registe-se com "/register password confirmePassword"'
+usage_reg: '&cUse: /register seu@email.com seu@email.com'
+reg_only: '&fApenas jogadores registados! Visite http://example.com para se registar'
+# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
+registered: '&cRegistado com sucesso!'
+reg_disabled: '&cRegito de novos utilizadores desactivado'
+user_regged: '&cUtilizador já registado'
+
+# Password errors on registration
+password_error: '&fAs passwords não coincidem'
+password_error_nick: '&cNão pode o usar seu nome como senha, por favor, escolha outra ...'
+password_error_unsafe: '&cA senha escolhida não é segura, por favor, escolha outra ...'
+password_error_chars: '&4Sua senha contém caracteres ilegais. caracteres permitidos: REG_EX'
+pass_len: '&fPassword demasiado curta'
+
+# Login
 usage_log: '&cUse: /login password'
 wrong_pwd: '&cPassword errada!'
-unregistered: '&cRegisto eliminado com sucesso!'
-reg_disabled: '&cRegito de novos utilizadores desactivado'
-valid_session: '&cSessão válida'
 login: '&bAutenticado com sucesso!'
-vb_nonActiv: '&fA sua conta não foi ainda activada, verifique o seu email onde irá receber indicações para activação de conta. '
-user_regged: '&cUtilizador já registado'
-usage_reg: '&cUse: /register seu@email.com seu@email.com'
-# TODO max_reg: Missing tag %reg_names
+login_msg: '&cIdentifique-se com "/login password"'
+timeout: '&fExcedeu o tempo para autenticação'
+
+# Errors
+unknown_user: '&cUsername não registado'
+denied_command: '&cPara utilizar este comando é necessário estar logado!'
+denied_chat: '&cPara usar o chat deve estar logado!'
+not_logged_in: '&cNão autenticado!'
+# TODO tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
+# TODO: Missing tags %reg_names
 max_reg: '&cAtingiu o numero máximo de %reg_count contas registas, maximo de contas %max_acc'
 no_perm: '&cSem Permissões'
 error: '&fOcorreu um erro; Por favor contacte um admin'
-login_msg: '&cIdentifique-se com "/login password"'
-reg_msg: '&cPor favor registe-se com "/register password confirmePassword"'
+unsafe_spawn: '&fA sua localização na saída não é segura, será tele-portado para a Spawn'
+kick_forvip: '&cUm jogador VIP entrou no servidor cheio!'
+
+# AntiBot
+kick_antibot: 'Modo de protecção anti-Bot está habilitado! Tem que espere alguns minutos antes de entrar no servidor.'
+antibot_auto_enabled: '[AuthMe] AntiBotMod activado automaticamente devido a um aumento anormal de tentativas de ligação!'
+antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automaticamente após %m minutos, esperamos que a invasão tenha parado'
+
+# Other messages
+unregistered: '&cRegisto eliminado com sucesso!'
+# TODO accounts_owned_self: 'You own %count accounts:'
+# TODO accounts_owned_other: 'The player %name has %count accounts:'
+two_factor_create: '&2O seu código secreto é o %code. Você pode verificá-lo a partir daqui %url'
+# 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'
+vb_nonActiv: '&fA sua conta não foi ainda activada, verifique o seu email onde irá receber indicações para activação de conta. '
 usage_unreg: '&cUse: /unregister password'
 pwd_changed: '&cPassword alterada!'
-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'
 logged_in: '&cJá se encontra autenticado!'
 logout: '&cSaida com sucesso'
-same_nick: '&fO mesmo nickname já se encontra a jogar no servidor'
-registered: '&cRegistado com sucesso!'
-pass_len: '&fPassword demasiado curta'
 reload: '&fConfiguração e base de dados foram recarregadas'
-timeout: '&fExcedeu o tempo para autenticação'
 usage_changepassword: '&fUse: /changepassword passwordAntiga passwordNova'
+
+# Session messages
+invalid_session: '&fDados de sessão não correspondem. Por favor aguarde o fim da sessão'
+valid_session: '&cSessão válida'
+
+# Error messages when joining
 name_len: '&cO seu nick é demasiado curto ou muito longo.'
 regex: '&cO seu nickname contém caracteres não permitidos. Permitido: REG_EX'
-add_email: '&cPor favor adicione o seu email com : /email add seuEmail confirmarSeuEmail'
-recovery_email: '&cPerdeu a sua password? Para a recuperar escreva /email recovery <seuEmail>'
-usage_captcha: '&cPrecisa digitar um captcha, escreva: /captcha <theCaptcha>'
-wrong_captcha: '&cCaptcha errado, por favor escreva: /captcha THE_CAPTCHA'
-valid_captcha: '&cO seu captcha é válido!'
-kick_forvip: '&cUm jogador VIP entrou no servidor cheio!'
+country_banned: 'O seu país está banido deste servidor'
+not_owner_error: 'Não é o proprietário da conta. Por favor, escolha outro nome!'
 kick_fullserver: '&cO servidor está actualmente cheio, lamentamos!'
+same_nick: '&fO mesmo nickname já se encontra a jogar no servidor'
+invalid_name_case: 'Deve se juntar usando nome de usuário %valid, não %invalid.'
+same_ip_online: 'Um jogador com o mesmo IP já está em jogo!'
+
+# Email
 usage_email_add: '&fUse: /email add <email> <confirmeEmail> '
 usage_email_change: '&fUse: /email change <emailAntigo> <emailNovo> '
 usage_email_recovery: '&fUse: /email recovery <email>'
@ -48,28 +79,16 @@ email_added: 'Email adicionado com sucesso!'
 email_confirm: 'Confirme o seu email!'
 email_changed: 'Email alterado com sucesso!'
 email_send: 'Nova palavra-passe enviada para o seu email!'
-country_banned: 'O seu país está banido deste servidor'
-antibot_auto_enabled: '[AuthMe] AntiBotMod activado automaticamente devido a um aumento anormal de tentativas de ligação!'
-antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automaticamente após %m minutos, esperamos que a invasão tenha parado'
-password_error_nick: '&cNão pode o usar seu nome como senha, por favor, escolha outra ...'
-not_owner_error: 'Não é o proprietário da conta. Por favor, escolha outro nome!'
-two_factor_create: '&2O seu código secreto é o %code. Você pode verificá-lo a partir daqui %url'
-email_already_used: '&4O endereço de e-mail já está sendo usado'
-denied_command: '&cPara utilizar este comando é necessário estar logado!'
-same_ip_online: 'Um jogador com o mesmo IP já está em jogo!'
-password_error_chars: '&4Sua senha contém caracteres ilegais. caracteres permitidos: REG_EX'
-denied_chat: '&cPara usar o chat deve estar logado!'
-password_error_unsafe: '&cA senha escolhida não é segura, por favor, escolha outra ...'
-kick_antibot: 'Modo de protecção anti-Bot está habilitado! Tem que espere alguns minutos antes de entrar no servidor.'
 email_exists: '&cUm e-mail de recuperação já foi enviado! Pode descartá-lo e enviar um novo usando o comando abaixo:'
-invalid_name_case: 'Deve se juntar usando nome de usuário %valid, não %invalid.'
 # 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 tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
-# TODO accounts_owned_self: 'You own %count accounts:'
-# TODO accounts_owned_other: 'The player %name has %count accounts:'
-# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
 # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.'
+email_already_used: '&4O endereço de e-mail já está sendo usado'
 # 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'
+# TODO show_no_email: '&2You currently don''t have email address associated with this account.'
+add_email: '&cPor favor adicione o seu email com : /email add seuEmail confirmarSeuEmail'
+recovery_email: '&cPerdeu a sua password? Para a recuperar escreva /email recovery <seuEmail>'
+
+# Captcha
+usage_captcha: '&cPrecisa digitar um captcha, escreva: /captcha <theCaptcha>'
+wrong_captcha: '&cCaptcha errado, por favor escreva: /captcha THE_CAPTCHA'
+valid_captcha: '&cO seu captcha é válido!'
--- a/src/main/resources/messages/messages_ro.yml
+++ b/src/main/resources/messages/messages_ro.yml
@ -1,45 +1,73 @@
-kick_antibot: 'Protectia AntiBot-ului este activata! Trebuie sa astepti cateva minute pentru a intra pe server.'
-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!'
-usage_log: '&cFoloseste: /login <parola> pentru a te loga.'
-wrong_pwd: '&cParola gresita!'
-unregistered: '&cTe-ai unregistart cu succes!'
-reg_disabled: '&cInegistrarea in joc nu este activata!'
-valid_session: '&2Te-ai logat cu reconectarea sesiuni.'
-login: '&2Te-ai logat cu succes!'
-vb_nonActiv: '&cContul tau nu este activat, te rugam verifica-ti email-ul!'
-user_regged: '&cCineva este inregistrat cu acest nume!'
-no_perm: '&4Nu ai permisiunea!'
-error: '&4A aparut o eroare, te rugam contacteaza un membru din staff!'
-login_msg: '&cTe rugam sa te autentifici folosind comanda "/login <parola>"'
+# Registration
 reg_msg: '&3Te rugam sa te inregistrezi folosind comanda "/register <parola> <parola>"'
-max_reg: '&cTe-ai inregistrat cu prea multe counturi (%reg_count/%max_acc %reg_names) pentru conexiunea ta!'
 usage_reg: '&cFoloseste comanda: /register <parola> <parola>'
-usage_unreg: '&cFoloseste comanda: /unregister <parola>'
-pwd_changed: '&2Parola a fost inregistrata cu succes!'
+reg_only: '&4Doar jucatori inregistrati pot intra pe server! Te rugam foloseste http://example.ro pentru a te inregistra!'
+kicked_admin_registered: 'Un administrator tocmai te-a inregistrat, te rog autentifica-te din nou.'
+registered: '&2Te-ai inregistrat cu succes!'
+reg_disabled: '&cInegistrarea in joc nu este activata!'
+user_regged: '&cCineva este inregistrat cu acest nume!'
+
+# Password errors on registration
 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...'
-invalid_session: '&cIP-ul tau a fost schimbat si sesiunea ta a expirat!'
-reg_only: '&4Doar jucatori inregistrati pot intra pe server! Te rugam foloseste http://example.ro pentru a te inregistra!'
+password_error_chars: '&4Parola ta contine caractere ilegale. Caractere permise: REG_EX'
+pass_len: '&cParola ta este prea scurta pentru a te inregistra! Te rugam incearca alta!'
+
+# Login
+usage_log: '&cFoloseste: /login <parola> pentru a te loga.'
+wrong_pwd: '&cParola gresita!'
+login: '&2Te-ai logat cu succes!'
+login_msg: '&cTe rugam sa te autentifici folosind comanda "/login <parola>"'
+timeout: '&4A expirat timpul de autentificare si ai fost dat afara de server, te rugam incearca din nou!'
+
+# Errors
+unknown_user: '&cAcest jucator nu este inregistrat!'
+denied_command: '&cPentru a folosi comanda trebuie sa te autentifici!'
+denied_chat: 'Pentru a folosi chat-ul trebuie sa te autentifici!'
+not_logged_in: '&cNu te-ai logat!'
+tempban_max_logins: '&cAi fost interzis temporar deoarece ai incercat sa te autentifici de prea multe ori.'
+max_reg: '&cTe-ai inregistrat cu prea multe counturi (%reg_count/%max_acc %reg_names) pentru conexiunea ta!'
+no_perm: '&4Nu ai permisiunea!'
+error: '&4A aparut o eroare, te rugam contacteaza un membru din staff!'
+unsafe_spawn: '&cLocatia in care esti acum nu este sigura, ai fost teleportat la spawn.'
+kick_forvip: '&3Un V.I.P a intrat pe server cand era plin!'
+
+# AntiBot
+kick_antibot: 'Protectia AntiBot-ului este activata! Trebuie sa astepti cateva minute pentru a intra pe server.'
+antibot_auto_enabled: '&4[AntiBotService] AntiBot-ul a fost activat din cauza numărului mare de conexiuni!'
+antibot_auto_disabled: '&2[AntiBotService] AntiBot-ul a fost dezactivat dupa %m de minute!'
+
+# Other messages
+unregistered: '&cTe-ai unregistart cu succes!'
+accounts_owned_self: 'Detii %count conturi:'
+accounts_owned_other: 'Jucatorul %name are %count conturi:'
+two_factor_create: '&2Codul tau secret este %code. Il poti scana de aici %url'
+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.'
+vb_nonActiv: '&cContul tau nu este activat, te rugam verifica-ti email-ul!'
+usage_unreg: '&cFoloseste comanda: /unregister <parola>'
+pwd_changed: '&2Parola a fost inregistrata cu succes!'
 logged_in: '&cEsti deja autentificat!'
 logout: '&2Te-ai dezautentificat cu succes!'
-same_nick: '&4Acelasi nume se joaca deja pe server!'
-registered: '&2Te-ai inregistrat cu succes!'
-pass_len: '&cParola ta este prea scurta pentru a te inregistra! Te rugam incearca alta!'
 reload: '&2Configuratiile si baza de date sau reincarcat corect!'
-timeout: '&4A expirat timpul de autentificare si ai fost dat afara de server, te rugam incearca din nou!'
 usage_changepassword: '&cFoloseste comanda: /changepassword <parola veche> <parola noua>'
+
+# Session messages
+invalid_session: '&cIP-ul tau a fost schimbat si sesiunea ta a expirat!'
+valid_session: '&2Te-ai logat cu reconectarea sesiuni.'
+
+# Error messages when joining
 name_len: '&4Numele tau este prea scurt pentru a te inregistra!'
 regex: '&4Numele tau contine caractere ilegale. Caractere permise: REG_EX'
-add_email: '&3Te rugam adaugati email-ul la contul tau folosind comanda "/email add <email> <email>"'
-recovery_email: '&3Ti-ai uitat parola? Te rugam foloseste comanda "/email recovery <email>"'
-usage_captcha: '&3Pentru a te autentifica trebuie sa folosesti codul de la captcha, te rugam foloseste comanda "/captcha <theCaptcha>"'
-wrong_captcha: '&cCod-ul captcha este gresit, te rugam foloseste comanda "/captcha THE_CAPTCHA"!'
-valid_captcha: '&2Cod-ul captcha a fost scris corect!'
-kick_forvip: '&3Un V.I.P a intrat pe server cand era plin!'
+country_banned: '&4Tara ta este interzisa pe acest server!'
+not_owner_error: 'Tu nu esti detinatorul acestui cont. Te rugam alege alt nume!'
 kick_fullserver: '&4Server-ul este plin, te rugam incearca din nou mai tarziu!'
+same_nick: '&4Acelasi nume se joaca deja pe server!'
+invalid_name_case: 'Ar trebui sa intri cu numele %valid nu %invalid'
+same_ip_online: 'Un jucator cu acelasi IP joaca deja!'
+
+# Email
 usage_email_add: '&cFoloseste comanda: /email add <email> <email>'
 usage_email_change: '&cFoloseste comanda: /email change <email vechi> <email nou>'
 usage_email_recovery: '&cFoloseste comanda: /email recovery <email>'
@ -51,24 +79,15 @@ email_confirm: '&cTe rugam confirma adresa de email!'
 email_changed: '&2Email-ul a fost schimbat corect!'
 email_send: ' &2Recuperarea email-ul a fost trimis cu succes! Te rugam sa verificati email-ul in inbox!'
 email_exists: '&cRecuperarea email-ului a fost deja trimisa! Puteti sa-l anulati si sa trimiteti unul nou folosind comanda de mai jos:'
-country_banned: '&4Tara ta este interzisa pe acest server!'
-antibot_auto_enabled: '&4[AntiBotService] AntiBot-ul a fost activat din cauza numărului mare de conexiuni!'
-antibot_auto_disabled: '&2[AntiBotService] AntiBot-ul a fost dezactivat dupa %m de minute!'
-email_already_used: '&4Email-ul a fost deja folosit'
-two_factor_create: '&2Codul tau secret este %code. Il poti scana de aici %url'
-not_owner_error: 'Tu nu esti detinatorul acestui cont. Te rugam alege alt nume!'
-invalid_name_case: 'Ar trebui sa intri cu numele %valid nu %invalid'
-denied_command: '&cPentru a folosi comanda trebuie sa te autentifici!'
-same_ip_online: 'Un jucator cu acelasi IP joaca deja!'
-denied_chat: 'Pentru a folosi chat-ul trebuie sa te autentifici!'
-password_error_chars: '&4Parola ta contine caractere ilegale. Caractere permise: REG_EX'
 email_show: '&2Adresa ta curenta de email este: &f%email'
-show_no_email: '&2Nu ai nici-o adresa de email asociat cu acest cont.'
-tempban_max_logins: '&cAi fost interzis temporar deoarece ai incercat sa te autentifici de prea multe ori.'
-accounts_owned_self: 'Detii %count conturi:'
-accounts_owned_other: 'Jucatorul %name are %count conturi:'
-kicked_admin_registered: 'Un administrator tocmai te-a inregistrat, te rog autentifica-te din nou.'
 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.'
+email_already_used: '&4Email-ul a fost deja folosit'
 # TODO email_send_failure: 'The email could not be sent. Please contact an administrator.'
+show_no_email: '&2Nu ai nici-o adresa de email asociat cu acest cont.'
+add_email: '&3Te rugam adaugati email-ul la contul tau folosind comanda "/email add <email> <email>"'
+recovery_email: '&3Ti-ai uitat parola? Te rugam foloseste comanda "/email recovery <email>"'
+
+# Captcha
+usage_captcha: '&3Pentru a te autentifica trebuie sa folosesti codul de la captcha, te rugam foloseste comanda "/captcha <theCaptcha>"'
+wrong_captcha: '&cCod-ul captcha este gresit, te rugam foloseste comanda "/captcha THE_CAPTCHA"!'
+valid_captcha: '&2Cod-ul captcha a fost scris corect!'
--- a/src/main/resources/messages/messages_ru.yml
+++ b/src/main/resources/messages/messages_ru.yml
@ -1,46 +1,74 @@
-unknown_user: '&c&lТакой игрок не зарегистрирован'
-unsafe_spawn: '&eВаше расположение перед выходом было опасным - вы перенесены на спавн'
-not_logged_in: '&c&lВы еще не вошли!'
+# Registration
+reg_msg: '&a&lРегистрация: &e&l/reg ПАРОЛЬ ПОВТОР_ПАРОЛЯ'
+usage_reg: '&c&lИспользование: &e&l/reg ПАРОЛЬ ПОВТОР_ПАРОЛЯ'
+reg_only: '&c&lТолько для зарегистрированных! Посетите http://сайт_сервера.com/register/ для регистрации'
+kicked_admin_registered: 'Администратор зарегистрировал ваш аккаунт. Пожалуйста, войдите снова'
+registered: '&a&lУспешная регистрация!'
+reg_disabled: '&c&lРегистрация отключена'
+user_regged: '&c&lТакой игрок уже зарегистрирован'
+
+# Password errors on registration
+password_error: '&c&lПароль не совпадает'
+password_error_nick: '&c&lВы не можете использовать ваш ник в роли пароля'
+password_error_unsafe: '&c&lВы не можете использовать небезопасный пароль'
+password_error_chars: '&4Ваш пароль содержит недоступные символы. Доступные: REG_EX'
+pass_len: '&c&lТвой пароль либо слишком длинный, либо слишком короткий'
+
+# Login
 usage_log: '&eСинтаксис: &d/login ПАРОЛЬ'
 wrong_pwd: '&c&lНеправильный пароль!'
-unregistered: '&6Вы успешно удалили свой аккаунт!'
-reg_disabled: '&c&lРегистрация отключена'
-valid_session: '&aСессия открыта'
 login: '&a&lВы успешно вошли!'
-vb_nonActiv: '&6Ваш аккаунт еще не активирован! Проверьте вашу почту!'
-user_regged: '&c&lТакой игрок уже зарегистрирован'
-usage_reg: '&c&lИспользование: &e&l/reg ПАРОЛЬ ПОВТОР_ПАРОЛЯ'
-# TODO max_reg: Missing tags %reg_count, %max_acc, %reg_names
+login_msg: '&a&lАвторизация: &e&l/login ПАРОЛЬ'
+timeout: '&c&lВремя для авторизации истекло'
+
+# Errors
+unknown_user: '&c&lТакой игрок не зарегистрирован'
+denied_command: '&cДля использования этой команды, вы должны авторизоваться!'
+denied_chat: '&cДля общения в чате вы должны авторизоваться!'
+not_logged_in: '&c&lВы еще не вошли!'
+tempban_max_logins: '&cВы были временно забанены, потому что вы пытались войти в систему слишком много раз.'
+# TODO: Missing tags %reg_count, %max_acc, %reg_names
 max_reg: '&c&lВы превысили макс количество регистраций на ваш IP'
 no_perm: '&c&lНедостаточно прав'
 error: '&c&lПроизошла ошибка. Свяжитесь с администратором'
-login_msg: '&a&lАвторизация: &e&l/login ПАРОЛЬ'
-reg_msg: '&a&lРегистрация: &e&l/reg ПАРОЛЬ ПОВТОР_ПАРОЛЯ'
-password_error_nick: '&c&lВы не можете использовать ваш ник в роли пароля'
-password_error_unsafe: '&c&lВы не можете использовать небезопасный пароль'
-regex: '&c&lВаш пароль содержит запрещенные символы. Разрешенные символы: REG_EX'
+unsafe_spawn: '&eВаше расположение перед выходом было опасным - вы перенесены на спавн'
+kick_forvip: '&6VIP игрок зашел на переполненный сервер!'
+
+# AntiBot
+kick_antibot: '&a[AuthMe] AntiBot защита включена! Вы должны подождать перед следующим входом на сервер.'
+antibot_auto_enabled: '&a[AuthMe] AntiBot-режим автоматически включен из-за большого количества входов!'
+antibot_auto_disabled: '&a[AuthMe] AntiBot-режим автоматичски отключен после %m мин. Надеюсь атака закончилась'
+
+# Other messages
+unregistered: '&6Вы успешно удалили свой аккаунт!'
+accounts_owned_self: 'Вы являетесь владельцем %count аккаунтов:'
+accounts_owned_other: 'Игрок %name имеет %count аккаунтов:'
+two_factor_create: '&2Ваш секретный код %code. Вы должны просканировать его здесь %url'
+recovery_code_sent: 'Код восстановления для сброса пароля был отправлен на вашу электронную почту.'
+recovery_code_incorrect: 'Код восстановления неверный! Введите /email recovery [email], чтобы отправить новый код'
+vb_nonActiv: '&6Ваш аккаунт еще не активирован! Проверьте вашу почту!'
 usage_unreg: '&c&lИспользование: &e&l/unregister ПАРОЛЬ'
 pwd_changed: '&2Пароль изменен!'
-password_error: '&c&lПароль не совпадает'
-invalid_session: '&c&lСессия некорректна. Дождитесь, пока она закончится'
-reg_only: '&c&lТолько для зарегистрированных! Посетите http://сайт_сервера.com/register/ для регистрации'
 logged_in: '&c&lВы уже авторизированы!'
 logout: '&2Вы успешно вышли'
-same_nick: '&c&lТакой игрок уже играет на сервере'
-registered: '&a&lУспешная регистрация!'
-pass_len: '&c&lТвой пароль либо слишком длинный, либо слишком короткий'
 reload: '&6Конфигурация и база данных перезагружены'
-timeout: '&c&lВремя для авторизации истекло'
 usage_changepassword: '&c&lИспользование: &e&l/changepassword СТАРЫЙ_ПАРОЛЬ НОВЫЙ_ПАРОЛЬ'
+
+# Session messages
+invalid_session: '&c&lСессия некорректна. Дождитесь, пока она закончится'
+valid_session: '&aСессия открыта'
+
+# Error messages when joining
 name_len: '&c&lВаш ник слишком длинный или слишком короткий'
-regex: '&c&lВаш логин содержит запрещенные символы. Разрешенные символы: REG_EX'
-add_email: '&c&lДобавьте свой email: &e&l/email add ВАШ_EMAIL ВАШ_EMAIL'
-recovery_email: '&c&lЗабыли пароль? Используйте &e&l/email recovery ВАШ_EMAIL'
-usage_captcha: '&c&lВы должны ввести код, используйте: &e&l/captcha <theCaptcha>'
-wrong_captcha: '&c&lНеверный код, используйте: &e&l/captcha THE_CAPTCHA'
-valid_captcha: '&2Вы успешно ввели код!'
-kick_forvip: '&6VIP игрок зашел на переполненный сервер!'
+regex: '&c&lВаш пароль содержит запрещенные символы. Разрешенные символы: REG_EX'
+country_banned: 'Вход с IP-адресов вашей страны воспрещен на этом сервере'
+not_owner_error: 'Вы не владелец этого аккаунта. Пожалуйста, выберите себе другой ник!'
 kick_fullserver: '&c&lСервер переполнен!'
+same_nick: '&c&lТакой игрок уже играет на сервере'
+invalid_name_case: 'Вы должны использовать ник %valid, а не %invalid.'
+same_ip_online: 'Игрок с таким же IP как у вас уже на сервере!'
+
+# Email
 usage_email_add: '&c&lИспользование: &e&l/email add ВАШ_EMAIL ПОВТОР_EMAIL'
 usage_email_change: '&c&lИспользование: &e&l/email change СТАРЫЙ_EMAIL НОВЫЙ_EMAIL'
 usage_email_recovery: '&c&lИспользование: /email recovery EMAIL'
@ -51,26 +79,16 @@ email_added: '[AuthMe] Email добавлен!'
 email_confirm: '[AuthMe] Подтвердите ваш Email!'
 email_changed: '[AuthMe] Email изменен!'
 email_send: '[AuthMe] Письмо с инструкциями для восстановления было отправлено на ваш Email!'
-country_banned: 'Вход с IP-адресов вашей страны воспрещен на этом сервере'
-antibot_auto_enabled: '&a[AuthMe] AntiBot-режим автоматически включен из-за большого количества входов!'
-antibot_auto_disabled: '&a[AuthMe] AntiBot-режим автоматичски отключен после %m мин. Надеюсь атака закончилась'
-not_owner_error: 'Вы не владелец этого аккаунта. Пожалуйста, выберите себе другой ник!'
-two_factor_create: '&2Ваш секретный код %code. Вы должны просканировать его здесь %url'
-email_already_used: '&4Этот email уже используется.'
-denied_command: '&cДля использования этой команды, вы должны авторизоваться!'
-same_ip_online: 'Игрок с таким же IP как у вас уже на сервере!'
-password_error_chars: '&4Ваш пароль содержит недоступные символы. Доступные: REG_EX'
-denied_chat: '&cДля общения в чате вы должны авторизоваться!'
-kick_antibot: '&a[AuthMe] AntiBot защита включена! Вы должны подождать перед следующим входом на сервер.'
 email_exists: '&cВосстановительное письмо через email отправлено! Вы можете отменить его командой ниже:'
-invalid_name_case: 'Вы должны использовать ник %valid, а не %invalid.'
-accounts_owned_other: 'Игрок %name имеет %count аккаунтов:'
-kicked_admin_registered: 'Администратор зарегистрировал ваш аккаунт. Пожалуйста, войдите снова'
-tempban_max_logins: '&cВы были временно забанены, потому что вы пытались войти в систему слишком много раз.'
-accounts_owned_self: 'Вы являетесь владельцем %count аккаунтов:'
-incomplete_email_settings: 'Ошибка: не все необходимые параметры установлены для отправки электронной почты. Пожалуйста, обратитесь к администратору.'
 email_show: '&2Ваш текущий адрес электронной почты: &f%email'
-show_no_email: '&2В данный момент к вашему аккаунте не привязана электронная почта.'
-recovery_code_sent: 'Код восстановления для сброса пароля был отправлен на вашу электронную почту.'
-recovery_code_incorrect: 'Код восстановления неверный! Введите /email recovery [email], чтобы отправить новый код'
+incomplete_email_settings: 'Ошибка: не все необходимые параметры установлены для отправки электронной почты. Пожалуйста, обратитесь к администратору.'
+email_already_used: '&4Этот email уже используется.'
 # TODO email_send_failure: 'The email could not be sent. Please contact an administrator.'
+show_no_email: '&2В данный момент к вашему аккаунте не привязана электронная почта.'
+add_email: '&c&lДобавьте свой email: &e&l/email add ВАШ_EMAIL ВАШ_EMAIL'
+recovery_email: '&c&lЗабыли пароль? Используйте &e&l/email recovery ВАШ_EMAIL'
+
+# Captcha
+usage_captcha: '&c&lВы должны ввести код, используйте: &e&l/captcha <theCaptcha>'
+wrong_captcha: '&c&lНеверный код, используйте: &e&l/captcha THE_CAPTCHA'
+valid_captcha: '&2Вы успешно ввели код!'
--- a/src/main/resources/messages/messages_sk.yml
+++ b/src/main/resources/messages/messages_sk.yml
@ -1,53 +1,78 @@
 #         Slovak translate by Judzi         #
 #     www.judzi.eu | judzi@cs-gaming.eu     #
 #   02.02.2013 - 4:35 AM - Thanks for use   #
-logged_in: '&cAktuálne si uz prihláseny!'
-not_logged_in: '&cNie si este prihláseny!'
+
+# Registration
+reg_msg: '&cZaregistruj sa príkazom "/register heslo zopakujHeslo"'
+usage_reg: '&cPríkaz: /register heslo zopakujHeslo'
+reg_only: '&fVstup iba pre registrovanych! Navstiv http://example.com pre registráciu'
+# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
+registered: '&cBol si úspesne zaregistrovany'
 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'
-pwd_changed: '&cHeslo zmenené!'
-reg_only: '&fVstup iba pre registrovanych! Navstiv http://example.com pre registráciu'
-valid_session: '&cZapamätané prihlásenie'
-login_msg: '&cPrihlás sa príkazom "/login heslo"'
-reg_msg: '&cZaregistruj sa príkazom "/register heslo zopakujHeslo"'
-timeout: '&fVyprsal cas na prihlásenie'
-wrong_pwd: '&cZadal si zlé heslo'
-logout: '&cBol si úspesne odhláseny'
-usage_unreg: '&cPríkaz: /unregister heslo'
-registered: '&cBol si úspesne zaregistrovany'
-unregistered: '&cUcet bol vymazany!'
-login: '&cBol si úspesne prihláseny!'
-no_perm: '&cZiadne'
-same_nick: '&fHrác s tymto nickom uz hrá!'
-reload: '&fKonfigurácia a databáza bola obnovená'
-error: '&fNastala chyba; Kontaktujte administrátora'
-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
-max_reg: '&fDosiahol si maximum registrovanych uctov.'
+
+# Password errors on registration
 password_error: '&fHeslá sa nezhodujú'
-pass_len: '&fHeslo je velmi kratke alebo dlhe'
-vb_nonActiv: '&fUcet nie je aktivny. Prezri si svoj e-mail!'
-usage_changepassword: '&fPríkaz: /changepassword stareHeslo noveHeslo'
-name_len: '&cTvoje meno je velmi krátke alebo dlhé'
-regex: '&cTvoje meno obsahuje zakázané znaky. Povolené znaky: REG_EX'
-add_email: '&cPridaj svoj e-mail príkazom "/email add email zopakujEmail"'
-recovery_email: '&cZabudol si heslo? Pouzi príkaz /email recovery <tvojEmail>'
-# TODO denied_command: '&cIn order to use this command you must be authenticated!'
-# TODO same_ip_online: 'A player with the same IP is already in game!'
-# TODO denied_chat: '&cIn order to chat you must be authenticated!'
-# TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
 # TODO password_error_nick: '&cYou can''t use your name as password, please choose another one...'
 # TODO password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...'
 # TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
-# TODO usage_captcha: '&3To login you have to solve a captcha code, please use the command "/captcha <theCaptcha>"'
-# TODO wrong_captcha: '&cWrong captcha, please type "/captcha THE_CAPTCHA" into the chat!'
-# TODO valid_captcha: '&2Captcha code solved correctly!'
+pass_len: '&fHeslo je velmi kratke alebo dlhe'
+
+# Login
+usage_log: '&cPríkaz: /login heslo'
+wrong_pwd: '&cZadal si zlé heslo'
+login: '&cBol si úspesne prihláseny!'
+login_msg: '&cPrihlás sa príkazom "/login heslo"'
+timeout: '&fVyprsal cas na prihlásenie'
+
+# Errors
+unknown_user: '&cZadané meno nie je zaregistrované!'
+# TODO denied_command: '&cIn order to use this command you must be authenticated!'
+# TODO denied_chat: '&cIn order to chat you must be authenticated!'
+not_logged_in: '&cNie si este prihláseny!'
+# TODO tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
+# TODO: Missing tags %reg_count, %max_acc, %reg_names
+max_reg: '&fDosiahol si maximum registrovanych uctov.'
+no_perm: '&cZiadne'
+error: '&fNastala chyba; Kontaktujte administrátora'
+unsafe_spawn: '&fTvoj pozícia bol nebezpecná, teleportujem hraca na spawn'
 # TODO kick_forvip: '&3A VIP player has joined the server when it was full!'
+
+# AntiBot
+# TODO kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.'
+# TODO antibot_auto_enabled: '&4[AntiBotService] AntiBot enabled due to the huge number of connections!'
+# TODO antibot_auto_disabled: '&2[AntiBotService] AntiBot disabled after %m minutes!'
+
+# Other messages
+unregistered: '&cUcet bol vymazany!'
+# TODO accounts_owned_self: 'You own %count accounts:'
+# TODO accounts_owned_other: 'The player %name has %count accounts:'
+# TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
+# 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'
+vb_nonActiv: '&fUcet nie je aktivny. Prezri si svoj e-mail!'
+usage_unreg: '&cPríkaz: /unregister heslo'
+pwd_changed: '&cHeslo zmenené!'
+logged_in: '&cAktuálne si uz prihláseny!'
+logout: '&cBol si úspesne odhláseny'
+reload: '&fKonfigurácia a databáza bola obnovená'
+usage_changepassword: '&fPríkaz: /changepassword stareHeslo noveHeslo'
+
+# Session messages
+invalid_session: '&fZapamätane casove data nie su doveryhodne. Cakaj na ukoncenie spojenia'
+valid_session: '&cZapamätané prihlásenie'
+
+# Error messages when joining
+name_len: '&cTvoje meno je velmi krátke alebo dlhé'
+regex: '&cTvoje meno obsahuje zakázané znaky. Povolené znaky: REG_EX'
+# TODO country_banned: '&4Your country is banned from this server!'
+# TODO not_owner_error: 'You are not the owner of this account. Please choose another name!'
 # TODO kick_fullserver: '&4The server is full, try again later!'
+same_nick: '&fHrác s tymto nickom uz hrá!'
+# TODO invalid_name_case: 'You should join using username %valid, not %invalid.'
+# TODO same_ip_online: 'A player with the same IP is already in game!'
+
+# Email
 # TODO usage_email_add: '&cUsage: /email add <email> <confirmEmail>'
 # TODO usage_email_change: '&cUsage: /email change <oldEmail> <newEmail>'
 # TODO usage_email_recovery: '&cUsage: /email recovery <Email>'
@ -57,22 +82,17 @@ recovery_email: '&cZabudol si heslo? Pouzi príkaz /email recovery <tvojEmail>'
 # TODO email_added: '&2Email address successfully added to your account!'
 # TODO email_confirm: '&cPlease confirm your email address!'
 # TODO email_changed: '&2Email address changed correctly!'
-# 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: '&2Recovery email sent successfully! Please check your email inbox!'
 # TODO email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:'
-# TODO country_banned: '&4Your country is banned from this server!'
-# TODO antibot_auto_enabled: '&4[AntiBotService] AntiBot enabled due to the huge number of connections!'
-# TODO antibot_auto_disabled: '&2[AntiBotService] AntiBot disabled after %m minutes!'
-# TODO email_already_used: '&4The email address is already being used'
-# TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
-# 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 tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
-# TODO accounts_owned_self: 'You own %count accounts:'
-# TODO accounts_owned_other: 'The player %name has %count accounts:'
-# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
+# TODO email_show: '&2Your current email address is: &f%email'
 # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.'
+# TODO email_already_used: '&4The email address is already being used'
 # 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'
+# TODO show_no_email: '&2You currently don''t have email address associated with this account.'
+add_email: '&cPridaj svoj e-mail príkazom "/email add email zopakujEmail"'
+recovery_email: '&cZabudol si heslo? Pouzi príkaz /email recovery <tvojEmail>'
+
+# Captcha
+# TODO usage_captcha: '&3To login you have to solve a captcha code, please use the command "/captcha <theCaptcha>"'
+# TODO wrong_captcha: '&cWrong captcha, please type "/captcha THE_CAPTCHA" into the chat!'
+# TODO valid_captcha: '&2Captcha code solved correctly!'
--- a/src/main/resources/messages/messages_tr.yml
+++ b/src/main/resources/messages/messages_tr.yml
@ -1,45 +1,73 @@
-kick_antibot: 'AntiBot koruma modu aktif! Birkac dakika sonra tekrar girmeyi deneyin.'
-unknown_user: '&cBu oyuncu kayitli degil!'
-unsafe_spawn: '&cOyundan ciktigin yer guvenli degil, baslangic noktasina isinlaniyorsun.'
-not_logged_in: '&cGiris yapmadin!'
-usage_log: '&cKullanim: /login <sifre>'
-wrong_pwd: '&cYanlis sifre!'
-unregistered: '&cKayit basariyla kaldirildi!'
-reg_disabled: '&cOyun icin kayit olma kapatildi!'
-valid_session: '&2Oturum icin yeniden giris gerekiyor.'
-login: '&2Giris basarili!'
-vb_nonActiv: '&cHeabiniz henuz aktif edilmemis, e-postanizi kontrol edin!'
-user_regged: '&cSenin adinda daha once birisi kaydolmus!'
-usage_reg: '&cKullanim: /register <sifre> <TekrarSifre>'
-max_reg: '&cSen maksimum kayit sinirini astin (%reg_count/%max_acc %reg_names)!'
-no_perm: '&4Bunu yapmak icin iznin yok!'
-error: '&4Beklenmedik bir hata olustu, yetkili ile iletisime gecin!'
-login_msg: '&cLutfen giris komutunu kullanin "/login <sifre>"'
+# Registration
 reg_msg: '&3Lutfen kayit komutunu kullanin "/register <sifre> <TekrarSifre>"'
-usage_unreg: '&cKullanim: /unregister <sifre>'
-pwd_changed: '&2Sifre basariyla degistirildi!'
+usage_reg: '&cKullanim: /register <sifre> <TekrarSifre>'
+reg_only: '&4Sunucuya kayit sadece internet uzerinden yapilmakta! Lutfen http://ornek.com sitesini kayit icin ziyaret edin!'
+# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
+registered: '&2Basariyla kaydoldun!'
+reg_disabled: '&cOyun icin kayit olma kapatildi!'
+user_regged: '&cSenin adinda daha once birisi kaydolmus!'
+
+# Password errors on registration
 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...'
-invalid_session: '&cIP adresin degistirildi ve oturum suren doldu!'
-reg_only: '&4Sunucuya kayit sadece internet uzerinden yapilmakta! Lutfen http://ornek.com sitesini kayit icin ziyaret edin!'
+# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
+pass_len: '&cSenin sifren ya cok kisa yada cok uzun! Lutfen farkli birsey dene!'
+
+# Login
+usage_log: '&cKullanim: /login <sifre>'
+wrong_pwd: '&cYanlis sifre!'
+login: '&2Giris basarili!'
+login_msg: '&cLutfen giris komutunu kullanin "/login <sifre>"'
+timeout: '&4Giris izni icin verilen zaman suresini astigin icin sunucudan atildin, tekrar deneyin!'
+
+# Errors
+unknown_user: '&cBu oyuncu kayitli degil!'
+# TODO denied_command: '&cIn order to use this command you must be authenticated!'
+# TODO denied_chat: '&cIn order to chat you must be authenticated!'
+not_logged_in: '&cGiris yapmadin!'
+# TODO tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
+max_reg: '&cSen maksimum kayit sinirini astin (%reg_count/%max_acc %reg_names)!'
+no_perm: '&4Bunu yapmak icin iznin yok!'
+error: '&4Beklenmedik bir hata olustu, yetkili ile iletisime gecin!'
+unsafe_spawn: '&cOyundan ciktigin yer guvenli degil, baslangic noktasina isinlaniyorsun.'
+kick_forvip: '&3Bir VIP oyuna giris yaptigi icin atildin!'
+
+# AntiBot
+kick_antibot: 'AntiBot koruma modu aktif! Birkac dakika sonra tekrar girmeyi deneyin.'
+antibot_auto_enabled: '&4[AntiBotServis] Saldiri oldugu icin AntiBot aktif edildi!'
+antibot_auto_disabled: '&2[AntiBotServis] AntiBot, %m dakika sonra deaktif edilecek!'
+
+# Other messages
+unregistered: '&cKayit basariyla kaldirildi!'
+# TODO accounts_owned_self: 'You own %count accounts:'
+# TODO accounts_owned_other: 'The player %name has %count accounts:'
+two_factor_create: '&2Gizli kodunuz %code. Buradan test edebilirsin, %url'
+# 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'
+vb_nonActiv: '&cHeabiniz henuz aktif edilmemis, e-postanizi kontrol edin!'
+usage_unreg: '&cKullanim: /unregister <sifre>'
+pwd_changed: '&2Sifre basariyla degistirildi!'
 logged_in: '&cZaten giris yaptin!'
 logout: '&2Basariyla cikis yaptin!'
-same_nick: '&4Senin isminde bir oyuncu suncuda bulunmakta!'
-registered: '&2Basariyla kaydoldun!'
-pass_len: '&cSenin sifren ya cok kisa yada cok uzun! Lutfen farkli birsey dene!'
 reload: '&2Ayarlar ve veritabani yenilendi!'
-timeout: '&4Giris izni icin verilen zaman suresini astigin icin sunucudan atildin, tekrar deneyin!'
 usage_changepassword: '&cKullanim: /changepassword <eskiSifre> <yeniSifre>'
+
+# Session messages
+invalid_session: '&cIP adresin degistirildi ve oturum suren doldu!'
+valid_session: '&2Oturum icin yeniden giris gerekiyor.'
+
+# Error messages when joining
 name_len: '&4Senin ismin ya cok kisa yada cok uzun!'
 regex: '&4Senin isminde uygunsuz karakterler bulunmakta. Izin verilen karakterler: REG_EX'
-add_email: '&3Lutfen hesabinize eposta adresinizi komut ile ekleyin "/email add <eposta> <tekrarEposta>"'
-recovery_email: '&3Sifreni mi unuttun ? Komut kullanarak ogrenebilirsin "/email recovery <eposta>"'
-usage_captcha: '&3Giris yapmak icin guvenlik kodunu komut yazarak girin "/captcha <theCaptcha>"'
-wrong_captcha: '&cYanlis guvenlik kodu, kullanim sekli "/captcha THE_CAPTCHA" sohbete yazin!'
-valid_captcha: '&2Guvenlik kodu dogrulandi!'
-kick_forvip: '&3Bir VIP oyuna giris yaptigi icin atildin!'
+country_banned: '&4Senin bolgen sunucudan yasaklandi!'
+not_owner_error: 'Bu hesabin sahibi degilsin. Lutfen farkli bir isim sec!'
 kick_fullserver: '&4Sunucu suanda dolu, daha sonra tekrar deneyin!'
+same_nick: '&4Senin isminde bir oyuncu suncuda bulunmakta!'
+invalid_name_case: 'Oyuna %valid isminde katilmalisin. %invalid ismini kullanarak katilamazsin.'
+# TODO same_ip_online: 'A player with the same IP is already in game!'
+
+# Email
 usage_email_add: '&cKullanim: /email add <eposta> <tekrarEposta>'
 usage_email_change: '&cKullanim: /email change <eskiEposta> <yeniEposta>'
 usage_email_recovery: '&cKullanim: /email recovery <Eposta>'
@ -51,24 +79,15 @@ email_confirm: '&cLutfen tekrar epostanizi giriniz!'
 email_changed: '&2Epostaniz basariyla degistirildi!'
 email_send: '&2Sifreniz epostaniza gonderildi! Lutfen eposta kutunuzu kontrol edin!'
 email_exists: '&cSifreniz zaten epostanize gonderildi! Bunu iptal etmek veya yeni bir sifre gondermek icin assagidaki komutu kullanabilirsin:'
-country_banned: '&4Senin bolgen sunucudan yasaklandi!'
-antibot_auto_enabled: '&4[AntiBotServis] Saldiri oldugu icin AntiBot aktif edildi!'
-antibot_auto_disabled: '&2[AntiBotServis] AntiBot, %m dakika sonra deaktif edilecek!'
-email_already_used: '&4Eposta adresi zaten kullaniliyor.'
-two_factor_create: '&2Gizli kodunuz %code. Buradan test edebilirsin, %url'
-not_owner_error: 'Bu hesabin sahibi degilsin. Lutfen farkli bir isim sec!'
-invalid_name_case: 'Oyuna %valid isminde katilmalisin. %invalid ismini kullanarak katilamazsin.'
-# TODO denied_command: '&cIn order to use this command you must be authenticated!'
-# TODO same_ip_online: 'A player with the same IP is already in game!'
-# TODO denied_chat: '&cIn order to chat you must be authenticated!'
-# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
 # 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 tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
-# TODO accounts_owned_self: 'You own %count accounts:'
-# TODO accounts_owned_other: 'The player %name has %count accounts:'
-# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
 # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.'
+email_already_used: '&4Eposta adresi zaten kullaniliyor.'
 # 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'
+# TODO show_no_email: '&2You currently don''t have email address associated with this account.'
+add_email: '&3Lutfen hesabinize eposta adresinizi komut ile ekleyin "/email add <eposta> <tekrarEposta>"'
+recovery_email: '&3Sifreni mi unuttun ? Komut kullanarak ogrenebilirsin "/email recovery <eposta>"'
+
+# Captcha
+usage_captcha: '&3Giris yapmak icin guvenlik kodunu komut yazarak girin "/captcha <theCaptcha>"'
+wrong_captcha: '&cYanlis guvenlik kodu, kullanim sekli "/captcha THE_CAPTCHA" sohbete yazin!'
+valid_captcha: '&2Guvenlik kodu dogrulandi!'
--- a/src/main/resources/messages/messages_uk.yml
+++ b/src/main/resources/messages/messages_uk.yml
@ -1,49 +1,73 @@
-denied_command: '&cДля використання цієї команди потрібна авторизація.'
-same_ip_online: 'Перевищено ліміт на авторизацію з одного IP.'
-denied_chat: '&cДля доступу до чату потрібна авторизація.'
-kick_antibot: 'На сервер здійснено DDoS атаку. Будь ласка, зачекайте декілька хвилин доки активність спаде.'
-unknown_user: '&cЦей гравець не є зареєстрованим.'
-unsafe_spawn: '&cВаше останнє місцезнаходження не є безпечним. Вас було переміщено на точку спавна.'
-not_logged_in: '&cВи не авторизовані!'
-usage_log: '&cСинтаксис: /login <пароль>'
-wrong_pwd: '&cНевірний пароль!'
-unregistered: '&cДані про реєстрацію успішно видалено'
-reg_disabled: '&cВнутрішньоігрову реєстрацію зараз вимкнено.'
-valid_session: '&2Сесію відновлено.'
-login: '&2Успішна авторизація!'
-vb_nonActiv: '&cВаш акаунт ще не активовано. Будь ласка, провірте свою електронну пошту!'
-user_regged: '&cТакий нікнейм вже зареєстровано.'
-usage_reg: '&cСинтаксис: /register <пароль> <повторПароля>'
-max_reg: '&cВичерпано ліміт реєстрацій (%reg_count/%max_acc %reg_names) для вашого підключення!'
-no_perm: '&4У вас недостатньо прав, щоб застосувати цю команду!'
-error: '&4[AuthMe] Error. Будь ласка, повідомте адміністратора!'
-login_msg: '&cДля авторизації, введіть команду "/login <пароль>"'
+# Registration
 reg_msg: '&3Перш ніж почати гру, вам потрібно зареєструвати свій нікнейм!%nl%&3Для цього просто введіть команду "/register <пароль> <повторПароля>"'
-usage_unreg: '&cСинтаксис: /unregister <пароль>'
-pwd_changed: '&2Пароль успішно змінено!'
+usage_reg: '&cСинтаксис: /register <пароль> <повторПароля>'
+reg_only: '&4Лише зареєстровані гравці можуть підключатись до сервера!%nl%&4Будь ласка, відвідайте http://example.com для реєстрації.'
+kicked_admin_registered: 'Адміністратор вас зареєстрував; Будь ласка, авторизуйтесь знову!'
+registered: '&2Реєстрація пройшла успішно!'
+reg_disabled: '&cВнутрішньоігрову реєстрацію зараз вимкнено.'
+user_regged: '&cТакий нікнейм вже зареєстровано.'
+
+# Password errors on registration
 password_error: '&cПаролі не співпадають!'
 password_error_nick: '&cНе можна використовувати свій нікнейм у якості пароля! Будь ласка, виберіть щось інакше...'
 password_error_unsafe: '&cЦей пароль надто простий! Будь ласка, придумайте інакший...'
 password_error_chars: '&4Ваш пароль містить недопустимі символи. Підберіть інакший...%nl%&4(Reg-ex: REG_EX)'
-invalid_session: '&cСесію було розірвано внаслідок зміни IP.'
-reg_only: '&4Лише зареєстровані гравці можуть підключатись до сервера!%nl%&4Будь ласка, відвідайте http://example.com для реєстрації.'
+pass_len: '&cВаш пароль надто короткий або надто довгий! Спробуйте інакший...'
+
+# Login
+usage_log: '&cСинтаксис: /login <пароль>'
+wrong_pwd: '&cНевірний пароль!'
+login: '&2Успішна авторизація!'
+login_msg: '&cДля авторизації, введіть команду "/login <пароль>"'
+timeout: '&4Час для авторизації сплинув. Будь ласка, спробуйте ще раз!'
+
+# Errors
+unknown_user: '&cЦей гравець не є зареєстрованим.'
+denied_command: '&cДля використання цієї команди потрібна авторизація.'
+denied_chat: '&cДля доступу до чату потрібна авторизація.'
+not_logged_in: '&cВи не авторизовані!'
+tempban_max_logins: '&cВаш IP тимчасово заблоковано, із‒за багатократного введення хибного пароля.'
+max_reg: '&cВичерпано ліміт реєстрацій (%reg_count/%max_acc %reg_names) для вашого підключення!'
+no_perm: '&4У вас недостатньо прав, щоб застосувати цю команду!'
+error: '&4[AuthMe] Error. Будь ласка, повідомте адміністратора!'
+unsafe_spawn: '&cВаше останнє місцезнаходження не є безпечним. Вас було переміщено на точку спавна.'
+kick_forvip: '&3Вас кікнуто, внаслідок того, що VIP гравець зайшов на сервер коли небуло вільних місць.'
+
+# AntiBot
+kick_antibot: 'На сервер здійснено DDoS атаку. Будь ласка, зачекайте декілька хвилин доки активність спаде.'
+antibot_auto_enabled: '&4[AntiBotService] Ненормативне число з’єднань. Активовано антибот систему!'
+antibot_auto_disabled: '&2[AntiBotService] Антибот систему деактивовано після %m хв. активності.'
+
+# Other messages
+unregistered: '&cДані про реєстрацію успішно видалено'
+accounts_owned_self: 'Кількість ваших твінк‒акаунтів: %count:'
+accounts_owned_other: 'Кількість твінк‒акаунтів гравця %name: %count'
+two_factor_create: '&2Ваш секретний код — %code %nl%&2Можете зкопіювати його за цим посиланням — %url'
+# 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'
+vb_nonActiv: '&cВаш акаунт ще не активовано. Будь ласка, провірте свою електронну пошту!'
+usage_unreg: '&cСинтаксис: /unregister <пароль>'
+pwd_changed: '&2Пароль успішно змінено!'
 logged_in: '&cВи вже авторизовані!'
 logout: '&2Ви вийшли зі свого акаунта!'
-same_nick: '&4Хтось з таким ніком зараз вже сидить на сервері!'
-registered: '&2Реєстрація пройшла успішно!'
-pass_len: '&cВаш пароль надто короткий або надто довгий! Спробуйте інакший...'
 reload: '&2Конфігурації та базу даних було успішно перезавантажено!'
-timeout: '&4Час для авторизації сплинув. Будь ласка, спробуйте ще раз!'
 usage_changepassword: '&cСинтаксис: /changepassword <старийПароль> <новийПароль>'
+
+# Session messages
+invalid_session: '&cСесію було розірвано внаслідок зміни IP.'
+valid_session: '&2Сесію відновлено.'
+
+# Error messages when joining
 name_len: '&4Ваш нікнейм надто короткий або надто довгий!'
 regex: '&4Ваш нікнейм містить недопустимі символи! Reg-ex: REG_EX'
-add_email: '&3Не забудьте прив’язати електронну пошту до свого акаунта, за допомогою команди "/email add <e-mail> <e-mail повторно>"'
-recovery_email: 'Забули пароль? Можете скористатись командою &9/email recovery &f<&9ваш e-mail&f>'
-usage_captcha: '&3Для продовження доведеться ввести капчу — "/captcha <theCaptcha>"'
-wrong_captcha: '&cНевірно введена капча! Спробуйте ще раз — "/captcha THE_CAPTCHA"'
-valid_captcha: '&2Капчу прийнято.'
-kick_forvip: '&3Вас кікнуто, внаслідок того, що VIP гравець зайшов на сервер коли небуло вільних місць.'
+country_banned: '&4Your country is banned from this server!'
+not_owner_error: 'Цей акаунт вам не належить! Будь ласка, оберіть інакший нікнейм!'
 kick_fullserver: '&4Сервер переповнено! Доведеться зачекати доки хтось вийде.'
+same_nick: '&4Хтось з таким ніком зараз вже сидить на сервері!'
+invalid_name_case: 'Регістр у вашому нікнеймі відрізняється від регістру при реєстрації.%nl%Поточний регістр: &c%invalid&f.  Валідний регістр: &a%valid&f.%nl%Будь ласка, перезайдіть з валідним регістром!'
+same_ip_online: 'Перевищено ліміт на авторизацію з одного IP.'
+
+# Email
 usage_email_add: '&cСинтаксис: /email add <e-mail> <e-mail повторно>'
 usage_email_change: '&cСинтаксис: /email change <старий e-mail> <новий e-mail>'
 usage_email_recovery: '&cСинтаксис: /email recovery <e-mail>'
@ -55,20 +79,15 @@ email_confirm: '&cАдреси не співпадають.'
 email_changed: '&2E-mail успішно змінено.'
 email_send: '&2Лист для відновлення доступу надіслано. Будь ласка, провірте свою пошту!'
 email_exists: '&cЛист для відновлення доступу вже було надіслано! Ви можете деактуалізувати його, використавши наступну команду:'
-country_banned: '&4Your country is banned from this server!'
-antibot_auto_enabled: '&4[AntiBotService] Ненормативне число з’єднань. Активовано антибот систему!'
-antibot_auto_disabled: '&2[AntiBotService] Антибот систему деактивовано після %m хв. активності.'
-email_already_used: '&4До цієї електронної пошти прив’язано забагато акаунтів!'
-two_factor_create: '&2Ваш секретний код — %code %nl%&2Можете зкопіювати його за цим посиланням — %url'
-not_owner_error: 'Цей акаунт вам не належить! Будь ласка, оберіть інакший нікнейм!'
-invalid_name_case: 'Регістр у вашому нікнеймі відрізняється від регістру при реєстрації.%nl%Поточний регістр: &c%invalid&f.  Валідний регістр: &a%valid&f.%nl%Будь ласка, перезайдіть з валідним регістром!'
-tempban_max_logins: '&cВаш IP тимчасово заблоковано, із‒за багатократного введення хибного пароля.'
-accounts_owned_self: 'Кількість ваших твінк‒акаунтів: %count:'
-accounts_owned_other: 'Кількість твінк‒акаунтів гравця %name: %count'
-kicked_admin_registered: 'Адміністратор вас зареєстрував; Будь ласка, авторизуйтесь знову!'
-incomplete_email_settings: '&4[AuthMe] Error: Не всі необхідні налаштування є встановленими, щоб надсилати електронну пошту. Будь ласка, повідомте адміністратора!'
 # 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.'
+incomplete_email_settings: '&4[AuthMe] Error: Не всі необхідні налаштування є встановленими, щоб надсилати електронну пошту. Будь ласка, повідомте адміністратора!'
+email_already_used: '&4До цієї електронної пошти прив’язано забагато акаунтів!'
 # 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'
+# TODO show_no_email: '&2You currently don''t have email address associated with this account.'
+add_email: '&3Не забудьте прив’язати електронну пошту до свого акаунта, за допомогою команди "/email add <e-mail> <e-mail повторно>"'
+recovery_email: 'Забули пароль? Можете скористатись командою &9/email recovery &f<&9ваш e-mail&f>'
+
+# Captcha
+usage_captcha: '&3Для продовження доведеться ввести капчу — "/captcha <theCaptcha>"'
+wrong_captcha: '&cНевірно введена капча! Спробуйте ще раз — "/captcha THE_CAPTCHA"'
+valid_captcha: '&2Капчу прийнято.'
--- a/src/main/resources/messages/messages_vn.yml
+++ b/src/main/resources/messages/messages_vn.yml
@ -1,49 +1,73 @@
-denied_command: '&cĐể được sử dụng lệnh bạn phải hoàn thành xác thực tài khoản đã!'
-same_ip_online: 'Một người chơi với cùng địa chỉ IP đã đang chơi!'
-denied_chat: '&cĐể được chát bạn phải hoàn thành xác thực tài khoản đã!'
-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: '&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!'
-usage_log: '&cSử dụng: /login <mật khẩu>'
-wrong_pwd: '&cSai mật khẩu!'
-unregistered: '&cHủy đăng ký thành công!'
-reg_disabled: '&cKhông cho phép đăng ký tài khoản trong máy chủ!'
-valid_session: '&2Phiên đăng nhập đã được kết nối trở lại.'
-login: '&2Đăng nhập thành công!'
-vb_nonActiv: '&cTài khoản của bạn chưa được kích hoạt, vui lòng kiểm tra email!'
-user_regged: '&cBạn có thể đăng ký với tên tài khoản này!'
-usage_reg: '&cSử dụng: /register <mật khẩu> <nhập lại mật khẩu>'
-max_reg: '&cBạn đã vượt quá giới hạn tối đa đăng ký tài khoản (%reg_count/%max_acc %reg_names) cho những lần kết nối tài khoản!'
-no_perm: '&4Bạn không có quyền truy cập lệnh này!'
-error: '&4Lỗi! Vui lòng liên hệ quản trị viên hoặc admin'
-login_msg: '&cXin vui lòng đăng nhập bằng lệnh "/login <mật khẩu>"'
+# Registration
 reg_msg: '&2Xin vui lòng đăng ký tài khoản với lệnh "/register <mật khẩu> <nhập lại mật khẩu>"'
-usage_unreg: '&cSử dụng: /unregister <mật khẩu>'
-pwd_changed: '&2Thay đổi mật khẩu thành công!'
+usage_reg: '&cSử dụng: /register <mật khẩu> <nhập lại mật khẩu>'
+reg_only: '&4Chỉ có thành viên mới có thể tham gia máy chủ, vui lòng truy cập trang web http://example.com để đăng ký thành viên!'
+kicked_admin_registered: 'Một quản trị viên đã đăng ký cho bạn; vui lòng đăng nhập lại'
+registered: '&2Đăng ký thành công!'
+reg_disabled: '&cKhông cho phép đăng ký tài khoản trong máy chủ!'
+user_regged: '&cBạn có thể đăng ký với tên tài khoản này!'
+
+# Password errors on registration
 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...'
 password_error_chars: '&4Mật khẩu của bạn chứa ký tự không hợp lệ. Các ký tự cho phép: REG_EX'
-invalid_session: '&cIP của bạn đã bị thay đổi và phiên đăng nhập của bạn đã hết hạn!'
-reg_only: '&4Chỉ có thành viên mới có thể tham gia máy chủ, vui lòng truy cập trang web http://example.com để đăng ký thành viên!'
+pass_len: '&cMật khẩu của bạn đặt quá dài hoặc quá ngắn, vui lòng đặt lại!'
+
+# Login
+usage_log: '&cSử dụng: /login <mật khẩu>'
+wrong_pwd: '&cSai mật khẩu!'
+login: '&2Đăng nhập thành công!'
+login_msg: '&cXin vui lòng đăng nhập bằng lệnh "/login <mật khẩu>"'
+timeout: '&4Thời gian đăng nhập đã hết, bạn đã bị văng khỏi máy chủ. Xin vui lòng thử lại!'
+
+# Errors
+unknown_user: '&cNgười dùng này đã được đăng ký!'
+denied_command: '&cĐể được sử dụng lệnh bạn phải hoàn thành xác thực tài khoản đã!'
+denied_chat: '&cĐể được chát bạn phải hoàn thành xác thực tài khoản đã!'
+not_logged_in: '&cBạn chưa đăng nhập!'
+tempban_max_logins: '&cBạn đã bị tạm thời khóa truy cập do đăng nhập sai nhiều lần.'
+max_reg: '&cBạn đã vượt quá giới hạn tối đa đăng ký tài khoản (%reg_count/%max_acc %reg_names) cho những lần kết nối tài khoản!'
+no_perm: '&4Bạn không có quyền truy cập lệnh này!'
+error: '&4Lỗi! Vui lòng liên hệ quản trị viên hoặc admin'
+unsafe_spawn: '&cBạn đang ở vị trí không an toàn, bạn đã được dịch chuyển về Spawn.'
+kick_forvip: '&eChỉ có thành viên VIP mới được tham gia khi máy chủ đầy!'
+
+# AntiBot
+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ủ.'
+antibot_auto_enabled: '&4[AntiBotService] AntiBot đã được kích hoạt do số lượng lớn kết nối đến máy chủ!'
+antibot_auto_disabled: '&2[AntiBotService] AntiBot đã được tắt sau %m phút!'
+
+# Other messages
+unregistered: '&cHủy đăng ký thành công!'
+accounts_owned_self: 'Bạn sở hữu %count tài khoản:'
+accounts_owned_other: 'Người chơi %name có %count tài khoản:'
+two_factor_create: '&2Mã bí mật của bạn là %code. Bạn có thể quét nó tại đây %url'
+recovery_code_sent: 'Một mã khôi phục mật khẩu đã được gửi đến địa chỉ email của bạn.'
+recovery_code_incorrect: 'Mã khôi phục không đúng! Dùng lệnh /email recovery [email] để tạo một mã mới'
+vb_nonActiv: '&cTài khoản của bạn chưa được kích hoạt, vui lòng kiểm tra email!'
+usage_unreg: '&cSử dụng: /unregister <mật khẩu>'
+pwd_changed: '&2Thay đổi mật khẩu thành công!'
 logged_in: '&cBạn đã đăng nhập!'
 logout: '&2Bạn đã đăng xuất!'
-same_nick: '&4Tài khoản đang được sử dụng trên máy chủ!'
-registered: '&2Đăng ký thành công!'
-pass_len: '&cMật khẩu của bạn đặt quá dài hoặc quá ngắn, vui lòng đặt lại!'
 reload: '&2Cấu hình và cơ sở dử liệu đã được nạp lại!'
-timeout: '&4Thời gian đăng nhập đã hết, bạn đã bị văng khỏi máy chủ. Xin vui lòng thử lại!'
 usage_changepassword: '&cSử dụng: /changepassword <mật khẩu cũ> <mật khẩu mới>'
+
+# Session messages
+invalid_session: '&cIP của bạn đã bị thay đổi và phiên đăng nhập của bạn đã hết hạn!'
+valid_session: '&2Phiên đăng nhập đã được kết nối trở lại.'
+
+# Error messages when joining
 name_len: '&4Tên đăng nhập của bạn quá ngắn hoặc quá dài!'
 regex: '&4Tên nhân vật có chứa ký tự không hợp lệ. Các ký tự được cho phép: REG_EX'
-add_email: '&eVui lòng thêm email của bạn với lệnh "/email add <email> <nhập lại email>"'
-recovery_email: '&aBạn quên mật khẩu? Vui lòng gõ lệnh "/email recovery <email>"'
-usage_captcha: '&eĐể đăng nhập vui lòng hãy gõ mã Captcha, gõ lệnh "/captcha <theCaptcha>"'
-wrong_captcha: '&cSai mã captcha, Vui lòng nhấn "/captcha THE_CAPTCHA" trong kênh chát!'
-valid_captcha: '&2Mã captcha đã được xác nhận!'
-kick_forvip: '&eChỉ có thành viên VIP mới được tham gia khi máy chủ đầy!'
+country_banned: '&4Quốc gia của bạn bị cấm tham gia máy chủ này!'
+not_owner_error: 'Bạn không phải là chủ sở hữu tài khoản này, hãy chọn tên khác!'
 kick_fullserver: '&4Máy chủ quá tải, vui lòng thử lại sau!'
+same_nick: '&4Tài khoản đang được sử dụng trên máy chủ!'
+invalid_name_case: 'Bạn nên vào máy chủ với tên đăng nhập là %valid, không phải là %invalid.'
+same_ip_online: 'Một người chơi với cùng địa chỉ IP đã đang chơi!'
+
+# Email
 usage_email_add: '&cSử dụng: /email add <email> <nhập lại email>'
 usage_email_change: '&cSử dụng: /email change <email> <email mới>'
 usage_email_recovery: '&cSử dụng: /email recovery <email>'
@ -56,19 +80,14 @@ email_changed: '&2Địa chỉ email đã thay đổi!'
 email_send: '&2Email phục hồi đã được gửi thành công! Vui lòng kiểm tra hộp thư đến trong email của bạn.'
 email_exists: '&cEmail phục hồi đã được gửi, bạn có thể hủy bỏ và gửi thư mới bằng cách sử dụng lệnh sau:'
 email_show: '&2Địa chỉ email hiện tại của bạn là: &f%email'
-show_no_email: '&2Hiện tại bạn chưa liên kết bất kỳ email nào với tài khoản này.'
-country_banned: '&4Quốc gia của bạn bị cấm tham gia máy chủ này!'
-antibot_auto_enabled: '&4[AntiBotService] AntiBot đã được kích hoạt do số lượng lớn kết nối đến máy chủ!'
-antibot_auto_disabled: '&2[AntiBotService] AntiBot đã được tắt sau %m phút!'
-email_already_used: '&4Địa chỉ email đã được sử dụng'
-two_factor_create: '&2Mã bí mật của bạn là %code. Bạn có thể quét nó tại đây %url'
-not_owner_error: 'Bạn không phải là chủ sở hữu tài khoản này, hãy chọn tên khác!'
-invalid_name_case: 'Bạn nên vào máy chủ với tên đăng nhập là %valid, không phải là %invalid.'
-tempban_max_logins: '&cBạn đã bị tạm thời khóa truy cập do đăng nhập sai nhiều lần.'
-accounts_owned_self: 'Bạn sở hữu %count tài khoản:'
-accounts_owned_other: 'Người chơi %name có %count tài khoản:'
-kicked_admin_registered: 'Một quản trị viên đã đăng ký cho bạn; vui lòng đăng nhập lại'
 incomplete_email_settings: 'Lỗi: các thiết lập để gửi thư không được cài đặt đầy đủ. Vui lòng liên hệ với quản trị viên để thông báo lỗi.'
+email_already_used: '&4Địa chỉ email đã được sử dụng'
 email_send_failure: 'Không thể gửi thư. Vui lòng liên hệ với ban quản trị.'
-recovery_code_sent: 'Một mã khôi phục mật khẩu đã được gửi đến địa chỉ email của bạn.'
-recovery_code_incorrect: 'Mã khôi phục không đúng! Dùng lệnh /email recovery [email] để tạo một mã mới'
+show_no_email: '&2Hiện tại bạn chưa liên kết bất kỳ email nào với tài khoản này.'
+add_email: '&eVui lòng thêm email của bạn với lệnh "/email add <email> <nhập lại email>"'
+recovery_email: '&aBạn quên mật khẩu? Vui lòng gõ lệnh "/email recovery <email>"'
+
+# Captcha
+usage_captcha: '&eĐể đăng nhập vui lòng hãy gõ mã Captcha, gõ lệnh "/captcha <theCaptcha>"'
+wrong_captcha: '&cSai mã captcha, Vui lòng nhấn "/captcha THE_CAPTCHA" trong kênh chát!'
+valid_captcha: '&2Mã captcha đã được xác nhận!'
--- a/src/main/resources/messages/messages_zhcn.yml
+++ b/src/main/resources/messages/messages_zhcn.yml
@ -1,49 +1,74 @@
-# Translator: Unknown                          #
-# Last modif: 1459528742 UTC                   #
-# -------------------------------------------- #
-kick_antibot: '&8[&6玩家系统&8] &f防机器人程序已启用 !请稍等几分钟後才再次进入服务器'
-unknown_user: '&8[&6玩家系统&8] &c此用户名还未注册过'
-unsafe_spawn: '&8[&6玩家系统&8] &f你退出服务器时的位置不安全，正在传送你到此世界的出生点'
-not_logged_in: '&8[&6玩家系统&8] &c你还未登录！'
-usage_log: '&8[&6玩家系统&8] &c正确用法：“/login <密码>”'
-wrong_pwd: '&8[&6玩家系统&8] &c错误的密码'
-unregistered: '&8[&6玩家系统&8] &c成功删除此用户！'
-reg_disabled: '&8[&6玩家系统&8] &c目前服务器暂时禁止注册，请到服务器论坛以得到更多资讯'
-valid_session: '&8[&6玩家系统&8] &c欢迎回来，已帮你自动登录到此服务器'
-login: '&8[&6玩家系统&8] &c已成功登录！'
-vb_nonActiv: '&8[&6玩家系统&8] &f你的帐号还未激活，请查看你的邮箱！'
-user_regged: '&8[&6玩家系统&8] &c此用户已经在此服务器注册过'
-usage_reg: '&8[&6玩家系统&8] &c正确用法：“/register <密码> <再输入一次以确定密码>”'
-# TODO max_reg: Missing tags %reg_count, %max_acc, %reg_names
-max_reg: '&8[&6玩家系统&8] &f你不允许再为你的IP在服务器注册更多用户了！'
-no_perm: '&8[&6玩家系统&8] &c没有权限'
-error: '&8[&6玩家系统&8] &f发现错误，请联系管理员'
-login_msg: '&8[&6玩家系统&8] &c请输入“/login <密码>”以登录'
+# Registration
 reg_msg: '&8[&6玩家系统&8] &c请输入“/register <密码> <再输入一次以确定密码>”以注册'
-usage_unreg: '&8[&6玩家系统&8] &c正确用法：“/unregister <密码>”'
-pwd_changed: '&8[&6玩家系统&8] &c密码已成功修改！'
+usage_reg: '&8[&6玩家系统&8] &c正确用法：“/register <密码> <再输入一次以确定密码>”'
+reg_only: '&8[&6玩家系统&8] &f只允许注册过的玩家进服！请到 https://example.cn 注册'
+# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
+registered: '&8[&6玩家系统&8] &c已成功注册！'
+reg_disabled: '&8[&6玩家系统&8] &c目前服务器暂时禁止注册，请到服务器论坛以得到更多资讯'
+user_regged: '&8[&6玩家系统&8] &c此用户已经在此服务器注册过'
+
+# Password errors on registration
 password_error: '&8[&6玩家系统&8] &f密码不相同'
 password_error_nick: '&8[&6玩家系统&8] &f你不能使用你的名字作为密码。 '
 password_error_unsafe: '&8[&6玩家系统&8] &f你不能使用安全性过低的码。 '
-invalid_session: '&8[&6玩家系统&8] &f登陆数据异常，请等待登陆结束'
-reg_only: '&8[&6玩家系统&8] &f只允许注册过的玩家进服！请到 https://example.cn 注册'
+# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
+pass_len: '&8[&6玩家系统&8] &你的密码没有达到要求！'
+
+# Login
+usage_log: '&8[&6玩家系统&8] &c正确用法：“/login <密码>”'
+wrong_pwd: '&8[&6玩家系统&8] &c错误的密码'
+login: '&8[&6玩家系统&8] &c已成功登录！'
+login_msg: '&8[&6玩家系统&8] &c请输入“/login <密码>”以登录'
+timeout: '&8[&6玩家系统&8] &f给你登录的时间已经过了'
+
+# Errors
+unknown_user: '&8[&6玩家系统&8] &c此用户名还未注册过'
+# TODO denied_command: '&cIn order to use this command you must be authenticated!'
+# TODO denied_chat: '&cIn order to chat you must be authenticated!'
+not_logged_in: '&8[&6玩家系统&8] &c你还未登录！'
+# TODO tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
+# TODO: Missing tags %reg_count, %max_acc, %reg_names
+max_reg: '&8[&6玩家系统&8] &f你不允许再为你的IP在服务器注册更多用户了！'
+no_perm: '&8[&6玩家系统&8] &c没有权限'
+error: '&8[&6玩家系统&8] &f发现错误，请联系管理员'
+unsafe_spawn: '&8[&6玩家系统&8] &f你退出服务器时的位置不安全，正在传送你到此世界的出生点'
+kick_forvip: '&8[&6玩家系统&8] &cA VIP玩家加入了已满的服务器!'
+
+# AntiBot
+kick_antibot: '&8[&6玩家系统&8] &f防机器人程序已启用 !请稍等几分钟後才再次进入服务器'
+antibot_auto_enabled: '&8[&6玩家系统&8] &f防机器人程序由于大量异常连接而启用'
+antibot_auto_disabled: '&8[&6玩家系统&8] &f防机器人程序由于异常连接减少而在 %m 分钟后停止'
+
+# Other messages
+unregistered: '&8[&6玩家系统&8] &c成功删除此用户！'
+# TODO accounts_owned_self: 'You own %count accounts:'
+# TODO accounts_owned_other: 'The player %name has %count accounts:'
+two_factor_create: '&8[&6玩家系统&8] &2你的代码是 %code，你可以使用 %url 来扫描'
+# 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'
+vb_nonActiv: '&8[&6玩家系统&8] &f你的帐号还未激活，请查看你的邮箱！'
+usage_unreg: '&8[&6玩家系统&8] &c正确用法：“/unregister <密码>”'
+pwd_changed: '&8[&6玩家系统&8] &c密码已成功修改！'
 logged_in: '&8[&6玩家系统&8] &c你已经登陆过了！'
 logout: '&8[&6玩家系统&8] &c已成功登出！'
-same_nick: '&8[&6玩家系统&8] &f同样的用户名现在在线且已经登录了！'
-registered: '&8[&6玩家系统&8] &c已成功注册！'
-pass_len: '&8[&6玩家系统&8] &你的密码没有达到要求！'
 reload: '&8[&6玩家系统&8] &f配置以及数据已经重新加载完毕'
-timeout: '&8[&6玩家系统&8] &f给你登录的时间已经过了'
 usage_changepassword: '&8[&6玩家系统&8] &f正确用法：“/changepassword 旧密码 新密码”'
+
+# Session messages
+invalid_session: '&8[&6玩家系统&8] &f登陆数据异常，请等待登陆结束'
+valid_session: '&8[&6玩家系统&8] &c欢迎回来，已帮你自动登录到此服务器'
+
+# Error messages when joining
 name_len: '&8[&6玩家系统&8] &c你的用户名太短或者太长了'
 regex: '&8[&6玩家系统&8] &c你的用户名包含非法字母，用户名里允许的字母: REG_EX'
-add_email: '&8[&6玩家系统&8] &c请输入“/email add <你的邮箱> <再输入一次以确认>”以把你的邮箱添加到此帐号'
-recovery_email: '&8[&6玩家系统&8] &c忘了你的密码？请输入：“/email recovery <你的邮箱>”'
-usage_captcha: '&8[&6玩家系统&8] &c正确用法：/captcha <theCaptcha>'
-wrong_captcha: '&8[&6玩家系统&8] &c错误的验证码，请输入：“/captcha THE_CAPTCHA”'
-valid_captcha: '&8[&6玩家系统&8] &c你的验证码是有效的！'
-kick_forvip: '&8[&6玩家系统&8] &cA VIP玩家加入了已满的服务器!'
+country_banned: '这个服务器禁止该国家登陆'
+not_owner_error: '&8[&6玩家系统&8] &4警告！ &c你并不是此帐户持有人，请立即登出。 '
 kick_fullserver: '&8[&6玩家系统&8] &c抱歉，服务器已满!'
+same_nick: '&8[&6玩家系统&8] &f同样的用户名现在在线且已经登录了！'
+invalid_name_case: '&8[&6玩家系统&8] &c你应该使用「%valid」而并非「%invalid」登入游戏。 '
+# TODO same_ip_online: 'A player with the same IP is already in game!'
+
+# Email
 usage_email_add: '&8[&6玩家系统&8] &f用法: /email add <邮箱> <确认电子邮件> '
 usage_email_change: '&8[&6玩家系统&8] &f用法: /email change <旧邮箱> <新邮箱> '
 usage_email_recovery: '&8[&6玩家系统&8] &f用法: /email recovery <邮箱>'
@ -54,25 +79,16 @@ email_added: '&8[&6玩家系统&8] &f邮箱已添加 !'
 email_confirm: '&8[&6玩家系统&8] &f确认你的邮箱 !'
 email_changed: '&8[&6玩家系统&8] &f邮箱已改变 !'
 email_send: '&8[&6玩家系统&8] &f恢复邮件已发送 !'
-country_banned: '这个服务器禁止该国家登陆'
-antibot_auto_enabled: '&8[&6玩家系统&8] &f防机器人程序由于大量异常连接而启用'
-antibot_auto_disabled: '&8[&6玩家系统&8] &f防机器人程序由于异常连接减少而在 %m 分钟后停止'
-email_already_used: '&8[&6玩家系统&8] &4邮箱已被使用'
 email_exists: '&8[&6玩家系统&8] &c恢复邮件已发送 ! 你可以丢弃它然後使用以下的指令来发送新的邮件：'
-two_factor_create: '&8[&6玩家系统&8] &2你的代码是 %code，你可以使用 %url 来扫描'
-not_owner_error: '&8[&6玩家系统&8] &4警告！ &c你并不是此帐户持有人，请立即登出。 '
-invalid_name_case: '&8[&6玩家系统&8] &c你应该使用「%valid」而并非「%invalid」登入游戏。 '
-# TODO denied_command: '&cIn order to use this command you must be authenticated!'
-# TODO same_ip_online: 'A player with the same IP is already in game!'
-# TODO denied_chat: '&cIn order to chat you must be authenticated!'
-# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
 # 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 tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
-# TODO accounts_owned_self: 'You own %count accounts:'
-# TODO accounts_owned_other: 'The player %name has %count accounts:'
-# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
 # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.'
+email_already_used: '&8[&6玩家系统&8] &4邮箱已被使用'
 # 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'
+# TODO show_no_email: '&2You currently don''t have email address associated with this account.'
+add_email: '&8[&6玩家系统&8] &c请输入“/email add <你的邮箱> <再输入一次以确认>”以把你的邮箱添加到此帐号'
+recovery_email: '&8[&6玩家系统&8] &c忘了你的密码？请输入：“/email recovery <你的邮箱>”'
+
+# Captcha
+usage_captcha: '&8[&6玩家系统&8] &c正确用法：/captcha <theCaptcha>'
+wrong_captcha: '&8[&6玩家系统&8] &c错误的验证码，请输入：“/captcha THE_CAPTCHA”'
+valid_captcha: '&8[&6玩家系统&8] &c你的验证码是有效的！'
--- a/src/main/resources/messages/messages_zhhk.yml
+++ b/src/main/resources/messages/messages_zhhk.yml
@ -1,49 +1,78 @@
 # Translator: lifehome<m@lifeho.me>            #
 # Last modif: 1459528742 UTC                   #
 # -------------------------------------------- #
-kick_antibot: '&8[&6用戶系統&8] &c伺服器錯誤！請稍候再嘗試登入吧。 &7(err: kick_due2_bot)'
-unknown_user: '&8[&6用戶系統&8] &c此用戶名沒有已登記資料。'
-unsafe_spawn: '&8[&6用戶系統&8] &f你的登出位置不安全，現在將傳送你到重生點。'
-not_logged_in: '&8[&6用戶系統&8] &c你還沒有登入 ！'
-usage_log: '&8[&6用戶系統&8] &f用法： 《 /login <密碼> 》'
-wrong_pwd: '&8[&6用戶系統&8] &c你輸入了錯誤的密碼。'
-unregistered: '&8[&6用戶系統&8] &c你已成功刪除會員註冊記錄。'
-reg_disabled: '&8[&6用戶系統&8] &c本伺服器已停止新玩家註冊。'
-valid_session: '&8[&6用戶系統&8] &b嗨 ！ 歡迎回來喔～'
-login: '&8[&6用戶系統&8] &c你成功登入了。'
-vb_nonActiv: '&8[&6用戶系統&8] &f你的帳戶還沒有經過電郵驗證 ！'
-user_regged: '&8[&6用戶系統&8] &c此用戶名已經註冊過了。'
-usage_reg: '&8[&6用戶系統&8] &f用法： 《 /register <密碼> <重覆密碼> 》'
-# TODO max_reg: Missing tags %reg_count, %max_acc, %reg_names
-max_reg: '&8[&6用戶系統&8] &f你的IP地址已達到註冊數上限。'
-no_perm: '&8[&6用戶系統&8] &b嗯～你想幹甚麼？'
-error: '&8[&6用戶系統&8] &f發生錯誤，請與管理員聯絡。'
-login_msg: '&8[&6用戶系統&8] &c請使用這個指令來登入： 《 /login <密碼> 》'
+
+# Registration
 reg_msg: '&8[&6用戶系統&8] &c請使用這個指令來註冊： 《 /register <密碼> <重覆密碼> 》'
-usage_unreg: '&8[&6用戶系統&8] &f用法： 《 /unregister <密碼> 》'
-pwd_changed: '&8[&6用戶系統&8] &c你成功更換了你的密碼 ！'
+usage_reg: '&8[&6用戶系統&8] &f用法： 《 /register <密碼> <重覆密碼> 》'
+reg_only: '&8[&6用戶系統&8] &f限已註冊會員，請先到本服網站進行註冊。'
+# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
+registered: '&8[&6用戶系統&8] &b你成功註冊了。'
+reg_disabled: '&8[&6用戶系統&8] &c本伺服器已停止新玩家註冊。'
+user_regged: '&8[&6用戶系統&8] &c此用戶名已經註冊過了。'
+
+# Password errors on registration
 password_error: '&8[&6用戶系統&8] &f密碼不符合。'
 password_error_nick: '&8[&6用戶系統&8] &c這個密碼太不安全了！'
 password_error_unsafe: '&8[&6用戶系統&8] &c這個密碼太不安全了！'
-invalid_session: '&8[&6用戶系統&8] &f登入階段資料已損壞，請等待登入階段結束。'
-reg_only: '&8[&6用戶系統&8] &f限已註冊會員，請先到本服網站進行註冊。'
+# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
+pass_len: '&8[&6用戶系統&8] &f你的密碼並不符合規定長度。'
+
+# Login
+usage_log: '&8[&6用戶系統&8] &f用法： 《 /login <密碼> 》'
+wrong_pwd: '&8[&6用戶系統&8] &c你輸入了錯誤的密碼。'
+login: '&8[&6用戶系統&8] &c你成功登入了。'
+login_msg: '&8[&6用戶系統&8] &c請使用這個指令來登入： 《 /login <密碼> 》'
+timeout: '&8[&6用戶系統&8] &f登入逾時。'
+
+# Errors
+unknown_user: '&8[&6用戶系統&8] &c此用戶名沒有已登記資料。'
+# TODO denied_command: '&cIn order to use this command you must be authenticated!'
+# TODO denied_chat: '&cIn order to chat you must be authenticated!'
+not_logged_in: '&8[&6用戶系統&8] &c你還沒有登入 ！'
+# TODO tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
+# TODO: Missing tags %reg_count, %max_acc, %reg_names
+max_reg: '&8[&6用戶系統&8] &f你的IP地址已達到註冊數上限。'
+no_perm: '&8[&6用戶系統&8] &b嗯～你想幹甚麼？'
+error: '&8[&6用戶系統&8] &f發生錯誤，請與管理員聯絡。'
+unsafe_spawn: '&8[&6用戶系統&8] &f你的登出位置不安全，現在將傳送你到重生點。'
+kick_forvip: '&c喔！因為有VIP玩家登入了伺服器。'
+
+# AntiBot
+kick_antibot: '&8[&6用戶系統&8] &c伺服器錯誤！請稍候再嘗試登入吧。 &7(err: kick_due2_bot)'
+antibot_auto_enabled: '&8[&6用戶系統&8] &3防止機械人程序已因應現時大量不尋常連線而啟用。'
+antibot_auto_disabled: '&8[&6用戶系統&8] &3不正常連接數已減少，防止機械人程序將於 %m 分鐘後停止。'
+
+# Other messages
+unregistered: '&8[&6用戶系統&8] &c你已成功刪除會員註冊記錄。'
+# TODO accounts_owned_self: 'You own %count accounts:'
+# TODO accounts_owned_other: 'The player %name has %count accounts:'
+two_factor_create: '&8[&6用戶系統 - 兩步驗證碼&8] &b你的登入金鑰為&9「%c%code&9」&b，掃描連結為：&c %url'
+# 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'
+vb_nonActiv: '&8[&6用戶系統&8] &f你的帳戶還沒有經過電郵驗證 ！'
+usage_unreg: '&8[&6用戶系統&8] &f用法： 《 /unregister <密碼> 》'
+pwd_changed: '&8[&6用戶系統&8] &c你成功更換了你的密碼 ！'
 logged_in: '&8[&6用戶系統&8] &c你已經登入過了。'
 logout: '&8[&6用戶系統&8] &b你成功登出了。'
-same_nick: '&8[&6用戶系統&8] &f同名玩家已在遊玩。'
-registered: '&8[&6用戶系統&8] &b你成功註冊了。'
-pass_len: '&8[&6用戶系統&8] &f你的密碼並不符合規定長度。'
 reload: '&8[&6用戶系統&8] &b登入系統設定及資料庫重新載入完畢。'
-timeout: '&8[&6用戶系統&8] &f登入逾時。'
 usage_changepassword: '&8[&6用戶系統&8] &f用法： 《 /changepassword <舊密碼> <新密碼> 》'
+
+# Session messages
+invalid_session: '&8[&6用戶系統&8] &f登入階段資料已損壞，請等待登入階段結束。'
+valid_session: '&8[&6用戶系統&8] &b嗨 ！ 歡迎回來喔～'
+
+# Error messages when joining
 name_len: '&8[&6用戶系統&8] &c你的用戶名不符合規定長度。'
 regex: '&8[&6用戶系統&8] &c用戶名稱錯誤！ 登入系統只接受以下字符： REG_EX'
-add_email: '&8[&6用戶系統&8] &b請為你的帳戶立即添加電郵地址： 《 /email add <電郵地址> <重覆電郵地址> 》'
-recovery_email: '&8[&6用戶系統&8] &b忘記密碼？請使用 /email recovery <電郵地址> 來更新密碼。'
-usage_captcha: '&8[&6用戶系統&8] &f用法： 《 /captcha <theCaptcha> 》'
-wrong_captcha: '&8[&6用戶系統&8] &c你所輸入的驗證碼無效，請使用 《 /captcha THE_CAPTCHA 》 再次輸入。'
-valid_captcha: '&8[&6用戶系統&8] &c你所輸入的驗證碼無效 ！'
-kick_forvip: '&c喔！因為有VIP玩家登入了伺服器。'
+country_banned: '&8[&6用戶系統&8] &4本伺服器已停止對你的國家提供遊戲服務。'
+not_owner_error: '&8[&6用戶系統&8] &4警告！&c你並不是此帳戶持有人，請立即登出。'
 kick_fullserver: '&c抱歉！ 因為伺服器滿人了，所以你目前未能登入伺服器。'
+same_nick: '&8[&6用戶系統&8] &f同名玩家已在遊玩。'
+invalid_name_case: '&8[&6用戶系統&8] &4警告！&c你應該使用「%valid」而並非「%invalid」登入遊戲。'
+# TODO same_ip_online: 'A player with the same IP is already in game!'
+
+# Email
 usage_email_add: '&8[&6用戶系統&8] &f用法： 《 /email add <電郵> <重覆電郵> 》'
 usage_email_change: '&8[&6用戶系統&8] &f用法： 《 /email change <舊電郵> <新電郵> 》'
 usage_email_recovery: '&8[&6用戶系統&8] &f用法： 《 /email recovery <電郵> 》'
@ -54,25 +83,16 @@ email_added: '&8[&6用戶系統&8] &a已新增你的電郵地址。'
 email_confirm: '&8[&6用戶系統&8] &5請重覆輸入你的電郵地址。'
 email_changed: '&8[&6用戶系統&8] &a你的電郵地址已更改。'
 email_send: '&8[&6用戶系統&8] &a忘記密碼信件已寄出，請查收。'
-country_banned: '&8[&6用戶系統&8] &4本伺服器已停止對你的國家提供遊戲服務。'
-antibot_auto_enabled: '&8[&6用戶系統&8] &3防止機械人程序已因應現時大量不尋常連線而啟用。'
-antibot_auto_disabled: '&8[&6用戶系統&8] &3不正常連接數已減少，防止機械人程序將於 %m 分鐘後停止。'
-email_already_used: '&8[&6用戶系統&8] &4這個電郵地址已被使用。'
 email_exists: '&8[&6用戶系統&8] &c訊息已發送！如果你收不到該封電郵，可以使用以下指令進行重寄：'
-two_factor_create: '&8[&6用戶系統 - 兩步驗證碼&8] &b你的登入金鑰為&9「%c%code&9」&b，掃描連結為：&c %url'
-not_owner_error: '&8[&6用戶系統&8] &4警告！&c你並不是此帳戶持有人，請立即登出。'
-invalid_name_case: '&8[&6用戶系統&8] &4警告！&c你應該使用「%valid」而並非「%invalid」登入遊戲。'
-# TODO denied_command: '&cIn order to use this command you must be authenticated!'
-# TODO same_ip_online: 'A player with the same IP is already in game!'
-# TODO denied_chat: '&cIn order to chat you must be authenticated!'
-# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
 # 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 tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
-# TODO accounts_owned_self: 'You own %count accounts:'
-# TODO accounts_owned_other: 'The player %name has %count accounts:'
-# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
 # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.'
+email_already_used: '&8[&6用戶系統&8] &4這個電郵地址已被使用。'
 # 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'
+# TODO show_no_email: '&2You currently don''t have email address associated with this account.'
+add_email: '&8[&6用戶系統&8] &b請為你的帳戶立即添加電郵地址： 《 /email add <電郵地址> <重覆電郵地址> 》'
+recovery_email: '&8[&6用戶系統&8] &b忘記密碼？請使用 /email recovery <電郵地址> 來更新密碼。'
+
+# Captcha
+usage_captcha: '&8[&6用戶系統&8] &f用法： 《 /captcha <theCaptcha> 》'
+wrong_captcha: '&8[&6用戶系統&8] &c你所輸入的驗證碼無效，請使用 《 /captcha THE_CAPTCHA 》 再次輸入。'
+valid_captcha: '&8[&6用戶系統&8] &c你所輸入的驗證碼無效 ！'
--- a/src/main/resources/messages/messages_zhmc.yml
+++ b/src/main/resources/messages/messages_zhmc.yml
@ -1,49 +1,73 @@
-denied_command: '&c你必須得到權限來使用此指令!'
-same_ip_online: '一位同一IP的玩家已在遊戲中!'
-denied_chat: '&c你必須得到權限來使用聊天功能!'
-kick_antibot: '伺服器正在啟用AntiBot保護模式！ 您必須等待幾分鐘才能加入服務器。'
-unknown_user: '&c此用戶尚未注冊!'
-unsafe_spawn: '&c你的登出地點並不安全，你已經被傳送到世界的重生點。'
-not_logged_in: '&c你尚未登入!'
-usage_log: '&b使用方法: 輸入"/login [你的密碼]" 來登入'
-wrong_pwd: '&c密碼錯誤!'
-unregistered: '&c帳戶已刪除!'
-reg_disabled: '&c遊戲內註冊已停用!'
-valid_session: '&2由於會話重新連接而登錄.'
-login: '&2你已成功登入!'
-vb_nonActiv: '&c你的帳戶未激活,請確認電郵!'
-user_regged: '&c您已經註冊此用戶名!'
-usage_reg: '&c使用方法: 輸入"/register [你的密碼] [重覆確認你的密碼]"'
-max_reg: '&c您已超過註冊的最大數量(%reg_count/%max_acc %reg_names)!'
-no_perm: '&4您沒有執行此操作的權限!'
-error: '&4發生錯誤!請聯繫伺服器管理員!'
-login_msg: '&c [請先登入] 請按T , 然後輸入 "/login [你的密碼]" 。'
+# Registration
 reg_msg: '&3[請先注冊] 請按T , 然後輸入 "/register [你的密碼] [重覆確認你的密碼]" 來注冊。'
-usage_unreg: '&c使用方法: "/unregister <你的密碼>"'
-pwd_changed: '&2密碼已更變!'
+usage_reg: '&c使用方法: 輸入"/register [你的密碼] [重覆確認你的密碼]"'
+reg_only: '&4只有註冊用戶才能加入服務器！ 請訪問http://example.com註冊！'
+kicked_admin_registered: '管理員剛剛註冊了您; 請重新登錄。'
+registered: '&2已成功註冊!'
+reg_disabled: '&c遊戲內註冊已停用!'
+user_regged: '&c您已經註冊此用戶名!'
+
+# Password errors on registration
 password_error: '&密碼錯誤!'
 password_error_nick: '&c你不能使用你的用戶名作密碼,請 choose another one...'
 password_error_unsafe: '&c所選的你的密碼並不安全的，請選擇另一個...'
 password_error_chars: '&4您的密碼含有非法字符。允許的字符：REG_EX'
-invalid_session: '&c您的IP已更改，並且您的會話數據已過期！'
-reg_only: '&4只有註冊用戶才能加入服務器！ 請訪問http://example.com註冊！'
+pass_len: '&c你的密碼太短或太長!請嘗試另一個!'
+
+# Login
+usage_log: '&b使用方法: 輸入"/login [你的密碼]" 來登入'
+wrong_pwd: '&c密碼錯誤!'
+login: '&2你已成功登入!'
+login_msg: '&c [請先登入] 請按T , 然後輸入 "/login [你的密碼]" 。'
+timeout: '&4超過登錄超時，您已從伺服器中踢出，請重試!'
+
+# Errors
+unknown_user: '&c此用戶尚未注冊!'
+denied_command: '&c你必須得到權限來使用此指令!'
+denied_chat: '&c你必須得到權限來使用聊天功能!'
+not_logged_in: '&c你尚未登入!'
+tempban_max_logins: '&c由於登錄失敗次數過多，您已被暫時禁止。'
+max_reg: '&c您已超過註冊的最大數量(%reg_count/%max_acc %reg_names)!'
+no_perm: '&4您沒有執行此操作的權限!'
+error: '&4發生錯誤!請聯繫伺服器管理員!'
+unsafe_spawn: '&c你的登出地點並不安全，你已經被傳送到世界的重生點。'
+kick_forvip: '&3一名VIP玩家在服務器已滿時已加入伺服器!'
+
+# AntiBot
+kick_antibot: '伺服器正在啟用AntiBot保護模式！ 您必須等待幾分鐘才能加入服務器。'
+antibot_auto_enabled: '&4[AntiBotService] 伺服器由於連接數量龐大而啟用AntiBot!'
+antibot_auto_disabled: '&2[AntiBotService] AntiBot將在%m分鐘後禁用!'
+
+# Other messages
+unregistered: '&c帳戶已刪除!'
+accounts_owned_self: '您擁有 %count 個帳戶:'
+accounts_owned_other: '玩家 %name 擁有 %count 個帳戶:'
+two_factor_create: '&2您的密碼是 %code。您可以從這裡掃描 %url'
+recovery_code_sent: '已將重設密碼的恢復代碼發送到您的電子郵件。'
+recovery_code_incorrect: '恢復代碼錯誤!使用指令: "/email recovery [電郵地址]" 生成新的一個恢復代碼。'
+vb_nonActiv: '&c你的帳戶未激活,請確認電郵!'
+usage_unreg: '&c使用方法: "/unregister <你的密碼>"'
+pwd_changed: '&2密碼已更變!'
 logged_in: '&c您已經登錄!'
 logout: '&2已成功註銷!'
-same_nick: '&4伺服器上已經在使用相同的用戶名！'
-registered: '&2已成功註冊!'
-pass_len: '&c你的密碼太短或太長!請嘗試另一個!'
 reload: '&2伺服器已正確地被重新加載配置和數據庫！'
-timeout: '&4超過登錄超時，您已從伺服器中踢出，請重試!'
 usage_changepassword: '&c使用方法: "/changepassword [舊密碼] [新密碼]"'
+
+# Session messages
+invalid_session: '&c您的IP已更改，並且您的會話數據已過期！'
+valid_session: '&2由於會話重新連接而登錄.'
+
+# Error messages when joining
 name_len: '&4你的暱稱太短或太長!'
 regex: '&4您的暱稱含有非法字符。允許的字符：REG_EX'
-add_email: '&3請使用命令: /email add [你的電郵地址] [重覆確認你的電郵地址] 將您的電子郵件添加到您的帳戶"'
-recovery_email: '&3忘記密碼了嗎？ 請使用命令: "/email recovery [你的電郵地址]"'
-usage_captcha: '&3T要登錄您必須使用captcha驗證碼,請使用命令: "/captcha <theCaptcha>"'
-wrong_captcha: '&c驗證碼錯誤!請按T在聊天中輸入 "/captcha THE_CAPTCHA"'
-valid_captcha: '&2驗證碼正確!'
-kick_forvip: '&3一名VIP玩家在服務器已滿時已加入伺服器!'
+country_banned: '&4您的國家/地區已被禁止使用此伺服器!'
+not_owner_error: '您不是此帳戶的所有者。 請選擇其他名稱!'
 kick_fullserver: '&4服務器已滿,請稍後再試!'
+same_nick: '&4伺服器上已經在使用相同的用戶名！'
+invalid_name_case: '您應該使用用戶名 %valid 而不是 %invalid 來加入。'
+same_ip_online: '一位同一IP的玩家已在遊戲中!'
+
+# Email
 usage_email_add: '&c使用方法: "/email add [電郵地址] [confirmEmail]"'
 usage_email_change: '&c使用方法: "/email change [舊電郵地址] [新電郵地址]"'
 usage_email_recovery: '&c使用方法: "/email recovery [電郵地址]"'
@ -55,20 +79,15 @@ email_confirm: '&c請確認你的電郵地址!'
 email_changed: '&2已正確地更改電子郵件地址!'
 email_send: '&2帳戶恢復電子郵件已成功發送！ 請檢查您的電子郵件收件箱!'
 email_exists: '&c備援電子郵件已傳送！ 您可以使用以下命令丟棄它並發送一個新的備援電子郵件:'
-country_banned: '&4您的國家/地區已被禁止使用此伺服器!'
-antibot_auto_enabled: '&4[AntiBotService] 伺服器由於連接數量龐大而啟用AntiBot!'
-antibot_auto_disabled: '&2[AntiBotService] AntiBot將在%m分鐘後禁用!'
-email_already_used: '&4此電子郵件地址已被使用'
-two_factor_create: '&2您的密碼是 %code。您可以從這裡掃描 %url'
-not_owner_error: '您不是此帳戶的所有者。 請選擇其他名稱!'
-invalid_name_case: '您應該使用用戶名 %valid 而不是 %invalid 來加入。'
-tempban_max_logins: '&c由於登錄失敗次數過多，您已被暫時禁止。'
-accounts_owned_self: '您擁有 %count 個帳戶:'
-accounts_owned_other: '玩家 %name 擁有 %count 個帳戶:'
-kicked_admin_registered: '管理員剛剛註冊了您; 請重新登錄。'
-incomplete_email_settings: '缺少必要的配置來為發送電子郵件。請聯繫管理員。'
-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.'
+incomplete_email_settings: '缺少必要的配置來為發送電子郵件。請聯繫管理員。'
+email_already_used: '&4此電子郵件地址已被使用'
 # TODO email_send_failure: 'The email could not be sent. Please contact an administrator.'
+# TODO show_no_email: '&2You currently don''t have email address associated with this account.'
+add_email: '&3請使用命令: /email add [你的電郵地址] [重覆確認你的電郵地址] 將您的電子郵件添加到您的帳戶"'
+recovery_email: '&3忘記密碼了嗎？ 請使用命令: "/email recovery [你的電郵地址]"'
+
+# Captcha
+usage_captcha: '&3T要登錄您必須使用captcha驗證碼,請使用命令: "/captcha <theCaptcha>"'
+wrong_captcha: '&c驗證碼錯誤!請按T在聊天中輸入 "/captcha THE_CAPTCHA"'
+valid_captcha: '&2驗證碼正確!'
--- a/src/main/resources/messages/messages_zhtw.yml
+++ b/src/main/resources/messages/messages_zhtw.yml
@ -1,49 +1,78 @@
 # Translator: MineWolf50, lifehome             #
 # Last modif: 1459528742 UTC                   #
 # -------------------------------------------- #
-kick_antibot: '&b【AuthMe】&cAntiBotMod 正在啟用中，請稍後再嘗試登入吧！'
-unknown_user: '&b【AuthMe】&6這個帳號還沒有註冊過'
-unsafe_spawn: '&b【AuthMe】&6你登出的地點不安全，已傳送你到安全的地點。'
-not_logged_in: '&b【AuthMe】&6你還沒有登入!'
-usage_log: '&b【AuthMe】&6用法: &c"/login <密碼>"'
-wrong_pwd: '&b【AuthMe】&6密碼錯誤!'
-unregistered: '&b【AuthMe】&6你已經成功取消註冊。'
-reg_disabled: '&b【AuthMe】&6已關閉註冊功能'
-valid_session: '&b【AuthMe】&6你已經成功登入!'
-login: '&b【AuthMe】&6密碼正確，你已成功登入!'
-vb_nonActiv: '&b【AuthMe】&6你的帳號還沒有經過驗證! 檢查看看你的電子信箱 (Email) 吧!'
-user_regged: '&b【AuthMe】&6這個帳號已經被註冊過了!'
-usage_reg: '&b【AuthMe】&6用法: &c"/register <密碼> <確認密碼>"'
-# TODO max_reg: Missing tags %reg_count, %max_acc, %reg_names
-max_reg: '&b【AuthMe】&6你的 IP 位置所註冊的帳號數量已經達到最大。'
-no_perm: '&b【AuthMe】&6你沒有使用該指令的權限。'
-error: '&b【AuthMe】&6發生錯誤，請聯繫管理員'
-login_msg: '&b【AuthMe】&6請使用 &c"/login <密碼>" &6來登入。'
+
+# Registration
 reg_msg: '&b【AuthMe】&6請使用 "&c/register <密碼> <確認密碼>" 來註冊。'
-usage_unreg: '&b【AuthMe】&6用法: &c"/unregister <密碼>"'
-pwd_changed: '&b【AuthMe】&6密碼變更成功!'
+usage_reg: '&b【AuthMe】&6用法: &c"/register <密碼> <確認密碼>"'
+reg_only: '&b【AuthMe】&6請到下列網站 :「 https://example.tw 」 進行註冊'
+# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
+registered: '&b【AuthMe】&6你已成功註冊'
+reg_disabled: '&b【AuthMe】&6已關閉註冊功能'
+user_regged: '&b【AuthMe】&6這個帳號已經被註冊過了!'
+
+# Password errors on registration
 password_error: '&b【AuthMe】&6兩次輸入的密碼不一致!'
 password_error_nick: '&b【AuthMe】&6你不可以用你的 ID ( 名稱 ) 來當作密碼 !'
 password_error_unsafe: '&b【AuthMe】&6你不可以使用這個不安全的密碼'
-invalid_session: '&b【AuthMe】&6憑證日期不相符!'
-reg_only: '&b【AuthMe】&6請到下列網站 :「 https://example.tw 」 進行註冊'
+# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
+pass_len: '&b【AuthMe】&6你的密碼 超過最大字數 / 小於最小字數'
+
+# Login
+usage_log: '&b【AuthMe】&6用法: &c"/login <密碼>"'
+wrong_pwd: '&b【AuthMe】&6密碼錯誤!'
+login: '&b【AuthMe】&6密碼正確，你已成功登入!'
+login_msg: '&b【AuthMe】&6請使用 &c"/login <密碼>" &6來登入。'
+timeout: '&b【AuthMe】&6超過登入時間，請稍後再試一次'
+
+# Errors
+unknown_user: '&b【AuthMe】&6這個帳號還沒有註冊過'
+# TODO denied_command: '&cIn order to use this command you must be authenticated!'
+# TODO denied_chat: '&cIn order to chat you must be authenticated!'
+not_logged_in: '&b【AuthMe】&6你還沒有登入!'
+# TODO tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
+# TODO: Missing tags %reg_count, %max_acc, %reg_names
+max_reg: '&b【AuthMe】&6你的 IP 位置所註冊的帳號數量已經達到最大。'
+no_perm: '&b【AuthMe】&6你沒有使用該指令的權限。'
+error: '&b【AuthMe】&6發生錯誤，請聯繫管理員'
+unsafe_spawn: '&b【AuthMe】&6你登出的地點不安全，已傳送你到安全的地點。'
+kick_forvip: '&b【AuthMe】&6你已經被請出。&c原因 : 有 VIP 玩家登入伺服器'
+
+# AntiBot
+kick_antibot: '&b【AuthMe】&cAntiBotMod 正在啟用中，請稍後再嘗試登入吧！'
+antibot_auto_enabled: '&b【AuthMe】&6AntiBotMod已自動啟用!'
+antibot_auto_disabled: '&b【AuthMe】&6AntiBotMod將會於 &c%m &6分鐘後自動關閉'
+
+# Other messages
+unregistered: '&b【AuthMe】&6你已經成功取消註冊。'
+# TODO accounts_owned_self: 'You own %count accounts:'
+# TODO accounts_owned_other: 'The player %name has %count accounts:'
+two_factor_create: '&b【AuthMe - 兩步驗證碼】&b你的登入金鑰為&9「%c%code&9」&b，掃描連結為：&c %url'
+# 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'
+vb_nonActiv: '&b【AuthMe】&6你的帳號還沒有經過驗證! 檢查看看你的電子信箱 (Email) 吧!'
+usage_unreg: '&b【AuthMe】&6用法: &c"/unregister <密碼>"'
+pwd_changed: '&b【AuthMe】&6密碼變更成功!'
 logged_in: '&b【AuthMe】&6你已經登入了!'
 logout: '&b【AuthMe】&6你已成功登出'
-same_nick: '&b【AuthMe】&6有同樣帳號的玩家在線上!'
-registered: '&b【AuthMe】&6你已成功註冊'
-pass_len: '&b【AuthMe】&6你的密碼 超過最大字數 / 小於最小字數'
 reload: '&b【AuthMe】&6已重新讀取設定檔及資料庫'
-timeout: '&b【AuthMe】&6超過登入時間，請稍後再試一次'
 usage_changepassword: '&b【AuthMe】&6用法: &c"/changepassword <舊密碼> <新密碼>"'
+
+# Session messages
+invalid_session: '&b【AuthMe】&6憑證日期不相符!'
+valid_session: '&b【AuthMe】&6你已經成功登入!'
+
+# Error messages when joining
 name_len: '&b【AuthMe】&6你的暱稱 太長 / 太短 了!'
 regex: '&b【AuthMe】&6暱稱裡能使用的字符為： REG_EX'
-add_email: '&b【AuthMe】&6請使用 &c"/email add <你的Email> <再次輸入你的Email>" &6來添加 Email'
-recovery_email: '&b【AuthMe】&6忘記密碼了嗎? 使用 &c"/email recovery <你的Email>"'
-usage_captcha: '&b【AuthMe】&6請用 &c"/captcha <theCaptcha>" &6來輸入你的驗證碼'
-wrong_captcha: '&b【AuthMe】&6錯誤的驗證碼，請使用 《 /captcha THE_CAPTCHA 》 再試一次吧。'
-valid_captcha: '&b【AuthMe】&6驗證碼無效!'
-kick_forvip: '&b【AuthMe】&6你已經被請出。&c原因 : 有 VIP 玩家登入伺服器'
+country_banned: '&b【AuthMe】&6你所在的地區無法進入此伺服器'
+not_owner_error: '&b【AuthMe】&4警告！&c你並不是此帳戶持有人，請立即登出。'
 kick_fullserver: '&b【AuthMe】&6伺服器已經滿了，請等等再試一次'
+same_nick: '&b【AuthMe】&6有同樣帳號的玩家在線上!'
+invalid_name_case: '&b【AuthMe】&4警告！&c你應該使用「%valid」而並非「%invalid」登入遊戲。'
+# TODO same_ip_online: 'A player with the same IP is already in game!'
+
+# Email
 usage_email_add: '&b【AuthMe】&6用法: &c"/email add <你的Email> <重複Email>"'
 usage_email_change: '&b【AuthMe】&6用法: &c"/email change <舊的Email> <新的Email>"'
 usage_email_recovery: '&b【AuthMe】&6用法: &c"/email recovery <你的Email>"'
@ -54,25 +83,16 @@ email_added: '&b【AuthMe】&6已添加Email!'
 email_confirm: '&b【AuthMe】&6請驗證你的Email!'
 email_changed: '&b【AuthMe】&6Email已變更!'
 email_send: '&b【AuthMe】&6已經送出重設密碼要求至你的Email , 請查收。'
-country_banned: '&b【AuthMe】&6你所在的地區無法進入此伺服器'
-antibot_auto_enabled: '&b【AuthMe】&6AntiBotMod已自動啟用!'
-antibot_auto_disabled: '&b【AuthMe】&6AntiBotMod將會於 &c%m &6分鐘後自動關閉'
-email_already_used: '&b【AuthMe】&4這個電郵地址已被使用。'
 email_exists: '&b【AuthMe】&6這個帳戶已經有設定電子郵件了'
-two_factor_create: '&b【AuthMe - 兩步驗證碼】&b你的登入金鑰為&9「%c%code&9」&b，掃描連結為：&c %url'
-not_owner_error: '&b【AuthMe】&4警告！&c你並不是此帳戶持有人，請立即登出。'
-invalid_name_case: '&b【AuthMe】&4警告！&c你應該使用「%valid」而並非「%invalid」登入遊戲。'
-# TODO denied_command: '&cIn order to use this command you must be authenticated!'
-# TODO same_ip_online: 'A player with the same IP is already in game!'
-# TODO denied_chat: '&cIn order to chat you must be authenticated!'
-# TODO password_error_chars: '&4Your password contains illegal characters. Allowed chars: REG_EX'
 # 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 tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
-# TODO accounts_owned_self: 'You own %count accounts:'
-# TODO accounts_owned_other: 'The player %name has %count accounts:'
-# TODO kicked_admin_registered: 'An admin just registered you; please log in again'
 # TODO incomplete_email_settings: 'Error: not all required settings are set for sending emails. Please contact an admin.'
+email_already_used: '&b【AuthMe】&4這個電郵地址已被使用。'
 # 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'
+# TODO show_no_email: '&2You currently don''t have email address associated with this account.'
+add_email: '&b【AuthMe】&6請使用 &c"/email add <你的Email> <再次輸入你的Email>" &6來添加 Email'
+recovery_email: '&b【AuthMe】&6忘記密碼了嗎? 使用 &c"/email recovery <你的Email>"'
+
+# Captcha
+usage_captcha: '&b【AuthMe】&6請用 &c"/captcha <theCaptcha>" &6來輸入你的驗證碼'
+wrong_captcha: '&b【AuthMe】&6錯誤的驗證碼，請使用 《 /captcha THE_CAPTCHA 》 再試一次吧。'
+valid_captcha: '&b【AuthMe】&6驗證碼無效!'
--- a/src/test/java/tools/messages/MessageFileElementReader.java
+++ b/src/test/java/tools/messages/MessageFileElementReader.java
@ -73,6 +73,6 @@ public class MessageFileElementReader {
    }

    private static boolean isTodoComment(String line) {
-        return line.startsWith("# TODO ");
+        return line.startsWith("# TODO");
    }
 }