Merge branch 'master' into bugfix_type_convertion

This commit is contained in:
Antonio Ramirez
2017-11-23 12:19:41 +01:00
committed by GitHub
2 changed files with 11 additions and 10 deletions

View File

@ -2,6 +2,7 @@
## 1.1.1 - Work in progress ## 1.1.1 - Work in progress
- Bug #115: Convert client_id to string because pgsql fail with type convertion (Dezinger) - Bug #115: Convert client_id to string because pgsql fail with type convertion (Dezinger)
- Enh #120: 2FA i18n russian translation (Dezinger)
- Bug #111: Fix migration for PostgreSQL DBMS (MKiselev) - Bug #111: Fix migration for PostgreSQL DBMS (MKiselev)
- Bug #106: Correct exception value returned in `MailEvent::getException` (kartik-v) - Bug #106: Correct exception value returned in `MailEvent::getException` (kartik-v)
- Enh #99: Added German translation (jkmssoft) - Enh #99: Added German translation (jkmssoft)

View File

@ -17,16 +17,16 @@
* NOTE: this file must be saved in UTF-8 encoding. * NOTE: this file must be saved in UTF-8 encoding.
*/ */
return [ return [
'Disable two factor authentication' => '', 'Disable two factor authentication' => 'Выключить двухфакторную авторизацию',
'Enable two factor authentication' => '', 'Enable two factor authentication' => 'Включить двухфакторную авторизацию',
'Invalid two factor authentication code' => '', 'Invalid two factor authentication code' => 'Неверный код двухфакторной авторизации',
'This will disable two factor authentication. Are you sure?' => '', 'This will disable two factor authentication. Are you sure?' => 'Двухфакторная авторизация будет отключена. Вы уверены?',
'Two Factor Authentication (2FA)' => '', 'Two Factor Authentication (2FA)' => 'Двухфакторная авторизация (2FA)',
'Two factor authentication code' => '', 'Two factor authentication code' => 'Код двухфакторной авторизации',
'Two factor authentication has been disabled.' => '', 'Two factor authentication has been disabled.' => 'Двухфакторная авторизация отключена.',
'Two factor authentication protects you against stolen credentials' => '', 'Two factor authentication protects you against stolen credentials' => 'Двухфакторная авторизация защитит вас от кражи параметров доступа',
'Two factor authentication successfully enabled.' => '', 'Two factor authentication successfully enabled.' => 'Двухфакторная авторизация успешно включена.',
'Unable to disable Two factor authentication.' => '', 'Unable to disable Two factor authentication.' => 'Не удалось отключить двухфакторную авторизацию.',
'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' => '@@Класс "{0}" не найден@@', 'Class "{0}" does not exist' => '@@Класс "{0}" не найден@@',