Merge branch 'develop' into 5.8-dev

# Conflicts:
#	config/firefly.php
#	resources/lang/de_DE/firefly.php
#	resources/lang/de_DE/validation.php
#	resources/lang/pl_PL/firefly.php
This commit is contained in:
James Cole
2022-12-29 19:16:24 +01:00
12 changed files with 36 additions and 29 deletions

View File

@@ -147,10 +147,10 @@ export default {
"rule_action_clear_category_choice": "Bereinige jede Kategorie",
"rule_action_set_budget_choice": "Setze Budget auf ..",
"rule_action_clear_budget_choice": "Alle Budgets leeren",
"rule_action_add_tag_choice": "Add tag ..",
"rule_action_remove_tag_choice": "Remove tag ..",
"rule_action_add_tag_choice": "Schlagwort hinzuf\u00fcgen \u2026",
"rule_action_remove_tag_choice": "Schlagwort entfernen \u2026",
"rule_action_remove_all_tags_choice": "Alle Schlagw\u00f6rter entfernen",
"rule_action_set_description_choice": "Set description to ..",
"rule_action_set_description_choice": "Beschreibung festlegen auf \u2026",
"rule_action_update_piggy_choice": "Add \/ remove transaction amount in piggy bank ..",
"rule_action_append_description_choice": "Append description with ..",
"rule_action_prepend_description_choice": "Prepend description with ..",