Fix merge with upstream

This commit is contained in:
E.Alamo
2018-05-27 07:09:02 +02:00
121 changed files with 2598 additions and 407 deletions

View File

@ -35,6 +35,7 @@ return [
'Are you sure you want to delete this user?' => '',
'Are you sure you want to switch to this user for the rest of this Session?' => '',
'Are you sure you want to unblock this user?' => '',
'Are you sure you wish to send a password recovery email to this user?' => '',
'Are you sure? Deleted user can not be restored' => '',
'Are you sure? There is no going back' => '',
'Assignments' => '',
@ -88,18 +89,20 @@ return [
'Deleted by GDPR request' => '',
'Description' => '',
'Didn\'t receive confirmation message?' => '',
'Disable Two-Factor Auth' => '',
'Disable two factor authentication' => '',
'Disconnect' => '',
'Don\'t have an account? Sign up!' => '',
'Download my data' => '',
'Email' => '',
'Email (public)' => '',
'Enable' => '',
'Enable Two-factor auth' => '',
'Enable two factor authentication' => '',
'Error occurred while changing password' => '',
'Error occurred while confirming user' => '',
'Error occurred while deleting user' => '',
'Export my data' => '',
'Error sending registration message to "{email}". Please try again later.' => '',
'Error sending welcome message to "{email}". Please try again later.' => '',
'Finish' => '',
'Forgot password?' => '',
'Gravatar email' => '',
@ -118,6 +121,7 @@ return [
'Invalid or expired link' => '',
'Invalid password' => '',
'Invalid two-factor code' => '',
'Invalid two factor authentication code' => '',
'Invalid value' => '',
'It will be deleted forever' => '',
'Items' => '',
@ -174,6 +178,7 @@ return [
'Rules' => '',
'Save' => '',
'Scan the QrCode with Google Authenticator App, then insert its temporary code on the box and submit.' => '',
'Send password recovery email' => '',
'Sign in' => '',
'Sign up' => '',
'Something went wrong' => '',
@ -189,23 +194,23 @@ return [
'This username has already been taken' => '',
'This will disable two-factor auth. Are you sure?' => '',
'This will remove your personal data from this site. You will no longer be able to sign in.' => '',
'This will disable two factor authentication. Are you sure?' => '',
'Time zone' => '',
'Time zone is not valid' => '',
'Two Factor Authentication' => '',
'Two factor successfully enabled.' => '',
'Two-Factor Authentication' => '',
'Two-factor auth protects you against stolen credentials' => '',
'Two-factor authentication code' => '',
'Two-factor authorization has been disabled.' => '',
'Two-factor code' => '',
'Two Factor Authentication (2FA)' => '',
'Two factor authentication code' => '',
'Two factor authentication has been disabled.' => '',
'Two factor authentication protects you against stolen credentials' => '',
'Two factor authentication successfully enabled.' => '',
'Unable to confirm user. Please, try again.' => '',
'Unable to create an account.' => '',
'Unable to create authorization item.' => '',
'Unable to create new authorization rule.' => '',
'Unable to delete user. Please, try again later.' => '',
'Unable to disable two-factor authorization.' => '',
'Unable to disable Two factor authentication.' => '',
'Unable to remove authorization item.' => '',
'Unable to send confirmation link' => '',
'Unable to send recovery message to the user' => '',
'Unable to update authorization item.' => '',
'Unable to update authorization rule.' => '',
'Unable to update block status.' => '',
@ -218,7 +223,9 @@ return [
'Update rule' => '',
'Update user account' => '',
'Updated at' => '',
'User account could not be created.' => '',
'User block status has been updated.' => '',
'User could not be registered.' => '',
'User has been confirmed' => '',
'User has been created' => '',
'User has been deleted' => '',
@ -262,9 +269,19 @@ return [
'Class "{0}" does not exist' => '@@@@',
'I aggree processing of my personal data and the use of cookies
to facilitate the operation of this site. For more information read our {privacyPolicy}' => '@@@@',
'Disable Two-Factor Auth' => '@@@@',
'Enable Two-factor auth' => '@@@@',
'Registration ip' => '@@@@',
'Rule class can not be instantiated' => '@@@@',
'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',
'Two Factor Authentication' => '@@@@',
'Two factor successfully enabled.' => '@@@@',
'Two-Factor Authentication' => '@@@@',
'Two-factor auth protects you against stolen credentials' => '@@@@',
'Two-factor authentication code' => '@@@@',
'Two-factor authorization has been disabled.' => '@@@@',
'Two-factor code' => '@@@@',
'Unable to disable two-factor authorization.' => '@@@@',
'We couldn\'t re-send the mail to confirm your address. ' => '@@@@',
'We have sent confirmation links to both old and new email addresses. ' => '@@@@',
];