diff --git a/changelog.md b/changelog.md index 3e7350ec47..e8f6ca01ad 100644 --- a/changelog.md +++ b/changelog.md @@ -6,10 +6,10 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - Redirecting to an URL with parameters works well now for editing and creating transactions. -- #2756 Search was broken due to left-over debug statements. -- #2757 2FA was broken due to a changed library. -- #2758 A debug command courtesy of Laravel wouldn't work due to invalid routes. -- #2701 Fixed a never-ending loop. +- [Issue 2756](https://github.com/firefly-iii/firefly-iii/issues/2756) Search was broken due to left-over debug statements. +- [Issue 2757](https://github.com/firefly-iii/firefly-iii/issues/2757) 2FA was broken due to a changed library. +- [Issue 2758](https://github.com/firefly-iii/firefly-iii/issues/2758) A debug command courtesy of Laravel wouldn't work due to invalid routes. +- [Issue 2701](https://github.com/firefly-iii/firefly-iii/issues/2701) Fixed a never-ending loop. ## [4.8.1.5 (API 0.10.4)] - 2019-10-21 diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index 121cc6863a..d4c4ecae7d 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -759,9 +759,9 @@ return [ 'list_inactive_rule' => 'Inaktive Regeln', // accounts: - 'inactive_account_link' => 'You have :count inactive (archived) accounts, which you can view on this separate page.', - 'all_accounts_inactive' => 'These are your inactive accounts.', - 'active_account_link' => 'This link goes back to your active accounts.', + 'inactive_account_link' => 'Sie haben :count inaktive (archivierte) Konten, die Sie auf dieser separaten Seite einsehen können.', + 'all_accounts_inactive' => 'Dies sind Ihre inaktiven Konten.', + 'active_account_link' => 'Diese Verknüpfung führt zurück zu Ihren aktiven Konten.', 'account_missing_transaction' => 'Konto #:id („:name”) kann nicht direkt angezeigt werden, da Firefly III Weiterleitungsinformationen fehlen.', 'details_for_asset' => 'Details zum Bestandskonto „:name”', 'details_for_expense' => 'Details zum Kreditor (Ausgabenkonto) „:name”', @@ -789,9 +789,9 @@ return [ 'make_new_revenue_account' => 'Neuen Schuldner anlegen', 'make_new_liabilities_account' => 'Neue Verbindlichkeit anlegen', 'asset_accounts' => 'Bestandskonten', - 'asset_accounts_inactive' => 'Asset accounts (inactive)', + 'asset_accounts_inactive' => 'Bestandskonten (inaktiv)', 'expense_accounts' => 'Kreditoren (Ausgabenkonten)', - 'expense_accounts_inactive' => 'Expense accounts (inactive)', + 'expense_accounts_inactive' => 'Aufwandskonten (inaktiv)', 'revenue_accounts' => 'Schuldner', 'cash_accounts' => 'Geldbörsen', 'Cash account' => 'Geldbörse', diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index 76fe4954b3..f9a4bf6efb 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -759,9 +759,9 @@ return [ 'list_inactive_rule' => 'regla inactiva', // accounts: - 'inactive_account_link' => 'You have :count inactive (archived) accounts, which you can view on this separate page.', - 'all_accounts_inactive' => 'These are your inactive accounts.', - 'active_account_link' => 'This link goes back to your active accounts.', + 'inactive_account_link' => 'Tiene :count cuentas inactivas (archivadas), que puede ver en esta página separada.', + 'all_accounts_inactive' => 'Estas son sus cuentas inactivas.', + 'active_account_link' => 'Este enlace se regresa a sus cuentas activas.', 'account_missing_transaction' => 'Cuenta #:id (":name") no puede ser vista directamente, Firefly perdió información de redirección.', 'details_for_asset' => 'Detalles para la cuenta de activos ":name"', 'details_for_expense' => 'Detalles para la cuenta de gastos ":name"', @@ -789,9 +789,9 @@ return [ 'make_new_revenue_account' => 'Crear nueva cuenta de ingresos', 'make_new_liabilities_account' => 'Crear un nuevo pasivo', 'asset_accounts' => 'Cuenta de activos', - 'asset_accounts_inactive' => 'Asset accounts (inactive)', + 'asset_accounts_inactive' => 'Cuentas de activos (inactivas)', 'expense_accounts' => 'Cuentas de gastos', - 'expense_accounts_inactive' => 'Expense accounts (inactive)', + 'expense_accounts_inactive' => 'Cuentas de gastos (inactivas)', 'revenue_accounts' => 'Cuentas de ingresos', 'cash_accounts' => 'Cuentas de efectivo', 'Cash account' => 'Cuenta de efectivo', diff --git a/resources/lang/it_IT/firefly.php b/resources/lang/it_IT/firefly.php index 73902f4a26..82ef6b4de1 100644 --- a/resources/lang/it_IT/firefly.php +++ b/resources/lang/it_IT/firefly.php @@ -759,9 +759,9 @@ return [ 'list_inactive_rule' => 'regola inattiva', // accounts: - 'inactive_account_link' => 'You have :count inactive (archived) accounts, which you can view on this separate page.', - 'all_accounts_inactive' => 'These are your inactive accounts.', - 'active_account_link' => 'This link goes back to your active accounts.', + 'inactive_account_link' => 'Hai :count conti inattivi (archiviati) che puoi visualizzare in questa pagina separata.', + 'all_accounts_inactive' => 'Questi sono i tuoi conti inattivi.', + 'active_account_link' => 'Questo collegamento ti riporta ai conti attivi.', 'account_missing_transaction' => 'Non è possibile visualizzare il conto #:id (":name") direttamente, a Firefly mancano le informazioni per il reindirizzamento.', 'details_for_asset' => 'Dettagli per conto attività ":name"', 'details_for_expense' => 'Dettagli per conto uscite ":name"', @@ -789,9 +789,9 @@ return [ 'make_new_revenue_account' => 'Crea nuovo conto entrate', 'make_new_liabilities_account' => 'Crea una nuova passività', 'asset_accounts' => 'Conti attività', - 'asset_accounts_inactive' => 'Asset accounts (inactive)', + 'asset_accounts_inactive' => 'Conti attività (inattivi)', 'expense_accounts' => 'Conti uscite', - 'expense_accounts_inactive' => 'Expense accounts (inactive)', + 'expense_accounts_inactive' => 'Conti spese (inattivi)', 'revenue_accounts' => 'Conti entrate', 'cash_accounts' => 'Conti contanti', 'Cash account' => 'Conto contanti', diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 63264c4280..f01f22dc50 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -240,8 +240,8 @@ return [ 'search_modifier_amount_min' => 'Bedrag is minstens :value', 'search_modifier_amount_less' => 'Bedrag is minder dan :value', 'search_modifier_amount_more' => 'Bedrag is meer dan :value', - 'search_modifier_source' => 'Bronrekening is :value', - 'search_modifier_from' => 'Bronrekening is :value', + 'search_modifier_source' => 'Bronrekeningnaam is :value', + 'search_modifier_from' => 'Bronrekeningnaam is :value', 'search_modifier_destination' => 'Doelrekening is :value', 'search_modifier_to' => 'Doelrekening is :value', 'search_modifier_tag' => 'Tag is ":value"', @@ -255,8 +255,8 @@ return [ 'search_modifier_on' => 'Transactiedatum is :value', 'search_modifier_before' => 'Transactiedatum is vóór :value', 'search_modifier_after' => 'Transactiedatum is na :value', - 'search_modifier_created_on' => 'Transaction was created on :value', - 'search_modifier_updated_on' => 'Transaction was last updated on :value', + 'search_modifier_created_on' => 'Transactie werd gemaakt op :value', + 'search_modifier_updated_on' => 'Transactie werd laatst gewijzigd op :value', 'modifiers_applies_are' => 'De volgende wijzigingen worden ook toegepast op de zoekopdracht:', 'general_search_error' => 'Er is een fout opgetreden tijdens het zoeken. Controleer de log-bestanden voor meer informatie.', 'search_box' => 'Zoeken', @@ -343,13 +343,13 @@ return [ // actions and triggers 'rule_trigger_user_action' => 'Gebruikersactie is ":trigger_value"', - 'rule_trigger_from_account_starts_choice' => 'Bronrekening naam begint met..', + 'rule_trigger_from_account_starts_choice' => 'Bronrekeningnaam begint met..', 'rule_trigger_from_account_starts' => 'Bronrekeningnaam begint met ":trigger_value"', - 'rule_trigger_from_account_ends_choice' => 'Bronrekening eindigt op..', + 'rule_trigger_from_account_ends_choice' => 'Bronrekeningnaam eindigt op..', 'rule_trigger_from_account_ends' => 'Bronrekeningnaam eindigt op ":trigger_value"', - 'rule_trigger_from_account_is_choice' => 'Bronrekening is..', + 'rule_trigger_from_account_is_choice' => 'Bronrekeningnaam is..', 'rule_trigger_from_account_is' => 'Bronrekeningnaam is ":trigger_value"', - 'rule_trigger_from_account_contains_choice' => 'Bronrekening bevat..', + 'rule_trigger_from_account_contains_choice' => 'Bronrekeningnaam bevat..', 'rule_trigger_from_account_contains' => 'Bronrekeningnaam bevat ":trigger_value"', 'rule_trigger_to_account_starts_choice' => 'Doelrekeningnaam begint met..', 'rule_trigger_to_account_starts' => 'Doelrekeningnaam begint met ":trigger_value"', @@ -759,9 +759,9 @@ return [ 'list_inactive_rule' => 'inactieve regel', // accounts: - 'inactive_account_link' => 'You have :count inactive (archived) accounts, which you can view on this separate page.', - 'all_accounts_inactive' => 'These are your inactive accounts.', - 'active_account_link' => 'This link goes back to your active accounts.', + 'inactive_account_link' => 'Je hebt :count inactieve (gearchiveerde) rekeningen, die je kan bekijken op deze aparte pagina.', + 'all_accounts_inactive' => 'Dit zijn je inactieve rekeningen.', + 'active_account_link' => 'Deze link gaat terug naar je actieve rekeningen.', 'account_missing_transaction' => 'Rekening #:id (":name") kan je niet bekijken in Firefly III, maar het origineel is kwijt.', 'details_for_asset' => 'Overzicht voor betaalrekening ":name"', 'details_for_expense' => 'Overzicht voor crediteur ":name"', @@ -789,9 +789,9 @@ return [ 'make_new_revenue_account' => 'Nieuwe debiteur', 'make_new_liabilities_account' => 'Maak nieuwe passiva', 'asset_accounts' => 'Betaalrekeningen', - 'asset_accounts_inactive' => 'Asset accounts (inactive)', + 'asset_accounts_inactive' => 'Betaalrekeningen (inactief)', 'expense_accounts' => 'Crediteuren', - 'expense_accounts_inactive' => 'Expense accounts (inactive)', + 'expense_accounts_inactive' => 'Crediteuren (inactief)', 'revenue_accounts' => 'Debiteuren', 'cash_accounts' => 'Contant geldrekeningen', 'Cash account' => 'Contant geldrekening', diff --git a/resources/lang/pl_PL/intro.php b/resources/lang/pl_PL/intro.php index 159e100607..da102c8eb1 100644 --- a/resources/lang/pl_PL/intro.php +++ b/resources/lang/pl_PL/intro.php @@ -33,11 +33,11 @@ return [ 'index_cash_account' => 'To są dotychczas utworzone konta. Możesz użyć konta gotówkowego do śledzenia wydatków gotówkowych, ale oczywiście nie jest to obowiązkowe.', // transactions (withdrawal) - 'transactions_create_withdrawal_source' => 'Select your favorite asset account or liability from this dropdown.', - 'transactions_create_withdrawal_destination' => 'Select an expense account here. Leave it empty if you want to make a cash expense.', - 'transactions_create_withdrawal_foreign_currency' => 'Use this field to set a foreign currency and amount.', - 'transactions_create_withdrawal_more_meta' => 'Plenty of other meta data you set in these fields.', - 'transactions_create_withdrawal_split_add' => 'If you want to split a transaction, add more splits with this button', + 'transactions_create_withdrawal_source' => 'Wybierz swoje ulubione konto aktywów lub zobowiązanie z tej listy rozwijalnej.', + 'transactions_create_withdrawal_destination' => 'Wybierz konto wydatków. Zostaw puste, jeśli chcesz zapisać wydatek gotówkowy.', + 'transactions_create_withdrawal_foreign_currency' => 'Użyj tego pola aby ustawić obcą walutę i jej ilość.', + 'transactions_create_withdrawal_more_meta' => 'Mnóstwo innych metadanych, które ustawiasz w tych polach.', + 'transactions_create_withdrawal_split_add' => 'Jeżeli chcesz podzielić transakcję, dodaj więcej podziałów używając tego przycisku', // transactions (deposit) 'transactions_create_deposit_source' => 'Select or type the payee in this auto-completing dropdown/textbox. Leave it empty if you want to make a cash deposit.', diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index f7ea6b9af3..d4bd3728e9 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -929,7 +929,7 @@ return [ 'average_spending_per_source' => 'Average expense per source account', 'average_earning_per_source' => 'Average earning per source account', 'average_earning_per_destination' => 'Average earning per destination account', - 'account_per_tag' => 'Account per tag', + 'account_per_tag' => 'Conta por tag', 'tag_report_expenses_listed_once' => 'Expenses and income are never listed twice. If a transaction has multiple tags, it may only show up under one of its tags. This list may appear to be missing data, but the amounts will be correct.', 'double_report_expenses_charted_once' => 'Expenses and income are never displayed twice. If a transaction has multiple tags, it may only show up under one of its tags. This chart may appear to be missing data, but the amounts will be correct.', 'tag_report_chart_single_tag' => 'This chart applies to a single tag. If a transaction has multiple tags, what you see here may be reflected in the charts of other tags as well.', diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php index a9f7d494cf..06052f055d 100644 --- a/resources/lang/ru_RU/firefly.php +++ b/resources/lang/ru_RU/firefly.php @@ -759,9 +759,9 @@ return [ 'list_inactive_rule' => 'неактивное правило', // accounts: - 'inactive_account_link' => 'You have :count inactive (archived) accounts, which you can view on this separate page.', - 'all_accounts_inactive' => 'These are your inactive accounts.', - 'active_account_link' => 'This link goes back to your active accounts.', + 'inactive_account_link' => 'У вас есть :count неактивных (архивных) счетов, которые вы можете просмотреть на этой отдельной странице.', + 'all_accounts_inactive' => 'Это ваши неактивные счета.', + 'active_account_link' => 'Эта ссылка вернёт вас к вашим активным счетам.', 'account_missing_transaction' => 'Счёт #:id (":name") невозможно просмотреть напрямую, и у Firefly нет информации для перенаправления.', 'details_for_asset' => 'Детали по основному счёту ":name"', 'details_for_expense' => 'Детали по счёту расходов ":name"', @@ -789,9 +789,9 @@ return [ 'make_new_revenue_account' => 'Создать новый счёт дохода', 'make_new_liabilities_account' => 'Создать новый долговой счёт', 'asset_accounts' => 'Основные счета', - 'asset_accounts_inactive' => 'Asset accounts (inactive)', + 'asset_accounts_inactive' => 'Основной счёт (неактивный)', 'expense_accounts' => 'Счета расходов', - 'expense_accounts_inactive' => 'Expense accounts (inactive)', + 'expense_accounts_inactive' => 'Счёт расходов (неактивный)', 'revenue_accounts' => 'Счета доходов', 'cash_accounts' => 'Наличные деньги', 'Cash account' => 'Наличные деньги',