mirror of
				https://github.com/firefly-iii/firefly-iii.git
				synced 2025-10-31 10:47:00 +00:00 
			
		
		
		
	Merge branch 'develop' into l10n_develop
This commit is contained in:
		| @@ -25,4 +25,4 @@ return [ | ||||
|     'failed'   => 'Неправильный адрес электронной почты или пароль.', | ||||
|     'throttle' => 'Слишком много попыток логина. Пожалуйста, попробуйте снова через :seconds секунд.', | ||||
|  | ||||
| ]; | ||||
| ]; | ||||
|   | ||||
| @@ -38,4 +38,4 @@ return [ | ||||
|     'createTag'         => 'Создать новый тег', | ||||
|     'edit_tag'          => 'Редактировать тег ":tag"', | ||||
|     'delete_tag'        => 'Удалить тег ":tag"', | ||||
| ]; | ||||
| ]; | ||||
|   | ||||
| @@ -20,4 +20,4 @@ return [ | ||||
|     'year'            => '%Y', | ||||
|     'half_year'       => '%B %Y', | ||||
|  | ||||
| ]; | ||||
| ]; | ||||
|   | ||||
| @@ -77,4 +77,4 @@ return [ | ||||
|     'column_tags-space'             => 'Tags (space separated)', | ||||
|     'column_account-number'         => 'Asset account (account number)', | ||||
|     'column_opposing-number'        => 'Opposing account (account number)', | ||||
| ]; | ||||
| ]; | ||||
|   | ||||
| @@ -21,4 +21,4 @@ return [ | ||||
|     'import-index'                   => 'Of course, any CSV file can be imported into Firefly III ', | ||||
|     'import-configure-security'      => 'Because of security concerns, your upload has been replaced with a local file.', | ||||
|     'import-configure-configuration' => 'The configuration you see below is correct for the local file.', | ||||
| ]; | ||||
| ]; | ||||
|   | ||||
| @@ -965,4 +965,4 @@ return [ | ||||
|  | ||||
|     // sandstorm.io errors and messages: | ||||
|     'sandstorm_not_available'              => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', | ||||
| ]; | ||||
| ]; | ||||
|   | ||||
| @@ -181,4 +181,4 @@ return [ | ||||
|     'payment_date'       => 'Payment date', | ||||
|     'invoice_date'       => 'Invoice date', | ||||
|     'internal_reference' => 'Internal reference', | ||||
| ]; | ||||
| ]; | ||||
|   | ||||
| @@ -30,4 +30,4 @@ return [ | ||||
|     'main-content-end-text'  => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.', | ||||
|     'index'                  => 'index', | ||||
|     'home'                   => 'home', | ||||
| ]; | ||||
| ]; | ||||
|   | ||||
| @@ -86,4 +86,4 @@ return [ | ||||
|     'budget_count'          => 'Number of budgets', | ||||
|     'rule_and_groups_count' => 'Number of rules and rule groups', | ||||
|     'tags_count'            => 'Number of tags', | ||||
| ]; | ||||
| ]; | ||||
|   | ||||
| @@ -14,4 +14,4 @@ return [ | ||||
|     'previous' => '« Previous', | ||||
|     'next'     => 'Next »', | ||||
|  | ||||
| ]; | ||||
| ]; | ||||
|   | ||||
| @@ -16,4 +16,4 @@ return [ | ||||
|     'sent'     => 'We have e-mailed your password reset link!', | ||||
|     'reset'    => 'Your password has been reset!', | ||||
|     'blocked'  => 'Nice try though.', | ||||
| ]; | ||||
| ]; | ||||
|   | ||||
| @@ -88,4 +88,4 @@ return [ | ||||
|     'in_array'                       => 'The :attribute field does not exist in :other.', | ||||
|     'present'                        => 'The :attribute field must be present.', | ||||
|     'amount_zero'                    => 'The total amount cannot be zero', | ||||
| ]; | ||||
| ]; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user