Merge branch 'fix-ui-2fareset'

Author: Kristan Kenney

web/inc/i18n/de.php

@@ -850,9 +850,9 @@
     // Set default language
     'SYSTEM_SET_DEFAULT_LANGUAGE' => 'Als Standardsprache für alle Benutzer festlegen',
 
-        //2FA 
+    //2FA 
     'Forgot token' => 'Token vergessen',
-    '2FA Token' => '2FA Token',
+    '2FA Token' => 'OTP PIN',
     '2FA Reset successfully' => '2FA Token wurde mit Erfolg zurückgesetzt. Sie können sich jetzt erneut anmelden',
     'Reset 2FA' => '2FA zurücksetzen',
     '2FA Reset Code' => 'Kontowiederherstellungscode',

web/inc/i18n/en.php

@@ -853,10 +853,10 @@
     'SYSTEM_SET_DEFAULT_LANGUAGE' => 'Set as default language for all users',
 
     //2FA 
-    'Forgot token' => 'Forgot token',
-    '2FA Token' => '2FA Token',
-    '2FA Reset successfully' => '2FA Token has been reset with success. You are now able to login again',
-    'Reset 2FA' => 'Reset 2FA',
+    'Forgot token' => 'Unlock Account',
+    '2FA Token' => 'OTP PIN',
+    '2FA Reset successfully' => 'Two-factor authentication is now turned off for your account.<br><br>You may now proceed to log in.',
+    'Reset 2FA' => 'Unlock Account',
     '2FA Reset Code' => 'Account Recovery Code',
     'Invalid or missing token' => 'Invalid or missing token',
 );

web/inc/i18n/it.php

@@ -851,9 +851,9 @@
     // Set default language
     'SYSTEM_SET_DEFAULT_LANGUAGE' => 'Imposta come lingua predefinita per tutti gli utenti',
 
-        //2FA 
+    //2FA 
     'Forgot token' => 'Codice dimenticato',
-    '2FA Token' => 'Codice 2fa',
+    '2FA Token' => 'PIN OTP',
     '2FA Reset successfully' => 'Il codice 2FA è stato ripristinato correttamente. Ora puoi accedere di nuovo',
     'Reset 2FA' => 'Reimposta il codice 2FA',
     '2FA Reset Code' => 'Codice di recupero dell\'account',

web/templates/reset2fa.html

@@ -15,6 +15,11 @@
                                             <?php print __('2FA Reset successfully'); ?>
                                             </td>
                                             </tr>
+                                            <tr>
+                                                <td style="padding: 20px 0 12px 0;">
+                                                    <input type="button" class="button cancel" value="<?php print __('Log in');?>" onclick="location.href='/login/'">
+                                                </td>
+                                            </tr>
                                         </table>
                                         <?php }else{ ?>
                                         <form method="post" action="/reset2fa/">