From e69346089472a8f3b7cd8974997123a709eac53b Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Sat, 9 Mar 2019 17:19:02 +0100 Subject: [PATCH] Finalized next version --- changelog/44_2.1.0_2019-03-09.md | 1 + localization/de/strings.php | 3 ++- localization/es/strings.php | 3 ++- localization/fr/strings.php | 3 ++- localization/nl/chore_types.php | 2 +- localization/no/strings.php | 3 ++- localization/ru/strings.php | 3 ++- localization/tr/strings.php | 3 ++- 8 files changed, 14 insertions(+), 7 deletions(-) diff --git a/changelog/44_2.1.0_2019-03-09.md b/changelog/44_2.1.0_2019-03-09.md index 82d0b3f3..327de06d 100644 --- a/changelog/44_2.1.0_2019-03-09.md +++ b/changelog/44_2.1.0_2019-03-09.md @@ -2,6 +2,7 @@ - Recipe ingredient notes were not displayed - Edit/delete buttons on the equipment page had no icons - Improved the overview pages "action buttons column" (e. g. hide more rarely used actions behind a context/dropdown menu) + - The "purchase to stock conversion factor" is now displayed on the purchase page when QU units are different (above the amount field) - Some JS files were not loaded correctly on case sensitive file systems - The changelog is now included as markdown files (in `/changelog` directory, one file per release with a filename in format `__.md`) and shown in the about dialog - Please review your `CURRENCY` setting in `data/config.php`, see also `config-dist.php` - this should be the ISO 4217 code of the currency to properly work with the JS `toLocaleString` function diff --git a/localization/de/strings.php b/localization/de/strings.php index fdf9990b..53f0674c 100644 --- a/localization/de/strings.php +++ b/localization/de/strings.php @@ -353,5 +353,6 @@ return array( 'Show battery details' => 'Batteriedetails anzeigen', 'Journal for this battery' => 'Journal für diese Batterie', 'System info' => 'Systeminformationen', - 'Changelog' => 'Änderungsprotokoll' + 'Changelog' => 'Änderungsprotokoll', + 'will be multiplied a factor of #1 to get #2' => 'wird mit dem Faktor #1 multipliziert um #2 zu erhalten' ); diff --git a/localization/es/strings.php b/localization/es/strings.php index 939f6be4..586583f9 100644 --- a/localization/es/strings.php +++ b/localization/es/strings.php @@ -353,5 +353,6 @@ return array( 'Show battery details' => 'Show battery details', 'Journal for this battery' => 'Journal for this battery', 'System info' => 'System info', - 'Changelog' => 'Changelog' + 'Changelog' => 'Changelog', + 'will be multiplied a factor of #1 to get #2' => 'will be multiplied a factor of #1 to get #2' ); diff --git a/localization/fr/strings.php b/localization/fr/strings.php index e96de974..a7a59b70 100644 --- a/localization/fr/strings.php +++ b/localization/fr/strings.php @@ -353,5 +353,6 @@ return array( 'Show battery details' => 'Show battery details', 'Journal for this battery' => 'Journal for this battery', 'System info' => 'System info', - 'Changelog' => 'Changelog' + 'Changelog' => 'Changelog', + 'will be multiplied a factor of #1 to get #2' => 'will be multiplied a factor of #1 to get #2' ); diff --git a/localization/nl/chore_types.php b/localization/nl/chore_types.php index 18230edb..21065281 100644 --- a/localization/nl/chore_types.php +++ b/localization/nl/chore_types.php @@ -2,5 +2,5 @@ return array( 'manually' => 'Handmatig', - 'dynamic-regular' => 'Dynamic regular' + 'dynamic-regular' => 'Dynamisch regelmatig' ); diff --git a/localization/no/strings.php b/localization/no/strings.php index 14fb0fd4..1a99d461 100644 --- a/localization/no/strings.php +++ b/localization/no/strings.php @@ -353,5 +353,6 @@ return array( 'Show battery details' => 'Show battery details', 'Journal for this battery' => 'Journal for this battery', 'System info' => 'System info', - 'Changelog' => 'Changelog' + 'Changelog' => 'Changelog', + 'will be multiplied a factor of #1 to get #2' => 'will be multiplied a factor of #1 to get #2' ); diff --git a/localization/ru/strings.php b/localization/ru/strings.php index 3ab1001e..16f2e151 100644 --- a/localization/ru/strings.php +++ b/localization/ru/strings.php @@ -354,5 +354,6 @@ return array( 'Show battery details' => 'Show battery details', 'Journal for this battery' => 'Journal for this battery', 'System info' => 'System info', - 'Changelog' => 'Changelog' + 'Changelog' => 'Changelog', + 'will be multiplied a factor of #1 to get #2' => 'will be multiplied a factor of #1 to get #2' ); diff --git a/localization/tr/strings.php b/localization/tr/strings.php index a26f2d06..61b79ca1 100644 --- a/localization/tr/strings.php +++ b/localization/tr/strings.php @@ -353,5 +353,6 @@ return array( 'Show battery details' => 'Show battery details', 'Journal for this battery' => 'Journal for this battery', 'System info' => 'System info', - 'Changelog' => 'Changelog' + 'Changelog' => 'Changelog', + 'will be multiplied a factor of #1 to get #2' => 'will be multiplied a factor of #1 to get #2' );