diff --git a/src/User/resources/i18n/ca/usuario.php b/src/User/resources/i18n/ca/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/ca/usuario.php
+++ b/src/User/resources/i18n/ca/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/da/usuario.php b/src/User/resources/i18n/da/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/da/usuario.php
+++ b/src/User/resources/i18n/da/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/de-DU/usuario.php b/src/User/resources/i18n/de-DU/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/de-DU/usuario.php
+++ b/src/User/resources/i18n/de-DU/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/de/usuario.php b/src/User/resources/i18n/de/usuario.php
index a719215..32b2b8d 100644
--- a/src/User/resources/i18n/de/usuario.php
+++ b/src/User/resources/i18n/de/usuario.php
@@ -17,75 +17,39 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Eine Nachricht wurde an Ihre E-Mail-Adresse gesendet. Sie enthält einen Bestätigungslink den Sie klicken müssen um die Registrierung abzuschließen.',
-    'Are you sure you want to switch to this user for the rest of this Session?' => 'Sind Sie sicher, dass Sie zu diesem Benutzer zu wechseln möchten für den Rest dieser Session?',
-    'Are you sure you wish to send a password recovery email to this user?' => 'Sind Sie sicher, dass Sie eine Passwortwiederherstellungs-Mail an diesen Benutzer senden möchten?',
-    'Authentication rule class {0} can not be instantiated' => 'Von der Authentifizierungsregel Klasse {0} kann keine Instanz erstellt werden',
-    'Authorization rule has been added.' => 'Berechtigungsregel wurde hinzugefügt.',
-    'Authorization rule has been removed.' => 'Berechtigungsregel wurde entfernt.',
-    'Authorization rule has been updated.' => 'Berechtigungsregel wurde gespeichert.',
-    'Awesome, almost there. Now you need to click the confirmation link sent to your new email address.' => 'Fast geschafft. Nun müssen Sie nur noch den Aktivierungslink besuchen, der an ihre neue E-Mail Adresse gesendet wurde.',
-    'Awesome, almost there. Now you need to click the confirmation link sent to your old email address.' => 'Fast geschafft. Nun müssen Sie nur noch den Aktivierungslink besuchen, der an ihre alte E-Mail Adresse gesendet wurde.',
-    'Cancel' => 'Abbrechen',
-    'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => 'Kann die Rolle "{0}" nicht zuordnen da der AuthManager in der Console Application nicht konfiguriert ist.',
-    'Class' => 'Klasse',
-    'Close' => 'schließen',
-    'Create new rule' => 'Neue Regel erstellen',
-    'Created at' => 'Erstellt am',
-    'Disable Two-Factor Auth' => 'Zweifaktor-Authentifizierung deaktivieren',
-    'Enable' => 'aktivieren',
-    'Enable Two-factor auth' => 'Zweifaktor-Authentifizierung aktivieren',
-    'Error sending registration message to "{email}". Please try again later.' => 'Fehler beim Senden der Registrierungsnachricht an "{email}". Bitte später noch einmal probieren.',
-    'Error sending welcome message to "{email}". Please try again later.' => 'Fehler beim Senden der Willkommensnachricht an "{email}". Bitte später noch einmal probieren.',   
-    'Impersonate this user' => 'Wechsle zu diesem Benutzer',
-    'Invalid two-factor code' => 'Ungültiger Zweifaktor Schlüssel',
-    'Last login' => 'Letzter Login',
-    'Never' => 'Nie',
-    'New rule' => 'Neue Regel',
-    'Required "key" cannot be empty.' => 'Erforderlicher "key" darf nicht leer sein.',
-    'Required "secret" cannot be empty.' => 'Erforderliches "secret" darf nicht leer sein.',
-    'Role "{0}" not found. Creating it.' => 'Rolle "{0}" nicht gefunden. Erstelle diese.',
-    'Rule class must extend "yii\\rbac\\Rule".' => 'Regelklasse muss "yii\\rbac\\Rule" erweitern.',
-    'Rule name {0} is already in use' => 'Regelname {0} bereits in Benutzung',
-    'Rule {0} does not exists' => 'Regel {0} existiert nicht',
-    'Rule {0} not found.' => 'Regel {0} nicht gefunden.',
-    'Rules' => 'Regeln',
-    'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => 'Scanne den Qr-Code mit der Google Authenticator App, dann füge den temporären Schlüssel in das Feld und sende es ab.',
-    'Send password recovery email' => 'Sende Mail zur Passwortwiederherstellung',
-    'Switch identities is disabled.' => 'Identitäten wechseln ist deaktiviert.',
-    'The "recaptcha" component must be configured.' => 'Die "recaptcha" Komponente muss konfiguriert werden.',
-    'The verification code is incorrect.' => 'Der Verifizierungsschlüssel ist ungültig.',
-    'This will disable two-factor auth. Are you sure?' => 'Dies wird die Zweifaktor-Authentifizierung deaktivieren. Sind Sie sicher?',
-    'Two Factor Authentication' => 'Zweifaktor-Authentifizierung',
-    'Two factor successfully enabled.' => 'Zweifaktor-Authentifizierung erfolgreich aktiviert.',
-    'Two-Factor Authentication' => 'Zweifaktor-Authentifizierung',
-    'Two-factor auth protects you against stolen credentials' => 'Zweifaktor-Authentifizierung schützt Sie vor gestohlenen Zugangsdaten',
-    'Two-factor authentication code' => 'Zweifaktor-Authentifizierungsschlüssel',
-    'Two-factor authorization has been disabled.' => 'Zweifaktor-Authentifizierung wurde deaktiviert.',
-    'Two-factor code' => 'Zweifaktor-Schlüssel',
-    'Unable to create new authorization rule.' => 'Unfähig eine neue Authentifizierungsregel zu erstellen.',
-    'Unable to disable two-factor authorization.' => 'Unfähig die Zweifaktor-Authentifizierung zu deaktivieren.',
-    'Unable to send recovery message to the user' => 'Unfähig die Wiederherstellungsnachricht an den Benutzer zu senden.',
-    'Unable to update authorization rule.' => 'Unfähig die Berechtigungsregel zu speichern.',
-    'Update rule' => 'Regel aktualisieren',
-    'Updated at' => 'Aktualisiert am',
-    'User account could not be created.' => 'Benutzerkonto konnte nicht erstellt werden.',
-    'User could not be registered.' => 'Benutzer konnte nicht registriert werden.',
-    'User not found.' => 'Benutzer nicht gefunden.',
-    'Verification failed. Please, enter new code.' => 'Verifizierung fehlgeschlagen. Bitte einen neuen Schlüssel eingeben.',
-    'We couldn\'t re-send the mail to confirm your address. Please, verify is the correct email or if it has been confirmed already.' => 'Wir konnten die Mail zur Bestätigung Ihrer Adresse nicht noch einmal senden. Bitte kontrollieren Sie ob die E-Mail-Adresse korrekt ist oder diese bereits bestätigt wurde.',
-    'We have sent confirmation links to both old and new email addresses. You must click both links to complete your request.' => 'Wir haben Ihnen Bestätigungslinks an die alte und neue E-Mail-Adresse geschickt. Sie müssen beide Links anklicken um die Anfrage fertigzustellen.',
-    '{0} cannot be blank.' => '{0} darf nicht leer sein.',
+    'Disable two factor authentication' => '',
+    'Enable two factor authentication' => '',
+    'Invalid two factor authentication code' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'A message has been sent to your email address. ' => '@@Eine Nachricht wurde an ihre E-Mail Adresse versandt@@',
     'Awesome, almost there. ' => '@@Fast geschafft. @@',
     'Class "{0}" does not exist' => '@@Klasse "{0}" existiert nicht@@',
+    'Disable Two-Factor Auth' => '@@Zweifaktor-Authentifizierung deaktivieren@@',
+    'Enable Two-factor auth' => '@@Zweifaktor-Authentifizierung aktivieren@@',
+    'Invalid two-factor code' => '@@Ungültiger Zweifaktor Schlüssel@@',
     'Registration ip' => '@@Registrierungs-IP@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@Dies wird die Zweifaktor-Authentifizierung deaktivieren. Sind Sie sicher?@@',
+    'Two Factor Authentication' => '@@Zweifaktor-Authentifizierung@@',
+    'Two factor successfully enabled.' => '@@Zweifaktor-Authentifizierung erfolgreich aktiviert.@@',
+    'Two-Factor Authentication' => '@@Zweifaktor-Authentifizierung@@',
+    'Two-factor auth protects you against stolen credentials' => '@@Zweifaktor-Authentifizierung schützt Sie vor gestohlenen Zugangsdaten@@',
+    'Two-factor authentication code' => '@@Zweifaktor-Authentifizierungsschlüssel@@',
+    'Two-factor authorization has been disabled.' => '@@Zweifaktor-Authentifizierung wurde deaktiviert.@@',
+    'Two-factor code' => '@@Zweifaktor-Schlüssel@@',
+    'Unable to disable two-factor authorization.' => '@@Unfähig die Zweifaktor-Authentifizierung zu deaktivieren.@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@Wir konnte die Bestätigungs E-Mail nicht erneut versenden@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@Wir haben Bestätigungs E-Mails an die neue und alte E-Mail Adresse versandt.@@',
     '(not set)' => '(nicht gesetzt)',
     'A confirmation message has been sent to your new email address' => 'Eine Bestätigungsnachricht wurde an Ihre neue E-Mail Adresse versandt',
+    'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Eine Nachricht wurde an Ihre E-Mail-Adresse gesendet. Sie enthält einen Bestätigungslink den Sie klicken müssen um die Registrierung abzuschließen.',
     'A new confirmation link has been sent' => 'Ein neuer Bestätigungs-Link wurde versendet',
     'A password will be generated automatically if not provided' => 'Leer lassen, um automatisch ein Passwort zu generieren',
     'Account' => 'Konto',
@@ -99,21 +63,33 @@ return [
     'Are you sure you want to block this user?' => 'Sind Sie sicher, dass Sie diesen Benutzer blockieren wollen?',
     'Are you sure you want to confirm this user?' => 'Sind Sie sicher, dass Sie diesen Benutzer bestätigen wollen?',
     'Are you sure you want to delete this user?' => 'Sind Sie sicher, dass Sie diesen Benutzer löschen wollen?',
+    'Are you sure you want to switch to this user for the rest of this Session?' => 'Sind Sie sicher, dass Sie zu diesem Benutzer zu wechseln möchten für den Rest dieser Session?',
     'Are you sure you want to unblock this user?' => 'Sind Sie sicher, dass Sie diesen Benutzer wieder freischalten wollen?',
+    'Are you sure you wish to send a password recovery email to this user?' => 'Sind Sie sicher, dass Sie eine Passwortwiederherstellungs-Mail an diesen Benutzer senden möchten?',
     'Are you sure? Deleted user can not be restored' => 'Sind Sie sicher? Gelöschte Benutzer können nicht wiederhergestellt werden',
     'Are you sure? There is no going back' => 'Sind Sie sicher? Es gibt kein Zurück',
     'Assignments' => 'Zuordnungen',
     'Assignments have been updated' => 'Zuordnungen wurden gespeichert',
     'Auth item with such name already exists' => 'Eine Berechtigung mit diesem Name existiert bereits',
+    'Authentication rule class {0} can not be instantiated' => 'Von der Authentifizierungsregel Klasse {0} kann keine Instanz erstellt werden',
     'Authorization item successfully created.' => 'Berechtigung erfolgreich erstellt',
     'Authorization item successfully removed.' => 'Berechtigung erfolgreich gelöscht',
     'Authorization item successfully updated.' => 'Berechtigung erfolgreich gespeichert',
+    'Authorization rule has been added.' => 'Berechtigungsregel wurde hinzugefügt.',
+    'Authorization rule has been removed.' => 'Berechtigungsregel wurde entfernt.',
+    'Authorization rule has been updated.' => 'Berechtigungsregel wurde gespeichert.',
+    'Awesome, almost there. Now you need to click the confirmation link sent to your new email address.' => 'Fast geschafft. Nun müssen Sie nur noch den Aktivierungslink besuchen, der an ihre neue E-Mail Adresse gesendet wurde.',
+    'Awesome, almost there. Now you need to click the confirmation link sent to your old email address.' => 'Fast geschafft. Nun müssen Sie nur noch den Aktivierungslink besuchen, der an ihre alte E-Mail Adresse gesendet wurde.',
     'Bio' => 'Bio',
     'Block' => 'Blockieren',
     'Block status' => 'Blockadestatus',
     'Blocked at {0, date, MMMM dd, YYYY HH:mm}' => 'Blockiert am {0, date, dd. MMMM YYYY, HH:mm}',
+    'Cancel' => 'Abbrechen',
+    'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => 'Kann die Rolle "{0}" nicht zuordnen da der AuthManager in der Console Application nicht konfiguriert ist.',
     'Change your avatar at Gravatar.com' => 'Ändern Sie ihren Avatar auf Gravatar.com',
     'Children' => 'Unterelemente',
+    'Class' => 'Klasse',
+    'Close' => 'schließen',
     'Complete password reset on {0}' => 'Passwort-Wiederherstellung auf {0} fertigstellen',
     'Confirm' => 'Bestätigen',
     'Confirm account on {0}' => 'Konto auf {0} bestätigen',
@@ -129,6 +105,8 @@ return [
     'Create a user account' => 'Konto erstellen',
     'Create new permission' => 'Neue Berechtigung anlegen',
     'Create new role' => 'Neue Rolle anlegen',
+    'Create new rule' => 'Neue Regel erstellen',
+    'Created at' => 'Erstellt am',
     'Credentials will be sent to the user by email' => 'Die Zugangsdaten werden dem Nutzer per E-Mail versendet',
     'Current password' => 'Aktuelles Passwort',
     'Current password is not valid' => 'Das aktuelle Passwort ist nicht korrekt',
@@ -140,9 +118,12 @@ return [
     'Don\'t have an account? Sign up!' => 'Sie haben noch kein Konto? Registrieren!',
     'Email' => 'E-Mail',
     'Email (public)' => 'E-Mail (öffentlich)',
+    'Enable' => 'aktivieren',
     'Error occurred while changing password' => 'Fehler beim ändern des Passworts',
     'Error occurred while confirming user' => 'Fehler beim Bestätigen des Benutzers',
     'Error occurred while deleting user' => 'Fehler beim Löschen des Benutzers',
+    'Error sending registration message to "{email}". Please try again later.' => 'Fehler beim Senden der Registrierungsnachricht an "{email}". Bitte später noch einmal probieren.',
+    'Error sending welcome message to "{email}". Please try again later.' => 'Fehler beim Senden der Willkommensnachricht an "{email}". Bitte später noch einmal probieren.',
     'Finish' => 'Fertig',
     'Forgot password?' => 'Passwort vergessen?',
     'Gravatar email' => 'Gravatar E-Mail',
@@ -150,6 +131,7 @@ return [
     'If you already registered, sign in and connect this account on settings page' => 'Wenn Sie sich bereits registriert haben, melden Sie sich an und verbinden Sie dieses Konto auf der Einstellungs-Seite',
     'If you cannot click the link, please try pasting the text into your browser' => 'Wenn Sie den Link nicht anklicken können, versuchen Sie, diesen in ihre Browser-Leiste einzufügen',
     'If you did not make this request you can ignore this email' => 'Wenn Sie diese Anfrage nicht gemacht haben, können Sie diese E-Mail ignorieren',
+    'Impersonate this user' => 'Wechsle zu diesem Benutzer',
     'In order to complete your registration, please click the link below' => 'Um Ihre Registrierung abzuschliessen, klicken Sie bitte auf den Link unten',
     'In order to complete your request, please click the link below' => 'Um Ihre Anfrage abzuschliessen, klicken Sie bitte auf den Link unten',
     'In order to finish your registration, we need you to enter following fields' => 'Um Ihre Registrierung abzuschliessen, müssen Sie noch die folgenden Felder ausfüllen',
@@ -160,16 +142,19 @@ return [
     'It will be deleted forever' => 'Es wird permanent gelöscht',
     'Items' => 'Elemente',
     'Joined on {0, date}' => 'Mitglies seit {0, date}',
+    'Last login' => 'Letzter Login',
     'Location' => 'Ort',
     'Login' => 'Anmelden',
     'Logout' => 'Abmelden',
     'Manage users' => 'Nutzer verwalten',
     'Name' => 'Name',
     'Networks' => 'Netzwerke',
+    'Never' => 'Nie',
     'New email' => 'Neue E-Mail',
     'New password' => 'Neues Passwort',
     'New permission' => 'Neue Berechtigung',
     'New role' => 'Neue Rolle',
+    'New rule' => 'Neue Regel',
     'New user' => 'Neuer Benutzer',
     'Not blocked' => 'Nicht geblockt',
     'Not found' => 'Nicht gefunden',
@@ -192,17 +177,30 @@ return [
     'Registration time' => 'Registrierungszeit',
     'Remember me next time' => 'Anmeldung für das nächste mal merken',
     'Request new confirmation message' => 'Neuen Wiederherstellungs-Link anfordern',
+    'Required "key" cannot be empty.' => 'Erforderlicher "key" darf nicht leer sein.',
+    'Required "secret" cannot be empty.' => 'Erforderliches "secret" darf nicht leer sein.',
     'Reset your password' => 'Passwort wiederherstellen',
+    'Role "{0}" not found. Creating it.' => 'Rolle "{0}" nicht gefunden. Erstelle diese.',
     'Roles' => 'Rollen',
     'Rule' => 'Regel',
+    'Rule class must extend "yii\\rbac\\Rule".' => 'Regelklasse muss "yii\\rbac\\Rule" erweitern.',
     'Rule name' => 'Regelname',
+    'Rule name {0} is already in use' => 'Regelname {0} bereits in Benutzung',
+    'Rule {0} does not exists' => 'Regel {0} existiert nicht',
+    'Rule {0} not found.' => 'Regel {0} nicht gefunden.',
+    'Rules' => 'Regeln',
     'Save' => 'Speichern',
+    'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => 'Scanne den Qr-Code mit der Google Authenticator App, dann füge den temporären Schlüssel in das Feld und sende es ab.',
+    'Send password recovery email' => 'Sende Mail zur Passwortwiederherstellung',
     'Sign in' => 'Anmelden',
     'Sign up' => 'Registrieren',
     'Something went wrong' => 'Etwas ist schiefgelaufen',
+    'Switch identities is disabled.' => 'Identitäten wechseln ist deaktiviert.',
     'Thank you for signing up on {0}' => 'Danke für ihre Registrierung auf {0}',
     'Thank you, registration is now complete.' => 'Danke, ihre Registrierung ist nun abgeschlossen.',
+    'The "recaptcha" component must be configured.' => 'Die "recaptcha" Komponente muss konfiguriert werden.',
     'The confirmation link is invalid or expired. Please try requesting a new one.' => 'Ihr Aktivierungslink ist falsch oder abgelaufen. Bitte fordern Sie einen neuen an.',
+    'The verification code is incorrect.' => 'Der Verifizierungsschlüssel ist ungültig.',
     'There is neither role nor permission with name "{0}"' => 'Es gibt weder eine Rolle noch eine Berechtigung mit dem Namen "{0}"',
     'This account has already been connected to another user' => 'Dieses Konto wurde bereits von einem anderen Benutzer verbunden',
     'This email address has already been taken' => 'Die E-Mail Adresse ist bereits vergeben',
@@ -212,10 +210,13 @@ return [
     'Unable to confirm user. Please, try again.' => 'Der Benutzer konnte nicht bestätigt werden. Bitte versuchen Sie es erneut.',
     'Unable to create an account.' => 'Konto konnte nicht erstellt werden',
     'Unable to create authorization item.' => 'Authorization Item konnte nicht erstellt werden',
+    'Unable to create new authorization rule.' => 'Unfähig eine neue Authentifizierungsregel zu erstellen.',
     'Unable to delete user. Please, try again later.' => 'Benutzer konnte nicht gelöscht werden.',
     'Unable to remove authorization item.' => 'Authorization Item konnte nicht gelöscht werden.',
     'Unable to send confirmation link' => 'Konnte Bestätigungslink nicht versenden',
+    'Unable to send recovery message to the user' => 'Unfähig die Wiederherstellungsnachricht an den Benutzer zu senden.',
     'Unable to update authorization item.' => 'Konnte Authorization item nicht ändern',
+    'Unable to update authorization rule.' => 'Unfähig die Berechtigungsregel zu speichern.',
     'Unable to update block status.' => 'Konnte den Block-Status nicht ändern',
     'Unblock' => 'Freischalten',
     'Unconfirmed' => 'Unbestätigt',
@@ -223,18 +224,26 @@ return [
     'Update assignments' => 'Zuweisung ändern',
     'Update permission' => 'Berechtigung ändern',
     'Update role' => 'Rolle ändern',
+    'Update rule' => 'Regel aktualisieren',
     'Update user account' => 'Konto ändern',
+    'Updated at' => 'Aktualisiert am',
+    'User account could not be created.' => 'Benutzerkonto konnte nicht erstellt werden.',
     'User block status has been updated.' => 'Der Status des Benutzer wurde gespeichert',
+    'User could not be registered.' => 'Benutzer konnte nicht registriert werden.',
     'User has been confirmed' => 'Benutzer wurde bestätigt',
     'User has been created' => 'Benutzer wurde angelegt',
     'User has been deleted' => 'Benutzer wurde gelöscht',
     'User is not found' => 'Benutzer wurde nicht gefunden',
+    'User not found.' => 'Benutzer nicht gefunden.',
     'Username' => 'Benutzername',
     'Users' => 'Benutzer',
     'VKontakte' => 'VKontakte',
+    'Verification failed. Please, enter new code.' => 'Verifizierung fehlgeschlagen. Bitte einen neuen Schlüssel eingeben.',
+    'We couldn\'t re-send the mail to confirm your address. Please, verify is the correct email or if it has been confirmed already.' => 'Wir konnten die Mail zur Bestätigung Ihrer Adresse nicht noch einmal senden. Bitte kontrollieren Sie ob die E-Mail-Adresse korrekt ist oder diese bereits bestätigt wurde.',
     'We have generated a password for you' => 'Ein Passwort wurde für Sie generiert',
     'We have received a request to change the email address for your account on {0}' => 'Wir haben eine Anfrage, ihre E-Mail Adresse auf {0} zu verändern, bekommen',
     'We have received a request to reset the password for your account on {0}' => 'Wir haben eine Anfrage, ihr Passwort auf {0} wiederherzustellen, bekommen',
+    'We have sent confirmation links to both old and new email addresses. You must click both links to complete your request.' => 'Wir haben Ihnen Bestätigungslinks an die alte und neue E-Mail-Adresse geschickt. Sie müssen beide Links anklicken um die Anfrage fertigzustellen.',
     'Website' => 'Webseite',
     'Welcome to {0}' => 'Willkommen auf {0}',
     'Yandex' => 'Yandex',
@@ -254,4 +263,5 @@ return [
     'Your email address has been changed' => 'Ihre E-Mail Adresse wurde geändert',
     'Your profile has been updated' => 'Ihr Profil wurde gespeichert',
     '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, dd. MMMM YYYY, HH:mm}',
+    '{0} cannot be blank.' => '{0} darf nicht leer sein.',
 ];
diff --git a/src/User/resources/i18n/es/usuario.php b/src/User/resources/i18n/es/usuario.php
index eb31f3d..dd8fc68 100644
--- a/src/User/resources/i18n/es/usuario.php
+++ b/src/User/resources/i18n/es/usuario.php
@@ -17,10 +17,28 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Error sending registration message to "{email}". Please try again later.' => 'Ha ocurrido un error enviando el mensaje de registro a "{email}". Por favor inténtalo de nuevo más tarde.',
-    'Error sending welcome message to "{email}". Please try again later.' => 'Ha ocurrido un error al enviar el mensaje de bienvenida a "{email}". Por favor inténtalo de nuevo más tarde.',
-    'User account could not be created.' => 'La cuenta de usuario no ha podido ser creada.',
-    'User could not be registered.' => 'El usuario no ha podido ser registrado.',
+    'Disable two factor authentication' => '',
+    'Enable two factor authentication' => '',
+    'Invalid two factor authentication code' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
+    'Unable to disable Two factor authentication.' => '',
+    'Disable Two-Factor Auth' => '@@Desabilitar autenticación de dos factores@@',
+    'Enable Two-factor auth' => '@@Habilitar autenticación de dos factores@@',
+    'Invalid two-factor code' => '@@Código de dos factores inválido@@',
+    'This will disable two-factor auth. Are you sure?' => '@@Esto inhabilitará la autenticación de dos factores. Estás seguro?@@',
+    'Two Factor Authentication' => '@@Autenticación de Dos Factores@@',
+    'Two factor successfully enabled.' => '@@Autenticación de dos factores habilitada con éxito.@@',
+    'Two-Factor Authentication' => '@@Autenticación de Dos Factores@@',
+    'Two-factor auth protects you against stolen credentials' => '@@La autenticación te protege contra el robo de credenciales@@',
+    'Two-factor authentication code' => '@@Código de doble autenticación@@',
+    'Two-factor authorization has been disabled.' => '@@La autenticación de dos factores ha sido inhabilitada.@@',
+    'Two-factor code' => '@@Código de dos factores@@',
+    'Unable to disable two-factor authorization.' => '@@Ha sido imposible inhabilitar al autenticación de dos factores.@@',
     '(not set)' => '(sin establecer)',
     'A confirmation message has been sent to your new email address' => 'Se ha enviado un mensaje de confirmación a tu nueva dirección de correo electrónico',
     'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Un mensaje ha sido enviado a tu dirección de correo electrónico. Contiene un vínculo de confirmación que tienes que seguir para completar el registro.',
@@ -88,16 +106,16 @@ return [
     'Delete account' => 'Eliminar cuenta',
     'Description' => 'Descripción',
     'Didn\'t receive confirmation message?' => '¿No has recibido el mensaje de confirmación?',
-    'Disable Two-Factor Auth' => 'Desabilitar autenticación de dos factores',
     'Disconnect' => 'Desconectar',
     'Don\'t have an account? Sign up!' => '¿No tienes cuenta? ¡Regístrate!',
     'Email' => 'Correo electrónico',
     'Email (public)' => 'Correo electrónico (público)',
     'Enable' => 'Habilitar',
-    'Enable Two-factor auth' => 'Habilitar autenticación de dos factores',
     'Error occurred while changing password' => 'Se ha producido un error al cambiar la contraseña',
     'Error occurred while confirming user' => 'Se ha producido un error al confirmar el usuario',
     'Error occurred while deleting user' => 'Se ha producido un error al eliminar el usuario',
+    'Error sending registration message to "{email}". Please try again later.' => 'Ha ocurrido un error enviando el mensaje de registro a "{email}". Por favor inténtalo de nuevo más tarde.',
+    'Error sending welcome message to "{email}". Please try again later.' => 'Ha ocurrido un error al enviar el mensaje de bienvenida a "{email}". Por favor inténtalo de nuevo más tarde.',
     'Finish' => 'Finalizar',
     'Forgot password?' => '¿Olvidaste la contraseña?',
     'Gravatar email' => 'Correo electrónico Gravatar',
@@ -112,7 +130,6 @@ return [
     'Information' => 'Información',
     'Invalid login or password' => 'Usuario o contraseña incorrectos',
     'Invalid or expired link' => 'Enlace inválido o caducado',
-    'Invalid two-factor code' => 'Código de dos factores inválido',
     'Invalid value' => 'Valor inválido',
     'It will be deleted forever' => 'Será eliminado para siempre',
     'Items' => 'Elementos',
@@ -180,22 +197,13 @@ return [
     'This account has already been connected to another user' => 'Esta cuenta ya está conectada con otro usuario',
     'This email address has already been taken' => 'Esta cuenta de correo electrónico ya está siendo utilizada',
     'This username has already been taken' => 'El nombre de usuario ya está siendo utlizado',
-    'This will disable two-factor auth. Are you sure?' => 'Esto inhabilitará la autenticación de dos factores. Estás seguro?',
     'Time zone' => 'Zona horaria',
     'Time zone is not valid' => 'La zona horaria no es válida',
-    'Two Factor Authentication' => 'Autenticación de Dos Factores',
-    'Two factor successfully enabled.' => 'Autenticación de dos factores habilitada con éxito.',
-    'Two-Factor Authentication' => 'Autenticación de Dos Factores',
-    'Two-factor auth protects you against stolen credentials' => 'La autenticación te protege contra el robo de credenciales',
-    'Two-factor authentication code' => 'Código de doble autenticación',
-    'Two-factor authorization has been disabled.' => 'La autenticación de dos factores ha sido inhabilitada.',
-    'Two-factor code' => 'Código de dos factores',
     'Unable to confirm user. Please, try again.' => 'No se ha podido confirmar el usuario. Por favor, inténtalo de nuevo.',
     'Unable to create an account.' => 'No se ha podido crear la cuenta.',
     'Unable to create authorization item.' => 'No se puede actualizar el elemento de autorización.',
     'Unable to create new authorization rule.' => 'Ha sido imposible crear la nueva regla de autenticación.',
     'Unable to delete user. Please, try again later.' => 'No se ha podido eliminar el usuario. Por favor, inténtalo más tarde.',
-    'Unable to disable two-factor authorization.' => 'Ha sido imposible inhabilitar al autenticación de dos factores.',
     'Unable to remove authorization item.' => 'No se ha podido eliminar el elemento de autorización.',
     'Unable to send confirmation link' => 'No se ha podido enviar el enlace de confirmación',
     'Unable to send recovery message to the user' => 'Ha sido imposible enviar el email de recuperación de contraseña',
@@ -211,7 +219,9 @@ return [
     'Update rule' => 'Actualiza regla',
     'Update user account' => 'Actualizar cuenta',
     'Updated at' => 'Actualizado el',
+    'User account could not be created.' => 'La cuenta de usuario no ha podido ser creada.',
     'User block status has been updated.' => 'El estado de bloqueo del usuario ha sido actualizado.',
+    'User could not be registered.' => 'El usuario no ha podido ser registrado.',
     'User has been confirmed' => 'El usuario ha sido confirmado',
     'User has been created' => 'El usuario ha sido creado',
     'User has been deleted' => 'El usuario ha sido eliminado',
diff --git a/src/User/resources/i18n/fa-IR/usuario.php b/src/User/resources/i18n/fa-IR/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/fa-IR/usuario.php
+++ b/src/User/resources/i18n/fa-IR/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/fi/usuario.php b/src/User/resources/i18n/fi/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/fi/usuario.php
+++ b/src/User/resources/i18n/fi/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/fr/usuario.php b/src/User/resources/i18n/fr/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/fr/usuario.php
+++ b/src/User/resources/i18n/fr/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/hr/usuario.php b/src/User/resources/i18n/hr/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/hr/usuario.php
+++ b/src/User/resources/i18n/hr/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/hu/usuario.php b/src/User/resources/i18n/hu/usuario.php
index 0f1d9cd..549986d 100644
--- a/src/User/resources/i18n/hu/usuario.php
+++ b/src/User/resources/i18n/hu/usuario.php
@@ -24,12 +24,12 @@ return [
     'Cancel' => '',
     'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => '',
     'Close' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error sending registration message to "{email}". Please try again later.' => '',
     'Error sending welcome message to "{email}". Please try again later.' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Last login' => '',
     'Never' => '',
     'Required "key" cannot be empty.' => '',
@@ -39,15 +39,13 @@ return [
     'Send password recovery email' => '',
     'The "recaptcha" component must be configured.' => '',
     'The verification code is incorrect.' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to send recovery message to the user' => '',
     'User account could not be created.' => '',
     'User could not be registered.' => '',
@@ -58,6 +56,18 @@ return [
     '{0} cannot be blank.' => '',
     'A message has been sent to your email address. ' => '@@Üzenet érkezett az e-mail címedre.@@',
     'Awesome, almost there. ' => '@@Szuper, majdnem kész.@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@A cím megerősítéséhez nem tudtuk újra elküldeni az e-mailt.@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@Megerősítő linkeket küldtünk régi és új e-mail címekre.@@',
     '(not set)' => '(nincs beállítva)',
diff --git a/src/User/resources/i18n/it/usuario.php b/src/User/resources/i18n/it/usuario.php
index cfad813..5206c44 100644
--- a/src/User/resources/i18n/it/usuario.php
+++ b/src/User/resources/i18n/it/usuario.php
@@ -24,12 +24,12 @@ return [
     'Cancel' => '',
     'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => '',
     'Close' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error sending registration message to "{email}". Please try again later.' => '',
     'Error sending welcome message to "{email}". Please try again later.' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Last login' => '',
     'Never' => '',
     'Required "key" cannot be empty.' => '',
@@ -39,15 +39,13 @@ return [
     'Send password recovery email' => '',
     'The "recaptcha" component must be configured.' => '',
     'The verification code is incorrect.' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to send recovery message to the user' => '',
     'User account could not be created.' => '',
     'User could not be registered.' => '',
@@ -58,6 +56,18 @@ return [
     '{0} cannot be blank.' => '',
     'A message has been sent to your email address. ' => '@@È stato inviato un messaggio al tuo indirizzo email@@',
     'Awesome, almost there. ' => '@@Fantastico, ci siamo quasi. @@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@Non è stato possibile reinviare l\'email per confermare il tuo indirizzo. @@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@Abbiamo inviato un link di conferma sia al nuovo che al vecchio indirizzo email. @@',
     '(not set)' => '(non impostato)',
diff --git a/src/User/resources/i18n/kk/usuario.php b/src/User/resources/i18n/kk/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/kk/usuario.php
+++ b/src/User/resources/i18n/kk/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/lt/usuario.php b/src/User/resources/i18n/lt/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/lt/usuario.php
+++ b/src/User/resources/i18n/lt/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/nl/usuario.php b/src/User/resources/i18n/nl/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/nl/usuario.php
+++ b/src/User/resources/i18n/nl/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/pl/usuario.php b/src/User/resources/i18n/pl/usuario.php
index 933b49b..27acdc3 100644
--- a/src/User/resources/i18n/pl/usuario.php
+++ b/src/User/resources/i18n/pl/usuario.php
@@ -19,18 +19,40 @@
 return [
     'Are you sure you wish to send a password recovery email to this user?' => '',
     'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => '',
+    'Disable two factor authentication' => '',
+    'Enable two factor authentication' => '',
     'Error sending registration message to "{email}". Please try again later.' => '',
     'Error sending welcome message to "{email}". Please try again later.' => '',
+    'Invalid two factor authentication code' => '',
     'Required "key" cannot be empty.' => '',
     'Required "secret" cannot be empty.' => '',
     'Role "{0}" not found. Creating it.' => '',
     'Send password recovery email' => '',
     'The "recaptcha" component must be configured.' => '',
     'The verification code is incorrect.' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to send recovery message to the user' => '',
     'User account could not be created.' => '',
     'User could not be registered.' => '',
     '{0} cannot be blank.' => '',
+    'Disable Two-Factor Auth' => '@@Wyłącz uwierzytelnianie dwuetapowe@@',
+    'Enable Two-factor auth' => '@@Włącz uwierzytelnianie dwuetapowe@@',
+    'Invalid two-factor code' => '@@Nieprawidłowy kod uwierzytelniania dwuetapowego@@',
+    'This will disable two-factor auth. Are you sure?' => '@@To wyłączy uwierzytelnianie dwuetapowe. Czy jesteś pewny?@@',
+    'Two Factor Authentication' => '@@Uwierzytelnianie dwuetapowe@@',
+    'Two factor successfully enabled.' => '@@Dwuetapowe uwierzytelnianie poprawnie włączone.@@',
+    'Two-Factor Authentication' => '@@Uwierzytelnianie dwuetapowe@@',
+    'Two-factor auth protects you against stolen credentials' => '@@Uwierzytelnianie dwuetapowe chroni Cię przed kradzieżą danych logowania@@',
+    'Two-factor authentication code' => '@@Kod uwierzytelniania dwuetapowego@@',
+    'Two-factor authorization has been disabled.' => '@@Dwuetapowa autoryzacja została wyłączona.@@',
+    'Two-factor code' => '@@Kod dwuetapowy@@',
+    'Unable to disable two-factor authorization.' => '@@Nie można wyłączyć dwuetapowej autoryzacji.@@',
     '(not set)' => '(nie podano)',
     'A confirmation message has been sent to your new email address' => 'Potwierdzenie zostało wysłane na Twój nowy adres email',
     'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Wysłaliśmy wiadomość na Twój adres email, zawierającą link aktywacyjny, w który musisz kliknąć, aby zakończyć rejestrację.',
@@ -96,13 +118,11 @@ return [
     'Delete account' => 'Usuń konto',
     'Description' => 'Opis',
     'Didn\'t receive confirmation message?' => 'Nie otrzymałeś emaila aktywacyjnego?',
-    'Disable Two-Factor Auth' => 'Wyłącz uwierzytelnianie dwuetapowe',
     'Disconnect' => 'Odłącz',
     'Don\'t have an account? Sign up!' => 'Nie masz jeszcze konto? Zarejestruj się!',
     'Email' => 'Email',
     'Email (public)' => 'Email (publiczny)',
     'Enable' => 'Włącz',
-    'Enable Two-factor auth' => 'Włącz uwierzytelnianie dwuetapowe',
     'Error occurred while changing password' => 'Wystąpił błąd podczas zmiany hasła',
     'Error occurred while confirming user' => 'Wystąpił błąd podczas aktywacji użytkownika',
     'Error occurred while deleting user' => 'Wystąpił błąd podczas usuwania użytkownika',
@@ -120,7 +140,6 @@ return [
     'Information' => 'Informacja',
     'Invalid login or password' => 'Nieprawidłowy login lub hasło',
     'Invalid or expired link' => 'Nieprawidłowy lub zdezaktualizowany link',
-    'Invalid two-factor code' => 'Nieprawidłowy kod uwierzytelniania dwuetapowego',
     'Invalid value' => 'Nieprawidłowa wartość',
     'It will be deleted forever' => 'Usuniętych kont nie można przywrócić',
     'Items' => 'Elementy',
@@ -182,22 +201,13 @@ return [
     'This account has already been connected to another user' => 'To konto zostało już dołączone do innego użytkownika',
     'This email address has already been taken' => 'Ten adres email jest już używany',
     'This username has already been taken' => 'Ta nazwa użytkownika jest już zajęta',
-    'This will disable two-factor auth. Are you sure?' => 'To wyłączy uwierzytelnianie dwuetapowe. Czy jesteś pewny?',
     'Time zone' => 'Strefa czasowa',
     'Time zone is not valid' => 'Strefa czasowa jest niepoprawna',
-    'Two Factor Authentication' => 'Uwierzytelnianie dwuetapowe',
-    'Two factor successfully enabled.' => 'Dwuetapowe uwierzytelnianie poprawnie włączone.',
-    'Two-Factor Authentication' => 'Uwierzytelnianie dwuetapowe',
-    'Two-factor auth protects you against stolen credentials' => 'Uwierzytelnianie dwuetapowe chroni Cię przed kradzieżą danych logowania',
-    'Two-factor authentication code' => 'Kod uwierzytelniania dwuetapowego',
-    'Two-factor authorization has been disabled.' => 'Dwuetapowa autoryzacja została wyłączona.',
-    'Two-factor code' => 'Kod dwuetapowy',
     'Unable to confirm user. Please, try again.' => 'Nie można aktywować użytkownika. Proszę spróbować ponownie.',
     'Unable to create an account.' => 'Nie można utworzyć konta.',
     'Unable to create authorization item.' => 'Nie można utworzyć celu autoryzacji.',
     'Unable to create new authorization rule.' => 'Nie można utworzyć zasady autoryzacji.',
     'Unable to delete user. Please, try again later.' => 'Nie można usunąć użytkownika. Proszę spróbować ponownie później.',
-    'Unable to disable two-factor authorization.' => 'Nie można wyłączyć dwuetapowej autoryzacji.',
     'Unable to remove authorization item.' => 'Nie można usunąć celu autoryzacji.',
     'Unable to send confirmation link' => 'Nie można wysłać linka aktywacyjnego',
     'Unable to update authorization item.' => 'Nie można zaktualizować celu autoryzacji.',
diff --git a/src/User/resources/i18n/pt-BR/usuario.php b/src/User/resources/i18n/pt-BR/usuario.php
index 36c7e4f..e68c3b6 100644
--- a/src/User/resources/i18n/pt-BR/usuario.php
+++ b/src/User/resources/i18n/pt-BR/usuario.php
@@ -17,6 +17,36 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'Disable two factor authentication' => '',
+    'Enable two factor authentication' => '',
+    'Invalid two factor authentication code' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
+    'Unable to disable Two factor authentication.' => '',
+    'A message has been sent to your email address. ' => '@@Uma mensagem foi enviada para o seu endereço de e-mail.@@',
+    'Awesome, almost there. ' => '@@Incrível, quase lá.@@',
+    'Class "{0}" does not exist' => '@@A classe "{0}" não existe@@',
+    'Disable Two-Factor Auth' => '@@Desabilitar autenticação em dois fatores@@',
+    'Enable Two-factor auth' => '@@Habilitar autenticação em dois fatores@@',
+    'Invalid two-factor code' => '@@Código de dois fatores inválido@@',
+    'Registration ip' => '@@Registro ip@@',
+    'Rule class can not be instantiated' => '@@A classe de regras não pode ser instanciada@@',
+    'Rule class must extend "yii\\rbac\\Rule"' => '@@A classe de regras deve estender de "yii\\rbac\\Rule"@@',
+    'This will disable two-factor auth. Are you sure?' => '@@Isso desativará a autenticação de dois fatores. Você tem certeza?@@',
+    'Two Factor Authentication' => '@@Autenticação de dois fatores@@',
+    'Two factor successfully enabled.' => '@@Dois fatores habilitados com sucesso.@@',
+    'Two-Factor Authentication' => '@@Autenticação de dois fatores@@',
+    'Two-factor auth protects you against stolen credentials' => '@@Autenticação de dois fatores protege você contra credenciais roubadas@@',
+    'Two-factor authentication code' => '@@Código de autenticação de dois fatores@@',
+    'Two-factor authorization has been disabled.' => '@@A autorização de dois fatores foi desabilitada.@@',
+    'Two-factor code' => '@@Código de dois fatores@@',
+    'Unable to disable two-factor authorization.' => '@@Não é possível desabilitar a autorização de dois fatores.@@',
+    'We couldn\'t re-send the mail to confirm your address. ' => '@@Não poderíamos re-enviar o correio para confirmar o seu endereço.@@',
+    'We have sent confirmation links to both old and new email addresses. ' => '@@Enviamos links de confirmação para endereços de e-mail antigo e novo.@@',
     '(not set)' => '(não informado)',
     'A confirmation message has been sent to your new email address' => 'Uma mensagem de confirmação foi enviada para seu novo endereço de e-mail',
     'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'Uma mensagem foi enviada para o seu endereço de e-mail. Ele contém um link de confirmação que você deve clicar para completar o registro.',
@@ -84,13 +114,11 @@ return [
     'Delete account' => 'Excluir conta',
     'Description' => 'Descrição',
     'Didn\'t receive confirmation message?' => 'Não recebeu mensagem de confirmação?',
-    'Disable Two-Factor Auth' => 'Desabilitar autenticação em dois fatores',
     'Disconnect' => 'Desconectar',
     'Don\'t have an account? Sign up!' => 'Não tem uma conta? Inscrever-se!',
     'Email' => 'Email',
     'Email (public)' => 'Email (publico)',
     'Enable' => 'Habilitado',
-    'Enable Two-factor auth' => 'Habilitar autenticação em dois fatores',
     'Error occurred while changing password' => 'Ocorreu um erro ao mudar a senha',
     'Error occurred while confirming user' => 'Ocorreu um erro ao confirmar o usuário',
     'Error occurred while deleting user' => 'Ocorreu um erro ao excluir o usuário',
@@ -110,7 +138,6 @@ return [
     'Information' => 'Informação',
     'Invalid login or password' => 'Login ou senha inválidos',
     'Invalid or expired link' => 'Link inválido ou expirado',
-    'Invalid two-factor code' => 'Código de dois fatores inválido',
     'Invalid value' => 'Valor inválido',
     'It will be deleted forever' => 'Ele será excluído para sempre',
     'Items' => 'Itens',
@@ -178,22 +205,13 @@ return [
     'This account has already been connected to another user' => 'Esta conta já foi conectada a outro usuário',
     'This email address has already been taken' => 'Este endereço de e-mail já foi feito',
     'This username has already been taken' => 'Este nome de usuário já foi feito',
-    'This will disable two-factor auth. Are you sure?' => 'Isso desativará a autenticação de dois fatores. Você tem certeza?',
     'Time zone' => 'Fuso horário',
     'Time zone is not valid' => 'O fuso horário não é válido',
-    'Two Factor Authentication' => 'Autenticação de dois fatores',
-    'Two factor successfully enabled.' => 'Dois fatores habilitados com sucesso.',
-    'Two-Factor Authentication' => 'Autenticação de dois fatores',
-    'Two-factor auth protects you against stolen credentials' => 'Autenticação de dois fatores protege você contra credenciais roubadas',
-    'Two-factor authentication code' => 'Código de autenticação de dois fatores',
-    'Two-factor authorization has been disabled.' => 'A autorização de dois fatores foi desabilitada.',
-    'Two-factor code' => 'Código de dois fatores',
     'Unable to confirm user. Please, try again.' => 'Não é possível confirmar o usuário. Por favor, tente novamente.',
     'Unable to create an account.' => 'Não é possível criar uma conta.',
     'Unable to create authorization item.' => 'Não foi possível criar o item de autorização.',
     'Unable to create new authorization rule.' => 'Não é possível criar uma nova regra de autorização.',
     'Unable to delete user. Please, try again later.' => 'Não é possível excluir o usuário. Por favor, tente novamente mais tarde.',
-    'Unable to disable two-factor authorization.' => 'Não é possível desabilitar a autorização de dois fatores.',
     'Unable to remove authorization item.' => 'Não é possível remover o item de autorização.',
     'Unable to send confirmation link' => 'Não é possível enviar o link de confirmação',
     'Unable to send recovery message to the user' => 'Não é possível enviar uma mensagem de recuperação para o usuário',
@@ -246,12 +264,4 @@ return [
     'Your profile has been updated' => 'Seu perfil foi atualizado',
     '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, MMMM dd, YYYY HH:mm}',
     '{0} cannot be blank.' => '{0} não pode estar em branco',
-    'A message has been sent to your email address. ' => 'Uma mensagem foi enviada para o seu endereço de e-mail.',
-    'Awesome, almost there. ' => 'Incrível, quase lá.',
-    'Class "{0}" does not exist' => 'A classe "{0}" não existe',
-    'Registration ip' => 'Registro ip',
-    'Rule class can not be instantiated' => 'A classe de regras não pode ser instanciada',
-    'Rule class must extend "yii\\rbac\\Rule"' => 'A classe de regras deve estender de "yii\\rbac\\Rule"',
-    'We couldn\'t re-send the mail to confirm your address. ' => 'Não poderíamos re-enviar o correio para confirmar o seu endereço.',
-    'We have sent confirmation links to both old and new email addresses. ' => 'Enviamos links de confirmação para endereços de e-mail antigo e novo.',
 ];
diff --git a/src/User/resources/i18n/pt-PT/usuario.php b/src/User/resources/i18n/pt-PT/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/pt-PT/usuario.php
+++ b/src/User/resources/i18n/pt-PT/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/ro/usuario.php b/src/User/resources/i18n/ro/usuario.php
index f8b45e4..eafd205 100644
--- a/src/User/resources/i18n/ro/usuario.php
+++ b/src/User/resources/i18n/ro/usuario.php
@@ -24,12 +24,12 @@ return [
     'Cancel' => '',
     'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => '',
     'Close' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error sending registration message to "{email}". Please try again later.' => '',
     'Error sending welcome message to "{email}". Please try again later.' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Last login' => '',
     'Never' => '',
     'Required "key" cannot be empty.' => '',
@@ -39,15 +39,13 @@ return [
     'Send password recovery email' => '',
     'The "recaptcha" component must be configured.' => '',
     'The verification code is incorrect.' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to send recovery message to the user' => '',
     'User account could not be created.' => '',
     'User could not be registered.' => '',
@@ -58,6 +56,18 @@ return [
     '{0} cannot be blank.' => '',
     'A message has been sent to your email address. ' => '@@A fost trimis un mesaj la adresa dvs. de e-mail.@@',
     'Awesome, almost there. ' => '@@Minunat, aproape acolo.@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@Nu am putut retrimite mesajul pentru a vă confirma adresa.@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@Am trimis linkuri de confirmare adresa de e-mail vechi și cel noi.@@',
     '(not set)' => '(nu este setat)',
diff --git a/src/User/resources/i18n/ru/usuario.php b/src/User/resources/i18n/ru/usuario.php
index d7fe376..5fa7e97 100644
--- a/src/User/resources/i18n/ru/usuario.php
+++ b/src/User/resources/i18n/ru/usuario.php
@@ -17,55 +17,39 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'На вашу электронную почту было отправлено сообщение со ссылкой подтверждения регистрации.',
-    'Are you sure you wish to send a password recovery email to this user?' => 'Вы уверены, что хотите отправить письмо с восстановлением пароля на почту этому пользователю?',
-    'Awesome, almost there. Now you need to click the confirmation link sent to your new email address.' => 'Замечательно, почти готово. Вам осталось перейти по ссылке подтверждения, отправленной на новый адрес вашей электронной почты.',
-    'Awesome, almost there. Now you need to click the confirmation link sent to your old email address.' => 'Замечательно, почти готово. Вам осталось перейти по ссылке подтверждения, отправленной на старый адрес вашей электронной почты.',
-    'Cancel' => 'Отменить',
-    'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => 'В вашем консольном приложении не настроен AuthManager, поэтому не удалось назначить роль "{0}".',
-    'Close' => 'Закрыть',
-    'Disable Two-Factor Auth' => 'Отключить двухфакторную авторизацию',
-    'Enable' => 'Включить',
-    'Enable Two-factor auth' => 'Включить двухфакторную авторизацию',
-    'Error sending registration message to "{email}". Please try again later.' => 'Ошибка при отправке письма о регистрации на "{email}". Пожалуйста, попробуйте позже.',
-    'Error sending welcome message to "{email}". Please try again later.' => 'Ошибка при отправке приветственного письма на "{email}". Пожалуйста, попробуйте позже.',
-    'Invalid two-factor code' => 'Неверный код двухфакторной авторизации',
-    'Last login' => 'Последний вход',
-    'Never' => 'Никогда',
-    'Required "key" cannot be empty.' => 'Поле "key" не может быть пустым.',
-    'Required "secret" cannot be empty.' => 'Поле "secret" не может быть пустым.',
-    'Role "{0}" not found. Creating it.' => 'Роль "{0}" не найдена. Создаём её.',
-    'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => 'Просканируйте QR-код приложением Google Authenticator App, затем вставьте временный код в поле и отправьте.',
-    'Send password recovery email' => 'Отправить письмо с восстановлением пароля',
-    'The "recaptcha" component must be configured.' => 'Необходимо настроить компонент "recaptcha"',
-    'The verification code is incorrect.' => 'Неправильный код подтверждения.',
-    'This will disable two-factor auth. Are you sure?' => 'Вы уверены, что хотите отключить двухфакторную авторизацию?',
-    'Two Factor Authentication' => 'Двухфакторная авторизация',
-    'Two factor successfully enabled.' => 'Включена двухфакторная авторизация.',
-    'Two-Factor Authentication' => 'Двухфакторная авторизация',
-    'Two-factor auth protects you against stolen credentials' => 'Двухфакторная авторизация предотвращает кражу ваших данных для входа.',
-    'Two-factor authentication code' => 'Код двухфакторной авторизации',
-    'Two-factor authorization has been disabled.' => 'Двухфакторная авторизация отключена.',
-    'Two-factor code' => 'Код двухфакторной авторизации',
-    'Unable to disable two-factor authorization.' => 'Не удалось отключить двухфакторную авторизацию.',
-    'Unable to send recovery message to the user' => 'Не удалось отправить пользователю письмо восстановления',
-    'User account could not be created.' => 'Не удалось создать аккаунт для пользователя.',
-    'User could not be registered.' => 'Не удалось зарегистрировать пользователя.',
-    'User not found.' => 'Пользователь не найден.',
-    'Verification failed. Please, enter new code.' => 'Проверка не удалась. Пожауйста, введите новый код',
-    'We couldn\'t re-send the mail to confirm your address. Please, verify is the correct email or if it has been confirmed already.' => 'Не удалось повторно отправить письмо для подтверждения вашего адреса электронной почты. Пожалуйста, проверьте, что ввели корректный адрес или что он ещё не был подтверждён.',
-    'We have sent confirmation links to both old and new email addresses. You must click both links to complete your request.' => 'Мы отправили письма на ваш старый и новый адреса. Вы должны перейти по обеим ссылкам, чтобы завершить процесс смены адреса.',
-    '{0} cannot be blank.' => '{0} не может быть пустым.',
+    'Disable two factor authentication' => '',
+    'Enable two factor authentication' => '',
+    'Invalid two factor authentication code' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'A message has been sent to your email address. ' => '@@Сообщение было отправлено на вашу электронную почту@@',
     'Awesome, almost there. ' => '@@Замечательно, почти готово!@@',
     'Class "{0}" does not exist' => '@@Класс "{0}" не найден@@',
+    'Disable Two-Factor Auth' => '@@Отключить двухфакторную авторизацию@@',
+    'Enable Two-factor auth' => '@@Включить двухфакторную авторизацию@@',
+    'Invalid two-factor code' => '@@Неверный код двухфакторной авторизации@@',
     'Registration ip' => '@@IP при регистрации@@',
     'Rule class can not be instantiated' => '@@Класс правила не может быть создан@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@Класс правила должен наследоваться от "yii\\rbac\\Rule"@@',
+    'This will disable two-factor auth. Are you sure?' => '@@Вы уверены, что хотите отключить двухфакторную авторизацию?@@',
+    'Two Factor Authentication' => '@@Двухфакторная авторизация@@',
+    'Two factor successfully enabled.' => '@@Включена двухфакторная авторизация.@@',
+    'Two-Factor Authentication' => '@@Двухфакторная авторизация@@',
+    'Two-factor auth protects you against stolen credentials' => '@@Двухфакторная авторизация предотвращает кражу ваших данных для входа.@@',
+    'Two-factor authentication code' => '@@Код двухфакторной авторизации@@',
+    'Two-factor authorization has been disabled.' => '@@Двухфакторная авторизация отключена.@@',
+    'Two-factor code' => '@@Код двухфакторной авторизации@@',
+    'Unable to disable two-factor authorization.' => '@@Не удалось отключить двухфакторную авторизацию.@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@Мы не можем повторно отправить письмо для подтверждения вашего адреса электронной почты.@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@Мы отправили письма на ваш старый и новый почтовые ящики. Вы должны перейти по обеим, чтобы завершить процесс смены адреса.@@',
     '(not set)' => '(не задано)',
     'A confirmation message has been sent to your new email address' => 'На указанный адрес было отправлено письмо с дальнейшими инструкциями',
+    'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.' => 'На вашу электронную почту было отправлено сообщение со ссылкой подтверждения регистрации.',
     'A new confirmation link has been sent' => 'Ссылка для подтверждения была отправлена вам на почту',
     'A password will be generated automatically if not provided' => 'Если Вы не укажете пароль, он будет сгенерирован автоматически',
     'Account' => 'Аккаунт',
@@ -81,6 +65,7 @@ return [
     'Are you sure you want to delete this user?' => 'Вы действительно хотите удалить этого пользователя?',
     'Are you sure you want to switch to this user for the rest of this Session?' => 'Вы уверены, что хотите переключиться на этого пользователя до окончании текущей сессии?',
     'Are you sure you want to unblock this user?' => 'Вы действительно хотите разблокировать этого пользователя?',
+    'Are you sure you wish to send a password recovery email to this user?' => 'Вы уверены, что хотите отправить письмо с восстановлением пароля на почту этому пользователю?',
     'Are you sure? Deleted user can not be restored' => 'Вы уверены? Удалённый аккаунт невозможно будет восстановить',
     'Are you sure? There is no going back' => 'Вы уверены? Это действие невозможно отменить',
     'Assignments' => 'Назначения',
@@ -93,13 +78,18 @@ return [
     'Authorization rule has been added.' => 'Правило авторизации добавлено.',
     'Authorization rule has been removed.' => 'Правило авторизации удалено.',
     'Authorization rule has been updated.' => 'Правило авторизации было обновлено.',
+    'Awesome, almost there. Now you need to click the confirmation link sent to your new email address.' => 'Замечательно, почти готово. Вам осталось перейти по ссылке подтверждения, отправленной на новый адрес вашей электронной почты.',
+    'Awesome, almost there. Now you need to click the confirmation link sent to your old email address.' => 'Замечательно, почти готово. Вам осталось перейти по ссылке подтверждения, отправленной на старый адрес вашей электронной почты.',
     'Bio' => 'О себе',
     'Block' => 'Блокировка',
     'Block status' => 'Статус блокировки',
     'Blocked at {0, date, MMMM dd, YYYY HH:mm}' => 'Заблокирован {0, date, d MMMM YYYY в HH:mm}',
+    'Cancel' => 'Отменить',
+    'Cannot assign role "{0}" as the AuthManager is not configured on your console application.' => 'В вашем консольном приложении не настроен AuthManager, поэтому не удалось назначить роль "{0}".',
     'Change your avatar at Gravatar.com' => 'Изменить аватар на сайте Gravatar.com',
     'Children' => 'Дочерние элементы',
     'Class' => 'Класс',
+    'Close' => 'Закрыть',
     'Complete password reset on {0}' => 'Смена пароля на сайте {0}',
     'Confirm' => 'Подтвердить',
     'Confirm account on {0}' => 'Активация аккаунта на сайте {0}',
@@ -128,9 +118,12 @@ return [
     'Don\'t have an account? Sign up!' => 'Нет аккаунта? Зарегистрируйтесь!',
     'Email' => 'Email',
     'Email (public)' => 'Публичный email',
+    'Enable' => 'Включить',
     'Error occurred while changing password' => 'Произошла ошибка при смене пароля',
     'Error occurred while confirming user' => 'Произошла ошибка при активации пользователя',
     'Error occurred while deleting user' => 'Произошла ошибка при удалении пользователя',
+    'Error sending registration message to "{email}". Please try again later.' => 'Ошибка при отправке письма о регистрации на "{email}". Пожалуйста, попробуйте позже.',
+    'Error sending welcome message to "{email}". Please try again later.' => 'Ошибка при отправке приветственного письма на "{email}". Пожалуйста, попробуйте позже.',
     'Finish' => 'Завершить',
     'Forgot password?' => 'Забыли пароль?',
     'Gravatar email' => 'Email для Gravatar',
@@ -149,12 +142,14 @@ return [
     'It will be deleted forever' => 'Он будет удалён навсегда',
     'Items' => 'Элементы',
     'Joined on {0, date}' => 'Зарегистрирован {0, date}',
+    'Last login' => 'Последний вход',
     'Location' => 'Местоположение',
     'Login' => 'Логин',
     'Logout' => 'Выйти',
     'Manage users' => 'Управление пользователями',
     'Name' => 'Имя',
     'Networks' => 'Соцсети',
+    'Never' => 'Никогда',
     'New email' => 'Новый адрес электронной почты',
     'New password' => 'Новый пароль',
     'New permission' => 'Новое разрешение',
@@ -182,7 +177,10 @@ return [
     'Registration time' => 'Время регистрации',
     'Remember me next time' => 'Запомнить меня',
     'Request new confirmation message' => 'Запросить новое подтверждающее письмо',
+    'Required "key" cannot be empty.' => 'Поле "key" не может быть пустым.',
+    'Required "secret" cannot be empty.' => 'Поле "secret" не может быть пустым.',
     'Reset your password' => 'Сбросить пароль',
+    'Role "{0}" not found. Creating it.' => 'Роль "{0}" не найдена. Создаём её.',
     'Roles' => 'Роли',
     'Rule' => 'Правило',
     'Rule class must extend "yii\\rbac\\Rule".' => 'Класс с правилами должен наследовать "yii\\rbac\\Rule".',
@@ -192,13 +190,17 @@ return [
     'Rule {0} not found.' => 'Правило {0} не найдено.',
     'Rules' => 'Правила',
     'Save' => 'Сохранить',
+    'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => 'Просканируйте QR-код приложением Google Authenticator App, затем вставьте временный код в поле и отправьте.',
+    'Send password recovery email' => 'Отправить письмо с восстановлением пароля',
     'Sign in' => 'Войти',
     'Sign up' => 'Зарегистрироваться',
     'Something went wrong' => 'Что-то пошло не так',
     'Switch identities is disabled.' => 'Переключение на другой аккаунт отключено.',
     'Thank you for signing up on {0}' => 'Спасибо за регистрацию на сайте {0}',
     'Thank you, registration is now complete.' => 'Поздравляем, регистрация успешно завершена!',
+    'The "recaptcha" component must be configured.' => 'Необходимо настроить компонент "recaptcha"',
     'The confirmation link is invalid or expired. Please try requesting a new one.' => 'Ссылка для активации аккаунта неправильна или устарела. Вы можете запросить новую.',
+    'The verification code is incorrect.' => 'Неправильный код подтверждения.',
     'There is neither role nor permission with name "{0}"' => 'Нет ни роли, ни разрешения с именем "{0}"',
     'This account has already been connected to another user' => 'Этот аккаунт уже привязан к другой учетной записи',
     'This email address has already been taken' => 'Email уже используется',
@@ -212,6 +214,7 @@ return [
     'Unable to delete user. Please, try again later.' => 'Не удалось удалить пользователя. Пожалуйста, попробуйте позже.',
     'Unable to remove authorization item.' => 'Не удалось удалить элемент авторизации.',
     'Unable to send confirmation link' => 'Не удалось отправить ссылку для активации аккаунта.',
+    'Unable to send recovery message to the user' => 'Не удалось отправить пользователю письмо восстановления',
     'Unable to update authorization item.' => 'Не удалось изменить элемент авторизации.',
     'Unable to update authorization rule.' => 'Не удалось изменить правило авторизации.',
     'Unable to update block status.' => 'Не удалось изменить статус блокировки.',
@@ -224,17 +227,23 @@ return [
     'Update rule' => 'Изменить правило',
     'Update user account' => 'Обновить аккаунт пользователя',
     'Updated at' => 'Дата редактирования',
+    'User account could not be created.' => 'Не удалось создать аккаунт для пользователя.',
     'User block status has been updated.' => 'Статус блокировки пользователя обновлён.',
+    'User could not be registered.' => 'Не удалось зарегистрировать пользователя.',
     'User has been confirmed' => 'Пользователь был активирован',
     'User has been created' => 'Пользователь был создан',
     'User has been deleted' => 'Пользователь был удалён',
     'User is not found' => 'Пользователь не найден',
+    'User not found.' => 'Пользователь не найден.',
     'Username' => 'Имя пользователя',
     'Users' => 'Пользователи',
     'VKontakte' => 'ВКонтакте',
+    'Verification failed. Please, enter new code.' => 'Проверка не удалась. Пожауйста, введите новый код',
+    'We couldn\'t re-send the mail to confirm your address. Please, verify is the correct email or if it has been confirmed already.' => 'Не удалось повторно отправить письмо для подтверждения вашего адреса электронной почты. Пожалуйста, проверьте, что ввели корректный адрес или что он ещё не был подтверждён.',
     'We have generated a password for you' => 'Мы сгенерировали новый пароль для вас',
     'We have received a request to change the email address for your account on {0}' => 'Мы получили запрос на смену адреса электронной почты для вашего аккаунта на {0}',
     'We have received a request to reset the password for your account on {0}' => 'Мы получили запрос на сброс пароля для вашего аккаунта на {0}',
+    'We have sent confirmation links to both old and new email addresses. You must click both links to complete your request.' => 'Мы отправили письма на ваш старый и новый адреса. Вы должны перейти по обеим ссылкам, чтобы завершить процесс смены адреса.',
     'Website' => 'Веб-сайт',
     'Welcome to {0}' => 'Добро пожаловать на {0}',
     'Yandex' => 'Яндекс',
@@ -254,4 +263,5 @@ return [
     'Your email address has been changed' => 'Ваш email был успешно изменён',
     'Your profile has been updated' => 'Настройки профиля были успешно сохранены',
     '{0, date, MMMM dd, YYYY HH:mm}' => '{0, date, d MMMM YYYY в HH:mm}',
+    '{0} cannot be blank.' => '{0} не может быть пустым.',
 ];
diff --git a/src/User/resources/i18n/th/usuario.php b/src/User/resources/i18n/th/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/th/usuario.php
+++ b/src/User/resources/i18n/th/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/tr_TR/usuario.php b/src/User/resources/i18n/tr_TR/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/tr_TR/usuario.php
+++ b/src/User/resources/i18n/tr_TR/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/uk/usuario.php b/src/User/resources/i18n/uk/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/uk/usuario.php
+++ b/src/User/resources/i18n/uk/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/vi/usuario.php b/src/User/resources/i18n/vi/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/vi/usuario.php
+++ b/src/User/resources/i18n/vi/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];
diff --git a/src/User/resources/i18n/zh-CN/usuario.php b/src/User/resources/i18n/zh-CN/usuario.php
index 2284ace..12d3054 100644
--- a/src/User/resources/i18n/zh-CN/usuario.php
+++ b/src/User/resources/i18n/zh-CN/usuario.php
@@ -84,13 +84,13 @@ return [
     'Delete account' => '',
     'Description' => '',
     'Didn\'t receive confirmation message?' => '',
-    'Disable Two-Factor Auth' => '',
+    'Disable two factor authentication' => '',
     'Disconnect' => '',
     'Don\'t have an account? Sign up!' => '',
     'Email' => '',
     'Email (public)' => '',
     'Enable' => '',
-    'Enable Two-factor auth' => '',
+    'Enable two factor authentication' => '',
     'Error occurred while changing password' => '',
     'Error occurred while confirming user' => '',
     'Error occurred while deleting user' => '',
@@ -110,7 +110,7 @@ return [
     'Information' => '',
     'Invalid login or password' => '',
     'Invalid or expired link' => '',
-    'Invalid two-factor code' => '',
+    'Invalid two factor authentication code' => '',
     'Invalid value' => '',
     'It will be deleted forever' => '',
     'Items' => '',
@@ -178,22 +178,20 @@ return [
     'This account has already been connected to another user' => '',
     'This email address has already been taken' => '',
     'This username has already been taken' => '',
-    'This will disable two-factor auth. Are you sure?' => '',
+    'This will disable two factor authentication. Are you sure?' => '',
     'Time zone' => '',
     'Time zone is not valid' => '',
-    'Two Factor Authentication' => '',
-    'Two factor successfully enabled.' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor auth protects you against stolen credentials' => '',
-    'Two-factor authentication code' => '',
-    'Two-factor authorization has been disabled.' => '',
-    'Two-factor code' => '',
+    'Two Factor Authentication (2FA)' => '',
+    'Two factor authentication code' => '',
+    'Two factor authentication has been disabled.' => '',
+    'Two factor authentication protects you against stolen credentials' => '',
+    'Two factor authentication successfully enabled.' => '',
     'Unable to confirm user. Please, try again.' => '',
     'Unable to create an account.' => '',
     'Unable to create authorization item.' => '',
     'Unable to create new authorization rule.' => '',
     'Unable to delete user. Please, try again later.' => '',
-    'Unable to disable two-factor authorization.' => '',
+    'Unable to disable Two factor authentication.' => '',
     'Unable to remove authorization item.' => '',
     'Unable to send confirmation link' => '',
     'Unable to send recovery message to the user' => '',
@@ -249,9 +247,21 @@ return [
     'A message has been sent to your email address. ' => '@@@@',
     'Awesome, almost there. ' => '@@@@',
     'Class "{0}" does not exist' => '@@@@',
+    'Disable Two-Factor Auth' => '@@@@',
+    'Enable Two-factor auth' => '@@@@',
+    'Invalid two-factor code' => '@@@@',
     'Registration ip' => '@@@@',
     'Rule class can not be instantiated' => '@@@@',
     'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
+    'This will disable two-factor auth. Are you sure?' => '@@@@',
+    'Two Factor Authentication' => '@@@@',
+    'Two factor successfully enabled.' => '@@@@',
+    'Two-Factor Authentication' => '@@@@',
+    'Two-factor auth protects you against stolen credentials' => '@@@@',
+    'Two-factor authentication code' => '@@@@',
+    'Two-factor authorization has been disabled.' => '@@@@',
+    'Two-factor code' => '@@@@',
+    'Unable to disable two-factor authorization.' => '@@@@',
     'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
     'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
 ];