Merge branch 'develop' into 5.8-dev

# Conflicts:
#	config/firefly.php
#	frontend/src/i18n/nb_NO/index.js
#	frontend/src/i18n/nl_NL/index.js
#	frontend/src/i18n/ru_RU/index.js
This commit is contained in:
James Cole
2022-07-17 08:18:18 +02:00
38 changed files with 937 additions and 897 deletions

View File

@@ -7,7 +7,7 @@ export default {
"name": "Nom",
"amount_min": "Montant minimum",
"amount_max": "Montant maximum",
"url": "URL",
"url": "Liens",
"title": "Titre",
"first_date": "Date de d\u00e9but",
"repetitions": "R\u00e9p\u00e9titions",
@@ -61,10 +61,10 @@ export default {
"rule_trigger_source_account_ends_choice": "Le nom du compte source se termine par..",
"rule_trigger_source_account_is_choice": "Le nom du compte source est..",
"rule_trigger_source_account_contains_choice": "Le nom du compte source contient..",
"rule_trigger_account_id_choice": "Either account ID is exactly..",
"rule_trigger_account_id_choice": "L'un des deux comptes a pour identifiant..",
"rule_trigger_source_account_id_choice": "L'ID du compte source est exactement..",
"rule_trigger_destination_account_id_choice": "L'ID du compte de destination est exactement..",
"rule_trigger_account_is_cash_choice": "Either account is cash",
"rule_trigger_account_is_cash_choice": "L'un des deux comptes est en esp\u00e8ces",
"rule_trigger_source_is_cash_choice": "Le compte source est un compte (d'esp\u00e8ces)",
"rule_trigger_destination_is_cash_choice": "Le compte de destination est un compte (d'esp\u00e8ces)",
"rule_trigger_source_account_nr_starts_choice": "Le num\u00e9ro \/ IBAN du compte source commence par..",
@@ -82,7 +82,7 @@ export default {
"rule_trigger_transaction_type_choice": "L'op\u00e9ration est du type..",
"rule_trigger_category_is_choice": "La cat\u00e9gorie est..",
"rule_trigger_amount_less_choice": "Le montant est inf\u00e9rieur \u00e0..",
"rule_trigger_amount_is_choice": "Amount is..",
"rule_trigger_amount_is_choice": "Le montant est..",
"rule_trigger_amount_more_choice": "Le montant est sup\u00e9rieur \u00e0..",
"rule_trigger_description_starts_choice": "Le description commence par..",
"rule_trigger_description_ends_choice": "La description se termine par..",

View File

@@ -82,7 +82,7 @@ export default {
"rule_trigger_transaction_type_choice": "Transakcja jest typu..",
"rule_trigger_category_is_choice": "Kategoria to..",
"rule_trigger_amount_less_choice": "Kwota jest mniejsza ni\u017c..",
"rule_trigger_amount_is_choice": "Amount is..",
"rule_trigger_amount_is_choice": "Kwota to..",
"rule_trigger_amount_more_choice": "Kwota jest wi\u0119ksza ni\u017c..",
"rule_trigger_description_starts_choice": "Opis zaczyna si\u0119 od..",
"rule_trigger_description_ends_choice": "Opis ko\u0144czy si\u0119 na..",
@@ -108,8 +108,8 @@ export default {
"rule_trigger_has_any_tag_choice": "Ma (dowolny) tag (lub kilka)",
"rule_trigger_any_notes_choice": "Ma (dowolne) notatki",
"rule_trigger_no_notes_choice": "Brak notatek",
"rule_trigger_notes_is_choice": "Notes are..",
"rule_trigger_notes_contains_choice": "Notes contain..",
"rule_trigger_notes_is_choice": "Notatki to..",
"rule_trigger_notes_contains_choice": "Notatki zawieraj\u0105..",
"rule_trigger_notes_starts_choice": "Notes start with..",
"rule_trigger_notes_ends_choice": "Notes end with..",
"rule_trigger_bill_is_choice": "Rachunek to..",