diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 83ab8a37ee..d052463b95 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -866,11 +866,6 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'setting_is_demo_site_explain' => 'Wenn sie diese Option auswählen, wird sich diese Installation wie eine Demonstrationsseite verhalten, was ungwollte Auswirkungen haben kann.',
'setting_send_email_notifications' => 'E-Mail-Benachrichtigungen senden',
'setting_send_email_explain' => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
- 'mail_for_lockout_help' => 'Wenn ein Benutzer gesperrt ist',
- 'mail_for_blocked_domain_help' => 'When a user tries to register using a blocked domain',
- 'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address',
- 'mail_for_bad_login_help' => 'When a user fails to login',
- 'mail_for_blocked_login_help' => 'When a blocked user tries to login',
'block_code_bounced' => 'Email message(s) bounced',
'block_code_expired' => 'Demo account expired',
'no_block_code' => 'No reason for block or user not blocked',
diff --git a/resources/lang/de_DE/form.php b/resources/lang/de_DE/form.php
index a695d4be5f..34d680be08 100644
--- a/resources/lang/de_DE/form.php
+++ b/resources/lang/de_DE/form.php
@@ -162,11 +162,6 @@ return [
'single_user_mode' => 'Einzelnutzermodus',
'must_confirm_account' => 'Erstanwender müssen ihr Konto aktivieren',
'is_demo_site' => 'Ist eine Demonstrationsseite',
- 'mail_for_lockout' => 'Ausgesperrt',
- 'mail_for_blocked_domain' => 'Gesperrte Domain',
- 'mail_for_blocked_email' => 'Gesperrte Email-Adresse',
- 'mail_for_bad_login' => 'Anmeldung fehlgeschlagen',
- 'mail_for_blocked_login' => 'Gesperrter Benutzer',
// import
diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php
index 900cc6c6f7..fe2a5a2bcc 100644
--- a/resources/lang/es_ES/firefly.php
+++ b/resources/lang/es_ES/firefly.php
@@ -865,11 +865,6 @@ return [
'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
'setting_send_email_notifications' => 'Send email notifications',
'setting_send_email_explain' => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
- 'mail_for_lockout_help' => 'When a user is locked out',
- 'mail_for_blocked_domain_help' => 'When a user tries to register using a blocked domain',
- 'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address',
- 'mail_for_bad_login_help' => 'When a user fails to login',
- 'mail_for_blocked_login_help' => 'When a blocked user tries to login',
'block_code_bounced' => 'Email message(s) bounced',
'block_code_expired' => 'Demo account expired',
'no_block_code' => 'No reason for block or user not blocked',
diff --git a/resources/lang/es_ES/form.php b/resources/lang/es_ES/form.php
index af698dcb73..8d0beed425 100644
--- a/resources/lang/es_ES/form.php
+++ b/resources/lang/es_ES/form.php
@@ -162,11 +162,6 @@ return [
'single_user_mode' => 'Single user mode',
'must_confirm_account' => 'New users must activate account',
'is_demo_site' => 'Is demo site',
- 'mail_for_lockout' => 'Locked out',
- 'mail_for_blocked_domain' => 'Blocked domain',
- 'mail_for_blocked_email' => 'Blocked email address',
- 'mail_for_bad_login' => 'Login failure',
- 'mail_for_blocked_login' => 'Blocked user',
// import
diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index ca76af2c36..3504c4b147 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -865,11 +865,6 @@ return [
'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
'setting_send_email_notifications' => 'Send email notifications',
'setting_send_email_explain' => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
- 'mail_for_lockout_help' => 'When a user is locked out',
- 'mail_for_blocked_domain_help' => 'When a user tries to register using a blocked domain',
- 'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address',
- 'mail_for_bad_login_help' => 'When a user fails to login',
- 'mail_for_blocked_login_help' => 'When a blocked user tries to login',
'block_code_bounced' => 'Email message(s) bounced',
'block_code_expired' => 'Demo account expired',
'no_block_code' => 'No reason for block or user not blocked',
diff --git a/resources/lang/fr_FR/form.php b/resources/lang/fr_FR/form.php
index ec5aca8d95..d496bb8ed7 100644
--- a/resources/lang/fr_FR/form.php
+++ b/resources/lang/fr_FR/form.php
@@ -162,11 +162,6 @@ return [
'single_user_mode' => 'Mode utilisateur unique',
'must_confirm_account' => 'New users must activate account',
'is_demo_site' => 'Is demo site',
- 'mail_for_lockout' => 'Locked out',
- 'mail_for_blocked_domain' => 'Blocked domain',
- 'mail_for_blocked_email' => 'Blocked email address',
- 'mail_for_bad_login' => 'Login failure',
- 'mail_for_blocked_login' => 'Blocked user',
// import
diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php
index 900cc6c6f7..fe2a5a2bcc 100644
--- a/resources/lang/hr_HR/firefly.php
+++ b/resources/lang/hr_HR/firefly.php
@@ -865,11 +865,6 @@ return [
'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
'setting_send_email_notifications' => 'Send email notifications',
'setting_send_email_explain' => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
- 'mail_for_lockout_help' => 'When a user is locked out',
- 'mail_for_blocked_domain_help' => 'When a user tries to register using a blocked domain',
- 'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address',
- 'mail_for_bad_login_help' => 'When a user fails to login',
- 'mail_for_blocked_login_help' => 'When a blocked user tries to login',
'block_code_bounced' => 'Email message(s) bounced',
'block_code_expired' => 'Demo account expired',
'no_block_code' => 'No reason for block or user not blocked',
diff --git a/resources/lang/hr_HR/form.php b/resources/lang/hr_HR/form.php
index af698dcb73..8d0beed425 100644
--- a/resources/lang/hr_HR/form.php
+++ b/resources/lang/hr_HR/form.php
@@ -162,11 +162,6 @@ return [
'single_user_mode' => 'Single user mode',
'must_confirm_account' => 'New users must activate account',
'is_demo_site' => 'Is demo site',
- 'mail_for_lockout' => 'Locked out',
- 'mail_for_blocked_domain' => 'Blocked domain',
- 'mail_for_blocked_email' => 'Blocked email address',
- 'mail_for_bad_login' => 'Login failure',
- 'mail_for_blocked_login' => 'Blocked user',
// import
diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 703b2380ba..9a05e80fa4 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -865,11 +865,6 @@ return [
'setting_is_demo_site_explain' => 'Als je dit aanzet doet jouw installatie alsof het een demo-site is, en dat kan problemen opleveren.',
'setting_send_email_notifications' => 'Stuur e-mail notificaties',
'setting_send_email_explain' => 'Firefly III kan je email notificaties sturen over allerhande zaken. Deze worden gestuurd naar :site_owner. Dat e-mailadres kan je instellen in het .env-bestand.',
- 'mail_for_lockout_help' => 'Als een user tijdelijk niet mag inloggen',
- 'mail_for_blocked_domain_help' => 'Als een gebruiker wil registreren met een geblokkeerd domein',
- 'mail_for_blocked_email_help' => 'Als een gebruiker wil registreren met een geblokkeerd e-mailadres',
- 'mail_for_bad_login_help' => 'Als een user met de verkeerde gegevens probeert in te loggen',
- 'mail_for_blocked_login_help' => 'Als een geblokkeerde gebruiker probeert in te loggen',
'block_code_bounced' => 'Email kwam niet aan',
'block_code_expired' => 'Demo-account verlopen',
'no_block_code' => 'Geen reden of gebruiker niet geblokkeerd',
diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php
index 8119fed791..52f39cf82e 100644
--- a/resources/lang/nl_NL/form.php
+++ b/resources/lang/nl_NL/form.php
@@ -162,11 +162,6 @@ return [
'single_user_mode' => 'Enkele gebruiker-modus',
'must_confirm_account' => 'Nieuwe gebruikers moeten hun account activeren',
'is_demo_site' => 'Is demo website',
- 'mail_for_lockout' => 'Tijdelijk niet inloggen',
- 'mail_for_blocked_domain' => 'Geblokkeerd domein',
- 'mail_for_blocked_email' => 'Geblokkeerd e-mailadres',
- 'mail_for_bad_login' => 'Mislukte login',
- 'mail_for_blocked_login' => 'Geblokkeerde gebruiker',
// import
diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index 57f4492b53..28ef0df704 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -865,11 +865,6 @@ return [
'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
'setting_send_email_notifications' => 'Send email notifications',
'setting_send_email_explain' => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
- 'mail_for_lockout_help' => 'When a user is locked out',
- 'mail_for_blocked_domain_help' => 'When a user tries to register using a blocked domain',
- 'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address',
- 'mail_for_bad_login_help' => 'When a user fails to login',
- 'mail_for_blocked_login_help' => 'When a blocked user tries to login',
'block_code_bounced' => 'Email message(s) bounced',
'block_code_expired' => 'Demo account expired',
'no_block_code' => 'No reason for block or user not blocked',
diff --git a/resources/lang/pt_BR/form.php b/resources/lang/pt_BR/form.php
index b9e54eeeaf..cb529c917d 100644
--- a/resources/lang/pt_BR/form.php
+++ b/resources/lang/pt_BR/form.php
@@ -162,11 +162,6 @@ return [
'single_user_mode' => 'Modo de usuário único',
'must_confirm_account' => 'Novos usuários devem ativar a conta',
'is_demo_site' => 'É o site de demonstração',
- 'mail_for_lockout' => 'Locked out',
- 'mail_for_blocked_domain' => 'Blocked domain',
- 'mail_for_blocked_email' => 'Blocked email address',
- 'mail_for_bad_login' => 'Login failure',
- 'mail_for_blocked_login' => 'Blocked user',
// import
diff --git a/resources/lang/ru_RU/auth.php b/resources/lang/ru_RU/auth.php
index 5d833b3d68..bc725bca9b 100644
--- a/resources/lang/ru_RU/auth.php
+++ b/resources/lang/ru_RU/auth.php
@@ -22,7 +22,7 @@ return [
|
*/
- 'failed' => 'These credentials do not match our records.',
- 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+ 'failed' => 'Неправильный адрес электронной почты или пароль.',
+ 'throttle' => 'Слишком много попыток логина. Пожалуйста, попробуйте снова через :seconds секунд.',
];
\ No newline at end of file
diff --git a/resources/lang/ru_RU/breadcrumbs.php b/resources/lang/ru_RU/breadcrumbs.php
index 6bcf9b862d..646511cec4 100644
--- a/resources/lang/ru_RU/breadcrumbs.php
+++ b/resources/lang/ru_RU/breadcrumbs.php
@@ -11,31 +11,31 @@
*/
return [
- 'home' => 'Home',
+ 'home' => 'Главная',
'edit_currency' => 'Edit currency ":name"',
'delete_currency' => 'Delete currency ":name"',
- 'newPiggyBank' => 'Create a new piggy bank',
- 'edit_piggyBank' => 'Edit piggy bank ":name"',
- 'preferences' => 'Preferences',
- 'profile' => 'Profile',
- 'changePassword' => 'Change your password',
- 'bills' => 'Bills',
- 'newBill' => 'New bill',
- 'edit_bill' => 'Edit bill ":name"',
- 'delete_bill' => 'Delete bill ":name"',
- 'reports' => 'Reports',
- 'searchResult' => 'Search for ":query"',
- 'withdrawal_list' => 'Expenses',
- 'deposit_list' => 'Revenue, income and deposits',
- 'transfer_list' => 'Transfers',
- 'transfers_list' => 'Transfers',
- 'create_withdrawal' => 'Create new withdrawal',
- 'create_deposit' => 'Create new deposit',
- 'create_transfer' => 'Create new transfer',
- 'edit_journal' => 'Edit transaction ":description"',
- 'delete_journal' => 'Delete transaction ":description"',
- 'tags' => 'Tags',
- 'createTag' => 'Create new tag',
- 'edit_tag' => 'Edit tag ":tag"',
- 'delete_tag' => 'Delete tag ":tag"',
+ 'newPiggyBank' => 'Создать новую копилку',
+ 'edit_piggyBank' => 'Редактировать копилку ":name"',
+ 'preferences' => 'Параметры',
+ 'profile' => 'Профиль',
+ 'changePassword' => 'Сменить пароль',
+ 'bills' => 'Счета',
+ 'newBill' => 'Новый счет',
+ 'edit_bill' => 'Редактировать счет ":name"',
+ 'delete_bill' => 'Удалить счет ":name"',
+ 'reports' => 'Отчёты',
+ 'searchResult' => 'Поиск ":query"',
+ 'withdrawal_list' => 'Расходы',
+ 'deposit_list' => 'Доходы и депозиты',
+ 'transfer_list' => 'Переводы',
+ 'transfers_list' => 'Переводы',
+ 'create_withdrawal' => 'Создать новый вывод средств',
+ 'create_deposit' => 'Создать новый депозит',
+ 'create_transfer' => 'Создать новый перевод',
+ 'edit_journal' => 'Редактировать транзакцию ":description"',
+ 'delete_journal' => 'Удалить транзакцию ":description"',
+ 'tags' => 'Теги',
+ 'createTag' => 'Создать новый тег',
+ 'edit_tag' => 'Редактировать тег ":tag"',
+ 'delete_tag' => 'Удалить тег ":tag"',
];
\ No newline at end of file
diff --git a/resources/lang/ru_RU/config.php b/resources/lang/ru_RU/config.php
index 58220429bf..5544349117 100644
--- a/resources/lang/ru_RU/config.php
+++ b/resources/lang/ru_RU/config.php
@@ -10,12 +10,12 @@
*/
return [
- 'locale' => 'en, English, en_US, en_US.utf8',
+ 'locale' => 'ru, Russian, ru_RU, ru_RU.utf8',
'month' => '%B %Y',
'month_and_day' => '%B %e, %Y',
'date_time' => '%B %e, %Y, @ %T',
'specific_day' => '%e %B %Y',
- 'week_in_year' => 'Week %W, %Y',
+ 'week_in_year' => 'Неделя %W, %Y',
'quarter_of_year' => '%B %Y',
'year' => '%Y',
'half_year' => '%B %Y',
diff --git a/resources/lang/ru_RU/csv.php b/resources/lang/ru_RU/csv.php
index 4acb52efdc..37e4e88998 100644
--- a/resources/lang/ru_RU/csv.php
+++ b/resources/lang/ru_RU/csv.php
@@ -13,12 +13,12 @@ declare(strict_types = 1);
return [
- 'import_configure_title' => 'Configure your import',
- 'import_configure_intro' => 'There are some options for your CSV import. Please indicate if your CSV file contains headers on the first column, and what the date format of your date-fields is. That might require some experimentation. The field delimiter is usually a ",", but could also be a ";". Check this carefully.',
- 'import_configure_form' => 'Basic CSV import options',
- 'header_help' => 'Check this if the first row of your CSV file are the column titles',
- 'date_help' => 'Date time format in your CSV. Follow the format like this page indicates. The default value will parse dates that look like this: :dateExample.',
- 'delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
+ 'import_configure_title' => 'Настройки импорта',
+ 'import_configure_intro' => 'Есть несколько вариантов для импорта CSV. Пожалуйста, укажите, содержит ли CSV-файл заголовки в первом столбце, и каков формат даты в вашем поле даты. Возможно, придется немного поэкспериментировать. Разделитель полей обычно «,», но также может быть «;». Внимательно проверьте это.',
+ 'import_configure_form' => 'Основные параметры импорта CSV',
+ 'header_help' => 'Проверьте, если первая строка CSV файла - это заголовки столбцов',
+ 'date_help' => 'Формат даты и времени в CSV файле. Следуйте формату, как показывает на этой странице. По умолчанию будет анализироваться даты, которые выглядят следующим образом: :dateExample.',
+ 'delimiter_help' => 'Выберите разделитель полей, который используется в вашем файле. Если не уверены, запятая - самый безопасный вариант.',
'import_account_help' => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.',
'upload_not_writeable' => 'The grey box contains a file path. It should be writeable. Please make sure it is.',
diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php
index 900cc6c6f7..fe2a5a2bcc 100644
--- a/resources/lang/ru_RU/firefly.php
+++ b/resources/lang/ru_RU/firefly.php
@@ -865,11 +865,6 @@ return [
'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
'setting_send_email_notifications' => 'Send email notifications',
'setting_send_email_explain' => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
- 'mail_for_lockout_help' => 'When a user is locked out',
- 'mail_for_blocked_domain_help' => 'When a user tries to register using a blocked domain',
- 'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address',
- 'mail_for_bad_login_help' => 'When a user fails to login',
- 'mail_for_blocked_login_help' => 'When a blocked user tries to login',
'block_code_bounced' => 'Email message(s) bounced',
'block_code_expired' => 'Demo account expired',
'no_block_code' => 'No reason for block or user not blocked',
diff --git a/resources/lang/ru_RU/form.php b/resources/lang/ru_RU/form.php
index af698dcb73..8d0beed425 100644
--- a/resources/lang/ru_RU/form.php
+++ b/resources/lang/ru_RU/form.php
@@ -162,11 +162,6 @@ return [
'single_user_mode' => 'Single user mode',
'must_confirm_account' => 'New users must activate account',
'is_demo_site' => 'Is demo site',
- 'mail_for_lockout' => 'Locked out',
- 'mail_for_blocked_domain' => 'Blocked domain',
- 'mail_for_blocked_email' => 'Blocked email address',
- 'mail_for_bad_login' => 'Login failure',
- 'mail_for_blocked_login' => 'Blocked user',
// import
diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php
index 900cc6c6f7..fe2a5a2bcc 100644
--- a/resources/lang/zh_HK/firefly.php
+++ b/resources/lang/zh_HK/firefly.php
@@ -865,11 +865,6 @@ return [
'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
'setting_send_email_notifications' => 'Send email notifications',
'setting_send_email_explain' => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
- 'mail_for_lockout_help' => 'When a user is locked out',
- 'mail_for_blocked_domain_help' => 'When a user tries to register using a blocked domain',
- 'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address',
- 'mail_for_bad_login_help' => 'When a user fails to login',
- 'mail_for_blocked_login_help' => 'When a blocked user tries to login',
'block_code_bounced' => 'Email message(s) bounced',
'block_code_expired' => 'Demo account expired',
'no_block_code' => 'No reason for block or user not blocked',
diff --git a/resources/lang/zh_HK/form.php b/resources/lang/zh_HK/form.php
index af698dcb73..8d0beed425 100644
--- a/resources/lang/zh_HK/form.php
+++ b/resources/lang/zh_HK/form.php
@@ -162,11 +162,6 @@ return [
'single_user_mode' => 'Single user mode',
'must_confirm_account' => 'New users must activate account',
'is_demo_site' => 'Is demo site',
- 'mail_for_lockout' => 'Locked out',
- 'mail_for_blocked_domain' => 'Blocked domain',
- 'mail_for_blocked_email' => 'Blocked email address',
- 'mail_for_bad_login' => 'Login failure',
- 'mail_for_blocked_login' => 'Blocked user',
// import
diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index bb07727fb9..af705c6f8b 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -865,11 +865,6 @@ return [
'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
'setting_send_email_notifications' => 'Send email notifications',
'setting_send_email_explain' => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
- 'mail_for_lockout_help' => 'When a user is locked out',
- 'mail_for_blocked_domain_help' => 'When a user tries to register using a blocked domain',
- 'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address',
- 'mail_for_bad_login_help' => 'When a user fails to login',
- 'mail_for_blocked_login_help' => 'When a blocked user tries to login',
'block_code_bounced' => 'Email message(s) bounced',
'block_code_expired' => 'Demo account expired',
'no_block_code' => 'No reason for block or user not blocked',
diff --git a/resources/lang/zh_TW/form.php b/resources/lang/zh_TW/form.php
index b50b217c62..3b634fc69e 100644
--- a/resources/lang/zh_TW/form.php
+++ b/resources/lang/zh_TW/form.php
@@ -162,11 +162,6 @@ return [
'single_user_mode' => 'Single user mode',
'must_confirm_account' => 'New users must activate account',
'is_demo_site' => 'Is demo site',
- 'mail_for_lockout' => 'Locked out',
- 'mail_for_blocked_domain' => 'Blocked domain',
- 'mail_for_blocked_email' => 'Blocked email address',
- 'mail_for_bad_login' => 'Login failure',
- 'mail_for_blocked_login' => 'Blocked user',
// import