Merge remote-tracking branch 'origin/2fa'

# Conflicts:
#	.php-cs-fixer.cache
#	config/language-translations.php
#	public/mix-manifest.json
#	resources/js/views/Auth/SignIn.vue
#	webpack.mix.js
This commit is contained in:
Peter Papp
2021-07-17 20:25:30 +02:00
18 changed files with 1035 additions and 110 deletions

View File

@@ -324,6 +324,7 @@ return [
'context_menu.delete' => 'Delete',
'context_menu.detail' => 'Detail',
'context_menu.download' => 'Download',
'context_menu.copy' => 'Copy',
'context_menu.empty_trash' => 'Empty Trash',
'context_menu.log_out' => 'Log Out',
'context_menu.move' => 'Move',
@@ -397,8 +398,7 @@ return [
'menu.files' => 'Files',
'menu.latest' => 'Recent Uploads',
'menu.logout' => 'Log Out',
'menu.password' => 'Password',
'menu.token' => 'Access Token',
'menu.password' => 'Account Security',
'menu.profile' => 'Profile Settings',
'menu.settings' => 'Settings',
'menu.shared' => 'Shared Files',
@@ -475,6 +475,13 @@ return [
'page_sign_in.placeholder_password' => 'Type your password',
'page_sign_in.subtitle' => 'Confirm you by your password',
'page_sign_in.title' => 'Are You {name}?',
'page_sign_in_2fa_title' => 'Welcome {name}',
'page_sign_in_2fa_subtitle' => 'Confirm you by 2FA code from your Authenticator app',
'page_sign_in.placeholder_2fa' => 'Type your 2FA code...',
'page_sign_in.2fa_recovery_text' => "Can't get your 2FA code?",
'page_sign_in.2fa_recovery_button' => 'Use recovery code.',
'page_sign_in.2fa_recovery_subtitle' => 'Use your recovery code',
'page_sign_in.placeholder_2fa_recovery' => "Type your recovery code",
'page_not_verified.subtitle' => 'Your account is not verified. Before login, verify your account please.',
'page_not_verified.resend_text' => 'Do you want resend verification email?',
'page_not_verified.resend_button' => 'Resend verification email.',
@@ -549,7 +556,6 @@ return [
'routes_title.profile' => 'My Profile',
'routes_title.settings' => 'Settings',
'routes_title.settings_password' => 'Change Password',
'routes_title.token' => 'Access Token',
'routes_title.settings_storage' => 'Storage',
'routes_title.user_create' => 'Create User',
'routes_title.users_delete' => 'Delete User',
@@ -625,7 +631,6 @@ return [
'user_box_role.title' => 'Change User Role',
'user_box_storage.description' => "Change user storage capacity by input bellow. You have to type only number e.g. value '5' means, user will have 5GB of storage capacity.",
'user_box_storage.title' => 'Change User Storage Capacity',
'user_token.title' => 'Access Tokens',
'user_password.title' => 'Change Your Password',
'user_settings.address' => 'Address',
'user_settings.address_plac' => 'Type your billing address',
@@ -645,6 +650,8 @@ return [
'user_settings.timezone_plac' => 'Select your timezone',
'user_settings.title_account' => 'Account Information',
'user_settings.title_billing' => 'Billing Information',
'validation_errors.incorrect_2fa_code' => 'Sorry, you passed incorrect or expired code',
'validation_errors.incorrect_2fa_recovery_code' => 'Sorry, you passed incorrect recovery code',
'validation_errors.incorrect_password' => 'Sorry, you passed incorrect password :(',
'validation_errors.wrong_image' => 'You may have uploaded the wrong file, try again!',
'app_description' => 'Your self-hosted storage cloud software powered by Laravel and Vue',
@@ -686,6 +693,26 @@ return [
'app_touch_icon' => 'App Touch Icon',
'app_touch_icon_description' => 'If user store bookmark on his phone screen, this icon appear in app thumbnail. Preferred size is 156x156',
'select_search_placeholder' => 'Search in list...',
'2fa.settings.title' => 'Two Factor Authentication',
'2fa.i_have_2fa_app' => 'I have already 2FA app',
'popup_2fa.title' => 'Confirm Your Password',
'popup_2fa.input_label' => 'Password',
'popup_2fa.placeholder' => 'Type your password',
'popup_2fa.help' => 'Scan the image above with the <b class="text-theme">two-factor authentication app</b> on your phone.',
'popup_2fa.confirm_button' => 'Confirm',
'popup_2fa.disappear_qr' => 'Really disappear this QR code?',
'popup_2fa.toaster_enabled' => 'Your 2FA was enabled successfully!',
'popup_2fa.toaster_disabled' => 'Your 2FA was disabled!',
'popup_2fa.switch_title' => 'Enable / Disable Two Factor Authentication',
'popup_2fa.switch_info' => 'Here you can improve your account security by turn on 2fa verification.',
'popup_2fa.codes_title' => 'Show Recovery Codes',
'popup_2fa.codes_info' => 'Recovery codes can be used to access your account in the event you lose access to your device and cannot receive two-factor authentication codes.',
'popup_2fa.codes_button' => 'Show Codes',
'popup_2fa.popup_codes_title' => 'Your Security Codes',
'popup_2fa.popup_codes_disclaimer' => '<b class="text-theme">Put these in a safe spot.</b> If you lose your device and dont have the recovery codes you will lose access to your account.',
'context_menu.codes_regenerate' => 'Regenerate Codes',
'popup_2fa.toaster_codes_copied' => 'Your codes was copied!',
'popup_2fa.toaster_codes_regenerated' => 'Your codes was regenerated!',
'go_home' => 'Go to the homepage',
],
];