diff --git a/controllers/UserSettingsController.php b/controllers/UserSettingsController.php
index a8f2833..ca4bd6d 100644
--- a/controllers/UserSettingsController.php
+++ b/controllers/UserSettingsController.php
@@ -23,7 +23,7 @@ class UserSettingsController extends BaseAccountController
     public function init()
     {
         $this->setActionTitles([
-            'index' => Yii::t('TwofaModule.config', 'Two-Factor Authentication'),
+            'index' => Yii::t('TwofaModule.base', 'Two-Factor Authentication'),
         ]);
         return parent::init();
     }
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 39815a6..52ab338 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -5,6 +5,7 @@ Changelog
 ----------------------
 - Enh #58: Tests for `next` version
 - Enh #65: Use PHP CS Fixer
+- Enh #66: Reduce translation message categories
 
 1.1.3 (June 8, 2023)
 --------------------
diff --git a/drivers/GoogleAuthenticatorDriver.php b/drivers/GoogleAuthenticatorDriver.php
index f7e279c..bd42a6c 100644
--- a/drivers/GoogleAuthenticatorDriver.php
+++ b/drivers/GoogleAuthenticatorDriver.php
@@ -98,10 +98,10 @@ public function renderUserSettings($params)
     {
         Yii::$app->getView()->registerJsConfig('twofa', [
             'text' => [
-                'confirm.action.header' => Yii::t('TwofaModule.config', '<strong>Request</strong> new code'),
-                'confirm.action.question' => Yii::t('TwofaModule.config', 'Do you really want to request a new code?') . '<br><br>'
-                    . Yii::t('TwofaModule.config', 'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.'),
-                'confirm.action.button' => Yii::t('TwofaModule.config', 'Request new code'),
+                'confirm.action.header' => Yii::t('TwofaModule.base', '<strong>Request</strong> new code'),
+                'confirm.action.question' => Yii::t('TwofaModule.base', 'Do you really want to request a new code?') . '<br><br>'
+                    . Yii::t('TwofaModule.base', 'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.'),
+                'confirm.action.button' => Yii::t('TwofaModule.base', 'Request new code'),
             ],
         ]);
 
diff --git a/messages/am/base.php b/messages/am/base.php
index d182a7e..037a895 100644
--- a/messages/am/base.php
+++ b/messages/am/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    'Code' => 'ኮድ',
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Email' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => 'ኮድ',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => '',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/am/config.php b/messages/am/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/am/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/an/base.php b/messages/an/base.php
index 243e8c4..042dcca 100644
--- a/messages/an/base.php
+++ b/messages/an/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    'Code' => 'Codigo',
-    'Email' => 'Correu-e',
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => 'Codigo',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => 'Correu-e',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/an/config.php b/messages/an/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/an/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/ar/base.php b/messages/ar/base.php
index a129e45..4704e74 100644
--- a/messages/ar/base.php
+++ b/messages/ar/base.php
@@ -1,24 +1,47 @@
 <?php
-return array (
+return [
+  '<strong>Request</strong> new code' => '<strong>طلب</strong> رمز جديد',
+  '<strong>Two-Factor Authentication</strong> module configuration' => 'إعداد وحدة <strong>المصادقة الثنائية</strong>',
+  '<strong>Two-Factor Authentication</strong> settings' => 'إعدادات <strong>المصادقة الثنائية</strong>',
   '<strong>Two-factor</strong> authentication' => 'المصادقة <strong>الثنائية</strong>',
   'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => 'لقد تم للتو إرسال رمز التأكيد إلى عنوان بريدك الإلكتروني. الرجاء إدخال الرمز من البريد الإلكتروني للمتابعة.',
+  'Account:' => 'الحساب:',
   'Authentication method' => 'طريقة المصادقة',
+  'Can\'t scan the code?' => 'ألا يمكن مسح الرمز؟',
   'Code' => 'الرمز',
   'Code is not valid!' => 'الرمز غير صالح',
   'Code:' => 'الرمز:',
   'Date and time:' => 'التاريخ و الوقت:',
+  'Default method for the mandatory groups' => 'الطريقة الافتراضية للمجموعات الإلزامية',
   'Disable two-factor authentication (not recommended)' => 'تعطيل المصادقة الثنائية (غير مستحسن)',
+  'Do you really want to request a new code?' => 'هل تريد حقًا طلب رمز جديد؟',
   'Email' => 'البريد الإلكتروني',
+  'Enabled methods' => 'الطرق الممكنة',
+  'Google Authenticator' => 'أداة مصادقة جوجل',
   'Hello {displayName}!' => 'مرحباً {displayName}!',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'قم بتثبيت تطبيق يطبق خوارزمية كلمة المرور لمرة واحدة (TOTP) المستندة إلى الوقت، مثل {googleAuthenticatorLink}، واستخدمه لمسح رمز الاستجابة السريعة الموضح أدناه.',
+  'Leave empty to disable this feature.' => 'اتركه فارغًا لتعطيل هذه الميزة.',
+  'Length of verifying code' => 'طول رمز التحقق',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'قائمة عناوين IP أو الشبكات الفرعية المراد إدراجها في القائمة البيضاء، القائمة حاليًا هي {0}. استخدم فاصل الفاصلة لإنشاء قائمة، على سبيل المثال: "{0}، 127.0.0.1"',
   'Log out' => 'تسجيل الخروج',
+  'Mandatory for the following groups' => 'إلزامية للمجموعات التالية',
   'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => 'افتح تطبيق المصادقة الثنائية على جهازك لعرض رمز المصادقة الخاص بك والتحقق من هويتك.',
   'Pin code' => 'رمز التعريف الشخصي',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => 'من فضلك <strong>لا تنس</strong> تحديث الكود في تطبيق المصادقة الخاص بك! إذا لم تقم بذلك، فلن تتمكن من تسجيل الدخول.',
   'Please enter your verifying code.' => 'الرجاء إدخال رمز التحقق الخاص بك.',
+  'Remember browser option amount of days' => 'مدة خيار تذكر المتصفح من الأيام',
   'Remember this browser for {0} days' => 'تذكر هذا المتصفح لمدة {0} يومًا',
+  'Request new code' => 'طلب رمز جديد',
+  'Secret:' => 'الرمز السري:',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'تم تعطيل هذه الوحدة نظرًا لعدم تحديد أي برامج تشغيل، إلا أن المستخدمين من المجموعات المفروضة يلجأون دائمًا إلى برنامج التشغيل {defaultDriverName} بشكل افتراضي.',
+  'Time based: Yes' => 'على أساس الوقت: نعم',
   'Time-based one-time passwords (e.g. Google Authenticator)' => 'كلمات المرور المستندة إلى الوقت والتي تستخدم لمرة واحدة (مثل Google Authenticator)',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'لتوصيل التطبيق يدويًا، قم بتقديم التفاصيل التالية إلى تطبيق TOTP (مثل Google Authenticator).',
+  'Trusted networks list' => 'قائمة الشبكات الموثوقة',
   'Two-Factor Authentication' => 'المصادقة الثنائية',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'توفر المصادقة الثنائية (2FA) مستوى إضافيًا من الأمان لحسابك. بمجرد التمكين، سيُطلب منك إدخال رمز بالإضافة إلى إدخال اسم المستخدم وكلمة المرور الخاصين بك.',
   'Verify' => 'التحقق',
   'Verifying code is not valid!' => 'رمز التحقق غير صالح!',
   'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => 'يتم تأمين حسابك من خلال نظام المصادقة الثنائية. الرجاء استخدام الكود التالي للمتابعة.',
   'Your login verification code' => 'رمز التحقق من تسجيل الدخول الخاص بك',
-);
+];
diff --git a/messages/ar/config.php b/messages/ar/config.php
deleted file mode 100644
index 5d7c134..0000000
--- a/messages/ar/config.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-return array (
-  '<strong>Request</strong> new code' => '<strong>طلب</strong> رمز جديد',
-  '<strong>Two-Factor Authentication</strong> module configuration' => 'إعداد وحدة <strong>المصادقة الثنائية</strong>',
-  '<strong>Two-Factor Authentication</strong> settings' => 'إعدادات <strong>المصادقة الثنائية</strong>',
-  'Account:' => 'الحساب:',
-  'Can\'t scan the code?' => 'ألا يمكن مسح الرمز؟',
-  'Default method for the mandatory groups' => 'الطريقة الافتراضية للمجموعات الإلزامية',
-  'Do you really want to request a new code?' => 'هل تريد حقًا طلب رمز جديد؟',
-  'Enabled methods' => 'الطرق الممكنة',
-  'Google Authenticator' => 'أداة مصادقة جوجل',
-  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'قم بتثبيت تطبيق يطبق خوارزمية كلمة المرور لمرة واحدة (TOTP) المستندة إلى الوقت، مثل {googleAuthenticatorLink}، واستخدمه لمسح رمز الاستجابة السريعة الموضح أدناه.',
-  'Leave empty to disable this feature.' => 'اتركه فارغًا لتعطيل هذه الميزة.',
-  'Length of verifying code' => 'طول رمز التحقق',
-  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'قائمة عناوين IP أو الشبكات الفرعية المراد إدراجها في القائمة البيضاء، القائمة حاليًا هي {0}. استخدم فاصل الفاصلة لإنشاء قائمة، على سبيل المثال: "{0}، 127.0.0.1"',
-  'Mandatory for the following groups' => 'إلزامية للمجموعات التالية',
-  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => 'من فضلك <strong>لا تنس</strong> تحديث الكود في تطبيق المصادقة الخاص بك! إذا لم تقم بذلك، فلن تتمكن من تسجيل الدخول.',
-  'Remember browser option amount of days' => 'مدة خيار تذكر المتصفح من الأيام',
-  'Request new code' => 'طلب رمز جديد',
-  'Secret:' => 'الرمز السري:',
-  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'تم تعطيل هذه الوحدة نظرًا لعدم تحديد أي برامج تشغيل، إلا أن المستخدمين من المجموعات المفروضة يلجأون دائمًا إلى برنامج التشغيل {defaultDriverName} بشكل افتراضي.',
-  'Time based: Yes' => 'على أساس الوقت: نعم',
-  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'لتوصيل التطبيق يدويًا، قم بتقديم التفاصيل التالية إلى تطبيق TOTP (مثل Google Authenticator).',
-  'Trusted networks list' => 'قائمة الشبكات الموثوقة',
-  'Two-Factor Authentication' => 'المصادقة الثنائية',
-  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'توفر المصادقة الثنائية (2FA) مستوى إضافيًا من الأمان لحسابك. بمجرد التمكين، سيُطلب منك إدخال رمز بالإضافة إلى إدخال اسم المستخدم وكلمة المرور الخاصين بك.',
-);
diff --git a/messages/bg/base.php b/messages/bg/base.php
index 4768584..0ca793c 100644
--- a/messages/bg/base.php
+++ b/messages/bg/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    '<strong>Two-factor</strong> authentication' => '<strong>Двуфакторно</strong> удостоверяване',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => 'На вашия имейл адрес току-що е изпратен код за потвърждение. Моля, въведете кода от имейла, за да продължите.',
-    'Authentication method' => 'Метод за удостоверяване',
-    'Code' => 'Код',
-    'Code is not valid!' => 'Кодът не е валиден!',
-    'Code:' => 'Код:',
-    'Date and time:' => 'Дата и час:',
-    'Disable two-factor authentication (not recommended)' => 'Деактивирайте двуфакторното удостоверяване (не се препоръчва)',
-    'Email' => 'Имейл',
-    'Hello {displayName}!' => 'Здравейте, {displayName}!',
-    'Log out' => 'Излез от профила си',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => 'Отворете приложението за двуфакторно удостоверяване на вашето устройство, за да видите кода си за удостоверяване и да потвърдите самоличността си.',
-    'Pin code' => 'ПИН код',
-    'Please enter your verifying code.' => 'Моля, въведете вашия потвърждаващ код.',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => 'Еднократни пароли, базирани на времето (напр. Google Authenticator)',
-    'Two-Factor Authentication' => 'Двуфакторно удостоверяване',
-    'Verify' => 'Проверете',
-    'Verifying code is not valid!' => 'Кодът за проверка не е валиден!',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => 'Вашият акаунт е защитен от двуфакторна система за удостоверяване. Моля, използвайте следния код, за да продължите.',
-    'Your login verification code' => 'Вашият код за потвърждение на вход',
-    'Remember this browser for {0} days' => '',
+  '<strong>Request</strong> new code' => '<strong>Заявка</strong> за нов код',
+  '<strong>Two-Factor Authentication</strong> module configuration' => 'Конфигурация на модул за <strong>двуфакторно удостоверяване</strong>',
+  '<strong>Two-Factor Authentication</strong> settings' => 'Настройки за <strong>двуфакторно удостоверяване</strong>',
+  '<strong>Two-factor</strong> authentication' => '<strong>Двуфакторно</strong> удостоверяване',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => 'На вашия имейл адрес току-що е изпратен код за потвърждение. Моля, въведете кода от имейла, за да продължите.',
+  'Account:' => 'Акаунт:',
+  'Authentication method' => 'Метод за удостоверяване',
+  'Can\'t scan the code?' => 'Не можете да сканирате кода?',
+  'Code' => 'Код',
+  'Code is not valid!' => 'Кодът не е валиден!',
+  'Code:' => 'Код:',
+  'Date and time:' => 'Дата и час:',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => 'Деактивирайте двуфакторното удостоверяване (не се препоръчва)',
+  'Do you really want to request a new code?' => 'Наистина ли искате да заявите нов код?',
+  'Email' => 'Имейл',
+  'Enabled methods' => 'Активирани методи',
+  'Google Authenticator' => 'Google Удостоверител',
+  'Hello {displayName}!' => 'Здравейте, {displayName}!',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Инсталирайте приложение, което прилага алгоритъм за еднократна парола (TOTP), базиран на времето, като {googleAuthenticatorLink}, и го използвайте за сканиране на QR кода, показан по-долу.',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => 'Дължина на кода за проверка',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => 'Излез от профила си',
+  'Mandatory for the following groups' => 'Задължително за следните групи',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => 'Отворете приложението за двуфакторно удостоверяване на вашето устройство, за да видите кода си за удостоверяване и да потвърдите самоличността си.',
+  'Pin code' => 'ПИН код',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => 'Моля <strong> не забравяйте </strong> да актуализирате кода в приложението си за удостоверяване! Ако не го направите, няма да можете да влезете.',
+  'Please enter your verifying code.' => 'Моля, въведете вашия потвърждаващ код.',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => 'Заявете нов код',
+  'Secret:' => 'Парола:',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Този модул е деактивиран, тъй като не са избрани драйвери, но потребителите от наложените групи винаги се връщат към драйвера {defaultDriverName} по подразбиране.',
+  'Time based: Yes' => 'Въз основа на времето: Да',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => 'Еднократни пароли, базирани на времето (напр. Google Authenticator)',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'За да свържете приложението ръчно, предоставете следните подробности на приложението TOTP (напр. Google Authenticator).',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => 'Двуфакторно удостоверяване',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'Двуфакторното удостоверяване (2FA) осигурява допълнително ниво на сигурност за вашия акаунт. След като бъдете активирани, ще бъдете подканени да въведете код в допълнение към въвеждането на вашето потребителско име и парола.',
+  'Verify' => 'Проверете',
+  'Verifying code is not valid!' => 'Кодът за проверка не е валиден!',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => 'Вашият акаунт е защитен от двуфакторна система за удостоверяване. Моля, използвайте следния код, за да продължите.',
+  'Your login verification code' => 'Вашият код за потвърждение на вход',
 ];
diff --git a/messages/bg/config.php b/messages/bg/config.php
deleted file mode 100644
index cd7c5cd..0000000
--- a/messages/bg/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '<strong>Заявка</strong> за нов код',
-    '<strong>Two-Factor Authentication</strong> module configuration' => 'Конфигурация на модул за <strong>двуфакторно удостоверяване</strong>',
-    '<strong>Two-Factor Authentication</strong> settings' => 'Настройки за <strong>двуфакторно удостоверяване</strong>',
-    'Account:' => 'Акаунт:',
-    'Can\'t scan the code?' => 'Не можете да сканирате кода?',
-    'Do you really want to request a new code?' => 'Наистина ли искате да заявите нов код?',
-    'Enabled methods' => 'Активирани методи',
-    'Google Authenticator' => 'Google Удостоверител',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Инсталирайте приложение, което прилага алгоритъм за еднократна парола (TOTP), базиран на времето, като {googleAuthenticatorLink}, и го използвайте за сканиране на QR кода, показан по-долу.',
-    'Length of verifying code' => 'Дължина на кода за проверка',
-    'Mandatory for the following groups' => 'Задължително за следните групи',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => 'Моля <strong> не забравяйте </strong> да актуализирате кода в приложението си за удостоверяване! Ако не го направите, няма да можете да влезете.',
-    'Request new code' => 'Заявете нов код',
-    'Secret:' => 'Парола:',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Този модул е деактивиран, тъй като не са избрани драйвери, но потребителите от наложените групи винаги се връщат към драйвера {defaultDriverName} по подразбиране.',
-    'Time based: Yes' => 'Въз основа на времето: Да',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'За да свържете приложението ръчно, предоставете следните подробности на приложението TOTP (напр. Google Authenticator).',
-    'Two-Factor Authentication' => 'Двуфакторно удостоверяване',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'Двуфакторното удостоверяване (2FA) осигурява допълнително ниво на сигурност за вашия акаунт. След като бъдете активирани, ще бъдете подканени да въведете код в допълнение към въвеждането на вашето потребителско име и парола.',
-    'Default method for the mandatory groups' => '',
-    'Leave empty to disable this feature.' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Remember browser option amount of days' => '',
-    'Trusted networks list' => '',
-];
diff --git a/messages/br/base.php b/messages/br/base.php
index 105f1ef..412ecca 100644
--- a/messages/br/base.php
+++ b/messages/br/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Email' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => '',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => '',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/br/config.php b/messages/br/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/br/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/ca/base.php b/messages/ca/base.php
index f9b378b..da8483c 100644
--- a/messages/ca/base.php
+++ b/messages/ca/base.php
@@ -1,24 +1,47 @@
 <?php
-return array (
+return [
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
   '<strong>Two-factor</strong> authentication' => '',
   'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
   'Authentication method' => '',
+  'Can\'t scan the code?' => '',
   'Code' => 'Codi',
   'Code is not valid!' => '',
   'Code:' => '',
   'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
   'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
   'Email' => 'Correu electrònic',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
   'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
   'Log out' => 'Desconnectar',
+  'Mandatory for the following groups' => '',
   'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
   'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
   'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
   'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
   'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
   'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
   'Verify' => '',
   'Verifying code is not valid!' => '',
   'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
   'Your login verification code' => '',
-);
+];
diff --git a/messages/ca/config.php b/messages/ca/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/ca/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/cs/base.php b/messages/cs/base.php
index f8ec98e..4f3b11d 100644
--- a/messages/cs/base.php
+++ b/messages/cs/base.php
@@ -1,24 +1,47 @@
 <?php
-return array (
+return [
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
   '<strong>Two-factor</strong> authentication' => '',
   'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
   'Authentication method' => '',
+  'Can\'t scan the code?' => '',
   'Code' => 'Kód',
   'Code is not valid!' => '',
   'Code:' => '',
   'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
   'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
   'Email' => 'E-mail',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
   'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
   'Log out' => 'Odhlásit se',
+  'Mandatory for the following groups' => '',
   'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
   'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
   'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
   'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
   'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
   'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
   'Verify' => '',
   'Verifying code is not valid!' => '',
   'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
   'Your login verification code' => '',
-);
+];
diff --git a/messages/cs/config.php b/messages/cs/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/cs/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/cy/base.php b/messages/cy/base.php
index 105f1ef..412ecca 100644
--- a/messages/cy/base.php
+++ b/messages/cy/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Email' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => '',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => '',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/cy/config.php b/messages/cy/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/cy/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/da/base.php b/messages/da/base.php
index 4271dd1..c3a2d29 100644
--- a/messages/da/base.php
+++ b/messages/da/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    'Code' => 'Kode',
-    'Email' => 'E-mail',
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => 'Kode',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => 'E-mail',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/da/config.php b/messages/da/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/da/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/de/base.php b/messages/de/base.php
index 2f81657..edb7ecb 100644
--- a/messages/de/base.php
+++ b/messages/de/base.php
@@ -1,24 +1,47 @@
 <?php
-return array (
+return [
+  '<strong>Request</strong> new code' => 'Neuen Code <strong>anfordern</strong>',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '<strong>Zwei-Faktor-Authentifizierung</strong> Modulkonfiguration',
+  '<strong>Two-Factor Authentication</strong> settings' => '<strong>Zwei-Faktor-Authentifizierung</strong> Einstellungen',
   '<strong>Two-factor</strong> authentication' => '<strong>Zwei-Faktor</strong>-Authentifizierung',
   'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => 'Ein Bestätigungscode wurde soeben an Ihre E-Mail-Adresse gesendet. Bitte geben Sie den Code aus der E-Mail ein, um fortzufahren.',
+  'Account:' => 'Konto:',
   'Authentication method' => 'Authentifizierungsverfahren',
+  'Can\'t scan the code?' => 'Du kannst den Code nicht scannen?',
   'Code' => 'Code',
   'Code is not valid!' => 'Code ist ungültig!',
   'Code:' => 'Code:',
   'Date and time:' => 'Datum und Uhrzeit:',
+  'Default method for the mandatory groups' => 'Standardmethode für die obligatorischen Gruppen',
   'Disable two-factor authentication (not recommended)' => 'Zwei-Faktor-Authentifizierung deaktivieren (nicht empfohlen)',
+  'Do you really want to request a new code?' => 'Möchtest Du wirklich einen neuen Code anfordern?',
   'Email' => 'E-Mail',
+  'Enabled methods' => 'Aktivierte Methoden',
+  'Google Authenticator' => 'Google Authenticator',
   'Hello {displayName}!' => 'Hallo {displayName}!',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Installiere eine Anwendung/App, die einen zeitbasierten One-Time-Password-Algorithmus (TOTP) implementiert, z. B. {googleAuthenticatorLink}, und scanne damit den unten gezeigten QR-Code.',
+  'Leave empty to disable this feature.' => 'Leer lassen um die Funktion zu deaktivieren',
+  'Length of verifying code' => 'Länge des Verifizierungscodes',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'Liste von IP Adressen oder Subnetzen für die Whitelist. Deine derzeitige {0}. Nutze Komma getrennte Liste. z.B.: "{0}, 127.0.0.1"',
   'Log out' => 'Abmelden',
+  'Mandatory for the following groups' => 'Obligatorisch für die folgenden Gruppen',
   'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => 'Öffnen Sie die App zur Zwei-Faktor-Authentifizierung auf Ihrem Gerät, um Ihren Authentifizierungscode anzuzeigen und Ihre Identität zu überprüfen.',
   'Pin code' => 'Pin-Code',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => 'Bitte <strong>vergiss nicht</strong>, den Code in Ihrer Authenticator-App zu aktualisieren! Wenn Du dies nicht tust, kannst Du Dich nicht mehr anmelden.',
   'Please enter your verifying code.' => 'Bitte geben Sie Ihren Verifizierungscode ein.',
+  'Remember browser option amount of days' => 'Browser Vertrauen Option Tage',
   'Remember this browser for {0} days' => 'Diesem Gerät für {0} Tage vertrauen',
+  'Request new code' => 'Neuen Code anfordern',
+  'Secret:' => 'Secret:',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Dieses Modul ist deaktiviert, da keine Treiber ausgewählt sind, aber Benutzer aus den erzwungenen Gruppen greifen standardmäßig immer auf den Treiber {defaultDriverName} zurück.',
+  'Time based: Yes' => 'Zeitbasiert: Ja',
   'Time-based one-time passwords (e.g. Google Authenticator)' => 'Zeitbasierte Einmal-Passwörter (z. B. Google Authenticator)',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'Um die App manuell zu verbinden, gib bitte in der TOTP-App (z. B. Google Authenticator) die folgenden Details an.',
+  'Trusted networks list' => 'Vertraute Netzwerk Liste',
   'Two-Factor Authentication' => 'Zwei-Faktor-Authentifizierung',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'Die Zwei-Faktor-Authentifizierung (2FA) bietet eine zusätzliche Sicherheitsstufe für Dein Konto. Sobald sie aktiviert ist, wirst Du aufgefordert, zusätzlich zur Eingabe Deines Benutzernamens und Passworts einen Code einzugeben.',
   'Verify' => 'Prüfen',
   'Verifying code is not valid!' => 'Verifizierungscode ist nicht gültig!',
   'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => 'Ihr Konto ist durch ein Zwei-Faktor-Authentifizierungssystem gesichert. Bitte verwenden Sie den folgenden Code, um fortzufahren.',
   'Your login verification code' => 'Ihr Login-Verifizierungscode',
-);
+];
diff --git a/messages/de/config.php b/messages/de/config.php
deleted file mode 100644
index 004b76c..0000000
--- a/messages/de/config.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-return array (
-  '<strong>Request</strong> new code' => 'Neuen Code <strong>anfordern</strong>',
-  '<strong>Two-Factor Authentication</strong> module configuration' => '<strong>Zwei-Faktor-Authentifizierung</strong> Modulkonfiguration',
-  '<strong>Two-Factor Authentication</strong> settings' => '<strong>Zwei-Faktor-Authentifizierung</strong> Einstellungen',
-  'Account:' => 'Konto:',
-  'Can\'t scan the code?' => 'Du kannst den Code nicht scannen?',
-  'Default method for the mandatory groups' => 'Standardmethode für die obligatorischen Gruppen',
-  'Do you really want to request a new code?' => 'Möchtest Du wirklich einen neuen Code anfordern?',
-  'Enabled methods' => 'Aktivierte Methoden',
-  'Google Authenticator' => 'Google Authenticator',
-  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Installiere eine Anwendung/App, die einen zeitbasierten One-Time-Password-Algorithmus (TOTP) implementiert, z. B. {googleAuthenticatorLink}, und scanne damit den unten gezeigten QR-Code.',
-  'Leave empty to disable this feature.' => 'Leer lassen um die Funktion zu deaktivieren',
-  'Length of verifying code' => 'Länge des Verifizierungscodes',
-  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'Liste von IP Adressen oder Subnetzen für die Whitelist. Deine derzeitige {0}. Nutze Komma getrennte Liste. z.B.: "{0}, 127.0.0.1"',
-  'Mandatory for the following groups' => 'Obligatorisch für die folgenden Gruppen',
-  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => 'Bitte <strong>vergiss nicht</strong>, den Code in Ihrer Authenticator-App zu aktualisieren! Wenn Du dies nicht tust, kannst Du Dich nicht mehr anmelden.',
-  'Remember browser option amount of days' => 'Browser Vertrauen Option Tage',
-  'Request new code' => 'Neuen Code anfordern',
-  'Secret:' => 'Secret:',
-  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Dieses Modul ist deaktiviert, da keine Treiber ausgewählt sind, aber Benutzer aus den erzwungenen Gruppen greifen standardmäßig immer auf den Treiber {defaultDriverName} zurück.',
-  'Time based: Yes' => 'Zeitbasiert: Ja',
-  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'Um die App manuell zu verbinden, gib bitte in der TOTP-App (z. B. Google Authenticator) die folgenden Details an.',
-  'Trusted networks list' => 'Vertraute Netzwerk Liste',
-  'Two-Factor Authentication' => 'Zwei-Faktor-Authentifizierung',
-  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'Die Zwei-Faktor-Authentifizierung (2FA) bietet eine zusätzliche Sicherheitsstufe für Dein Konto. Sobald sie aktiviert ist, wirst Du aufgefordert, zusätzlich zur Eingabe Deines Benutzernamens und Passworts einen Code einzugeben.',
-);
diff --git a/messages/el/base.php b/messages/el/base.php
index a8ce0df..5414b89 100644
--- a/messages/el/base.php
+++ b/messages/el/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    'Code' => 'Κώδικας',
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Email' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => 'Κώδικας',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => '',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/el/config.php b/messages/el/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/el/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/es/base.php b/messages/es/base.php
index 91cd6bc..0896f23 100644
--- a/messages/es/base.php
+++ b/messages/es/base.php
@@ -1,24 +1,47 @@
 <?php
-return array (
+return [
+  '<strong>Request</strong> new code' => '<strong>Solicitar</strong> código nuevo',
+  '<strong>Two-Factor Authentication</strong> module configuration' => 'Configuración del módulo <strong>Autenticación de dos factores</strong>',
+  '<strong>Two-Factor Authentication</strong> settings' => 'Configuración de <strong>autenticación de dos factores</strong>',
   '<strong>Two-factor</strong> authentication' => 'Autenticación de <strong>dos factores</strong>',
   'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => 'Se acaba de enviar un código de confirmación a su dirección de correo electrónico. Ingrese el código del correo electrónico para continuar.',
+  'Account:' => 'Cuenta:',
   'Authentication method' => 'Método de autentificación',
+  'Can\'t scan the code?' => '¿No puedes escanear el código?',
   'Code' => 'Código',
   'Code is not valid!' => '¡El código no es válido!',
   'Code:' => 'Código:',
   'Date and time:' => 'Fecha y hora:',
+  'Default method for the mandatory groups' => 'Método por defecto para los grupos obligatorios',
   'Disable two-factor authentication (not recommended)' => 'Desactivar autenticación de dos factores (no se recomienda)',
+  'Do you really want to request a new code?' => '¿Realmente quieres solicitar un nuevo código?',
   'Email' => 'Correo electrónico',
+  'Enabled methods' => 'Métodos habilitados',
+  'Google Authenticator' => 'Google Authenticator',
   'Hello {displayName}!' => '¡Hola {displayName}!',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Instala una aplicación que implemente el algoritmo de una clave de un solo uso basada en tiempo (TOTP), como {googleAuthenticatorLink}, y utilízala para escanear el código QR que se muestra debajo.',
+  'Leave empty to disable this feature.' => 'Dejar vacío para deshabilitar esta característica',
+  'Length of verifying code' => 'Longitud del código de verificación',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'Lista de subredes IP para incluir en la lista blanca, actualmente la tuya es {0}. Utilizar la coma como separador para crear una lista, por ejemplo: "{0}, 127.0.0.1"',
   'Log out' => 'Cerrar sesión',
+  'Mandatory for the following groups' => 'Obligatorio para los siguientes grupos',
   'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => 'Abre la aplicación de autenticación en dos factores (2FA) en tu dispositivo para visualizar tu código de autenticación y verificar tu identidad.',
   'Pin code' => 'Código pin',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '<strong>No olvide</strong> actualizar el código en su aplicación de autenticación. Si no lo hace, no podrá iniciar sesión.',
   'Please enter your verifying code.' => 'Por favor ingresa tu código de verificación.',
+  'Remember browser option amount of days' => 'Número de días que se recuerda un navegador',
   'Remember this browser for {0} days' => 'Recuerda este navegador durante {0} días',
+  'Request new code' => 'Solicitar nuevo código',
+  'Secret:' => 'Secreto:',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Este módulo está deshabilitado porque no se seleccionan controladores; sin embargo, los usuarios de los grupos obligados siempre recurren al controlador {defaultDriverName} de forma predeterminada.',
+  'Time based: Yes' => 'Basado en tiempo: sí',
   'Time-based one-time passwords (e.g. Google Authenticator)' => 'Contraseñas de un solo uso basadas en el tiempo (por ejemplo, Google Authenticator)',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'Para conectar la aplicación manualmente, proporcione los siguientes detalles a la aplicación TOTP (por ejemplo, Google Authenticator).',
+  'Trusted networks list' => 'Lista de redes confiables',
   'Two-Factor Authentication' => 'Autenticación de dos factores',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'La autenticación de dos factores (2FA) proporciona un nivel adicional de seguridad para su cuenta. Una vez habilitado, se le pedirá que ingrese un código además de ingresar su nombre de usuario y contraseña.',
   'Verify' => 'Verificar',
   'Verifying code is not valid!' => '¡El código de verificación no es válido!',
   'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => 'Su cuenta está protegida por un sistema de autenticación de dos factores. Utilice el siguiente código para continuar.',
   'Your login verification code' => 'Su código de verificación de inicio de sesión',
-);
+];
diff --git a/messages/es/config.php b/messages/es/config.php
deleted file mode 100644
index 9278dd2..0000000
--- a/messages/es/config.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-return array (
-  '<strong>Request</strong> new code' => '<strong>Solicitar</strong> código nuevo',
-  '<strong>Two-Factor Authentication</strong> module configuration' => 'Configuración del módulo <strong>Autenticación de dos factores</strong>',
-  '<strong>Two-Factor Authentication</strong> settings' => 'Configuración de <strong>autenticación de dos factores</strong>',
-  'Account:' => 'Cuenta:',
-  'Can\'t scan the code?' => '¿No puedes escanear el código?',
-  'Default method for the mandatory groups' => 'Método por defecto para los grupos obligatorios',
-  'Do you really want to request a new code?' => '¿Realmente quieres solicitar un nuevo código?',
-  'Enabled methods' => 'Métodos habilitados',
-  'Google Authenticator' => 'Google Authenticator',
-  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Instala una aplicación que implemente el algoritmo de una clave de un solo uso basada en tiempo (TOTP), como {googleAuthenticatorLink}, y utilízala para escanear el código QR que se muestra debajo.',
-  'Leave empty to disable this feature.' => 'Dejar vacío para deshabilitar esta característica',
-  'Length of verifying code' => 'Longitud del código de verificación',
-  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'Lista de subredes IP para incluir en la lista blanca, actualmente la tuya es {0}. Utilizar la coma como separador para crear una lista, por ejemplo: "{0}, 127.0.0.1"',
-  'Mandatory for the following groups' => 'Obligatorio para los siguientes grupos',
-  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '<strong>No olvide</strong> actualizar el código en su aplicación de autenticación. Si no lo hace, no podrá iniciar sesión.',
-  'Remember browser option amount of days' => 'Número de días que se recuerda un navegador',
-  'Request new code' => 'Solicitar nuevo código',
-  'Secret:' => 'Secreto:',
-  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Este módulo está deshabilitado porque no se seleccionan controladores; sin embargo, los usuarios de los grupos obligados siempre recurren al controlador {defaultDriverName} de forma predeterminada.',
-  'Time based: Yes' => 'Basado en tiempo: sí',
-  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'Para conectar la aplicación manualmente, proporcione los siguientes detalles a la aplicación TOTP (por ejemplo, Google Authenticator).',
-  'Trusted networks list' => 'Lista de redes confiables',
-  'Two-Factor Authentication' => 'Autenticación de dos factores',
-  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'La autenticación de dos factores (2FA) proporciona un nivel adicional de seguridad para su cuenta. Una vez habilitado, se le pedirá que ingrese un código además de ingresar su nombre de usuario y contraseña.',
-);
diff --git a/messages/et/base.php b/messages/et/base.php
index 105f1ef..412ecca 100644
--- a/messages/et/base.php
+++ b/messages/et/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Email' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => '',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => '',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/et/config.php b/messages/et/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/et/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/eu/base.php b/messages/eu/base.php
index 54050fd..217003d 100644
--- a/messages/eu/base.php
+++ b/messages/eu/base.php
@@ -1,24 +1,47 @@
 <?php
-return array (
+return [
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
   '<strong>Two-factor</strong> authentication' => '',
   'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
   'Authentication method' => '',
+  'Can\'t scan the code?' => '',
   'Code' => 'Kodea',
   'Code is not valid!' => '',
   'Code:' => '',
   'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
   'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
   'Email' => '',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
   'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
   'Log out' => '',
+  'Mandatory for the following groups' => '',
   'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
   'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
   'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
   'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
   'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
   'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
   'Verify' => '',
   'Verifying code is not valid!' => '',
   'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
   'Your login verification code' => '',
-);
+];
diff --git a/messages/eu/config.php b/messages/eu/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/eu/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/fa-IR/base.php b/messages/fa-IR/base.php
index 3cb19cb..a7c1751 100644
--- a/messages/fa-IR/base.php
+++ b/messages/fa-IR/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    'Code' => 'کد',
-    'Email' => 'ايميل',
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => 'کد',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => 'ايميل',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/fa-IR/config.php b/messages/fa-IR/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/fa-IR/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/fi/base.php b/messages/fi/base.php
index 358d315..c8ac941 100644
--- a/messages/fi/base.php
+++ b/messages/fi/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    'Code' => 'Koodi',
-    'Email' => 'Sähköposti',
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => 'Koodi',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => 'Sähköposti',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/fi/config.php b/messages/fi/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/fi/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/fr/base.php b/messages/fr/base.php
index dfd11ad..856d23b 100644
--- a/messages/fr/base.php
+++ b/messages/fr/base.php
@@ -1,24 +1,47 @@
 <?php
-return array (
+return [
+  '<strong>Request</strong> new code' => '<strong>Demander un</strong> nouveau code',
+  '<strong>Two-Factor Authentication</strong> module configuration' => 'Configuration du module d\'<strong>authentification à deux facteurs</strong>',
+  '<strong>Two-Factor Authentication</strong> settings' => 'Paramètres de l\'<strong>authentification à deux facteurs</strong>',
   '<strong>Two-factor</strong> authentication' => 'Authentification à <strong>deux facteurs</strong>',
   'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => 'Un code de confirmation vient d\'être envoyé à votre adresse e-mail. Veuillez saisir le code trouvé dans l\'e-mail pour continuer.',
+  'Account:' => 'Compte :',
   'Authentication method' => 'Méthode d\'authentification',
+  'Can\'t scan the code?' => 'Vous ne pouvez pas scanner le code ?',
   'Code' => 'Code',
   'Code is not valid!' => 'Le code n\'est pas valide !',
   'Code:' => 'Code :',
   'Date and time:' => 'Date et heure :',
+  'Default method for the mandatory groups' => 'Méthode par défaut pour les groupes obligatoires',
   'Disable two-factor authentication (not recommended)' => 'Désactiver l\'authentification à deux facteurs (non recommandé)',
+  'Do you really want to request a new code?' => 'Voulez-vous vraiment demander un nouveau code ?',
   'Email' => 'E-mail',
+  'Enabled methods' => 'Méthodes activées',
+  'Google Authenticator' => 'Authentificateur Google',
   'Hello {displayName}!' => 'Bonjour {displayName} !',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Installez une application qui implémente un algorithme de mot de passe à usage unique basé sur le temps (TOTP), tel que par exemple {googleAuthenticatorLink}, et utilisez-la pour scanner le code QR affiché ci-dessous.',
+  'Leave empty to disable this feature.' => 'Laissez le champ vide pour désactiver cette fonction.',
+  'Length of verifying code' => 'Longueur du code de vérification',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'Liste des adresses IP ou des sous-réseaux à autoriser, le vôtre est actuellement {0}. Séparez les éléments par des virgules pour créer une liste, par exemple : "{0}, 127.0.0.1"',
   'Log out' => 'Se déconnecter',
+  'Mandatory for the following groups' => 'Obligatoire pour les groupes suivants',
   'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => 'Ouvrez l\'application d\'authentification à deux facteurs sur votre appareil pour afficher votre code d\'authentification et vérifier votre identité.',
   'Pin code' => 'Code PIN',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => 'Merci de <strong>ne pas oublier</strong> de mettre à jour le code dans votre application d\'authentification ! Si vous ne le faites pas, vous ne pourrez pas vous connecter.',
   'Please enter your verifying code.' => 'Veuillez saisir votre code de vérification.',
+  'Remember browser option amount of days' => 'Nombre de jours pour l’option « Se souvenir de ce navigateur »',
   'Remember this browser for {0} days' => 'Se souvenir de ce navigateur pour {0} jours',
+  'Request new code' => 'Demander un nouveau code',
+  'Secret:' => 'Code secret :',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Ce module est désactivé car aucun pilote n\'est sélectionné. Cependant, les utilisateurs des groupes concernés retombent toujours sur le pilote {defaultDriverName} par défaut.',
+  'Time based: Yes' => 'Basé sur le temps : Oui',
   'Time-based one-time passwords (e.g. Google Authenticator)' => 'Mots de passe à usage unique basés sur le temps (par exemple, Google Authenticator)',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'Pour connecter l\'application manuellement, fournissez les détails suivants à l\'application TOTP (par exemple, Google Authenticator).',
+  'Trusted networks list' => 'Liste des réseaux de confiance',
   'Two-Factor Authentication' => 'Authentification à deux facteurs',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'L’authentification à deux facteurs (2FA) offre un niveau de sécurité supplémentaire pour votre compte. Une fois celle-ci activée, vous serez invité·e à saisir un code en plus de saisir votre identifiant et votre mot de passe.',
   'Verify' => 'Vérifier',
   'Verifying code is not valid!' => 'Le code de vérification n\'est pas valide !',
   'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => 'Votre compte est sécurisé par un système d\'authentification à deux facteurs. Veuillez utiliser le code suivant pour continuer.',
   'Your login verification code' => 'Votre code de vérification de connexion',
-);
+];
diff --git a/messages/fr/config.php b/messages/fr/config.php
deleted file mode 100644
index 4f311df..0000000
--- a/messages/fr/config.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-return array (
-  '<strong>Request</strong> new code' => '<strong>Demander un</strong> nouveau code',
-  '<strong>Two-Factor Authentication</strong> module configuration' => 'Configuration du module d\'<strong>authentification à deux facteurs</strong>',
-  '<strong>Two-Factor Authentication</strong> settings' => 'Paramètres de l\'<strong>authentification à deux facteurs</strong>',
-  'Account:' => 'Compte :',
-  'Can\'t scan the code?' => 'Vous ne pouvez pas scanner le code ?',
-  'Default method for the mandatory groups' => 'Méthode par défaut pour les groupes obligatoires',
-  'Do you really want to request a new code?' => 'Voulez-vous vraiment demander un nouveau code ?',
-  'Enabled methods' => 'Méthodes activées',
-  'Google Authenticator' => 'Authentificateur Google',
-  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Installez une application qui implémente un algorithme de mot de passe à usage unique basé sur le temps (TOTP), tel que par exemple {googleAuthenticatorLink}, et utilisez-la pour scanner le code QR affiché ci-dessous.',
-  'Leave empty to disable this feature.' => 'Laissez le champ vide pour désactiver cette fonction.',
-  'Length of verifying code' => 'Longueur du code de vérification',
-  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'Liste des adresses IP ou des sous-réseaux à autoriser, le vôtre est actuellement {0}. Séparez les éléments par des virgules pour créer une liste, par exemple : "{0}, 127.0.0.1"',
-  'Mandatory for the following groups' => 'Obligatoire pour les groupes suivants',
-  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => 'Merci de <strong>ne pas oublier</strong> de mettre à jour le code dans votre application d\'authentification ! Si vous ne le faites pas, vous ne pourrez pas vous connecter.',
-  'Remember browser option amount of days' => 'Nombre de jours pour l’option « Se souvenir de ce navigateur »',
-  'Request new code' => 'Demander un nouveau code',
-  'Secret:' => 'Code secret :',
-  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Ce module est désactivé car aucun pilote n\'est sélectionné. Cependant, les utilisateurs des groupes concernés retombent toujours sur le pilote {defaultDriverName} par défaut.',
-  'Time based: Yes' => 'Basé sur le temps : Oui',
-  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'Pour connecter l\'application manuellement, fournissez les détails suivants à l\'application TOTP (par exemple, Google Authenticator).',
-  'Trusted networks list' => 'Liste des réseaux de confiance',
-  'Two-Factor Authentication' => 'Authentification à deux facteurs',
-  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'L’authentification à deux facteurs (2FA) offre un niveau de sécurité supplémentaire pour votre compte. Une fois celle-ci activée, vous serez invité·e à saisir un code en plus de saisir votre identifiant et votre mot de passe.',
-);
diff --git a/messages/he/base.php b/messages/he/base.php
index 105f1ef..412ecca 100644
--- a/messages/he/base.php
+++ b/messages/he/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Email' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => '',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => '',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/he/config.php b/messages/he/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/he/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/hr/base.php b/messages/hr/base.php
index ed2f061..9ec1abd 100644
--- a/messages/hr/base.php
+++ b/messages/hr/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    'Code' => 'Kod',
-    'Email' => 'Email',
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => 'Kod',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => 'Email',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/hr/config.php b/messages/hr/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/hr/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/ht/base.php b/messages/ht/base.php
index 75de7d0..597519c 100644
--- a/messages/ht/base.php
+++ b/messages/ht/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    'Code' => 'Kòd',
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Email' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => 'Kòd',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => '',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/ht/config.php b/messages/ht/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/ht/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/hu/base.php b/messages/hu/base.php
index e72646e..5f71c6d 100644
--- a/messages/hu/base.php
+++ b/messages/hu/base.php
@@ -1,24 +1,47 @@
 <?php
-return array (
+return [
+  '<strong>Request</strong> new code' => 'Új kód <strong>igénylése</strong>',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '<strong>Kétlépcsős azonosítás</strong> modul konfigurálás',
+  '<strong>Two-Factor Authentication</strong> settings' => '<strong>Kétlépcsős azonosítás</strong> beállítások',
   '<strong>Two-factor</strong> authentication' => '<strong>Kétfaktoros</strong> hitelesítés',
   'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => 'Egy megerősítő kód lett elküldve az e-mail címedre. Kérjük, add meg az e-mailben található kódot a folytatáshoz.',
+  'Account:' => 'Fiók:',
   'Authentication method' => 'Hitelesítési módszer',
+  'Can\'t scan the code?' => 'Nem tudod beolvasni a kódot?',
   'Code' => 'Kód',
   'Code is not valid!' => 'A kód nem érvényes!',
   'Code:' => 'Kód:',
   'Date and time:' => 'Dátum és idő:',
+  'Default method for the mandatory groups' => 'A kötelező csoportok alapértelmezett módszere',
   'Disable two-factor authentication (not recommended)' => 'Kétfaktoros hitelesítés kikapcsolása (nem ajánlott)',
+  'Do you really want to request a new code?' => 'Biztosan szeretnél új kódot kérni?',
   'Email' => 'E-mail',
+  'Enabled methods' => 'Engedélyezett módszerek',
+  'Google Authenticator' => 'Google Authenticator',
   'Hello {displayName}!' => 'Szia {displayName}!',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Telepíts egy olyan alkalmazást, amely "időalapú egyszeri jelszó" (TOTP) algoritmust használ, ilyen például a {googleAuthenticatorLink}, ezzel olvasd be az alább látható QR-kódot.',
+  'Leave empty to disable this feature.' => 'Hagyja üresen a funkció letiltásához.',
+  'Length of verifying code' => 'Visszaigazoló kód hossza',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'Az engedélyezőlistán szereplő IP-címek vagy alhálózatok listája, jelenleg az Öné {0}. Használjon kóma elválasztót a lista létrehozásához, például: "{0}, 127.0.0.1"',
   'Log out' => 'Kijelentkezés',
+  'Mandatory for the following groups' => 'A következő csoportok számára kötelező',
   'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => 'Nyisd meg eszközödön a kétfaktoros hitelesítési alkalmazást a kód megtekintéséhez és igazold vissza a személyazonosságodat.',
   'Pin code' => 'Pinkód',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => 'Kérjük, <strong>ne felejtsd el</strong> frissíteni a kódot a hitelesítő alkalmazásban! Ha nem teszel így, akkor nem fogsz tudni bejelentkezni.',
   'Please enter your verifying code.' => 'Kérjük, írd be az ellenőrző kódot.',
+  'Remember browser option amount of days' => 'Emlékezzen a böngészőbeállítások napszámára',
   'Remember this browser for {0} days' => 'Emlékezzen erre a böngészőre {0} napig',
+  'Request new code' => 'Új kód kérése',
+  'Secret:' => 'Titkos:',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Ez a modul le van tiltva, mert nincsenek kiválasztva vezetők, azonban a kényszerített csoportok felhasználói alapértelmezés szerint mindig a(z) {defaultDriverName} vezetőre állnak vissza.',
+  'Time based: Yes' => 'Időalapú: Igen',
   'Time-based one-time passwords (e.g. Google Authenticator)' => 'Időalapú egyszeri jelszavak (pl.: Google Authenticator)',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'Az alkalmazás manuális csatlakoztatásához add meg a következő részleteket a TOTP alkalmazáshoz (pl.: Google Authenticator).',
+  'Trusted networks list' => 'Megbízható hálózatok listája',
   'Two-Factor Authentication' => 'Kétfaktoros hitelesítés',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'A kétlépcsős azonosítás (2FA) nagyobb biztonságot nyújt a fiókod számára. Az engedélyezés után a rendszer kéri a kód megadását a felhasználónév és jelszó azonosítása után.',
   'Verify' => 'Igazolás',
   'Verifying code is not valid!' => 'A kód ellenőrzése érvénytelen!',
   'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => 'Fiókodat kétfaktoros hitelesítési rendszer biztosítja. A folytatáshoz használd a következő kódot.',
   'Your login verification code' => 'Bejelentkezési ellenőrző kódod',
-);
+];
diff --git a/messages/hu/config.php b/messages/hu/config.php
deleted file mode 100644
index 1588356..0000000
--- a/messages/hu/config.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-return array (
-  '<strong>Request</strong> new code' => 'Új kód <strong>igénylése</strong>',
-  '<strong>Two-Factor Authentication</strong> module configuration' => '<strong>Kétlépcsős azonosítás</strong> modul konfigurálás',
-  '<strong>Two-Factor Authentication</strong> settings' => '<strong>Kétlépcsős azonosítás</strong> beállítások',
-  'Account:' => 'Fiók:',
-  'Can\'t scan the code?' => 'Nem tudod beolvasni a kódot?',
-  'Default method for the mandatory groups' => 'A kötelező csoportok alapértelmezett módszere',
-  'Do you really want to request a new code?' => 'Biztosan szeretnél új kódot kérni?',
-  'Enabled methods' => 'Engedélyezett módszerek',
-  'Google Authenticator' => 'Google Authenticator',
-  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Telepíts egy olyan alkalmazást, amely "időalapú egyszeri jelszó" (TOTP) algoritmust használ, ilyen például a {googleAuthenticatorLink}, ezzel olvasd be az alább látható QR-kódot.',
-  'Leave empty to disable this feature.' => 'Hagyja üresen a funkció letiltásához.',
-  'Length of verifying code' => 'Visszaigazoló kód hossza',
-  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'Az engedélyezőlistán szereplő IP-címek vagy alhálózatok listája, jelenleg az Öné {0}. Használjon kóma elválasztót a lista létrehozásához, például: "{0}, 127.0.0.1"',
-  'Mandatory for the following groups' => 'A következő csoportok számára kötelező',
-  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => 'Kérjük, <strong>ne felejtsd el</strong> frissíteni a kódot a hitelesítő alkalmazásban! Ha nem teszel így, akkor nem fogsz tudni bejelentkezni.',
-  'Remember browser option amount of days' => 'Emlékezzen a böngészőbeállítások napszámára',
-  'Request new code' => 'Új kód kérése',
-  'Secret:' => 'Titkos:',
-  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Ez a modul le van tiltva, mert nincsenek kiválasztva vezetők, azonban a kényszerített csoportok felhasználói alapértelmezés szerint mindig a(z) {defaultDriverName} vezetőre állnak vissza.',
-  'Time based: Yes' => 'Időalapú: Igen',
-  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'Az alkalmazás manuális csatlakoztatásához add meg a következő részleteket a TOTP alkalmazáshoz (pl.: Google Authenticator).',
-  'Trusted networks list' => 'Megbízható hálózatok listája',
-  'Two-Factor Authentication' => 'Kétlépcsős azonosítás',
-  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'A kétlépcsős azonosítás (2FA) nagyobb biztonságot nyújt a fiókod számára. Az engedélyezés után a rendszer kéri a kód megadását a felhasználónév és jelszó azonosítása után.',
-);
diff --git a/messages/id/base.php b/messages/id/base.php
index 105f1ef..412ecca 100644
--- a/messages/id/base.php
+++ b/messages/id/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Email' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => '',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => '',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/id/config.php b/messages/id/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/id/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/it/base.php b/messages/it/base.php
index 4c50cf0..8501e10 100644
--- a/messages/it/base.php
+++ b/messages/it/base.php
@@ -1,24 +1,47 @@
 <?php
-return array (
+return [
+  '<strong>Request</strong> new code' => '<strong>Richiedi</strong> nuovo codice',
+  '<strong>Two-Factor Authentication</strong> module configuration' => 'Configurazione del modulo <strong>Autenticazione a due fattori</strong>',
+  '<strong>Two-Factor Authentication</strong> settings' => 'Impostazioni <strong>Autenticazione a due fattori</strong>',
   '<strong>Two-factor</strong> authentication' => 'Autenticazione <strong>a due fattori</strong>',
   'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => 'Un codice di conferma è stato appena inviato al tuo indirizzo email. Si prega di inserire il codice contenuto nella mail ricevuta per procedere.',
+  'Account:' => 'Account:',
   'Authentication method' => 'Metodo di autenticazione',
+  'Can\'t scan the code?' => 'Non riesci a scansionare il codice?',
   'Code' => 'Codice',
   'Code is not valid!' => 'Il codice non è valido!',
   'Code:' => 'Codice:',
   'Date and time:' => 'Data e ora:',
+  'Default method for the mandatory groups' => 'Metodo predefinito per i gruppi obbligatori',
   'Disable two-factor authentication (not recommended)' => 'Disabilita l\'autenticazione a due fattori (non consigliato)',
+  'Do you really want to request a new code?' => 'Vuoi davvero richiedere un nuovo codice?',
   'Email' => 'Email',
+  'Enabled methods' => 'Metodi abilitati',
+  'Google Authenticator' => 'Google Authenticator Google',
   'Hello {displayName}!' => 'Buongiorno {displayName}!',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Installa un\'applicazione che implementa un algoritmo di password monouso (TOTP) basato sul tempo, come {googleAuthenticatorLink}, e usala per scansionare il codice QR mostrato di seguito.',
+  'Leave empty to disable this feature.' => 'Lascia vuoto per disabilitare questa caratteristica',
+  'Length of verifying code' => 'Lunghezza del codice di verifica',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'Elenco degli IP o delle sotto-reti da inserire in whitelist, atualmente la tua è {0}. Usa una virgola per separare gli elementi della lista da creare, esempio:  "{0}, 127.0.0.1"',
   'Log out' => 'Esci',
+  'Mandatory for the following groups' => 'Obbligatorio per i seguenti gruppi',
   'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => 'Apri l\'app di autenticazione a due fattori sul tuo dispositivo per visualizzare il codice di autenticazione e verificare la tua identità.',
   'Pin code' => 'Codice PIN',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => 'Per favore <strong>non dimenticare</strong> di aggiornare il codice nella tua app di autenticazione! Se non lo fai, non sarai in grado di accedere.',
   'Please enter your verifying code.' => 'Inserisci il tuo codice di verifica.',
+  'Remember browser option amount of days' => 'Ricorda il numero dei giorni dell\'opzione del browser',
   'Remember this browser for {0} days' => 'Ricorda questo browser per {0} giorni',
+  'Request new code' => 'Richiedi nuovo codice',
+  'Secret:' => 'Segreto:',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Questo modulo è disabilitato perché non è selezionato alcun driver, tuttavia gli utenti dei gruppi applicati eseguono sempre il fallback al driver {defaultDriverName} per impostazione predefinita.',
+  'Time based: Yes' => 'Basato sul tempo: Sì',
   'Time-based one-time passwords (e.g. Google Authenticator)' => 'Password monouso temporanea  (ad es. Google Authenticator)',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'Per connettere l\'app manualmente, fornire i seguenti dettagli all\'app TOTP (ad es. Google Authenticator).',
+  'Trusted networks list' => 'Elenco delle reti affidabili',
   'Two-Factor Authentication' => 'Autenticazione a due fattori',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'L\'autenticazione a due fattori (2FA) fornisce un ulteriore livello di sicurezza per il tuo account. Una volta abilitato, ti verrà richiesto di inserire un codice oltre a inserire nome utente e password.',
   'Verify' => 'Verifica',
   'Verifying code is not valid!' => 'Il codice di verifica non è valido!',
   'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => 'Il tuo account è protetto da un sistema di autenticazione a due fattori. Si prega di utilizzare il seguente codice per procedere.',
   'Your login verification code' => 'Il tuo codice di verifica per accedere',
-);
+];
diff --git a/messages/it/config.php b/messages/it/config.php
deleted file mode 100644
index 0d008fa..0000000
--- a/messages/it/config.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-return array (
-  '<strong>Request</strong> new code' => '<strong>Richiedi</strong> nuovo codice',
-  '<strong>Two-Factor Authentication</strong> module configuration' => 'Configurazione del modulo <strong>Autenticazione a due fattori</strong>',
-  '<strong>Two-Factor Authentication</strong> settings' => 'Impostazioni <strong>Autenticazione a due fattori</strong>',
-  'Account:' => 'Account:',
-  'Can\'t scan the code?' => 'Non riesci a scansionare il codice?',
-  'Default method for the mandatory groups' => 'Metodo predefinito per i gruppi obbligatori',
-  'Do you really want to request a new code?' => 'Vuoi davvero richiedere un nuovo codice?',
-  'Enabled methods' => 'Metodi abilitati',
-  'Google Authenticator' => 'Google Authenticator Google',
-  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Installa un\'applicazione che implementa un algoritmo di password monouso (TOTP) basato sul tempo, come {googleAuthenticatorLink}, e usala per scansionare il codice QR mostrato di seguito.',
-  'Leave empty to disable this feature.' => 'Lascia vuoto per disabilitare questa caratteristica',
-  'Length of verifying code' => 'Lunghezza del codice di verifica',
-  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'Elenco degli IP o delle sotto-reti da inserire in whitelist, atualmente la tua è {0}. Usa una virgola per separare gli elementi della lista da creare, esempio:  "{0}, 127.0.0.1"',
-  'Mandatory for the following groups' => 'Obbligatorio per i seguenti gruppi',
-  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => 'Per favore <strong>non dimenticare</strong> di aggiornare il codice nella tua app di autenticazione! Se non lo fai, non sarai in grado di accedere.',
-  'Remember browser option amount of days' => 'Ricorda il numero dei giorni dell\'opzione del browser',
-  'Request new code' => 'Richiedi nuovo codice',
-  'Secret:' => 'Segreto:',
-  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Questo modulo è disabilitato perché non è selezionato alcun driver, tuttavia gli utenti dei gruppi applicati eseguono sempre il fallback al driver {defaultDriverName} per impostazione predefinita.',
-  'Time based: Yes' => 'Basato sul tempo: Sì',
-  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'Per connettere l\'app manualmente, fornire i seguenti dettagli all\'app TOTP (ad es. Google Authenticator).',
-  'Trusted networks list' => 'Elenco delle reti affidabili',
-  'Two-Factor Authentication' => 'Autenticazione a due passaggi',
-  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'L\'autenticazione a due fattori (2FA) fornisce un ulteriore livello di sicurezza per il tuo account. Una volta abilitato, ti verrà richiesto di inserire un codice oltre a inserire nome utente e password.',
-);
diff --git a/messages/ja/base.php b/messages/ja/base.php
index b75be15..8be2119 100644
--- a/messages/ja/base.php
+++ b/messages/ja/base.php
@@ -1,24 +1,47 @@
 <?php
-return array (
+return [
+  '<strong>Request</strong> new code' => '新しいコードの <strong>リクエスト</strong>',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '<strong>二段階認証</strong> モジュールの構成',
+  '<strong>Two-Factor Authentication</strong> settings' => '<strong>二段階認証</strong> の設定',
   '<strong>Two-factor</strong> authentication' => '<strong>二段階</strong> 認証',
   'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '確認コードがあなたのメール アドレスに送信されました。続行するにはメールに記載されているコードを入力してください。',
+  'Account:' => 'アカウント：',
   'Authentication method' => '認証方法',
+  'Can\'t scan the code?' => 'コードをスキャンできませんか？',
   'Code' => 'コード',
   'Code is not valid!' => 'コードが無効です！',
   'Code:' => 'コード：',
   'Date and time:' => '日時：',
+  'Default method for the mandatory groups' => '必須グループのデフォルトの方法',
   'Disable two-factor authentication (not recommended)' => '二段階認証を無効にする (非推奨)',
+  'Do you really want to request a new code?' => '本当に新しいコードをリクエストしますか？',
   'Email' => 'メール',
+  'Enabled methods' => '有効なメソッド',
+  'Google Authenticator' => 'Google認証システム',
   'Hello {displayName}!' => '{displayName}さん、こんにちは！',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '{googleAuthenticatorLink} などの時間ベースのワンタイム パスワード (TOTP) アルゴリズムを実装するアプリケーションをインストールし、それを使用して以下に示す QRコードをスキャンします。',
+  'Leave empty to disable this feature.' => 'この機能を無効にするには、空のままにします。',
+  'Length of verifying code' => '検証コードの長さ',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'ホワイトリストに登録する IP またはサブネットのリスト。現在、あなたのものは {0} です。カンマ区切りを使用してリストを作成します。例： "{0}, 127.0.0.1"',
   'Log out' => 'ログアウト',
+  'Mandatory for the following groups' => '以下の団体は必須',
   'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => 'デバイスで 二段階認証アプリを開き、認証コードを表示して身元を確認します。',
   'Pin code' => 'ピンコード',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '認証アプリのコードを<strong>忘れずに</strong>更新してください。そうしないとログインできません。',
   'Please enter your verifying code.' => '確認コードを入力してください。',
+  'Remember browser option amount of days' => 'ブラウザ オプションの日数を記憶する',
   'Remember this browser for {0} days' => 'このブラウザを {0} 日間記憶する',
+  'Request new code' => '新しいコードをリクエストする',
+  'Secret:' => 'シークレット：',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'ドライバーが選択されていない為、このモジュールは無効になっていますが、強制グループのユーザーは常にデフォルトで {defaultDriverName} ドライバーにフォールバックします。',
+  'Time based: Yes' => '時間ベース：YES',
   'Time-based one-time passwords (e.g. Google Authenticator)' => '時間ベースのワンタイム パスワード (Google Authenticator など)',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'アプリを手動で接続するには、次の詳細を TOTPアプリ (Google Authenticator など) に提供します。',
+  'Trusted networks list' => '信頼できるネットワーク リスト',
   'Two-Factor Authentication' => '二段階認証',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '二段階認証 (2FA) は、アカウントのセキュリティ レベルを強化します。有効にするとユーザー名とパスワードの入力に加えて、コードの入力を求めるプロンプトが表示されます。',
   'Verify' => '検証',
   'Verifying code is not valid!' => '検証コードが無効です！',
   'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => 'あなたのアカウントは二段階認証システムによって保護されています。続行するには次のコードを使用してください。',
   'Your login verification code' => 'ログイン認証コード',
-);
+];
diff --git a/messages/ja/config.php b/messages/ja/config.php
deleted file mode 100644
index bb8ee95..0000000
--- a/messages/ja/config.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-return array (
-  '<strong>Request</strong> new code' => '新しいコードの <strong>リクエスト</strong>',
-  '<strong>Two-Factor Authentication</strong> module configuration' => '<strong>二段階認証</strong> モジュールの構成',
-  '<strong>Two-Factor Authentication</strong> settings' => '<strong>二段階認証</strong> の設定',
-  'Account:' => 'アカウント：',
-  'Can\'t scan the code?' => 'コードをスキャンできませんか？',
-  'Default method for the mandatory groups' => '必須グループのデフォルトの方法',
-  'Do you really want to request a new code?' => '本当に新しいコードをリクエストしますか？',
-  'Enabled methods' => '有効なメソッド',
-  'Google Authenticator' => 'Google認証システム',
-  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '{googleAuthenticatorLink} などの時間ベースのワンタイム パスワード (TOTP) アルゴリズムを実装するアプリケーションをインストールし、それを使用して以下に示す QRコードをスキャンします。',
-  'Leave empty to disable this feature.' => 'この機能を無効にするには、空のままにします。',
-  'Length of verifying code' => '検証コードの長さ',
-  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'ホワイトリストに登録する IP またはサブネットのリスト。現在、あなたのものは {0} です。カンマ区切りを使用してリストを作成します。例： "{0}, 127.0.0.1"',
-  'Mandatory for the following groups' => '以下の団体は必須',
-  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '認証アプリのコードを<strong>忘れずに</strong>更新してください。そうしないとログインできません。',
-  'Remember browser option amount of days' => 'ブラウザ オプションの日数を記憶する',
-  'Request new code' => '新しいコードをリクエストする',
-  'Secret:' => 'シークレット：',
-  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'ドライバーが選択されていない為、このモジュールは無効になっていますが、強制グループのユーザーは常にデフォルトで {defaultDriverName} ドライバーにフォールバックします。',
-  'Time based: Yes' => '時間ベース：YES',
-  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'アプリを手動で接続するには、次の詳細を TOTPアプリ (Google Authenticator など) に提供します。',
-  'Trusted networks list' => '信頼できるネットワーク リスト',
-  'Two-Factor Authentication' => '二段階認証',
-  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '二段階認証 (2FA) は、アカウントのセキュリティ レベルを強化します。有効にするとユーザー名とパスワードの入力に加えて、コードの入力を求めるプロンプトが表示されます。',
-);
diff --git a/messages/ko/base.php b/messages/ko/base.php
index 1f6b0a2..7ad7625 100644
--- a/messages/ko/base.php
+++ b/messages/ko/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    'Code' => '코드',
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Email' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => '코드',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => '',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/ko/config.php b/messages/ko/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/ko/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/lt/base.php b/messages/lt/base.php
index 6a02be7..70c212c 100644
--- a/messages/lt/base.php
+++ b/messages/lt/base.php
@@ -1,24 +1,47 @@
 <?php
-return array (
+return [
+  '<strong>Request</strong> new code' => '<strong> Siųsti  </strong> naują kodą',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '<strong>Dviejų žingsnių  patvirtinimo</strong> modulio nustatymai',
+  '<strong>Two-Factor Authentication</strong> settings' => '<strong>Dviejų žingsnių  patvirtinimo</strong> nustatymai',
   '<strong>Two-factor</strong> authentication' => '<strong>Dviejų žingsnių</strong> autentifikavimas',
   'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => 'Patvirtinimo kodas ką tik buvo išsiųstas į jūsų el. pašto adresą. Norėdami tęsti, įveskite el. laiške nurodytą kodą.',
+  'Account:' => 'Paskyra:',
   'Authentication method' => 'Patvirtinimo būdas',
+  'Can\'t scan the code?' => 'Negalite nuskaityti kodo?',
   'Code' => 'Kodas',
   'Code is not valid!' => 'Kodas neteisingas',
   'Code:' => 'Kodas:',
   'Date and time:' => 'Data ir laikas:',
+  'Default method for the mandatory groups' => 'Numatytasis privalomų grupių metodas',
   'Disable two-factor authentication (not recommended)' => 'Išjungti dviejų veiksnių autentifikavimą (nerekomenduojama)',
+  'Do you really want to request a new code?' => 'Ar tikrai norite prašyti naujo kodo?',
   'Email' => 'Elektroninis paštas',
+  'Enabled methods' => 'Įjungti metodai',
+  'Google Authenticator' => '"Google" autentifikatorius',
   'Hello {displayName}!' => 'Labas, {displayName}!',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Įdiekite programėlę, kurioje įdiegtas vienkartinio slaptažodžio (TOTP) algoritmas, pvz., {googleAuthenticatorLink}, ir naudokite ją toliau nurodytam QR kodui nuskaityti.',
+  'Leave empty to disable this feature.' => 'Palikite tuščią, jei norite išjungti šią funkciją.',
+  'Length of verifying code' => 'Tikrinamojo kodo ilgis',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'IP adresų arba potinklių, kuriuos norite įtraukti į baltąjį sąrašą, sąrašas, šiuo metu jūsų yra {0}. Sąrašui sudaryti naudokite kablelį, pvz: "{0}, 127.0.0.1"',
   'Log out' => 'Atsijungti',
+  'Mandatory for the following groups' => 'Privaloma šioms grupėms',
   'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => 'Atidarykite dviejų žingsnių autentifikavimo programėlę, kad pamatytumėte autentifikavimo kodą ir patvirtintumėte savo tapatybę.',
   'Pin code' => 'Pin kodas',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => 'Nepamirškite <strong>atnaujinti </strong> autentifikatoriaus programėlėje esančio kodo! Jei to nepadarysite, negalėsite prisijungti.',
   'Please enter your verifying code.' => 'Įveskite patvirtinimo kodą.',
+  'Remember browser option amount of days' => 'Prisiminti naršyklės parinktį dienų skaičius',
   'Remember this browser for {0} days' => 'Prisiminkite šią naršyklę {0} dienų',
+  'Request new code' => 'Prašyti naujo kodo',
+  'Secret:' => 'Slapta:',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Šis modulis išjungtas, nes nepasirinkta jokių tvarkyklių, tačiau pagal numatytuosius nustatymus priverstinių grupių naudotojai visada grįžta prie {defaultDriverName} tvarkyklės.',
+  'Time based: Yes' => 'Pagal laiką: Taip',
   'Time-based one-time passwords (e.g. Google Authenticator)' => 'Laikini vienkartiniai slaptažodžiai (pvz., "Google Authenticator")',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'Norėdami programėlę prijungti rankiniu būdu, TOTP programėlei (pvz., "Google Authenticator") pateikite šiuos duomenis.',
+  'Trusted networks list' => 'Patikimos nuorodos',
   'Two-Factor Authentication' => 'Dviejų žingsnių autentifikavimas',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'Dviejų žingsnių  patvirtinimas (ang. Two-factor authentication, 2FA) užtikrina papildomą jūsų paskyros saugumo lygį. Įjungus šią funkciją, be vartotojo vardo ir slaptažodžio turėsite papildomai įvesti kodą.',
   'Verify' => 'Patvirtinti',
   'Verifying code is not valid!' => 'Patvirtinimo kodas neteisingas',
   'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => 'Jūsų paskyra apsaugota dviejų žingsnių autentifikavimo sistema. Norėdami tęsti, naudokite šį kodą.',
   'Your login verification code' => 'Jūsų prisijungimo patvirtinimo kodas',
-);
+];
diff --git a/messages/lt/config.php b/messages/lt/config.php
deleted file mode 100644
index aeb748b..0000000
--- a/messages/lt/config.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-return array (
-  '<strong>Request</strong> new code' => '<strong> Siųsti  </strong> naują kodą',
-  '<strong>Two-Factor Authentication</strong> module configuration' => '<strong>Dviejų žingsnių  patvirtinimo</strong> modulio nustatymai',
-  '<strong>Two-Factor Authentication</strong> settings' => '<strong>Dviejų žingsnių  patvirtinimo</strong> nustatymai',
-  'Account:' => 'Paskyra:',
-  'Can\'t scan the code?' => 'Negalite nuskaityti kodo?',
-  'Default method for the mandatory groups' => 'Numatytasis privalomų grupių metodas',
-  'Do you really want to request a new code?' => 'Ar tikrai norite prašyti naujo kodo?',
-  'Enabled methods' => 'Įjungti metodai',
-  'Google Authenticator' => '"Google" autentifikatorius',
-  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Įdiekite programėlę, kurioje įdiegtas vienkartinio slaptažodžio (TOTP) algoritmas, pvz., {googleAuthenticatorLink}, ir naudokite ją toliau nurodytam QR kodui nuskaityti.',
-  'Leave empty to disable this feature.' => 'Palikite tuščią, jei norite išjungti šią funkciją.',
-  'Length of verifying code' => 'Tikrinamojo kodo ilgis',
-  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'IP adresų arba potinklių, kuriuos norite įtraukti į baltąjį sąrašą, sąrašas, šiuo metu jūsų yra {0}. Sąrašui sudaryti naudokite kablelį, pvz: "{0}, 127.0.0.1"',
-  'Mandatory for the following groups' => 'Privaloma šioms grupėms',
-  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => 'Nepamirškite <strong>atnaujinti </strong> autentifikatoriaus programėlėje esančio kodo! Jei to nepadarysite, negalėsite prisijungti.',
-  'Remember browser option amount of days' => 'Prisiminti naršyklės parinktį dienų skaičius',
-  'Request new code' => 'Prašyti naujo kodo',
-  'Secret:' => 'Slapta:',
-  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Šis modulis išjungtas, nes nepasirinkta jokių tvarkyklių, tačiau pagal numatytuosius nustatymus priverstinių grupių naudotojai visada grįžta prie {defaultDriverName} tvarkyklės.',
-  'Time based: Yes' => 'Pagal laiką: Taip',
-  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'Norėdami programėlę prijungti rankiniu būdu, TOTP programėlei (pvz., "Google Authenticator") pateikite šiuos duomenis.',
-  'Trusted networks list' => 'Patikimos nuorodos',
-  'Two-Factor Authentication' => 'Dviejų žingsnių patvirtinimas (ang. Two-factor authentication, 2FA)',
-  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'Dviejų žingsnių  patvirtinimas (ang. Two-factor authentication, 2FA) užtikrina papildomą jūsų paskyros saugumo lygį. Įjungus šią funkciją, be vartotojo vardo ir slaptažodžio turėsite papildomai įvesti kodą.',
-);
diff --git a/messages/lv/base.php b/messages/lv/base.php
index ef0c9ce..02619f8 100644
--- a/messages/lv/base.php
+++ b/messages/lv/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    'Code' => 'Kods',
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Email' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => 'Kods',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => '',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/lv/config.php b/messages/lv/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/lv/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/nb-NO/base.php b/messages/nb-NO/base.php
index 24a3e9a..4e6eaec 100644
--- a/messages/nb-NO/base.php
+++ b/messages/nb-NO/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    'Code' => 'Kode',
-    'Email' => 'E-post',
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => 'Kode',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => 'E-post',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/nb-NO/config.php b/messages/nb-NO/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/nb-NO/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/nl/base.php b/messages/nl/base.php
index ba5fd78..1d72548 100644
--- a/messages/nl/base.php
+++ b/messages/nl/base.php
@@ -1,24 +1,47 @@
 <?php
-return array (
+return [
+  '<strong>Request</strong> new code' => '<strong>Vraag</strong>een nieuwe code aan',
+  '<strong>Two-Factor Authentication</strong> module configuration' => 'Configuratie van module <strong>Twee-factorenauthenticatie</strong>',
+  '<strong>Two-Factor Authentication</strong> settings' => 'Instellingen voor <strong>Twee-factorenauthenticatie</strong>',
   '<strong>Two-factor</strong> authentication' => '<strong>Tweefactorauthenticatie</strong>',
   'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => 'Een bevestigingscode is naar uw e-mailadres gestuurd. Voer de code uit deze e-mail in om verder te gaan.',
+  'Account:' => 'Account:',
   'Authentication method' => 'Verificatiemethode',
+  'Can\'t scan the code?' => 'Kunt u de code niet scannen?',
   'Code' => 'Code',
   'Code is not valid!' => 'Code is niet geldig!',
   'Code:' => 'Code:',
   'Date and time:' => 'Datum en tijd:',
+  'Default method for the mandatory groups' => 'Standaardmethode voor de verplichte groepen',
   'Disable two-factor authentication (not recommended)' => 'Schakel tweefactorauthenticatie uit (niet aanbevolen)',
+  'Do you really want to request a new code?' => 'Wilt u een nieuwe code aanvragen?',
   'Email' => 'E-mail',
+  'Enabled methods' => 'Ingeschakelde methoden',
+  'Google Authenticator' => 'Google Authenticator',
   'Hello {displayName}!' => 'Hallo {displayName}!',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Installeer een applicatie die een op tijd gebaseerd eenmalig wachtwoord (TOTP) -algoritme implementeert, zoals {googleAuthenticatorLink}, en gebruik dit om de onderstaande QR-code te scannen.',
+  'Leave empty to disable this feature.' => 'Laat leeg om deze functie uit te schakelen.',
+  'Length of verifying code' => 'Lengte van de verificatiecode',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'Lijst met IP\'s of subnetten die op de vertrouwde lijst moeten worden gezet, momenteel is de jouwe {0}. Gebruik een kommascheidingsteken om een lijst te maken, bijvoorbeeld: "{0}, 127.0.0.1"',
   'Log out' => 'Uitloggen',
+  'Mandatory for the following groups' => 'Verplicht voor de volgende groepen',
   'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => 'Open de tweefactorauthenticatie-app op uw apparaat om uw authenticatiecode te bekijken en uw identiteit te verifiëren.',
   'Pin code' => 'Pincode',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '<strong> de code in uw authenticator-app bij te werken! Als u dit niet doet, kunt u niet inloggen.</strong>',
   'Please enter your verifying code.' => 'Voer uw verificatiecode in.',
+  'Remember browser option amount of days' => 'Onthoud browseroptie aantal dagen',
   'Remember this browser for {0} days' => 'Onthoud deze browser voor {0} dagen',
+  'Request new code' => 'Vraag een nieuwe code aan',
+  'Secret:' => 'Geheimcode:',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Deze module is uitgeschakeld omdat er geen stuurprogramma\'s zijn geselecteerd. Maar gebruikers uit de verplichte groepen vallen terug op het stuurprogramma {defaultDriverName}.',
+  'Time based: Yes' => 'Op tijd gebaseerd: ja',
   'Time-based one-time passwords (e.g. Google Authenticator)' => 'Op tijd gebaseerde eenmalige wachtwoorden (bijvoorbeeld Google Authenticator)',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'Om de app handmatig te verbinden, geeft u de volgende details op aan de TOTP-app (bijvoorbeeld Google Authenticator).',
+  'Trusted networks list' => 'Lijst met vertrouwde netwerken',
   'Two-Factor Authentication' => 'Twee-factorenauthenticatie',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'Tweefactorauthenticatie (2FA) biedt een extra beveiligingsniveau voor uw account. Eenmaal ingeschakeld, wordt u gevraagd om naast uw gebruikersnaam en wachtwoord ook een code in te voeren.',
   'Verify' => 'Verifiëren',
   'Verifying code is not valid!' => 'De verificatiecode is niet geldig!',
   'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => 'Uw account is beveiligd met een tweefactorauthenticatiesysteem. Gebruik de volgende code om door te gaan.',
   'Your login verification code' => 'Uw inlogverificatiecode',
-);
+];
diff --git a/messages/nl/config.php b/messages/nl/config.php
deleted file mode 100644
index 157d685..0000000
--- a/messages/nl/config.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-return array (
-  '<strong>Request</strong> new code' => '<strong>Vraag</strong>een nieuwe code aan',
-  '<strong>Two-Factor Authentication</strong> module configuration' => 'Configuratie van module <strong>Twee-factorenauthenticatie</strong>',
-  '<strong>Two-Factor Authentication</strong> settings' => 'Instellingen voor <strong>Twee-factorenauthenticatie</strong>',
-  'Account:' => 'Account:',
-  'Can\'t scan the code?' => 'Kunt u de code niet scannen?',
-  'Default method for the mandatory groups' => 'Standaardmethode voor de verplichte groepen',
-  'Do you really want to request a new code?' => 'Wilt u een nieuwe code aanvragen?',
-  'Enabled methods' => 'Ingeschakelde methoden',
-  'Google Authenticator' => 'Google Authenticator',
-  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Installeer een applicatie die een op tijd gebaseerd eenmalig wachtwoord (TOTP) -algoritme implementeert, zoals {googleAuthenticatorLink}, en gebruik dit om de onderstaande QR-code te scannen.',
-  'Leave empty to disable this feature.' => 'Laat leeg om deze functie uit te schakelen.',
-  'Length of verifying code' => 'Lengte van de verificatiecode',
-  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'Lijst met IP\'s of subnetten die op de vertrouwde lijst moeten worden gezet, momenteel is de jouwe {0}. Gebruik een kommascheidingsteken om een lijst te maken, bijvoorbeeld: "{0}, 127.0.0.1"',
-  'Mandatory for the following groups' => 'Verplicht voor de volgende groepen',
-  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '<strong> de code in uw authenticator-app bij te werken! Als u dit niet doet, kunt u niet inloggen.</strong>',
-  'Remember browser option amount of days' => 'Onthoud browseroptie aantal dagen',
-  'Request new code' => 'Vraag een nieuwe code aan',
-  'Secret:' => 'Geheimcode:',
-  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Deze module is uitgeschakeld omdat er geen stuurprogramma\'s zijn geselecteerd. Maar gebruikers uit de verplichte groepen vallen terug op het stuurprogramma {defaultDriverName}.',
-  'Time based: Yes' => 'Op tijd gebaseerd: ja',
-  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'Om de app handmatig te verbinden, geeft u de volgende details op aan de TOTP-app (bijvoorbeeld Google Authenticator).',
-  'Trusted networks list' => 'Lijst met vertrouwde netwerken',
-  'Two-Factor Authentication' => 'Twee-factorenauthenticatie',
-  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'Tweefactorauthenticatie (2FA) biedt een extra beveiligingsniveau voor uw account. Eenmaal ingeschakeld, wordt u gevraagd om naast uw gebruikersnaam en wachtwoord ook een code in te voeren.',
-);
diff --git a/messages/nn-NO/base.php b/messages/nn-NO/base.php
index 105f1ef..412ecca 100644
--- a/messages/nn-NO/base.php
+++ b/messages/nn-NO/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Email' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => '',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => '',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/nn-NO/config.php b/messages/nn-NO/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/nn-NO/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/pl/base.php b/messages/pl/base.php
index 070469f..910b9e7 100644
--- a/messages/pl/base.php
+++ b/messages/pl/base.php
@@ -1,24 +1,47 @@
 <?php
-return array (
+return [
+  '<strong>Request</strong> new code' => '<strong>Żądaj</strong> nowego kodu',
+  '<strong>Two-Factor Authentication</strong> module configuration' => 'Konfiguracja modułu<strong>Dwuskładnikowego Uwierzytelniania</strong>',
+  '<strong>Two-Factor Authentication</strong> settings' => 'Ustawienia <strong>Dwuskładnikowego Uwierzytelniania</strong>',
   '<strong>Two-factor</strong> authentication' => 'Uwierzytelnianie <strong>dwuskładnikowe</strong>',
   'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => 'Kod potwierdzający został właśnie wysłany na Twój adres e-mail. Wpisz kod z wiadomości aby kontynuować.',
+  'Account:' => 'Konto:',
   'Authentication method' => 'Metoda uwierzytelnienia',
+  'Can\'t scan the code?' => 'Nie możesz zeskanować kodu?',
   'Code' => 'Kod',
   'Code is not valid!' => 'Kod jest nieprawidłowy!',
   'Code:' => 'Kod:',
   'Date and time:' => 'Data i czas:',
+  'Default method for the mandatory groups' => '',
   'Disable two-factor authentication (not recommended)' => 'Wyłącz uwierzytelnianie dwuskładnikowe (nie polecane)',
+  'Do you really want to request a new code?' => 'Na pewno chcesz zażądać nowego kodu?',
   'Email' => 'E-mail',
+  'Enabled methods' => 'Włączone metody',
+  'Google Authenticator' => 'Google Authenticator',
   'Hello {displayName}!' => 'Witaj {displayName}!',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Zainstaluj aplikacje która implementuje bazując na czasie jednorazowy (TOTP) algorytm, jak np. {googleAuthenticatorLink} i użyj jej do zeskanowania kodu QR wyświetlonego poniżej.',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => 'Długość kodu weryfikacyjnego',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
   'Log out' => 'Wyloguj',
+  'Mandatory for the following groups' => 'Wymagane dla tych grup',
   'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => 'Otwórz aplikacje do dwuskładnikowego uwierzytelniania na swoim urządzeniu w celu podejrzenia kodu i weryfikacji Twojej tożsamości.',
   'Pin code' => 'Kod Pin',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '<strong>Nie zapomnij</strong> zaktualizować kodu w swojej aplikacji do uwierzytelniania! Jeśli tego nie zrobisz, stracisz możliwość zalogowania.',
   'Please enter your verifying code.' => 'Wpisz kod weryfikacyjny',
+  'Remember browser option amount of days' => '',
   'Remember this browser for {0} days' => 'Pamiętaj przeglądarkę przez {0} dni',
+  'Request new code' => 'Poproś o nowy kod',
+  'Secret:' => 'Sekret:',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Ten moduł został wyłączony ponieważ żaden silnik nie został wybrany, jednak użytkownicy z grup w których jest to wymuszone zawsze wracają domyślnie do {defaultDriverName}.',
+  'Time based: Yes' => 'Bazuje na czasie: Tak',
   'Time-based one-time passwords (e.g. Google Authenticator)' => 'Bazujace na czasie jednorazowe hasła  (np. Google Authenticator)',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'Aby ręcznie połączyć aplikacje, dostarcz podane informacje do aplikacji TOTP (np. Google Authenticator).',
+  'Trusted networks list' => '',
   'Two-Factor Authentication' => 'Dwuskładnikowe Uwierzytelnianie',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'Uwierzytelnianie dwuskładnikowe (2FA) dostarcza dodatkowego poziomu zabezpieczeń Twojego konta. Po włączeniu, przy logowaniu będziesz proszony o wpisanie kodu oprócz loginu i hasła.',
   'Verify' => 'Zweryfikuj',
   'Verifying code is not valid!' => 'Kod weryfikacyjny jest niepoprawny!',
   'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => 'Twoje konto jest zabezpieczone przez system dwuskładnikowego uwierzytelniania. Użyj kodu aby kontynuować.',
   'Your login verification code' => 'Twój kod weryfikacyjny do logowania',
-);
+];
diff --git a/messages/pl/config.php b/messages/pl/config.php
deleted file mode 100644
index 9fb363c..0000000
--- a/messages/pl/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '<strong>Żądaj</strong> nowego kodu',
-    '<strong>Two-Factor Authentication</strong> module configuration' => 'Konfiguracja modułu<strong>Dwuskładnikowego Uwierzytelniania</strong>',
-    '<strong>Two-Factor Authentication</strong> settings' => 'Ustawienia <strong>Dwuskładnikowego Uwierzytelniania</strong>',
-    'Account:' => 'Konto:',
-    'Can\'t scan the code?' => 'Nie możesz zeskanować kodu?',
-    'Do you really want to request a new code?' => 'Na pewno chcesz zażądać nowego kodu?',
-    'Enabled methods' => 'Włączone metody',
-    'Google Authenticator' => 'Google Authenticator',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Zainstaluj aplikacje która implementuje bazując na czasie jednorazowy (TOTP) algorytm, jak np. {googleAuthenticatorLink} i użyj jej do zeskanowania kodu QR wyświetlonego poniżej.',
-    'Length of verifying code' => 'Długość kodu weryfikacyjnego',
-    'Mandatory for the following groups' => 'Wymagane dla tych grup',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '<strong>Nie zapomnij</strong> zaktualizować kodu w swojej aplikacji do uwierzytelniania! Jeśli tego nie zrobisz, stracisz możliwość zalogowania.',
-    'Request new code' => 'Poproś o nowy kod',
-    'Secret:' => 'Sekret:',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Ten moduł został wyłączony ponieważ żaden silnik nie został wybrany, jednak użytkownicy z grup w których jest to wymuszone zawsze wracają domyślnie do {defaultDriverName}.',
-    'Time based: Yes' => 'Bazuje na czasie: Tak',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'Aby ręcznie połączyć aplikacje, dostarcz podane informacje do aplikacji TOTP (np. Google Authenticator).',
-    'Two-Factor Authentication' => 'Uwierzytelnianie Dwuskładnikowe',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'Uwierzytelnianie dwuskładnikowe (2FA) dostarcza dodatkowego poziomu zabezpieczeń Twojego konta. Po włączeniu, przy logowaniu będziesz proszony o wpisanie kodu oprócz loginu i hasła.',
-    'Default method for the mandatory groups' => '',
-    'Leave empty to disable this feature.' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Remember browser option amount of days' => '',
-    'Trusted networks list' => '',
-];
diff --git a/messages/pt-BR/base.php b/messages/pt-BR/base.php
index e672380..1d74cb1 100644
--- a/messages/pt-BR/base.php
+++ b/messages/pt-BR/base.php
@@ -1,24 +1,47 @@
 <?php
-return array (
+return [
+  '<strong>Request</strong> new code' => '<strong>Solicitar</strong> novo código',
+  '<strong>Two-Factor Authentication</strong> module configuration' => 'Configuração do módulo <strong>Autenticação de dois fatores</strong>',
+  '<strong>Two-Factor Authentication</strong> settings' => 'Configurações de <strong>autenticação de dois fatores</strong>',
   '<strong>Two-factor</strong> authentication' => 'Autenticação de <strong>dois fatores</strong>',
   'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => 'Um código de confirmação acaba de ser enviado para o seu endereço de e-mail. Por favor, insira o código do e-mail para prosseguir.',
+  'Account:' => 'Conta:',
   'Authentication method' => 'Método de autenticação',
+  'Can\'t scan the code?' => 'Não consegue digitalizar o código?',
   'Code' => 'Código',
   'Code is not valid!' => 'O código não é válido!',
   'Code:' => 'Código:',
   'Date and time:' => 'Data e hora:',
+  'Default method for the mandatory groups' => 'Método padrão para os grupos obrigatórios',
   'Disable two-factor authentication (not recommended)' => 'Desative a autenticação de dois fatores (não recomendado)',
+  'Do you really want to request a new code?' => 'Deseja realmente solicitar um novo código?',
   'Email' => 'E-mail',
+  'Enabled methods' => 'Métodos ativados',
+  'Google Authenticator' => 'Autenticador do Google',
   'Hello {displayName}!' => 'Olá, {displayName}!',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Instale um aplicativo que implemente um algoritmo de senha descartável baseada em tempo (TOTP), como {googleAuthenticatorLink}, e use-o para digitalizar o código QR mostrado abaixo.',
+  'Leave empty to disable this feature.' => 'Deixe em branco para desativar este recurso.',
+  'Length of verifying code' => 'Comprimento do código de verificação',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'Lista de IPs ou sub-redes para lista de permissões, atualmente a sua é {0}. Use o separador de vírgula para criar uma lista, exemplo: "{0}, 127.0.0.1"',
   'Log out' => 'Sair',
+  'Mandatory for the following groups' => 'Obrigatório para os seguintes grupos',
   'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => 'Código PIN',
   'Pin code' => 'Código PIN',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => 'Por favor, <strong>não se esqueça</strong> de atualizar o código em seu aplicativo autenticador! Se você não fizer isso, você não poderá fazer o login.',
   'Please enter your verifying code.' => 'Insira seu código de verificação.',
+  'Remember browser option amount of days' => 'Lembrar a quantidade de dias da opção do navegador',
   'Remember this browser for {0} days' => 'Lembre-se deste navegador por {0} dias',
+  'Request new code' => 'Solicitar novo código',
+  'Secret:' => 'Chave:',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Este módulo está desabilitado porque nenhum driver está selecionado, no entanto, os usuários dos grupos impostos sempre fazem fallback para o driver {defaultDriverName} por padrão.',
+  'Time based: Yes' => 'Com base no tempo: Sim',
   'Time-based one-time passwords (e.g. Google Authenticator)' => 'Senhas de uso único baseadas em tempo (por exemplo, Google Authenticator)',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'Para conectar o aplicativo manualmente, forneça os seguintes detalhes ao aplicativo TOTP (por exemplo, Google Authenticator).',
+  'Trusted networks list' => 'Lista de redes confiáveis',
   'Two-Factor Authentication' => 'Autenticação de dois fatores',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'A autenticação de dois fatores (2FA) fornece um nível adicional de segurança para sua conta. Uma vez ativado, você será solicitado a inserir um código, além de inserir seu nome de usuário e senha.',
   'Verify' => 'Verificar',
   'Verifying code is not valid!' => 'O código de verificação não é válido!',
   'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => 'Sua conta é protegida por um sistema de autenticação de dois fatores. Por favor, use o seguinte código para prosseguir.',
   'Your login verification code' => 'Seu código de verificação de login',
-);
+];
diff --git a/messages/pt-BR/config.php b/messages/pt-BR/config.php
deleted file mode 100644
index 775f1a5..0000000
--- a/messages/pt-BR/config.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-return array (
-  '<strong>Request</strong> new code' => '<strong>Solicitar</strong> novo código',
-  '<strong>Two-Factor Authentication</strong> module configuration' => 'Configuração do módulo <strong>Autenticação de dois fatores</strong>',
-  '<strong>Two-Factor Authentication</strong> settings' => 'Configurações de <strong>autenticação de dois fatores</strong>',
-  'Account:' => 'Conta:',
-  'Can\'t scan the code?' => 'Não consegue digitalizar o código?',
-  'Default method for the mandatory groups' => 'Método padrão para os grupos obrigatórios',
-  'Do you really want to request a new code?' => 'Deseja realmente solicitar um novo código?',
-  'Enabled methods' => 'Métodos ativados',
-  'Google Authenticator' => 'Autenticador do Google',
-  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'Instale um aplicativo que implemente um algoritmo de senha descartável baseada em tempo (TOTP), como {googleAuthenticatorLink}, e use-o para digitalizar o código QR mostrado abaixo.',
-  'Leave empty to disable this feature.' => 'Deixe em branco para desativar este recurso.',
-  'Length of verifying code' => 'Comprimento do código de verificação',
-  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => 'Lista de IPs ou sub-redes para lista de permissões, atualmente a sua é {0}. Use o separador de vírgula para criar uma lista, exemplo: "{0}, 127.0.0.1"',
-  'Mandatory for the following groups' => 'Obrigatório para os seguintes grupos',
-  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => 'Por favor, <strong>não se esqueça</strong> de atualizar o código em seu aplicativo autenticador! Se você não fizer isso, você não poderá fazer o login.',
-  'Remember browser option amount of days' => 'Lembrar a quantidade de dias da opção do navegador',
-  'Request new code' => 'Solicitar novo código',
-  'Secret:' => 'Chave:',
-  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'Este módulo está desabilitado porque nenhum driver está selecionado, no entanto, os usuários dos grupos impostos sempre fazem fallback para o driver {defaultDriverName} por padrão.',
-  'Time based: Yes' => 'Com base no tempo: Sim',
-  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'Para conectar o aplicativo manualmente, forneça os seguintes detalhes ao aplicativo TOTP (por exemplo, Google Authenticator).',
-  'Trusted networks list' => 'Lista de redes confiáveis',
-  'Two-Factor Authentication' => 'Autenticação de dois fatores',
-  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'A autenticação de dois fatores (2FA) fornece um nível adicional de segurança para sua conta. Uma vez ativado, você será solicitado a inserir um código, além de inserir seu nome de usuário e senha.',
-);
diff --git a/messages/pt/base.php b/messages/pt/base.php
index 3dcc18c..4e29e02 100644
--- a/messages/pt/base.php
+++ b/messages/pt/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    'Code' => 'Código',
-    'Email' => 'Email',
-    'Log out' => 'Sair',
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Hello {displayName}!' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => 'Código',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => 'Email',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => 'Sair',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/pt/config.php b/messages/pt/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/pt/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/ro/base.php b/messages/ro/base.php
index a807493..b325ccc 100644
--- a/messages/ro/base.php
+++ b/messages/ro/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    'Code' => 'Cod',
-    'Email' => 'Email',
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => 'Cod',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => 'Email',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/ro/config.php b/messages/ro/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/ro/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/ru/base.php b/messages/ru/base.php
index 9a2500a..059f7fa 100644
--- a/messages/ru/base.php
+++ b/messages/ru/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    'Code' => 'Блок кода',
-    'Email' => 'Email',
-    'Log out' => 'Выйти',
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Hello {displayName}!' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => 'Блок кода',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => 'Email',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => 'Выйти',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/ru/config.php b/messages/ru/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/ru/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/sk/base.php b/messages/sk/base.php
index 6cdccf9..6dc47a5 100644
--- a/messages/sk/base.php
+++ b/messages/sk/base.php
@@ -1,24 +1,47 @@
 <?php
-return array (
+return [
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
   '<strong>Two-factor</strong> authentication' => '<strong>Dvojfaktorové</strong> overenie',
   'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => 'Na vašu e-mailovú adresu bol práve odoslaný potvrdzovací kód. Ak chcete pokračovať, zadajte kód z e-mailu.',
+  'Account:' => '',
   'Authentication method' => 'Spôsob overovania',
+  'Can\'t scan the code?' => '',
   'Code' => 'Kód',
   'Code is not valid!' => 'Kód nie je platný!',
   'Code:' => 'Kód:',
   'Date and time:' => 'Dátum a čas:',
+  'Default method for the mandatory groups' => '',
   'Disable two-factor authentication (not recommended)' => 'Zakázať dvojfaktorové overenie (neodporúča sa)',
+  'Do you really want to request a new code?' => '',
   'Email' => 'Email',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
   'Hello {displayName}!' => 'Dobrý deň, {displayName}!',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
   'Log out' => 'Odhlásiť sa',
+  'Mandatory for the following groups' => '',
   'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => 'Otvorte na svojom zariadení aplikáciu dvojfaktorovej autentifikácie, aby ste si mohli pozrieť overovací kód a overiť svoju identitu.',
   'Pin code' => 'PIN kód',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
   'Please enter your verifying code.' => 'Zadajte svoj overovací kód.',
+  'Remember browser option amount of days' => '',
   'Remember this browser for {0} days' => 'Zapamätať si tento prehliadač na {0} dní',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
   'Time-based one-time passwords (e.g. Google Authenticator)' => 'Časovo podmienené jednorazové heslá (napr. Google Authenticator)',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
   'Two-Factor Authentication' => 'Dvojfaktorová Autentifikácia',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
   'Verify' => 'Overiť',
   'Verifying code is not valid!' => 'Overovací kód je neplatný!',
   'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => 'Váš účet je zabezpečený dvojfaktorovým overovacím systémom. Ak chcete pokračovať, použite nasledujúci kód.',
   'Your login verification code' => 'Váš prihlasovací overovací kód',
-);
+];
diff --git a/messages/sk/config.php b/messages/sk/config.php
deleted file mode 100644
index acfd62e..0000000
--- a/messages/sk/config.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-return array (
-  '<strong>Request</strong> new code' => '',
-  '<strong>Two-Factor Authentication</strong> module configuration' => '',
-  '<strong>Two-Factor Authentication</strong> settings' => '',
-  'Account:' => '',
-  'Can\'t scan the code?' => '',
-  'Default method for the mandatory groups' => '',
-  'Do you really want to request a new code?' => '',
-  'Enabled methods' => '',
-  'Google Authenticator' => '',
-  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-  'Leave empty to disable this feature.' => '',
-  'Length of verifying code' => '',
-  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-  'Mandatory for the following groups' => '',
-  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-  'Remember browser option amount of days' => '',
-  'Request new code' => '',
-  'Secret:' => '',
-  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-  'Time based: Yes' => '',
-  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-  'Trusted networks list' => '',
-  'Two-Factor Authentication' => 'Dvojfaktorová Autentifikácia',
-  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-);
diff --git a/messages/sl/base.php b/messages/sl/base.php
index 105f1ef..412ecca 100644
--- a/messages/sl/base.php
+++ b/messages/sl/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Email' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => '',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => '',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/sl/config.php b/messages/sl/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/sl/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/sq/base.php b/messages/sq/base.php
index 105f1ef..412ecca 100644
--- a/messages/sq/base.php
+++ b/messages/sq/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Email' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => '',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => '',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/sq/config.php b/messages/sq/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/sq/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/sr/base.php b/messages/sr/base.php
index 0538571..e2ae08e 100644
--- a/messages/sr/base.php
+++ b/messages/sr/base.php
@@ -1,24 +1,47 @@
 <?php
-return array (
+return [
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
   '<strong>Two-factor</strong> authentication' => '',
   'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
   'Authentication method' => '',
+  'Can\'t scan the code?' => '',
   'Code' => 'Kod',
   'Code is not valid!' => '',
   'Code:' => '',
   'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
   'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
   'Email' => 'Email',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
   'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
   'Log out' => 'Odjava',
+  'Mandatory for the following groups' => '',
   'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
   'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
   'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
   'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
   'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
   'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
   'Verify' => '',
   'Verifying code is not valid!' => '',
   'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
   'Your login verification code' => '',
-);
+];
diff --git a/messages/sr/config.php b/messages/sr/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/sr/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/sv/base.php b/messages/sv/base.php
index 6c49ba8..1590364 100644
--- a/messages/sv/base.php
+++ b/messages/sv/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    'Code' => 'Kod',
-    'Email' => 'E-post',
-    'Log out' => 'Logga ut',
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Hello {displayName}!' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => 'Kod',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => 'E-post',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => 'Logga ut',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/sv/config.php b/messages/sv/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/sv/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/sw/base.php b/messages/sw/base.php
index 105f1ef..412ecca 100644
--- a/messages/sw/base.php
+++ b/messages/sw/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Email' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => '',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => '',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/sw/config.php b/messages/sw/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/sw/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/th/base.php b/messages/th/base.php
index ba7ee67..cf7238f 100644
--- a/messages/th/base.php
+++ b/messages/th/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    '<strong>Two-factor</strong> authentication' => 'การตรวจสอบสิทธิ์ <strong>สองปัจจัย</strong>',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => 'เพิ่งส่งรหัสยืนยันไปยังที่อยู่อีเมลของคุณ โปรดป้อนรหัสจากอีเมลเพื่อดำเนินการต่อ',
-    'Authentication method' => 'วิธีการรับรองความถูกต้อง',
-    'Code' => 'รหัส',
-    'Code is not valid!' => 'รหัสไม่ถูกต้อง!',
-    'Code:' => 'รหัส:',
-    'Date and time:' => 'วันและเวลา:',
-    'Disable two-factor authentication (not recommended)' => 'ปิดใช้งานการตรวจสอบสิทธิ์แบบสองปัจจัย (ไม่แนะนำ)',
-    'Email' => 'อีเมล',
-    'Hello {displayName}!' => 'สวัสดี {displayName}',
-    'Log out' => 'ออกจากระบบ',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => 'เปิดแอปการตรวจสอบสิทธิ์แบบสองปัจจัยบนอุปกรณ์ของคุณเพื่อดูรหัสการตรวจสอบสิทธิ์และยืนยันตัวตนของคุณ',
-    'Pin code' => 'รหัสพิน',
-    'Please enter your verifying code.' => 'โปรดป้อนรหัสยืนยันของคุณ',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => 'รหัสผ่านแบบใช้ครั้งเดียวตามเวลา (เช่น Google Authenticator)',
-    'Two-Factor Authentication' => 'การรับรองความถูกต้องด้วยสองปัจจัย',
-    'Verify' => 'ยืนยัน',
-    'Verifying code is not valid!' => 'รหัสยืนยันไม่ถูกต้อง',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => 'บัญชีของคุณได้รับการรักษาความปลอดภัยด้วยระบบการตรวจสอบสิทธิ์แบบสองปัจจัย โปรดใช้รหัสต่อไปนี้เพื่อดำเนินการต่อ',
-    'Your login verification code' => 'รหัสยืนยันการเข้าสู่ระบบของคุณ',
-    'Remember this browser for {0} days' => '',
+  '<strong>Request</strong> new code' => '<strong>ขอ</strong> รหัสใหม่',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '<strong>การตรวจสอบสิทธิ์สองปัจจัย</strong> การกำหนดค่าโมดูล',
+  '<strong>Two-Factor Authentication</strong> settings' => 'การตั้งค่า<strong>การตรวจสอบสิทธิ์สองปัจจัย</strong>',
+  '<strong>Two-factor</strong> authentication' => 'การตรวจสอบสิทธิ์ <strong>สองปัจจัย</strong>',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => 'เพิ่งส่งรหัสยืนยันไปยังที่อยู่อีเมลของคุณ โปรดป้อนรหัสจากอีเมลเพื่อดำเนินการต่อ',
+  'Account:' => 'บัญชีผู้ใช้:',
+  'Authentication method' => 'วิธีการรับรองความถูกต้อง',
+  'Can\'t scan the code?' => 'ไม่สามารถสแกนรหัส?',
+  'Code' => 'รหัส',
+  'Code is not valid!' => 'รหัสไม่ถูกต้อง!',
+  'Code:' => 'รหัส:',
+  'Date and time:' => 'วันและเวลา:',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => 'ปิดใช้งานการตรวจสอบสิทธิ์แบบสองปัจจัย (ไม่แนะนำ)',
+  'Do you really want to request a new code?' => 'คุณต้องการขอรหัสใหม่หรือไม่?',
+  'Email' => 'อีเมล',
+  'Enabled methods' => 'วิธีการเปิดใช้งาน',
+  'Google Authenticator' => 'Google Authenticator',
+  'Hello {displayName}!' => 'สวัสดี {displayName}',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'ติดตั้งแอปพลิเคชันที่ใช้อัลกอริทึมรหัสผ่านแบบใช้ครั้งเดียวตามเวลา (TOTP) เช่น {googleAuthenticatorLink} และใช้เพื่อสแกนโค้ด QR ที่แสดงด้านล่าง',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => 'ความยาวของรหัสยืนยัน',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => 'ออกจากระบบ',
+  'Mandatory for the following groups' => 'บังคับสำหรับกลุ่มต่อไปนี้',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => 'เปิดแอปการตรวจสอบสิทธิ์แบบสองปัจจัยบนอุปกรณ์ของคุณเพื่อดูรหัสการตรวจสอบสิทธิ์และยืนยันตัวตนของคุณ',
+  'Pin code' => 'รหัสพิน',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => 'โปรด<strong>อย่าลืม</strong>เพื่ออัปเดตรหัสในแอปตรวจสอบความถูกต้องของคุณ! หากไม่ทำเช่นนั้น คุณจะไม่สามารถเข้าสู่ระบบได้',
+  'Please enter your verifying code.' => 'โปรดป้อนรหัสยืนยันของคุณ',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => 'ขอรหัสใหม่',
+  'Secret:' => 'ความลับ:',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'โมดูลนี้ถูกปิดใช้งานเนื่องจากไม่ได้เลือกโปรแกรมควบคุม อย่างไรก็ตาม ผู้ใช้จากกลุ่มที่บังคับใช้มักจะใช้โปรแกรมควบคุม {defaultDriverName} แทนโดยค่าเริ่มต้น',
+  'Time based: Yes' => 'ตามเวลา: ใช่',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => 'รหัสผ่านแบบใช้ครั้งเดียวตามเวลา (เช่น Google Authenticator)',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'หากต้องการเชื่อมต่อแอปด้วยตนเอง ให้ระบุรายละเอียดต่อไปนี้กับแอป TOTP (เช่น Google Authenticator)',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => 'การรับรองความถูกต้องด้วยสองปัจจัย',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'การรับรองความถูกต้องด้วยสองปัจจัย (2FA) ให้ระดับความปลอดภัยเพิ่มเติมสำหรับบัญชีของคุณ เมื่อเปิดใช้งานแล้ว คุณจะได้รับแจ้งให้ป้อนรหัสนอกเหนือจากการป้อนชื่อผู้ใช้และรหัสผ่านของคุณ',
+  'Verify' => 'ยืนยัน',
+  'Verifying code is not valid!' => 'รหัสยืนยันไม่ถูกต้อง',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => 'บัญชีของคุณได้รับการรักษาความปลอดภัยด้วยระบบการตรวจสอบสิทธิ์แบบสองปัจจัย โปรดใช้รหัสต่อไปนี้เพื่อดำเนินการต่อ',
+  'Your login verification code' => 'รหัสยืนยันการเข้าสู่ระบบของคุณ',
 ];
diff --git a/messages/th/config.php b/messages/th/config.php
deleted file mode 100644
index b20d711..0000000
--- a/messages/th/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '<strong>ขอ</strong> รหัสใหม่',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '<strong>การตรวจสอบสิทธิ์สองปัจจัย</strong> การกำหนดค่าโมดูล',
-    '<strong>Two-Factor Authentication</strong> settings' => 'การตั้งค่า<strong>การตรวจสอบสิทธิ์สองปัจจัย</strong>',
-    'Account:' => 'บัญชีผู้ใช้:',
-    'Can\'t scan the code?' => 'ไม่สามารถสแกนรหัส?',
-    'Do you really want to request a new code?' => 'คุณต้องการขอรหัสใหม่หรือไม่?',
-    'Enabled methods' => 'วิธีการเปิดใช้งาน',
-    'Google Authenticator' => 'Google Authenticator',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => 'ติดตั้งแอปพลิเคชันที่ใช้อัลกอริทึมรหัสผ่านแบบใช้ครั้งเดียวตามเวลา (TOTP) เช่น {googleAuthenticatorLink} และใช้เพื่อสแกนโค้ด QR ที่แสดงด้านล่าง',
-    'Length of verifying code' => 'ความยาวของรหัสยืนยัน',
-    'Mandatory for the following groups' => 'บังคับสำหรับกลุ่มต่อไปนี้',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => 'โปรด<strong>อย่าลืม</strong>เพื่ออัปเดตรหัสในแอปตรวจสอบความถูกต้องของคุณ! หากไม่ทำเช่นนั้น คุณจะไม่สามารถเข้าสู่ระบบได้',
-    'Request new code' => 'ขอรหัสใหม่',
-    'Secret:' => 'ความลับ:',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => 'โมดูลนี้ถูกปิดใช้งานเนื่องจากไม่ได้เลือกโปรแกรมควบคุม อย่างไรก็ตาม ผู้ใช้จากกลุ่มที่บังคับใช้มักจะใช้โปรแกรมควบคุม {defaultDriverName} แทนโดยค่าเริ่มต้น',
-    'Time based: Yes' => 'ตามเวลา: ใช่',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => 'หากต้องการเชื่อมต่อแอปด้วยตนเอง ให้ระบุรายละเอียดต่อไปนี้กับแอป TOTP (เช่น Google Authenticator)',
-    'Two-Factor Authentication' => 'การรับรองความถูกต้องด้วยสองปัจจัย',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => 'การรับรองความถูกต้องด้วยสองปัจจัย (2FA) ให้ระดับความปลอดภัยเพิ่มเติมสำหรับบัญชีของคุณ เมื่อเปิดใช้งานแล้ว คุณจะได้รับแจ้งให้ป้อนรหัสนอกเหนือจากการป้อนชื่อผู้ใช้และรหัสผ่านของคุณ',
-    'Default method for the mandatory groups' => '',
-    'Leave empty to disable this feature.' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Remember browser option amount of days' => '',
-    'Trusted networks list' => '',
-];
diff --git a/messages/tr/base.php b/messages/tr/base.php
index ac29784..eb793e7 100644
--- a/messages/tr/base.php
+++ b/messages/tr/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    'Code' => 'Kod',
-    'Email' => 'E-posta',
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => 'Kod',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => 'E-posta',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/tr/config.php b/messages/tr/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/tr/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/uk/base.php b/messages/uk/base.php
index 079b22c..5ab4c20 100644
--- a/messages/uk/base.php
+++ b/messages/uk/base.php
@@ -1,24 +1,47 @@
 <?php
-return array (
+return [
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
   '<strong>Two-factor</strong> authentication' => '',
   'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
   'Authentication method' => '',
+  'Can\'t scan the code?' => '',
   'Code' => 'Код',
   'Code is not valid!' => '',
   'Code:' => '',
   'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
   'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
   'Email' => 'Електронна пошта',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
   'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
   'Log out' => 'Вийти',
+  'Mandatory for the following groups' => '',
   'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
   'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
   'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
   'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
   'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
   'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
   'Verify' => '',
   'Verifying code is not valid!' => '',
   'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
   'Your login verification code' => '',
-);
+];
diff --git a/messages/uk/config.php b/messages/uk/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/uk/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/uz/base.php b/messages/uz/base.php
index 105f1ef..412ecca 100644
--- a/messages/uz/base.php
+++ b/messages/uz/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Email' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => '',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => '',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/uz/config.php b/messages/uz/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/uz/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/vi/base.php b/messages/vi/base.php
index 0da2bf5..342efa9 100644
--- a/messages/vi/base.php
+++ b/messages/vi/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    'Code' => 'Mã',
-    'Email' => 'Email',
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => 'Mã',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => 'Email',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/vi/config.php b/messages/vi/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/vi/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/zh-CN/base.php b/messages/zh-CN/base.php
index 7a8c74c..5c6c861 100644
--- a/messages/zh-CN/base.php
+++ b/messages/zh-CN/base.php
@@ -1,25 +1,47 @@
 <?php
-
 return [
-    'Code' => '代码',
-    'Email' => '邮箱',
-    '<strong>Two-factor</strong> authentication' => '',
-    'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
-    'Authentication method' => '',
-    'Code is not valid!' => '',
-    'Code:' => '',
-    'Date and time:' => '',
-    'Disable two-factor authentication (not recommended)' => '',
-    'Hello {displayName}!' => '',
-    'Log out' => '',
-    'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
-    'Pin code' => '',
-    'Please enter your verifying code.' => '',
-    'Remember this browser for {0} days' => '',
-    'Time-based one-time passwords (e.g. Google Authenticator)' => '',
-    'Two-Factor Authentication' => '',
-    'Verify' => '',
-    'Verifying code is not valid!' => '',
-    'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
-    'Your login verification code' => '',
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
+  '<strong>Two-factor</strong> authentication' => '',
+  'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
+  'Authentication method' => '',
+  'Can\'t scan the code?' => '',
+  'Code' => '代码',
+  'Code is not valid!' => '',
+  'Code:' => '',
+  'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
+  'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
+  'Email' => '邮箱',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
+  'Hello {displayName}!' => '',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
+  'Log out' => '',
+  'Mandatory for the following groups' => '',
+  'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
+  'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
+  'Please enter your verifying code.' => '',
+  'Remember browser option amount of days' => '',
+  'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
+  'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
+  'Two-Factor Authentication' => '',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
+  'Verify' => '',
+  'Verifying code is not valid!' => '',
+  'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
+  'Your login verification code' => '',
 ];
diff --git a/messages/zh-CN/config.php b/messages/zh-CN/config.php
deleted file mode 100644
index 445ca84..0000000
--- a/messages/zh-CN/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-return [
-    '<strong>Request</strong> new code' => '',
-    '<strong>Two-Factor Authentication</strong> module configuration' => '',
-    '<strong>Two-Factor Authentication</strong> settings' => '',
-    'Account:' => '',
-    'Can\'t scan the code?' => '',
-    'Default method for the mandatory groups' => '',
-    'Do you really want to request a new code?' => '',
-    'Enabled methods' => '',
-    'Google Authenticator' => '',
-    'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-    'Leave empty to disable this feature.' => '',
-    'Length of verifying code' => '',
-    'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-    'Mandatory for the following groups' => '',
-    'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-    'Remember browser option amount of days' => '',
-    'Request new code' => '',
-    'Secret:' => '',
-    'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-    'Time based: Yes' => '',
-    'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-    'Trusted networks list' => '',
-    'Two-Factor Authentication' => '',
-    'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-];
diff --git a/messages/zh-TW/base.php b/messages/zh-TW/base.php
index 9fa17d4..2cebb77 100644
--- a/messages/zh-TW/base.php
+++ b/messages/zh-TW/base.php
@@ -1,24 +1,47 @@
 <?php
-return array (
+return [
+  '<strong>Request</strong> new code' => '',
+  '<strong>Two-Factor Authentication</strong> module configuration' => '',
+  '<strong>Two-Factor Authentication</strong> settings' => '',
   '<strong>Two-factor</strong> authentication' => '<strong>兩步驟</strong> 驗證',
   'A confirmation code hast just been sent to your email address. Please enter the code from the email in order to proceed.' => '',
+  'Account:' => '',
   'Authentication method' => '',
+  'Can\'t scan the code?' => '',
   'Code' => '程式碼',
   'Code is not valid!' => '',
   'Code:' => '',
   'Date and time:' => '',
+  'Default method for the mandatory groups' => '',
   'Disable two-factor authentication (not recommended)' => '',
+  'Do you really want to request a new code?' => '',
   'Email' => 'E-mail',
+  'Enabled methods' => '',
+  'Google Authenticator' => '',
   'Hello {displayName}!' => '您好 {displayName} !',
+  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
+  'Leave empty to disable this feature.' => '',
+  'Length of verifying code' => '',
+  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
   'Log out' => '登出',
+  'Mandatory for the following groups' => '',
   'Open the two-factor authentication app on your device to view your authentication code and verify your identity.' => '',
   'Pin code' => '',
+  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
   'Please enter your verifying code.' => '請輸入您的驗證碼。',
+  'Remember browser option amount of days' => '',
   'Remember this browser for {0} days' => '',
+  'Request new code' => '',
+  'Secret:' => '',
+  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
+  'Time based: Yes' => '',
   'Time-based one-time passwords (e.g. Google Authenticator)' => '',
+  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
+  'Trusted networks list' => '',
   'Two-Factor Authentication' => '兩步驟驗證',
+  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
   'Verify' => '驗證',
   'Verifying code is not valid!' => '驗證碼錯誤!',
   'Your account is secured by a two-factor authentication system. Please use the following code to proceed.' => '',
   'Your login verification code' => '您的登入驗證碼',
-);
+];
diff --git a/messages/zh-TW/config.php b/messages/zh-TW/config.php
deleted file mode 100644
index 2717c4c..0000000
--- a/messages/zh-TW/config.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-return array (
-  '<strong>Request</strong> new code' => '',
-  '<strong>Two-Factor Authentication</strong> module configuration' => '',
-  '<strong>Two-Factor Authentication</strong> settings' => '',
-  'Account:' => '',
-  'Can\'t scan the code?' => '',
-  'Default method for the mandatory groups' => '',
-  'Do you really want to request a new code?' => '',
-  'Enabled methods' => '',
-  'Google Authenticator' => '',
-  'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.' => '',
-  'Leave empty to disable this feature.' => '',
-  'Length of verifying code' => '',
-  'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"' => '',
-  'Mandatory for the following groups' => '',
-  'Please <strong>do not forget</strong> to update the code in your authenticator app! If you do not do so, you will not be able to login.' => '',
-  'Remember browser option amount of days' => '',
-  'Request new code' => '',
-  'Secret:' => '',
-  'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.' => '',
-  'Time based: Yes' => '',
-  'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).' => '',
-  'Trusted networks list' => '',
-  'Two-Factor Authentication' => '兩步驟驗證',
-  'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.' => '',
-);
diff --git a/models/Config.php b/models/Config.php
index 3a99473..c52ba45 100644
--- a/models/Config.php
+++ b/models/Config.php
@@ -85,12 +85,12 @@ public function rules()
     public function attributeLabels()
     {
         return [
-            'enabledDrivers' => Yii::t('TwofaModule.config', 'Enabled methods'),
-            'codeLength' => Yii::t('TwofaModule.config', 'Length of verifying code'),
-            'rememberMeDays' => Yii::t('TwofaModule.config', 'Remember browser option amount of days'),
-            'enforcedGroups' => Yii::t('TwofaModule.config', 'Mandatory for the following groups'),
-            'enforcedMethod' => Yii::t('TwofaModule.config', 'Default method for the mandatory groups'),
-            'trustedNetworks' => Yii::t('TwofaModule.config', 'Trusted networks list'),
+            'enabledDrivers' => Yii::t('TwofaModule.base', 'Enabled methods'),
+            'codeLength' => Yii::t('TwofaModule.base', 'Length of verifying code'),
+            'rememberMeDays' => Yii::t('TwofaModule.base', 'Remember browser option amount of days'),
+            'enforcedGroups' => Yii::t('TwofaModule.base', 'Mandatory for the following groups'),
+            'enforcedMethod' => Yii::t('TwofaModule.base', 'Default method for the mandatory groups'),
+            'trustedNetworks' => Yii::t('TwofaModule.base', 'Trusted networks list'),
         ];
     }
 
diff --git a/views/config/module.php b/views/config/module.php
index 359ebec..99d543f 100644
--- a/views/config/module.php
+++ b/views/config/module.php
@@ -16,7 +16,7 @@
 <div class="panel panel-default">
 
     <div class="panel-heading">
-        <?= Yii::t('TwofaModule.config', '<strong>Two-Factor Authentication</strong> module configuration'); ?>
+        <?= Yii::t('TwofaModule.base', '<strong>Two-Factor Authentication</strong> module configuration'); ?>
     </div>
 
     <div class="panel-body">
@@ -25,7 +25,7 @@
         <div id="disabledDriversInfo"
              class="alert alert-warning"<?= empty($model->enabledDrivers) ? '' : ' style="display:none"' ?>>
             <i class="fa fa-info-circle"></i>
-            <?= Yii::t('TwofaModule.config', 'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.', [
+            <?= Yii::t('TwofaModule.base', 'This module is disabled because no drivers are selected, however users from the enforced groups always fallback to {defaultDriverName} driver by default.', [
                 'defaultDriverName' => $defaultDriverName
             ]) ?>
         </div>
@@ -43,12 +43,12 @@ class="alert alert-warning"<?= empty($model->enabledDrivers) ? '' : ' style="dis
 
         <?= $form->field($model, 'rememberMeDays'); ?>
         <div class="help-block">
-            <?= Yii::t('TwofaModule.config', 'Leave empty to disable this feature.') ?>
+            <?= Yii::t('TwofaModule.base', 'Leave empty to disable this feature.') ?>
         </div>
 
         <?= $form->field($model, 'trustedNetworks')->textarea() ?>
         <div class="help-block">
-            <?= Yii::t('TwofaModule.config', 'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"', [$ip]) ?>
+            <?= Yii::t('TwofaModule.base', 'List of IPs or subnets to whitelist, currently yours is {0}. Use coma separator to create a list, example: "{0}, 127.0.0.1"', [$ip]) ?>
         </div>
 
         <?= Button::save()->submit() ?>
diff --git a/views/config/user.php b/views/config/user.php
index 79e39a7..18c2bc4 100644
--- a/views/config/user.php
+++ b/views/config/user.php
@@ -16,14 +16,14 @@
 ?>
 
 <div class="panel-heading">
-    <?= Yii::t('TwofaModule.config', '<strong>Two-Factor Authentication</strong> settings'); ?>
+    <?= Yii::t('TwofaModule.base', '<strong>Two-Factor Authentication</strong> settings'); ?>
 </div>
 
 <?= AccountSettingsMenu::widget(); ?>
 
 <div class="panel-body">
     <div class="help-block">
-        <?= Yii::t('TwofaModule.config', 'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.'); ?>
+        <?= Yii::t('TwofaModule.base', 'Two-factor authentication (2FA) provides an additional level of security for your account. Once enabled, you will be prompted to enter a code in addition to entering your username and password.'); ?>
     </div>
     <br/>
 
diff --git a/views/config/userGoogleAuthenticator.php b/views/config/userGoogleAuthenticator.php
index 3d5f555..46653ed 100644
--- a/views/config/userGoogleAuthenticator.php
+++ b/views/config/userGoogleAuthenticator.php
@@ -26,7 +26,7 @@
 </div>
 
 <div class="form-group">
-    <?= Button::asLink(Yii::t('TwofaModule.config', 'Request new code'))
+    <?= Button::asLink(Yii::t('TwofaModule.base', 'Request new code'))
         ->icon('fa-qrcode')
         ->right()
         ->action('twofa.callDriverAction', Yii::$app->user->identity->createUrl('/twofa/user-settings/driver-action'))
diff --git a/views/config/userGoogleAuthenticatorCode.php b/views/config/userGoogleAuthenticatorCode.php
index 7b37e6f..25155e6 100644
--- a/views/config/userGoogleAuthenticatorCode.php
+++ b/views/config/userGoogleAuthenticatorCode.php
@@ -15,8 +15,8 @@
 /* @var $columnRightClass string */
 /* @var $codeSize integer */
 ?>
-<p><?= Yii::t('TwofaModule.config', 'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.',
-        ['{googleAuthenticatorLink}' => '<a href="https://support.google.com/accounts/answer/1066447" target="_blank">' . Yii::t('TwofaModule.config', 'Google Authenticator'). '</a>']); ?></p>
+<p><?= Yii::t('TwofaModule.base', 'Install an application that implements a time-based one-time password (TOTP) algorithm, such as {googleAuthenticatorLink}, and use it to scan the QR code shown below.',
+        ['{googleAuthenticatorLink}' => '<a href="https://support.google.com/accounts/answer/1066447" target="_blank">' . Yii::t('TwofaModule.base', 'Google Authenticator'). '</a>']); ?></p>
 
 <div class="row">
     <div class="<?= $columnLeftClass ?>">
@@ -27,14 +27,14 @@
     </div>
     <div class="<?= $columnRightClass ?>">
         <div class="alert alert-default">
-            <p><strong><?= Yii::t('TwofaModule.config', 'Can\'t scan the code?'); ?></strong></p>
+            <p><strong><?= Yii::t('TwofaModule.base', 'Can\'t scan the code?'); ?></strong></p>
             <br/>
-            <p><?= Yii::t('TwofaModule.config', 'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).'); ?></p>
+            <p><?= Yii::t('TwofaModule.base', 'To connect the app manually, provide the following details to the TOTP app (e.g. Google Authenticator).'); ?></p>
             <br/>
             <p>
-                <?= Yii::t('TwofaModule.config', 'Account:'); ?> <?= TwofaHelper::getAccountName() ?><br>
-                <?= Yii::t('TwofaModule.config', 'Secret:'); ?> <?= $secret ?><br>
-                <?= Yii::t('TwofaModule.config', 'Time based: Yes'); ?><br>
+                <?= Yii::t('TwofaModule.base', 'Account:'); ?> <?= TwofaHelper::getAccountName() ?><br>
+                <?= Yii::t('TwofaModule.base', 'Secret:'); ?> <?= $secret ?><br>
+                <?= Yii::t('TwofaModule.base', 'Time based: Yes'); ?><br>
             </p>
         </div>
     </div>