leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
E.Alamo
2018-05-27 16:26:42 +02:00
parent 4952d7bd3c
commit fc7ab68fec
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/User/resources/i18n/tr-TR/usuario.php
View File

@ -100,11 +100,9 @@ return [
'Error occurred while changing password' => '', 'Error occurred while changing password' => '',
'Error occurred while confirming user' => '', 'Error occurred while confirming user' => '',
'Error occurred while deleting user' => '', 'Error occurred while deleting user' => '',
<<<<<<< HEAD:src/User/resources/i18n/tr_TR/usuario.php
'Export my data' => '', 'Export my data' => '',
'Error sending registration message to "{email}". Please try again later.' => '', 'Error sending registration message to "{email}". Please try again later.' => '',
'Error sending welcome message to "{email}". Please try again later.' => '', 'Error sending welcome message to "{email}". Please try again later.' => '',
>>>>>>> upstream/master:src/User/resources/i18n/tr-TR/usuario.php
'Finish' => '', 'Finish' => '',
'Forgot password?' => '', 'Forgot password?' => '',
'Gravatar email' => '', 'Gravatar email' => '',
@ -121,11 +119,9 @@ return [
'Information' => '', 'Information' => '',
'Invalid login or password' => '', 'Invalid login or password' => '',
'Invalid or expired link' => '', 'Invalid or expired link' => '',
<<<<<<< HEAD:src/User/resources/i18n/tr_TR/usuario.php
'Invalid password' => '', 'Invalid password' => '',
'Invalid two-factor code' => '', 'Invalid two-factor code' => '',
'Invalid two factor authentication code' => '', 'Invalid two factor authentication code' => '',
>>>>>>> upstream/master:src/User/resources/i18n/tr-TR/usuario.php
'Invalid value' => '', 'Invalid value' => '',
'It will be deleted forever' => '', 'It will be deleted forever' => '',
'Items' => '', 'Items' => '',
@ -196,11 +192,9 @@ return [
'This account has already been connected to another user' => '', 'This account has already been connected to another user' => '',
'This email address has already been taken' => '', 'This email address has already been taken' => '',
'This username has already been taken' => '', 'This username has already been taken' => '',
<<<<<<< HEAD:src/User/resources/i18n/tr_TR/usuario.php
'This will disable two-factor auth. Are you sure?' => '', '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 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?' => '', 'This will disable two factor authentication. Are you sure?' => '',
>>>>>>> upstream/master:src/User/resources/i18n/tr-TR/usuario.php
'Time zone' => '', 'Time zone' => '',
'Time zone is not valid' => '', 'Time zone is not valid' => '',
'Two Factor Authentication (2FA)' => '', 'Two Factor Authentication (2FA)' => '',
@ -273,12 +267,10 @@ return [
'A message has been sent to your email address. ' => '@@@@', 'A message has been sent to your email address. ' => '@@@@',
'Awesome, almost there. ' => '@@@@', 'Awesome, almost there. ' => '@@@@',
'Class "{0}" does not exist' => '@@@@', 'Class "{0}" does not exist' => '@@@@',
<<<<<<< HEAD:src/User/resources/i18n/tr_TR/usuario.php
'I aggree processing of my personal data and the use of cookies '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}' => '@@@@', to facilitate the operation of this site. For more information read our {privacyPolicy}' => '@@@@',
'Disable Two-Factor Auth' => '@@@@', 'Disable Two-Factor Auth' => '@@@@',
'Enable Two-factor auth' => '@@@@', 'Enable Two-factor auth' => '@@@@',
>>>>>>> upstream/master:src/User/resources/i18n/tr-TR/usuario.php
'Registration ip' => '@@@@', 'Registration ip' => '@@@@',
'Rule class can not be instantiated' => '@@@@', 'Rule class can not be instantiated' => '@@@@',
'Rule class must extend "yii\\rbac\\Rule"' => '@@@@', 'Rule class must extend "yii\\rbac\\Rule"' => '@@@@',