Merge branch 'develop' into feature/bulk-reinstall-command

resources/lang/en/auth.php

@@ -1,22 +1,27 @@
 <?php
 
 return [
-    'not_authorized' => 'You are not authorized to perform this action.',
-    'auth_error' => 'There was an error while attempting to login.',
-    'authentication_required' => 'Authentication is required to continue.',
-    'remember_me' => 'Remember Me',
     'sign_in' => 'Sign In',
-    'forgot_password' => 'I\'ve forgotten my password!',
-    'request_reset_text' => 'Forgotten your account password? It is not the end of the world, just provide your email below.',
-    'reset_password_text' => 'Reset your account password.',
-    'reset_password' => 'Reset Account Password',
-    'email_sent' => 'An email has been sent to you with further instructions for resetting your password.',
-    'failed' => 'The credentials provided do not match those we have on record, or the 2FA token provided was invalid.',
+    'go_to_login' => 'Go to Login',
+    'failed' => 'No account matching those credentials could be found.',
+
+    'forgot_password' => [
+        'label' => 'Forgot Password?',
+        'label_help' => 'Enter your account email address to receive instructions on resetting your password.',
+        'button' => 'Recover Account',
+    ],
+
+    'reset_password' => [
+        'button' => 'Reset and Sign In',
+    ],
+
+    'two_factor' => [
+        'label' => '2-Factor Token',
+        'label_help' => 'This account requires a second layer of authentication in order to continue. Please enter the code generated by your device to complete this login.',
+        'checkpoint_failed' => 'The two-factor authentication token was invalid.',
+    ],
+
     'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
-    'password_requirements' => 'Passwords must contain at least one uppercase, lowercase, and numeric character and must be at least 8 characters in length.',
-    'request_reset' => 'Locate Account',
-    '2fa_required' => '2-Factor Authentication',
-    '2fa_failed' => 'The 2FA token provided was invalid.',
-    'totp_failed' => 'There was an error while attempting to validate TOTP.',
+    'password_requirements' => 'Password must be at least 8 characters in length and should be unique to this site.',
     '2fa_must_be_enabled' => 'The administrator has required that 2-Factor Authentication be enabled for your account in order to use the Panel.',
 ];

resources/lang/en/base.php

@@ -54,36 +54,4 @@ return [
             ],
         ],
     ],
-    'account' => [
-        'details_updated' => 'Your account details have been successfully updated.',
-        'invalid_password' => 'The password provided for your account was not valid.',
-        'header' => 'Your Account',
-        'header_sub' => 'Manage your account details.',
-        'update_pass' => 'Update Password',
-        'update_email' => 'Update Email Address',
-        'current_password' => 'Current Password',
-        'new_password' => 'New Password',
-        'new_password_again' => 'Repeat New Password',
-        'new_email' => 'New Email Address',
-        'first_name' => 'First Name',
-        'last_name' => 'Last Name',
-        'update_identity' => 'Update Identity',
-        'username_help' => 'Your username must be unique to your account, and may only contain the following characters: :requirements.',
-        'language' => 'Language',
-    ],
-    'security' => [
-        'session_mgmt_disabled' => 'Your host has not enabled the ability to manage account sessions via this interface.',
-        'header' => 'Account Security',
-        'header_sub' => 'Control active sessions and 2-Factor Authentication.',
-        'sessions' => 'Active Sessions',
-        '2fa_header' => '2-Factor Authentication',
-        '2fa_token_help' => 'Enter the 2FA Token generated by your app (Google Authenticator, Authy, etc.).',
-        'disable_2fa' => 'Disable 2-Factor Authentication',
-        '2fa_enabled' => '2-Factor Authentication is enabled on this account and will be required in order to login to the panel. If you would like to disable 2FA, simply enter a valid token below and submit the form.',
-        '2fa_disabled' => '2-Factor Authentication is disabled on your account! You should enable 2FA in order to add an extra level of protection on your account.',
-        'enable_2fa' => 'Enable 2-Factor Authentication',
-        '2fa_qr' => 'Configure 2FA on Your Device',
-        '2fa_checkpoint_help' => 'Use the 2FA application on your phone to take a picture of the QR code to the left, or manually enter the code under it. Once you have done so, generate a token and enter it below.',
-        '2fa_disable_error' => 'The 2FA token provided was not valid. Protection has not been disabled for this account.',
-    ],
 ];

resources/lang/en/dashboard/account.php

@@ -0,0 +1,28 @@
+<?php
+
+return [
+    'email' => [
+        'title' => 'Update your email',
+        'updated' => 'Your email address has been updated.',
+    ],
+    'password' => [
+        'title' => 'Change your password',
+        'requirements' => 'Your new password should be at least 8 characters in length.',
+        'updated' => 'Your password has been updated.',
+    ],
+    'two_factor' => [
+        'button' => 'Configure 2-Factor Authentication',
+        'disabled' => 'Two-factor authentication has been disabled on your account. You will no longer be prompted to provide a token when logging in.',
+        'enabled' => 'Two-factor authentication has been enabled on your account! From now on, when logging in, you will be required to provide the code generated by your device.',
+        'invalid' => 'The token provided was invalid.',
+        'setup' => [
+            'title' => 'Setup two-factor authentication',
+            'help' => 'Can\'t scan the code? Enter the code below into your application:',
+            'field' => 'Enter token',
+        ],
+        'disable' => [
+            'title' => 'Disable two-factor authentication',
+            'field' => 'Enter token',
+        ],
+    ],
+];

resources/lang/en/dashboard/index.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'search' => 'Search for servers...',
+    'no_matches' => 'There were no servers found matching the search criteria provided.',
+    'cpu_title' => 'CPU',
+    'memory_title' => 'Memory',
+];

resources/lang/en/strings.php

@@ -2,9 +2,11 @@
 
 return [
     'email' => 'Email',
+    'email_address' => 'Email address',
     'user_identifier' => 'Username or Email',
     'password' => 'Password',
-    'confirm_password' => 'Confirm Password',
+    'new_password' => 'New password',
+    'confirm_password' => 'Confirm new password',
     'login' => 'Login',
     'home' => 'Home',
     'servers' => 'Servers',
@@ -85,4 +87,8 @@ return [
         'sat' => 'Saturday',
     ],
     'last_used' => 'Last Used',
+    'enable' => 'Enable',
+    'disable' => 'Disable',
+    'save' => 'Save',
+    'copyright' => '© 2015 - :year Pterodactyl Software',
 ];

resources/lang/en/validation.php

@@ -101,5 +101,6 @@ return [
     // Internal validation logic for Pterodactyl
     'internal' => [
         'variable_value' => ':env variable',
+        'invalid_password' => 'The password provided was invalid for this account.',
     ],
 ];