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

Merge branch 'develop' into feature/credit_calc

Browse Source 
# Conflicts:
#	app/Repositories/Account/AccountRepository.php
This commit is contained in:
James Cole
2021-05-02 06:27:32 +02:00
parent a83578d1ae 8f6655f85e
commit d0622dbcd3
99 changed files with 1254 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -431,7 +431,6 @@ return [
'apply_rule_group_selection' => 'Apply rule group ":title" to a selection of your transactions',
'apply_rule_group_selection_intro' => 'Rule groups like ":title" are normally only applied to new or updated transactions, but you can tell Firefly III to run all the rules in this group on a selection of your existing transactions. This can be useful when you have updated a group of rules and you need the changes to be applied to all of your other transactions.',
'applied_rule_group_selection' => 'Rule group ":title" has been applied to your selection.',
'timezone_difference' => 'Your browser reports time zone "{local}". Firefly III is configured for time zone "{system}". This chart may drift.',
// actions and triggers
'rule_trigger_user_action' => 'User action is ":trigger_value"',