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

Add ability to move stuff around, fix spelling.

Browse Source
This commit is contained in:
James Cole
2022-09-24 17:43:49 +02:00
parent 600fa388c1
commit a9f2741282
14 changed files with 344 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -761,8 +761,8 @@ return [
// new values:
'rule_trigger_user_action_choice' => 'User action is ":trigger_value"',
'rule_trigger_tag_is_not_choice' => 'No tag is ":trigger_value"',
'rule_trigger_tag_is_not' => 'No tag is..',
'rule_trigger_tag_is_not_choice' => 'No tag is..',
'rule_trigger_tag_is_not' => 'No tag is ":trigger_value"',
'rule_trigger_account_is_choice' => 'Either account is exactly..',
'rule_trigger_account_is' => 'Either account is exactly ":trigger_value"',
'rule_trigger_account_contains_choice' => 'Either account contains..',
@@ -887,10 +887,14 @@ return [
'rule_trigger_attachment_notes_starts' => 'Any attachment\'s notes start with ":trigger_value"',
'rule_trigger_attachment_notes_ends_choice' => 'Any attachment\'s notes end with..',
'rule_trigger_attachment_notes_ends' => 'Any attachment\'s notes end with ":trigger_value"',
'rule_trigger_reconciled_choice' => 'Transaction is reconciled',
'rule_trigger_reconciled' => 'Transaction is reconciled',
'rule_trigger_exists_choice' => 'Any transaction matches(!)',
'rule_trigger_exists' => 'Any transaction matches',
// actions
'rule_action_delete_transaction_choice' => 'DELETE transaction (!)',
'rule_action_delete_transaction' => 'DELETE transaction (!)',
'rule_action_delete_transaction_choice' => 'DELETE transaction(!)',
'rule_action_delete_transaction' => 'DELETE transaction(!)',
'rule_action_set_category' => 'Set category to ":action_value"',
'rule_action_clear_category' => 'Clear category',
'rule_action_set_budget' => 'Set budget to ":action_value"',
@@ -901,30 +905,30 @@ return [
'rule_action_set_description' => 'Set description to ":action_value"',
'rule_action_append_description' => 'Append description with ":action_value"',
'rule_action_prepend_description' => 'Prepend description with ":action_value"',
'rule_action_set_category_choice' => 'Set category to..',
'rule_action_set_category_choice' => 'Set category to ..',
'rule_action_clear_category_choice' => 'Clear any category',
'rule_action_set_budget_choice' => 'Set budget to..',
'rule_action_set_budget_choice' => 'Set budget to ..',
'rule_action_clear_budget_choice' => 'Clear any budget',
'rule_action_add_tag_choice' => 'Add tag..',
'rule_action_remove_tag_choice' => 'Remove tag..',
'rule_action_add_tag_choice' => 'Add tag ..',
'rule_action_remove_tag_choice' => 'Remove tag ..',
'rule_action_remove_all_tags_choice' => 'Remove all tags',
'rule_action_set_description_choice' => 'Set description to..',
'rule_action_update_piggy_choice' => 'Add/remove transaction amount in piggy bank..',
'rule_action_update_piggy' => 'Add/remove transaction amount in piggy bank ":action_value"',
'rule_action_append_description_choice' => 'Append description with..',
'rule_action_prepend_description_choice' => 'Prepend description with..',
'rule_action_set_source_account_choice' => 'Set source account to..',
'rule_action_set_description_choice' => 'Set description to ..',
'rule_action_update_piggy_choice' => 'Add / remove transaction amount in piggy bank ..',
'rule_action_update_piggy' => 'Add / remove transaction amount in piggy bank ":action_value"',
'rule_action_append_description_choice' => 'Append description with ..',
'rule_action_prepend_description_choice' => 'Prepend description with ..',
'rule_action_set_source_account_choice' => 'Set source account to ..',
'rule_action_set_source_account' => 'Set source account to :action_value',
'rule_action_set_destination_account_choice' => 'Set destination account to..',
'rule_action_set_destination_account_choice' => 'Set destination account to ..',
'rule_action_set_destination_account' => 'Set destination account to :action_value',
'rule_action_append_notes_choice' => 'Append notes with..',
'rule_action_append_notes_choice' => 'Append notes with ..',
'rule_action_append_notes' => 'Append notes with ":action_value"',
'rule_action_prepend_notes_choice' => 'Prepend notes with..',
'rule_action_prepend_notes_choice' => 'Prepend notes with ..',
'rule_action_prepend_notes' => 'Prepend notes with ":action_value"',
'rule_action_clear_notes_choice' => 'Remove any notes',
'rule_action_clear_notes' => 'Remove any notes',
'rule_action_set_notes_choice' => 'Set notes to..',
'rule_action_link_to_bill_choice' => 'Link to a bill..',
'rule_action_set_notes_choice' => 'Set notes to ..',
'rule_action_link_to_bill_choice' => 'Link to a bill ..',
'rule_action_link_to_bill' => 'Link to bill ":action_value"',
'rule_action_set_notes' => 'Set notes to ":action_value"',
'rule_action_convert_deposit_choice' => 'Convert the transaction to a deposit',
@@ -933,15 +937,23 @@ return [
'rule_action_convert_withdrawal' => 'Convert the transaction to a withdrawal to ":action_value"',
'rule_action_convert_transfer_choice' => 'Convert the transaction to a transfer',
'rule_action_convert_transfer' => 'Convert the transaction to a transfer with ":action_value"',
'rule_action_append_descr_to_notes_choice' => 'Append the description to the transaction notes',
'rule_action_append_notes_to_descr_choice' => 'Append the transaction notes to the description',
'rule_action_move_descr_to_notes_choice' => 'Replace the current transaction notes with the description',
'rule_action_move_notes_to_descr_choice' => 'Replace the current description with the transaction notes',
'rule_action_append_descr_to_notes' => 'Append description to notes',
'rule_action_append_notes_to_descr' => 'Append notes to description',
'rule_action_move_descr_to_notes' => 'Replace notes with description',
'rule_action_move_notes_to_descr' => 'Replace description with notes',
'rules_have_read_warning' => 'Have you read the warning?',
'apply_rule_warning' => 'Warning: running a rule(group) on a large selection of transactions could take ages, and it could time-out. If it does, the rule(group) will only be applied to an unknown subset of your transactions. This might leave your financial administration in tatters. Please be careful.',
'rules_have_read_warning' => 'Have you read the warning ? ',
'apply_rule_warning' => 'Warning: running a rule(group) on a large selection of transactions could take ages, and it could time - out . if it does, the rule(group) will only be applied to an unknown subset of your transactions . This might leave your financial administration in tatters . Please be careful . ',
'rulegroup_for_bills_title' => 'Rule group for bills',
'rulegroup_for_bills_description' => 'A special rule group for all the rules that involve bills.',
'rule_for_bill_title' => 'Auto-generated rule for bill ":name"',
'rule_for_bill_description' => 'This rule is auto-generated to try to match bill ":name".',
'rulegroup_for_bills_description' => 'A special rule group for all the rules that involve bills . ',
'rule_for_bill_title' => 'Auto - generated rule for bill ":name"',
'rule_for_bill_description' => 'This rule is auto - generated to try to match bill ":name" . ',
'create_rule_for_bill' => 'Create a new rule for bill ":name"',
'create_rule_for_bill_txt' => 'You have just created a new bill called ":name", congratulations! Firefly III can automagically match new withdrawals to this bill. For example, whenever you pay your rent, the bill "rent" will be linked to the expense. This way, Firefly III can accurately show you which bills are due and which ones aren\'t. In order to do so, a new rule must be created. Firefly III has filled in some sensible defaults for you. Please make sure these are correct. If these values are correct, Firefly III will automatically link the correct withdrawal to the correct bill. Please check out the triggers to see if they are correct, and add some if they\'re wrong.',
'create_rule_for_bill_txt' => 'You have just created a new bill called ":name", congratulations!Firefly III can automagically match new withdrawals to this bill . for example, whenever you pay your rent, the bill "rent" will be linked to the expense . This way, Firefly III can accurately show you which bills are due and which ones aren\'t. In order to do so, a new rule must be created. Firefly III has filled in some sensible defaults for you. Please make sure these are correct. If these values are correct, Firefly III will automatically link the correct withdrawal to the correct bill. Please check out the triggers to see if they are correct, and add some if they\'re wrong.',
'new_rule_for_bill_title' => 'Rule for bill ":name"',
'new_rule_for_bill_description' => 'This rule marks transactions for bill ":name".',

2
resources/lang/en_US/validation.php
View File

@@ -142,7 +142,7 @@ return [
'unique_object_group' => 'The group name must be unique',
'starts_with' => 'The value must start with :values.',
'unique_webhook' => 'You already have a webhook with this combination of URL, trigger, response and delivery.',
'unique_existing_webhook' => 'You already have another webhook this combination of URL, trigger, response and delivery.',
'unique_existing_webhook' => 'You already have another webhook with this combination of URL, trigger, response and delivery.',
'same_account_type' => 'Both accounts must be of the same account type',
'same_account_currency' => 'Both accounts must have the same currency setting',