StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into pr/1129

Browse source
This commit is contained in:
Dane Everitt 2018-05-26 10:34:29 -07:00
commit e3bbd85f3f
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
174 changed files with 1485 additions and 1116 deletions
Download patch file Download diff file Expand all files Collapse all files

10
resources/lang/en/base.php
View file

@ -36,7 +36,7 @@ return [
'index' => [
'list' => 'Your Keys',
'header' => 'Account API',
'header_sub' => 'Manage access keys that allow you to perform actions aganist the panel.',
'header_sub' => 'Manage access keys that allow you to perform actions against the panel.',
'create_new' => 'Create New API key',
'keypair_created' => 'An API key has been successfully generated and is listed below.',
],
@ -50,7 +50,7 @@ return [
],
'allowed_ips' => [
'title' => 'Allowed IPs',
'description' => 'Enter a line delimitated list of IPs that are allowed to access the API using this key. CIDR notation is allowed. Leave blank to allow any IP.',
'description' => 'Enter a line delimited list of IPs that are allowed to access the API using this key. CIDR notation is allowed. Leave blank to allow any IP.',
],
],
],
@ -67,7 +67,7 @@ return [
'new_email' => 'New Email Address',
'first_name' => 'First Name',
'last_name' => 'Last Name',
'update_identitity' => 'Update Identity',
'update_identity' => 'Update Identity',
'username_help' => 'Your username must be unique to your account, and may only contain the following characters: :requirements.',
],
'security' => [
@ -76,12 +76,12 @@ return [
'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 Authenticatior, Authy, etc.).',
'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' => 'Confgure 2FA on Your Device',
'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.',
],