From 0e2419d61a9045841f6f0b6baef0e0075131845b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 26 Jul 2015 09:44:31 +0200 Subject: [PATCH] New translations [skip ci] --- resources/lang/en/firefly.php | 9 ++ resources/lang/en/form.php | 183 ++++++++++++++++---------------- resources/lang/nl/firefly.php | 7 ++ resources/lang/nl/form.php | 3 + resources/twig/tags/create.twig | 2 +- resources/twig/tags/delete.twig | 23 ++-- resources/twig/tags/edit.twig | 2 +- resources/twig/tags/show.twig | 20 ++-- 8 files changed, 137 insertions(+), 112 deletions(-) diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php index d5870f50a7..26a67e6de9 100644 --- a/resources/lang/en/firefly.php +++ b/resources/lang/en/firefly.php @@ -24,6 +24,15 @@ return [ 'added_amount' => 'Added :amount', 'asset_account_role_help' => 'Any extra options resulting from your choice can be set later.', + // tags + 'store_new_tag' => 'Store new tag', + 'update_tag' => 'Update tag', + 'no_location_set' => 'No location set.', + 'meta_data' => 'Meta data', + 'edit_tag' => 'Edit tag', + 'delete_tag' => 'Delete tag', + 'location' => 'Location', + // preferences 'pref_home_screen_accounts' => 'Home screen accounts', 'pref_home_screen_accounts_help' => 'Which accounts should be displayed on the home page?', diff --git a/resources/lang/en/form.php b/resources/lang/en/form.php index 9b2275cd9f..b25407d9f9 100644 --- a/resources/lang/en/form.php +++ b/resources/lang/en/form.php @@ -2,99 +2,102 @@ return [ // new user: - 'bank_name' => 'Bank name', - 'bank_balance' => 'Balance', - 'savings_balance' => 'Savings balance', - 'credit_card_limit' => 'Credit card limit', + 'bank_name' => 'Bank name', + 'bank_balance' => 'Balance', + 'savings_balance' => 'Savings balance', + 'credit_card_limit' => 'Credit card limit', - 'name' => 'Name', - 'active' => 'Active', - 'amount_min' => 'Minimum amount', - 'amount_max' => 'Maximum amount', - 'match' => 'Matches on', - 'repeat_freq' => 'Repeats', - 'account_from_id' => 'From account', - 'account_to_id' => 'To account', - 'account_id' => 'Asset account', - 'budget_id' => 'Budget', - 'openingBalance' => 'Opening balance', - 'tagMode' => 'Tag mode', - 'tagPosition' => 'Tag location', - 'virtualBalance' => 'Virtual balance', - 'longitude_latitude' => 'Location', - 'targetamount' => 'Target amount', - 'accountRole' => 'Account role', - 'openingBalanceDate' => 'Opening balance date', - 'ccType' => 'Credit card payment plan', - 'ccMonthlyPaymentDate' => 'Credit card monthly payment date', - 'piggy_bank_id' => 'Piggy bank', - 'returnHere' => 'Return here', - 'returnHereExplanation' => 'After storing, return here to create another one.', - 'returnHereUpdateExplanation' => 'After updating, return here.', - 'description' => 'Description', - 'expense_account' => 'Expense account', - 'revenue_account' => 'Revenue account', - 'amount' => 'Amount', - 'date' => 'Date', - 'category' => 'Category', - 'tags' => 'Tags', - 'deletePermanently' => 'Delete permanently', - 'cancel' => 'Cancel', - 'targetdate' => 'Target date', - 'tag' => 'Tag', - 'under' => 'Under', - 'symbol' => 'Symbol', - 'code' => 'Code', - 'iban' => 'IBAN', - 'csv' => 'CSV file', - 'has_headers' => 'Headers', - 'date_format' => 'Date format', - 'csv_config' => 'CSV import configuration', - 'specifix' => 'Bank- or file specific fixes', - 'csv_import_account' => 'Default import account', - 'attachments[]' => 'Attachments', - 'store_new_withdrawal' => 'Store new withdrawal', - 'store_new_deposit' => 'Store new deposit', - 'store_new_transfer' => 'Store new transfer', - 'add_new_withdrawal' => 'Add a new withdrawal', - 'add_new_deposit' => 'Add a new deposit', - 'add_new_transfer' => 'Add a new transfer', - 'noPiggybank' => '(no piggy bank)', - 'noBudget' => '(no budget)', - 'title' => 'Title', - 'notes' => 'Notes', - 'filename' => 'File name', - 'mime' => 'Mime type', - 'size' => 'Size', + 'name' => 'Name', + 'active' => 'Active', + 'amount_min' => 'Minimum amount', + 'amount_max' => 'Maximum amount', + 'match' => 'Matches on', + 'repeat_freq' => 'Repeats', + 'account_from_id' => 'From account', + 'account_to_id' => 'To account', + 'account_id' => 'Asset account', + 'budget_id' => 'Budget', + 'openingBalance' => 'Opening balance', + 'tagMode' => 'Tag mode', + 'tagPosition' => 'Tag location', + 'virtualBalance' => 'Virtual balance', + 'longitude_latitude' => 'Location', + 'targetamount' => 'Target amount', + 'accountRole' => 'Account role', + 'openingBalanceDate' => 'Opening balance date', + 'ccType' => 'Credit card payment plan', + 'ccMonthlyPaymentDate' => 'Credit card monthly payment date', + 'piggy_bank_id' => 'Piggy bank', + 'returnHere' => 'Return here', + 'returnHereExplanation' => 'After storing, return here to create another one.', + 'returnHereUpdateExplanation' => 'After updating, return here.', + 'description' => 'Description', + 'expense_account' => 'Expense account', + 'revenue_account' => 'Revenue account', + 'amount' => 'Amount', + 'date' => 'Date', + 'category' => 'Category', + 'tags' => 'Tags', + 'deletePermanently' => 'Delete permanently', + 'cancel' => 'Cancel', + 'targetdate' => 'Target date', + 'tag' => 'Tag', + 'under' => 'Under', + 'symbol' => 'Symbol', + 'code' => 'Code', + 'iban' => 'IBAN', + 'csv' => 'CSV file', + 'has_headers' => 'Headers', + 'date_format' => 'Date format', + 'csv_config' => 'CSV import configuration', + 'specifix' => 'Bank- or file specific fixes', + 'csv_import_account' => 'Default import account', + 'attachments[]' => 'Attachments', + 'store_new_withdrawal' => 'Store new withdrawal', + 'store_new_deposit' => 'Store new deposit', + 'store_new_transfer' => 'Store new transfer', + 'add_new_withdrawal' => 'Add a new withdrawal', + 'add_new_deposit' => 'Add a new deposit', + 'add_new_transfer' => 'Add a new transfer', + 'noPiggybank' => '(no piggy bank)', + 'noBudget' => '(no budget)', + 'title' => 'Title', + 'notes' => 'Notes', + 'filename' => 'File name', + 'mime' => 'Mime type', + 'size' => 'Size', - 'delete_account' => 'Delete account ":name"', - 'delete_bill' => 'Delete bill ":name"', - 'delete_budget' => 'Delete budget ":name"', - 'delete_category' => 'Delete category ":name"', - 'delete_currency' => 'Delete currency ":name"', - 'delete_piggyBank' => 'Delete piggy bank ":name"', - 'delete_journal' => 'Delete transaction with description ":description"', - 'delete_attachment' => 'Delete attachment ":name"', + 'delete_account' => 'Delete account ":name"', + 'delete_bill' => 'Delete bill ":name"', + 'delete_budget' => 'Delete budget ":name"', + 'delete_category' => 'Delete category ":name"', + 'delete_currency' => 'Delete currency ":name"', + 'delete_piggyBank' => 'Delete piggy bank ":name"', + 'delete_journal' => 'Delete transaction with description ":description"', + 'delete_attachment' => 'Delete attachment ":name"', - 'attachment_areYouSure' => 'Are you sure you want to delete the attachment named ":name"?', - 'account_areYouSure' => 'Are you sure you want to delete the account named ":name"?', - 'bill_areYouSure' => 'Are you sure you want to delete the bill named ":name"?', - 'budget_areYouSure' => 'Are you sure you want to delete the budget named ":name"?', - 'category_areYouSure' => 'Are you sure you want to delete the category named ":name"?', - 'currency_areYouSure' => 'Are you sure you want to delete the currency named ":name"?', - 'piggyBank_areYouSure' => 'Are you sure you want to delete the piggy bank named ":name"?', - 'journal_areYouSure' => 'Are you sure you want to delete the transaction described ":description"?', + 'attachment_areYouSure' => 'Are you sure you want to delete the attachment named ":name"?', + 'account_areYouSure' => 'Are you sure you want to delete the account named ":name"?', + 'bill_areYouSure' => 'Are you sure you want to delete the bill named ":name"?', + 'budget_areYouSure' => 'Are you sure you want to delete the budget named ":name"?', + 'category_areYouSure' => 'Are you sure you want to delete the category named ":name"?', + 'currency_areYouSure' => 'Are you sure you want to delete the currency named ":name"?', + 'piggyBank_areYouSure' => 'Are you sure you want to delete the piggy bank named ":name"?', + 'journal_areYouSure' => 'Are you sure you want to delete the transaction described ":description"?', + 'tag_areYouSure' => 'Are you sure you want to delete the tag ":tag"?', - 'permDeleteWarning' => 'Deleting stuff from Firely is permanent and cannot be undone.', - 'also_delete_transactions' => 'The only transaction connected to this account will be deleted as well.' . - '|All :count transactions connected to this account will be deleted as well.', - 'also_delete_piggyBanks' => 'The only piggy bank connected to this account will be deleted as well.' . - '|All :count piggy bank connected to this account will be deleted as well.', - 'bill_keep_transactions' => 'The only transaction connected to this bill will not be deleted.' . - '|All :count transactions connected to this bill will spared deletion.', - 'budget_keep_transactions' => 'The only transaction connected to this budget will not be deleted.' . - '|All :count transactions connected to this budget will spared deletion.', - 'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.' . - '|All :count transactions connected to this category will spared deletion.', + 'permDeleteWarning' => 'Deleting stuff from Firely is permanent and cannot be undone.', + 'also_delete_transactions' => 'The only transaction connected to this account will be deleted as well.' . + '|All :count transactions connected to this account will be deleted as well.', + 'also_delete_piggyBanks' => 'The only piggy bank connected to this account will be deleted as well.' . + '|All :count piggy bank connected to this account will be deleted as well.', + 'bill_keep_transactions' => 'The only transaction connected to this bill will not be deleted.' . + '|All :count transactions connected to this bill will spared deletion.', + 'budget_keep_transactions' => 'The only transaction connected to this budget will not be deleted.' . + '|All :count transactions connected to this budget will spared deletion.', + 'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.' . + '|All :count transactions connected to this category will spared deletion.', + 'tag_keep_transactions' => 'The only transaction connected to this tag will not be deleted.' . + '|All :count transactions connected to this tag will spared deletion.', ]; diff --git a/resources/lang/nl/firefly.php b/resources/lang/nl/firefly.php index 55e446c852..82f115da14 100644 --- a/resources/lang/nl/firefly.php +++ b/resources/lang/nl/firefly.php @@ -24,6 +24,13 @@ return [ 'added_amount' => ':amount toegevoegd', 'asset_account_role_help' => 'Voorkeuren die voortkomen uit je keuze hier kan je later aangeven.', + // tags + 'store_new_tag' => 'Sla tag op', + 'update_tag' => 'Sla wijzigingen op', + 'no_location_set' => 'Zonder plaats', + 'location' => 'Plaats', + 'meta_data' => 'Metagegevens', + // preferences 'pref_home_screen_accounts' => 'Voorpaginarekeningen', 'pref_home_screen_accounts_help' => 'Welke betaalrekeningen wil je op de voorpagina zien?', diff --git a/resources/lang/nl/form.php b/resources/lang/nl/form.php index 67204b97ea..8d2e544b5c 100644 --- a/resources/lang/nl/form.php +++ b/resources/lang/nl/form.php @@ -78,6 +78,7 @@ return [ 'delete_journal' => 'Verwijder transactie met omschrijving ":description"', 'delete_attachment' => 'Verwijder bijlage ":name"', + 'tag_areYouSure' => 'Weet je zeker dat je de tag met naam ":tag" wilt verwijderen?', 'attachment_areYouSure' => 'Weet je zeker dat je de bijlage met naam ":name" wilt verwijderen?', 'account_areYouSure' => 'Weet je zeker dat je de rekening met naam ":name" wilt verwijderen?', 'bill_areYouSure' => 'Weet je zeker dat je het contract met naam ":name" wilt verwijderen?', @@ -98,4 +99,6 @@ return [ '|De :count transacties verbonden aan dit budget blijven bewaard.', 'category_keep_transactions' => 'De transactie verbonden aan deze categorie blijft bewaard.' . '|De :count transacties verbonden aan deze categorie blijven bewaard.', + 'tag_keep_transactions' => 'De transactie verbonden aan deze tag blijft bewaard.' . + '|De :count transacties verbonden aan deze tag blijven bewaard.', ]; diff --git a/resources/twig/tags/create.twig b/resources/twig/tags/create.twig index 1d2f61b3ef..a7e7def346 100644 --- a/resources/twig/tags/create.twig +++ b/resources/twig/tags/create.twig @@ -43,7 +43,7 @@
diff --git a/resources/twig/tags/delete.twig b/resources/twig/tags/delete.twig index f1dfbe2f96..eeb035ee93 100644 --- a/resources/twig/tags/delete.twig +++ b/resources/twig/tags/delete.twig @@ -13,19 +13,22 @@

Delete tag "{{ tag.tag }}"

-

- Are you sure that you want to delete tag "{{ tag.tag }}"? +

+ {{ trans('form.permDeleteWarning') }} +

+

+ {{ trans('form.tag_areYouSure', {'tag': tag.tag}) }} +

+ +

+ {% if tag.transactionjournals|length == 0 %} + {{ Lang.choice('form.tag_keep_transactions', tag.transactionjournals|length, {count: tag.transactionjournals|length}) }} + {% endif %}

- {% if tag.transactionjournals|length > 0 %} -

- Tag "{{ tag.tag }}" still has {{ tag.transactionjournals|length }} transaction(s) connected - to it. These will not be removed but will lose their connection to this tag. -

- {% endif %}
- - Cancel + + {{ trans('form.cancel') }}
diff --git a/resources/twig/tags/edit.twig b/resources/twig/tags/edit.twig index 8983783357..6eabbebade 100644 --- a/resources/twig/tags/edit.twig +++ b/resources/twig/tags/edit.twig @@ -45,7 +45,7 @@
diff --git a/resources/twig/tags/show.twig b/resources/twig/tags/show.twig index c68e67a895..a6a7cd40a8 100644 --- a/resources/twig/tags/show.twig +++ b/resources/twig/tags/show.twig @@ -11,7 +11,7 @@
-

Meta data

+

{{ 'meta_data'|_ }}

@@ -19,8 +19,8 @@
@@ -34,7 +34,7 @@ {% endif %} {% if tag.date %} -

Date: {{ tag.date.formatLocalized(monthAndDayFormat) }}

+

{{ 'date'|_ }}: {{ tag.date.formatLocalized(monthAndDayFormat) }}

{% endif %}
@@ -42,7 +42,7 @@
-

Location

+

{{ 'location'|_ }}

@@ -50,8 +50,8 @@
@@ -62,7 +62,7 @@

{% else %} -

No location set.

+

{{ 'no_location_set'|_ }}

{% endif %}
@@ -80,8 +80,8 @@