diff --git a/docs/translations.md b/docs/translations.md
index 93f8f92ad..919798b3c 100644
--- a/docs/translations.md
+++ b/docs/translations.md
@@ -1,5 +1,5 @@
 <!-- AUTO-GENERATED FILE! Do not edit this directly -->
-<!-- File auto-generated on Fri Apr 19 17:16:06 CEST 2019. See docs/translations/translations.tpl.md -->
+<!-- File auto-generated on Thu Aug 15 21:13:36 CEST 2019. See docs/translations/translations.tpl.md -->
 
 # AuthMe Translations
 The following translations are available in AuthMe. Set `messagesLanguage` to the language code
@@ -8,38 +8,37 @@ 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://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-[bg](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_bg.yml) | Bulgarian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-[br](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_br.yml) | Brazilian | 97% | <img src="https://via.placeholder.com/97x7/66ee55?text=%20" alt="97" />
-[cz](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_cz.yml) | Czech | 80% | <img src="https://via.placeholder.com/80x7/aaaa11?text=%20" alt="80" />
-[de](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_de.yml) | German | 80% | <img src="https://via.placeholder.com/80x7/aaaa11?text=%20" alt="80" />
-[eo](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_eo.yml) | Esperanto | 80% | <img src="https://via.placeholder.com/80x7/aaaa11?text=%20" alt="80" />
-[es](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_es.yml) | Spanish | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-[et](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_et.yml) | Estonian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
+[bg](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_bg.yml) | Bulgarian | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
+[br](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_br.yml) | Brazilian | 96% | <img src="https://via.placeholder.com/96x7/66ee55?text=%20" alt="96" />
+[cz](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_cz.yml) | Czech | 79% | <img src="https://via.placeholder.com/79x7/bb9900?text=%20" alt="79" />
+[de](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_de.yml) | German | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
+[eo](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_eo.yml) | Esperanto | 79% | <img src="https://via.placeholder.com/79x7/bb9900?text=%20" alt="79" />
+[es](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_es.yml) | Spanish | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
+[et](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_et.yml) | Estonian | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
 [eu](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_eu.yml) | Basque | 42% | <img src="https://via.placeholder.com/42x7/aa5500?text=%20" alt="42" />
 [fi](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fi.yml) | Finnish | 45% | <img src="https://via.placeholder.com/45x7/aa5500?text=%20" alt="45" />
-[fr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fr.yml) | French | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
+[fr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fr.yml) | French | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
 [gl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_gl.yml) | Galician | 48% | <img src="https://via.placeholder.com/48x7/aa5500?text=%20" alt="48" />
-[hu](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_hu.yml) | Hungarian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
+[hu](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_hu.yml) | Hungarian | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
 [id](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_id.yml) | Indonesian | 93% | <img src="https://via.placeholder.com/93x7/77dd44?text=%20" alt="93" />
-[it](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_it.yml) | Italian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-[ko](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ko.yml) | Korean | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
+[it](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_it.yml) | Italian | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
+[ko](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ko.yml) | Korean | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
 [lt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_lt.yml) | Lithuanian | 36% | <img src="https://via.placeholder.com/36x7/aa4400?text=%20" alt="36" />
-[nl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_nl.yml) | Dutch | 80% | <img src="https://via.placeholder.com/80x7/aaaa11?text=%20" alt="80" />
-[pl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pl.yml) | Polish | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-[pt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pt.yml) | Portuguese | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-[ro](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ro.yml) | Romanian | 80% | <img src="https://via.placeholder.com/80x7/aaaa11?text=%20" alt="80" />
-[ru](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ru.yml) | Russian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-[sk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_sk.yml) | Slovakian | 80% | <img src="https://via.placeholder.com/80x7/aaaa11?text=%20" alt="80" />
-[sr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_sr.yml) | Serbian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-[tr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_tr.yml) | Turkish | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
+[nl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_nl.yml) | Dutch | 79% | <img src="https://via.placeholder.com/79x7/bb9900?text=%20" alt="79" />
+[pl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pl.yml) | Polish | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
+[pt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pt.yml) | Portuguese | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
+[ro](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ro.yml) | Romanian | 79% | <img src="https://via.placeholder.com/79x7/bb9900?text=%20" alt="79" />
+[ru](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ru.yml) | Russian | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
+[sk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_sk.yml) | Slovakian | 79% | <img src="https://via.placeholder.com/79x7/bb9900?text=%20" alt="79" />
+[sr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_sr.yml) | Serbian | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
+[tr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_tr.yml) | Turkish | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
 [uk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_uk.yml) | Ukrainian | 63% | <img src="https://via.placeholder.com/63x7/bb7700?text=%20" alt="63" />
 [vn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_vn.yml) | Vietnamese | 77% | <img src="https://via.placeholder.com/77x7/bb9900?text=%20" alt="77" />
-[zhcn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhcn.yml) | Chinese (China) | 98% | <img src="https://via.placeholder.com/98x7/66ee55?text=%20" alt="98" />
-[zhhk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhhk.yml) | Chinese (Hong Kong) | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
-[zhmc](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhmc.yml) | Chinese (Macau) | 65% | <img src="https://via.placeholder.com/65x7/bb7700?text=%20" alt="65" />
-[zhtw](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhtw.yml) | Chinese (Taiwan) | 87% | <img src="https://via.placeholder.com/87x7/99bb22?text=%20" alt="87" />
-
+[zhcn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhcn.yml) | Chinese (China) | 97% | <img src="https://via.placeholder.com/97x7/66ee55?text=%20" alt="97" />
+[zhhk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhhk.yml) | Chinese (Hong Kong) | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
+[zhmc](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhmc.yml) | Chinese (Macau) | 64% | <img src="https://via.placeholder.com/64x7/bb7700?text=%20" alt="64" />
+[zhtw](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhtw.yml) | Chinese (Taiwan) | 86% | <img src="https://via.placeholder.com/86x7/99bb22?text=%20" alt="86" />
 
 ---
 
-This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Fri Apr 19 17:16:06 CEST 2019
+This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Thu Aug 15 21:13:36 CEST 2019
diff --git a/src/main/resources/messages/messages_bg.yml b/src/main/resources/messages/messages_bg.yml
index b359a406e..30015296a 100644
--- a/src/main/resources/messages/messages_bg.yml
+++ b/src/main/resources/messages/messages_bg.yml
@@ -40,6 +40,7 @@ error:
     max_registration: '&cВие сте достигнали максималният брой регистрации (%reg_count/%max_acc %reg_names)!'
     logged_in: '&cВече сте влезли!'
     kick_for_vip: '&3VIP потребител влезе докато сървъра беше пълен, вие бяхте изгонен!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cВие бяхте баннат временно, понеже сте си сгрешили паролата прекалено много пъти.'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_br.yml b/src/main/resources/messages/messages_br.yml
index c20799451..86a89c73f 100644
--- a/src/main/resources/messages/messages_br.yml
+++ b/src/main/resources/messages/messages_br.yml
@@ -43,6 +43,7 @@ error:
     max_registration: '&cVocê excedeu o número máximo de inscrições (%reg_count/%max_acc %reg_names) do seu IP!'
     logged_in: '&cVocê já está logado!'
     kick_for_vip: '&3Um jogador VIP juntou-se ao servidor enquanto ele estava cheio!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cVocê foi temporariamente banido por tentar logar muitas vezes.'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_cz.yml b/src/main/resources/messages/messages_cz.yml
index 025b39f7a..d81b008be 100644
--- a/src/main/resources/messages/messages_cz.yml
+++ b/src/main/resources/messages/messages_cz.yml
@@ -40,6 +40,7 @@ error:
     max_registration: '&cPřekročil(a) jsi limit pro počet účtů (%reg_count/%max_acc %reg_names) z jedné IP adresy.'
     logged_in: '&cJsi již přihlášen!'
     kick_for_vip: '&cOmlouváme se, ale VIP hráč se připojil na plný server!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cByl jsi dočasně zabanován za příliš mnoho neúspěšných pokusů o přihlášení.'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_de.yml b/src/main/resources/messages/messages_de.yml
index 3cc9bfeac..63f9de61b 100644
--- a/src/main/resources/messages/messages_de.yml
+++ b/src/main/resources/messages/messages_de.yml
@@ -40,6 +40,7 @@ error:
     max_registration: '&cDu hast die maximale Anzahl an Accounts erreicht (%reg_count/%max_acc %reg_names).'
     logged_in: '&cBereits eingeloggt!'
     kick_for_vip: '&3Ein VIP-Spieler hat den vollen Server betreten!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cDu bist wegen zu vielen fehlgeschlagenen Login-Versuchen temporär gebannt!'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_eo.yml b/src/main/resources/messages/messages_eo.yml
index 5636ab729..c42b1426c 100644
--- a/src/main/resources/messages/messages_eo.yml
+++ b/src/main/resources/messages/messages_eo.yml
@@ -40,6 +40,7 @@ error:
     max_registration: 'Vi superis la maksimuman nombron de enregistroj (%reg_count/%max_acc %reg_names) pro via ligo!'
     logged_in: '&cVi jam estas ensalutinta!'
     kick_for_vip: '&3VIP ludanto aliĝis al la servilo kiam ĝi pleniĝis!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cVi estis portempe malpermesita por ne ensaluti tro multajn fojojn.'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_es.yml b/src/main/resources/messages/messages_es.yml
index 8ab9ee080..d36c993de 100644
--- a/src/main/resources/messages/messages_es.yml
+++ b/src/main/resources/messages/messages_es.yml
@@ -41,6 +41,7 @@ error:
     max_registration: '&fHas excedido la cantidad máxima de registros para tu cuenta'
     logged_in: '&c¡Ya has iniciado sesión!'
     kick_for_vip: '&c¡Un jugador VIP ha ingresado al servidor lleno!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cHas sido expulsado temporalmente por intentar iniciar sesión demasiadas veces.'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_et.yml b/src/main/resources/messages/messages_et.yml
index a248d0f21..3c388b7cd 100644
--- a/src/main/resources/messages/messages_et.yml
+++ b/src/main/resources/messages/messages_et.yml
@@ -5,150 +5,153 @@
 
 # Registration
 registration:
-  register_request: '&3Palun registreeri käsklusega: /register <parool> <KinnitaParool>'
-  command_usage: '&cKasutus: /register <parool> <KinnitaParool>'
-  reg_only: '&4Vaid registreeritud mängijad saavad liituda serveriga! Külasta http://example.com enda kasutaja registreerimiseks!'
-  kicked_admin_registered: 'Administraator registreeris su kasutaja, palun logi uuesti sisse.'
-  success: '&2Edukalt registreeritud!'
-  disabled: '&cMängusisene registreerimine on välja lülitatud!'
-  name_taken: '&cSee kasutaja on juba registreeritud!'
+    disabled: '&cMängusisene registreerimine on välja lülitatud!'
+    name_taken: '&cSee kasutaja on juba registreeritud!'
+    register_request: '&3Palun registreeri käsklusega: /register <parool> <KinnitaParool>'
+    command_usage: '&cKasutus: /register <parool> <KinnitaParool>'
+    reg_only: '&4Vaid registreeritud mängijad saavad liituda serveriga! Külasta http://example.com enda kasutaja registreerimiseks!'
+    success: '&2Edukalt registreeritud!'
+    kicked_admin_registered: 'Administraator registreeris su kasutaja, palun logi uuesti sisse.'
 
 # Password errors on registration
 password:
-  match_error: '&cParoolid ei kattu, palun proovi uuesti!'
-  name_in_password: '&cSa ei saa kasutada oma kasutajanime paroolina, palun vali mõni teine parool.'
-  unsafe_password: '&cSee parool ei ole turvaline, palun vali mõni teine parool.'
-  forbidden_characters: '&4Su parool sisaldab keelatud tähemärke. Lubatud tähemärgid: %valid_chars'
-  wrong_length: '&cSu parool on liiga pikk või lühike, palun vali mõni teine parool.'
+    match_error: '&cParoolid ei kattu, palun proovi uuesti!'
+    name_in_password: '&cSa ei saa kasutada oma kasutajanime paroolina, palun vali mõni teine parool.'
+    unsafe_password: '&cSee parool ei ole turvaline, palun vali mõni teine parool.'
+    forbidden_characters: '&4Su parool sisaldab keelatud tähemärke. Lubatud tähemärgid: %valid_chars'
+    wrong_length: '&cSu parool on liiga pikk või lühike, palun vali mõni teine parool.'
 
 # Login
 login:
-  command_usage: '&cKasutus: /login <parool>'
-  wrong_password: '&cVale parool!'
-  success: '&2Edukalt sisselogitud!'
-  login_request: '&cPalun logi sisse kasutades käsklust: /login <parool>'
-  timeout_error: '&4Sisselogimiseks antud aeg on läbi, palun proovi uuesti!'
+    command_usage: '&cKasutus: /login <parool>'
+    wrong_password: '&cVale parool!'
+    success: '&2Edukalt sisselogitud!'
+    login_request: '&cPalun logi sisse kasutades käsklust: /login <parool>'
+    timeout_error: '&4Sisselogimiseks antud aeg on läbi, palun proovi uuesti!'
 
 # Errors
 error:
-  unregistered_user: '&cSee kasutaja ei ole registreeritud!'
-  denied_command: '&cSelle käskluse kasutamiseks pead sisse logima!'
-  denied_chat: '&cRääkimiseks pead sisse logima!'
-  not_logged_in: '&cSa ei ole sisselogitud!'
-  tempban_max_logins: '&cSind blokeeriti ajutiselt serverist, sest sisestasid mitu korda vale parooli.'
-  max_registration: '&cSu IP aadressile on registreeritud liiga palju kasutajaid! (%reg_count/%max_acc %reg_names)'
-  no_permission: '&4Sul ei ole õigust selle käskluse kasutamiseks.'
-  unexpected_error: '&4Süsteemis tekkis viga, teata sellest administraatorile!'
-  kick_for_vip: '&3VIP mängija liitus serveriga ajal, mil see oli täis!'
-  logged_in: '&cSa oled juba sisselogitud!'
+    denied_command: '&cSelle käskluse kasutamiseks pead sisse logima!'
+    denied_chat: '&cRääkimiseks pead sisse logima!'
+    unregistered_user: '&cSee kasutaja ei ole registreeritud!'
+    not_logged_in: '&cSa ei ole sisselogitud!'
+    no_permission: '&4Sul ei ole õigust selle käskluse kasutamiseks.'
+    unexpected_error: '&4Süsteemis tekkis viga, teata sellest administraatorile!'
+    max_registration: '&cSu IP aadressile on registreeritud liiga palju kasutajaid! (%reg_count/%max_acc %reg_names)'
+    logged_in: '&cSa oled juba sisselogitud!'
+    kick_for_vip: '&3VIP mängija liitus serveriga ajal, mil see oli täis!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
+    tempban_max_logins: '&cSind blokeeriti ajutiselt serverist, sest sisestasid mitu korda vale parooli.'
 
 # AntiBot
 antibot:
-  kick_antibot: 'AntiBot kaitse sisse lülitatud! Pead ootama mõne minuti enne kui serveriga liituda saad.'
-  auto_enabled: '&4[AntiBotKaitse] AntiBot sisselülitatud!'
-  auto_disabled: '&2[AntiBotKaitse] AntiBot välja lülitatud peale %m minutit!'
+    kick_antibot: 'AntiBot kaitse sisse lülitatud! Pead ootama mõne minuti enne kui serveriga liituda saad.'
+    auto_enabled: '&4[AntiBotKaitse] AntiBot sisselülitatud!'
+    auto_disabled: '&2[AntiBotKaitse] AntiBot välja lülitatud peale %m minutit!'
 
+# Unregister
 unregister:
-  success: '&cKasutaja edukalt kustutatud!'
-  command_usage: '&cKasutus: /unregister <parool>'
+    success: '&cKasutaja edukalt kustutatud!'
+    command_usage: '&cKasutus: /unregister <parool>'
 
 # Other messages
 misc:
-  accounts_owned_self: 'Sa omad %count kontot:'
-  accounts_owned_other: 'Mängijal %name on %count kontot:'
-  account_not_activated: '&cSu konto ei ole veel aktiveeritud, kontrolli oma meili!'
-  password_changed: '&2Parool vahetatud!'
-  logout: '&2Edukalt välja logitud!'
-  reload: '&2Andmebaas edukalt laetud!'
-  usage_change_password: '&cKasutus: /changepassword <vanaParool> <uusParool>'
+    account_not_activated: '&cSu konto ei ole veel aktiveeritud, kontrolli oma meili!'
+    password_changed: '&2Parool vahetatud!'
+    logout: '&2Edukalt välja logitud!'
+    reload: '&2Andmebaas edukalt laetud!'
+    usage_change_password: '&cKasutus: /changepassword <vanaParool> <uusParool>'
+    accounts_owned_self: 'Sa omad %count kontot:'
+    accounts_owned_other: 'Mängijal %name on %count kontot:'
 
 # Session messages
 session:
-  invalid_session: '&cSu IP aadress muutus mistõttu sinu sessioon aegus!'
-  valid_session: '&2Sisse logitud sessiooni jätkumise tõttu.'
+    valid_session: '&2Sisse logitud sessiooni jätkumise tõttu.'
+    invalid_session: '&cSu IP aadress muutus mistõttu sinu sessioon aegus!'
 
 # Error messages when joining
 on_join_validation:
-  name_length: '&4Su kasutajanimi on liiga pikk või lühike!'
-  characters_in_name: '&4Su kasutajanimi sisaldab keelatud tähemärke. Lubatud tähemärgid: %valid_chars'
-  country_banned: '&4Sinu riigist ei ole võimalik ühenduda sellesse serverisse!'
-  not_owner_error: 'Sa ei ole selle kasutaja omanik. Vali teine nimi!!'
-  kick_full_server: '&4Server täis, proovi uuesti!'
-  same_nick_online: '&4Sama kasutaja on juba ühendatud serveriga!'
-  invalid_name_case: 'Sa peaksid liituma nimega %valid, mitte nimega %invalid.'
-  same_ip_online: 'Sama IP aadressiga mängija juba mängib!'
-  quick_command: 'Sa kasutasid käsklust liiga kiiresti! Palun liitu serveriga ja oota kauem enne kui käsklust kasutad.'
+    same_ip_online: 'Sama IP aadressiga mängija juba mängib!'
+    same_nick_online: '&4Sama kasutaja on juba ühendatud serveriga!'
+    name_length: '&4Su kasutajanimi on liiga pikk või lühike!'
+    characters_in_name: '&4Su kasutajanimi sisaldab keelatud tähemärke. Lubatud tähemärgid: %valid_chars'
+    kick_full_server: '&4Server täis, proovi uuesti!'
+    country_banned: '&4Sinu riigist ei ole võimalik ühenduda sellesse serverisse!'
+    not_owner_error: 'Sa ei ole selle kasutaja omanik. Vali teine nimi!!'
+    invalid_name_case: 'Sa peaksid liituma nimega %valid, mitte nimega %invalid.'
+    quick_command: 'Sa kasutasid käsklust liiga kiiresti! Palun liitu serveriga ja oota kauem enne kui käsklust kasutad.'
 
 # Email
 email:
-  usage_email_add: '&cKasutus: /email add <email> <kinnitaEmail>'
-  usage_email_change: '&cKasutus: /email change <vanaEmail> <uusEmail>'
-  new_email_invalid: '&cUus meiliaadress on vale, proovi uuesti!'
-  old_email_invalid: '&cVana meiliaadress on vale, proovi uuesti!'
-  invalid: '&cVale meiliaadress, proovi uuesti!'
-  added: '&2Meiliaadress edukalt lisatud!'
-  request_confirmation: '&cPalun kinnita oma meiliaadress!'
-  changed: '&2Meiliaadress edukalt muudetud!'
-  email_show: '&2Su praegune meiliaadress on: &f%email'
-  incomplete_settings: 'Viga: meili saatmiseks pole kõik vajalikud seaded seadistatud. Teata sellest administraatorile.'
-  already_used: '&4See meiliaadress on juba kasutuses!'
-  send_failure: 'Meili ei õnnestunud saata. Teata sellest administraatorile.'
-  no_email_for_account: '&2Selle kasutajaga ei ole seotud ühtegi meiliaadressi.'
-  add_email_request: '&3Palun seo oma kasutajaga meiliaadress kasutades käsklust: /email add <sinuEmail> <kinnitaEmail>'
-  change_password_expired: 'Selle käsklusega ei saa sa enam parooli muuta.'
-  email_cooldown_error: '&cMeil on juba saadetud. Sa pead ootama %time enne kui saad küsida uue saatmist.'
-  add_not_allowed: '&cMeiliaadressi lisamine ei ole lubatud.'
-  change_not_allowed: '&cMeiliaadressi muutmine ei ole lubatud.'
+    add_email_request: '&3Palun seo oma kasutajaga meiliaadress kasutades käsklust: /email add <sinuEmail> <kinnitaEmail>'
+    usage_email_add: '&cKasutus: /email add <email> <kinnitaEmail>'
+    usage_email_change: '&cKasutus: /email change <vanaEmail> <uusEmail>'
+    new_email_invalid: '&cUus meiliaadress on vale, proovi uuesti!'
+    old_email_invalid: '&cVana meiliaadress on vale, proovi uuesti!'
+    invalid: '&cVale meiliaadress, proovi uuesti!'
+    added: '&2Meiliaadress edukalt lisatud!'
+    add_not_allowed: '&cMeiliaadressi lisamine ei ole lubatud.'
+    request_confirmation: '&cPalun kinnita oma meiliaadress!'
+    changed: '&2Meiliaadress edukalt muudetud!'
+    change_not_allowed: '&cMeiliaadressi muutmine ei ole lubatud.'
+    email_show: '&2Su praegune meiliaadress on: &f%email'
+    no_email_for_account: '&2Selle kasutajaga ei ole seotud ühtegi meiliaadressi.'
+    already_used: '&4See meiliaadress on juba kasutuses!'
+    incomplete_settings: 'Viga: meili saatmiseks pole kõik vajalikud seaded seadistatud. Teata sellest administraatorile.'
+    send_failure: 'Meili ei õnnestunud saata. Teata sellest administraatorile.'
+    change_password_expired: 'Selle käsklusega ei saa sa enam parooli muuta.'
+    email_cooldown_error: '&cMeil on juba saadetud. Sa pead ootama %time enne kui saad küsida uue saatmist.'
 
 # Password recovery by email
 recovery:
-  forgot_password_hint: '&3Unustasid oma parooli? Kasuta käsklust: /email recovery <sinuEmail>'
-  command_usage: '&cKasutus: /email recovery <Email>'
-  email_sent: '&2Konto taastamiseks vajalik meil saadetud! Vaata oma postkasti.'
-  code:
-    code_sent: 'Konto taastamise kood on saadetud!'
-    incorrect: 'Kood vale! Sul on %count katset jäänud.'
-    tries_exceeded: 'Sul on katsed otsas. Kasuta käsklust "/email recovery [email]" uue koodi saamiseks.'
-    correct: 'Kood õigesti sisestatud!'
-    change_password: 'Palun kasuta käsklust /email setpassword <uusParool> parooli muutmiseks.'
+    forgot_password_hint: '&3Unustasid oma parooli? Kasuta käsklust: /email recovery <sinuEmail>'
+    command_usage: '&cKasutus: /email recovery <Email>'
+    email_sent: '&2Konto taastamiseks vajalik meil saadetud! Vaata oma postkasti.'
+    code:
+        code_sent: 'Konto taastamise kood on saadetud!'
+        incorrect: 'Kood vale! Sul on %count katset jäänud.'
+        tries_exceeded: 'Sul on katsed otsas. Kasuta käsklust "/email recovery [email]" uue koodi saamiseks.'
+        correct: 'Kood õigesti sisestatud!'
+        change_password: 'Palun kasuta käsklust /email setpassword <uusParool> parooli muutmiseks.'
 
 # Captcha
 captcha:
-  usage_captcha: '&3Sisselogimiseks lahenda captcha käsklusega: /captcha %captcha_code'
-  wrong_captcha: '&cVale captcha, kasuta käsklust "/captcha %captcha_code"!'
-  valid_captcha: '&2Captcha lahendatud!'
-  captcha_for_registration: 'Registreerimiseks lahenda captcha kasutades käsklust: /captcha %captcha_code'
-  register_captcha_valid: '&2Captcha lahendatud! Võid nüüd registreerida kasutades käsklust /register'
+    usage_captcha: '&3Sisselogimiseks lahenda captcha käsklusega: /captcha %captcha_code'
+    wrong_captcha: '&cVale captcha, kasuta käsklust "/captcha %captcha_code"!'
+    valid_captcha: '&2Captcha lahendatud!'
+    captcha_for_registration: 'Registreerimiseks lahenda captcha kasutades käsklust: /captcha %captcha_code'
+    register_captcha_valid: '&2Captcha lahendatud! Võid nüüd registreerida kasutades käsklust /register'
 
 # Verification code
 verification:
-  code_required: '&3See käsklus on ohtlik mistõttu saatsime sulle meili. Kontrolli oma meili ja järgi saadetud meili juhiseid.'
-  command_usage: '&cKasutus: /verification <kood>'
-  incorrect_code: '&cVale kood, palun kasuta käsklust "/verification <kood>" koodiga, mille saatsime sulle meilile.'
-  success: '&2Konto kinnitatud!'
-  already_verified: '&2Sa juba saad kasutada kõiki ohtlikke käsklusi!'
-  code_expired: '&3Kood aegunud! Kasuta mõnda ohtlikku käsklust, et saada uus kood!'
-  email_needed: '&3Konto kinnitamiseks pead siduma oma kontoga enda meiliaadressi!'
-
-two_factor:
-  code_created: '&2Sinu privaatne kood on %code. Sa saad selle skännida aadressil %url'
-  confirmation_required: 'Palun kinnita oma kaheastmeline autentimise kood käsklusega /2fa confirm <kood>'
-  code_required: 'Palun sisesta kaheastmeline autentimise kood kasutades /2fa code <kood>'
-  already_enabled: 'Kaheastmeline autentimine on juba sisselülitatud!'
-  enable_error_no_code: '2fa võtit ei ole genereeritud või on see aegunud. Kasuta käsklust /2fa add'
-  enable_success: 'Kaheastmeline autentimine edukalt sisselülitatud!'
-  enable_error_wrong_code: 'Vale kood või kood on aegunud. Kasuta käsklust /2fa add'
-  not_enabled_error: 'Kaheastmeline autentimine ei ole su kontol sisse lülitatud. Kasuta käsklust /2fa add'
-  removed_success: 'Sinu kontolt on edukalt eemaldatud kaheastmeline autentimine.'
-  invalid_code: 'Vale kood!'
+    code_required: '&3See käsklus on ohtlik mistõttu saatsime sulle meili. Kontrolli oma meili ja järgi saadetud meili juhiseid.'
+    command_usage: '&cKasutus: /verification <kood>'
+    incorrect_code: '&cVale kood, palun kasuta käsklust "/verification <kood>" koodiga, mille saatsime sulle meilile.'
+    success: '&2Konto kinnitatud!'
+    already_verified: '&2Sa juba saad kasutada kõiki ohtlikke käsklusi!'
+    code_expired: '&3Kood aegunud! Kasuta mõnda ohtlikku käsklust, et saada uus kood!'
+    email_needed: '&3Konto kinnitamiseks pead siduma oma kontoga enda meiliaadressi!'
 
 # Time units
 time:
-  second: 'sekund'
-  seconds: 'sekundit'
-  minute: 'minut'
-  minutes: 'minutit'
-  hour: 'tund'
-  hours: 'tundi'
-  day: 'päev'
-  days: 'päeva'
+    second: 'sekund'
+    seconds: 'sekundit'
+    minute: 'minut'
+    minutes: 'minutit'
+    hour: 'tund'
+    hours: 'tundi'
+    day: 'päev'
+    days: 'päeva'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2Sinu privaatne kood on %code. Sa saad selle skännida aadressil %url'
+    confirmation_required: 'Palun kinnita oma kaheastmeline autentimise kood käsklusega /2fa confirm <kood>'
+    code_required: 'Palun sisesta kaheastmeline autentimise kood kasutades /2fa code <kood>'
+    already_enabled: 'Kaheastmeline autentimine on juba sisselülitatud!'
+    enable_error_no_code: '2fa võtit ei ole genereeritud või on see aegunud. Kasuta käsklust /2fa add'
+    enable_success: 'Kaheastmeline autentimine edukalt sisselülitatud!'
+    enable_error_wrong_code: 'Vale kood või kood on aegunud. Kasuta käsklust /2fa add'
+    not_enabled_error: 'Kaheastmeline autentimine ei ole su kontol sisse lülitatud. Kasuta käsklust /2fa add'
+    removed_success: 'Sinu kontolt on edukalt eemaldatud kaheastmeline autentimine.'
+    invalid_code: 'Vale kood!'
diff --git a/src/main/resources/messages/messages_eu.yml b/src/main/resources/messages/messages_eu.yml
index cfa0f78b3..a32386d7e 100644
--- a/src/main/resources/messages/messages_eu.yml
+++ b/src/main/resources/messages/messages_eu.yml
@@ -40,6 +40,7 @@ error:
     max_registration: '&fKontuko 2 erabiltzaile bakarrik izan ditzakezu'
     logged_in: '&cDagoeneko saioa hasita!'
     kick_for_vip: '&cVIP erabiltzaile bat sartu da zerbitzaria beteta zegoenean!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     # TODO tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_fi.yml b/src/main/resources/messages/messages_fi.yml
index 00a29ba4e..c0f6431a6 100644
--- a/src/main/resources/messages/messages_fi.yml
+++ b/src/main/resources/messages/messages_fi.yml
@@ -40,6 +40,7 @@ error:
     max_registration: '&fSinulla ei ole oikeuksia tehdä enempää pelaajatilejä!'
     logged_in: '&cOlet jo kirjautunut!'
     kick_for_vip: '&cVIP pelaaja liittyi täyteen palvelimeen!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     # TODO tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_fr.yml b/src/main/resources/messages/messages_fr.yml
index 87f0c7443..f9817cc6e 100644
--- a/src/main/resources/messages/messages_fr.yml
+++ b/src/main/resources/messages/messages_fr.yml
@@ -6,7 +6,7 @@
 # %username% - Affiche le pseudo du joueur recevant le message.
 # %displayname% - Affiche le pseudo, avec couleurs, du joueur recevant le message.
 
-# Enregistrement
+# Registration
 registration:
     disabled: '&cL''inscription est désactivée.'
     name_taken: '&cUtilisateur déjà inscrit.'
@@ -16,7 +16,7 @@ registration:
     success: '&aInscription effectuée !'
     kicked_admin_registered: 'Un admin vient de vous inscrire, veuillez vous reconnecter.'
 
-# Erreurs de mot de passe lors de l'enregistrement
+# Password errors on registration
 password:
     match_error: '&cLe mot de passe de confirmation ne correspond pas.'
     name_in_password: '&cVous ne pouvez pas utiliser votre pseudo comme mot de passe.'
@@ -24,7 +24,7 @@ password:
     forbidden_characters: '&cVotre mot de passe contient des caractères non autorisés. Caractères permis : %valid_chars'
     wrong_length: '&cVotre mot de passe est trop court ou trop long !'
 
-# Identification
+# Login
 login:
     command_usage: '&cUsage: /login <MotDePasse>'
     wrong_password: '&cMauvais mot de passe !'
@@ -32,7 +32,7 @@ login:
     login_request: '&cPour vous identifier, utilisez "/login <MotDePasse>"'
     timeout_error: 'Vous avez été expulsé car vous êtes trop lent pour vous enregistrer/identifier !'
 
-# Erreurs
+# Errors
 error:
     denied_command: '&cVous devez être connecté pour pouvoir utiliser cette commande.'
     denied_chat: '&cVous devez être connecté pour pouvoir écrire dans le chat.'
@@ -43,6 +43,7 @@ error:
     max_registration: 'Vous avez atteint la limite d''inscription !%nl%&cVous avez %reg_count sur %max_acc : %reg_names'
     logged_in: '&aVous êtes déjà connecté.'
     kick_for_vip: 'Un joueur VIP a rejoint le serveur à votre place (serveur plein).'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cVous êtes temporairement banni suite à plusieurs échecs de connexions !'
 
 # AntiBot
@@ -51,12 +52,12 @@ antibot:
     auto_enabled: 'L''AntiBot a été activé automatiquement à cause de nombreuses connexions !'
     auto_disabled: 'L''AntiBot a été désactivé automatiquement après %m minutes, espérons que l''invasion se soit arrêtée !'
 
-# Dé-enregistrement
+# Unregister
 unregister:
     success: '&aCompte supprimé !'
     command_usage: '&cPour supprimer votre compte, utilisez "/unregister <MotDePasse>"'
 
-# Messages divers
+# Other messages
 misc:
     account_not_activated: '&fCe compte n''est pas actif, consultez vos mails !'
     password_changed: '&aMot de passe changé avec succès !'
@@ -66,12 +67,12 @@ misc:
     accounts_owned_self: 'Vous avez %count comptes:'
     accounts_owned_other: 'Le joueur %name a %count comptes:'
 
-# Messages de sessions
+# Session messages
 session:
     valid_session: '&aVous avez été automatiquement connecté !'
     invalid_session: 'Session expirée suite à un changement d''IP.'
 
-# Messages d'erreurs lors de la connexion
+# Error messages when joining
 on_join_validation:
     same_ip_online: 'Un joueur avec la même adresse IP joue déjà !'
     same_nick_online: 'Un joueur ayant le même pseudo est déjà connecté.'
@@ -104,7 +105,7 @@ email:
     change_password_expired: 'Vous ne pouvez pas changer votre mot de passe avec cette commande.'
     email_cooldown_error: '&cUn mail de récupération a déjà été envoyé récemment. Veuillez attendre %time pour le demander de nouveau.'
 
-# Récupération de mot de passe par mail
+# Password recovery by email
 recovery:
     forgot_password_hint: '&cVous avez oublié votre Mot de Passe? Utilisez "/email recovery <votreEmail>"'
     command_usage: '&fUsage: /email recovery <Email>'
@@ -124,7 +125,7 @@ captcha:
     captcha_for_registration: 'Avant de vous inscrire veuillez rentrer un captcha en faisant "/captcha %captcha_code"'
     register_captcha_valid: '&aCaptcha validé! Vous pouvez maintenant vous inscrire.'
 
-# Code de vérification
+# Verification code
 verification:
     code_required: '&cCette commande est sensible, elle nécessite donc une confirmation par email.%nl%&cVeuillez suivre les instructions qui viennent de vous être envoyées par email.'
     command_usage: '&cUsage: /verification <code>'
@@ -134,20 +135,7 @@ verification:
     code_expired: '&cVotre code d''identification a expiré !%nl%&cVeuillez re-exécuter une commande sensible pour recevoir un nouveau code.'
     email_needed: '&cAfin de vérifier votre identité, vous devez avoir un email lié à votre compte.%nl%&cPour cela, faites "/email add <Email> <ConfirmerEmail>"'
 
-# Authentification à double facteur
-two_factor:
-    code_created: '&aVotre code secret est &2%code&a. Vous pouvez le scanner depuis &2%url'
-    code_required: 'Veuillez indiquer votre code secret en écrivant "/2fa code <Code>"'
-    confirmation_required: 'Veuillez confirmer votre code secret en écrivant "/2fa confirm <Code>"'
-    already_enabled: '&aL''authentification à double facteur est déjà active !'
-    enable_error_no_code: '&cAucun code secret n''a été généré ou bien celui-ci a expiré. Veuillez écrire "/2fa add"'
-    enable_success: '&aL''authentification à double facteur a été activé pour votre compte !'
-    enable_error_wrong_code: '&cLe code secret est faux ou bien celui-ci a expiré. Veuillez écrire "/2fa add"'
-    not_enabled_error: '&cL''authentification à double facteur n''est pas active sur votre compte. Faites "/2fa add" pour l''activer.'
-    removed_success: '&cL''authentification à double facteur a été désactivé pour votre compte !'
-    invalid_code: '&cCode secret invalide !'
-    
-# Unités de temps
+# Time units
 time:
     second: 'seconde'
     seconds: 'secondes'
@@ -157,3 +145,16 @@ time:
     hours: 'heures'
     day: 'jour'
     days: 'jours'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&aVotre code secret est &2%code&a. Vous pouvez le scanner depuis &2%url'
+    confirmation_required: 'Veuillez confirmer votre code secret en écrivant "/2fa confirm <Code>"'
+    code_required: 'Veuillez indiquer votre code secret en écrivant "/2fa code <Code>"'
+    already_enabled: '&aL''authentification à double facteur est déjà active !'
+    enable_error_no_code: '&cAucun code secret n''a été généré ou bien celui-ci a expiré. Veuillez écrire "/2fa add"'
+    enable_success: '&aL''authentification à double facteur a été activé pour votre compte !'
+    enable_error_wrong_code: '&cLe code secret est faux ou bien celui-ci a expiré. Veuillez écrire "/2fa add"'
+    not_enabled_error: '&cL''authentification à double facteur n''est pas active sur votre compte. Faites "/2fa add" pour l''activer.'
+    removed_success: '&cL''authentification à double facteur a été désactivé pour votre compte !'
+    invalid_code: '&cCode secret invalide !'
diff --git a/src/main/resources/messages/messages_gl.yml b/src/main/resources/messages/messages_gl.yml
index 6b6f8707e..6b7d59e64 100644
--- a/src/main/resources/messages/messages_gl.yml
+++ b/src/main/resources/messages/messages_gl.yml
@@ -40,6 +40,7 @@ error:
     max_registration: '&fExcediches o máximo de rexistros para a túa Conta'
     logged_in: '&cXa estás identificado!'
     kick_for_vip: '&cUn xogador VIP uniuse ao servidor cheo!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     # TODO tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_hu.yml b/src/main/resources/messages/messages_hu.yml
index e1570ad3f..a72deba8d 100644
--- a/src/main/resources/messages/messages_hu.yml
+++ b/src/main/resources/messages/messages_hu.yml
@@ -40,6 +40,7 @@ error:
     max_registration: '&cElérted a maximálisan beregisztrálható karakterek számát. (%reg_count/%max_acc %reg_names)'
     logged_in: '&cMár be vagy jelentkezve!'
     kick_for_vip: '&3VIP játékos csatlakozott a szerverhez!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cIdeiglenesen ki lettél tiltva, mert túl sok alkalommal rontottad el a jelszavad!'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_id.yml b/src/main/resources/messages/messages_id.yml
index a74ce8d89..68a77713c 100644
--- a/src/main/resources/messages/messages_id.yml
+++ b/src/main/resources/messages/messages_id.yml
@@ -40,6 +40,7 @@ error:
     max_registration: '&Kamu telah mencapai batas maksimum pendaftaran di server ini!'
     logged_in: '&cKamu telah login!'
     kick_for_vip: '&3Player VIP mencoba masuk pada saat server sedang penuh!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cKamu untuk sementara diblokir karena terlalu sering salah saat login.'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_it.yml b/src/main/resources/messages/messages_it.yml
index 9e9721b96..3165cc777 100644
--- a/src/main/resources/messages/messages_it.yml
+++ b/src/main/resources/messages/messages_it.yml
@@ -41,6 +41,7 @@ error:
     max_registration: '&cHai raggiunto il numero massimo di registrazioni (%reg_count/%max_acc %reg_names) per questo indirizzo IP!'
     logged_in: '&cHai già eseguito l''autenticazione!'
     kick_for_vip: '&3Un utente VIP è entrato mentre il server era pieno e ha preso il tuo posto!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cSei stato temporaneamente bandito per aver fallito l''autenticazione troppe volte.'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_ko.yml b/src/main/resources/messages/messages_ko.yml
index b33c1c8af..81d836d82 100644
--- a/src/main/resources/messages/messages_ko.yml
+++ b/src/main/resources/messages/messages_ko.yml
@@ -42,6 +42,7 @@ error:
     max_registration: '&c당신은 가입할 수 있는 계정 한도를 초과했습니다 (%reg_count/%max_acc %reg_names)!'
     logged_in: '&c이미 로그인되어 있습니다!'
     kick_for_vip: '&3서버가 꽉 차있을 때는 VIP 플레이어만 접속이 가능합니다!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&c너무 많이 로그인에 실패하여 잠시 서버에서 차단되었습니다.'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_lt.yml b/src/main/resources/messages/messages_lt.yml
index e58a9fd6e..7452d49bf 100644
--- a/src/main/resources/messages/messages_lt.yml
+++ b/src/main/resources/messages/messages_lt.yml
@@ -40,6 +40,7 @@ error:
     max_registration: '&cJus pasiekete maksimalu registraciju skaiciu.'
     logged_in: '&cTu aju prisijunges!'
     kick_for_vip: '&cA VIP prisijunge i pilna serveri!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     # TODO tempban_max_logins: '&cYou have been temporarily banned for failing to log in too many times.'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_nl.yml b/src/main/resources/messages/messages_nl.yml
index 00b99161b..6b5b83aa4 100644
--- a/src/main/resources/messages/messages_nl.yml
+++ b/src/main/resources/messages/messages_nl.yml
@@ -40,6 +40,7 @@ error:
     max_registration: 'Je hebt het maximum aantal registraties overschreden (%reg_count/%max_acc: %reg_names).'
     logged_in: '&cJe bent al ingelogd!'
     kick_for_vip: '&cEen VIP-gebruiker heeft ingelogd toen de server vol was!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cJe bent tijdelijk gebanned omdat het inloggen te vaak mislukt is.'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_pl.yml b/src/main/resources/messages/messages_pl.yml
index 78f63a831..f390b8c5f 100644
--- a/src/main/resources/messages/messages_pl.yml
+++ b/src/main/resources/messages/messages_pl.yml
@@ -40,6 +40,7 @@ error:
     max_registration: '&cPrzekroczyłeś limit zarejestrowanych kont na serwerze &8(&e%reg_count/%max_acc %reg_names&8) &cdla twojego połączenia.'
     logged_in: '&fJesteś już zalogowany!'
     kick_for_vip: '&cGracz VIP dołączył do gry!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cZostałeś tymczasowo zbanowany za dużą liczbę nieudanych logowań!'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_pt.yml b/src/main/resources/messages/messages_pt.yml
index 5d5b0ce9b..0f420833f 100644
--- a/src/main/resources/messages/messages_pt.yml
+++ b/src/main/resources/messages/messages_pt.yml
@@ -40,6 +40,7 @@ error:
     max_registration: '&cAtingiu o numero máximo de %reg_count contas registas, maximo de contas %max_acc'
     logged_in: '&cJá se encontra autenticado!'
     kick_for_vip: '&cUm jogador VIP entrou no servidor cheio!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cVocê foi temporariamente banido por falhar muitas vezes o login.'
 
 # AntiBot
@@ -89,8 +90,10 @@ email:
     old_email_invalid: 'Email antigo inválido!'
     invalid: 'Email inválido!'
     added: 'Email adicionado com sucesso!'
+    add_not_allowed: '&cAdicionar e-mail não é permitido'
     request_confirmation: 'Confirme o seu email!'
     changed: 'Email alterado com sucesso!'
+    change_not_allowed: '&cAlterar e-mail não é permitido'
     email_show: '&2O seu endereço de email atual é &f%email'
     no_email_for_account: '&2Você atualmente não tem um endereço de email associado a essa conta.'
     already_used: '&4O endereço de e-mail já está sendo usado'
@@ -98,8 +101,6 @@ email:
     send_failure: 'Não foi possivel enviar o email. Por favor contate um administrador.'
     change_password_expired: 'Você não pode mais alterar a sua password usando este comando.'
     email_cooldown_error: '&cUm email já foi enviado recentemente.Por favor, espere %time antes de enviar novamente'
-    add_not_allowed: '&cAdicionar e-mail não é permitido'
-    change_not_allowed: '&cAlterar e-mail não é permitido'
 
 # Password recovery by email
 recovery:
diff --git a/src/main/resources/messages/messages_ro.yml b/src/main/resources/messages/messages_ro.yml
index 3d9c6cfed..a6462abab 100644
--- a/src/main/resources/messages/messages_ro.yml
+++ b/src/main/resources/messages/messages_ro.yml
@@ -40,6 +40,7 @@ error:
     max_registration: '&cTe-ai inregistrat cu prea multe conturi pe acelasi ip! (%reg_count/%max_acc %reg_names)'
     logged_in: '&cEsti deja autentificat!'
     kick_for_vip: '&3Un V.I.P a intrat pe server cand era plin!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cAi fost interzis temporar deoarece ai esuat sa te autentifici de prea multe ori.'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_ru.yml b/src/main/resources/messages/messages_ru.yml
index 3252894d4..50002f48e 100644
--- a/src/main/resources/messages/messages_ru.yml
+++ b/src/main/resources/messages/messages_ru.yml
@@ -1,4 +1,3 @@
-
 # Registration
 registration:
     disabled: '&cРегистрация отключена.'
@@ -8,6 +7,7 @@ registration:
     reg_only: '&4Вход только для зарегистрированных! Посетите http://сайт_сервера.ru для регистрации.'
     success: '&2Вы успешно зарегистрировались!'
     kicked_admin_registered: 'Администратор зарегистрировал вас. Авторизируйтесь снова.'
+
 # Password errors on registration
 password:
     match_error: '&cПароли не совпадают.'
@@ -15,6 +15,7 @@ password:
     unsafe_password: '&cТакой пароль небезопасен.'
     forbidden_characters: '&4Пароль содержит запрещённые символы. Разрешённые: %valid_chars'
     wrong_length: '&cПароль слишком длинный/короткий.'
+
 # Login
 login:
     command_usage: '&cИспользование: /login <пароль>'
@@ -22,6 +23,7 @@ login:
     success: '&2Вы успешно вошли!'
     login_request: '&3Авторизация: /login <Пароль>'
     timeout_error: '&4Время авторизации истекло.'
+
 # Errors
 error:
     denied_command: '&cНеобходимо авторизоваться для использования этой команды!'
@@ -33,16 +35,20 @@ error:
     max_registration: '&cПревышено максимальное количество регистраций на сервере! (%reg_count/%max_acc %reg_names)'
     logged_in: '&cВы уже авторизированы!'
     kick_for_vip: '&3VIP-игрок зашёл на переполненный сервер.'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cВы временно заблокированы из-за большого количества неудачных попыток авторизоваться.'
+
 # AntiBot
 antibot:
     kick_antibot: 'Сработала защита против ботов! Необходимо подождать перед следующим входом на сервер.'
     auto_enabled: '&4[AuthMe] AntiBot-режим включился из-за большого количества входов!'
     auto_disabled: '&2[AuthMe] AntiBot-режим отключился спустя %m мин.'
+
 # Unregister
 unregister:
     success: '&cУчётная запись успешно удалена!'
     command_usage: '&cИспользование: /unregister <пароль>'
+
 # Other messages
 misc:
     account_not_activated: '&cВаша уч. запись ещё не активирована. Проверьте электронную почту!'
@@ -52,10 +58,12 @@ misc:
     usage_change_password: '&cИспользование: /changepassword <пароль> <новый пароль>'
     accounts_owned_self: 'У вас %count уч. записей:'
     accounts_owned_other: 'У игрока %name %count уч. записей:'
+
 # Session messages
 session:
     valid_session: '&2Вы автоматически авторизовались!'
     invalid_session: '&cСессия некорректна. Дождитесь, пока она закончится.'
+
 # Error messages when joining
 on_join_validation:
     same_ip_online: 'Игрок с данным IP-адресом уже играет на сервере!'
@@ -67,6 +75,7 @@ on_join_validation:
     not_owner_error: 'Вы не являетесь владельцем данной уч. записи. Выберите себе другое имя!'
     invalid_name_case: 'Неверное имя! Зайдите под именем %valid, а не %invalid.'
     quick_command: 'Вы вводили команды слишком часто! Пожалуйста заходите снова и вводите команды помедленнее.'
+
 # Email
 email:
     add_email_request: '&3Добавьте электронную почту: /email add <эл. почта> <повтор эл. почты>'
@@ -87,6 +96,7 @@ email:
     send_failure: 'Письмо не может быть отправлено. Свяжитесь в администратором.'
     change_password_expired: 'Больше нельзя сменить свой пароль, используя эту команду.'
     email_cooldown_error: '&cПисьмо было отправлено недавно. Подождите %time, прежде чем отправить новое.'
+
 # Password recovery by email
 recovery:
     forgot_password_hint: '&Забыли пароль? Используйте «/email recovery <эл. почта>».'
@@ -98,6 +108,7 @@ recovery:
         tries_exceeded: 'Вы слишком много раз неверно ввели код восстановления. Используйте «/email recovery [эл. почта]», чтобы получить новый код.'
         correct: 'Код восстановления введён верно!'
         change_password: 'Используйте «/email setpassword <новый пароль>», чтобы сменить свой пароль.'
+
 # Captcha
 captcha:
     usage_captcha: '&3Необходимо ввести текст с каптчи. Используйте «/captcha %captcha_code»'
@@ -105,6 +116,7 @@ captcha:
     valid_captcha: '&2Вы успешно решили каптчу!'
     captcha_for_registration: 'Чтобы зарегистрироваться, решите каптчу используя команду: «/captcha %captcha_code»'
     register_captcha_valid: '&2Вы успешно решили каптчу! Теперь вы можете зарегистрироваться командой «/register»'
+
 # Verification code
 verification:
     code_required: '&3Эта команда чувствительна и требует подтверждения электронной почты! Проверьте свою почту и следуйте инструкциям в письме.'
@@ -114,6 +126,7 @@ verification:
     already_verified: '&2Вы уже можете выполнять все чувствительные команды в текущем сеансе!'
     code_expired: '&3Срок действия кода истёк! Выполните чувствительную команду, чтобы получить новый код!'
     email_needed: '&3Чтобы подтвердить вашу личность, необходимо привязать электронную почту к учётной записи!!'
+
 # Time units
 time:
     second: 'с.'
@@ -124,6 +137,7 @@ time:
     hours: 'ч.'
     day: 'дн.'
     days: 'дн.'
+
 # Two-factor authentication
 two_factor:
     code_created: '&2Ваш секретный код — %code. Просканируйте его здесь: %url'
diff --git a/src/main/resources/messages/messages_sk.yml b/src/main/resources/messages/messages_sk.yml
index e1a085793..ea309e9c4 100644
--- a/src/main/resources/messages/messages_sk.yml
+++ b/src/main/resources/messages/messages_sk.yml
@@ -46,6 +46,7 @@ error:
     max_registration: '&fPrekročil si maximum registrovaných účtov(%reg_count/%max_acc|%reg_names).'
     logged_in: '&cAktuálne si už prihlásený!'
     kick_for_vip: '&3Uvoľnil si miesto pre VIP hráča!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cBol si dočasne zabanovaný za opakované zadanie zlého hesla.'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_sr.yml b/src/main/resources/messages/messages_sr.yml
index 9cb79cd37..b9d343a11 100644
--- a/src/main/resources/messages/messages_sr.yml
+++ b/src/main/resources/messages/messages_sr.yml
@@ -3,152 +3,155 @@
 # %username% - Zamenjuje ime igrača kome se šalje poruka.
 # %displayname% - Zamenjuje nadimak (i boje) igrača kome se šalje poruka.
 
-# Registracija
+# Registration
 registration:
-  register_request: '&3Molimo Vas, registrujte se na server komandom: /register <lozinka> <PotvrditeLozinku>'
-  command_usage: '&cUpotreba: /register <lozinka> <PotvrditeLozinku>'
-  reg_only: '&4Samo registrovani igrači mogu ući na server! Molimo Vas posetite http://example.com da biste se registrovali!'
-  kicked_admin_registered: 'Admin vas je upravo registrovao; molimo Vas uđite ponovo'
-  success: '&2Uspešno registrovani!'
-  disabled: '&cRegistracija u igri je isključena!'
-  name_taken: '&cKorisnik je već registrovan!'
+    disabled: '&cRegistracija u igri je isključena!'
+    name_taken: '&cKorisnik je već registrovan!'
+    register_request: '&3Molimo Vas, registrujte se na server komandom: /register <lozinka> <PotvrditeLozinku>'
+    command_usage: '&cUpotreba: /register <lozinka> <PotvrditeLozinku>'
+    reg_only: '&4Samo registrovani igrači mogu ući na server! Molimo Vas posetite http://example.com da biste se registrovali!'
+    success: '&2Uspešno registrovani!'
+    kicked_admin_registered: 'Admin vas je upravo registrovao; molimo Vas uđite ponovo'
 
-# Greške lozinki i registracije
+# Password errors on registration
 password:
-  match_error: '&cLozinke se nisu složile, proverite ih ponovo!'
-  name_in_password: '&cNe možete koristiti svoje ime za lozinku, molimo vas da izaberete drugu...'
-  unsafe_password: '&cIzabrana lozinka nije bezbedna, molimo vas da izaberete drugu...'
-  forbidden_characters: '&4Vaša lozinka sadrži nedozvoljene karaktere. Dozvoljeni karakteri: %valid_chars'
-  wrong_length: '&cVaša lozinka je prekratka ili predugačka! Molimo Vas da probate drugu!'
+    match_error: '&cLozinke se nisu složile, proverite ih ponovo!'
+    name_in_password: '&cNe možete koristiti svoje ime za lozinku, molimo vas da izaberete drugu...'
+    unsafe_password: '&cIzabrana lozinka nije bezbedna, molimo vas da izaberete drugu...'
+    forbidden_characters: '&4Vaša lozinka sadrži nedozvoljene karaktere. Dozvoljeni karakteri: %valid_chars'
+    wrong_length: '&cVaša lozinka je prekratka ili predugačka! Molimo Vas da probate drugu!'
 
-# Ulogovanje
+# Login
 login:
-  command_usage: '&cUpotreba: /login <lozinka>'
-  wrong_password: '&cPogrešna lozinka!'
-  success: '&2Uspešno ste se ulogovali!'
-  login_request: '&cMolimo Vas, ulogujte se komandom: /login <lozinka>'
-  timeout_error: '&4Vreme za login isteklo, izbačeni ste sa servera, molimo Vas da pokušate ponovo!'
+    command_usage: '&cUpotreba: /login <lozinka>'
+    wrong_password: '&cPogrešna lozinka!'
+    success: '&2Uspešno ste se ulogovali!'
+    login_request: '&cMolimo Vas, ulogujte se komandom: /login <lozinka>'
+    timeout_error: '&4Vreme za login isteklo, izbačeni ste sa servera, molimo Vas da pokušate ponovo!'
 
-# Greške
+# Errors
 error:
-  unregistered_user: '&cKorisnik nije registrovan!'
-  denied_command: '&cDa biste koristili komande morate se autentifikovati!'
-  denied_chat: '&cDa biste koristili čet morate se autentifikovati!'
-  not_logged_in: '&cNiste ulogovani!'
-  tempban_max_logins: '&cPrivremeno ste banovani zbog previše pogrešnih pokušaja ulogovanja.'
-  max_registration: '&cDostigli ste maksimalan broj registracija (%reg_count/%max_acc %reg_names) za vaše povezivanje!'
-  no_permission: '&4Nemate dovoljno dozvola da uradite to!'
-  unexpected_error: '&4Pojavila se neočekivana greška, molimo Vas kontaktirajte administratora!'
-  kick_for_vip: '&3VIP igrač je ušao na server dok je bio pun!'
-  logged_in: '&cVeć ste ulogovani!'
+    denied_command: '&cDa biste koristili komande morate se autentifikovati!'
+    denied_chat: '&cDa biste koristili čet morate se autentifikovati!'
+    unregistered_user: '&cKorisnik nije registrovan!'
+    not_logged_in: '&cNiste ulogovani!'
+    no_permission: '&4Nemate dovoljno dozvola da uradite to!'
+    unexpected_error: '&4Pojavila se neočekivana greška, molimo Vas kontaktirajte administratora!'
+    max_registration: '&cDostigli ste maksimalan broj registracija (%reg_count/%max_acc %reg_names) za vaše povezivanje!'
+    logged_in: '&cVeć ste ulogovani!'
+    kick_for_vip: '&3VIP igrač je ušao na server dok je bio pun!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
+    tempban_max_logins: '&cPrivremeno ste banovani zbog previše pogrešnih pokušaja ulogovanja.'
 
 # AntiBot
 antibot:
-  kick_antibot: 'AntiBot mod zaštite je aktiviran! Morate sačekati par minuta pre povezivanja na server.'
-  auto_enabled: '&4[AntiBotSlužba] AntiBot je aktiviran zbog prevelikog broja povezivanja!'
-  auto_disabled: '&2[AntiBotSlužba] AntiBot je isključen posle %m minut(a)!'
+    kick_antibot: 'AntiBot mod zaštite je aktiviran! Morate sačekati par minuta pre povezivanja na server.'
+    auto_enabled: '&4[AntiBotSlužba] AntiBot je aktiviran zbog prevelikog broja povezivanja!'
+    auto_disabled: '&2[AntiBotSlužba] AntiBot je isključen posle %m minut(a)!'
 
+# Unregister
 unregister:
-  success: '&cUspešno odregistrovani!'
-  command_usage: '&cUpotreba: /unregister <lozinka>'
+    success: '&cUspešno odregistrovani!'
+    command_usage: '&cUpotreba: /unregister <lozinka>'
 
-# Ostale poruke
+# Other messages
 misc:
-  accounts_owned_self: 'Vi imate %count naloga:'
-  accounts_owned_other: 'Igrač %name ima %count naloga:'
-  account_not_activated: '&cVaš nalog još uvek nije aktiviran, molimo Vas proverite svoj email!'
-  password_changed: '&2Lozinka uspešno promenjena!'
-  logout: '&2Uspešno ste se odlogovali!'
-  reload: '&2Konfiguracija i databaza su uspešno osveženi!'
-  usage_change_password: '&cUpotreba: /changepassword <staraLozinka> <novaLozinka>'
+    account_not_activated: '&cVaš nalog još uvek nije aktiviran, molimo Vas proverite svoj email!'
+    password_changed: '&2Lozinka uspešno promenjena!'
+    logout: '&2Uspešno ste se odlogovali!'
+    reload: '&2Konfiguracija i databaza su uspešno osveženi!'
+    usage_change_password: '&cUpotreba: /changepassword <staraLozinka> <novaLozinka>'
+    accounts_owned_self: 'Vi imate %count naloga:'
+    accounts_owned_other: 'Igrač %name ima %count naloga:'
 
-# Poruke vezane za sesiju
+# Session messages
 session:
-  invalid_session: '&cVaš IP je promenjen i vaši podaci o sesiji su istekli!'
-  valid_session: '&2Ulogovani ste zbog ponovnog povezivanja sesije.'
+    valid_session: '&2Ulogovani ste zbog ponovnog povezivanja sesije.'
+    invalid_session: '&cVaš IP je promenjen i vaši podaci o sesiji su istekli!'
 
-# Greške pri povezivanju
+# Error messages when joining
 on_join_validation:
-  name_length: '&4Vaše korisničko ime je prekratko ili predugačko!'
-  characters_in_name: '&4Vaše korisničko ime sadrži nedozvoljene karaktere. Dozvoljeni karakteri: %valid_chars'
-  country_banned: '&4Vaša država je banovana sa ovog servera!'
-  not_owner_error: 'Ne posedujete ovaj nalog. Molimo Vas izaberite drugo ime!'
-  kick_full_server: '&4Server je pun, probajte ponovo kasnije!'
-  same_nick_online: '&4Isto korisničko ime već igra na serveru!'
-  invalid_name_case: 'Morate ući sa korisničkim imenom %valid, umesto %invalid.'
-  same_ip_online: 'Igrač sa istim IP-em je već u igri!'
-  quick_command: 'Iskoristili ste komandu previše brzo! Molimo Vas, uđite opet na server i sačekajte malo pre korišćenja komandi.'
+    same_ip_online: 'Igrač sa istim IP-em je već u igri!'
+    same_nick_online: '&4Isto korisničko ime već igra na serveru!'
+    name_length: '&4Vaše korisničko ime je prekratko ili predugačko!'
+    characters_in_name: '&4Vaše korisničko ime sadrži nedozvoljene karaktere. Dozvoljeni karakteri: %valid_chars'
+    kick_full_server: '&4Server je pun, probajte ponovo kasnije!'
+    country_banned: '&4Vaša država je banovana sa ovog servera!'
+    not_owner_error: 'Ne posedujete ovaj nalog. Molimo Vas izaberite drugo ime!'
+    invalid_name_case: 'Morate ući sa korisničkim imenom %valid, umesto %invalid.'
+    quick_command: 'Iskoristili ste komandu previše brzo! Molimo Vas, uđite opet na server i sačekajte malo pre korišćenja komandi.'
 
 # Email
 email:
-  usage_email_add: '&cUpotreba: /email add <email> <potvrditeEmail>'
-  usage_email_change: '&cUpotreba: /email change <stariEmail> <noviEmail>'
-  new_email_invalid: '&cNevažeći email, pokušajte ponovo!'
-  old_email_invalid: '&cNevažeći stari email, pokušajte ponovo!'
-  invalid: '&cNevažeći email, pokušajte ponovo!'
-  added: '&2Email adresa je uspešno dodata na vaš nalog!'
-  request_confirmation: '&cMolimo Vas podvrdite svoju email adresu!'
-  changed: '&2Email adresa uspešno promenjena!'
-  email_show: '&2Vaša email adresa je: &f%email'
-  incomplete_settings: 'Greška: nisu postavljena potrebna podešavanja za slanje emaila. Molimo Vas da kontaktirate admina.'
-  already_used: '&4Email adresa je već u upotrebi'
-  send_failure: 'Email se nije mogao poslati. Molimo Vas da kontaktirate administratora.'
-  no_email_for_account: '&2Trenutno nemate email adresu povezanu sa svojim nalogom.'
-  add_email_request: '&3Molimo Vas dodajte email adresu na vaš nalog komandom: /email add <vašEmail> <potvrditeEmail>'
-  change_password_expired: 'Ne možete više promeniti svoju lozinku koristeći ovu komandu.'
-  email_cooldown_error: '&cEmail je već poslat. Morate sačekati %time pre nego što možete poslati drugi.'
-  add_not_allowed: '&cDodavanje emaila nije dozvoljeno'
-  change_not_allowed: '&cPromena emaila nije dozvoljena'
+    add_email_request: '&3Molimo Vas dodajte email adresu na vaš nalog komandom: /email add <vašEmail> <potvrditeEmail>'
+    usage_email_add: '&cUpotreba: /email add <email> <potvrditeEmail>'
+    usage_email_change: '&cUpotreba: /email change <stariEmail> <noviEmail>'
+    new_email_invalid: '&cNevažeći email, pokušajte ponovo!'
+    old_email_invalid: '&cNevažeći stari email, pokušajte ponovo!'
+    invalid: '&cNevažeći email, pokušajte ponovo!'
+    added: '&2Email adresa je uspešno dodata na vaš nalog!'
+    add_not_allowed: '&cDodavanje emaila nije dozvoljeno'
+    request_confirmation: '&cMolimo Vas podvrdite svoju email adresu!'
+    changed: '&2Email adresa uspešno promenjena!'
+    change_not_allowed: '&cPromena emaila nije dozvoljena'
+    email_show: '&2Vaša email adresa je: &f%email'
+    no_email_for_account: '&2Trenutno nemate email adresu povezanu sa svojim nalogom.'
+    already_used: '&4Email adresa je već u upotrebi'
+    incomplete_settings: 'Greška: nisu postavljena potrebna podešavanja za slanje emaila. Molimo Vas da kontaktirate admina.'
+    send_failure: 'Email se nije mogao poslati. Molimo Vas da kontaktirate administratora.'
+    change_password_expired: 'Ne možete više promeniti svoju lozinku koristeći ovu komandu.'
+    email_cooldown_error: '&cEmail je već poslat. Morate sačekati %time pre nego što možete poslati drugi.'
 
-# Povratak lozinke putem emaila
+# Password recovery by email
 recovery:
-  forgot_password_hint: '&3Zaboravili ste lozinku? Molimo Vas ukucajte komandu: /email recovery <vašEmail>'
-  command_usage: '&cUpotreba: /email recovery <Email>'
-  email_sent: '&2Email za povratak je poslat uspešno! Molimo Vas proverite inbox svog emaila!'
-  code:
-    code_sent: 'Povratni kod za resetovanje vaše lozinke je poslat na vaš email.'
-    incorrect: 'Povratni kod nije tačan! Imate još %count pokušaja.'
-    tries_exceeded: 'Dostigli ste maksimalni broj pokušaja povratka sa kodom. Koristite "/email recovery [email]" da generišite nov.'
-    correct: 'Povratni kod uspešno unesen!'
-    change_password: 'Molimo Vas iskoristite komandu /email setpassword <nova lozinka> da odmah promenite svoju lozinku.'
+    forgot_password_hint: '&3Zaboravili ste lozinku? Molimo Vas ukucajte komandu: /email recovery <vašEmail>'
+    command_usage: '&cUpotreba: /email recovery <Email>'
+    email_sent: '&2Email za povratak je poslat uspešno! Molimo Vas proverite inbox svog emaila!'
+    code:
+        code_sent: 'Povratni kod za resetovanje vaše lozinke je poslat na vaš email.'
+        incorrect: 'Povratni kod nije tačan! Imate još %count pokušaja.'
+        tries_exceeded: 'Dostigli ste maksimalni broj pokušaja povratka sa kodom. Koristite "/email recovery [email]" da generišite nov.'
+        correct: 'Povratni kod uspešno unesen!'
+        change_password: 'Molimo Vas iskoristite komandu /email setpassword <nova lozinka> da odmah promenite svoju lozinku.'
 
 # Captcha
 captcha:
-  usage_captcha: '&3Da biste se ulogovali morate rešiti captcha kod, molimo Vas iskoristite komandu: /captcha %captcha_code'
-  wrong_captcha: '&cPogrešna captcha, molimo Vas kucajte "/captcha %captcha_code" u četu!'
-  valid_captcha: '&2Captcha kod uspešno unesen!'
-  captcha_for_registration: 'Da biste se registrovali morate rešiti captcha kod, molimo Vas iskoristite komandu: /captcha %captcha_code'
-  register_captcha_valid: '&2Ispravna captcha! Sada se možete registrovati koristeći /register'
+    usage_captcha: '&3Da biste se ulogovali morate rešiti captcha kod, molimo Vas iskoristite komandu: /captcha %captcha_code'
+    wrong_captcha: '&cPogrešna captcha, molimo Vas kucajte "/captcha %captcha_code" u četu!'
+    valid_captcha: '&2Captcha kod uspešno unesen!'
+    captcha_for_registration: 'Da biste se registrovali morate rešiti captcha kod, molimo Vas iskoristite komandu: /captcha %captcha_code'
+    register_captcha_valid: '&2Ispravna captcha! Sada se možete registrovati koristeći /register'
 
-# Verifikacioni kod
+# Verification code
 verification:
-  code_required: '&3Ova komanda je osetljiva i zahteva verifikaciju emaila! Molimo Vas proverite svoj inbox i pratite instrukcije u emailu.'
-  command_usage: '&cUpotreba: /verification <kod>'
-  incorrect_code: '&cNeispravan kod, molimo Vas unesite "/verification <code>" u čet, koristeći kod koji ste dobili u emailu'
-  success: '&2Vaš identitet je verifikovan! Sada možete koristiti sve komande u trenutnoj sesiji!'
-  already_verified: '&2Već možete koristiti sve osetljive komande u trenutnoj sesiji!'
-  code_expired: '&3Vaš kod je istekao! Iskoristite drugu osetljivu komandu da dobijete kod!'
-  email_needed: '&3Da biste verifikovali svoj identitet morate da povežete svoju email adresu sa svojim nalogom!!'
+    code_required: '&3Ova komanda je osetljiva i zahteva verifikaciju emaila! Molimo Vas proverite svoj inbox i pratite instrukcije u emailu.'
+    command_usage: '&cUpotreba: /verification <kod>'
+    incorrect_code: '&cNeispravan kod, molimo Vas unesite "/verification <code>" u čet, koristeći kod koji ste dobili u emailu'
+    success: '&2Vaš identitet je verifikovan! Sada možete koristiti sve komande u trenutnoj sesiji!'
+    already_verified: '&2Već možete koristiti sve osetljive komande u trenutnoj sesiji!'
+    code_expired: '&3Vaš kod je istekao! Iskoristite drugu osetljivu komandu da dobijete kod!'
+    email_needed: '&3Da biste verifikovali svoj identitet morate da povežete svoju email adresu sa svojim nalogom!!'
 
-two_factor:
-  code_created: '&2Vaš tajni kod je %code. Možete ga skenirati sa %url'
-  confirmation_required: 'Molimo Vas potvrdite svoj kod koristeći /2fa confirm <code>'
-  code_required: 'Molimo Vas unesite svoj autentifikacioni kod dva-faktora koristeći /2fa code <kod>'
-  already_enabled: 'Autentifikacioni dupli-faktor je već aktiviran za vaš nalog!'
-  enable_error_no_code: 'Nijedan 2fa ključ nije generisan za vas ili je istekao. Molimo Vas kucajte /2fa add'
-  enable_success: 'Uspešno ste aktivirali dvo-faktornu autentifikaciju za vaš nalog'
-  enable_error_wrong_code: 'Pogrešan kod ili je kod istekao. Molimo Vas kucajte /2fa add'
-  not_enabled_error: 'Dvo-faktorna autentifikacija nije aktivirana za vaš nalog. Kucajte /2fa add'
-  removed_success: 'Uspešno ste uklonili dvo-faktornu autentifikaciju sa vašeg naloga'
-  invalid_code: 'Nevažeći kod!'
-
-# Vremenske odredbe
+# Time units
 time:
-  second: 'sekund'
-  seconds: 'sekundi'
-  minute: 'minut'
-  minutes: 'minuta'
-  hour: 'čas'
-  hours: 'časova'
-  day: 'dan'
-  days: 'dana'
+    second: 'sekund'
+    seconds: 'sekundi'
+    minute: 'minut'
+    minutes: 'minuta'
+    hour: 'čas'
+    hours: 'časova'
+    day: 'dan'
+    days: 'dana'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2Vaš tajni kod je %code. Možete ga skenirati sa %url'
+    confirmation_required: 'Molimo Vas potvrdite svoj kod koristeći /2fa confirm <code>'
+    code_required: 'Molimo Vas unesite svoj autentifikacioni kod dva-faktora koristeći /2fa code <kod>'
+    already_enabled: 'Autentifikacioni dupli-faktor je već aktiviran za vaš nalog!'
+    enable_error_no_code: 'Nijedan 2fa ključ nije generisan za vas ili je istekao. Molimo Vas kucajte /2fa add'
+    enable_success: 'Uspešno ste aktivirali dvo-faktornu autentifikaciju za vaš nalog'
+    enable_error_wrong_code: 'Pogrešan kod ili je kod istekao. Molimo Vas kucajte /2fa add'
+    not_enabled_error: 'Dvo-faktorna autentifikacija nije aktivirana za vaš nalog. Kucajte /2fa add'
+    removed_success: 'Uspešno ste uklonili dvo-faktornu autentifikaciju sa vašeg naloga'
+    invalid_code: 'Nevažeći kod!'
diff --git a/src/main/resources/messages/messages_tr.yml b/src/main/resources/messages/messages_tr.yml
index acce70123..7d3d75828 100644
--- a/src/main/resources/messages/messages_tr.yml
+++ b/src/main/resources/messages/messages_tr.yml
@@ -40,6 +40,7 @@ error:
     max_registration: '&cSen maksimum kayit sinirini astin (%reg_count/%max_acc %reg_names)!'
     logged_in: '&cZaten giris yaptin!'
     kick_for_vip: '&3Bir VIP oyuna giris yaptigi icin atildin!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cBir cok kez yanlis giris yaptiginiz icin gecici olarak banlandiniz.'
 
 # AntiBot
@@ -112,7 +113,7 @@ recovery:
         tries_exceeded: 'Kurtarma kodu icin girilen maksimum sayisi astiniz. "/email recovery [email]" komutunu kullanarak yeni bir tane olusturabilirsiniz.'
         correct: 'Kurtarma kodu dogru sekilde girildi!'
         change_password: 'Lutfen sifrenizi degistirmek icin /email setpassword <yeni sifre> komutunu kullanin.'
-        
+
 # Captcha
 captcha:
     usage_captcha: '&3Giris yapmak icin guvenlik kodunu komut yazarak girin "/captcha %captcha_code"'
diff --git a/src/main/resources/messages/messages_uk.yml b/src/main/resources/messages/messages_uk.yml
index 034238d3f..54c7883d9 100644
--- a/src/main/resources/messages/messages_uk.yml
+++ b/src/main/resources/messages/messages_uk.yml
@@ -40,6 +40,7 @@ error:
     max_registration: '&cВичерпано ліміт реєстрацій (%reg_count/%max_acc %reg_names) для вашого підключення!'
     logged_in: '&cВи вже авторизовані!'
     kick_for_vip: '&3Вас кікнуто, внаслідок того, що VIP гравець зайшов на сервер коли небуло вільних місць.'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cВаш IP тимчасово заблоковано, із‒за багатократного введення хибного пароля.'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_vn.yml b/src/main/resources/messages/messages_vn.yml
index 10a813ef6..22ab790c6 100644
--- a/src/main/resources/messages/messages_vn.yml
+++ b/src/main/resources/messages/messages_vn.yml
@@ -40,6 +40,7 @@ error:
     max_registration: '&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!'
     logged_in: '&cBạn đã đăng nhập!'
     kick_for_vip: '&eChỉ có thành viên VIP mới được tham gia khi máy chủ đầy!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&cBạn đã bị tạm thời khóa truy cập do đăng nhập sai nhiều lần.'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_zhcn.yml b/src/main/resources/messages/messages_zhcn.yml
index cc9e35b00..aea93984f 100644
--- a/src/main/resources/messages/messages_zhcn.yml
+++ b/src/main/resources/messages/messages_zhcn.yml
@@ -41,6 +41,7 @@ error:
     max_registration: '&8[&6玩家系统&8] &f你不允许再为你的IP在服务器注册更多用户了！'
     logged_in: '&8[&6玩家系统&8] &c你已经登陆过了！'
     kick_for_vip: '&8[&6玩家系统&8] &cA VIP玩家加入了已满的服务器!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&c由于您登录失败次数过多，已被暂时禁止登录。'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_zhhk.yml b/src/main/resources/messages/messages_zhhk.yml
index 722ff7fe3..399982fc9 100644
--- a/src/main/resources/messages/messages_zhhk.yml
+++ b/src/main/resources/messages/messages_zhhk.yml
@@ -43,6 +43,7 @@ error:
     max_registration: '&8[&6用戶系統&8] &f你的IP地址已達到註冊數上限。 &7(info: %reg_count/%max_acc %reg_names)'
     logged_in: '&8[&6用戶系統&8] &c你已經登入過了。'
     kick_for_vip: '&c喔 ！因為有VIP玩家登入了伺服器。'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&8[&6用戶系統&8] &c因為多次登入失敗，你已被暫時封禁。'
 
 # AntiBot
@@ -134,6 +135,17 @@ verification:
     code_expired: '&8[&6用戶系統&8] &c你的驗證碼已經過期，請執行另一個高等魔法指令以觸發新的身份驗證挑戰。'
     email_needed: '&8[&6用戶系統&8] &c嗯... 你的帳戶沒有已經連結的電郵地址，不能使用電郵驗證功能。'
 
+# Time units
+time:
+    second: '秒'
+    seconds: '秒'
+    minute: '分'
+    minutes: '分'
+    hour: '小時'
+    hours: '小時'
+    day: '日'
+    days: '日'
+
 # Two-factor authentication
 two_factor:
     code_created: '&8[&6用戶系統&8] &b你的登入金鑰為&9〔 &c%code&9 〕&b，掃描連結為：%nl%&c %url'
@@ -146,14 +158,3 @@ two_factor:
     not_enabled_error: '&8[&6用戶系統&8] &c你的帳戶尚未啓用兩步驗證功能 ！ &f你可以使用指令《 /2fa add 》以啓用此功能。'
     removed_success: '&8[&6用戶系統&8] &2你已成功關閉兩步驗證功能；&c為保障帳戶安全，請儘快於可行的情況下重新啟用本功能。'
     invalid_code: '&8[&6用戶系統&8] &c無效的兩步驗證碼 ！'
-
-# Time units
-time:
-    second: '秒'
-    seconds: '秒'
-    minute: '分'
-    minutes: '分'
-    hour: '小時'
-    hours: '小時'
-    day: '日'
-    days: '日'
diff --git a/src/main/resources/messages/messages_zhmc.yml b/src/main/resources/messages/messages_zhmc.yml
index cf9fe986f..67897122c 100644
--- a/src/main/resources/messages/messages_zhmc.yml
+++ b/src/main/resources/messages/messages_zhmc.yml
@@ -40,6 +40,7 @@ error:
     max_registration: '&c您已超過註冊的最大數量(%reg_count/%max_acc %reg_names)!'
     logged_in: '&c您已經登錄!'
     kick_for_vip: '&3一名VIP玩家在服務器已滿時已加入伺服器!'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&c由於登錄失敗次數過多，您已被暫時禁止。'
 
 # AntiBot
diff --git a/src/main/resources/messages/messages_zhtw.yml b/src/main/resources/messages/messages_zhtw.yml
index f6192193a..db18e4ad0 100644
--- a/src/main/resources/messages/messages_zhtw.yml
+++ b/src/main/resources/messages/messages_zhtw.yml
@@ -42,6 +42,7 @@ error:
     max_registration: '&b【AuthMe】&6您的 IP 位置所註冊的帳號數量已經達到最大。'
     logged_in: '&b【AuthMe】&6您已經登入了!'
     kick_for_vip: '&b【AuthMe】&6您已經被請出。&c原因 : 有 VIP 玩家登入伺服器'
+    # TODO kick_unresolved_hostname: '&cAn error occurred: unresolved player hostname!'
     tempban_max_logins: '&b【AuthMe】&c您已被暫時封鎖IP位置，因為您登入失敗太多次.'
 
 # AntiBot