diff --git a/app/Models/ObjectGroup.php b/app/Models/ObjectGroup.php index a4c86b72d0..af3b8e813b 100644 --- a/app/Models/ObjectGroup.php +++ b/app/Models/ObjectGroup.php @@ -61,6 +61,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @method static Builder|ObjectGroup whereTitle($value) * @method static Builder|ObjectGroup whereUpdatedAt($value) * @method static Builder|ObjectGroup whereUserId($value) + * @property int|null $user_group_id + * @method static Builder|ObjectGroup whereUserGroupId($value) * @mixin Eloquent */ class ObjectGroup extends Model diff --git a/app/Models/Rule.php b/app/Models/Rule.php index 5e8807863a..90058af7cf 100644 --- a/app/Models/Rule.php +++ b/app/Models/Rule.php @@ -76,6 +76,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @method static Builder|Rule withoutTrashed() * @property int|null $user_group_id * @method static \Illuminate\Database\Eloquent\Builder|Rule whereUserGroupId($value) + * @property-read \FireflyIII\Models\UserGroup|null $userGroup * @mixin Eloquent */ class Rule extends Model diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php index cdd3662600..8f36fc3b9c 100644 --- a/app/Models/TransactionGroup.php +++ b/app/Models/TransactionGroup.php @@ -61,6 +61,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @method static Builder|TransactionGroup withoutTrashed() * @property int|null $user_group_id * @method static \Illuminate\Database\Eloquent\Builder|TransactionGroup whereUserGroupId($value) + * @property-read \FireflyIII\Models\UserGroup|null $userGroup * @mixin Eloquent */ class TransactionGroup extends Model diff --git a/app/Models/UserGroup.php b/app/Models/UserGroup.php index 8f2bd8581e..f4d08b1e31 100644 --- a/app/Models/UserGroup.php +++ b/app/Models/UserGroup.php @@ -52,6 +52,16 @@ use Illuminate\Support\Carbon; * @method static Builder|UserGroup whereUpdatedAt($value) * @property-read Collection $accounts * @property-read int|null $accounts_count + * @property-read Collection $availableBudgets + * @property-read int|null $available_budgets_count + * @property-read Collection $bills + * @property-read int|null $bills_count + * @property-read Collection $budgets + * @property-read int|null $budgets_count + * @property-read Collection $piggyBanks + * @property-read int|null $piggy_banks_count + * @property-read Collection $transactionJournals + * @property-read int|null $transaction_journals_count * @mixin Eloquent */ class UserGroup extends Model diff --git a/app/Validation/AccountValidator.php b/app/Validation/AccountValidator.php index 159779fbd9..333b617252 100644 --- a/app/Validation/AccountValidator.php +++ b/app/Validation/AccountValidator.php @@ -293,6 +293,7 @@ class AccountValidator $first = $this->accountRepository->findByName($accountName, $validTypes); if (null !== $first) { app('log')->debug(sprintf('Name: Found %s account #%d ("%s", IBAN "%s")', $first->accountType->type, $first->id, $first->name, $first->iban ?? 'no iban')); + return $first; } } app('log')->debug('Found nothing!'); diff --git a/changelog.md b/changelog.md index f2229b2902..a7af740f57 100644 --- a/changelog.md +++ b/changelog.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## 6.0.22 - 2023-09-02 + +### API + +- [Issue 7917](https://github.com/firefly-iii/firefly-iii/issues/7917) Fixed an API issue where submitting an account name would not be accepted. + ## 6.0.21 - 2023-09-02 ### Added diff --git a/composer.lock b/composer.lock index 3280806b1d..67d1618a5b 100644 --- a/composer.lock +++ b/composer.lock @@ -2139,16 +2139,16 @@ }, { "name": "laravel/passport", - "version": "v11.9.0", + "version": "v11.9.1", "source": { "type": "git", "url": "https://github.com/laravel/passport.git", - "reference": "2582d2a58ff32761cb3aecb337a146ba17483f76" + "reference": "93bb9c36045fe5be2eaeacf35e836c00b392b761" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/passport/zipball/2582d2a58ff32761cb3aecb337a146ba17483f76", - "reference": "2582d2a58ff32761cb3aecb337a146ba17483f76", + "url": "https://api.github.com/repos/laravel/passport/zipball/93bb9c36045fe5be2eaeacf35e836c00b392b761", + "reference": "93bb9c36045fe5be2eaeacf35e836c00b392b761", "shasum": "" }, "require": { @@ -2213,7 +2213,7 @@ "issues": "https://github.com/laravel/passport/issues", "source": "https://github.com/laravel/passport" }, - "time": "2023-08-29T13:48:41+00:00" + "time": "2023-09-01T14:20:24+00:00" }, { "name": "laravel/prompts", diff --git a/config/firefly.php b/config/firefly.php index b77f4525a7..c799b28ae7 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -110,8 +110,8 @@ return [ 'handle_debts' => true, // see cer.php for exchange rates feature flag. ], - 'version' => '6.0.21', - 'api_version' => '2.0.6', + 'version' => '6.0.22', + 'api_version' => '2.0.7', 'db_version' => 20, // generic settings diff --git a/resources/lang/ca_ES/firefly.php b/resources/lang/ca_ES/firefly.php index bad1207027..e02bf8cba7 100644 --- a/resources/lang/ca_ES/firefly.php +++ b/resources/lang/ca_ES/firefly.php @@ -1395,7 +1395,7 @@ return [ 'pref_notification_new_access_token' => 'Avisar quan es creï un nou identificador d\'accés API', 'pref_notification_transaction_creation' => 'Avisar quan una transacció es creï automàticament', 'pref_notification_user_login' => 'Avisar quan s\'iniciï sessió des d\'una nova ubicació', - 'pref_notification_rule_action_failures' => 'Alert when rule actions fail to execute (Slack or Discord only)', + 'pref_notification_rule_action_failures' => 'Alerta quan les accions de la regla no es poden executar (només Slack i Discord)', 'pref_notifications' => 'Notificacions', 'pref_notifications_help' => 'Indica si aquestes són notificacions que vols rebre. Algunes notificacions podrien contenir informació financera sensible.', 'slack_webhook_url' => 'Webhook URL de Slack', @@ -1625,8 +1625,8 @@ return [ 'create_new_revenue' => 'Crear un nou compte de beneficis', 'create_new_piggy_bank' => 'Crea una guardiola nova', 'create_new_bill' => 'Crear una nova factura', - 'create_new_subscription' => 'Create new subscription', - 'create_new_rule' => 'Create new rule', + 'create_new_subscription' => 'Crea una nova subscripció', + 'create_new_rule' => 'Crea una nova regla', // currencies: 'create_currency' => 'Crear una nova moneda', @@ -1785,7 +1785,7 @@ return [ 'bill_repeats_half-year_skip' => 'Es repeteix cada {skip} mitjos anys', 'bill_repeats_yearly_skip' => 'Es repeteix cada {skip} anys', 'subscriptions' => 'Subscripcions', - 'go_to_subscriptions' => 'Go to your subscriptions', + 'go_to_subscriptions' => 'Ves a les teves subscripcions', 'forever' => 'Per a sempre', 'extension_date_is' => 'La data d\'extensió és {date}', @@ -2372,7 +2372,7 @@ return [ 'created_tag' => 'L\'etiqueta ":tag" ha sigut creada!', 'transaction_journal_information' => 'Informació de la transacció', - 'transaction_journal_amount' => 'Amount information', + 'transaction_journal_amount' => 'Informació de la quantitat', 'transaction_journal_meta' => 'Metainformació', 'transaction_journal_more' => 'Més informació', 'basic_journal_information' => 'Informació de transacció bàsica', diff --git a/resources/lang/ca_ES/rules.php b/resources/lang/ca_ES/rules.php index 8d034ab1f3..4506929ee9 100644 --- a/resources/lang/ca_ES/rules.php +++ b/resources/lang/ca_ES/rules.php @@ -23,47 +23,47 @@ declare(strict_types=1); return [ - 'main_message' => 'Action ":action", present in rule ":rule", could not be applied to transaction #:group: :error', - 'find_or_create_tag_failed' => 'Could not find or create tag ":tag"', - 'tag_already_added' => 'Tag ":tag" is already linked to this transaction', - 'inspect_transaction' => 'Inspect transaction ":title" @ Firefly III', - 'inspect_rule' => 'Inspect rule ":title" @ Firefly III', - 'journal_other_user' => 'This transaction doesn\'t belong to the user', - 'no_such_journal' => 'This transaction doesn\'t exist', - 'journal_already_no_budget' => 'This transaction has no budget, so it cannot be removed', - 'journal_already_no_category' => 'This transaction had no category, so it cannot be removed', - 'journal_already_no_notes' => 'This transaction had no notes, so they cannot be removed', - 'journal_not_found' => 'Firefly III can\'t find the requested transaction', - 'split_group' => 'Firefly III cannot execute this action on a transaction with multiple splits', - 'is_already_withdrawal' => 'This transaction is already a withdrawal', - 'is_already_deposit' => 'This transaction is already a deposit', - 'is_already_transfer' => 'This transaction is already a transfer', - 'is_not_transfer' => 'This transaction is not a transfer', - 'complex_error' => 'Something complicated went wrong. Sorry about that. Please inspect the logs of Firefly III', - 'no_valid_opposing' => 'Conversion failed because there is no valid account named ":account"', - 'new_notes_empty' => 'The notes to be set are empty', - 'unsupported_transaction_type_withdrawal' => 'Firefly III cannot convert a ":type" to a withdrawal', - 'unsupported_transaction_type_deposit' => 'Firefly III cannot convert a ":type" to a deposit', - 'unsupported_transaction_type_transfer' => 'Firefly III cannot convert a ":type" to a transfer', - 'already_has_source_asset' => 'This transaction already has ":name" as the source asset account', - 'already_has_destination_asset' => 'This transaction already has ":name" as the destination asset account', - 'already_has_destination' => 'This transaction already has ":name" as the destination account', - 'already_has_source' => 'This transaction already has ":name" as the source account', - 'already_linked_to_subscription' => 'The transaction is already linked to subscription ":name"', - 'cannot_find_subscription' => 'Firefly III can\'t find subscription ":name"', - 'no_notes_to_move' => 'The transaction has no notes to move to the description field', - 'no_tags_to_remove' => 'The transaction has no tags to remove', - 'cannot_find_tag' => 'Firefly III can\'t find tag ":tag"', - 'cannot_find_asset' => 'Firefly III can\'t find asset account ":name"', - 'cannot_find_accounts' => 'Firefly III can\'t find the source or destination account', - 'cannot_find_source_transaction' => 'Firefly III can\'t find the source transaction', - 'cannot_find_destination_transaction' => 'Firefly III can\'t find the destination transaction', - 'cannot_find_source_transaction_account' => 'Firefly III can\'t find the source transaction account', - 'cannot_find_destination_transaction_account' => 'Firefly III can\'t find the destination transaction account', - 'cannot_find_piggy' => 'Firefly III can\'t find a piggy bank named ":name"', - 'no_link_piggy' => 'This transaction\'s accounts are not linked to the piggy bank, so no action will be taken', - 'cannot_unlink_tag' => 'Tag ":tag" isn\'t linked to this transaction', - 'cannot_find_budget' => 'Firefly III can\'t find budget ":name"', - 'cannot_find_category' => 'Firefly III can\'t find category ":name"', - 'cannot_set_budget' => 'Firefly III can\'t set budget ":name" to a transaction of type ":type"', + 'main_message' => 'Acció ":action", present a la regla ":rule", no s\'ha pogut aplicar a la transacció #:group: :error', + 'find_or_create_tag_failed' => 'No s\'ha pogut trobar o crear l\'etiqueta ":tag"', + 'tag_already_added' => 'L\'etiqueta ":tag" ja està enllaçada a aquesta transacció', + 'inspect_transaction' => 'Inspecciona la transacció ":title" a Firefly III', + 'inspect_rule' => 'Inspecciona la norma ":title" a Firefly III', + 'journal_other_user' => 'Aquesta transacció no pertany a l\'usuari', + 'no_such_journal' => 'Aquesta transacció no existeix', + 'journal_already_no_budget' => 'Aquesta transacció no té cap pressupost, així que no es pot eliminar', + 'journal_already_no_category' => 'Aquesta transacció no tenia cap categoria, així que no es pot eliminar', + 'journal_already_no_notes' => 'Aquesta transacció no tenia notes, així que no es poden eliminar', + 'journal_not_found' => 'Firefly III no pot trobar la transacció sol·licitada', + 'split_group' => 'Firefly III no pot executar aquesta acció a una transacció amb varies divisions', + 'is_already_withdrawal' => 'Aquesta transacció ja és una retirada', + 'is_already_deposit' => 'Aquesta transacció ja és un dipòsit', + 'is_already_transfer' => 'Aquesta transacció ja és una transferència', + 'is_not_transfer' => 'Aquesta transacció no és una transferència', + 'complex_error' => 'Una operació complicada ha anat malament. Disculpa. Per favor, revisa els registres de Firefly III', + 'no_valid_opposing' => 'La conversió ha fallat perquè no hi ha cap compte anomenat ":account"', + 'new_notes_empty' => 'Les notes a establir són buides', + 'unsupported_transaction_type_withdrawal' => 'Firefly III no pot convertir un/una ":type" a una retirada', + 'unsupported_transaction_type_deposit' => 'Firefly III no pot convertir una ":type" a un dipòsit', + 'unsupported_transaction_type_transfer' => 'Firefly III no pot convertir un/una ":type" a una transferència', + 'already_has_source_asset' => 'Aquesta transacció ja té ":name" com al compte d\'actius font', + 'already_has_destination_asset' => 'Aquesta transacció ja té ":name" com al compte d\'actius destí', + 'already_has_destination' => 'Aquesta transacció ja té ":name" com al compte destí', + 'already_has_source' => 'Aquesta transacció ja té ":name" com al compte font', + 'already_linked_to_subscription' => 'La transacció ja està enllaçada a la subscripció ":name"', + 'cannot_find_subscription' => 'Firefly III no pot trobar la subscripció ":name"', + 'no_notes_to_move' => 'La transacció no té cap nota que moure al camp de descripció', + 'no_tags_to_remove' => 'La transacció no té etiquetes que eliminar', + 'cannot_find_tag' => 'Firefly III no ha pogut trobar l\'etiqueta ":tag"', + 'cannot_find_asset' => 'Firefly III no ha pogut trobar el compte d\'actius ":name"', + 'cannot_find_accounts' => 'Firefly III no ha pogut trobar el compte destí o font', + 'cannot_find_source_transaction' => 'Firefly III no pot trobar la transacció d\'origen', + 'cannot_find_destination_transaction' => 'Firefly III no pot trobar la transacció de destinació', + 'cannot_find_source_transaction_account' => 'Firefly III no pot trobar el compte font de la transacció', + 'cannot_find_destination_transaction_account' => 'Firefly III no pot trobar el compte de destinació de la transacció', + 'cannot_find_piggy' => 'Firefly III no pot trobar una guardiola anomenada ":name"', + 'no_link_piggy' => 'Els comptes d\'aquesta transacció no estan enllaçats a la guardiola, així que no es durà a terme cap acció', + 'cannot_unlink_tag' => 'L\'etiqueta ":tag" no està enllaçada a aquesta transacció', + 'cannot_find_budget' => 'Firefly III no pot trobar el pressupost ":name"', + 'cannot_find_category' => 'Firefly III no pot trobar la categoria ":name"', + 'cannot_set_budget' => 'Firefly III no pot establir el pressupost ":name" a una transacció del tipus ":type"', ]; diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index ce9ca300d5..d4e6714e3f 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -1395,7 +1395,7 @@ return [ 'pref_notification_new_access_token' => 'Warnen, wenn ein neues API-Zugangs-Token erstellt wird', 'pref_notification_transaction_creation' => 'Warnen, wenn eine Buchung automatisch erstellt wird', 'pref_notification_user_login' => 'Warnen, wenn Sie sich von einem neuen Standort aus anmelden', - 'pref_notification_rule_action_failures' => 'Alert when rule actions fail to execute (Slack or Discord only)', + 'pref_notification_rule_action_failures' => 'Warnung, wenn Regelaktionen nicht ausgeführt werden (nur Slack oder Discord)', 'pref_notifications' => 'Benachrichtigungen', 'pref_notifications_help' => 'Geben Sie an, ob Sie diese Mitteilungen erhalten möchten. Einige Mitteilungen können sensible Finanzinformationen enthalten.', 'slack_webhook_url' => 'Slack Webhook URL', @@ -1625,8 +1625,8 @@ return [ 'create_new_revenue' => 'Neues Einnahmenkonto erstellen', 'create_new_piggy_bank' => 'Ein neues Sparschwein erstellen', 'create_new_bill' => 'Eine neue Rechnung erstellen', - 'create_new_subscription' => 'Create new subscription', - 'create_new_rule' => 'Create new rule', + 'create_new_subscription' => 'Neues Abonnement erstellen', + 'create_new_rule' => 'Neue Regel erstellen', // currencies: 'create_currency' => 'Eine neue Währung erstellen', @@ -1785,7 +1785,7 @@ return [ 'bill_repeats_half-year_skip' => 'Wiederholt sich alle {skip} Halbjahre', 'bill_repeats_yearly_skip' => 'Wiederholt sich alle {skip} Jahre', 'subscriptions' => 'Abonnements', - 'go_to_subscriptions' => 'Go to your subscriptions', + 'go_to_subscriptions' => 'Zu Abonnements gehen', 'forever' => 'Dauerhaft', 'extension_date_is' => 'Zeitpunkt der Verlängerung ist {date}', @@ -2372,7 +2372,7 @@ return [ 'created_tag' => 'Schlagwort „:tag” wurde angelegt!', 'transaction_journal_information' => 'Transaktionsinformationen', - 'transaction_journal_amount' => 'Amount information', + 'transaction_journal_amount' => 'Betraginformation', 'transaction_journal_meta' => 'Metainformationen', 'transaction_journal_more' => 'Weitere Informationen', 'basic_journal_information' => 'Allgemeine Buchungsinformationen', diff --git a/resources/lang/de_DE/rules.php b/resources/lang/de_DE/rules.php index 8d034ab1f3..3dacc3eba0 100644 --- a/resources/lang/de_DE/rules.php +++ b/resources/lang/de_DE/rules.php @@ -23,25 +23,25 @@ declare(strict_types=1); return [ - 'main_message' => 'Action ":action", present in rule ":rule", could not be applied to transaction #:group: :error', - 'find_or_create_tag_failed' => 'Could not find or create tag ":tag"', - 'tag_already_added' => 'Tag ":tag" is already linked to this transaction', - 'inspect_transaction' => 'Inspect transaction ":title" @ Firefly III', - 'inspect_rule' => 'Inspect rule ":title" @ Firefly III', - 'journal_other_user' => 'This transaction doesn\'t belong to the user', - 'no_such_journal' => 'This transaction doesn\'t exist', - 'journal_already_no_budget' => 'This transaction has no budget, so it cannot be removed', - 'journal_already_no_category' => 'This transaction had no category, so it cannot be removed', - 'journal_already_no_notes' => 'This transaction had no notes, so they cannot be removed', - 'journal_not_found' => 'Firefly III can\'t find the requested transaction', - 'split_group' => 'Firefly III cannot execute this action on a transaction with multiple splits', - 'is_already_withdrawal' => 'This transaction is already a withdrawal', - 'is_already_deposit' => 'This transaction is already a deposit', - 'is_already_transfer' => 'This transaction is already a transfer', - 'is_not_transfer' => 'This transaction is not a transfer', - 'complex_error' => 'Something complicated went wrong. Sorry about that. Please inspect the logs of Firefly III', + 'main_message' => 'Aktion ":action", vorhanden in Regel ":rule", konnte nicht auf Transaktion #:group angewendet werden: :error', + 'find_or_create_tag_failed' => 'Konnte Schlagwort ":tag" nicht finden oder erstellen', + 'tag_already_added' => 'Schlagwort ":tag" ist bereits mit dieser Buchung verknüpft', + 'inspect_transaction' => 'Buchung ":title" untersuchen @ Firefly III', + 'inspect_rule' => 'Regel ":title" untersuchen @ Firefly III', + 'journal_other_user' => 'Diese Buchung gehört nicht zum Benutzer', + 'no_such_journal' => 'Diese Buchung existiert nicht', + 'journal_already_no_budget' => 'Diese Buchung hat kein Budget, daher kann sie nicht entfernt werden', + 'journal_already_no_category' => 'Diese Buchung hatte keine Kategorie, daher kann sie nicht entfernt werden', + 'journal_already_no_notes' => 'Diese Buchung hatte keine Notizen, daher können sie nicht entfernt werden', + 'journal_not_found' => 'Firefly III kann die angeforderte Buchung nicht finden', + 'split_group' => 'Firefly III kann diese Aktion bei einer Buchung mit mehreren Aufteilungen nicht ausführen', + 'is_already_withdrawal' => 'Diese Buchung ist bereits eine Ausgabe', + 'is_already_deposit' => 'Diese Buchung ist bereits eine Einnahme', + 'is_already_transfer' => 'Diese Buchung ist bereits eine Umbuchung', + 'is_not_transfer' => 'Diese Buchung ist keine Überweisung', + 'complex_error' => 'Etwas kompliziertes ist schief gelaufen. Bitte die Protokolle von Firefly III überprüfen', 'no_valid_opposing' => 'Conversion failed because there is no valid account named ":account"', - 'new_notes_empty' => 'The notes to be set are empty', + 'new_notes_empty' => 'Die zu setzenden Notizen sind leer', 'unsupported_transaction_type_withdrawal' => 'Firefly III cannot convert a ":type" to a withdrawal', 'unsupported_transaction_type_deposit' => 'Firefly III cannot convert a ":type" to a deposit', 'unsupported_transaction_type_transfer' => 'Firefly III cannot convert a ":type" to a transfer', @@ -52,18 +52,18 @@ return [ 'already_linked_to_subscription' => 'The transaction is already linked to subscription ":name"', 'cannot_find_subscription' => 'Firefly III can\'t find subscription ":name"', 'no_notes_to_move' => 'The transaction has no notes to move to the description field', - 'no_tags_to_remove' => 'The transaction has no tags to remove', - 'cannot_find_tag' => 'Firefly III can\'t find tag ":tag"', - 'cannot_find_asset' => 'Firefly III can\'t find asset account ":name"', - 'cannot_find_accounts' => 'Firefly III can\'t find the source or destination account', + 'no_tags_to_remove' => 'Die Buchung hat keine Schlagworte zum Entfernen', + 'cannot_find_tag' => 'Firefly III kann Schlagwort ":tag" nicht finden', + 'cannot_find_asset' => 'Firefly III kann kein Girokonto ":name" finden', + 'cannot_find_accounts' => 'Firefly III kann das Quell- oder Zielkonto nicht finden', 'cannot_find_source_transaction' => 'Firefly III can\'t find the source transaction', 'cannot_find_destination_transaction' => 'Firefly III can\'t find the destination transaction', 'cannot_find_source_transaction_account' => 'Firefly III can\'t find the source transaction account', 'cannot_find_destination_transaction_account' => 'Firefly III can\'t find the destination transaction account', - 'cannot_find_piggy' => 'Firefly III can\'t find a piggy bank named ":name"', - 'no_link_piggy' => 'This transaction\'s accounts are not linked to the piggy bank, so no action will be taken', - 'cannot_unlink_tag' => 'Tag ":tag" isn\'t linked to this transaction', - 'cannot_find_budget' => 'Firefly III can\'t find budget ":name"', - 'cannot_find_category' => 'Firefly III can\'t find category ":name"', - 'cannot_set_budget' => 'Firefly III can\'t set budget ":name" to a transaction of type ":type"', + 'cannot_find_piggy' => 'Firefly III kann kein Sparschwein mit dem Namen ":name" finden', + 'no_link_piggy' => 'Die Konten dieser Buchung sind nicht mit dem Sparschwein verbunden, daher wird nichts gemacht', + 'cannot_unlink_tag' => 'Schlagwort ":tag" ist nicht mit dieser Buchung verknüpft', + 'cannot_find_budget' => 'Firefly III kann kein Budget ":name" finden', + 'cannot_find_category' => 'Firefly III kann die Kategorie ":name" nicht finden', + 'cannot_set_budget' => 'Firefly III kann das Budget ":name" nicht auf eine Buchung vom Typ ":type" setzen', ]; diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index bd728ba016..f7d0e8a109 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -1395,7 +1395,7 @@ return [ 'pref_notification_new_access_token' => 'Alerta cuando se crea un nuevo token de acceso API', 'pref_notification_transaction_creation' => 'Alerta cuando una transacción se crea automáticamente', 'pref_notification_user_login' => 'Alertar cuando se inicie sesión desde una nueva ubicación', - 'pref_notification_rule_action_failures' => 'Alert when rule actions fail to execute (Slack or Discord only)', + 'pref_notification_rule_action_failures' => 'Alerta cuando las acciones de regla fallan al ejecutar (Slack o Discord solamente)', 'pref_notifications' => 'Notificaciones', 'pref_notifications_help' => 'Indique si desea recibir estas notificaciones. Algunas notificaciones pueden contener información financiera sensible.', 'slack_webhook_url' => 'URL del Webhook de Slack', @@ -1625,8 +1625,8 @@ return [ 'create_new_revenue' => 'Crear nueva cuenta de ingresos', 'create_new_piggy_bank' => 'Crear nueva hucha', 'create_new_bill' => 'Crear nueva factura', - 'create_new_subscription' => 'Create new subscription', - 'create_new_rule' => 'Create new rule', + 'create_new_subscription' => 'Crear nueva suscripción', + 'create_new_rule' => 'Crear nueva regla', // currencies: 'create_currency' => 'Crear nueva moneda', @@ -1785,7 +1785,7 @@ return [ 'bill_repeats_half-year_skip' => 'Repetir cada {skip} medios años', 'bill_repeats_yearly_skip' => 'Repetir cada {skip} años', 'subscriptions' => 'Suscripciones', - 'go_to_subscriptions' => 'Go to your subscriptions', + 'go_to_subscriptions' => 'Ir a tus suscripciones', 'forever' => 'Siempre', 'extension_date_is' => 'Fecha de extensión es {date}', @@ -2372,7 +2372,7 @@ return [ 'created_tag' => 'Etiqueta ":tag" ha sido creado!', 'transaction_journal_information' => 'Información de transacción', - 'transaction_journal_amount' => 'Amount information', + 'transaction_journal_amount' => 'Información de cantidad', 'transaction_journal_meta' => 'Información Meta', 'transaction_journal_more' => 'Más información', 'basic_journal_information' => 'Información básica de transacción', diff --git a/resources/lang/es_ES/rules.php b/resources/lang/es_ES/rules.php index 8d034ab1f3..94cda46a2a 100644 --- a/resources/lang/es_ES/rules.php +++ b/resources/lang/es_ES/rules.php @@ -23,12 +23,12 @@ declare(strict_types=1); return [ - 'main_message' => 'Action ":action", present in rule ":rule", could not be applied to transaction #:group: :error', - 'find_or_create_tag_failed' => 'Could not find or create tag ":tag"', - 'tag_already_added' => 'Tag ":tag" is already linked to this transaction', - 'inspect_transaction' => 'Inspect transaction ":title" @ Firefly III', - 'inspect_rule' => 'Inspect rule ":title" @ Firefly III', - 'journal_other_user' => 'This transaction doesn\'t belong to the user', + 'main_message' => 'Acción ":action", presente en la regla ":rule", no se pudo aplicar a la transacción #:group: :error', + 'find_or_create_tag_failed' => 'No se pudo encontrar o crear la etiqueta ":tag"', + 'tag_already_added' => 'La etiqueta ":tag" ya está vinculada a esta transacción', + 'inspect_transaction' => 'Inspeccionar transacción ":title" @ Firefly III', + 'inspect_rule' => 'Inspeccionar regla ":title" @ Firefly III', + 'journal_other_user' => 'Esta transacción no pertenece al usuario', 'no_such_journal' => 'This transaction doesn\'t exist', 'journal_already_no_budget' => 'This transaction has no budget, so it cannot be removed', 'journal_already_no_category' => 'This transaction had no category, so it cannot be removed', diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index 266b90eb5d..8626e2849a 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -1395,7 +1395,7 @@ return [ 'pref_notification_new_access_token' => 'Alerte à la création d\'un nouveau jeton d\'accès API', 'pref_notification_transaction_creation' => 'Alerte à la création automatique d\'une opération', 'pref_notification_user_login' => 'Alerte à la connexion depuis un nouvel emplacement', - 'pref_notification_rule_action_failures' => 'Alert when rule actions fail to execute (Slack or Discord only)', + 'pref_notification_rule_action_failures' => 'Alerte lorsque les actions des règles ne s\'exécutent pas (Slack ou Discord uniquement)', 'pref_notifications' => 'Notifications', 'pref_notifications_help' => 'Sélectionnez les notifications que vous souhaitez recevoir. Certaines notifications peuvent contenir des informations financières sensibles.', 'slack_webhook_url' => 'Webhook URL de Slack', @@ -1625,8 +1625,8 @@ return [ 'create_new_revenue' => 'Créer nouveau compte de recettes', 'create_new_piggy_bank' => 'Créer une nouvelle tirelire', 'create_new_bill' => 'Créer une nouvelle facture', - 'create_new_subscription' => 'Create new subscription', - 'create_new_rule' => 'Create new rule', + 'create_new_subscription' => 'Créer un nouvel abonnement', + 'create_new_rule' => 'Créer une nouvelle règle', // currencies: 'create_currency' => 'Créer une nouvelle devise', @@ -1785,7 +1785,7 @@ return [ 'bill_repeats_half-year_skip' => 'Se répète tous les {skip} semestres', 'bill_repeats_yearly_skip' => 'Se répète tous les {skip} ans', 'subscriptions' => 'Abonnements', - 'go_to_subscriptions' => 'Go to your subscriptions', + 'go_to_subscriptions' => 'Accédez à vos abonnements', 'forever' => 'Pour toujours', 'extension_date_is' => 'La date de l\'extension est {date}', @@ -2372,7 +2372,7 @@ return [ 'created_tag' => 'Tag ":tag" a été créé !', 'transaction_journal_information' => 'Informations sur l\'opération', - 'transaction_journal_amount' => 'Amount information', + 'transaction_journal_amount' => 'Informations sur les montants', 'transaction_journal_meta' => 'Méta informations', 'transaction_journal_more' => 'Plus d\'informations', 'basic_journal_information' => 'Informations de base sur l\'opération', diff --git a/resources/lang/fr_FR/rules.php b/resources/lang/fr_FR/rules.php index 8d034ab1f3..f2c4f645a6 100644 --- a/resources/lang/fr_FR/rules.php +++ b/resources/lang/fr_FR/rules.php @@ -23,47 +23,47 @@ declare(strict_types=1); return [ - 'main_message' => 'Action ":action", present in rule ":rule", could not be applied to transaction #:group: :error', - 'find_or_create_tag_failed' => 'Could not find or create tag ":tag"', - 'tag_already_added' => 'Tag ":tag" is already linked to this transaction', - 'inspect_transaction' => 'Inspect transaction ":title" @ Firefly III', - 'inspect_rule' => 'Inspect rule ":title" @ Firefly III', - 'journal_other_user' => 'This transaction doesn\'t belong to the user', - 'no_such_journal' => 'This transaction doesn\'t exist', - 'journal_already_no_budget' => 'This transaction has no budget, so it cannot be removed', - 'journal_already_no_category' => 'This transaction had no category, so it cannot be removed', - 'journal_already_no_notes' => 'This transaction had no notes, so they cannot be removed', - 'journal_not_found' => 'Firefly III can\'t find the requested transaction', - 'split_group' => 'Firefly III cannot execute this action on a transaction with multiple splits', - 'is_already_withdrawal' => 'This transaction is already a withdrawal', - 'is_already_deposit' => 'This transaction is already a deposit', - 'is_already_transfer' => 'This transaction is already a transfer', - 'is_not_transfer' => 'This transaction is not a transfer', - 'complex_error' => 'Something complicated went wrong. Sorry about that. Please inspect the logs of Firefly III', - 'no_valid_opposing' => 'Conversion failed because there is no valid account named ":account"', - 'new_notes_empty' => 'The notes to be set are empty', - 'unsupported_transaction_type_withdrawal' => 'Firefly III cannot convert a ":type" to a withdrawal', - 'unsupported_transaction_type_deposit' => 'Firefly III cannot convert a ":type" to a deposit', - 'unsupported_transaction_type_transfer' => 'Firefly III cannot convert a ":type" to a transfer', - 'already_has_source_asset' => 'This transaction already has ":name" as the source asset account', - 'already_has_destination_asset' => 'This transaction already has ":name" as the destination asset account', - 'already_has_destination' => 'This transaction already has ":name" as the destination account', - 'already_has_source' => 'This transaction already has ":name" as the source account', - 'already_linked_to_subscription' => 'The transaction is already linked to subscription ":name"', - 'cannot_find_subscription' => 'Firefly III can\'t find subscription ":name"', - 'no_notes_to_move' => 'The transaction has no notes to move to the description field', - 'no_tags_to_remove' => 'The transaction has no tags to remove', - 'cannot_find_tag' => 'Firefly III can\'t find tag ":tag"', - 'cannot_find_asset' => 'Firefly III can\'t find asset account ":name"', - 'cannot_find_accounts' => 'Firefly III can\'t find the source or destination account', - 'cannot_find_source_transaction' => 'Firefly III can\'t find the source transaction', - 'cannot_find_destination_transaction' => 'Firefly III can\'t find the destination transaction', - 'cannot_find_source_transaction_account' => 'Firefly III can\'t find the source transaction account', - 'cannot_find_destination_transaction_account' => 'Firefly III can\'t find the destination transaction account', - 'cannot_find_piggy' => 'Firefly III can\'t find a piggy bank named ":name"', - 'no_link_piggy' => 'This transaction\'s accounts are not linked to the piggy bank, so no action will be taken', - 'cannot_unlink_tag' => 'Tag ":tag" isn\'t linked to this transaction', - 'cannot_find_budget' => 'Firefly III can\'t find budget ":name"', - 'cannot_find_category' => 'Firefly III can\'t find category ":name"', - 'cannot_set_budget' => 'Firefly III can\'t set budget ":name" to a transaction of type ":type"', + 'main_message' => 'L\'action ":action", présente dans la règle ":rule", n\'a pas pu être appliquée à l\'opération #:group : :error', + 'find_or_create_tag_failed' => 'Impossible de trouver ou de créer le tag ":tag"', + 'tag_already_added' => 'L\'étiquette ":tag" est déjà liée à cette opération', + 'inspect_transaction' => 'Inspecter l\'opération ":title" @ Firefly III', + 'inspect_rule' => 'Inspecter la règle ":title" @ Firefly III', + 'journal_other_user' => 'Cette opération n\'appartient pas à l\'utilisateur', + 'no_such_journal' => 'Cette opération n\'existe pas', + 'journal_already_no_budget' => 'Cette opération n\'a pas de budget, elle ne peut donc pas être supprimée', + 'journal_already_no_category' => 'Cette opération n\'a pas de catégorie, elle ne peut donc pas être supprimée', + 'journal_already_no_notes' => 'Cette opération n\'a pas de note, elle ne peut donc pas être supprimée', + 'journal_not_found' => 'Firefly III ne trouve pas l\'opération demandée', + 'split_group' => 'Firefly III ne peut pas exécuter cette action sur une opération avec une ventilation multiple', + 'is_already_withdrawal' => 'Cette opération est déjà une dépense', + 'is_already_deposit' => 'Cette opération est déjà un dépôt', + 'is_already_transfer' => 'Cette opération est déjà un transfert', + 'is_not_transfer' => 'Cette opération n\'est pas un transfert', + 'complex_error' => 'Quelque chose de compliqué s\'est mal passé. Nous en sommes désolés. Veuillez consulter les journaux de Firefly III', + 'no_valid_opposing' => 'La conversion a échoué car il n\'y a pas de compte valide nommé ":account"', + 'new_notes_empty' => 'Les notes à définir sont vides', + 'unsupported_transaction_type_withdrawal' => 'Firefly III ne peut pas convertir un ":type" en retrait', + 'unsupported_transaction_type_deposit' => 'Firefly III ne peut pas convertir un ":type" en dépôt', + 'unsupported_transaction_type_transfer' => 'Firefly III ne peut pas convertir un ":type" en transfert', + 'already_has_source_asset' => 'Cette opération a déjà «:name» comme compte d\'actif source', + 'already_has_destination_asset' => 'Cette opération a déjà «:name» comme compte d\'actif de destination', + 'already_has_destination' => 'Cette opération a déjà «:name» comme compte de destination', + 'already_has_source' => 'Cette opération a déjà ":name" comme compte source', + 'already_linked_to_subscription' => 'L\'opération est déjà liée à l\'abonnement ":name"', + 'cannot_find_subscription' => 'Firefly III ne trouve pas l\'abonnement ":name"', + 'no_notes_to_move' => 'L\'opération n\'a pas de notes à déplacer dans le champ description', + 'no_tags_to_remove' => 'L\'opération n\'a pas de tags à supprimer', + 'cannot_find_tag' => 'Firefly III ne trouve pas le tag ":tag"', + 'cannot_find_asset' => 'Firefly III ne trouve pas le compte d\'actif ":name"', + 'cannot_find_accounts' => 'Firefly III ne trouve pas le compte source ou le compte de destination', + 'cannot_find_source_transaction' => 'Firefly III ne trouve pas l\'opération source', + 'cannot_find_destination_transaction' => 'Firefly III ne trouve pas l\'opération de destination', + 'cannot_find_source_transaction_account' => 'Firefly III ne trouve pas le compte d\'opérations source', + 'cannot_find_destination_transaction_account' => 'Firefly III ne trouve pas le compte d\'opérations de destination', + 'cannot_find_piggy' => 'Firefly III ne trouve pas de tirelire nommée ":name"', + 'no_link_piggy' => 'Les comptes de cette opération ne sont pas liés à la tirelire, aucune action ne sera donc entreprise', + 'cannot_unlink_tag' => 'L\'étiquette ":tag" n\'est pas liée à cette opération', + 'cannot_find_budget' => 'Firefly III ne trouve pas le budget ":name"', + 'cannot_find_category' => 'Firefly III ne trouve pas la catégorie ":name"', + 'cannot_set_budget' => 'Firefly III ne peut pas attribuer le budget ":name" à une opération de type ":type"', ]; diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php index 837aa94823..453f8194ef 100644 --- a/resources/lang/sl_SI/firefly.php +++ b/resources/lang/sl_SI/firefly.php @@ -1395,7 +1395,7 @@ return [ 'pref_notification_new_access_token' => 'Alert when a new API access token is created', 'pref_notification_transaction_creation' => 'Alert when a transaction is created automatically', 'pref_notification_user_login' => 'Alert when you login from a new location', - 'pref_notification_rule_action_failures' => 'Alert when rule actions fail to execute (Slack or Discord only)', + 'pref_notification_rule_action_failures' => 'Opozorilo, ko se dejanja pravila ne izvedejo (samo Slack ali Discord)', 'pref_notifications' => 'Obvestila', 'pref_notifications_help' => 'Indicate if these are notifications you would like to get. Some notifications may contain sensitive financial information.', 'slack_webhook_url' => 'Slack Webhook URL', @@ -1625,8 +1625,8 @@ return [ 'create_new_revenue' => 'Ustvari nov račun prihodkov', 'create_new_piggy_bank' => 'Ustvari nov hranilnik', 'create_new_bill' => 'Ustvari nov trajnik', - 'create_new_subscription' => 'Create new subscription', - 'create_new_rule' => 'Create new rule', + 'create_new_subscription' => 'Ustvarite novo naročnino', + 'create_new_rule' => 'Ustvari novo pravilo', // currencies: 'create_currency' => 'Ustvarite valuto', @@ -1785,7 +1785,7 @@ return [ 'bill_repeats_half-year_skip' => 'Repeats every {skip} half years', 'bill_repeats_yearly_skip' => 'Repeats every {skip} years', 'subscriptions' => 'Naročnine', - 'go_to_subscriptions' => 'Go to your subscriptions', + 'go_to_subscriptions' => 'Pojdite na svoje naročnine', 'forever' => 'Forever', 'extension_date_is' => 'Extension date is {date}',