kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 01:42:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into adminlte4

Browse Source 
# Conflicts:
#	yarn.lock
This commit is contained in:
James Cole
2023-08-01 09:47:30 +02:00
parent b2084a94e5 8d55f7f2e5
commit fc78c9a1d6
85 changed files with 1096 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -834,12 +834,12 @@ return [
'rule_trigger_transaction_type' => 'Transaction is of type ":trigger_value"',
'rule_trigger_category_is_choice' => 'Category is..',
'rule_trigger_category_is' => 'Category is ":trigger_value"',
'rule_trigger_amount_less_choice' => 'Amount is less than..',
'rule_trigger_amount_less' => 'Amount is less than :trigger_value',
'rule_trigger_amount_less_choice' => 'Amount is less than or equal to ..',
'rule_trigger_amount_less' => 'Amount is less than or equal to :trigger_value',
'rule_trigger_amount_is_choice' => 'Amount is..',
'rule_trigger_amount_is' => 'Amount is :trigger_value',
'rule_trigger_amount_more_choice' => 'Amount is more than..',
'rule_trigger_amount_more' => 'Amount is more than :trigger_value',
'rule_trigger_amount_more_choice' => 'Amount is more than or equal to..',
'rule_trigger_amount_more' => 'Amount is more than or equal to :trigger_value',
'rule_trigger_description_starts_choice' => 'Description starts with..',
'rule_trigger_description_starts' => 'Description starts with ":trigger_value"',
'rule_trigger_description_ends_choice' => 'Description ends with..',
@@ -2616,6 +2616,10 @@ return [
'ale_action_remove_from_piggy' => 'Piggy bank',
'ale_action_add_tag' => 'Added tag',
// dashboard
'enable_auto_convert' => 'Enable currency conversion',
'disable_auto_convert' => 'Disable currency conversion',
];
// Ignore this comment

1
resources/lang/en_US/form.php
View File

@@ -127,6 +127,7 @@ return [
'start_date' => 'Start of range',
'end_date' => 'End of range',
'enddate' => 'End date',
'move_rules_before_delete' => 'Rule group',
'start' => 'Start of range',
'end' => 'End of range',
'delete_account' => 'Delete account ":name"',