From 0f68735e1ce3f3abe60996357a66db1e83098561 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 28 Dec 2024 13:59:31 +0100 Subject: [PATCH] Auto commit for release 'develop' on 2024-12-28 --- .../Controllers/Summary/BasicController.php | 8 +-- .../Observer/AvailableBudgetObserver.php | 1 + app/Handlers/Observer/BudgetLimitObserver.php | 1 + .../Controllers/System/InstallController.php | 4 +- .../Budget/AvailableBudgetRepository.php | 2 +- app/Support/Amount.php | 60 +++++++++---------- composer.lock | 14 ++--- resources/assets/v1/src/locales/bg.json | 2 +- resources/assets/v1/src/locales/ca.json | 2 +- resources/assets/v1/src/locales/cs.json | 2 +- resources/assets/v1/src/locales/da.json | 2 +- resources/assets/v1/src/locales/de.json | 6 +- resources/assets/v1/src/locales/el.json | 2 +- resources/assets/v1/src/locales/en-gb.json | 2 +- resources/assets/v1/src/locales/en.json | 2 +- resources/assets/v1/src/locales/es.json | 2 +- resources/assets/v1/src/locales/fi.json | 2 +- resources/assets/v1/src/locales/fr.json | 2 +- resources/assets/v1/src/locales/hu.json | 2 +- resources/assets/v1/src/locales/id.json | 2 +- resources/assets/v1/src/locales/it.json | 2 +- resources/assets/v1/src/locales/ja.json | 2 +- resources/assets/v1/src/locales/ko.json | 2 +- resources/assets/v1/src/locales/nb.json | 2 +- resources/assets/v1/src/locales/nl.json | 22 +++---- resources/assets/v1/src/locales/nn.json | 2 +- resources/assets/v1/src/locales/pl.json | 2 +- resources/assets/v1/src/locales/pt-br.json | 2 +- resources/assets/v1/src/locales/pt.json | 2 +- resources/assets/v1/src/locales/ro.json | 2 +- resources/assets/v1/src/locales/ru.json | 2 +- resources/assets/v1/src/locales/sk.json | 2 +- resources/assets/v1/src/locales/sl.json | 2 +- resources/assets/v1/src/locales/sv.json | 2 +- resources/assets/v1/src/locales/tr.json | 2 +- resources/assets/v1/src/locales/uk.json | 2 +- resources/assets/v1/src/locales/vi.json | 2 +- resources/assets/v1/src/locales/zh-cn.json | 2 +- resources/assets/v1/src/locales/zh-tw.json | 2 +- 39 files changed, 89 insertions(+), 89 deletions(-) diff --git a/app/Api/V1/Controllers/Summary/BasicController.php b/app/Api/V1/Controllers/Summary/BasicController.php index eadf5e01f6..cea491fc4d 100644 --- a/app/Api/V1/Controllers/Summary/BasicController.php +++ b/app/Api/V1/Controllers/Summary/BasicController.php @@ -103,10 +103,10 @@ class BasicController extends Controller $billData = $this->getBillInformation($start, $end); $spentData = $this->getLeftToSpendInfo($start, $end); $netWorthData = $this->getNetWorthInfo($start, $end); -// $balanceData = []; -// $billData = []; -// $spentData = []; -// $netWorthData = []; + // $balanceData = []; + // $billData = []; + // $spentData = []; + // $netWorthData = []; $total = array_merge($balanceData, $billData, $spentData, $netWorthData); // give new keys diff --git a/app/Handlers/Observer/AvailableBudgetObserver.php b/app/Handlers/Observer/AvailableBudgetObserver.php index 4e9b8cb57a..68de9677b4 100644 --- a/app/Handlers/Observer/AvailableBudgetObserver.php +++ b/app/Handlers/Observer/AvailableBudgetObserver.php @@ -47,6 +47,7 @@ class AvailableBudgetObserver { if (!Amount::convertToNative($availableBudget->user)) { Log::debug('Do not update native available amount of the available budget.'); + return; } $userCurrency = app('amount')->getDefaultCurrencyByUserGroup($availableBudget->user->userGroup); diff --git a/app/Handlers/Observer/BudgetLimitObserver.php b/app/Handlers/Observer/BudgetLimitObserver.php index 78ed28846d..dbc3493415 100644 --- a/app/Handlers/Observer/BudgetLimitObserver.php +++ b/app/Handlers/Observer/BudgetLimitObserver.php @@ -47,6 +47,7 @@ class BudgetLimitObserver { if (!Amount::convertToNative($budgetLimit->budget->user)) { Log::debug('Do not update native amount of the budget limit.'); + return; } $userCurrency = app('amount')->getDefaultCurrencyByUserGroup($budgetLimit->budget->user->userGroup); diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php index c2f41df459..fef4db461e 100644 --- a/app/Http/Controllers/System/InstallController.php +++ b/app/Http/Controllers/System/InstallController.php @@ -62,8 +62,8 @@ class InstallController extends Controller 'migrate' => ['--seed' => true, '--force' => true], 'generate-keys' => [], // an exception :( 'firefly-iii:upgrade-database' => [], - //'firefly-iii:correct-database' => [], - //'firefly-iii:report-integrity' => [], + // 'firefly-iii:correct-database' => [], + // 'firefly-iii:report-integrity' => [], 'firefly-iii:set-latest-version' => ['--james-is-cool' => true], 'firefly-iii:verify-security-alerts' => [], ]; diff --git a/app/Repositories/Budget/AvailableBudgetRepository.php b/app/Repositories/Budget/AvailableBudgetRepository.php index b985a4e25f..a1a23eb093 100644 --- a/app/Repositories/Budget/AvailableBudgetRepository.php +++ b/app/Repositories/Budget/AvailableBudgetRepository.php @@ -128,7 +128,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface public function getAvailableBudgetWithCurrency(Carbon $start, Carbon $end): array { - Log::debug(sprintf('Now in %s(%s, %s)',__METHOD__, $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s'))); + Log::debug(sprintf('Now in %s(%s, %s)', __METHOD__, $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s'))); $return = []; $availableBudgets = $this->user->availableBudgets() ->where('start_date', $start->format('Y-m-d H:i:s')) diff --git a/app/Support/Amount.php b/app/Support/Amount.php index a5e5806a50..aea73d2114 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -72,14 +72,12 @@ class Amount public function convertToNative(?User $user = null): bool { if (null === $user) { - $result = Preferences::get('convert_to_native', false)->data && config('cer.enabled'); -// Log::debug(sprintf('convertToNative [a]: %s', var_export($result, true))); - return $result; + return Preferences::get('convert_to_native', false)->data && config('cer.enabled'); + // Log::debug(sprintf('convertToNative [a]: %s', var_export($result, true))); } - $result = Preferences::getForUser($user, 'convert_to_native', false)->data && config('cer.enabled'); - //Log::debug(sprintf('convertToNative [b]: %s', var_export($result, true))); - return $result; + return Preferences::getForUser($user, 'convert_to_native', false)->data && config('cer.enabled'); + // Log::debug(sprintf('convertToNative [b]: %s', var_export($result, true))); } /** @@ -88,16 +86,16 @@ class Amount */ public function getAmountFromJournalObject(TransactionJournal $journal): string { - $convertToNative = $this->convertToNative(); - $currency = $this->getDefaultCurrency(); - $field = $convertToNative && $currency->id !== $journal->transaction_currency_id ? 'native_amount' : 'amount'; + $convertToNative = $this->convertToNative(); + $currency = $this->getDefaultCurrency(); + $field = $convertToNative && $currency->id !== $journal->transaction_currency_id ? 'native_amount' : 'amount'; /** @var null|Transaction $sourceTransaction */ $sourceTransaction = $journal->transactions()->where('amount', '<', 0)->first(); if (null === $sourceTransaction) { return '0'; } - $amount = $sourceTransaction->{$field} ?? '0'; + $amount = $sourceTransaction->{$field} ?? '0'; if ((int) $sourceTransaction->foreign_currency_id === $currency->id) { // use foreign amount instead! $amount = (string) $sourceTransaction->foreign_amount; // hard coded to be foreign amount. @@ -116,15 +114,15 @@ class Amount */ public function formatFlat(string $symbol, int $decimalPlaces, string $amount, ?bool $coloured = null): string { - $locale = app('steam')->getLocale(); - $rounded = app('steam')->bcround($amount, $decimalPlaces); + $locale = app('steam')->getLocale(); + $rounded = app('steam')->bcround($amount, $decimalPlaces); $coloured ??= true; - $fmt = new \NumberFormatter($locale, \NumberFormatter::CURRENCY); + $fmt = new \NumberFormatter($locale, \NumberFormatter::CURRENCY); $fmt->setSymbol(\NumberFormatter::CURRENCY_SYMBOL, $symbol); $fmt->setAttribute(\NumberFormatter::MIN_FRACTION_DIGITS, $decimalPlaces); $fmt->setAttribute(\NumberFormatter::MAX_FRACTION_DIGITS, $decimalPlaces); - $result = (string) $fmt->format((float) $rounded); // intentional float + $result = (string) $fmt->format((float) $rounded); // intentional float if (true === $coloured) { if (1 === bccomp($rounded, '0')) { @@ -170,7 +168,7 @@ class Amount public function getDefaultCurrencyByUserGroup(UserGroup $userGroup): TransactionCurrency { - $cache = new CacheProperties(); + $cache = new CacheProperties(); $cache->addProperty('getDefaultCurrencyByGroup'); $cache->addProperty($userGroup->id); if ($cache->has()) { @@ -233,20 +231,20 @@ class Amount private function getLocaleInfo(): array { // get config from preference, not from translation: - $locale = app('steam')->getLocale(); - $array = app('steam')->getLocaleArray($locale); + $locale = app('steam')->getLocale(); + $array = app('steam')->getLocaleArray($locale); setlocale(LC_MONETARY, $array); - $info = localeconv(); + $info = localeconv(); // correct variables - $info['n_cs_precedes'] = $this->getLocaleField($info, 'n_cs_precedes'); - $info['p_cs_precedes'] = $this->getLocaleField($info, 'p_cs_precedes'); + $info['n_cs_precedes'] = $this->getLocaleField($info, 'n_cs_precedes'); + $info['p_cs_precedes'] = $this->getLocaleField($info, 'p_cs_precedes'); - $info['n_sep_by_space'] = $this->getLocaleField($info, 'n_sep_by_space'); - $info['p_sep_by_space'] = $this->getLocaleField($info, 'p_sep_by_space'); + $info['n_sep_by_space'] = $this->getLocaleField($info, 'n_sep_by_space'); + $info['p_sep_by_space'] = $this->getLocaleField($info, 'p_sep_by_space'); - $fmt = new \NumberFormatter($locale, \NumberFormatter::CURRENCY); + $fmt = new \NumberFormatter($locale, \NumberFormatter::CURRENCY); $info['mon_decimal_point'] = $fmt->getSymbol(\NumberFormatter::MONETARY_SEPARATOR_SYMBOL); $info['mon_thousands_sep'] = $fmt->getSymbol(\NumberFormatter::MONETARY_GROUPING_SEPARATOR_SYMBOL); @@ -269,7 +267,7 @@ class Amount public static function getAmountJsConfig(bool $sepBySpace, int $signPosn, string $sign, bool $csPrecedes): string { // negative first: - $space = ' '; + $space = ' '; // require space between symbol and amount? if (false === $sepBySpace) { @@ -278,11 +276,11 @@ class Amount // there are five possible positions for the "+" or "-" sign (if it is even used) // pos_a and pos_e could be the ( and ) symbol. - $posA = ''; // before everything - $posB = ''; // before currency symbol - $posC = ''; // after currency symbol - $posD = ''; // before amount - $posE = ''; // after everything + $posA = ''; // before everything + $posB = ''; // before currency symbol + $posC = ''; // after currency symbol + $posD = ''; // before amount + $posE = ''; // after everything // format would be (currency before amount) // AB%sC_D%vE @@ -324,11 +322,11 @@ class Amount } // default is amount before currency - $format = $posA . $posD . '%v' . $space . $posB . '%s' . $posC . $posE; + $format = $posA.$posD.'%v'.$space.$posB.'%s'.$posC.$posE; if ($csPrecedes) { // alternative is currency before amount - $format = $posA . $posB . '%s' . $posC . $space . $posD . '%v' . $posE; + $format = $posA.$posB.'%s'.$posC.$space.$posD.'%v'.$posE; } return $format; diff --git a/composer.lock b/composer.lock index d034bb85d7..ae1a0ee832 100644 --- a/composer.lock +++ b/composer.lock @@ -10287,16 +10287,16 @@ }, { "name": "barryvdh/reflection-docblock", - "version": "v2.1.3", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/barryvdh/ReflectionDocBlock.git", - "reference": "c6fad15f7c878be21650c51e1f841bca7e49752e" + "reference": "db125e8df4329bd45f2da405aab007f502f38531" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/c6fad15f7c878be21650c51e1f841bca7e49752e", - "reference": "c6fad15f7c878be21650c51e1f841bca7e49752e", + "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/db125e8df4329bd45f2da405aab007f502f38531", + "reference": "db125e8df4329bd45f2da405aab007f502f38531", "shasum": "" }, "require": { @@ -10312,7 +10312,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.2.x-dev" } }, "autoload": { @@ -10333,9 +10333,9 @@ } ], "support": { - "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.1.3" + "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.2.0" }, - "time": "2024-10-23T11:41:03+00:00" + "time": "2024-12-28T10:00:03+00:00" }, { "name": "cloudcreativity/json-api-testing", diff --git a/resources/assets/v1/src/locales/bg.json b/resources/assets/v1/src/locales/bg.json index 5005a763fa..ae549a681c 100644 --- a/resources/assets/v1/src/locales/bg.json +++ b/resources/assets/v1/src/locales/bg.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/ca.json b/resources/assets/v1/src/locales/ca.json index f806299f74..09c54614ca 100644 --- a/resources/assets/v1/src/locales/ca.json +++ b/resources/assets/v1/src/locales/ca.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/cs.json b/resources/assets/v1/src/locales/cs.json index 2090047177..c2bfa03955 100644 --- a/resources/assets/v1/src/locales/cs.json +++ b/resources/assets/v1/src/locales/cs.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/da.json b/resources/assets/v1/src/locales/da.json index fab68136ae..c938f942c4 100644 --- a/resources/assets/v1/src/locales/da.json +++ b/resources/assets/v1/src/locales/da.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/de.json b/resources/assets/v1/src/locales/de.json index d4f79c8e01..46ba8f5c04 100644 --- a/resources/assets/v1/src/locales/de.json +++ b/resources/assets/v1/src/locales/de.json @@ -36,7 +36,7 @@ "is_reconciled_fields_dropped": "Da diese Buchung abgeglichen ist, k\u00f6nnen Sie weder die Konten noch den\/die Betrag\/Betr\u00e4ge aktualisieren.", "tags": "Schlagw\u00f6rter", "no_budget": "(kein Budget)", - "no_bill": "(no subscription)", + "no_bill": "(kein Abonnement)", "category": "Kategorie", "attachments": "Anh\u00e4nge", "notes": "Notizen", @@ -52,7 +52,7 @@ "destination_account_reconciliation": "Sie k\u00f6nnen das Zielkonto einer Kontenausgleichsbuchung nicht bearbeiten.", "source_account_reconciliation": "Sie k\u00f6nnen das Quellkonto einer Kontenausgleichsbuchung nicht bearbeiten.", "budget": "Budget", - "bill": "Subscription", + "bill": "Abonnement", "you_create_withdrawal": "Sie haben eine Ausgabe erstellt.", "you_create_transfer": "Sie erstellen eine Umbuchung.", "you_create_deposit": "Sie haben eine Einnahme erstellt.", @@ -133,7 +133,7 @@ "header_exchange_rates": "Wechselkurse", "exchange_rates_intro": "Firefly III unterst\u00fctzt das Herunterladen und Verwenden von Wechselkursen. Lesen Sie mehr dar\u00fcber in der Dokumentation<\/a>.", "exchange_rates_from_to": "Zwischen {from} und {to} (und umgekehrt)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Wechselkurse", "header_exchange_rates_table": "Tabelle mit Wechselkursen", "help_rate_form": "An diesem Tag, wie viele {to} werden Sie f\u00fcr {from} bekommen?", diff --git a/resources/assets/v1/src/locales/el.json b/resources/assets/v1/src/locales/el.json index d4a7fa3bb2..326ff98aab 100644 --- a/resources/assets/v1/src/locales/el.json +++ b/resources/assets/v1/src/locales/el.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/en-gb.json b/resources/assets/v1/src/locales/en-gb.json index 14faf5f9f1..d4d66a3e07 100644 --- a/resources/assets/v1/src/locales/en-gb.json +++ b/resources/assets/v1/src/locales/en-gb.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/en.json b/resources/assets/v1/src/locales/en.json index fe325fa19d..6581de5727 100644 --- a/resources/assets/v1/src/locales/en.json +++ b/resources/assets/v1/src/locales/en.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/es.json b/resources/assets/v1/src/locales/es.json index 9cfcc89bbb..0d8fce0071 100644 --- a/resources/assets/v1/src/locales/es.json +++ b/resources/assets/v1/src/locales/es.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/fi.json b/resources/assets/v1/src/locales/fi.json index e03bda98ce..9390460c6e 100644 --- a/resources/assets/v1/src/locales/fi.json +++ b/resources/assets/v1/src/locales/fi.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/fr.json b/resources/assets/v1/src/locales/fr.json index fbe06bd6d9..845809188f 100644 --- a/resources/assets/v1/src/locales/fr.json +++ b/resources/assets/v1/src/locales/fr.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/hu.json b/resources/assets/v1/src/locales/hu.json index 966ab04c23..d1b1f4a337 100644 --- a/resources/assets/v1/src/locales/hu.json +++ b/resources/assets/v1/src/locales/hu.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/id.json b/resources/assets/v1/src/locales/id.json index fb7a4cb267..e6b57a34e8 100644 --- a/resources/assets/v1/src/locales/id.json +++ b/resources/assets/v1/src/locales/id.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/it.json b/resources/assets/v1/src/locales/it.json index 67ba00c2f9..d7fa97f7d7 100644 --- a/resources/assets/v1/src/locales/it.json +++ b/resources/assets/v1/src/locales/it.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/ja.json b/resources/assets/v1/src/locales/ja.json index 3f863a0243..6a89c8c388 100644 --- a/resources/assets/v1/src/locales/ja.json +++ b/resources/assets/v1/src/locales/ja.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/ko.json b/resources/assets/v1/src/locales/ko.json index 80fd02b692..2c90553265 100644 --- a/resources/assets/v1/src/locales/ko.json +++ b/resources/assets/v1/src/locales/ko.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/nb.json b/resources/assets/v1/src/locales/nb.json index a24603dfc1..b23203f225 100644 --- a/resources/assets/v1/src/locales/nb.json +++ b/resources/assets/v1/src/locales/nb.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/nl.json b/resources/assets/v1/src/locales/nl.json index e453472574..2c3f7a6ae4 100644 --- a/resources/assets/v1/src/locales/nl.json +++ b/resources/assets/v1/src/locales/nl.json @@ -21,7 +21,7 @@ "apply_rules_checkbox": "Regels toepassen", "fire_webhooks_checkbox": "Webhooks starten", "no_budget_pointer": "Je hebt nog geen budgetten. Maak er een aantal op de budgetten<\/a>-pagina. Met budgetten kan je je uitgaven beter bijhouden.", - "no_bill_pointer": "You seem to have no subscription yet. You should create some on the subscription<\/a>-page. Subscriptions can help you keep track of expenses.", + "no_bill_pointer": "Je hebt nog geen abonnementen. Maak er een aantal op de abonnementenpagina<\/a>. Met abonnementen kan je uitgaven bijhouden.", "source_account": "Bronrekening", "hidden_fields_preferences": "Je kan meer transactieopties inschakelen in je instellingen<\/a>.", "destination_account": "Doelrekening", @@ -130,15 +130,15 @@ "response": "Reactie", "visit_webhook_url": "Bezoek URL van webhook", "reset_webhook_secret": "Reset webhook-geheim", - "header_exchange_rates": "Exchange rates", - "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", - "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", - "header_exchange_rates_rates": "Exchange rates", - "header_exchange_rates_table": "Table with exchange rates", - "help_rate_form": "On this day, how many {to} will you get for one {from}?", - "add_new_rate": "Add a new exchange rate", - "save_new_rate": "Save new rate" + "header_exchange_rates": "Wisselkoersen", + "exchange_rates_intro": "Firefly III kan wisselkoersen downloaden en gebruiken. Lees hier meer over in de documentatie<\/a>.", + "exchange_rates_from_to": "Tussen {from} en {to} (en andersom)", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", + "header_exchange_rates_rates": "Wisselkoersen", + "header_exchange_rates_table": "Tabel met wisselkoersen", + "help_rate_form": "Hoeveel {to} krijg je op deze dag voor \u00e9\u00e9n {from}?", + "add_new_rate": "Nieuwe wisselkoers toevoegen", + "save_new_rate": "Nieuwe wisselkoers opslaan" }, "form": { "url": "URL", @@ -158,7 +158,7 @@ "webhook_delivery": "Bericht", "from_currency_to_currency": "{from} → {to}", "to_currency_from_currency": "{to} → {from}", - "rate": "Tarief" + "rate": "Wisselkoers" }, "list": { "active": "Actief?", diff --git a/resources/assets/v1/src/locales/nn.json b/resources/assets/v1/src/locales/nn.json index 372e12b563..7e54e42824 100644 --- a/resources/assets/v1/src/locales/nn.json +++ b/resources/assets/v1/src/locales/nn.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/pl.json b/resources/assets/v1/src/locales/pl.json index b8be4db26c..e9a0327069 100644 --- a/resources/assets/v1/src/locales/pl.json +++ b/resources/assets/v1/src/locales/pl.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/pt-br.json b/resources/assets/v1/src/locales/pt-br.json index 94fb1e6ab2..3043c3c96a 100644 --- a/resources/assets/v1/src/locales/pt-br.json +++ b/resources/assets/v1/src/locales/pt-br.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/pt.json b/resources/assets/v1/src/locales/pt.json index 554b3ce031..956a62cfe6 100644 --- a/resources/assets/v1/src/locales/pt.json +++ b/resources/assets/v1/src/locales/pt.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/ro.json b/resources/assets/v1/src/locales/ro.json index 8767dbf3eb..e4129a99ec 100644 --- a/resources/assets/v1/src/locales/ro.json +++ b/resources/assets/v1/src/locales/ro.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/ru.json b/resources/assets/v1/src/locales/ru.json index 0bd9448e6a..5bd6948f95 100644 --- a/resources/assets/v1/src/locales/ru.json +++ b/resources/assets/v1/src/locales/ru.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/sk.json b/resources/assets/v1/src/locales/sk.json index 2b2d16d716..81ce869c5b 100644 --- a/resources/assets/v1/src/locales/sk.json +++ b/resources/assets/v1/src/locales/sk.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/sl.json b/resources/assets/v1/src/locales/sl.json index 9dd0deea47..0f5be1c16f 100644 --- a/resources/assets/v1/src/locales/sl.json +++ b/resources/assets/v1/src/locales/sl.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/sv.json b/resources/assets/v1/src/locales/sv.json index a79d228596..bb4dd88b7f 100644 --- a/resources/assets/v1/src/locales/sv.json +++ b/resources/assets/v1/src/locales/sv.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/tr.json b/resources/assets/v1/src/locales/tr.json index 9e0c3d1aeb..768c6f0bac 100644 --- a/resources/assets/v1/src/locales/tr.json +++ b/resources/assets/v1/src/locales/tr.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/uk.json b/resources/assets/v1/src/locales/uk.json index 9825ea43ee..254e22f5b4 100644 --- a/resources/assets/v1/src/locales/uk.json +++ b/resources/assets/v1/src/locales/uk.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/vi.json b/resources/assets/v1/src/locales/vi.json index 2b9e5fda6b..5e2e002e84 100644 --- a/resources/assets/v1/src/locales/vi.json +++ b/resources/assets/v1/src/locales/vi.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/zh-cn.json b/resources/assets/v1/src/locales/zh-cn.json index cc823d9749..55f1f1559b 100644 --- a/resources/assets/v1/src/locales/zh-cn.json +++ b/resources/assets/v1/src/locales/zh-cn.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?", diff --git a/resources/assets/v1/src/locales/zh-tw.json b/resources/assets/v1/src/locales/zh-tw.json index 7fedbcdf69..5dc911c6b5 100644 --- a/resources/assets/v1/src/locales/zh-tw.json +++ b/resources/assets/v1/src/locales/zh-tw.json @@ -133,7 +133,7 @@ "header_exchange_rates": "Exchange rates", "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in the documentation<\/a>.", "exchange_rates_from_to": "Between {from} and {to} (and the other way around)", - "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.", + "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.", "header_exchange_rates_rates": "Exchange rates", "header_exchange_rates_table": "Table with exchange rates", "help_rate_form": "On this day, how many {to} will you get for one {from}?",