Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

This commit is contained in:
Dane Everitt 2017-09-16 17:39:54 -05:00
commit 34f1152d0f
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53

View file

@ -13,7 +13,7 @@ return [
'email_sent' => 'An email has been sent to you with further instructions for resetting your password.', 'email_sent' => 'An email has been sent to you with further instructions for resetting your password.',
'failed' => 'The credentials provided to not match those we have on record, or the 2FA token provided was invalid.', 'failed' => 'The credentials provided to not match those we have on record, or the 2FA token provided was invalid.',
'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
'password_requirements' => 'Passwords must contain at least one uppercase, lowecase, and numeric character and must be at least 8 characters in length.', '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', 'request_reset' => 'Locate Account',
'2fa_required' => '2-Factor Authentication', '2fa_required' => '2-Factor Authentication',
'2fa_failed' => 'The 2FA token provided was invalid.', '2fa_failed' => 'The 2FA token provided was invalid.',