kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 02:36:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into develop

Browse Source
This commit is contained in:
James Cole
2023-10-22 08:05:48 +02:00
parent b032210a33 c3398d4d51
commit 24e0839c34
31 changed files with 765 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
resources/lang/en_US/firefly.php
View File

@@ -1583,7 +1583,8 @@ return [
'create_currency' => 'Create a new currency',
'store_currency' => 'Store new currency',
'update_currency' => 'Update currency',
'new_default_currency' => ':name is now the default currency.',
'new_default_currency' => '":name" is now the default currency.',
'default_currency_failed' => 'Could not make ":name" the default currency. Please check the logs.',
'cannot_delete_currency' => 'Cannot delete :name because it is still in use.',
'cannot_delete_fallback_currency' => ':name is the system fallback currency and can\'t be deleted.',
'cannot_disable_currency_journals' => 'Cannot disable :name because transactions are still using it.',
@@ -1609,7 +1610,9 @@ return [
'disable_currency' => 'Disable',
'currencies_default_disabled' => 'Most of these currencies are disabled by default. To use them, you must enable them first.',
'currency_is_now_enabled' => 'Currency ":name" has been enabled',
'could_not_enable_currency' => 'Could not enable currency ":name". Please review the logs.',
'currency_is_now_disabled' => 'Currency ":name" has been disabled',
'could_not_disable_currency' => 'Could not disable currency ":name". Perhaps it is still in use?',
// forms:
'mandatoryFields' => 'Mandatory fields',