#1141 Fixes to TOTP implementation

- Revert back to SHA1 as HMAC hash function so that it works with Google authenticator
- Add message to user to tell him to run /2fa confirm to add a TOTP code

docs/commands.md

@@ -1,5 +1,5 @@
 <!-- AUTO-GENERATED FILE! Do not edit this directly -->
-<!-- File auto-generated on Fri Feb 02 20:09:14 CET 2018. See docs/commands/commands.tpl.md -->
+<!-- File auto-generated on Sun Apr 22 11:00:10 CEST 2018. See docs/commands/commands.tpl.md -->
 
 ## AuthMe Commands
 You can use the following commands to use the features of AuthMe. Mandatory arguments are marked with `< >`
@@ -85,6 +85,15 @@ brackets; optional arguments are enclosed in square brackets (`[ ]`).
 - **/changepassword** &lt;oldPassword> &lt;newPassword>: Command to change your password using AuthMeReloaded.
   <br />Requires `authme.player.changepassword`
 - **/changepassword help** [query]: View detailed help for /changepassword commands.
+- **/totp**: Performs actions related to two-factor authentication.
+- **/totp code** &lt;code>: Processes the two-factor authentication code during login.
+- **/totp add**: Enables two-factor authentication for your account.
+  <br />Requires `authme.player.totpadd`
+- **/totp confirm** &lt;code>: Saves the generated TOTP secret after confirmation.
+  <br />Requires `authme.player.totpadd`
+- **/totp remove** &lt;code>: Disables two-factor authentication for your account.
+  <br />Requires `authme.player.totpremove`
+- **/totp help** [query]: View detailed help for /totp commands.
 - **/captcha** &lt;captcha>: Captcha command for AuthMeReloaded.
   <br />Requires `authme.player.captcha`
 - **/captcha help** [query]: View detailed help for /captcha commands.
@@ -95,4 +104,4 @@ brackets; optional arguments are enclosed in square brackets (`[ ]`).
 
 ---
 
-This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Fri Feb 02 20:09:14 CET 2018
+This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sun Apr 22 11:00:10 CEST 2018

docs/config.md

@@ -1,5 +1,5 @@
 <!-- AUTO-GENERATED FILE! Do not edit this directly -->
-<!-- File auto-generated on Sun Jan 21 18:49:44 CET 2018. See docs/config/config.tpl.md -->
+<!-- File auto-generated on Sun Apr 22 11:00:10 CEST 2018. See docs/config/config.tpl.md -->
 
 ## AuthMe Configuration
 The first time you run AuthMe it will create a config.yml file in the plugins/AuthMe folder, 
@@ -43,6 +43,8 @@ DataSource:
     mySQLColumnLogged: 'isLogged'
     # Column for storing if a player has a valid session or not
     mySQLColumnHasSession: 'hasSession'
+    # Column for storing a player's TOTP key (for two-factor authentication)
+    mySQLtotpKey: 'totp'
     # Column for storing the player's last IP
     mySQLColumnIp: 'ip'
     # Column for storing players lastlogins
@@ -138,6 +140,8 @@ settings:
         - '/reg'
         - '/email'
         - '/captcha'
+        - '/2fa'
+        - '/totp'
         # Max number of allowed registrations per IP
         # The value 0 means an unlimited number of registrations!
         maxRegPerIp: 1
@@ -384,7 +388,7 @@ Protection:
     # Apply the protection also to registered usernames
     enableProtectionRegistered: true
     # Countries allowed to join the server and register. For country codes, see
-    # http://dev.maxmind.com/geoip/legacy/codes/iso3166/
+    # https://dev.maxmind.com/geoip/legacy/codes/iso3166/
     # PLEASE USE QUOTES!
     countries: 
     - 'US'
@@ -404,6 +408,9 @@ Protection:
     antiBotDuration: 10
     # Delay in seconds before the antibot activation
     antiBotDelay: 60
+    quickCommands:
+        # Kicks the player that issued a command before the defined time after the join process
+        denyCommandsBeforeMilliseconds: 1000
 Purge:
     # If enabled, AuthMe automatically purges old, unused accounts
     useAutoPurge: false
@@ -555,4 +562,4 @@ To change settings on a running server, save your changes to config.yml and use
 
 ---
 
-This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sun Jan 21 18:49:44 CET 2018
+This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sun Apr 22 11:00:10 CEST 2018

docs/permission_nodes.md

@@ -1,5 +1,5 @@
 <!-- AUTO-GENERATED FILE! Do not edit this directly -->
-<!-- File auto-generated on Fri Dec 01 19:16:17 CET 2017. See docs/permissions/permission_nodes.tpl.md -->
+<!-- File auto-generated on Sun Apr 22 11:00:13 CEST 2018. See docs/permissions/permission_nodes.tpl.md -->
 
 ## AuthMe Permission Nodes
 The following are the permission nodes that are currently supported by the latest dev builds.
@@ -57,13 +57,16 @@ The following are the permission nodes that are currently supported by the lates
 - **authme.player.email.see** – Command permission to see the own email address.
 - **authme.player.login** – Command permission to login.
 - **authme.player.logout** – Command permission to logout.
+- **authme.player.protection.quickcommandsprotection** – Permission that enables on join quick commands checks for the player.
 - **authme.player.register** – Command permission to register.
 - **authme.player.security.verificationcode** – Permission to use the email verification codes feature.
 - **authme.player.seeownaccounts** – Permission to use to see own other accounts.
+- **authme.player.totpadd** – Permission to enable two-factor authentication.
+- **authme.player.totpremove** – Permission to disable two-factor authentication.
 - **authme.player.unregister** – Command permission to unregister.
 - **authme.vip** – When the server is full and someone with this permission joins the server, someone will be kicked.
 
 
 ---
 
-This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Fri Dec 01 19:16:17 CET 2017
+This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sun Apr 22 11:00:13 CEST 2018

docs/translations.md

@@ -1,5 +1,5 @@
 <!-- AUTO-GENERATED FILE! Do not edit this directly -->
-<!-- File auto-generated on Fri Feb 02 20:09:17 CET 2018. See docs/translations/translations.tpl.md -->
+<!-- File auto-generated on Sun Apr 22 11:09:12 CEST 2018. See docs/translations/translations.tpl.md -->
 
 # AuthMe Translations
 The following translations are available in AuthMe. Set `messagesLanguage` to the language code
@@ -8,37 +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://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 | 86% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=99bb22&w=86&h=5&txtpad=1" alt="bar" />
+[bg](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_bg.yml) | Bulgarian | 76% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb9900&w=76&h=5&txtpad=1" alt="bar" />
-[br](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_br.yml) | Brazilian | 90% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=88cc33&w=90&h=5&txtpad=1" alt="bar" />
+[br](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_br.yml) | Brazilian | 80% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aaaa11&w=80&h=5&txtpad=1" alt="bar" />
-[cz](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_cz.yml) | Czech | 90% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=88cc33&w=90&h=5&txtpad=1" alt="bar" />
+[cz](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_cz.yml) | Czech | 80% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aaaa11&w=80&h=5&txtpad=1" alt="bar" />
-[de](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_de.yml) | German | 90% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=88cc33&w=90&h=5&txtpad=1" alt="bar" />
+[de](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_de.yml) | German | 80% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aaaa11&w=80&h=5&txtpad=1" alt="bar" />
-[eo](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_eo.yml) | Esperanto | 90% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=88cc33&w=90&h=5&txtpad=1" alt="bar" />
+[eo](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_eo.yml) | Esperanto | 80% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aaaa11&w=80&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" />
+[es](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_es.yml) | Spanish | 92% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=77dd44&w=92&h=5&txtpad=1" alt="bar" />
-[et](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_et.yml) | Estonian | 90% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=88cc33&w=90&h=5&txtpad=1" alt="bar" />
+[et](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_et.yml) | Estonian | 80% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aaaa11&w=80&h=5&txtpad=1" alt="bar" />
-[eu](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_eu.yml) | Basque | 48% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aa5500&w=48&h=5&txtpad=1" alt="bar" />
+[eu](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_eu.yml) | Basque | 42% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aa5500&w=42&h=5&txtpad=1" alt="bar" />
-[fi](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fi.yml) | Finnish | 51% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb6600&w=51&h=5&txtpad=1" alt="bar" />
+[fi](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fi.yml) | Finnish | 45% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aa5500&w=45&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" />
+[fr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fr.yml) | French | 89% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=88cc33&w=89&h=5&txtpad=1" alt="bar" />
-[gl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_gl.yml) | Galician | 54% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb6600&w=54&h=5&txtpad=1" alt="bar" />
+[gl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_gl.yml) | Galician | 48% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aa5500&w=48&h=5&txtpad=1" alt="bar" />
-[hu](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_hu.yml) | Hungarian | 98% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ee55&w=98&h=5&txtpad=1" alt="bar" />
+[hu](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_hu.yml) | Hungarian | 87% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=99bb22&w=87&h=5&txtpad=1" alt="bar" />
-[id](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_id.yml) | Indonesian | 53% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb6600&w=53&h=5&txtpad=1" alt="bar" />
+[id](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_id.yml) | Indonesian | 47% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aa5500&w=47&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" />
+[it](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_it.yml) | Italian | 92% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=77dd44&w=92&h=5&txtpad=1" alt="bar" />
-[ko](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ko.yml) | Korean | 98% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ee55&w=98&h=5&txtpad=1" alt="bar" />
+[ko](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ko.yml) | Korean | 89% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=88cc33&w=89&h=5&txtpad=1" alt="bar" />
-[lt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_lt.yml) | Lithuanian | 40% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aa4400&w=40&h=5&txtpad=1" alt="bar" />
+[lt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_lt.yml) | Lithuanian | 36% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aa4400&w=36&h=5&txtpad=1" alt="bar" />
-[nl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_nl.yml) | Dutch | 90% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=88cc33&w=90&h=5&txtpad=1" alt="bar" />
+[nl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_nl.yml) | Dutch | 80% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aaaa11&w=80&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" />
+[pl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pl.yml) | Polish | 92% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=77dd44&w=92&h=5&txtpad=1" alt="bar" />
-[pt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pt.yml) | Portuguese | 90% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=88cc33&w=90&h=5&txtpad=1" alt="bar" />
+[pt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pt.yml) | Portuguese | 80% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aaaa11&w=80&h=5&txtpad=1" alt="bar" />
-[ro](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ro.yml) | Romanian | 90% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=88cc33&w=90&h=5&txtpad=1" alt="bar" />
+[ro](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ro.yml) | Romanian | 80% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aaaa11&w=80&h=5&txtpad=1" alt="bar" />
-[ru](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ru.yml) | Russian | 98% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ee55&w=98&h=5&txtpad=1" alt="bar" />
+[ru](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ru.yml) | Russian | 92% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=77dd44&w=92&h=5&txtpad=1" alt="bar" />
-[sk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_sk.yml) | Slovakian | 90% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=88cc33&w=90&h=5&txtpad=1" alt="bar" />
+[sk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_sk.yml) | Slovakian | 80% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aaaa11&w=80&h=5&txtpad=1" alt="bar" />
-[tr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_tr.yml) | Turkish | 86% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=99bb22&w=86&h=5&txtpad=1" alt="bar" />
+[tr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_tr.yml) | Turkish | 76% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb9900&w=76&h=5&txtpad=1" alt="bar" />
-[uk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_uk.yml) | Ukrainian | 71% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb8800&w=71&h=5&txtpad=1" alt="bar" />
+[uk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_uk.yml) | Ukrainian | 63% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb7700&w=63&h=5&txtpad=1" alt="bar" />
-[vn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_vn.yml) | Vietnamese | 87% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=99bb22&w=87&h=5&txtpad=1" alt="bar" />
+[vn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_vn.yml) | Vietnamese | 77% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb9900&w=77&h=5&txtpad=1" alt="bar" />
-[zhcn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhcn.yml) | Chinese (China) | 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) | 89% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=88cc33&w=89&h=5&txtpad=1" alt="bar" />
-[zhhk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhhk.yml) | Chinese (Hong Kong) | 90% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=88cc33&w=90&h=5&txtpad=1" alt="bar" />
+[zhhk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhhk.yml) | Chinese (Hong Kong) | 80% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=aaaa11&w=80&h=5&txtpad=1" alt="bar" />
-[zhmc](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhmc.yml) | Chinese (Macau) | 73% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb8800&w=73&h=5&txtpad=1" alt="bar" />
+[zhmc](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhmc.yml) | Chinese (Macau) | 65% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=bb7700&w=65&h=5&txtpad=1" alt="bar" />
-[zhtw](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhtw.yml) | Chinese (Taiwan) | 98% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=66ee55&w=98&h=5&txtpad=1" alt="bar" />
+[zhtw](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhtw.yml) | Chinese (Taiwan) | 87% | <img src="https://placeholdit.imgix.net/~text?txtsize=5&bg=99bb22&w=87&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 Fri Feb 02 20:09:17 CET 2018
+This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sun Apr 22 11:09:12 CEST 2018

src/main/java/fr/xephi/authme/command/CommandInitializer.java

@@ -563,10 +563,11 @@ public class CommandInitializer {
 
         // Register the base totp code
         CommandDescription.builder()
-            .parent(null)
+            .parent(totpBase)
             .labels("code", "c")
             .description("Command for logging in")
             .detailedDescription("Processes the two-factor authentication code during login.")
+            .withArgument("code", "The TOTP code to use to log in", MANDATORY)
             .executableCommand(TotpCodeCommand.class)
             .register();
 

src/main/java/fr/xephi/authme/command/executable/totp/AddTotpCommand.java

@@ -35,6 +35,7 @@ public class AddTotpCommand extends PlayerCommand {
             TotpGenerationResult createdTotpInfo = generateTotpService.generateTotpKey(player);
             messages.send(player, MessageKey.TWO_FACTOR_CREATE,
                 createdTotpInfo.getTotpKey(), createdTotpInfo.getAuthenticatorQrCodeUrl());
+            messages.send(player, MessageKey.TWO_FACTOR_CREATE_CONFIRMATION_REQUIRED);
         } else {
             messages.send(player, MessageKey.TWO_FACTOR_ALREADY_ENABLED);
         }

src/main/java/fr/xephi/authme/message/MessageKey.java

@@ -125,7 +125,7 @@ public enum MessageKey {
     /** Forgot your password? Please use the command: /email recovery <yourEmail> */
     FORGOT_PASSWORD_MESSAGE("recovery.forgot_password_hint"),
 
-    /** To login you have to solve a captcha code, please use the command: /captcha %captcha_code */
+    /** To log in you have to solve a captcha code, please use the command: /captcha %captcha_code */
     USAGE_CAPTCHA("captcha.usage_captcha", "%captcha_code"),
 
     /** Wrong captcha, please type "/captcha %captcha_code" into the chat! */
@@ -134,7 +134,7 @@ public enum MessageKey {
     /** Captcha code solved correctly! */
     CAPTCHA_SUCCESS("captcha.valid_captcha"),
 
-    /** To register you have to solve a captcha code first, please use the command: /captcha %captcha_code */
+    /** To register you have to solve a captcha first, please use the command: /captcha %captcha_code */
     CAPTCHA_FOR_REGISTRATION_REQUIRED("captcha.captcha_for_registration", "%captcha_code"),
 
     /** Valid captcha! You may now register with /register */
@@ -203,7 +203,10 @@ public enum MessageKey {
     /** Your secret code is %code. You can scan it from here %url */
     TWO_FACTOR_CREATE("two_factor.code_created", "%code", "%url"),
 
-    /** Please submit your two-factor authentication code with /2fa code <code>. */
+    /** Please confirm your code with /2fa confirm <code> */
+    TWO_FACTOR_CREATE_CONFIRMATION_REQUIRED("two_factor.confirmation_required"),
+
+    /** Please submit your two-factor authentication code with /2fa code <code> */
     TWO_FACTOR_CODE_REQUIRED("two_factor.code_required"),
 
     /** Two-factor authentication is already enabled for your account! */
@@ -276,27 +279,21 @@ public enum MessageKey {
     EMAIL_COOLDOWN_ERROR("email.email_cooldown_error", "%time"),
 
     /**
-     * The command you are trying to execute is sensitive and requires a verification!
+     * This command is sensitive and requires an email verification!
-     * A verification code has been sent to your email,
+     * Check your inbox and follow the email's instructions.
-     * run the command "/verification [code]" to verify your identity.
      */
     VERIFICATION_CODE_REQUIRED("verification.code_required"),
 
     /** Usage: /verification <code> */
     USAGE_VERIFICATION_CODE("verification.command_usage"),
 
-    /** Incorrect code, please type "/verification <code>" into the chat! */
+    /** Incorrect code, please type "/verification <code>" into the chat, using the code you received by email */
     INCORRECT_VERIFICATION_CODE("verification.incorrect_code"),
 
-    /**
+    /** Your identity has been verified! You can now execute all commands within the current session! */
-     * Your identity has been verified!
-     * You can now execute every sensitive command within the current session!
-     */
     VERIFICATION_CODE_VERIFIED("verification.success"),
 
-    /**
+    /** You can already execute every sensitive command within the current session! */
-     * You can already execute every sensitive command within the current session!
-     */
     VERIFICATION_CODE_ALREADY_VERIFIED("verification.already_verified"),
 
     /** Your code has expired! Execute another sensitive command to get a new code! */

src/main/java/fr/xephi/authme/security/totp/TotpAuthenticator.java

@@ -1,11 +1,8 @@
 package fr.xephi.authme.security.totp;
 
 import com.warrenstrange.googleauth.GoogleAuthenticator;
-import com.warrenstrange.googleauth.GoogleAuthenticatorConfig;
-import com.warrenstrange.googleauth.GoogleAuthenticatorConfig.GoogleAuthenticatorConfigBuilder;
 import com.warrenstrange.googleauth.GoogleAuthenticatorKey;
 import com.warrenstrange.googleauth.GoogleAuthenticatorQRGenerator;
-import com.warrenstrange.googleauth.HmacHashFunction;
 import com.warrenstrange.googleauth.IGoogleAuthenticator;
 import fr.xephi.authme.service.BukkitService;
 import org.bukkit.entity.Player;
@@ -30,10 +27,7 @@ public class TotpAuthenticator {
      * @return new Google Authenticator instance
      */
     protected IGoogleAuthenticator createGoogleAuthenticator() {
-        GoogleAuthenticatorConfig config = new GoogleAuthenticatorConfigBuilder()
+        return new GoogleAuthenticator();
-            .setHmacHashFunction(HmacHashFunction.HmacSHA512)
-            .build();
-        return new GoogleAuthenticator(config);
     }
 
     /**

src/main/resources/messages/messages_bg.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&2Излязохте успешно!'
     reload: '&2Конфигурацията и база данните бяха презаредени правилно!'
     usage_change_password: '&cКоманда: /changepassword Стара-Парола Нова-Парола'
-    two_factor_create: '&2Кода е %code. Можеш да го провериш оттука: %url'
     accounts_owned_self: 'Претежаваш %count акаунт/а:'
     accounts_owned_other: 'Потребителят %name има %count акаунт/а:'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: '&cСтарият имейл е грешен, опитайте отново!'
     invalid: '&cИмейла е невалиден, опитайте с друг!'
     added: '&2Имейл адреса е добавен!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '&cМоля потвърди своя имейл адрес!'
     changed: '&2Имейл адреса е сменен!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     email_show: '&2Твоят имейл адрес е: &f%email'
     no_email_for_account: '&2Няма добавен имейл адрес към акаунта.'
     already_used: '&4Имейл адреса вече се използва, опитайте с друг.'
@@ -99,8 +100,6 @@ email:
     send_failure: 'Съобщението не беше изпратено. Моля свържете се с администратора.'
     # TODO change_password_expired: 'You cannot change your password using this command anymore.'
     email_cooldown_error: '&cВече е бил изпратен имейл адрес. Трябва а изчакаш %time преди да пратиш нов.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     hours: 'часа'
     day: 'ден'
     days: 'дена'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2Кода е %code. Можеш да го провериш оттука: %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_br.yml

@@ -63,7 +63,6 @@ misc:
     logout: '&2Desconectado com sucesso!'
     reload: '&2Configuração e o banco de dados foram recarregados corretamente!'
     usage_change_password: '&cUse: /changepassword <senhaVelha> <senhaNova>'
-    two_factor_create: '&2O seu código secreto é %code. Você pode verificá-lo a partir daqui %url'
     accounts_owned_self: 'Você tem %count contas:'
     accounts_owned_other: 'O jogador %name tem %count contas:'
 
@@ -93,8 +92,10 @@ email:
     old_email_invalid: '&cE-mail velho inválido, tente novamente!'
     invalid: '&E-mail inválido, tente novamente!'
     added: '&2Email adicionado com sucesso à sua conta!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '&cPor favor confirme seu endereço de email!'
     changed: '&2Troca de email com sucesso.!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     email_show: '&2O seu endereço de e-mail atual é: &f%email'
     no_email_for_account: '&2Você atualmente não têm endereço de e-mail associado a esta conta.'
     already_used: '&4O endereço de e-mail já está sendo usado'
@@ -102,8 +103,6 @@ email:
     send_failure: '&cO e-mail não pôde ser enviado, reporte isso a um administrador!'
     change_password_expired: 'Você não pode mais usar esse comando de recuperação de senha!'
     email_cooldown_error: '&cUm e-mail já foi enviado, espere mais %time antes de enviar novamente!'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -145,3 +144,16 @@ time:
     hours: 'horas'
     day: 'dia'
     days: 'dias'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2O seu código secreto é %code. Você pode verificá-lo a partir daqui %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_cz.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&cÚspěšně jsi se odhlásil.'
     reload: '&cZnovu načtení nastavení AuthMe proběhlo úspěšně.'
     usage_change_password: '&cPoužij: "/changepassword StaréHeslo NovéHeslo".'
-    two_factor_create: '&2Tvůj tajný kód je %code. Můžeš ho oskenovat zde %url'
     accounts_owned_self: 'Vlastníš tyto účty (%count):'
     accounts_owned_other: 'Hráč %name vlastní tyto účty (%count):'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: '[AuthMe] Starý email je chybně zadán!'
     invalid: '[AuthMe] Nesprávný email'
     added: '[AuthMe] Email přidán!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '[AuthMe] Potvrď prosím svůj email!'
     changed: '[AuthMe] Email změněn!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     email_show: '&2Váš aktuální email je: &f%email'
     no_email_for_account: '&2K tomuto účtu nemáte přidanou žádnou emailovou adresu.'
     already_used: '&4Tato emailová adresa je již používána'
@@ -99,8 +100,6 @@ email:
     send_failure: 'Email nemohl být odeslán. Kontaktujte prosím admina.'
     change_password_expired: 'Nemůžeš si změnit heslo pomocí toho příkazu.'
     email_cooldown_error: '&cEmail už byl nedávno odeslán. Musíš čekat %time před odesláním nového.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     hours: 'hodin'
     day: 'dny'
     days: 'dnu'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2Tvůj tajný kód je %code. Můžeš ho oskenovat zde %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_de.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&2Erfolgreich ausgeloggt'
     reload: '&2Konfiguration und Datenbank wurden erfolgreich neu geladen.'
     usage_change_password: '&cBenutze: /changepassword <altesPasswort> <neuesPasswort>'
-    two_factor_create: '&2Dein geheimer Code ist %code. Du kannst ihn hier abfragen: %url'
     accounts_owned_self: 'Du besitzt %count Accounts:'
     accounts_owned_other: 'Der Spieler %name hat %count Accounts:'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: '&cDie alte E-Mail ist ungültig!'
     invalid: '&cUngültige E-Mail!'
     added: '&2E-Mail hinzugefügt!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '&cBitte bestätige deine E-Mail!'
     changed: '&2E-Mail aktualisiert!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     email_show: '&2Deine aktuelle E-Mail-Adresse ist: &f%email'
     no_email_for_account: '&2Du hast zur Zeit keine E-Mail-Adresse für deinen Account hinterlegt.'
     already_used: '&4Diese E-Mail-Adresse wird bereits genutzt.'
@@ -99,8 +100,6 @@ email:
     send_failure: 'Die E-Mail konnte nicht gesendet werden. Bitte kontaktiere einen Administrator.'
     change_password_expired: 'Mit diesem Befehl kannst du dein Passwort nicht mehr ändern.'
     email_cooldown_error: '&cEine E-Mail wurde erst kürzlich versendet. Du musst %time warten, bevor du eine neue anfordern kannst.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     hours: 'Stunden'
     day: 'Tag'
     days: 'Tage'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2Dein geheimer Code ist %code. Du kannst ihn hier abfragen: %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_en.yml

@@ -132,6 +132,7 @@ verification:
 
 two_factor:
   code_created: '&2Your secret code is %code. You can scan it from here %url'
+  confirmation_required: 'Please confirm your code with /2fa confirm <code>'
   code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
   already_enabled: 'Two-factor authentication is already enabled for your account!'
   enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'

src/main/resources/messages/messages_eo.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&2Elsalutita sukcese!'
     reload: '&2Agordo kaj datumbazo estis larditaj korekte!'
     usage_change_password: '&cUzado: /changepassword <malnovaPasvorto> <novaPasvorto>'
-    two_factor_create: '&2Via sekreta kodo estas %code. Vi povas skani ĝin de tie %url'
     accounts_owned_self: 'Vi posedas %count kontoj:'
     accounts_owned_other: 'La ludanto %name havas %count kontojn::'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: '&cNevalida malnovaj retpoŝto, provu denove!'
     invalid: '&cNevalida retadreso, provu denove!'
     added: '&2Retpoŝtadreso sukcese aldonitaj al via konto!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '&cBonvolu konfirmi vian retadreson!'
     changed: '&2Retpoŝtadreso ŝanĝis ĝuste!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     email_show: '&2Via nuna retadreso estas: &f%email'
     no_email_for_account: '&2Vi aktuale ne havas retadreson asociita kun ĉi tiu konto.'
     already_used: '&4La retpoŝto jam estas uzata'
@@ -99,8 +100,6 @@ email:
     send_failure: 'La retpoŝto ne estis sendita. Bonvolu kontakti administranto.'
     change_password_expired: 'Vi ne povas ŝanĝi vian pasvorton per tiu ĉi komando plu.'
     email_cooldown_error: '&cRetmesaĝon jam sendita lastatempe. Vi devas atendi %time antaŭ vi povas sendi novan.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     hours: 'horoj'
     day: 'tago'
     days: 'tagoj'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2Via sekreta kodo estas %code. Vi povas skani ĝin de tie %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_es.yml

@@ -61,7 +61,6 @@ misc:
     logout: '&cDesconectado correctamente.'
     reload: '&fLa configuración y la base de datos han sido recargados'
     usage_change_password: '&fUso: /changepw contraseñaActual contraseñaNueva'
-    two_factor_create: '&2Tu código secreto es %code. Lo puedes escanear desde aquí %url'
     accounts_owned_self: 'Eres propietario de %count cuentas:'
     accounts_owned_other: 'El jugador %name tiene %count cuentas:'
 
@@ -91,8 +90,10 @@ email:
     old_email_invalid: '[AuthMe] Email anterior inválido!'
     invalid: '[AuthMe] Email inválido'
     added: '[AuthMe] Email agregado !'
+    add_not_allowed: '&cNo se permite añadir un Email'
     request_confirmation: '[AuthMe] Confirma tu Email !'
     changed: '[AuthMe] Email cambiado !'
+    change_not_allowed: '&cNo se permite el cambio de Email'
     email_show: '&2Tu dirección de E-Mail actual es: &f%email'
     no_email_for_account: '&2No tienes ningun E-Mail asociado en esta cuenta.'
     already_used: '&4La dirección Email ya está siendo usada'
@@ -100,8 +101,6 @@ email:
     send_failure: 'No se ha podido enviar el correo electrónico. Por favor, contacta con un administrador.'
     change_password_expired: 'No puedes cambiar la contraseña utilizando este comando.'
     email_cooldown_error: '&cEl correo ha sido enviado recientemente. Debes esperar %time antes de volver a enviar uno nuevo.'
-    add_not_allowed: '&cNo se permite añadir un Email'
-    change_not_allowed: '&cNo se permite el cambio de Email'
 
 # Password recovery by email
 recovery:
@@ -143,3 +142,16 @@ time:
     hours: 'horas'
     day: 'día'
     days: 'días'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2Tu código secreto es %code. Lo puedes escanear desde aquí %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_et.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&2Edukalt välja logitud!!'
     reload: '&2Andmebaas uuendatud!'
     usage_change_password: '&cKasutus: /changepassword <vanaParool> <UusParool>'
-    two_factor_create: '&2Su salajane kood on %code. Skänni see siin: %url'
     accounts_owned_self: 'Sa omad %count kontot:'
     accounts_owned_other: 'Mängijal %name on %count kontot:'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: '&cVale vana meiliaadress, proovi uuesti.'
     invalid: '&cVale meiliaadress, proovi uuesti.'
     added: '&2Meiliaadress edukalt vahetatud!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '&cPalun kinnita oma meiliaadress.'
     changed: '&2Meiliaadress edukalt vahetatud.'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     email_show: '&2Su meiliaadress on: &f%email'
     no_email_for_account: '&2Selle kasutajaga pole seotud ühtegi meiliaadressi.'
     already_used: '&4Meiliaadress juba kasutuses.'
@@ -99,8 +100,6 @@ email:
     send_failure: 'Meili ei õnnestunud saata. Kontakteeru meeskonnaga.'
     change_password_expired: '&3Enam ei saa vahetada oma parooli kasutades seda käsklust.'
     email_cooldown_error: '&cEmail juba saadeti. Sa pead ootama %time ennem, kui saad uuesti saata.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     hours: 'tundi'
     day: 'päev'
     days: 'päeva'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2Su salajane kood on %code. Skänni see siin: %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_eu.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&cAtera zara'
     reload: '&fConfiguration and database has been reloaded'
     usage_change_password: '&fErabili: /changepassword pasahitzZaharra pasahitzBerria'
-    # TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
     # TODO accounts_owned_self: 'You own %count accounts:'
     # TODO accounts_owned_other: 'The player %name has %count accounts:'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: '[AuthMe] Email zaharra okerra!'
     invalid: '[AuthMe] Email okerrea'
     added: '[AuthMe] Emaila gehitu duzu !'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '[AuthMe] Konfirmatu zure emaila !'
     changed: '[AuthMe] Emaila aldatua!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     # TODO email_show: '&2Your current email address is: &f%email'
     # TODO no_email_for_account: '&2You currently don''t have email address associated with this account.'
     # TODO already_used: '&4The email address is already being used'
@@ -99,8 +100,6 @@ email:
     # TODO send_failure: 'The email could not be sent. Please contact an administrator.'
     # TODO change_password_expired: 'You cannot change your password using this command anymore.'
     # TODO email_cooldown_error: '&cAn email was already sent recently. You must wait %time before you can send a new one.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     # TODO hours: 'hours'
     # TODO day: 'day'
     # TODO days: 'days'
+
+# Two-factor authentication
+two_factor:
+    # TODO code_created: '&2Your secret code is %code. You can scan it from here %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_fi.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&cKirjauduit ulos palvelimelta.'
     reload: '&fAsetukset uudelleenladattu'
     usage_change_password: '&fKäyttötapa: /changepassword vanhaSalasana uusiSalasana'
-    # TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
     # TODO accounts_owned_self: 'You own %count accounts:'
     # TODO accounts_owned_other: 'The player %name has %count accounts:'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: '[AuthMe] Vanha sähköposti on väärä!'
     invalid: '[AuthMe] Väärä sähköposti'
     added: '[AuthMe] Sähköposti lisätty!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '[AuthMe] Vahvistuta sähköposti!'
     changed: '[AuthMe] Sähköposti vaihdettu!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     # TODO email_show: '&2Your current email address is: &f%email'
     # TODO no_email_for_account: '&2You currently don''t have email address associated with this account.'
     # TODO already_used: '&4The email address is already being used'
@@ -99,8 +100,6 @@ email:
     # TODO send_failure: 'The email could not be sent. Please contact an administrator.'
     # TODO change_password_expired: 'You cannot change your password using this command anymore.'
     # TODO email_cooldown_error: '&cAn email was already sent recently. You must wait %time before you can send a new one.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     # TODO hours: 'hours'
     # TODO day: 'day'
     # TODO days: 'days'
+
+# Two-factor authentication
+two_factor:
+    # TODO code_created: '&2Your secret code is %code. You can scan it from here %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_fr.yml

@@ -63,7 +63,6 @@ misc:
     logout: '&cVous avez été déconnecté !'
     reload: '&aAuthMe a été relancé avec succès.'
     usage_change_password: '&cPour changer de mot de passe, utilisez "/changepassword <AncienMotDePasse> <NouveauMotDePasse>"'
-    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:'
 
@@ -93,8 +92,10 @@ email:
     old_email_invalid: '&cAncien email invalide !'
     invalid: '&cL''email inscrit est invalide !'
     added: '&aEmail enregistré. En cas de perte de MDP, faites "/email recover <Email>"'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '&cLa confirmation de l''email est manquante ou éronnée.'
     changed: '&aVotre email a été mis à jour.'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     email_show: '&fL''email enregistré pour votre compte est: %email'
     no_email_for_account: '&c&oVous n''avez aucun email enregistré sur votre compte.'
     already_used: '&cCet email est déjà utilisé !'
@@ -102,8 +103,6 @@ email:
     send_failure: '&cLe mail n''a pas pu être envoyé. Veuillez contacter un admin.'
     change_password_expired: 'Vous ne pouvez pas changer votre mot de passe avec cette commande.'
     email_cooldown_error: '&cUn mail de récupération a déjà été envoyé récemment. Veuillez attendre %time pour le demander de nouveau.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -145,3 +144,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'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_gl.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&cSesión pechada con éxito'
     reload: '&fRecargáronse a configuración e a base de datos'
     usage_change_password: '&fUso: /changepassword <contrasinalVello> <contrasinalNovo>'
-    # TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
     # TODO accounts_owned_self: 'You own %count accounts:'
     # TODO accounts_owned_other: 'The player %name has %count accounts:'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: '[AuthMe] O correo vello non é válido!'
     invalid: '[AuthMe] Correo non válido'
     added: '[AuthMe] Correo engadido!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '[AuthMe] Confirma o teu correo!'
     changed: '[AuthMe] Cambiouse o correo!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     # TODO email_show: '&2Your current email address is: &f%email'
     # TODO no_email_for_account: '&2You currently don''t have email address associated with this account.'
     # TODO already_used: '&4The email address is already being used'
@@ -99,8 +100,6 @@ email:
     # TODO send_failure: 'The email could not be sent. Please contact an administrator.'
     # TODO change_password_expired: 'You cannot change your password using this command anymore.'
     # TODO email_cooldown_error: '&cAn email was already sent recently. You must wait %time before you can send a new one.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     # TODO hours: 'hours'
     # TODO day: 'day'
     # TODO days: 'days'
+
+# Two-factor authentication
+two_factor:
+    # TODO code_created: '&2Your secret code is %code. You can scan it from here %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_hu.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&cSikeresen kijelentkeztél!'
     reload: 'Beállítások és az adatbázis újratöltve!'
     usage_change_password: 'Használat: "/changepassword <régi jelszó> <új jelszó>".'
-    two_factor_create: '&2A titkos kódod a következő: %code. Vagy skenneld be a következő oldalról: %url'
     accounts_owned_self: '%count db regisztrációd van:'
     accounts_owned_other: 'A %name nevű játékosnak, %count db regisztrációja van:'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: '&cHibás a régi email cím, próbáld újra!'
     invalid: '&cHibás az email cím, próbáld újra!'
     added: '&2Az email címed rögzítése sikeresen megtörtént!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '&cKérlek, ellenőrízd az email címedet!'
     changed: '&2Az email cím cseréje sikeresen megtörtént!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     email_show: '&2A jelenlegi email-ed a következő: &f%email'
     no_email_for_account: '&2Ehhez a felhasználóhoz jelenleg még nincs email hozzárendelve.'
     already_used: '&4Ez az email cím már használatban van!'
@@ -99,8 +100,6 @@ email:
     send_failure: 'Nem sikerült elküldeni az emailt. Lépj kapcsolatba egy adminnal.'
     change_password_expired: 'Ezzel a paranccsal már nem módosíthatja jelszavát.'
     email_cooldown_error: '&cEgy emailt már kiküldtünk. Következő email küldése előtt várnod kell: %time.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     hours: 'óra'
     day: 'nap'
     days: 'nap'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2A titkos kódod a következő: %code. Vagy skenneld be a következő oldalról: %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_id.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&2Berhasil logout!'
     reload: '&2Konfigurasi dan database telah dimuat ulang!'
     usage_change_password: '&cUsage: /changepassword <passwordLama> <passwordBaru>'
-    # TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
     # TODO accounts_owned_self: 'You own %count accounts:'
     # TODO accounts_owned_other: 'The player %name has %count accounts:'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: '&cEmail lama tidak valid, coba lagi!'
     invalid: '&cAlamat email tidak valid, coba lagi!'
     added: '&2Berhasil menambahkan alamat email ke akunmu!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '&cSilahkan konfirmasi alamat email kamu!'
     changed: '&2Alamat email telah diubah dengan benar!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     # TODO email_show: '&2Your current email address is: &f%email'
     # TODO no_email_for_account: '&2You currently don''t have email address associated with this account.'
     # TODO already_used: '&4The email address is already being used'
@@ -99,8 +100,6 @@ email:
     # TODO send_failure: 'The email could not be sent. Please contact an administrator.'
     # TODO change_password_expired: 'You cannot change your password using this command anymore.'
     # TODO email_cooldown_error: '&cAn email was already sent recently. You must wait %time before you can send a new one.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     # TODO hours: 'hours'
     # TODO day: 'day'
     # TODO days: 'days'
+
+# Two-factor authentication
+two_factor:
+    # TODO code_created: '&2Your secret code is %code. You can scan it from here %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_it.yml

@@ -61,7 +61,6 @@ misc:
     logout: '&2Disconnessione avvenuta correttamente!'
     reload: '&2La configurazione e il database sono stati ricaricati correttamente!'
     usage_change_password: '&cUtilizzo: /changepassword <vecchiaPassword> <nuovaPassword>'
-    two_factor_create: '&2Il tuo codice segreto è: &f%code%%nl%&2Puoi anche scannerizzare il codice QR da qui: &f%url'
     accounts_owned_self: 'Possiedi %count account:'
     accounts_owned_other: 'Il giocatore %name possiede %count account:'
 
@@ -91,8 +90,10 @@ email:
     old_email_invalid: '&cIl vecchio indirizzo email inserito non è valido, riprova!'
     invalid: '&cL''indirizzo email inserito non è valido, riprova!'
     added: '&2Indirizzo email aggiunto correttamente al tuo account!'
+    add_not_allowed: '&cNon hai il permesso di aggiungere un indirizzo email'
     request_confirmation: '&cPer favore, conferma il tuo indirizzo email!'
     changed: '&2Indirizzo email cambiato correttamente!'
+    change_not_allowed: '&cNon hai il permesso di cambiare l''indirizzo email'
     email_show: '&2Il tuo indirizzo email al momento è: &f%email'
     no_email_for_account: '&2Al momento non hai nessun indirizzo email associato al tuo account.'
     already_used: '&4L''indirizzo email inserito è già in uso'
@@ -100,8 +101,6 @@ email:
     send_failure: 'Non è stato possibile inviare l''email di recupero. Per favore contatta un amministratore.'
     change_password_expired: 'Non puoi più cambiare la tua password con questo comando.'
     email_cooldown_error: '&cUna email di recupero ti è già stata inviata recentemente. Devi attendere %time prima di poterne richiedere una nuova.'
-    add_not_allowed: '&cNon hai il permesso di aggiungere un indirizzo email'
-    change_not_allowed: '&cNon hai il permesso di cambiare l''indirizzo email'
 
 # Password recovery by email
 recovery:
@@ -143,3 +142,16 @@ time:
     hours: 'ore'
     day: 'giorno'
     days: 'giorni'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2Il tuo codice segreto è: &f%code%%nl%&2Puoi anche scannerizzare il codice QR da qui: &f%url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_ko.yml

@@ -62,7 +62,6 @@ misc:
     logout: '&2로그아웃 되었습니다!'
     reload: '&2설정과 데이터 베이스가 새로고침 되었습니다!'
     usage_change_password: '&c사용법: /changepassword <예전 비밀번호> <새 비밀번호>'
-    two_factor_create: '&2당신의 비밀 코드는 %code 입니다. %url 에서 스캔할 수 있습니다'
     accounts_owned_self: '%count 개의 계정을 소유하고 있습니다.'
     accounts_owned_other: '플레이어 %name 는 %count 개의 계정을 소유하고 있습니다:'
 
@@ -92,8 +91,10 @@ email:
     old_email_invalid: '&c예전 이메일 주소가 잘못되었습니다. 다시 시도해보세요!'
     invalid: '&c이메일 주소가 잘못되었습니다. 다시 시도해보세요!'
     added: '&2계정에 이메일 주소를 추가했습니다!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '&c이메일 주소를 확인해주세요!'
     changed: '&2이메일 주소가 변경되었습니다!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     email_show: '&2현재 이메일 주소: &f%email'
     no_email_for_account: '&2현재 이 계정과 연결된 이메일 주소가 없습니다.'
     already_used: '&4이메일 주소가 이미 사용 중입니다.'
@@ -101,8 +102,6 @@ email:
     send_failure: '이메일을 보낼 수 없습니다. 관리자에게 알려주세요.'
     change_password_expired: '더 이상 이 명령어를 통해 비밀번호를 변경할 수 없습니다.'
     email_cooldown_error: '&c이메일을 이미 발송했습니다. %time 후에 다시 발송할 수 있습니다.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -144,3 +143,16 @@ time:
     hours: '시간'
     day: '일'
     days: '일'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2당신의 비밀 코드는 %code 입니다. %url 에서 스캔할 수 있습니다'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_lt.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&aSekmingai atsijungete'
     reload: '&aNustatymai ir duomenu baze buvo perkrauta.'
     usage_change_password: '&ePanaudojimas: /changepassword senasSlaptazodis naujasSlaptazodis'
-    # TODO two_factor_create: '&2Your secret code is %code. You can scan it from here %url'
     # TODO accounts_owned_self: 'You own %count accounts:'
     # TODO accounts_owned_other: 'The player %name has %count accounts:'
 
@@ -90,8 +89,10 @@ email:
     # TODO old_email_invalid: '&cInvalid old email, try again!'
     # TODO invalid: '&cInvalid email address, try again!'
     # TODO added: '&2Email address successfully added to your account!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     # TODO request_confirmation: '&cPlease confirm your email address!'
     # TODO changed: '&2Email address changed correctly!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     # TODO email_show: '&2Your current email address is: &f%email'
     # TODO no_email_for_account: '&2You currently don''t have email address associated with this account.'
     # TODO already_used: '&4The email address is already being used'
@@ -99,8 +100,6 @@ email:
     # TODO send_failure: 'The email could not be sent. Please contact an administrator.'
     # TODO change_password_expired: 'You cannot change your password using this command anymore.'
     # TODO email_cooldown_error: '&cAn email was already sent recently. You must wait %time before you can send a new one.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     # TODO hours: 'hours'
     # TODO day: 'day'
     # TODO days: 'days'
+
+# Two-factor authentication
+two_factor:
+    # TODO code_created: '&2Your secret code is %code. You can scan it from here %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_nl.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&2Je bent succesvol uitgelogd!'
     reload: '&2De configuratie en database zijn succesvol herladen!'
     usage_change_password: '&cGebruik: /changepassword <oud wachtwoord> <nieuw wachtwoord>'
-    two_factor_create: '&2Je geheime code is %code. Je kunt hem scannen op %url'
     accounts_owned_self: 'Je bezit %count accounts:'
     accounts_owned_other: 'De speler %name heeft %count accounts:'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: '&cOngeldig oud e-mailadres, probeer het opnieuw!'
     invalid: '&cOngeldig E-mailadres, probeer het opnieuw!'
     added: '&2Het e-mailadres is succesvol toegevoegd aan je account!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '&cVerifiëer je e-mailadres alsjeblieft!'
     changed: '&2Het e-mailadres is succesvol veranderd!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     email_show: '&2Jouw huidige e-mailadres is: %email'
     no_email_for_account: '&2Je hebt nog geen e-mailadres toegevoegd aan dit account.'
     already_used: '&4Dit e-mailadres wordt al gebruikt'
@@ -99,8 +100,6 @@ email:
     send_failure: 'De e-mail kon niet verzonden worden. Neem contact op met een administrator.'
     change_password_expired: 'Je kunt je wachtwoord niet meer veranderen met dit commando.'
     email_cooldown_error: '&cEr is recent al een e-mail verzonden. Je moet %time wachten voordat je een nieuw bericht kunt versturen.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     hours: 'uren'
     day: 'dag'
     days: 'dagen'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2Je geheime code is %code. Je kunt hem scannen op %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_pl.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&cPomyślnie wylogowany'
     reload: '&fKonfiguracja bazy danych została przeładowana.'
     usage_change_password: '&fUżycie: /changepassword <stare_hasło> <nowe_hasło>'
-    two_factor_create: '&2Twój sekretny kod to %code. Możesz zeskanować go tutaj: %url'
     accounts_owned_self: '&7Posiadasz %count kont:'
     accounts_owned_other: '&7Gracz %name posiada %count kont:'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: '[AuthMe] Stary e-mail niepoprawny!'
     invalid: '[AuthMe] Nieprawidłowy adres e-mail.'
     added: '[AuthMe] E-mail został dodany do Twojego konta!'
+    add_not_allowed: '&cMożliwość dodania adresu e-mail jest wyłączona.'
     request_confirmation: '[AuthMe] Potwierdź swój adres e-mail!'
     changed: '[AuthMe] E-mail został zmieniony!'
+    change_not_allowed: '&cMożliwość zmiany adresu e-mail jest wyłączona.'
     email_show: '&2Twój aktualny adres e-mail to: &f%email'
     no_email_for_account: '&2Nie posiadasz adresu e-mail przypisanego do tego konta.'
     already_used: '&4Ten adres e-mail jest aktualnie używany!'
@@ -99,8 +100,6 @@ email:
     send_failure: 'Nie można wysłać e-maila. Skontaktuj się z administracją.'
     change_password_expired: 'Nie zmienisz już hasła przy użyciu tej komendy.'
     email_cooldown_error: '&cE-mail został wysłany, musisz poczekać %time przed wysłaniem następnego.'
-    add_not_allowed: '&cMożliwość dodania adresu e-mail jest wyłączona.'
-    change_not_allowed: '&cMożliwość zmiany adresu e-mail jest wyłączona.'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     hours: 'godzin'
     day: 'dzień'
     days: 'dni'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2Twój sekretny kod to %code. Możesz zeskanować go tutaj: %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_pt.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&cSaida com sucesso'
     reload: '&fConfiguração e base de dados foram recarregadas'
     usage_change_password: '&fUse: /changepassword <passwordAntiga> <passwordNova>'
-    two_factor_create: '&2O seu código secreto é o %code. Você pode verificá-lo a partir daqui %url'
     accounts_owned_self: 'Você possui %count contas:'
     accounts_owned_other: 'O jogador %name possui %count contas:'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: 'Email antigo inválido!'
     invalid: 'Email inválido!'
     added: 'Email adicionado com sucesso!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: 'Confirme o seu email!'
     changed: 'Email alterado com sucesso!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     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'
@@ -99,8 +100,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'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     hours: 'horas'
     day: 'dia'
     days: 'dias'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2O seu código secreto é o %code. Você pode verificá-lo a partir daqui %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_ro.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&2Te-ai dezautentificat cu succes!'
     reload: '&2Configuratiile si baza de date sau reincarcat corect!'
     usage_change_password: '&cFoloseste comanda: /changepassword <parola veche> <parola noua>'
-    two_factor_create: '&2Codul tau secret este %code. Il poti scana de aici %url'
     accounts_owned_self: 'Detii %count conturi:'
     accounts_owned_other: 'Jucatorul %name are %count conturi:'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: '&cEmail-ul vechi este invalid, incearca din nou!'
     invalid: '&cEmail-ul este invalid, incearca din nou!'
     added: '&2Email-ul a fost adaugat cu succes la contul tau!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '&cTe rugam sa confirmi adresa ta de email!'
     changed: '&2Email-ul a fost schimbat cu succes!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     email_show: '&2Adresa ta curenta de email este: &f%email'
     no_email_for_account: '&2Nu ai nici o adresa de email asociata cu acest cont.'
     already_used: '&4Email-ul acesta este deja folosit de altcineva'
@@ -99,8 +100,6 @@ email:
     send_failure: 'Email-ul nu a putut fi trimis. Ta rugam contactatezi un administrator.'
     change_password_expired: 'Nu mai iti poti schimba parola folosind aceasta comanda.'
     email_cooldown_error: '&cAi primit deja un mail pentru schimbarea parolei. Trebuie sa astepti %time inainte de a trimite unul nou.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     hours: 'ore'
     day: 'zi'
     days: 'zile'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2Codul tau secret este %code. Il poti scana de aici %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_ru.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&2Вы успешно вышли.'
     reload: '&6Конфигурация и база данных перезагружены.'
     usage_change_password: '&cИспользование: /changepassword <пароль> <новый пароль>'
-    two_factor_create: '&2Ваш секретный код — %code. Просканируйте его здесь: %url'
     accounts_owned_self: 'У вас %count уч. записей:'
     accounts_owned_other: 'У игрока %name %count уч. записей:'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: '&cНедействительная старая электронная почта!'
     invalid: '&cНедействительный адрес электронной почты!'
     added: '&2Электронная почта успешно добавлена!'
+    add_not_allowed: '&cДобавление электронной почты не было разрешено.'
     request_confirmation: '&cПодтвердите свою электронную почту!'
     changed: '&2Адрес электронной почты изменён!'
+    change_not_allowed: '&cИзменение электронной почты не было разрешено.'
     email_show: '&2Текущий адрес электронной почты — &f%email'
     no_email_for_account: '&2К вашей уч. записи не привязана электронная почта.'
     already_used: '&4Эта электронная почта уже используется.'
@@ -99,8 +100,6 @@ email:
     send_failure: 'Письмо не может быть отправлено. Свяжитесь в администратором.'
     change_password_expired: 'Больше нельзя сменить свой пароль, используя эту команду.'
     email_cooldown_error: '&cПисьмо было отправлено недавно. Подождите %time, прежде чем отправить новое.'
-    add_not_allowed: '&cДобавление электронной почты не было разрешено.'
-    change_not_allowed: '&cИзменение электронной почты не было разрешено.'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     hours: 'ч.'
     day: 'дн.'
     days: 'дн.'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2Ваш секретный код — %code. Просканируйте его здесь: %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_sk.yml

@@ -66,7 +66,6 @@ misc:
     logout: '&cBol si úspešne odhlásený.'
     reload: '&fZnovu načítanie konfigurácie a databázy bolo úspešné.'
     usage_change_password: '&fPoužitie: /changepassword <staréHeslo> <novéHeslo>'
-    two_factor_create: '&2Tvoj tajný kód je %code. Môžeš ho oskenovať tu: %url'
     accounts_owned_self: 'Vlastníš tieto účty(%count): '
     accounts_owned_other: 'Hráč %name vlastní tieto účty(%count): '
 
@@ -96,8 +95,10 @@ email:
     old_email_invalid: '&cNeplatný starý email, skús to znovu!'
     invalid: '&cNeplatná emailová adresa, skús to znovu!'
     added: '&2Emailová adresa bola úspešne pridaná k tvojmu účtu!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '&cProsím potvrď svoju emailovú adresu!'
     changed: '&2Emailová adresa bola úspešne zmenená!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     email_show: '&2Tvoja súčastná emailová adresa je: &f%email'
     no_email_for_account: '&2Momentálne nemáš emailovú adresu spojenú s týmto účtom.'
     already_used: '&4Túto emailovú adresu už niekto používa.'
@@ -105,8 +106,6 @@ email:
     send_failure: 'Email nemohol byť poslaný. Prosím kontaktuj Administrátora.'
     change_password_expired: 'Už nemôžeš zmeniť svoje heslo týmto príkazom.'
     email_cooldown_error: '&cEmail bol nedávno poslaný. Musíš počkať %time predtým ako ti pošleme nový.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -148,3 +147,16 @@ time:
     hours: 'hod.'
     day: 'd.'
     days: 'd.'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2Tvoj tajný kód je %code. Môžeš ho oskenovať tu: %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_tr.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&2Basariyla cikis yaptin!'
     reload: '&2Ayarlar ve veritabani yenilendi!'
     usage_change_password: '&cKullanim: /changepassword <eskiSifre> <yeniSifre>'
-    two_factor_create: '&2Gizli kodunuz %code. Buradan test edebilirsin, %url'
     accounts_owned_self: 'Sen %count hesaba sahipsin:'
     accounts_owned_other: 'Oyuncu %name %count hesaba sahip:'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: '&cGecersiz eski eposta, tekrar deneyin!'
     invalid: '&cGecersiz eposta, tekrar deneyin!'
     added: '&2Eposta basariyla kullaniciniza eklendi!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '&cLutfen tekrar epostanizi giriniz!'
     changed: '&2Epostaniz basariyla degistirildi!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     email_show: '&2Suanki eposta adresin: &f%email'
     no_email_for_account: '&2Bu hesapla iliskili bir eposta bulunmuyor.'
     already_used: '&4Eposta adresi zaten kullaniliyor.'
@@ -99,8 +100,6 @@ email:
     send_failure: 'Eposta gonderilemedi. Yetkili ile iletisime gec.'
     # TODO change_password_expired: 'You cannot change your password using this command anymore.'
     email_cooldown_error: '&cKisa bir sure once eposta gonderildi. Yeni bir eposta almak icin %time beklemelisin.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     hours: 'saat'
     day: 'gun'
     days: 'gun'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2Gizli kodunuz %code. Buradan test edebilirsin, %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_uk.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&2Ви вийшли зі свого акаунта!'
     reload: '&2Конфігурації та базу даних було успішно перезавантажено!'
     usage_change_password: '&cСинтаксис: /changepassword <старийПароль> <новийПароль>'
-    two_factor_create: '&2Ваш секретний код — %code %nl%&2Можете зкопіювати його за цим посиланням — %url'
     accounts_owned_self: 'Кількість ваших твінк‒акаунтів: %count:'
     accounts_owned_other: 'Кількість твінк‒акаунтів гравця %name: %count'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: '&cСтарий e-mail, що прив’язано до вашого акаунта, відрізняється від введеного вами.'
     invalid: '&cФормат вказаного e-mail’у є некоректним, або його домен внесено до блеклисту.'
     added: '&2Електронну пошту успішно прив’язано до вашого акаунта.'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '&cАдреси не співпадають.'
     changed: '&2E-mail успішно змінено.'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     # TODO email_show: '&2Your current email address is: &f%email'
     # TODO no_email_for_account: '&2You currently don''t have email address associated with this account.'
     already_used: '&4До цієї електронної пошти прив’язано забагато акаунтів!'
@@ -99,8 +100,6 @@ email:
     # TODO send_failure: 'The email could not be sent. Please contact an administrator.'
     # TODO change_password_expired: 'You cannot change your password using this command anymore.'
     # TODO email_cooldown_error: '&cAn email was already sent recently. You must wait %time before you can send a new one.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     # TODO hours: 'hours'
     # TODO day: 'day'
     # TODO days: 'days'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2Ваш секретний код — %code %nl%&2Можете зкопіювати його за цим посиланням — %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_vn.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&2Bạn đã đăng xuất!'
     reload: '&2Cấu hình và cơ sở dử liệu đã được nạp lại!'
     usage_change_password: '&cSử dụng: /changepassword <mật khẩu cũ> <mật khẩu mới>'
-    two_factor_create: '&2Mã bí mật của bạn là %code. Bạn có thể quét nó tại đây %url'
     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:'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: '&cEmail cũ không hợp lệ, vui lòng thử lại!'
     invalid: '&cĐại chỉ email không hợp lệ, vui lòng thử lại!'
     added: '&2Địa chỉ email đã thêm vào tài khoản của bạn thành công!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '&cVui lòng xác nhận địa chỉ email của bạn!'
     changed: '&2Địa chỉ email đã thay đổi!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     email_show: '&2Địa chỉ email hiện tại của bạn là: &f%email'
     no_email_for_account: '&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.'
     already_used: '&4Địa chỉ email đã được sử dụng'
@@ -99,8 +100,6 @@ email:
     send_failure: 'Không thể gửi thư. Vui lòng liên hệ với ban quản trị.'
     change_password_expired: '&cBạn không thể thay đổi mật khẩu bằng lệnh này từ nay.'
     email_cooldown_error: '&cMột bức thư đã được gửi gần đây. Bạn phải chờ %time trước khi có thể gửi một bức thư mới.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     hours: 'giờ'
     day: 'ngày'
     days: 'ngày'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2Mã bí mật của bạn là %code. Bạn có thể quét nó tại đây %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_zhcn.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&8[&6玩家系统&8] &c已成功登出！'
     reload: '&8[&6玩家系统&8] &f配置以及数据已经重新加载完毕'
     usage_change_password: '&8[&6玩家系统&8] &f正确用法：“/changepassword 旧密码 新密码”'
-    two_factor_create: '&8[&6玩家系统&8] &2你的代码是 %code，你可以使用 %url 来扫描'
     accounts_owned_self: '您拥有 %count 个账户：'
     accounts_owned_other: '玩家 %name 拥有 %count 个账户：'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: '&8[&6玩家系统&8] &f旧邮箱无效!'
     invalid: '&8[&6玩家系统&8] &f无效的邮箱'
     added: '&8[&6玩家系统&8] &f邮箱已添加 !'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '&8[&6玩家系统&8] &f确认你的邮箱 !'
     changed: '&8[&6玩家系统&8] &f邮箱已改变 !'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     email_show: '&2您当前的电子邮件地址为： &f%email'
     no_email_for_account: '&2您当前并没有任何邮箱与该账号绑定'
     already_used: '&8[&6玩家系统&8] &4邮箱已被使用'
@@ -99,8 +100,6 @@ email:
     send_failure: '邮件发送失败，请联系管理员'
     change_password_expired: '您不能使用此命令更改密码'
     email_cooldown_error: '&c邮件已在几分钟前发送，您需要等待 %time 后才能再次请求发送'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     hours: '小时'
     day: '天'
     days: '天'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&8[&6玩家系统&8] &2你的代码是 %code，你可以使用 %url 来扫描'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_zhhk.yml

@@ -63,7 +63,6 @@ misc:
     logout: '&8[&6用戶系統&8] &b你成功登出了。'
     reload: '&8[&6用戶系統&8] &b登入系統設定及資料庫重新載入完畢。'
     usage_change_password: '&8[&6用戶系統&8] &f用法：《 /changepassword <舊密碼> <新密碼> 》'
-    two_factor_create: '&8[&6用戶系統 - 兩步驗證碼&8] &b你的登入金鑰為&9「%c%code&9」&b，掃描連結為：&c %url'
     accounts_owned_self: '你擁有 %count 個帳戶：'
     accounts_owned_other: '玩家《%name》擁有 %count 個帳戶：'
 
@@ -93,8 +92,10 @@ email:
     old_email_invalid: '&8[&6用戶系統&8] &c你所填寫的舊電郵地址並不正確。'
     invalid: '&8[&6用戶系統&8] &c你所填寫的電郵地址並不正確。'
     added: '&8[&6用戶系統&8] &a已新增你的電郵地址。'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '&8[&6用戶系統&8] &5請重覆輸入你的電郵地址。'
     changed: '&8[&6用戶系統&8] &a你的電郵地址已更改。'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     email_show: '&8[&6用戶系統&8] &2你所使用的電郵地址為：&f%email'
     no_email_for_account: '&8[&6用戶系統&8] &2你並未有綁定電郵地址到此帳戶。'
     already_used: '&8[&6用戶系統&8] &4這個電郵地址已被使用。'
@@ -102,8 +103,6 @@ email:
     send_failure: '&8[&6用戶系統&8] &c電郵系統錯誤，請聯絡伺服器管理員。 &7(err: smtperr)'
     change_password_expired: '&8[&6用戶系統&8] 此指令已過期，請重新辦理。'
     email_cooldown_error: '&8[&6用戶系統&8] &c你已經辦理過重寄郵件，請等待 %time 後再嘗試吧。'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -145,3 +144,16 @@ time:
     hours: '小時'
     day: '日'
     days: '日'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&8[&6用戶系統 - 兩步驗證碼&8] &b你的登入金鑰為&9「%c%code&9」&b，掃描連結為：&c %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_zhmc.yml

@@ -60,7 +60,6 @@ misc:
     logout: '&2已成功註銷!'
     reload: '&2伺服器已正確地被重新加載配置和數據庫！'
     usage_change_password: '&c使用方法: "/changepassword [舊密碼] [新密碼]"'
-    two_factor_create: '&2您的密碼是 %code。您可以從這裡掃描 %url'
     accounts_owned_self: '您擁有 %count 個帳戶:'
     accounts_owned_other: '玩家 %name 擁有 %count 個帳戶:'
 
@@ -90,8 +89,10 @@ email:
     old_email_invalid: '&c舊電子郵件地址無效，請重試!'
     invalid: '&c電子郵件地址無效，請重試!'
     added: '&2電子郵件地址已成功添加到您的帳戶!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '&c請確認你的電郵地址!'
     changed: '&2已正確地更改電子郵件地址!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     # TODO email_show: '&2Your current email address is: &f%email'
     # TODO no_email_for_account: '&2You currently don''t have email address associated with this account.'
     already_used: '&4此電子郵件地址已被使用'
@@ -99,8 +100,6 @@ email:
     # TODO send_failure: 'The email could not be sent. Please contact an administrator.'
     # TODO change_password_expired: 'You cannot change your password using this command anymore.'
     # TODO email_cooldown_error: '&cAn email was already sent recently. You must wait %time before you can send a new one.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -142,3 +141,16 @@ time:
     # TODO hours: 'hours'
     # TODO day: 'day'
     # TODO days: 'days'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&2您的密碼是 %code。您可以從這裡掃描 %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/messages/messages_zhtw.yml

@@ -62,7 +62,6 @@ misc:
     logout: '&b【AuthMe】&6您已成功登出'
     reload: '&b【AuthMe】&6已重新讀取設定檔及資料庫'
     usage_change_password: '&b【AuthMe】&6用法: &c"/changepassword <舊密碼> <新密碼>"'
-    two_factor_create: '&b【AuthMe - 兩步驗證碼】&b您的登入金鑰為&9「%c%code&9」&b，掃描連結為：&c %url'
     accounts_owned_self: '&b【AuthMe】&6您擁有 %count 個帳號:'
     accounts_owned_other: '&b【AuthMe】&6玩家 %name 擁有 %count 個帳號:'
 
@@ -92,8 +91,10 @@ email:
     old_email_invalid: '&b【AuthMe】&6舊的Email無效!'
     invalid: '&b【AuthMe】&6無效的Email!'
     added: '&b【AuthMe】&6已添加Email!'
+    # TODO add_not_allowed: '&cAdding email was not allowed'
     request_confirmation: '&b【AuthMe】&6請驗證您的Email!'
     changed: '&b【AuthMe】&6Email已變更!'
+    # TODO change_not_allowed: '&cChanging email was not allowed'
     email_show: '&b【AuthMe】&2目前的電子郵件: &f%email'
     no_email_for_account: '&b【AuthMe】&2您目前沒有設置電子郵件.'
     already_used: '&b【AuthMe】&4這個電郵地址已被使用。'
@@ -101,8 +102,6 @@ email:
     send_failure: '&b【AuthMe】&4無法傳送電子郵件，請聯絡管理員.'
     change_password_expired: '&b【AuthMe】&6您現在不能使用這個指令變更密碼了.'
     email_cooldown_error: '&b【AuthMe】&c電子郵件已經寄出了. 您只能在 %time 後才能傳送.'
-    # TODO add_not_allowed: '&cAdding email was not allowed'
-    # TODO change_not_allowed: '&cChanging email was not allowed'
 
 # Password recovery by email
 recovery:
@@ -144,3 +143,16 @@ time:
     hours: '時'
     day: '天'
     days: '天'
+
+# Two-factor authentication
+two_factor:
+    code_created: '&b【AuthMe - 兩步驗證碼】&b您的登入金鑰為&9「%c%code&9」&b，掃描連結為：&c %url'
+    # TODO confirmation_required: 'Please confirm your code with /2fa confirm <code>'
+    # TODO code_required: 'Please submit your two-factor authentication code with /2fa code <code>'
+    # TODO already_enabled: 'Two-factor authentication is already enabled for your account!'
+    # TODO enable_error_no_code: 'No 2fa key has been generated for you or it has expired. Please run /2fa add'
+    # TODO enable_success: 'Successfully enabled two-factor authentication for your account'
+    # TODO enable_error_wrong_code: 'Wrong code or code has expired. Please run /2fa add'
+    # TODO not_enabled_error: 'Two-factor authentication is not enabled for your account. Run /2fa add'
+    # TODO removed_success: 'Successfully removed two-factor auth from your account'
+    # TODO invalid_code: 'Invalid code!'

src/main/resources/plugin.yml

@@ -23,7 +23,7 @@ commands:
     usage: /email show|add|change|recover|code|setpassword
   login:
     description: Login command
-    usage: /login <password> [2facode]
+    usage: /login <password>
     aliases:
     - l
     - log
@@ -48,7 +48,7 @@ commands:
     - cp
   totp:
     description: TOTP commands
-    usage: /totp add|confirm|remove
+    usage: /totp code|add|confirm|remove
     aliases:
     - 2fa
   captcha: