Prepared next release

* bugfix variable name

* Typo: curent->current

.devtools/transifex_download.bat

@@ -1,4 +1,4 @@
 pushd ..
-tx pull --all --minimum-perc=90
+tx pull --all --minimum-perc=80
 tx pull --language en_GB
 popd

.devtools/update_dependencies.bat

@@ -1,4 +1,4 @@
 pushd ..
 call composer update
-yarn upgrade
+yarn upgrade --latest
 popd

.gitattributes

@@ -0,0 +1,2 @@
+* text=auto
+*.sh text eol=lf

README.md

@@ -45,18 +45,20 @@ You can easily help translating grocy at https://www.transifex.com/grocy/grocy,
 
 The [pre-release demo](https://demo-prerelease.grocy.info) is available for any translation which is at least 80 % complete and will pull the translations from Transifex 10 minutes past every hour, so you can have a kind of instant preview of your contributed translations. Thank you!
 
+Also any translation which reached a completion level of 80 % will be included in releases.
+
 ## Things worth to know
 
 ### REST API & data model documentation
 See the integrated Swagger UI instance on [/api](https://demo.grocy.info/api).
 
 ### Barcode readers & camera scanning
-Some fields also allow to select a value by scanning a barcode. It works best when your barcode reader prefixes every barcode with a letter which is normally not part of a item name (I use a `$`) and sends a `TAB` after a scan.
+Some fields (with a barcode icon above) also allow to select a value by scanning a barcode. It works best when your barcode reader prefixes every barcode with a letter which is normally not part of a item name (I use a `$`) and sends a `TAB` after a scan.
 
-Additionally it's also possible to use your device camera to scan a barcode by using the camera button on the right side of the corresponding field (powered by [QuaggaJS](https://github.com/serratus/quaggaJS), totally offline / client-side camera stream processing). Quick video demo: https://www.youtube.com/watch?v=Y5YH6IJFnfc
+Additionally it's also possible to use your device camera to scan a barcode by using the camera button on the right side of the corresponding field (powered by [QuaggaJS](https://github.com/serratus/quaggaJS), totally offline / client-side camera stream processing, please note due to browser security restrictions, this only works when serving grocy via a secure connection (`https://`)). Quick video demo: https://www.youtube.com/watch?v=Y5YH6IJFnfc
 
 ### Input shorthands for date fields
-For (productivity) reasons all date (and time) input fields use the ISO-8601 format regardless of localization.
+For (productivity) reasons all date (and time) input (and display) fields use the ISO-8601 format regardless of localization.
 The following shorthands are available:
 - `MMDD` gets expanded to the given day on the current year, if > today, or to the given day next year, if < today, in proper notation
   - Example: `0517` will be converted to `2018-05-17`
@@ -65,8 +67,10 @@ The following shorthands are available:
 - `YYYYMMe` or `YYYYMM+` gets expanded to the end of the given month in the given year in proper notation
   - Example: `201807e` will be converted to `2018-07-31`
 - `x` gets expanded to `2999-12-31` (which I use for products which never expire)
-- Down/up arrow keys will increase/decrease the date by one day
+- Down/up arrow keys will increase/decrease the date by 1 day
 - Right/left arrow keys will increase/decrease the date by 1 week
+- Shift + down/up arrow keys will increase/decrease the date by 1 month
+- Shift + right/left arrow keys will increase/decrease the date by 1 year
 
 ### Keyboard shorthands for buttons
 Wherever a button contains a bold highlighted letter, this is a shortcut key.
@@ -88,7 +92,7 @@ If you don't use certain feature sets of grocy (for example if you don't need "C
 - When the file `data/custom_css.html` exists, the contents of the file will be added just before `</head>` (end of head) on every page
 
 ### Demo mode
-When the file `data/demo.txt` exists, the application will work in a demo mode which means authentication is disabled and some demo data will be generated during the database schema migration.
+When the `MODE` setting is set to `dev`, `demo` or `prerelease`, the application will work in a demo mode which means authentication is disabled and some demo data will be generated during the database schema migration.
 
 ### Embedded mode
 When the file `embedded.txt` exists, it must contain a valid and writable path which will be used as the data directory instead of `data` and authentication will be disabled (used in [grocy-desktop](https://github.com/grocy/grocy-desktop)).

app.php

@@ -19,20 +19,6 @@ else
 	define('GROCY_DATAPATH', __DIR__ . '/data');
 }
 
-// Definitions for demo mode
-if (file_exists(GROCY_DATAPATH . '/demo.txt'))
-{
-	define('GROCY_IS_DEMO_INSTALL', true);
-	if (!defined('GROCY_USER_ID'))
-	{
-		define('GROCY_USER_ID', 1);
-	}
-}
-else
-{
-	define('GROCY_IS_DEMO_INSTALL', false);
-}
-
 // Load composer dependencies
 require_once __DIR__ . '/vendor/autoload.php';
 
@@ -40,6 +26,12 @@ require_once __DIR__ . '/vendor/autoload.php';
 require_once GROCY_DATAPATH . '/config.php';
 require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
 
+// Definitions for dev/demo/prerelease mode
+if (GROCY_MODE === 'dev' || GROCY_MODE === 'demo' || GROCY_MODE === 'prerelease')
+{
+	define('GROCY_USER_ID', 1);
+}
+
 // Definitions for disabled authentication mode
 if (GROCY_DISABLE_AUTH === true)
 {

changelog/54_2.5.2_2019-10-05.md

@@ -0,0 +1,15 @@
+### Stock fixes
+- Fixed that product specific quantity unit conversions (product overrides) were also displayed on the product edit page of other products with the same stock quantity unit
+
+### Recipe fixes
+- Fixed that recipes were displayed without ingredients if the total recipe count was > 100
+
+### Shopping list improvements
+- Added a new sub feature flag `FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS` to disable multiple shopping lists if you only need one (defaults to `true`, so no changed behavior when not configured)
+
+### Chores improvements
+- Added a new period type "yearly" (for yearly schedules)
+- Added a "period interval" option per chore to have more flexible schedules (possible for the daily/weekly/monthly/yearly schedules, means "schedule this chore only every x days/weeks/months" to have for example biweekly schedules)
+
+### General & other improvements
+- New Input shorthands for date fields to increase/decrease the date by 1 month/year (shift + arrow keys, see the full list [here](https://github.com/grocy/grocy#input-shorthands-for-date-fields))

changelog/55_2.6.0_2020-01-31.md

@@ -0,0 +1,85 @@
+### New feature: Transfer products between locations and edit stock entries
+- New menu entry in the sidebar to transfer products (or as a shortcut in the more/context menu per line on the stock overview page)
+- New button "Stock entries" in the header of the stock overview page (or as a shortcut in the more/context menu per line) to show the detail stock entries behind each product
+  - From there you can also edit the stock entries
+- (A huge THANK YOU goes to @kriddles for the work on this feature)
+
+### New feature: Scan mode
+- Just scan one product after another, no manual input required and audio feedback is provided
+- New switch-button on the purchase and consume page
+- When enabled
+  - The amount will always be filled with `1` after changing/scanning a product
+  - If all fields could be automatically populated (means for purchase the product has a default best before date set), the transaction is automatically submitted
+    - If not, a warning is displayed and you can fill in the missing information
+  - Audio feedback is provided after scanning and on success/error of the transaction
+- => Quick video demo: https://www.youtube.com/watch?v=83dm9iD718k
+
+### New feature: Self produced products
+- To a recipe a product can be attached
+  - This products needs a "Default best before date"
+- On using "Consume all ingredients needed by this recipe" and when it has a product attached, one unit of that product (per serving in purchase quantity unit) will be added to stock (with the proper price based on the recipe ingredients)
+- (Thanks @kriddles for the intial work on this)
+
+### New feature: Freeze/Thaw products
+- New product options "Default best before days after freezing/thawing" to set how the best before date should be changed on freezing/thawing
+- New location option "Is freezer" to indicate if the location is a freezer
+- => When moving a product from/to a freezer location, the best before date is changed accordingly
+- There is also a new sub feature flag `FEATURE_FLAG_STOCK_PRODUCT_FREEZING` to disable this if you don't need it (defaults to `true`)
+
+### Stock improvements/fixes
+- The productcard gets now also refreshed after a transaction was posted (purchase/consume/etc.) (thanks @kriddles)
+- The product field calories (kcal) now also allows decimal numbers
+- On the inventory page, "New amount" is now prefilled with the current stock amount of the selected product
+- Fixed that entering partial amounts was not possible on the inventory page (only applies if the product option "Allow partial units in stock" is enabled)
+- Fixed that on purchase a wrong minimum amount was enforced for products with enabled tare weight handling in combination with different purchase/stock quantity units
+- Fixed that the productcard did not load correctly when `FEATURE_FLAG_STOCK_LOCATION_TRACKING` was set to `false` (thanks @kriddles)
+- Fixed that the "Add as barcode to existing product" workflow did not work twice when not switching the page inbetween
+
+### Shopping list improvements/fixes
+- Added a compact view to have a better shopping list for shopping trips (new button "Compact view" in the header, additionally this is automatically enabled on mobile devices / when screen width is < 768 px)
+- It's now possible to filter for only undone (not striked through) items (new option in the "Filter by status" dropdown)
+- Fixed that when `FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS` was set to `false`, the shopping list appeared empty after some actions
+
+### Recipe improvements
+- When consuming a recipe and if an ingredient is not in stock, but that product has any subproduct which is in stock, this gets now consumed (before consuming was not possible in that case)
+- When adding or editing a recipe ingredient, a dialog is now used instead of switching between pages (thanks @kriddles)
+
+### Meal plan improvements/fixes
+- It's now possible to add notes per day (in the dropdown of the add button in the header of each day column)
+- It's now possible to products directly (also in the dropdown of the add button in the header of each day column, maybe useful in combination with the new "Self produced products" feature)
+- Added that the calories per serving are now also shown
+- Added that the total costs and calories per day are displayed in the header of each day column
+- Added a new `config.php` setting `MEAL_PLAN_FIRST_DAY_OF_WEEK` which can be used to start the meal plan on a different day (defaults to `CALENDAR_FIRST_DAY_OF_WEEK`, so no changed behavior when not configured)
+- Fixed that when `FEATURE_FLAG_STOCK_PRICE_TRACKING` was set to `false`, prices were still shown (thanks @kriddles)
+- Fixed that the week costs were missing for the weeks 1 - 9 of a year
+
+### Calendar improvements
+- Improved that meal plan events in the iCal calendar export now contain a link to the appropriate meal plan week in the body of the event (thanks @kriddles)
+
+### Task fixes
+- Fixed that a due date was required when editing an existing task
+
+### API improvements/fixes
+- The endpoint `/stock` now includes also the product object itself (new field/property `product`) (thanks @gsacre)
+- The endpoint `/stock/products/{productId}/entries` can now include stock entries of child products (if the given product is a parent product and in addition to the ones of the given product) - new query parameter `include_sub_products` (defaults to `false` so no changed behavior when not supplied)
+- New endpoints for the new stock transfer & stock entry edit capabilities
+- Fixed that the route `/stock/barcodes/external-lookup/{barcode}` did not work, because the `barcode` argument was expected as a route argument but the route was missing it (thanks @Mikhail5555 and @beetle442002)
+- Fixed the response type description of the `/stock/volatile` endpoint
+
+### General & other improvements/fixes
+- It's now possible to keep the screen on always or when a "fullscreen-card" (e. g. used for recipes) is displayed
+  - New user options in the display settings menu in the top right corner (defaults to disabled)
+- Slightly optimized table loading & search performance (thanks @lwis)
+- Added that the currently active sidebar menu item is always in view
+- Reordered the sidebar menu items a little bit, grouped them by borders and made them a little smaller to waste less space
+- Changed/removed some animations (and replaced jQuery UI by [Animate.css](https://daneden.github.io/animate.css/)) to improve responsiveness
+- Fixed that also the first column (where in most tables only buttons/menus are displayed) in tables was searched when using the general search field
+- Fixed that the meal plan menu entry (sidebar) was not visible when the calendar was disabled (`FEATURE_FLAG_CALENDAR`) (thanks @lwis)
+- For integration: If a `GET` parameter `closeAfterCreation` is passed to the product edit page, the window will be closed on save (due to Browser restrictions, this only works when the window was opened from JavaScript) (thanks @Forceu)
+- Fixed that the `update.sh` file had wrong line endings (DOS instead of Unix)
+- Internal change: Demo mode is now handled via the setting `MODE` instead of checking the existence of the file `data/demo.txt`
+- There is now a RSS feed for the changelog, subscribe to get notified about new releases: https://grocy.info/changelog/feed
+- New translations: (thanks all the translators)
+  - Hungarian (demo available at https://hu.demo.grocy.info)
+  - Portuguese (Brazil) (demo available at https://pt-br.demo.grocy.info)
+  - Slovak (demo available at https://sk.demo.grocy.info)

composer.lock

@@ -6,49 +6,18 @@
     ],
     "content-hash": "eff0f8f394573d15e26d8abd3788ed72",
     "packages": [
-        {
-            "name": "container-interop/container-interop",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/container-interop/container-interop.git",
-                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-                "shasum": ""
-            },
-            "require": {
-                "psr/container": "^1.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Interop\\Container\\": "src/Interop/Container/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
-            "homepage": "https://github.com/container-interop/container-interop",
-            "time": "2017-02-14T19:40:03+00:00"
-        },
         {
             "name": "doctrine/inflector",
-            "version": "v1.3.0",
+            "version": "1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
-                "reference": "5527a48b7313d15261292c149e55e26eae771b0a"
+                "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a",
-                "reference": "5527a48b7313d15261292c149e55e26eae771b0a",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/ec3a55242203ffa6a4b27c58176da97ff0a7aec1",
+                "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1",
                 "shasum": ""
             },
             "require": {
@@ -73,6 +42,10 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
                 {
                     "name": "Roman Borschel",
                     "email": "roman@code-factory.org"
@@ -81,10 +54,6 @@
                     "name": "Benjamin Eberlei",
                     "email": "kontakt@beberlei.de"
                 },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
                 {
                     "name": "Jonathan Wage",
                     "email": "jonwage@gmail.com"
@@ -102,7 +71,7 @@
                 "singularize",
                 "string"
             ],
-            "time": "2018-01-09T20:05:19+00:00"
+            "time": "2019-10-30T19:59:35+00:00"
         },
         {
             "name": "eluceo/ical",
@@ -157,16 +126,16 @@
         },
         {
             "name": "erusev/parsedown",
-            "version": "1.7.3",
+            "version": "1.7.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/erusev/parsedown.git",
-                "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7"
+                "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/erusev/parsedown/zipball/6d893938171a817f4e9bc9e86f2da1e370b7bcd7",
-                "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7",
+                "url": "https://api.github.com/repos/erusev/parsedown/zipball/cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
+                "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
                 "shasum": ""
             },
             "require": {
@@ -199,20 +168,20 @@
                 "markdown",
                 "parser"
             ],
-            "time": "2019-03-17T18:48:37+00:00"
+            "time": "2019-12-30T22:54:17+00:00"
         },
         {
             "name": "gettext/gettext",
-            "version": "v4.6.3",
+            "version": "v4.8.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/oscarotero/Gettext.git",
-                "reference": "70c6ff2fecd275e6ef9cdd542f55939a3d1904d6"
+                "url": "https://github.com/php-gettext/Gettext.git",
+                "reference": "e474f872f2c8636cf53fd283ec4ce1218f3d236a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/oscarotero/Gettext/zipball/70c6ff2fecd275e6ef9cdd542f55939a3d1904d6",
-                "reference": "70c6ff2fecd275e6ef9cdd542f55939a3d1904d6",
+                "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/e474f872f2c8636cf53fd283ec4ce1218f3d236a",
+                "reference": "e474f872f2c8636cf53fd283ec4ce1218f3d236a",
                 "shasum": ""
             },
             "require": {
@@ -261,31 +230,31 @@
                 "po",
                 "translation"
             ],
-            "time": "2019-07-15T12:56:31+00:00"
+            "time": "2019-12-02T10:21:14+00:00"
         },
         {
             "name": "gettext/languages",
-            "version": "2.5.0",
+            "version": "2.6.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/mlocati/cldr-to-gettext-plural-rules.git",
-                "reference": "78db2d17933f0765a102f368a6663f057162ddbd"
+                "url": "https://github.com/php-gettext/Languages.git",
+                "reference": "38ea0482f649e0802e475f0ed19fa993bcb7a618"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mlocati/cldr-to-gettext-plural-rules/zipball/78db2d17933f0765a102f368a6663f057162ddbd",
-                "reference": "78db2d17933f0765a102f368a6663f057162ddbd",
+                "url": "https://api.github.com/repos/php-gettext/Languages/zipball/38ea0482f649e0802e475f0ed19fa993bcb7a618",
+                "reference": "38ea0482f649e0802e475f0ed19fa993bcb7a618",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4"
+                "friendsofphp/php-cs-fixer": "^2.16.0",
+                "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.5 || ^8.4"
             },
             "bin": [
-                "bin/export-plural-rules",
-                "bin/export-plural-rules.php"
+                "bin/export-plural-rules"
             ],
             "type": "library",
             "autoload": {
@@ -305,7 +274,7 @@
                 }
             ],
             "description": "gettext languages with plural rules",
-            "homepage": "https://github.com/mlocati/cldr-to-gettext-plural-rules",
+            "homepage": "https://github.com/php-gettext/Languages",
             "keywords": [
                 "cldr",
                 "i18n",
@@ -322,7 +291,7 @@
                 "translations",
                 "unicode"
             ],
-            "time": "2018-11-13T22:06:07+00:00"
+            "time": "2019-11-13T10:30:21+00:00"
         },
         {
             "name": "gumlet/php-image-resize",
@@ -381,7 +350,7 @@
         },
         {
             "name": "illuminate/container",
-            "version": "v5.8.35",
+            "version": "v5.8.36",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/container.git",
@@ -426,7 +395,7 @@
         },
         {
             "name": "illuminate/contracts",
-            "version": "v5.8.35",
+            "version": "v5.8.36",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/contracts.git",
@@ -470,7 +439,7 @@
         },
         {
             "name": "illuminate/events",
-            "version": "v5.8.35",
+            "version": "v5.8.36",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/events.git",
@@ -515,7 +484,7 @@
         },
         {
             "name": "illuminate/filesystem",
-            "version": "v5.8.35",
+            "version": "v5.8.36",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/filesystem.git",
@@ -567,16 +536,16 @@
         },
         {
             "name": "illuminate/support",
-            "version": "v5.8.35",
+            "version": "v5.8.36",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/support.git",
-                "reference": "e63a495d3bf01654f70def1046fb925c4bb56506"
+                "reference": "df4af6a32908f1d89d74348624b57e3233eea247"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/e63a495d3bf01654f70def1046fb925c4bb56506",
-                "reference": "e63a495d3bf01654f70def1046fb925c4bb56506",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/df4af6a32908f1d89d74348624b57e3233eea247",
+                "reference": "df4af6a32908f1d89d74348624b57e3233eea247",
                 "shasum": ""
             },
             "require": {
@@ -624,11 +593,11 @@
             ],
             "description": "The Illuminate Support package.",
             "homepage": "https://laravel.com",
-            "time": "2019-09-03T16:36:47+00:00"
+            "time": "2019-12-12T14:16:47+00:00"
         },
         {
             "name": "illuminate/view",
-            "version": "v5.8.35",
+            "version": "v5.8.36",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/view.git",
@@ -781,27 +750,27 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.24.0",
+            "version": "2.29.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "934459c5ac0658bc765ad1e53512c7c77adcac29"
+                "reference": "e509be5bf2d703390e69e14496d9a1168452b0a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/934459c5ac0658bc765ad1e53512c7c77adcac29",
-                "reference": "934459c5ac0658bc765ad1e53512c7c77adcac29",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e509be5bf2d703390e69e14496d9a1168452b0a2",
+                "reference": "e509be5bf2d703390e69e14496d9a1168452b0a2",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "php": "^7.1.8 || ^8.0",
-                "symfony/translation": "^3.4 || ^4.0"
+                "symfony/translation": "^3.4 || ^4.0 || ^5.0"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^2.14 || ^3.0",
                 "kylekatarnls/multi-tester": "^1.1",
-                "phpmd/phpmd": "dev-php-7.1-compatibility",
+                "phpmd/phpmd": "^2.8",
                 "phpstan/phpstan": "^0.11",
                 "phpunit/phpunit": "^7.5 || ^8.0",
                 "squizlabs/php_codesniffer": "^3.4"
@@ -811,6 +780,9 @@
             ],
             "type": "library",
             "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                },
                 "laravel": {
                     "providers": [
                         "Carbon\\Laravel\\ServiceProvider"
@@ -837,14 +809,14 @@
                     "homepage": "http://github.com/kylekatarnls"
                 }
             ],
-            "description": "A API extension for DateTime that supports 281 different languages.",
+            "description": "An API extension for DateTime that supports 281 different languages.",
             "homepage": "http://carbon.nesbot.com",
             "keywords": [
                 "date",
                 "datetime",
                 "time"
             ],
-            "time": "2019-08-31T16:37:55+00:00"
+            "time": "2020-01-21T09:36:43+00:00"
         },
         {
             "name": "nikic/fast-route",
@@ -1242,16 +1214,16 @@
         },
         {
             "name": "psr/log",
-            "version": "1.1.0",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
+                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
+                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
                 "shasum": ""
             },
             "require": {
@@ -1260,7 +1232,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
@@ -1285,7 +1257,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2018-11-20T15:27:04+00:00"
+            "time": "2019-11-01T11:05:21+00:00"
         },
         {
             "name": "psr/simple-cache",
@@ -1387,20 +1359,19 @@
         },
         {
             "name": "slim/slim",
-            "version": "3.12.2",
+            "version": "3.12.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/slimphp/Slim.git",
-                "reference": "200c6143f15baa477601879b64ab2326847aac0b"
+                "reference": "1c9318a84ffb890900901136d620b4f03a59da38"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/slimphp/Slim/zipball/200c6143f15baa477601879b64ab2326847aac0b",
-                "reference": "200c6143f15baa477601879b64ab2326847aac0b",
+                "url": "https://api.github.com/repos/slimphp/Slim/zipball/1c9318a84ffb890900901136d620b4f03a59da38",
+                "reference": "1c9318a84ffb890900901136d620b4f03a59da38",
                 "shasum": ""
             },
             "require": {
-                "container-interop/container-interop": "^1.2",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-simplexml": "*",
@@ -1457,20 +1428,20 @@
                 "micro",
                 "router"
             ],
-            "time": "2019-08-20T18:46:05+00:00"
+            "time": "2019-11-28T17:40:33+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v4.3.4",
+            "version": "v4.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "afcdea44a2e399c1e4b52246ec8d54c715393ced"
+                "reference": "89c3fd5c299b940333bc6fe9f1b8db1b0912c759"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/afcdea44a2e399c1e4b52246ec8d54c715393ced",
-                "reference": "afcdea44a2e399c1e4b52246ec8d54c715393ced",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/89c3fd5c299b940333bc6fe9f1b8db1b0912c759",
+                "reference": "89c3fd5c299b940333bc6fe9f1b8db1b0912c759",
                 "shasum": ""
             },
             "require": {
@@ -1481,12 +1452,12 @@
                 "symfony/http-kernel": "<3.4"
             },
             "require-dev": {
-                "symfony/http-kernel": "~3.4|~4.0"
+                "symfony/http-kernel": "^3.4|^4.0|^5.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.3-dev"
+                    "dev-master": "4.4-dev"
                 }
             },
             "autoload": {
@@ -1513,20 +1484,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2019-08-20T14:27:59+00:00"
+            "time": "2020-01-08T17:29:02+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v4.3.4",
+            "version": "v4.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "86c1c929f0a4b24812e1eb109262fc3372c8e9f2"
+                "reference": "3a50be43515590faf812fbd7708200aabc327ec3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/86c1c929f0a4b24812e1eb109262fc3372c8e9f2",
-                "reference": "86c1c929f0a4b24812e1eb109262fc3372c8e9f2",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/3a50be43515590faf812fbd7708200aabc327ec3",
+                "reference": "3a50be43515590faf812fbd7708200aabc327ec3",
                 "shasum": ""
             },
             "require": {
@@ -1535,7 +1506,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.3-dev"
+                    "dev-master": "4.4-dev"
                 }
             },
             "autoload": {
@@ -1562,20 +1533,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2019-08-14T12:26:46+00:00"
+            "time": "2020-01-04T13:00:46+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.12.0",
+            "version": "v1.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17"
+                "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17",
-                "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f",
+                "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f",
                 "shasum": ""
             },
             "require": {
@@ -1587,7 +1558,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-master": "1.13-dev"
                 }
             },
             "autoload": {
@@ -1621,46 +1592,47 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-08-06T08:03:45+00:00"
+            "time": "2019-11-27T14:18:11+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v4.3.4",
+            "version": "v5.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "28498169dd334095fa981827992f3a24d50fed0f"
+                "reference": "28e1054f1ea26c63762d9260c37cb1056ea62dbb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/28498169dd334095fa981827992f3a24d50fed0f",
-                "reference": "28498169dd334095fa981827992f3a24d50fed0f",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/28e1054f1ea26c63762d9260c37cb1056ea62dbb",
+                "reference": "28e1054f1ea26c63762d9260c37cb1056ea62dbb",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
+                "php": "^7.2.5",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/translation-contracts": "^1.1.6"
+                "symfony/translation-contracts": "^2"
             },
             "conflict": {
-                "symfony/config": "<3.4",
-                "symfony/dependency-injection": "<3.4",
-                "symfony/yaml": "<3.4"
+                "symfony/config": "<4.4",
+                "symfony/dependency-injection": "<5.0",
+                "symfony/http-kernel": "<5.0",
+                "symfony/twig-bundle": "<5.0",
+                "symfony/yaml": "<4.4"
             },
             "provide": {
-                "symfony/translation-implementation": "1.0"
+                "symfony/translation-implementation": "2.0"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~3.4|~4.0",
-                "symfony/console": "~3.4|~4.0",
-                "symfony/dependency-injection": "~3.4|~4.0",
-                "symfony/finder": "~2.8|~3.0|~4.0",
-                "symfony/http-kernel": "~3.4|~4.0",
-                "symfony/intl": "~3.4|~4.0",
-                "symfony/service-contracts": "^1.1.2",
-                "symfony/var-dumper": "~3.4|~4.0",
-                "symfony/yaml": "~3.4|~4.0"
+                "symfony/config": "^4.4|^5.0",
+                "symfony/console": "^4.4|^5.0",
+                "symfony/dependency-injection": "^5.0",
+                "symfony/finder": "^4.4|^5.0",
+                "symfony/http-kernel": "^5.0",
+                "symfony/intl": "^4.4|^5.0",
+                "symfony/service-contracts": "^1.1.2|^2",
+                "symfony/yaml": "^4.4|^5.0"
             },
             "suggest": {
                 "psr/log-implementation": "To use logging capability in translator",
@@ -1670,7 +1642,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.3-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -1697,24 +1669,24 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2019-08-26T08:55:16+00:00"
+            "time": "2020-01-21T08:40:24+00:00"
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v1.1.6",
+            "version": "v2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "325b17c24f3ee23cbecfa63ba809c6d89b5fa04a"
+                "reference": "8cc682ac458d75557203b2f2f14b0b92e1c744ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/325b17c24f3ee23cbecfa63ba809c6d89b5fa04a",
-                "reference": "325b17c24f3ee23cbecfa63ba809c6d89b5fa04a",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/8cc682ac458d75557203b2f2f14b0b92e1c744ed",
+                "reference": "8cc682ac458d75557203b2f2f14b0b92e1c744ed",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3"
+                "php": "^7.2.5"
             },
             "suggest": {
                 "symfony/translation-implementation": ""
@@ -1722,7 +1694,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -1754,7 +1726,7 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2019-08-02T12:15:04+00:00"
+            "time": "2019-11-18T17:27:11+00:00"
         },
         {
             "name": "tuupola/callable-handler",
@@ -1811,16 +1783,16 @@
         },
         {
             "name": "tuupola/cors-middleware",
-            "version": "1.0.0",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tuupola/cors-middleware.git",
-                "reference": "f8bee9b47729a36892c680c457ff824c04cfae70"
+                "reference": "a043f4f52b902ee8902f95d28aae05013a7180fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tuupola/cors-middleware/zipball/f8bee9b47729a36892c680c457ff824c04cfae70",
-                "reference": "f8bee9b47729a36892c680c457ff824c04cfae70",
+                "url": "https://api.github.com/repos/tuupola/cors-middleware/zipball/a043f4f52b902ee8902f95d28aae05013a7180fc",
+                "reference": "a043f4f52b902ee8902f95d28aae05013a7180fc",
                 "shasum": ""
             },
             "require": {
@@ -1835,7 +1807,7 @@
                 "codedungeon/phpunit-result-printer": "^0.23.2",
                 "equip/dispatch": "^2.0",
                 "overtrue/phplint": "^1.0",
-                "phpstan/phpstan": "^0.11.4",
+                "phpstan/phpstan": "^0.11.15",
                 "phpunit/phpunit": "^7.4",
                 "squizlabs/php_codesniffer": "^3.3.1",
                 "zendframework/zend-diactoros": "^1.0|^2.0"
@@ -1866,7 +1838,7 @@
                 "psr-15",
                 "psr-7"
             ],
-            "time": "2019-06-04T06:54:19+00:00"
+            "time": "2019-10-30T11:18:16+00:00"
         },
         {
             "name": "tuupola/http-factory",

config-dist.php

@@ -15,7 +15,8 @@
 
 
 # Either "production", "dev", "demo" or "prerelease"
-# ("demo" and "prerelease" is reserved to be used only on the offical demo instances)
+# When not "production", authentication will be disabled and
+# demo data will be populated during database migrations
 Setting('MODE', 'production');
 
 # Either "en" or "de" or the directory name of
@@ -32,7 +33,7 @@ Setting('CALENDAR_SHOW_WEEK_OF_YEAR', true);
 
 # To keep it simple: grocy does not handle any currency conversions,
 # this here is used to format all money values,
-# so doesn't matter really matter, but should be the
+# so doesn't really matter, but should be the
 # ISO 4217 code of the currency ("USD", "EUR", "GBP", etc.)
 Setting('CURRENCY', 'USD');
 
@@ -61,6 +62,11 @@ Setting('DISABLE_AUTH', false);
 # Set this to true if you want to disable the ability to scan a barcode via the device camera (Browser API)
 Setting('DISABLE_BROWSER_BARCODE_CAMERA_SCANNING', false);
 
+# Set this if you want to have a different start day for the weekly meal plan view,
+# leave empty to use CALENDAR_FIRST_DAY_OF_WEEK (see above)
+# Needs to be a number where Sunday = 0, Monday = 1 and so forth
+Setting('MEAL_PLAN_FIRST_DAY_OF_WEEK', '');
+
 
 # Default user settings
 # These settings can be changed per user, here the defaults
@@ -74,6 +80,10 @@ DefaultUserSetting('auto_night_mode_time_range_to', "07:00"); // Format HH:mm
 DefaultUserSetting('auto_night_mode_time_range_goes_over_midnight', true); // If the time range above goes over midnight
 DefaultUserSetting('currently_inside_night_mode_range', false); // If we're currently inside of night mode time range (this is not user configurable, but stored as a user setting because it's evaluated client side to be able to use the client time instead of the maybe different server time)
 
+# Keep screen on settings
+DefaultUserSetting('keep_screen_on', false); // Keep the screen always on
+DefaultUserSetting('keep_screen_on_when_fullscreen_card', false); // Keep the screen on when a "fullscreen-card" is displayed
+
 # Stock settings
 DefaultUserSetting('product_presets_location_id', -1); // Default location id for new products (-1 means no location is preset)
 DefaultUserSetting('product_presets_product_group_id', -1); // Default product group id for new products (-1 means no product group is preset)
@@ -81,6 +91,8 @@ DefaultUserSetting('product_presets_qu_id', -1); // Default quantity unit id for
 DefaultUserSetting('stock_expring_soon_days', 5);
 DefaultUserSetting('stock_default_purchase_amount', 0);
 DefaultUserSetting('stock_default_consume_amount', 1);
+DefaultUserSetting('scan_mode_consume_enabled', false);
+DefaultUserSetting('scan_mode_purchase_enabled', false);
 
 # Chores settings
 DefaultUserSetting('chores_due_soon_days', 5);
@@ -124,6 +136,8 @@ Setting('FEATURE_FLAG_STOCK_PRICE_TRACKING', true);
 Setting('FEATURE_FLAG_STOCK_LOCATION_TRACKING', true);
 Setting('FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING', true);
 Setting('FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING', true);
+Setting('FEATURE_FLAG_STOCK_PRODUCT_FREEZING', true);
+Setting('FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS', true);
 Setting('FEATURE_FLAG_CHORES_ASSIGNMENTS', true);
 
 

controllers/CalendarApiController.php

@@ -38,6 +38,7 @@ class CalendarApiController extends BaseApiController
 				$vEvent->setDtStart($date)
 					->setDtEnd($date)
 					->setSummary($event['title'])
+					->setDescription($event['description'])
 					->setNoTime($event['date_format'] === 'date')
 					->setUseTimezone(true);
 				

controllers/GenericEntityApiController.php

@@ -171,6 +171,6 @@ class GenericEntityApiController extends BaseApiController
 
 	private function IsEntityWithPreventedListing($entity)
 	{
-		return in_array($entity, $this->OpenApiSpec->components->internalSchemas->ExposedEntitiesPreventListing->enum);
+		return !in_array($entity, $this->OpenApiSpec->components->internalSchemas->ExposedEntityButNoListing->enum);
 	}
 }

controllers/RecipesController.php

@@ -3,6 +3,7 @@
 namespace Grocy\Controllers;
 
 use \Grocy\Services\RecipesService;
+use \Grocy\Services\StockService;
 use \Grocy\Services\UserfieldsService;
 
 class RecipesController extends BaseController
@@ -11,10 +12,12 @@ class RecipesController extends BaseController
 	{
 		parent::__construct($container);
 		$this->RecipesService = new RecipesService();
+		$this->StockService = new StockService();
 		$this->UserfieldsService = new UserfieldsService();
 	}
 
 	protected $RecipesService;
+	protected $StockService;
 	protected $UserfieldsService;
 
 	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
@@ -92,7 +95,7 @@ class RecipesController extends BaseController
 			'recipe' =>  $this->Database->recipes($recipeId),
 			'recipePositions' =>  $this->Database->recipes_pos()->where('recipe_id', $recipeId),
 			'mode' => 'edit',
-			'products' => $this->Database->products(),
+			'products' => $this->Database->products()->orderBy('name'),
 			'quantityunits' => $this->Database->quantity_units(),
 			'recipePositionsResolved' => $this->RecipesService->GetRecipesPosResolved(),
 			'recipesResolved' => $this->RecipesService->GetRecipesResolved(),
@@ -132,7 +135,7 @@ class RecipesController extends BaseController
 	public function MealPlan(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		$recipes = $this->Database->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->fetchAll();
-
+		
 		$events = array();
 		foreach($this->Database->meal_plan() as $mealPlanEntry)
 		{
@@ -143,13 +146,21 @@ class RecipesController extends BaseController
 				$title = $recipe->name;
 			}
 
+			$productDetails = null;
+			if ($mealPlanEntry['product_id'] !== null)
+			{
+				$productDetails = $this->StockService->GetProductDetails($mealPlanEntry['product_id']);
+			}
+
 			$events[] = array(
 				'id' => $mealPlanEntry['id'],
 				'title' => $title,
 				'start' => $mealPlanEntry['day'],
 				'date_format' => 'date',
 				'recipe' => json_encode($recipe),
-				'mealPlanEntry' => json_encode($mealPlanEntry)
+				'mealPlanEntry' => json_encode($mealPlanEntry),
+				'type' => $mealPlanEntry['type'],
+				'productDetails' => json_encode($productDetails)
 			);
 		}
 
@@ -157,7 +168,10 @@ class RecipesController extends BaseController
 			'fullcalendarEventSources' => $events,
 			'recipes' => $recipes,
 			'internalRecipes' => $this->Database->recipes()->whereNot('type', RecipesService::RECIPE_TYPE_NORMAL)->fetchAll(),
-			'recipesResolved' => $this->RecipesService->GetRecipesResolved()
+			'recipesResolved' => $this->RecipesService->GetRecipesResolved(),
+			'products' => $this->Database->products()->orderBy('name'),
+			'quantityUnits' => $this->Database->quantity_units()->orderBy('name'),
+			'quantityUnitConversionsResolved' => $this->Database->quantity_unit_conversions_resolved()
 		]);
 	}
 }

controllers/StockApiController.php

@@ -113,6 +113,103 @@ class StockApiController extends BaseApiController
 		}
 	}
 
+	public function EditStockEntry(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$requestBody = $request->getParsedBody();
+
+		try
+		{
+			if ($requestBody === null)
+			{
+				throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
+			}
+
+			if (!array_key_exists('amount', $requestBody))
+			{
+				throw new \Exception('An amount is required');
+			}
+
+			$bestBeforeDate = null;
+			if (array_key_exists('best_before_date', $requestBody) && IsIsoDate($requestBody['best_before_date']))
+			{
+				$bestBeforeDate = $requestBody['best_before_date'];
+			}
+
+			$price = null;
+			if (array_key_exists('price', $requestBody) && is_numeric($requestBody['price']))
+			{
+				$price = $requestBody['price'];
+			}
+
+			$locationId = null;
+			if (array_key_exists('location_id', $requestBody) && is_numeric($requestBody['location_id']))
+			{
+				$locationId = $requestBody['location_id'];
+			}
+
+			$bookingId = $this->StockService->EditStockEntry($args['entryId'], $requestBody['amount'], $bestBeforeDate, $locationId, $price, $requestBody['open'], $requestBody['purchased_date']);
+			return $this->ApiResponse($this->Database->stock_log($bookingId));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function TransferProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$requestBody = $request->getParsedBody();
+
+		try
+		{
+			if ($requestBody === null)
+			{
+				throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
+			}
+
+			if (!array_key_exists('amount', $requestBody))
+			{
+				throw new \Exception('An amount is required');
+			}
+
+			if (!array_key_exists('location_id_from', $requestBody))
+			{
+				throw new \Exception('A transfer from location is required');
+			}
+
+			if (!array_key_exists('location_id_to', $requestBody))
+			{
+				throw new \Exception('A transfer to location is required');
+			}
+
+			$specificStockEntryId = 'default';
+			if (array_key_exists('stock_entry_id', $requestBody) && !empty($requestBody['stock_entry_id']))
+			{
+				$specificStockEntryId = $requestBody['stock_entry_id'];
+			}
+
+			$bookingId = $this->StockService->TransferProduct($args['productId'], $requestBody['amount'], $requestBody['location_id_from'], $requestBody['location_id_to'], $specificStockEntryId);
+			return $this->ApiResponse($this->Database->stock_log($bookingId));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function TransferProductByBarcode(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$args['productId'] = $this->StockService->GetProductIdFromBarcode($args['barcode']);
+			return $this->TransferProduct($request, $response, $args);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
 	public function ConsumeProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
@@ -147,13 +244,19 @@ class StockApiController extends BaseApiController
 				$specificStockEntryId = $requestBody['stock_entry_id'];
 			}
 
+			$locationId = null;
+			if (array_key_exists('location_id', $requestBody) && !empty($requestBody['location_id']) && is_numeric($requestBody['location_id']))
+			{
+				$locationId = $requestBody['location_id'];
+			}
+
 			$recipeId = null;
 			if (array_key_exists('recipe_id', $requestBody) && is_numeric($requestBody['recipe_id']))
 			{
 				$recipeId = $requestBody['recipe_id'];
 			}
 
-			$bookingId = $this->StockService->ConsumeProduct($args['productId'], $requestBody['amount'], $spoiled, $transactionType, $specificStockEntryId, $recipeId);
+			$bookingId = $this->StockService->ConsumeProduct($args['productId'], $requestBody['amount'], $spoiled, $transactionType, $specificStockEntryId, $recipeId, $locationId);
 			return $this->ApiResponse($this->Database->stock_log($bookingId));
 		}
 		catch (\Exception $ex)
@@ -280,7 +383,7 @@ class StockApiController extends BaseApiController
 		return $this->ApiResponse($this->StockService->GetCurrentStock());
 	}
 
-	public function CurrentVolatilStock(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function CurrentVolatileStock(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		$nextXDays = 5;
 		if (isset($request->getQueryParams()['expiring_days']) && !empty($request->getQueryParams()['expiring_days']) && is_numeric($request->getQueryParams()['expiring_days']))
@@ -449,9 +552,38 @@ class StockApiController extends BaseApiController
 		}
 	}
 
+	public function UndoTransaction(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$this->ApiResponse($this->StockService->UndoTransaction($args['transactionId']));
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
 	public function ProductStockEntries(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		return $this->ApiResponse($this->StockService->GetProductStockEntries($args['productId']));
+		$allowSubproductSubstitution = false;
+		if (isset($request->getQueryParams()['include_sub_products']) && filter_var($request->getQueryParams()['include_sub_products'], FILTER_VALIDATE_BOOLEAN))
+		{
+			$allowSubproductSubstitution = true;
+		}
+
+		return $this->ApiResponse($this->StockService->GetProductStockEntries($args['productId'], false, $allowSubproductSubstitution));
+	}
+
+	public function ProductStockLocations(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->ApiResponse($this->StockService->GetProductStockLocations($args['productId']));
+	}
+
+	public function StockEntry(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->ApiResponse($this->StockService->GetStockEntry($args['entryId']));
 	}
 
 	public function StockBooking(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
@@ -472,4 +604,23 @@ class StockApiController extends BaseApiController
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
+
+	public function StockTransactions(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$transactionRows = $this->Database->stock_log()->where('transaction_id = :1', $args['transactionId'])->fetchAll();
+
+			if (count($transactionRows) === 0)
+			{
+				throw new \Exception('No transaction was found by the given transaction id');
+			}
+			
+			return $this->ApiResponse($transactionRows);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
 }

controllers/StockController.php

@@ -38,6 +38,23 @@ class StockController extends BaseController
 		]);
 	}
 
+	public function Stockentries(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$usersService = new UsersService();
+		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_expring_soon_days'];
+
+		return $this->AppContainer->view->render($response, 'stockentries', [
+			'products' => $this->Database->products()->orderBy('name'),
+			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
+			'locations' => $this->Database->locations()->orderBy('name'),
+			'stockEntries' => $this->Database->stock()->orderBy('product_id'),
+			'currentStockLocations' => $this->StockService->GetCurrentStockLocations(),
+			'nextXDays' => $nextXDays,
+			'userfields' => $this->UserfieldsService->GetFields('products'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('products')
+		]);
+	}
+
 	public function Purchase(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'purchase', [
@@ -50,7 +67,17 @@ class StockController extends BaseController
 	{
 		return $this->AppContainer->view->render($response, 'consume', [
 			'products' => $this->Database->products()->orderBy('name'),
-			'recipes' => $this->Database->recipes()->orderBy('name')
+			'recipes' => $this->Database->recipes()->orderBy('name'),
+			'locations' => $this->Database->locations()->orderBy('name')
+		]);
+	}
+
+	public function Transfer(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'transfer', [
+			'products' => $this->Database->products()->orderBy('name'),
+			'recipes' => $this->Database->recipes()->orderBy('name'),
+			'locations' => $this->Database->locations()->orderBy('name')
 		]);
 	}
 
@@ -62,6 +89,15 @@ class StockController extends BaseController
 		]);
 	}
 
+	public function StockEntryEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'stockentryform', [
+			'stockEntry' => $this->Database->stock()->where('id', $args['entryId'])->fetch(),
+			'products' => $this->Database->products()->orderBy('name'),
+			'locations' => $this->Database->locations()->orderBy('name')
+		]);
+	}
+
 	public function ShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		$listId = 1;
@@ -271,6 +307,7 @@ class StockController extends BaseController
 	{
 		return $this->AppContainer->view->render($response, 'stockjournal', [
 			'stockLog' => $this->Database->stock_log()->orderBy('row_created_timestamp', 'DESC'),
+			'locations' => $this->Database->locations()->orderBy('name'),
 			'products' => $this->Database->products()->orderBy('name'),
 			'quantityunits' => $this->Database->quantity_units()->orderBy('name')
 		]);

controllers/SystemController.php

@@ -22,7 +22,7 @@ class SystemController extends BaseController
 		$databaseMigrationService = new DatabaseMigrationService();
 		$databaseMigrationService->MigrateDatabase();
 
-		if (GROCY_IS_DEMO_INSTALL)
+		if (GROCY_MODE === 'dev' || GROCY_MODE === 'demo' || GROCY_MODE === 'prerelease')
 		{
 			$demoDataGeneratorService = new DemoDataGeneratorService();
 			$demoDataGeneratorService->PopulateDemoData();

grocy.openapi.json

@@ -18,6 +18,40 @@
 		{
 			"name": "Generic entity interactions",
 			"description": "A limited set of entities are directly exposed for convenience"
+		},
+		{
+			"name": "System"
+		},
+		{
+			"name": "User management"
+		},
+		{
+			"name": "User settings"
+		},
+		{
+			"name": "Stock"
+		},
+		{
+			"name": "Stock \"by-barcode\"",
+			"description": "Some of the *Stock* routes, but access them by the products barcode instead of its id"
+		},
+		{
+			"name": "Recipes"
+		},
+		{
+			"name": "Chores"
+		},
+		{
+			"name": "Batteries"
+		},
+		{
+			"name": "Tasks"
+		},
+		{
+			"name": "Calendar"
+		},
+		{
+			"name": "Files"
 		}
 	],
 	"paths": {
@@ -129,7 +163,7 @@
 						"required": true,
 						"description": "A valid entity name",
 						"schema": {
-							"$ref": "#/components/internalSchemas/ExposedEntity"
+							"$ref": "#/components/internalSchemas/ExposedEntityButNoListing"
 						}
 					}
 				],
@@ -163,7 +197,7 @@
 											{
 												"$ref": "#/components/schemas/StockEntry"
 											}
-										]	
+										]
 									}
 								}
 							}
@@ -274,7 +308,7 @@
 						"required": true,
 						"description": "A valid entity name",
 						"schema": {
-							"$ref": "#/components/internalSchemas/ExposedEntity"
+							"$ref": "#/components/internalSchemas/ExposedEntityButNoListing"
 						}
 					},
 					{
@@ -626,7 +660,7 @@
 					}
 				}
 			}
-		},		
+		},
 		"/files/{group}/{fileName}": {
 			"get": {
 				"summary": "Serves the given file",
@@ -673,8 +707,7 @@
 						"schema": {
 							"type": "integer"
 						}
-					}
-					,
+					},
 					{
 						"in": "query",
 						"name": "best_fit_width",
@@ -1052,6 +1085,136 @@
 				}
 			}
 		},
+		"/stock/entry/{entryId}": {
+			"get": {
+				"summary": "Returns details of the given stock",
+				"tags": [
+					"Stock"
+				],
+				"parameters": [
+					{
+						"in": "path",
+						"name": "entryId",
+						"required": true,
+						"description": "A valid stock row id",
+						"schema": {
+							"type": "integer"
+						}
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "A StockEntry Response object",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/StockEntry"
+								}
+							}
+						}
+					},
+					"400": {
+						"description": "The operation was not successful (possible errors are: Not existing product)",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/GenericErrorResponse"
+								}
+							}
+						}
+					}
+				}
+			},
+			"put": {
+				"summary": "Edits the stock entry",
+				"tags": [
+					"Stock"
+				],
+				"parameters": [
+					{
+						"in": "path",
+						"name": "entryId",
+						"required": true,
+						"description": "A valid stock row id",
+						"schema": {
+							"type": "integer"
+						}
+					}
+				],
+				"requestBody": {
+					"required": true,
+					"content": {
+						"application/json": {
+							"schema": {
+								"type": "object",
+								"properties": {
+									"amount": {
+										"type": "number",
+										"format": "number",
+										"description": "The amount to add - please note that when tare weight handling for the product is enabled, this needs to be the amount including the container weight (gross), the amount to be posted will be automatically calculated based on what is in stock and the defined tare weight"
+									},
+									"best_before_date": {
+										"type": "string",
+										"format": "date",
+										"description": "The best before date of the product to add, when omitted, the current date is used"
+									},
+									"price": {
+										"type": "number",
+										"format": "number",
+										"description": "The price per purchase quantity unit in configured currency"
+									},
+									"open": {
+										"type": "boolean",
+										"description": "If the stock entry was already opened or not"
+									},
+									"location_id": {
+										"type": "number",
+										"format": "integer",
+										"description": "If omitted, the default location of the product is used"
+									},
+									"purchased_date": {
+										"type": "string",
+										"format": "date",
+										"description": "The date when this stock entry was purchased"
+									}
+								},
+								"example": {
+									"id": "2",
+									"amount": "1",
+									"best_before_date": "2021-07-19",
+									"purchased_date": "2020-01-01",
+									"price": "22.03",
+									"open": false,
+									"location_id": "4"
+								}
+							}
+						}
+					}
+				},
+				"responses": {
+					"200": {
+						"description": "The operation was successful",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/StockEntry"
+								}
+							}
+						}
+					},
+					"400": {
+						"description": "The operation was not successful (possible errors are: Not existing product, invalid transaction type)",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/GenericErrorResponse"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
 		"/stock/volatile": {
 			"get": {
 				"summary": "Returns all products which are expiring soon, are already expired or currently missing",
@@ -1128,6 +1291,50 @@
 				}
 			}
 		},
+		"/stock/products/{productId}/locations": {
+			"get": {
+				"summary": "Returns all locations where the given product currently has stock",
+				"tags": [
+					"Stock"
+				],
+				"parameters": [
+					{
+						"in": "path",
+						"name": "productId",
+						"required": true,
+						"description": "A valid product id",
+						"schema": {
+							"type": "integer"
+						}
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "An array of StockLocation objects",
+						"content": {
+							"application/json": {
+								"schema": {
+									"type": "array",
+									"items": {
+										"$ref": "#/components/schemas/StockLocation"
+									}
+								}
+							}
+						}
+					},
+					"400": {
+						"description": "The operation was not successful (possible errors are: Not existing product)",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/GenericErrorResponse"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
 		"/stock/products/{productId}/entries": {
 			"get": {
 				"summary": "Returns all stock entries of the given product in order of next use (first expiring first, then first in first out)",
@@ -1143,6 +1350,15 @@
 						"schema": {
 							"type": "integer"
 						}
+					},
+					{
+						"in": "query",
+						"name": "include_sub_products",
+						"required": false,
+						"description": "If sub products should be included (if the given product is a parent product and in addition to the ones of the given product)",
+						"schema": {
+							"type": "boolean"
+						}
 					}
 				],
 				"responses": {
@@ -1341,6 +1557,11 @@
 										"type": "number",
 										"format": "integer",
 										"description": "A valid recipe id for which this product was used (for statistical purposes only)"
+									},
+									"location_id": {
+										"type": "number",
+										"format": "integer",
+										"description": "A valid location id (if supplied, only stock at the given location is considered, if ommitted, stock of any location is considered)"
 									}
 								},
 								"example": {
@@ -1376,6 +1597,82 @@
 				}
 			}
 		},
+		"/stock/products/{productId}/transfer": {
+			"post": {
+				"summary": "Transfers the given amount of the given product from one location to another (this is currently not supported for tare weight handling enabled products)",
+				"tags": [
+					"Stock"
+				],
+				"parameters": [
+					{
+						"in": "path",
+						"name": "productId",
+						"required": true,
+						"description": "A valid product id",
+						"schema": {
+							"type": "integer"
+						}
+					}
+				],
+				"requestBody": {
+					"required": true,
+					"content": {
+						"application/json": {
+							"schema": {
+								"type": "object",
+								"properties": {
+									"amount": {
+										"type": "number",
+										"description": "The amount to transfer - please note that when tare weight handling for the product is enabled, this needs to be the amount including the container weight (gross), the amount to be posted will be automatically calculated based on what is in stock and the defined tare weight"
+									},
+									"location_id_from": {
+										"type": "number",
+										"format": "integer",
+										"description": "A valid location id, the location from where the product should be transfered"
+									},
+									"location_id_to": {
+										"type": "number",
+										"format": "integer",
+										"description": "A valid location id, the location to where the product should be transfered"
+									},
+									"stock_entry_id": {
+										"type": "string",
+										"description": "A specific stock entry id to transfer, if used, the amount has to be 1"
+									}
+								},
+								"example": {
+									"amount": 1,
+									"location_id_from": 1,
+									"location_id_to": 2
+								}
+							}
+						}
+					}
+				},
+				"responses": {
+					"200": {
+						"description": "The operation was successful",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/StockLogEntry"
+								}
+							}
+						}
+					},
+					"400": {
+						"description": "The operation was not successful (possible errors are: Not existing product, no existing from or to location, given amount > current stock amount at the source location)",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/GenericErrorResponse"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
 		"/stock/products/{productId}/inventory": {
 			"post": {
 				"summary": "Inventories the given product (adds/removes based on the given new amount)",
@@ -1516,7 +1813,7 @@
 			"get": {
 				"summary": "Returns details of the given product by its barcode",
 				"tags": [
-					"Stock"
+					"Stock \"by-barcode\""
 				],
 				"parameters": [
 					{
@@ -1557,7 +1854,7 @@
 			"post": {
 				"summary": "Adds the given amount of the by its barcode given product to stock",
 				"tags": [
-					"Stock"
+					"Stock \"by-barcode\""
 				],
 				"parameters": [
 					{
@@ -1639,7 +1936,7 @@
 			"post": {
 				"summary": "Removes the given amount of the by its barcode given product from stock",
 				"tags": [
-					"Stock"
+					"Stock \"by-barcode\""
 				],
 				"parameters": [
 					{
@@ -1678,6 +1975,11 @@
 										"type": "number",
 										"format": "integer",
 										"description": "A valid recipe id for which this product was used (for statistical purposes only)"
+									},
+									"location_id": {
+										"type": "number",
+										"format": "integer",
+										"description": "A valid location id (if supplied, only stock at the given location is considered, if ommitted, stock of any location is considered)"
 									}
 								},
 								"example": {
@@ -1713,11 +2015,87 @@
 				}
 			}
 		},
+		"/stock/products/by-barcode/{barcode}/transfer": {
+			"post": {
+				"summary": "Transfers the given amount of the by its barcode given product from one location to another (this is currently not supported for tare weight handling enabled products)",
+				"tags": [
+					"Stock \"by-barcode\""
+				],
+				"parameters": [
+					{
+						"in": "path",
+						"name": "barcode",
+						"required": true,
+						"description": "Barcode",
+						"schema": {
+							"type": "string"
+						}
+					}
+				],
+				"requestBody": {
+					"required": true,
+					"content": {
+						"application/json": {
+							"schema": {
+								"type": "object",
+								"properties": {
+									"amount": {
+										"type": "number",
+										"description": "The amount to transfer - please note that when tare weight handling for the product is enabled, this needs to be the amount including the container weight (gross), the amount to be posted will be automatically calculated based on what is in stock and the defined tare weight"
+									},
+									"location_id_from": {
+										"type": "number",
+										"format": "integer",
+										"description": "A valid location id, the location from where the product should be transfered"
+									},
+									"location_id_to": {
+										"type": "number",
+										"format": "integer",
+										"description": "A valid location id, the location to where the product should be transfered"
+									},
+									"stock_entry_id": {
+										"type": "string",
+										"description": "A specific stock entry id to transfer, if used, the amount has to be 1"
+									}
+								},
+								"example": {
+									"amount": 1,
+									"location_id_from": 1,
+									"location_id_to": 2
+								}
+							}
+						}
+					}
+				},
+				"responses": {
+					"200": {
+						"description": "The operation was successful",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/StockLogEntry"
+								}
+							}
+						}
+					},
+					"400": {
+						"description": "The operation was not successful (possible errors are: Not existing product, no existing from or to location, given amount > current stock amount at the source location)",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/GenericErrorResponse"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
 		"/stock/products/by-barcode/{barcode}/inventory": {
 			"post": {
 				"summary": "Inventories the by its barcode given product (adds/removes based on the given new amount)",
 				"tags": [
-					"Stock"
+					"Stock \"by-barcode\""
 				],
 				"parameters": [
 					{
@@ -1789,7 +2167,7 @@
 			"post": {
 				"summary": "Marks the given amount of the by its barcode given product as opened",
 				"tags": [
-					"Stock"
+					"Stock \"by-barcode\""
 				],
 				"parameters": [
 					{
@@ -2119,7 +2497,85 @@
 				}
 			}
 		},
-		"/stock/barcodes/external-lookup": {
+		"/stock/transactions/{transactionId}": {
+			"get": {
+				"summary": "Returns all stock bookings of the given transaction id",
+				"tags": [
+					"Stock"
+				],
+				"parameters": [
+					{
+						"in": "path",
+						"name": "transactionId",
+						"required": true,
+						"description": "A valid stock transaction id",
+						"schema": {
+							"type": "string"
+						}
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "An array of StockLogEntry objects",
+						"content": {
+							"application/json": {
+								"schema": {
+									"type": "array",
+									"items": {
+										"$ref": "#/components/schemas/StockLogEntry"
+									}
+								}
+							}
+						}
+					},
+					"400": {
+						"description": "The operation was not successful (possible errors are: Not existing transaction)",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/GenericErrorResponse"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
+		"/stock/transactions/{transactionId}/undo": {
+			"post": {
+				"summary": "Undoes a transaction",
+				"tags": [
+					"Stock"
+				],
+				"parameters": [
+					{
+						"in": "path",
+						"name": "transactionId",
+						"required": true,
+						"description": "A valid stock transaction id",
+						"schema": {
+							"type": "string"
+						}
+					}
+				],
+				"responses": {
+					"204": {
+						"description": "The operation was successful"
+					},
+					"400": {
+						"description": "The operation was not successful (possible errors are: Not existing transaction)",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/GenericErrorResponse"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
+		"/stock/barcodes/external-lookup/{barcode}": {
 			"get": {
 				"summary": "Executes an external barcode lookoup via the configured plugin with the given barcode",
 				"tags": [
@@ -2127,7 +2583,7 @@
 				],
 				"parameters": [
 					{
-						"in": "query",
+						"in": "path",
 						"name": "barcode",
 						"required": true,
 						"description": "The barcode to lookup up",
@@ -2861,10 +3317,28 @@
 					"meal_plan"
 				]
 			},
-			"ExposedEntitiesPreventListing": {
+			"ExposedEntityButNoListing": {
 				"type": "string",
 				"enum": [
-					"api_keys"
+					"products",
+					"chores",
+					"batteries",
+					"locations",
+					"quantity_units",
+					"quantity_unit_conversions",
+					"shopping_list",
+					"shopping_lists",
+					"recipes",
+					"recipes_pos",
+					"recipes_nestings",
+					"tasks",
+					"task_categories",
+					"product_groups",
+					"equipment",
+					"userfields",
+					"userentities",
+					"userobjects",
+					"meal_plan"
 				]
 			},
 			"StockTransactionType": {
@@ -3023,6 +3497,32 @@
 					"row_created_timestamp": "2019-05-02 20:12:25"
 				}
 			},
+			"StockLocation": {
+				"type": "object",
+				"properties": {
+					"id": {
+                                                "type": "integer"
+                                        },
+					"product_id": {
+						"type": "integer"
+					},
+					"location_id": {
+						"type": "integer"
+					},
+					"location_name": {
+						"type": "string"
+					},
+					"location_is_freezer": {
+						"type": "integer"
+					}
+				},
+				"example": {
+					"id": "1",
+					"product_id": "3",
+					"location_id": "1",
+					"name": "Fridge"
+				}
+			},
 			"StockEntry": {
 				"type": "object",
 				"properties": {
@@ -3645,6 +4145,9 @@
 					"is_aggregated_amount": {
 						"type": "boolean",
 						"description": "Indicates wheter this product has sub-products or not / if the fields `amount_aggregated` and `amount_opened_aggregated` are filled"
+					},
+					"product": {
+						"$ref": "#/components/schemas/Product"
 					}
 				}
 			},
@@ -3700,7 +4203,20 @@
 					"missing_products": {
 						"type": "array",
 						"items": {
-							"$ref": "#/components/schemas/CurrentStockResponse"
+							"properties": {
+								"id": {
+									"type": "integer"
+								},
+								"name": {
+									"type": "string"
+								},
+								"amount_missing": {
+									"type": "number"
+								},
+								"is_partly_in_stock": {
+									"type": "integer"
+								}
+							}
 						}
 					}
 				}

helpers/extensions.php

@@ -82,7 +82,7 @@ function SumArrayValue($array, $propertyName)
 	$sum = 0;
 	foreach($array as $object)
 	{
-		$sum += $object->{$propertyName};
+		$sum += floatval($object->{$propertyName});
 	}
 
 	return $sum;

localization/chore_period_types.pot

@@ -26,3 +26,6 @@ msgstr ""
 
 msgid "monthly"
 msgstr ""
+
+msgid "yearly"
+msgstr ""

localization/da/chore_period_types.po

@@ -1,5 +1,7 @@
 # Translators:
 # Troels Siggaard <troels@siggaard.com>, 2019
+# Rasmus Bojsen <rasmus@bojsen.cn>, 2019
+# Brian Moos Lindberg <brian@blueeel.dk>, 2019
 # 
 msgid ""
 msgstr ""
@@ -7,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Troels Siggaard <troels@siggaard.com>, 2019\n"
+"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +22,7 @@ msgid "manually"
 msgstr "manuelt"
 
 msgid "dynamic-regular"
-msgstr "gentagende-dynamisk"
+msgstr "dynamisk-regelmæssig"
 
 msgid "daily"
 msgstr "daglig"
@@ -30,3 +32,6 @@ msgstr "ugentlig"
 
 msgid "monthly"
 msgstr "månedlig"
+
+msgid "yearly"
+msgstr "årlig"

localization/da/demo_data.po

@@ -1,6 +1,8 @@
 # Translators:
 # dark159123 <r.j.hansen@protonmail.com>, 2019
 # Troels Siggaard <troels@siggaard.com>, 2019
+# Rasmus Bojsen <rasmus@bojsen.cn>, 2019
+# Brian Moos Lindberg <brian@blueeel.dk>, 2019
 # 
 msgid ""
 msgstr ""
@@ -8,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Troels Siggaard <troels@siggaard.com>, 2019\n"
+"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,8 +39,8 @@ msgstr "Køleskab"
 
 msgid "Piece"
 msgid_plural "Pieces"
-msgstr[0] "Styk"
-msgstr[1] "Stykker"
+msgstr[0] "stk"
+msgstr[1] "stk"
 
 msgid "Pack"
 msgid_plural "Packs"
@@ -81,7 +83,7 @@ msgid "Pickles"
 msgstr "Syltede agurker"
 
 msgid "Gulash soup"
-msgstr "Gulash"
+msgstr "Gullashsuppe"
 
 msgid "Yogurt"
 msgstr "Yoghurt"
@@ -161,14 +163,11 @@ msgstr "Tysk"
 msgid "Italian"
 msgstr "Italiensk"
 
-msgid "Demo in different language"
-msgstr "Demo på et andet sprog"
-
 msgid "This is the note content of the recipe ingredient"
 msgstr "Dette er indholdet af opskrift-ingrediensens notefeltet"
 
 msgid "Demo User"
-msgstr "Demo Bruger"
+msgstr "Demobruger"
 
 msgid "Gram"
 msgid_plural "Grams"
@@ -218,7 +217,7 @@ msgid "Vegetables/Fruits"
 msgstr "Frugt og grønt"
 
 msgid "Refrigerated products"
-msgstr "Køleskabsprodukter"
+msgstr "Køleskabsvarer"
 
 msgid "Coffee machine"
 msgstr "Kaffemaskine"
@@ -284,27 +283,66 @@ msgid "Polish"
 msgstr "Polsk"
 
 msgid "Milk Chocolate"
-msgstr ""
+msgstr "Mælkechokolade"
 
 msgid "Dark Chocolate"
-msgstr ""
+msgstr "Mørk chokolade"
 
 msgid "Slice"
 msgid_plural "Slices"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Skive"
+msgstr[1] "Skiver"
 
 msgid "Example userentity"
-msgstr ""
+msgstr "Eksempel-brugerenhed"
 
 msgid "This is an example user entity..."
-msgstr ""
+msgstr "Dette er en eksempel-brugerenhed..."
 
 msgid "Custom field"
-msgstr ""
+msgstr "Brugerdefineret felt"
 
 msgid "Example field value..."
-msgstr ""
+msgstr "Eksempel-feltværdi..."
 
 msgid "Waffle rolls"
+msgstr "Vaffelruller"
+
+msgid "Danish"
+msgstr "Dansk"
+
+msgid "Dutch"
+msgstr "Hollandsk"
+
+msgid "Norwegian"
+msgstr "Norsk"
+
+msgid "Demo"
+msgstr "Demo"
+
+msgid "Stable version"
+msgstr "Stabil version"
+
+msgid "Preview version"
+msgstr "Forhåndsvisningsversion"
+
+msgid "current release"
+msgstr "aktuel udgivelse"
+
+msgid "not yet released"
+msgstr "Ikke frigivet endnu"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portugisisk (Brasilien)"
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
 msgstr ""

localization/da/stock_transaction_types.po

@@ -1,5 +1,6 @@
 # Translators:
 # Troels Siggaard <troels@siggaard.com>, 2019
+# Brian Moos Lindberg <brian@blueeel.dk>, 2019
 # 
 msgid ""
 msgstr ""
@@ -7,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Troels Siggaard <troels@siggaard.com>, 2019\n"
+"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +20,12 @@ msgstr ""
 msgid "purchase"
 msgstr "køb"
 
+msgid "transfer_from"
+msgstr "flyt_fra"
+
+msgid "transfer_to"
+msgstr "flyt_til"
+
 msgid "consume"
 msgstr "forbrug"
 
@@ -27,3 +34,12 @@ msgstr "beholdningsrettelse"
 
 msgid "product-opened"
 msgstr "produkt-åbnet"
+
+msgid "stock-edit-old"
+msgstr "lager-redigering-gammel"
+
+msgid "stock-edit-new"
+msgstr "lager-redigering-ny"
+
+msgid "self-production"
+msgstr ""

localization/da/userfield_types.po

@@ -1,3 +1,5 @@
+# Translators:
+# Brian Moos Lindberg <brian@blueeel.dk>, 2019
 # 
 msgid ""
 msgstr ""
@@ -5,6 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:43+0000\n"
+"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,22 +17,31 @@ msgstr ""
 "X-Domain: grocy/userfield_types\n"
 
 msgid "text-single-line"
-msgstr ""
+msgstr "tekst-enkelt-linje"
 
 msgid "text-multi-line"
-msgstr ""
+msgstr "tekst-flere-linjer"
 
 msgid "number-integral"
-msgstr ""
+msgstr "tal-heltal"
 
 msgid "number-decimal"
-msgstr ""
+msgstr "tal-decimal"
 
 msgid "date"
-msgstr ""
+msgstr "dato"
 
 msgid "datetime"
-msgstr ""
+msgstr "datotid"
 
 msgid "checkbox"
-msgstr ""
+msgstr "afkrydsningsfelt"
+
+msgid "preset-list"
+msgstr "forudindstillet-liste"
+
+msgid "preset-checklist"
+msgstr "forudindstillet-tjekliste"
+
+msgid "link"
+msgstr "link"

localization/de/chore_period_types.po

@@ -30,3 +30,6 @@ msgstr "Wöchentlich"
 
 msgid "monthly"
 msgstr "Monatlich"
+
+msgid "yearly"
+msgstr "Jährlich"

localization/de/demo_data.po

@@ -1,5 +1,5 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
+# Bernd Bestel <bernd@berrnd.de>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2020\n"
 "Language-Team: German (https://www.transifex.com/grocy/teams/93189/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -328,3 +328,18 @@ msgstr "aktuelles Release"
 
 msgid "not yet released"
 msgstr "noch nicht freigegeben"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portugiesisch (Brasilien)"
+
+msgid "This is a note"
+msgstr "Dies ist eine Notiz"
+
+msgid "Freezer"
+msgstr "Gefrierschrank"
+
+msgid "Hungarian"
+msgstr "Ungarisch"
+
+msgid "Slovak"
+msgstr "Slowakisch"

localization/de/stock_transaction_types.po

@@ -1,5 +1,5 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
+# Bernd Bestel <bernd@berrnd.de>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2020\n"
 "Language-Team: German (https://www.transifex.com/grocy/teams/93189/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,12 @@ msgstr ""
 msgid "purchase"
 msgstr "Einkauf"
 
+msgid "transfer_from"
+msgstr "Umlagerung von"
+
+msgid "transfer_to"
+msgstr "Umlagerung nach"
+
 msgid "consume"
 msgstr "Verbrauch"
 
@@ -27,3 +33,12 @@ msgstr "Inventur-Korrektur"
 
 msgid "product-opened"
 msgstr "Produkt geöffnet"
+
+msgid "stock-edit-old"
+msgstr "Bestandseintrag bearbeitet (alte Werte)"
+
+msgid "stock-edit-new"
+msgstr "Bestandseintrag bearbeitet (neue Werte)"
+
+msgid "self-production"
+msgstr "Eigenproduktion"

localization/de/strings.po

@@ -1,5 +1,6 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
+# H T <github@fvbor.de>, 2020
+# Bernd Bestel <bernd@berrnd.de>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2020\n"
 "Language-Team: German (https://www.transifex.com/grocy/teams/93189/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,7 +76,7 @@ msgid "Shopping list"
 msgstr "Einkaufszettel"
 
 msgid "Chore tracking"
-msgstr "Hausarbeiten-Ausführung"
+msgstr "Hausarbeit-Ausführung"
 
 msgid "Battery tracking"
 msgstr "Batterie-Ladezyklus"
@@ -676,7 +677,7 @@ msgstr ""
 msgid "Consume all ingredients needed by this recipe"
 msgstr ""
 "Alle Zutaten, die von diesem Rezept benötigt werden, aus dem Bestand "
-"enternen"
+"entfernen"
 
 msgid "Click to show technical details"
 msgstr "Klick um technische Details anzuzeigen"
@@ -975,12 +976,12 @@ msgid "Mark %1$s of %2$s as open"
 msgstr "%1$s %2$s als geöffnet markieren"
 
 msgid ""
-"When a product was marked as opened, the best before date will be replaced "
-"by today + this amount of days (a value of 0 disables this)"
+"When this product was marked as opened, the best before date will be "
+"replaced by today + this amount of days (a value of 0 disables this)"
 msgstr ""
-"Wenn ein Produkt als geöffnet markiert wurde, wird das "
+"Wenn dieses Produkt als geöffnet markiert wurde, wird das "
 "Mindesthaltbarkeitsdatum durch heute + diese Anzahl von Tagen ersetzt (ein "
-"Wert von 0 deaktiviert dies)"
+"Wert von 0 deaktiviert dies) "
 
 msgid "Default best before days after opened"
 msgstr "Standard Haltbarkeit in Tagen nach dem Öffnen"
@@ -991,9 +992,6 @@ msgstr "%1$s %2$s als geöffnet markiert"
 msgid "Mark as opened"
 msgstr "Als geöffnet markieren"
 
-msgid "Expires on %1$s; Bought on %2$s"
-msgstr "Läuft ab am %1$s; Gekauft am %2$s"
-
 msgid "Not opened"
 msgstr "Nicht geöffnet"
 
@@ -1309,6 +1307,9 @@ msgstr "Nicht ausreichend im Bestand"
 msgid "Expiring soon days"
 msgstr "\"Bald ablaufend\"-Tage"
 
+msgid "Default location"
+msgstr "Standard Standort"
+
 msgid "Default amount for purchase"
 msgstr "Standardmenge für Einkauf"
 
@@ -1704,3 +1705,219 @@ msgstr "Unbegrenzt"
 
 msgid "Clear"
 msgstr "Löschen"
+
+msgid "Are you sure to remove the included recipe \"%s\"?"
+msgstr "Das enthaltene Rezept \"%s\" wirklich löschen?"
+
+msgid "Period interval"
+msgstr "Periodenintervall"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s days"
+msgstr ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit nur alle %s Tage "
+"geplant wird"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s weeks"
+msgstr ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit nur alle %s Wochen"
+" geplant wird"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s months"
+msgstr ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit nur alle %s Monate"
+" geplant wird"
+
+msgid ""
+"This means the next execution of this chore is scheduled 1 year after the "
+"last execution"
+msgstr ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit 1 Jahr nach der "
+"letzten Ausführung geplant wird"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s years"
+msgstr ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit nur alle %s Jahre "
+"geplant wird"
+
+msgid "Transfer"
+msgstr "Umlagern"
+
+msgid "From location"
+msgstr "Von Standort"
+
+msgid "To location"
+msgstr "Nach Standort"
+
+msgid "There are no units available at this location"
+msgstr "Keine Einheiten an diesem Standort verfügbar"
+
+msgid "Amount: %1$s; Expires on %2$s; Bought on %3$s"
+msgstr "Menge: %1$s; Läuft ab am %2$s; Gekauft am %3$s "
+
+msgid "Transfered %1$s of %2$s from %3$s to %4$s"
+msgstr "%1$s %2$s von %3$s nach %4$s verschoben"
+
+msgid "Show stock entries"
+msgstr "Bestandseinträge anzeigen"
+
+msgid "Stock entries"
+msgstr "Bestandseinträge"
+
+msgid "Best before date"
+msgstr "MHD"
+
+msgid "Purchased date"
+msgstr "Einkaufsdatum"
+
+msgid "Consume all %s for this stock entry"
+msgstr "Verbrauche alle %s dieses Bestandseintrags"
+
+msgid "The amount cannot be lower than %1$s"
+msgstr "Die Menge darf nicht kleiner als %1$s sein"
+
+msgid "Stock entry successfully updated"
+msgstr "Bestandseintrag wurde erfolgreich aktualisiert"
+
+msgid "Edit stock entry"
+msgstr "Bestandseintrag bearbeiten"
+
+msgid ""
+"Camera access is on only possible when supported and allowed by your browser"
+" and when grocy is served via a secure (https://) connection"
+msgstr ""
+"Der Kamerazugriff ist nur möglich, wenn dein Browser dies unterstützt und "
+"zulässt und wenn auf grocy über eine sichere Verbindung (https://) "
+"zugegriffen wird"
+
+msgid "Keep screen on"
+msgstr "Bildschirm eingeschaltet lassen"
+
+msgid "Keep screen on while displaying a \"fullscreen-card\""
+msgstr ""
+"Bildschirm eingeschaltet lassen während eine \"fullscreen-card\" angezeigt "
+"wird"
+
+msgid "A purchased date is required"
+msgstr "Ein Einkaufsdatum ist erforderlich"
+
+msgid ""
+"When a product is selected, one unit (per serving in purchase quantity unit)"
+" will be added to stock on consuming this recipe"
+msgstr ""
+"Wenn ein Produkt ausgewählt ist, wird beim Verbrauch dieses Rezeptes eine "
+"Einheit (pro Portion in Einkaufsmengeneinheit) dem Bestand hinzugefügt"
+
+msgid "Produces product"
+msgstr "Produziertes Produkt"
+
+msgid "This booking cannot be undone"
+msgstr "Die Buchung kann nicht rückgängig gemacht werden"
+
+msgid "Booking does not exist or was already undone"
+msgstr "Buchung existiert nicht oder wurde bereits rückgängig gemacht"
+
+msgid "Are you sure to delete API key \"%s\"?"
+msgstr "API key \"%s\" wirklich löschen?"
+
+msgid "Add note"
+msgstr "Notiz hinzufügen"
+
+msgid "Add note to %s"
+msgstr "Notiz zu %s hinzufügen"
+
+msgid "per day"
+msgstr "pro Tag"
+
+msgid "Compact view"
+msgstr "Kompakte Ansicht"
+
+msgid "Normal view"
+msgstr "Normale Ansicht"
+
+msgid "Only undone items"
+msgstr "Nur unerledigte Einträge"
+
+msgid "Add product"
+msgstr "Produkt hinzufügen"
+
+msgid "Add product to %s"
+msgstr "Produkt zu %s hinzufügen"
+
+msgid "Consume all ingredients needed by this weeks recipes or products"
+msgstr ""
+"Alle Zutaten, die diese Woche von Rezepten oder Produkten benötigt werden, "
+"aus dem Bestand entfernen"
+
+msgid "Meal plan recipe"
+msgstr "Speiseplan Rezept"
+
+msgid "Meal plan note"
+msgstr "Speiseplan Notiz"
+
+msgid "Meal plan product"
+msgstr "Speiseplan Produkt"
+
+msgid "Scan mode"
+msgstr "Scan-Modus"
+
+msgid "on"
+msgstr "an"
+
+msgid "off"
+msgstr "aus"
+
+msgid ""
+"Scan mode is on but not all required fields could be populated automatically"
+msgstr ""
+"Scan-Modus ist eingeschaltet, aber nicht alle erforderlichen Felder konnten "
+"automatisch ausgefüllt werden"
+
+msgid "Is freezer"
+msgstr "Ist ein Gefrier-Standort (also z. B. ein Gefrierschrank)"
+
+msgid ""
+"When moving products from/to a freezer location, the products best before "
+"date is automatically adjusted according to the product settings"
+msgstr ""
+"Beim Umlagen von Produkten von/zu einem Gefrier-Standort wird das "
+"Mindesthaltbarkeitsdatum der Produkte automatisch entsprechend den "
+"Produkteinstellungen angepasst"
+
+msgid ""
+"On moving this product to a freezer location (so when freezing it), the best"
+" before date will be replaced by today + this amount of days"
+msgstr ""
+"Wenn dieses Produkt zu einem Gefrier-Standort umgelagert (sprich "
+"eingefroren) wird, wird das Mindesthaltbarkeitsdatum durch heute + diese "
+"Anzahl von Tagen ersetzt"
+
+msgid "Default best before days after freezing"
+msgstr "Standard Haltbartkeit in Tagen nach dem Einfrieren"
+
+msgid ""
+"On moving this product from a freezer location (so when thawing it), the "
+"best before date will be replaced by today + this amount of days"
+msgstr ""
+"Wenn dieses Produkt von einem Gefrier-Standort umgelagert (sprich aufgetaut)"
+" wird, wird das Mindesthaltbarkeitsdatum durch heute + diese Anzahl von "
+"Tagen ersetzt"
+
+msgid "Default best before days after thawing"
+msgstr "Standard Haltbartkeit in Tagen nach dem Auftauen"
+
+msgid "This cannot be the same as the \"From\" location"
+msgstr "Dies kann nicht derselbe Standort wie \"Von Standort\" sein"
+
+msgid "Thawed"
+msgstr "Aufgetaut"
+
+msgid "Frozen"
+msgstr "Eingefroren"

localization/demo_data.pot

@@ -325,3 +325,17 @@ msgstr ""
 msgid "not yet released"
 msgstr ""
 
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
+msgstr ""

localization/en/chore_period_types.po

@@ -27,3 +27,6 @@ msgstr "Weekly"
 
 msgid "monthly"
 msgstr "Monthly"
+
+msgid "yearly"
+msgstr "Yearly"

localization/en/stock_transaction_types.po

@@ -15,6 +15,12 @@ msgstr ""
 msgid "purchase"
 msgstr "Purchase"
 
+msgid "transfer_to"
+msgstr "Transfer To"
+
+msgid "transfer_from"
+msgstr "Transfer From"
+
 msgid "consume"
 msgstr "Consume"
 
@@ -23,3 +29,12 @@ msgstr "Inventory correction"
 
 msgid "product-opened"
 msgstr "Product opened"
+
+msgid "stock-edit-old"
+msgstr "Stock entry edited (old values)"
+
+msgid "stock-edit-new"
+msgstr "Stock entry edited (new values)"
+
+msgid "self-production"
+msgstr "Self-production"

localization/en_GB/chore_assignment_types.po

@@ -1,3 +1,5 @@
+# Translators:
+# Jonathan Adams <jonathan@connockadams.uk>, 2020
 # 
 msgid ""
 msgstr ""
@@ -5,6 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-09-17 10:45+0000\n"
+"Last-Translator: Jonathan Adams <jonathan@connockadams.uk>, 2020\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,13 +17,13 @@ msgstr ""
 "X-Domain: grocy/chore_assignment_types\n"
 
 msgid "no-assignment"
-msgstr ""
+msgstr "no-assignment"
 
 msgid "who-least-did-first"
-msgstr ""
+msgstr "who-least-did-first"
 
 msgid "random"
-msgstr ""
+msgstr "random"
 
 msgid "in-alphabetical-order"
-msgstr ""
+msgstr "in-alphabetical-order"

localization/en_GB/chore_period_types.po

@@ -1,3 +1,5 @@
+# Translators:
+# Jonathan Adams <jonathan@connockadams.uk>, 2020
 # 
 msgid ""
 msgstr ""
@@ -5,6 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Jonathan Adams <jonathan@connockadams.uk>, 2020\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,16 +17,19 @@ msgstr ""
 "X-Domain: grocy/chore_types\n"
 
 msgid "manually"
-msgstr ""
+msgstr "manually"
 
 msgid "dynamic-regular"
-msgstr ""
+msgstr "dynamic-regular"
 
 msgid "daily"
-msgstr ""
+msgstr "daily"
 
 msgid "weekly"
-msgstr ""
+msgstr "weekly"
 
 msgid "monthly"
-msgstr ""
+msgstr "monthly"
+
+msgid "yearly"
+msgstr "yearly"

localization/en_GB/demo_data.po

@@ -1,3 +1,5 @@
+# Translators:
+# Jonathan Adams <jonathan@connockadams.uk>, 2020
 # 
 msgid ""
 msgstr ""
@@ -5,6 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Jonathan Adams <jonathan@connockadams.uk>, 2020\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,314 +17,329 @@ msgstr ""
 "X-Domain: grocy/demo_data\n"
 
 msgid "Cookies"
-msgstr ""
+msgstr "Cookies"
 
 msgid "Chocolate"
-msgstr ""
+msgstr "Chocolate"
 
 msgid "Pantry"
-msgstr ""
+msgstr "Pantry"
 
 msgid "Candy cupboard"
-msgstr ""
+msgstr "Candy cupboard"
 
 msgid "Tinned food cupboard"
-msgstr ""
+msgstr "Tinned food cupboard"
 
 msgid "Fridge"
-msgstr ""
+msgstr "Fridge"
 
 msgid "Piece"
 msgid_plural "Pieces"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Piece"
+msgstr[1] "Pieces"
 
 msgid "Pack"
 msgid_plural "Packs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Pack"
+msgstr[1] "Packs"
 
 msgid "Glass"
 msgid_plural "Glasses"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Glass"
+msgstr[1] "Glasses"
 
 msgid "Tin"
 msgid_plural "Tins"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tin"
+msgstr[1] "Tins"
 
 msgid "Can"
 msgid_plural "Cans"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Can"
+msgstr[1] "Cans"
 
 msgid "Bunch"
 msgid_plural "Bunches"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Bunch"
+msgstr[1] "Bunches"
 
 msgid "Gummy bears"
-msgstr ""
+msgstr "Gummy bears"
 
 msgid "Crisps"
-msgstr ""
+msgstr "Crisps"
 
 msgid "Eggs"
-msgstr ""
+msgstr "Eggs"
 
 msgid "Noodles"
-msgstr ""
+msgstr "Noodles"
 
 msgid "Pickles"
-msgstr ""
+msgstr "Pickles"
 
 msgid "Gulash soup"
-msgstr ""
+msgstr "Gulash soup"
 
 msgid "Yogurt"
-msgstr ""
+msgstr "Yogurt"
 
 msgid "Cheese"
-msgstr ""
+msgstr "Cheese"
 
 msgid "Cold cuts"
-msgstr ""
+msgstr "Cold cuts"
 
 msgid "Paprika"
-msgstr ""
+msgstr "Paprika"
 
 msgid "Cucumber"
-msgstr ""
+msgstr "Cucumber"
 
 msgid "Radish"
-msgstr ""
+msgstr "Radish"
 
 msgid "Tomato"
-msgstr ""
+msgstr "Tomato"
 
 msgid "Changed towels in the bathroom"
-msgstr ""
+msgstr "Changed towels in the bathroom"
 
 msgid "Cleaned the kitchen floor"
-msgstr ""
+msgstr "Cleaned the kitchen floor"
 
 msgid "Warranty ends"
-msgstr ""
+msgstr "Warranty ends"
 
 msgid "TV remote control"
-msgstr ""
+msgstr "TV remote control"
 
 msgid "Alarm clock"
-msgstr ""
+msgstr "Alarm clock"
 
 msgid "Heat remote control"
-msgstr ""
+msgstr "Heat remote control"
 
 msgid "Lawn mowed in the garden"
-msgstr ""
+msgstr "Lawn mowed in the garden"
 
 msgid "Some good snacks"
-msgstr ""
+msgstr "Some good snacks"
 
 msgid "Pizza dough"
-msgstr ""
+msgstr "Pizza dough"
 
 msgid "Sieved tomatoes"
-msgstr ""
+msgstr "Sieved tomatoes"
 
 msgid "Salami"
-msgstr ""
+msgstr "Salami"
 
 msgid "Toast"
-msgstr ""
+msgstr "Toast"
 
 msgid "Minced meat"
-msgstr ""
+msgstr "Minced meat"
 
 msgid "Pizza"
-msgstr ""
+msgstr "Pizza"
 
 msgid "Spaghetti bolognese"
-msgstr ""
+msgstr "Spaghetti bolognese"
 
 msgid "Sandwiches"
-msgstr ""
+msgstr "Sandwiches"
 
 msgid "English"
-msgstr ""
+msgstr "English"
 
 msgid "German"
-msgstr ""
+msgstr "German"
 
 msgid "Italian"
-msgstr ""
+msgstr "Italian"
 
 msgid "This is the note content of the recipe ingredient"
-msgstr ""
+msgstr "This is the note content of the recipe ingredient"
 
 msgid "Demo User"
-msgstr ""
+msgstr "Demo User"
 
 msgid "Gram"
 msgid_plural "Grams"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Gram"
+msgstr[1] "Grams"
 
 msgid "Flour"
-msgstr ""
+msgstr "Flour"
 
 msgid "Pancakes"
-msgstr ""
+msgstr "Pancakes"
 
 msgid "Sugar"
-msgstr ""
+msgstr "Sugar"
 
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
 msgid "Life"
-msgstr ""
+msgstr "Life"
 
 msgid "Projects"
-msgstr ""
+msgstr "Projects"
 
 msgid "Repair the garage door"
-msgstr ""
+msgstr "Repair the garage door"
 
 msgid "Fork and improve grocy"
-msgstr ""
+msgstr "Fork and improve grocy"
 
 msgid "Find a solution for what to do when I forget the door keys"
-msgstr ""
+msgstr "Find a solution for what to do when I forget the door keys"
 
 msgid "Sweets"
-msgstr ""
+msgstr "Sweets"
 
 msgid "Bakery products"
-msgstr ""
+msgstr "Bakery products"
 
 msgid "Tinned food"
-msgstr ""
+msgstr "Tinned food"
 
 msgid "Butchery products"
-msgstr ""
+msgstr "Butchery products"
 
 msgid "Vegetables/Fruits"
-msgstr ""
+msgstr "Vegetables/Fruits"
 
 msgid "Refrigerated products"
-msgstr ""
+msgstr "Refrigerated products"
 
 msgid "Coffee machine"
-msgstr ""
+msgstr "Coffee machine"
 
 msgid "Dishwasher"
-msgstr ""
+msgstr "Dishwasher"
 
 msgid "Liter"
-msgstr ""
+msgstr "Liter"
 
 msgid "Liters"
-msgstr ""
+msgstr "Liters"
 
 msgid "Bottle"
-msgstr ""
+msgstr "Bottle"
 
 msgid "Bottles"
-msgstr ""
+msgstr "Bottles"
 
 msgid "Milk"
-msgstr ""
+msgstr "Milk"
 
 msgid "Chocolate sauce"
-msgstr ""
+msgstr "Chocolate sauce"
 
 msgid "Milliliters"
-msgstr ""
+msgstr "Milliliters"
 
 msgid "Milliliter"
-msgstr ""
+msgstr "Milliliter"
 
 msgid "Bottom"
-msgstr ""
+msgstr "Bottom"
 
 msgid "Topping"
-msgstr ""
+msgstr "Topping"
 
 msgid "French"
-msgstr ""
+msgstr "French"
 
 msgid "Turkish"
-msgstr ""
+msgstr "Turkish"
 
 msgid "Spanish"
-msgstr ""
+msgstr "Spanish"
 
 msgid "Russian"
-msgstr ""
+msgstr "Russian"
 
 msgid "The thing which happens on the 5th of every month"
-msgstr ""
+msgstr "The thing which happens on the 5th of every month"
 
 msgid "The thing which happens daily"
-msgstr ""
+msgstr "The thing which happens daily"
 
 msgid "The thing which happens on Mondays and Wednesdays"
-msgstr ""
+msgstr "The thing which happens on Mondays and Wednesdays"
 
 msgid "Swedish"
-msgstr ""
+msgstr "Swedish"
 
 msgid "Polish"
-msgstr ""
+msgstr "Polish"
 
 msgid "Milk Chocolate"
-msgstr ""
+msgstr "Milk Chocolate"
 
 msgid "Dark Chocolate"
-msgstr ""
+msgstr "Dark Chocolate"
 
 msgid "Slice"
 msgid_plural "Slices"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Slice"
+msgstr[1] "Slices"
 
 msgid "Example userentity"
-msgstr ""
+msgstr "Example userentity"
 
 msgid "This is an example user entity..."
-msgstr ""
+msgstr "This is an example user entity..."
 
 msgid "Custom field"
-msgstr ""
+msgstr "Custom field"
 
 msgid "Example field value..."
-msgstr ""
+msgstr "Example field value..."
 
 msgid "Waffle rolls"
-msgstr ""
+msgstr "Waffle rolls"
 
 msgid "Danish"
-msgstr ""
+msgstr "Danish"
 
 msgid "Dutch"
-msgstr ""
+msgstr "Dutch"
 
 msgid "Norwegian"
-msgstr ""
+msgstr "Norwegian"
 
 msgid "Demo"
-msgstr ""
+msgstr "Demo"
 
 msgid "Stable version"
-msgstr ""
+msgstr "Stable version"
 
 msgid "Preview version"
-msgstr ""
+msgstr "Preview version"
 
 msgid "current release"
-msgstr ""
+msgstr "current release"
 
 msgid "not yet released"
+msgstr "not yet released"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portuguese (Brazil)"
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
 msgstr ""

localization/en_GB/stock_transaction_types.po

@@ -1,3 +1,5 @@
+# Translators:
+# Jonathan Adams <jonathan@connockadams.uk>, 2020
 # 
 msgid ""
 msgstr ""
@@ -5,6 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Jonathan Adams <jonathan@connockadams.uk>, 2020\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,13 +17,28 @@ msgstr ""
 "X-Domain: grocy/stock_transaction_types\n"
 
 msgid "purchase"
-msgstr ""
+msgstr "purchase"
+
+msgid "transfer_from"
+msgstr "transfer_from"
+
+msgid "transfer_to"
+msgstr "transfer_to"
 
 msgid "consume"
-msgstr ""
+msgstr "consume"
 
 msgid "inventory-correction"
-msgstr ""
+msgstr "inventory-correction"
 
 msgid "product-opened"
+msgstr "product-opened"
+
+msgid "stock-edit-old"
+msgstr "stock-edit-old"
+
+msgid "stock-edit-new"
+msgstr "stock-edit-new"
+
+msgid "self-production"
 msgstr ""

localization/en_GB/userfield_types.po

@@ -1,3 +1,5 @@
+# Translators:
+# Jonathan Adams <jonathan@connockadams.uk>, 2020
 # 
 msgid ""
 msgstr ""
@@ -5,6 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:43+0000\n"
+"Last-Translator: Jonathan Adams <jonathan@connockadams.uk>, 2020\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,31 +17,31 @@ msgstr ""
 "X-Domain: grocy/userfield_types\n"
 
 msgid "text-single-line"
-msgstr ""
+msgstr "text-single-line"
 
 msgid "text-multi-line"
-msgstr ""
+msgstr "text-multi-line"
 
 msgid "number-integral"
-msgstr ""
+msgstr "number-integral"
 
 msgid "number-decimal"
-msgstr ""
+msgstr "number-decimal"
 
 msgid "date"
-msgstr ""
+msgstr "date"
 
 msgid "datetime"
-msgstr ""
+msgstr "datetime"
 
 msgid "checkbox"
-msgstr ""
+msgstr "checkbox"
 
 msgid "preset-list"
-msgstr ""
+msgstr "preset-list"
 
 msgid "preset-checklist"
-msgstr ""
+msgstr "preset-checklist"
 
 msgid "link"
-msgstr ""
+msgstr "link"

localization/es/demo_data.po

@@ -162,9 +162,6 @@ msgstr "Alemán"
 msgid "Italian"
 msgstr "Italiano"
 
-msgid "Demo in different language"
-msgstr "Demo en otro idioma"
-
 msgid "This is the note content of the recipe ingredient"
 msgstr "Este es el contenido de la nota del ingrediente de la receta"
 
@@ -315,3 +312,36 @@ msgstr ""
 
 msgid "Dutch"
 msgstr ""
+
+msgid "Norwegian"
+msgstr ""
+
+msgid "Demo"
+msgstr ""
+
+msgid "Stable version"
+msgstr ""
+
+msgid "Preview version"
+msgstr ""
+
+msgid "current release"
+msgstr ""
+
+msgid "not yet released"
+msgstr ""
+
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
+msgstr ""

localization/fr/chore_period_types.po

@@ -1,6 +1,7 @@
 # Translators:
 # Bernd Bestel <bernd@berrnd.de>, 2019
 # Alex Deneuvillers <alex.deneuvillers@gmail.com>, 2019
+# Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -8,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Alex Deneuvillers <alex.deneuvillers@gmail.com>, 2019\n"
+"Last-Translator: Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019\n"
 "Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,3 +32,6 @@ msgstr "Hebdomadaire"
 
 msgid "monthly"
 msgstr "Mensuelle"
+
+msgid "yearly"
+msgstr "Annuelle"

localization/fr/demo_data.po

@@ -2,6 +2,8 @@
 # Cedric Octave <transifex@octvcdrc.fr>, 2019
 # bigoudo, 2019
 # Matthieu K, 2019
+# Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019
+# Zkryvix <angelo.frangione@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -9,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Matthieu K, 2019\n"
+"Last-Translator: Zkryvix <angelo.frangione@gmail.com>, 2020\n"
 "Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -145,7 +147,7 @@ msgid "Minced meat"
 msgstr "Viande hachée"
 
 msgid "Pizza"
-msgstr "PIzza"
+msgstr "Pizza"
 
 msgid "Spaghetti bolognese"
 msgstr "Spaghetti bolognaise"
@@ -162,9 +164,6 @@ msgstr "Allemand"
 msgid "Italian"
 msgstr "Italien"
 
-msgid "Demo in different language"
-msgstr "Démo dans une langue différente"
-
 msgid "This is the note content of the recipe ingredient"
 msgstr "Ceci est le contenu de la note concernant l'ingrédient de la recette"
 
@@ -224,7 +223,7 @@ msgid "Refrigerated products"
 msgstr "Produits réfrigérés"
 
 msgid "Coffee machine"
-msgstr "Machie à café"
+msgstr "Machine à café"
 
 msgid "Dishwasher"
 msgstr "Lave-vaisselle"
@@ -287,27 +286,66 @@ msgid "Polish"
 msgstr "Polonais"
 
 msgid "Milk Chocolate"
-msgstr ""
+msgstr "Chocolat au lait"
 
 msgid "Dark Chocolate"
-msgstr ""
+msgstr "Chocolat noir"
 
 msgid "Slice"
 msgid_plural "Slices"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tranche"
+msgstr[1] "Tranches"
 
 msgid "Example userentity"
-msgstr ""
+msgstr "Exemple entité utilisateur"
 
 msgid "This is an example user entity..."
-msgstr ""
+msgstr "Ceci est un exemple d'entité utilisateur"
 
 msgid "Custom field"
-msgstr ""
+msgstr "Champ personnalisé"
 
 msgid "Example field value..."
-msgstr ""
+msgstr "Exemple de valeur de champ..."
 
 msgid "Waffle rolls"
+msgstr "Gaufrettes roulées"
+
+msgid "Danish"
+msgstr "Danois"
+
+msgid "Dutch"
+msgstr "Néerlandais"
+
+msgid "Norwegian"
+msgstr "Norvégien"
+
+msgid "Demo"
+msgstr "Démo"
+
+msgid "Stable version"
+msgstr "Version stable"
+
+msgid "Preview version"
+msgstr "Version d'aperçu"
+
+msgid "current release"
+msgstr "Version actuelle"
+
+msgid "not yet released"
+msgstr "pas encore publiée"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portugais (Brésil)"
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr "Congélateur"
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
 msgstr ""

localization/fr/stock_transaction_types.po

@@ -1,5 +1,7 @@
 # Translators:
 # Bernd Bestel <bernd@berrnd.de>, 2019
+# Guillaume RICHARD <giz.richard@gmail.com>, 2020
+# Zkryvix <angelo.frangione@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Zkryvix <angelo.frangione@gmail.com>, 2020\n"
 "Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +21,12 @@ msgstr ""
 msgid "purchase"
 msgstr "Achat"
 
+msgid "transfer_from"
+msgstr "transféré depuis"
+
+msgid "transfer_to"
+msgstr "transféré à"
+
 msgid "consume"
 msgstr "Consommation"
 
@@ -27,3 +35,12 @@ msgstr "Correction d'inventaire"
 
 msgid "product-opened"
 msgstr "Produit ouvert"
+
+msgid "stock-edit-old"
+msgstr "Éditer l'ancien stock"
+
+msgid "stock-edit-new"
+msgstr "Éditer le nouveau stock"
+
+msgid "self-production"
+msgstr "Autoproduction"

localization/fr/strings.po

@@ -5,7 +5,14 @@
 # Cedric Octave <transifex@octvcdrc.fr>, 2019
 # Hydreliox Hydreliox <hydreliox@gmail.com>, 2019
 # Matthieu K, 2019
+# Jérémy Tisserand <jeremy.tisserand@gmail.com>, 2019
 # Mathieu Fortin <mathieugfortin@gmail.com>, 2019
+# Pierre-Emmanuel Colas <transiflex@atnock.fr>, 2019
+# Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019
+# Adrien Guillement <adrien.guillement@gmail.com>, 2019
+# Matthias Baumgartner <dersoistargate@gmail.com>, 2019
+# Guillaume RICHARD <giz.richard@gmail.com>, 2020
+# Zkryvix <angelo.frangione@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -13,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Mathieu Fortin <mathieugfortin@gmail.com>, 2019\n"
+"Last-Translator: Zkryvix <angelo.frangione@gmail.com>, 2020\n"
 "Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,7 +73,7 @@ msgid "Chores overview"
 msgstr "Aperçu des corvées"
 
 msgid "Batteries overview"
-msgstr "Piles"
+msgstr "Aperçu des piles"
 
 msgid "Purchase"
 msgstr "Achat"
@@ -87,7 +94,7 @@ msgid "Battery tracking"
 msgstr "Suivi des piles"
 
 msgid "Locations"
-msgstr "Emplacements"
+msgstr "Il n'y a pas d'unités disponibles à cet endroit."
 
 msgid "Quantity units"
 msgstr "Formats"
@@ -96,7 +103,7 @@ msgid "Chores"
 msgstr "Corvées"
 
 msgid "Batteries"
-msgstr "Batteries"
+msgstr "Piles"
 
 msgid "Chore"
 msgstr "Corvée"
@@ -165,7 +172,7 @@ msgid "Tracked count"
 msgstr "Nombre de réalisations"
 
 msgid "Battery overview"
-msgstr "Aperçu des batteries"
+msgstr "Aperçu des piles"
 
 msgid "Charge cycles count"
 msgstr "Nombre de charges"
@@ -243,10 +250,10 @@ msgid "Used in"
 msgstr "Utilisé dans"
 
 msgid "Create battery"
-msgstr "Créer une batterie"
+msgstr "Créer une pile"
 
 msgid "Edit battery"
-msgstr "Modifier une batterie"
+msgstr "Modifier une pile"
 
 msgid "Edit chore"
 msgstr "Modifier une corvée"
@@ -368,14 +375,14 @@ msgid "This means %s will be removed from stock"
 msgstr "%s sera supprimé du stock"
 
 msgid ""
-"This means it is estimated that a new execution of this chore is tracked %s "
-"days after the last was tracked"
+"This means the next execution of this chore is scheduled %s days after the "
+"last execution"
 msgstr ""
-"La prochaine exécution de cette corvée sera programmée %s jours après sa "
+"La prochaine exécution de cette corvée sera programmée %s jours après la "
 "dernière exécution"
 
 msgid "Removed %1$s of %2$s from stock"
-msgstr "%1$senlevé du stock de%2$s "
+msgstr "%1$s enlevée du stock de%2$s "
 
 msgid "About grocy"
 msgstr "À propos de grocy"
@@ -426,7 +433,7 @@ msgid "You have to select a chore"
 msgstr "Vous devez sélectionner une corvée"
 
 msgid "You have to select a battery"
-msgstr "Vous devez sélectionner une batterie"
+msgstr "Vous devez sélectionner une pile"
 
 msgid "A name is required"
 msgstr "Un nom est requis"
@@ -790,7 +797,7 @@ msgid "View settings"
 msgstr "Voir les paramètres"
 
 msgid "Auto reload on external changes"
-msgstr "Mettre à jour automatiquement lors d'un changement externe"
+msgstr "MàJ automatique lors de changements externe"
 
 msgid "Enable night mode"
 msgstr "Activer le mode nuit"
@@ -926,7 +933,7 @@ msgid "Batteries journal"
 msgstr "Journal des batteries"
 
 msgid "Filter by battery"
-msgstr "Filtrer par batterie"
+msgstr "Filtrer par pile"
 
 msgid "Undo charge cycle"
 msgstr "Annuler le cycle de charge"
@@ -976,12 +983,9 @@ msgid "Mark %1$s of %2$s as open"
 msgstr "Indiquer%1$s de %2$s comme ouvert"
 
 msgid ""
-"When a product was marked as opened, the best before date will be replaced "
-"by today + this amount of days (a value of 0 disables this)"
+"When this product was marked as opened, the best before date will be "
+"replaced by today + this amount of days (a value of 0 disables this)"
 msgstr ""
-"Quand un produit est marqué comme ouvert, la date de péremption sera "
-"remplacée par la date du jour + ce nombre de jours (une valeur de 0 "
-"désactive ce changement)"
 
 msgid "Default best before days after opened"
 msgstr "Date de péremption en jours par défaut après ouverture"
@@ -992,9 +996,6 @@ msgstr "Indiqué%1$s de %2$s comme ouvert"
 msgid "Mark as opened"
 msgstr "Indiquer comme ouvert"
 
-msgid "Expires on %1$s; Bought on %2$s"
-msgstr "Se périmera le%1$s; Acheté le %2$s"
-
 msgid "Not opened"
 msgstr "Non ouvert"
 
@@ -1139,10 +1140,10 @@ msgid "Journal for this chore"
 msgstr "Journal de la corvée"
 
 msgid "Show battery details"
-msgstr "Voir les détails"
+msgstr "Voir les détails de la pile"
 
 msgid "Journal for this battery"
-msgstr "Journal individuel"
+msgstr "Journal de cette pile"
 
 msgid "System info"
 msgstr "Informations système"
@@ -1238,7 +1239,7 @@ msgid "Sunday"
 msgstr "Dimanche"
 
 msgid "Configure userfields"
-msgstr "Configurer les attributs personalisés"
+msgstr "Configurer les attributs personnalisés"
 
 msgid "Userfields"
 msgstr "Attributs personalisés"
@@ -1308,6 +1309,9 @@ msgstr "Pas assez en stock"
 msgid "Expiring soon days"
 msgstr "Jours avant péremption"
 
+msgid "Default location"
+msgstr "Emplacement par défaut"
+
 msgid "Default amount for purchase"
 msgstr "Quantité ajoutée par défaut lors d'un achat"
 
@@ -1367,25 +1371,532 @@ msgid "Products"
 msgstr "Produits"
 
 msgid "Marked task %s as completed on %s"
-msgstr ""
+msgstr "%s tâche marquée complétée sur %s"
 
 msgid "Booking has subsequent dependent bookings, undo not possible"
 msgstr "La réservation a des dépendances, impossible de revenir en arrière"
 
 msgid "per serving"
-msgstr ""
+msgstr "par portion"
 
 msgid "Never"
-msgstr ""
+msgstr "Jamais"
 
 msgid "Today"
-msgstr ""
+msgstr "Aujourd'hui"
 
 msgid "Consume %1$s of %2$s as spoiled"
-msgstr ""
+msgstr "Consommer %1$s de %2$s comme périmée"
 
 msgid "Not all ingredients of recipe \"%s\" are in stock, nothing removed"
 msgstr ""
+"Des ingrédients de la recette \"%s\" sont manquants,\n"
+"rien n'est retiré"
 
 msgid "Undo task \"%s\""
+msgstr "Annuler tâche \"%s\""
+
+msgid "Due date rollover"
+msgstr "Report de la date d'échéance"
+
+msgid ""
+"When enabled the chore can never be overdue, the due date will shift forward"
+" each day when due"
+msgstr ""
+"Si activé la corvée ne sera jamais due, la date d'échéance sera avancée "
+"quand atteinte."
+
+msgid "Location Content Sheet"
+msgstr "Emplacement du stock"
+
+msgid "Print"
+msgstr "Imprimer"
+
+msgid "all locations"
+msgstr "Tous les emplacements"
+
+msgid ""
+"Here you can print a page per location with the current stock, maybe to hang"
+" it there and note the consumed things on it."
+msgstr ""
+"Ici vous pouvez imprimer une fiche du stock actuel classé par emplacement, "
+"vous pouvez par exemple l'accrocher et noter les produits qui ont été "
+"consommés dessus."
+
+msgid "this location"
+msgstr "Cet emplacement"
+
+msgid "Consumend amount"
+msgstr "Quantité consommé"
+
+msgid "Time of printing"
+msgstr "Temps d'impression"
+
+msgid "Are you sure to delete equipment \"%s\"?"
+msgstr "Êtes-vous certain de vouloir effacer l'équipement \"%s\"?"
+
+msgid "Parent product"
+msgstr "Produit parent"
+
+msgid ""
+"Not possible because this product is already used as a parent product in "
+"another product"
+msgstr ""
+"Impossible, ce produit est déjà assigné comme parent sur un autre produit"
+
+msgid "Default conversions"
+msgstr "Conversions par défaut"
+
+msgid "Factor"
+msgstr "Facteur"
+
+msgid "1 %s is the same as..."
+msgstr "1 %s corresponds aussi à..."
+
+msgid "Create QU conversion"
+msgstr "Créer une conversion d'UQ"
+
+msgid "Default for QU"
+msgstr "Défaut pour l'unité de quantité"
+
+msgid "Quantity unit from"
+msgstr "De l'unité de quantité"
+
+msgid "Quantity unit to"
+msgstr "À l'unité de quantité"
+
+msgid ""
+"This cannot be lower than %1$s and must be a valid number with max. %2$s "
+"decimal places"
+msgstr ""
+"Cela ne peut être inférieur à  %1$s et doit être un nombre valide avec "
+"maximum. %2$s décimales."
+
+msgid "This cannot be equal to %s"
+msgstr "Ne peut être égale à %s"
+
+msgid "This means 1 %1$s is the same as %2$s %3$s"
+msgstr "Signifie que  1 %1$s corresponds aussi à %2$s %3$s"
+
+msgid "QU conversions"
+msgstr "Conversions d'UQ"
+
+msgid "Product overrides"
+msgstr "Règles du produit"
+
+msgid "Override for product"
+msgstr "Règle pour le produit"
+
+msgid "This equals %1$s %2$s in stock"
+msgstr "Égal à %1$s%2$s en stock"
+
+msgid "Edit QU conversion"
+msgstr "Éditer la conversion d'UQ"
+
+msgid "An assignment type is required"
+msgstr "Un type de tâche est requis"
+
+msgid "Assignment type"
+msgstr "Type de tâche"
+
+msgid ""
+"This means the next execution of this chore is scheduled 1 day after the "
+"last execution"
+msgstr ""
+"La prochaine exécution de cette corvée sera programmé 1 jour après la "
+"dernière exécution"
+
+msgid ""
+"This means the next execution of this chore is scheduled 1 day after the "
+"last execution, but only for the weekdays selected below"
+msgstr ""
+"Signifie que la prochaine exécution de cette corvée est programmé 1 jour "
+"après la dernière exécution, mais uniquement pour les jours sélectionnés ci-"
+"dessous"
+
+msgid "This means the next execution of this chore is not scheduled"
+msgstr "Cette corvée n'a pas d'exécution de programmée. "
+
+msgid ""
+"This means the next execution of this chore is scheduled on the below "
+"selected day of each month"
+msgstr ""
+"Signifie que la prochaine exécution de cette corvée sera programmé à la date"
+" sélectionnée ci-dessous chaque mois"
+
+msgid ""
+"This means the next execution of this chore will not be assigned to anyone"
+msgstr ""
+"Signifie que la prochaine exécution de cette corvée ne sera assigné à "
+"personne"
+
+msgid ""
+"This means the next execution of this chore will be assigned to the one who "
+"executed it least"
+msgstr ""
+"Signifie que la prochaine exécution de cette corvée sera assignée à celui "
+"qui l'a effectué en dernier"
+
+msgid "This means the next execution of this chore will be assigned randomly"
+msgstr ""
+"Signifie que la prochaine exécution de cette corvée sera assignée "
+"aléatoirement"
+
+msgid ""
+"This means the next execution of this chore will be assigned to the next one"
+" in alphabetical order"
+msgstr ""
+"Signifie que la prochaine exécution de cette corvée sera assigné au prochain"
+" par ordre alphabétique"
+
+msgid "Assign to"
+msgstr "Assigné à"
+
+msgid "This assignment type requires that at least one is assigned"
+msgstr "Ce type de tâche nécessite au moins une personne assignée"
+
+msgid "%s chore is assigned to me"
+msgid_plural "%s chores are assigned to me"
+msgstr[0] "%s corvée m'est assignée"
+msgstr[1] "%s corvées me sont assignées"
+
+msgid "Assigned to me"
+msgstr "Assigné à moi"
+
+msgid "assigned to %s"
+msgstr "assigné à %s"
+
+msgid "Filter by assignment"
+msgstr "Filtrer par tâche"
+
+msgid "Consume product on chore execution"
+msgstr "Consommer un produit lors de l'exécution de la corvée"
+
+msgid "Are you sure to delete user field \"%s\"?"
+msgstr "Êtes-vous sûr de vouloir supprimer le champ utilisateur \"%s\" ?"
+
+msgid "Userentities"
+msgstr "Entités utilisateur"
+
+msgid "Create userentity"
+msgstr "Créer une entité utilisateur"
+
+msgid "Show in sidebar menu"
+msgstr "Afficher dans le menu latérale"
+
+msgid "Edit userentity"
+msgstr "Éditer l'entité utilisateur"
+
+msgid "Edit %s"
+msgstr "Éditer %s"
+
+msgid "Create %s"
+msgstr "Créer %s"
+
+msgid "Are you sure to delete this userobject?"
+msgstr "Êtes-vous sûr de vouloir supprimer cet objet utilisateur ?"
+
+msgid "Icon CSS class"
+msgstr "Classe CSS de l'icône"
+
+msgid "For example"
+msgstr "Par exemple"
+
+msgid "Configure fields"
+msgstr "Configurer les champs"
+
+msgid "Quantity unit plural form testing"
+msgstr "Test de la forme pluriel de l'unité de quantité"
+
+msgid "Result"
+msgstr "Résultat"
+
+msgid "Test plural forms"
+msgstr "Tester les formes pluriel"
+
+msgid "Scan a barcode"
+msgstr "Scanner un code barre"
+
+msgid "Error while initializing the barcode scanning library"
+msgstr "Erreur lors de l'initialisation de la librairie de scan de code barre"
+
+msgid ""
+"The resulting price of this ingredient will be multiplied by this factor"
+msgstr "Le prix final de cet ingrédient sera multiplié par ce facteur"
+
+msgid "Price factor"
+msgstr "Facteur de prix"
+
+msgid "Do you find grocy useful?"
+msgstr "Vous trouvez grocy utile ?"
+
+msgid "Say thanks"
+msgstr "Remercier"
+
+msgid "Search for recipes containing this product"
+msgstr "Chercher des recettes contenant ce produit"
+
+msgid "Add to shopping list"
+msgstr "Ajouter à la liste de courses"
+
+msgid "Added %1$s of %2$s to the shopping list \"%3$s\""
+msgstr "%1$s de %2$s ajouté à la liste de course \"%3$s\""
+
+msgid "Output"
+msgstr "Sortie"
+
+msgid "Energy (kcal)"
+msgstr "Énergie (kcal)"
+
+msgid "Per stock quantity unit"
+msgstr "Unité de quantité par stock"
+
+msgid "Barcode scanner testing"
+msgstr "Test du scanner de code barre"
+
+msgid "Expected barcode"
+msgstr "Code barre attendu"
+
+msgid "Scan field"
+msgstr "Champ du scan"
+
+msgid "Scanned barcodes"
+msgstr "Codes barre scanné"
+
+msgid "Hit"
+msgstr "Touché"
+
+msgid "Miss"
+msgstr "Raté"
+
+msgid "Display recipe"
+msgstr "Afficher la recette"
+
+msgid "Accumulate sub products min. stock amount"
+msgstr "Accumuler le stock minimal des sous produits"
+
+msgid ""
+"If enabled, the min. stock amount of sub products will be accumulated into "
+"this product, means the sub product will never be \"missing\", only this "
+"product"
+msgstr ""
+"Si activé, la somme du stock minimal des sous produits sera accumulé sur ce "
+"produit, signifiant que le sous produit ne sera jamais \"en manque\", "
+"seulement ce produit"
+
+msgid "Are you sure to remove this conversion?"
+msgstr "Êtes-vous sûr de vouloir supprimer cette conversion ?"
+
+msgid "Unit price"
+msgstr "Prix unitaire"
+
+msgid "Total price"
+msgstr "Prix total"
+
+msgid "in %s and based on the purchase quantity unit"
+msgstr "dans %s et basé sur la quantité unitaire d'achat"
+
+msgid "Unlimited"
+msgstr "Illimité"
+
+msgid "Clear"
+msgstr "Vider"
+
+msgid "Are you sure to remove the included recipe \"%s\"?"
+msgstr "Êtes-vous sûr de vouloir supprimer la recette incluse \"%s\"?"
+
+msgid "Period interval"
+msgstr "Intervalle de temps"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s days"
+msgstr ""
+"La prochaine exécution de cette corvée ne doit être uniquement programmée "
+"que tous les %s jours"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s weeks"
+msgstr ""
+"La prochaine exécution de cette corvée ne doit être uniquement programmée "
+"que toutes les %s semaines"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s months"
+msgstr ""
+"La prochaine exécution de cette corvée ne doit être uniquement programmée "
+"que tous les %s mois"
+
+msgid ""
+"This means the next execution of this chore is scheduled 1 year after the "
+"last execution"
+msgstr ""
+"La prochaine exécution de cette corvée sera programmé 1 an après la dernière"
+" exécution"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s years"
+msgstr ""
+"Signifie que la prochaine exécution de cette corvée ne doit uniquement être "
+"programmé que tous les %s ans"
+
+msgid "Transfer"
+msgstr "Transfert"
+
+msgid "From location"
+msgstr "De"
+
+msgid "To location"
+msgstr "A"
+
+msgid "There are no units available at this location"
+msgstr "Il n'y a pas d'unité disponible à cet endroit."
+
+msgid "Amount: %1$s; Expires on %2$s; Bought on %3$s"
+msgstr "Quantité : %1$s; Expire le %2$s; Acheté le %3$s"
+
+msgid "Transfered %1$s of %2$s from %3$s to %4$s"
+msgstr "A transferé%1$sde %2$svenant de %3$s à %4$s"
+
+msgid "Show stock entries"
+msgstr ""
+
+msgid "Stock entries"
+msgstr ""
+
+msgid "Best before date"
+msgstr "A consommer de préférence avant le"
+
+msgid "Purchased date"
+msgstr "Date d'achat"
+
+msgid "Consume all %s for this stock entry"
+msgstr ""
+
+msgid "The amount cannot be lower than %1$s"
+msgstr "La quantité ne peut être inférieure à %s"
+
+msgid "Stock entry successfully updated"
+msgstr ""
+
+msgid "Edit stock entry"
+msgstr ""
+
+msgid ""
+"Camera access is on only possible when supported and allowed by your browser"
+" and when grocy is served via a secure (https://) connection"
+msgstr ""
+
+msgid "Keep screen on"
+msgstr "Garder l'écran allumé"
+
+msgid "Keep screen on while displaying a \"fullscreen-card\""
+msgstr ""
+
+msgid "A purchased date is required"
+msgstr ""
+
+msgid ""
+"When a product is selected, one unit (per serving in purchase quantity unit)"
+" will be added to stock on consuming this recipe"
+msgstr ""
+
+msgid "Produces product"
+msgstr ""
+
+msgid "This booking cannot be undone"
+msgstr ""
+
+msgid "Booking does not exist or was already undone"
+msgstr ""
+
+msgid "Are you sure to delete API key \"%s\"?"
+msgstr ""
+
+msgid "Add note"
+msgstr ""
+
+msgid "Add note to %s"
+msgstr ""
+
+msgid "per day"
+msgstr ""
+
+msgid "Compact view"
+msgstr ""
+
+msgid "Normal view"
+msgstr ""
+
+msgid "Only undone items"
+msgstr ""
+
+msgid "Add product"
+msgstr ""
+
+msgid "Add product to %s"
+msgstr ""
+
+msgid "Consume all ingredients needed by this weeks recipes or products"
+msgstr ""
+
+msgid "Meal plan recipe"
+msgstr "Recette des prévisions de repas"
+
+msgid "Meal plan note"
+msgstr ""
+
+msgid "Meal plan product"
+msgstr "Produit des prévisions de repas"
+
+msgid "Scan mode"
+msgstr ""
+
+msgid "on"
+msgstr "Allumé"
+
+msgid "off"
+msgstr "Éteint"
+
+msgid ""
+"Scan mode is on but not all required fields could be populated automatically"
+msgstr ""
+
+msgid "Is freezer"
+msgstr ""
+
+msgid ""
+"When moving products from/to a freezer location, the products best before "
+"date is automatically adjusted according to the product settings"
+msgstr ""
+
+msgid ""
+"On moving this product to a freezer location (so when freezing it), the best"
+" before date will be replaced by today + this amount of days"
+msgstr ""
+
+msgid "Default best before days after freezing"
+msgstr ""
+
+msgid ""
+"On moving this product from a freezer location (so when thawing it), the "
+"best before date will be replaced by today + this amount of days"
+msgstr ""
+
+msgid "Default best before days after thawing"
+msgstr ""
+
+msgid "This cannot be the same as the \"From\" location"
+msgstr ""
+
+msgid "Thawed"
+msgstr ""
+
+msgid "Frozen"
+msgstr "Congelé"
+
+msgid "Are you sure to delete userentity \"%s\"?"
 msgstr ""

localization/fr/userfield_types.po

@@ -1,5 +1,6 @@
 # Translators:
 # Hydreliox Hydreliox <hydreliox@gmail.com>, 2019
+# Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -7,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:43+0000\n"
-"Last-Translator: Hydreliox Hydreliox <hydreliox@gmail.com>, 2019\n"
+"Last-Translator: Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019\n"
 "Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,3 +40,9 @@ msgstr "case à cocher"
 
 msgid "preset-list"
 msgstr "liste prédéfinie"
+
+msgid "preset-checklist"
+msgstr "liste multiple prédéfinie"
+
+msgid "link"
+msgstr "lien"

localization/hu/chore_assignment_types.po

@@ -0,0 +1,30 @@
+# Translators:
+# Márk Kökény <oregapamgroup@gmail.com>, 2019
+# Ádám Kovács <kovacsadam07@outlook.hu>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-09-17 10:45+0000\n"
+"Last-Translator: Ádám Kovács <kovacsadam07@outlook.hu>, 2019\n"
+"Language-Team: Hungarian (https://www.transifex.com/grocy/teams/93189/hu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/chore_assignment_types\n"
+
+msgid "no-assignment"
+msgstr "nincs-hozzárendelés"
+
+msgid "who-least-did-first"
+msgstr "ki-legkevésbé-csinálta-először"
+
+msgid "random"
+msgstr "véletlen"
+
+msgid "in-alphabetical-order"
+msgstr "ABC sorrendben"

localization/hu/chore_period_types.po

@@ -0,0 +1,35 @@
+# Translators:
+# Ádám Kovács <kovacsadam07@outlook.hu>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Ádám Kovács <kovacsadam07@outlook.hu>, 2019\n"
+"Language-Team: Hungarian (https://www.transifex.com/grocy/teams/93189/hu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/chore_types\n"
+
+msgid "manually"
+msgstr "manuálisan"
+
+msgid "dynamic-regular"
+msgstr "változó gyakorisággal"
+
+msgid "daily"
+msgstr "naponta"
+
+msgid "weekly"
+msgstr "hetente"
+
+msgid "monthly"
+msgstr "havonta"
+
+msgid "yearly"
+msgstr "évente"

localization/hu/component_translations.po

@@ -0,0 +1,52 @@
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2020\n"
+"Language-Team: Hungarian (https://www.transifex.com/grocy/teams/93189/hu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/component_translations\n"
+
+msgid "timeago_locale"
+msgstr "hu"
+
+msgid "timeago_nan"
+msgstr "NaN éve"
+
+msgid "moment_locale"
+msgstr "hu"
+
+msgid "datatables_localization"
+msgstr ""
+"{\"sEmptyTable\":\"Nincs rendelkezésre álló adat\",\"sInfo\":\"Találatok: "
+"_START_ - _END_ Összesen: _TOTAL_\",\"sInfoEmpty\":\"Nulla "
+"találat\",\"sInfoFiltered\":\"(_MAX_ összes rekord közül "
+"szűrve)\",\"sInfoPostFix\":\"\",\"sInfoThousands\":\" "
+"\",\"sLengthMenu\":\"_MENU_ találat "
+"oldalanként\",\"sLoadingRecords\":\"Betöltés...\",\"sProcessing\":\"Feldolgozás...\",\"sSearch\":\"Keresés:\",\"sZeroRecords\":\"Nincs"
+" a keresésnek megfelelő "
+"találat\",\"oPaginate\":{\"sFirst\":\"Első\",\"sPrevious\":\"Előző\",\"sNext\":\"Következő\",\"sLast\":\"Utolsó\"},\"oAria\":{\"sSortAscending\":\":"
+" aktiválja a növekvő rendezéshez\",\"sSortDescending\":\": aktiválja a "
+"csökkenő rendezéshez\"},\"select\":{\"rows\":{\"0\":\"\",\"1\":\"1 sor "
+"kiválasztva\",\"_\":\"%d sor "
+"kiválasztva\"}},\"buttons\":{\"print\":\"Nyomtatás\",\"colvis\":\"Oszlopok\",\"copy\":\"Másolás\",\"copyTitle\":\"Vágólapra"
+" másolás\",\"copySuccess\":{\"1\":\"1 sor másolva\",\"_\":\"%d sor "
+"másolva\"}}}"
+
+msgid "summernote_locale"
+msgstr "hu-HU"
+
+msgid "fullcalendar_locale"
+msgstr "hu"
+
+msgid "bootstrap-select_locale"
+msgstr "hu_HU"

localization/hu/demo_data.po

@@ -0,0 +1,348 @@
+# Translators:
+# Richard Szolár <szolar.richard@gmail.com>, 2019
+# Márk Kökény <oregapamgroup@gmail.com>, 2019
+# Bernd Bestel <bernd@berrnd.de>, 2020
+# Gábor Szellő <gabor.szello@gmail.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Gábor Szellő <gabor.szello@gmail.com>, 2020\n"
+"Language-Team: Hungarian (https://www.transifex.com/grocy/teams/93189/hu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/demo_data\n"
+
+msgid "Cookies"
+msgstr "Keksz"
+
+msgid "Chocolate"
+msgstr "Csokoládé"
+
+msgid "Pantry"
+msgstr "Éléskamra"
+
+msgid "Candy cupboard"
+msgstr "Édességszekrény"
+
+msgid "Tinned food cupboard"
+msgstr "Konzverves szekrény"
+
+msgid "Fridge"
+msgstr "Hűtő"
+
+msgid "Piece"
+msgid_plural "Pieces"
+msgstr[0] "Darab"
+msgstr[1] "Darab"
+
+msgid "Pack"
+msgid_plural "Packs"
+msgstr[0] "Csomag"
+msgstr[1] "Csomag"
+
+msgid "Glass"
+msgid_plural "Glasses"
+msgstr[0] "Üveg"
+msgstr[1] "Üveg"
+
+msgid "Tin"
+msgid_plural "Tins"
+msgstr[0] "Konzerv"
+msgstr[1] "Konzerv"
+
+msgid "Can"
+msgid_plural "Cans"
+msgstr[0] "Képes"
+msgstr[1] "Kancsó"
+
+msgid "Bunch"
+msgid_plural "Bunches"
+msgstr[0] "Csokor"
+msgstr[1] "Csokor"
+
+msgid "Gummy bears"
+msgstr "Gumimaci"
+
+msgid "Crisps"
+msgstr "Ropogtatnivaló"
+
+msgid "Eggs"
+msgstr "Tojás"
+
+msgid "Noodles"
+msgstr "Tészta"
+
+msgid "Pickles"
+msgstr "Savanyúság"
+
+msgid "Gulash soup"
+msgstr "Gulyásleves"
+
+msgid "Yogurt"
+msgstr "Joghurt"
+
+msgid "Cheese"
+msgstr "Sajt"
+
+msgid "Cold cuts"
+msgstr "Felvágott"
+
+msgid "Paprika"
+msgstr "Paprika"
+
+msgid "Cucumber"
+msgstr "Uborka"
+
+msgid "Radish"
+msgstr "Retek"
+
+msgid "Tomato"
+msgstr "Paradicsom"
+
+msgid "Changed towels in the bathroom"
+msgstr "Törölközők cseréje a fürdőszobában"
+
+msgid "Cleaned the kitchen floor"
+msgstr "Konyhapadló felmosása"
+
+msgid "Warranty ends"
+msgstr "Garancia lejár"
+
+msgid "TV remote control"
+msgstr "TV távirányító"
+
+msgid "Alarm clock"
+msgstr "Ébresztőóra"
+
+msgid "Heat remote control"
+msgstr "Termosztát"
+
+msgid "Lawn mowed in the garden"
+msgstr "Fűnyírás a kertben"
+
+msgid "Some good snacks"
+msgstr "Néhány jó kis nasi"
+
+msgid "Pizza dough"
+msgstr "Pizzatekercs"
+
+msgid "Sieved tomatoes"
+msgstr "Paradicsompüré"
+
+msgid "Salami"
+msgstr "Szalámi"
+
+msgid "Toast"
+msgstr "Toast kenyér"
+
+msgid "Minced meat"
+msgstr "Darált hús"
+
+msgid "Pizza"
+msgstr "Pizza"
+
+msgid "Spaghetti bolognese"
+msgstr "Bolognai spagetti"
+
+msgid "Sandwiches"
+msgstr "Szendvics"
+
+msgid "English"
+msgstr "Angol"
+
+msgid "German"
+msgstr "Német"
+
+msgid "Italian"
+msgstr "Olasz"
+
+msgid "This is the note content of the recipe ingredient"
+msgstr "Ez a recept hozzávalójának megjegyzés tartalma"
+
+msgid "Demo User"
+msgstr "Demo felhasználó"
+
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] "Gramm"
+msgstr[1] "Gramm"
+
+msgid "Flour"
+msgstr "Liszt"
+
+msgid "Pancakes"
+msgstr "Palacsinta"
+
+msgid "Sugar"
+msgstr "Cukor"
+
+msgid "Home"
+msgstr "Otthon"
+
+msgid "Life"
+msgstr "Élet"
+
+msgid "Projects"
+msgstr "Projektek"
+
+msgid "Repair the garage door"
+msgstr "Garázsajtó megjavítása"
+
+msgid "Fork and improve grocy"
+msgstr "Forkold és fejleszd te is Grocyt"
+
+msgid "Find a solution for what to do when I forget the door keys"
+msgstr "Megoldást találni, mit tennék akkor, ha elhagyom a lakáskulcsot"
+
+msgid "Sweets"
+msgstr "Édességek"
+
+msgid "Bakery products"
+msgstr "Péktermékek"
+
+msgid "Tinned food"
+msgstr "Konzerves étel"
+
+msgid "Butchery products"
+msgstr "Hentes termékek"
+
+msgid "Vegetables/Fruits"
+msgstr "Zöldségek/Gyümölcsök"
+
+msgid "Refrigerated products"
+msgstr "Hűtött termékek"
+
+msgid "Coffee machine"
+msgstr "Kávéfőző"
+
+msgid "Dishwasher"
+msgstr "Mosogató"
+
+msgid "Liter"
+msgstr "Liter"
+
+msgid "Liters"
+msgstr "Liter"
+
+msgid "Bottle"
+msgstr "Üveg"
+
+msgid "Bottles"
+msgstr "Üveg"
+
+msgid "Milk"
+msgstr "Tej"
+
+msgid "Chocolate sauce"
+msgstr "Csokiszósz"
+
+msgid "Milliliters"
+msgstr "Milliliter"
+
+msgid "Milliliter"
+msgstr "Milliliter"
+
+msgid "Bottom"
+msgstr "Alsó"
+
+msgid "Topping"
+msgstr "Feltét"
+
+msgid "French"
+msgstr "Francia"
+
+msgid "Turkish"
+msgstr "Török"
+
+msgid "Spanish"
+msgstr "Spanyol"
+
+msgid "Russian"
+msgstr "Orosz"
+
+msgid "The thing which happens on the 5th of every month"
+msgstr "A dolog, amely minden hónap 5. napján megtörténik"
+
+msgid "The thing which happens daily"
+msgstr "A dolog, amely minden nap megtörténik"
+
+msgid "The thing which happens on Mondays and Wednesdays"
+msgstr "A dolog, amely minden hétfőn és szerdán megtörténik"
+
+msgid "Swedish"
+msgstr "Svéd"
+
+msgid "Polish"
+msgstr "Lengyel"
+
+msgid "Milk Chocolate"
+msgstr "Tejcsokoládé"
+
+msgid "Dark Chocolate"
+msgstr "Étcsokoládé"
+
+msgid "Slice"
+msgid_plural "Slices"
+msgstr[0] "Szelet"
+msgstr[1] "Szelet"
+
+msgid "Example userentity"
+msgstr "Példa felhasználóentitás"
+
+msgid "This is an example user entity..."
+msgstr "Ez egy példa felhasználóentitás"
+
+msgid "Custom field"
+msgstr "Egyéni mező"
+
+msgid "Example field value..."
+msgstr "Példa egyéni mező érték..."
+
+msgid "Waffle rolls"
+msgstr "Gofri tekercs"
+
+msgid "Danish"
+msgstr "Dán"
+
+msgid "Dutch"
+msgstr "Holland"
+
+msgid "Norwegian"
+msgstr "Norvég"
+
+msgid "Demo"
+msgstr "Demo"
+
+msgid "Stable version"
+msgstr "Stabil verzió"
+
+msgid "Preview version"
+msgstr "Előzetes verzió"
+
+msgid "current release"
+msgstr "jelenlegi kiadás"
+
+msgid "not yet released"
+msgstr "még nem megjelent"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portugál (Brazil)"
+
+msgid "This is a note"
+msgstr "Ez egy jegyzet"
+
+msgid "Freezer"
+msgstr "Fagyasztószekrény"
+
+msgid "Hungarian"
+msgstr "Magyar"
+
+msgid "Slovak"
+msgstr "Szlovák"

localization/hu/stock_transaction_types.po

@@ -0,0 +1,45 @@
+# Translators:
+# Márk Kökény <oregapamgroup@gmail.com>, 2019
+# Gabor Pilsits <gabor.pilsits@gmail.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Gabor Pilsits <gabor.pilsits@gmail.com>, 2020\n"
+"Language-Team: Hungarian (https://www.transifex.com/grocy/teams/93189/hu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/stock_transaction_types\n"
+
+msgid "purchase"
+msgstr "vásárlás"
+
+msgid "transfer_from"
+msgstr "mozgatás innen"
+
+msgid "transfer_to"
+msgstr "mozgatás ide"
+
+msgid "consume"
+msgstr "elfogyasztás"
+
+msgid "inventory-correction"
+msgstr "készlet-korrekció"
+
+msgid "product-opened"
+msgstr "felbontott-termék"
+
+msgid "stock-edit-old"
+msgstr "régi készlet szerkesztése"
+
+msgid "stock-edit-new"
+msgstr "új készlet szerkesztése"
+
+msgid "self-production"
+msgstr "sajátkészítés"

localization/hu/userfield_types.po

@@ -0,0 +1,49 @@
+# Translators:
+# Márk Kökény <oregapamgroup@gmail.com>, 2019
+# Ádám Kovács <kovacsadam07@outlook.hu>, 2019
+# Gábor Szellő <gabor.szello@gmail.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:43+0000\n"
+"Last-Translator: Gábor Szellő <gabor.szello@gmail.com>, 2020\n"
+"Language-Team: Hungarian (https://www.transifex.com/grocy/teams/93189/hu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/userfield_types\n"
+
+msgid "text-single-line"
+msgstr "egysoros szöveg"
+
+msgid "text-multi-line"
+msgstr "többsoros szöveg"
+
+msgid "number-integral"
+msgstr "egész szám"
+
+msgid "number-decimal"
+msgstr "decimális szám"
+
+msgid "date"
+msgstr "dátum"
+
+msgid "datetime"
+msgstr "dátumidőpont"
+
+msgid "checkbox"
+msgstr "jelölőnégyzet"
+
+msgid "preset-list"
+msgstr "előre beállított lista"
+
+msgid "preset-checklist"
+msgstr "előre beállított jelölőlista"
+
+msgid "link"
+msgstr "link"

localization/it/chore_period_types.po

@@ -1,6 +1,5 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
-# Matteo Piotto <matteo.piotto@welaika.com>, 2019
+# Antonino Ursino <ninus_@libero.it>, 2019
 # 
 msgid ""
 msgstr ""
@@ -8,7 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Matteo Piotto <matteo.piotto@welaika.com>, 2019\n"
+"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2019\n"
 "Language-Team: Italian (https://www.transifex.com/grocy/teams/93189/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,16 +17,19 @@ msgstr ""
 "X-Domain: grocy/chore_types\n"
 
 msgid "manually"
-msgstr "Manualmente"
+msgstr "manualmente"
 
 msgid "dynamic-regular"
-msgstr "Regolatore dinamico"
+msgstr "dinamica regolare"
 
 msgid "daily"
-msgstr "Giornalmente"
+msgstr "giornalmente"
 
 msgid "weekly"
-msgstr "Settimanalmente"
+msgstr "settimanalmente"
 
 msgid "monthly"
-msgstr "Mensilmente"
+msgstr "mensilmente"
+
+msgid "yearly"
+msgstr "annualmente"

localization/it/demo_data.po

@@ -1,7 +1,7 @@
 # Translators:
 # Sergio Zampello <seriotv88@gmail.com>, 2019
 # Bernd Bestel <bernd@berrnd.de>, 2019
-# Antonino Ursino <ninus_@libero.it>, 2019
+# Antonino Ursino <ninus_@libero.it>, 2020
 # 
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2019\n"
+"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2020\n"
 "Language-Team: Italian (https://www.transifex.com/grocy/teams/93189/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -331,3 +331,18 @@ msgstr "versione attuale"
 
 msgid "not yet released"
 msgstr "non ancora pubblicata"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portoghese (Brasile)"
+
+msgid "This is a note"
+msgstr "Questa è una nota"
+
+msgid "Freezer"
+msgstr "Congelatore"
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
+msgstr ""

localization/it/stock_transaction_types.po

@@ -1,5 +1,5 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
+# Antonino Ursino <ninus_@libero.it>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2020\n"
 "Language-Team: Italian (https://www.transifex.com/grocy/teams/93189/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,13 +17,28 @@ msgstr ""
 "X-Domain: grocy/stock_transaction_types\n"
 
 msgid "purchase"
-msgstr "Acquista"
+msgstr "comprare"
+
+msgid "transfer_from"
+msgstr "trasferito_da"
+
+msgid "transfer_to"
+msgstr "trasferito_a"
 
 msgid "consume"
-msgstr "Consumare"
+msgstr "consumare"
 
 msgid "inventory-correction"
-msgstr "Correzione dell'inventario"
+msgstr "rettifica-inventario"
 
 msgid "product-opened"
-msgstr "Prodotto aperto"
+msgstr "prodotto-aperto"
+
+msgid "stock-edit-old"
+msgstr "modifica-dispensa-vecchio"
+
+msgid "stock-edit-new"
+msgstr "modifica-dispensa-nuovo"
+
+msgid "self-production"
+msgstr "auto-produzione"

localization/it/strings.po

@@ -3,7 +3,7 @@
 # Bernd Bestel <bernd@berrnd.de>, 2019
 # Matteo Piotto <matteo.piotto@welaika.com>, 2019
 # Matteo Parolin <matteoparolin99@gmail.com>, 2019
-# Antonino Ursino <ninus_@libero.it>, 2019
+# Antonino Ursino <ninus_@libero.it>, 2020
 # 
 msgid ""
 msgstr ""
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2019\n"
+"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2020\n"
 "Language-Team: Italian (https://www.transifex.com/grocy/teams/93189/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
 "X-Domain: grocy/strings\n"
 
 msgid "Stock overview"
-msgstr "Panoramica della dispensa"
+msgstr "Riepilogo della dispensa"
 
 msgid "%s product expires"
 msgid_plural "%s products expiring"
@@ -41,7 +41,8 @@ msgstr[1] "%s prodotti sono già scaduti"
 msgid "%s product is below defined min. stock amount"
 msgid_plural "%s products are below defined min. stock amount"
 msgstr[0] "%s prodotto sotto la quantità minima di dispensa definita"
-msgstr[1] "%s prodotti sono sotto la quantità minima di dispensa definita"
+msgstr[1] ""
+"%s prodotti sono al di sotto della quantità minima di dispensa definita"
 
 msgid "Product"
 msgstr "Prodotto"
@@ -978,12 +979,12 @@ msgid "Mark %1$s of %2$s as open"
 msgstr "Segna %1$s di %2$s come aperti"
 
 msgid ""
-"When a product was marked as opened, the best before date will be replaced "
-"by today + this amount of days (a value of 0 disables this)"
+"When this product was marked as opened, the best before date will be "
+"replaced by today + this amount of days (a value of 0 disables this)"
 msgstr ""
-"Quando un prodotto è stato contrassegnato come aperto, la data di scadenza "
-"verrà sostituita con oggi + questo numero di giorni (un valore di 0 lo "
-"disabilita)"
+"Quando questo prodotto è stato contrassegnato come aperto, la data di "
+"scadenza verrà sostituita con: \"oggi\" + \"questo numero di giorni\" (il "
+"valore 0 disabilita)"
 
 msgid "Default best before days after opened"
 msgstr "Giorni di scadenza predefiniti dopo l'apertura"
@@ -994,9 +995,6 @@ msgstr "Segnato %1$s di %2$s come aperti"
 msgid "Mark as opened"
 msgstr "Segna come aperto"
 
-msgid "Expires on %1$s; Bought on %2$s"
-msgstr "Scade il %1$s; Comprato il %2$s"
-
 msgid "Not opened"
 msgstr "Non aperto"
 
@@ -1312,6 +1310,9 @@ msgstr "Non abbastanza in dispensa"
 msgid "Expiring soon days"
 msgstr "In scadenza  tra pochi giorni"
 
+msgid "Default location"
+msgstr "Posizione predefinita"
+
 msgid "Default amount for purchase"
 msgstr "Quantità predefinita per l'acquisto"
 
@@ -1697,16 +1698,231 @@ msgid "Are you sure to remove this conversion?"
 msgstr "Sei sicuro di rimuovere questa conversione?"
 
 msgid "Unit price"
-msgstr ""
+msgstr "Prezzo unitario"
 
 msgid "Total price"
-msgstr ""
+msgstr "Prezzo totale"
 
 msgid "in %s and based on the purchase quantity unit"
-msgstr ""
+msgstr "in %se basato sull'unità quantitativa di acquisto"
 
 msgid "Unlimited"
-msgstr ""
+msgstr "Illimitato"
 
 msgid "Clear"
+msgstr "Liberato"
+
+msgid "Are you sure to remove the included recipe \"%s\"?"
+msgstr "Rimuovere la ricetta inclusa \"%s\"?"
+
+msgid "Period interval"
+msgstr "Intervallo di tempo"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s days"
 msgstr ""
+"Questo significa che la prossima esecuzione di questa faccenda dovrebbe "
+"essere programmata solo ogni %s giorni"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s weeks"
+msgstr ""
+"Questo significa che la prossima esecuzione di questa faccenda dovrebbe "
+"essere programmata solo ogni %s settimane"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s months"
+msgstr ""
+"Questo significa che la prossima esecuzione di questa faccenda dovrebbe "
+"essere programmata solo ogni %s mesi"
+
+msgid ""
+"This means the next execution of this chore is scheduled 1 year after the "
+"last execution"
+msgstr ""
+"Questo significa che la prossima esecuzione di questa faccenda è prevista 1 "
+"anno dopo l'ultima esecuzione"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s years"
+msgstr ""
+"Questo significa che la prossima esecuzione di questa faccenda dovrebbe "
+"essere programmata solo ogni %s anni"
+
+msgid "Transfer"
+msgstr "Trasferire"
+
+msgid "From location"
+msgstr "Dalla posizione"
+
+msgid "To location"
+msgstr "Alla posizione"
+
+msgid "There are no units available at this location"
+msgstr "Non ci sono unità disponibili in questa posizione"
+
+msgid "Amount: %1$s; Expires on %2$s; Bought on %3$s"
+msgstr "Quantità: %1$s; Scade il: %2$s; Comprato il: %3$s"
+
+msgid "Transfered %1$s of %2$s from %3$s to %4$s"
+msgstr "Trasferiti %1$s di %2$s da %3$s a %4$s"
+
+msgid "Show stock entries"
+msgstr "Mostra voci di dispensa"
+
+msgid "Stock entries"
+msgstr "Voci di dispensa"
+
+msgid "Best before date"
+msgstr "Data di scadenza"
+
+msgid "Purchased date"
+msgstr "Data di acquisto"
+
+msgid "Consume all %s for this stock entry"
+msgstr "Consuma tutte le %s per questa voce di dispensa"
+
+msgid "The amount cannot be lower than %1$s"
+msgstr "La quantità non può essere inferiore a %1$s"
+
+msgid "Stock entry successfully updated"
+msgstr "Voce di dispensa aggiornata correttamente"
+
+msgid "Edit stock entry"
+msgstr "Modifica voce di dispensa"
+
+msgid ""
+"Camera access is on only possible when supported and allowed by your browser"
+" and when grocy is served via a secure (https://) connection"
+msgstr ""
+"L'accesso alla videocamera è possibile solo se supportato e consentito dal "
+"browser e quando grocy è connesso tramite una connessione sicura (https://)"
+
+msgid "Keep screen on"
+msgstr "Mantieni lo schermo acceso"
+
+msgid "Keep screen on while displaying a \"fullscreen-card\""
+msgstr ""
+"Mantieni lo schermo acceso mentre visualizzi una \"scheda a schermo intero\""
+
+msgid "A purchased date is required"
+msgstr "È richiesta la data di acquisto"
+
+msgid ""
+"When a product is selected, one unit (per serving in purchase quantity unit)"
+" will be added to stock on consuming this recipe"
+msgstr ""
+"Quando viene selezionato un prodotto, un'unità (per porzione nell'unità di "
+"quantità di acquisto) verrà aggiunta alla dispensa consumando questa ricetta"
+" "
+
+msgid "Produces product"
+msgstr "Produce prodotto"
+
+msgid "This booking cannot be undone"
+msgstr "Questa prenotazione non può essere annullata"
+
+msgid "Booking does not exist or was already undone"
+msgstr "La prenotazione non esiste o è stata già annullata"
+
+msgid "Are you sure to delete API key \"%s\"?"
+msgstr "Eliminare la chiave API \"%s\"?"
+
+msgid "Add note"
+msgstr "Aggiungi nota"
+
+msgid "Add note to %s"
+msgstr "Aggiungi nota a %s"
+
+msgid "per day"
+msgstr "al giorno"
+
+msgid "Compact view"
+msgstr "Vista compatta"
+
+msgid "Normal view"
+msgstr "Vista normale"
+
+msgid "Only undone items"
+msgstr "Solo oggetti annullati"
+
+msgid "Add product"
+msgstr "Aggiungi prodotto"
+
+msgid "Add product to %s"
+msgstr "Aggiungi prodotto a %s"
+
+msgid "Consume all ingredients needed by this weeks recipes or products"
+msgstr ""
+"Consuma tutti gli ingredienti necessari per ricette o prodotti di questa "
+"settimana"
+
+msgid "Meal plan recipe"
+msgstr "Ricetta del Piano dei pasti"
+
+msgid "Meal plan note"
+msgstr "Nota del Piano dei pasti"
+
+msgid "Meal plan product"
+msgstr "Prodotto del Piano dei pasti"
+
+msgid "Scan mode"
+msgstr "Modalità di scansione"
+
+msgid "on"
+msgstr "accesa"
+
+msgid "off"
+msgstr "spenta"
+
+msgid ""
+"Scan mode is on but not all required fields could be populated automatically"
+msgstr ""
+"La modalità di scansione è attiva ma non è possibile compilare "
+"automaticamente tutti i campi richiesti"
+
+msgid "Is freezer"
+msgstr "È congelato"
+
+msgid ""
+"When moving products from/to a freezer location, the products best before "
+"date is automatically adjusted according to the product settings"
+msgstr ""
+"Quando si spostano i prodotti da/verso un congelatore, la data di scadenza "
+"dei prodotti viene regolata automaticamente in base alle impostazioni del "
+"prodotto"
+
+msgid ""
+"On moving this product to a freezer location (so when freezing it), the best"
+" before date will be replaced by today + this amount of days"
+msgstr ""
+"Spostando questo prodotto in una posizione di congelatore (quindi quando lo "
+"si congela), la data di scadenza verrà sostituita con: \"oggi\" + \"questa "
+"quantità di giorni\""
+
+msgid "Default best before days after freezing"
+msgstr "Data di scadenza predefinita dopo il congelamento"
+
+msgid ""
+"On moving this product from a freezer location (so when thawing it), the "
+"best before date will be replaced by today + this amount of days"
+msgstr ""
+"Quando si sposta questo prodotto da una posizione del congelatore (quindi "
+"quando lo si scongela), la data di scadenza verrà sostituita con: \"oggi\" +"
+" \"questa quantità di giorni\""
+
+msgid "Default best before days after thawing"
+msgstr "Data di scadenza predefinita dopo lo scongelamento"
+
+msgid "This cannot be the same as the \"From\" location"
+msgstr "Non può essere uguale alla posizione \"Da\""
+
+msgid "Thawed"
+msgstr "Scongelato"
+
+msgid "Frozen"
+msgstr "Congelato"

localization/it/userfield_types.po

@@ -1,5 +1,5 @@
 # Translators:
-# Antonino Ursino <ninus_@libero.it>, 2019
+# Antonino Ursino <ninus_@libero.it>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:43+0000\n"
-"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2019\n"
+"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2020\n"
 "Language-Team: Italian (https://www.transifex.com/grocy/teams/93189/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,4 +44,4 @@ msgid "preset-checklist"
 msgstr "Lista di controllo predefinita"
 
 msgid "link"
-msgstr "collegamento"
+msgstr "Collegamento"

localization/nl/chore_assignment_types.po

@@ -1,3 +1,6 @@
+# Translators:
+# Kees van Nieuwenhuijzen <kees@vannieuwenhuijzen.com>, 2019
+# Daniel Polders <zigurana@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -5,6 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-09-17 10:45+0000\n"
+"Last-Translator: Daniel Polders <zigurana@gmail.com>, 2020\n"
 "Language-Team: Dutch (https://www.transifex.com/grocy/teams/93189/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,13 +18,13 @@ msgstr ""
 "X-Domain: grocy/chore_assignment_types\n"
 
 msgid "no-assignment"
-msgstr ""
+msgstr "niet-toegewezen"
 
 msgid "who-least-did-first"
-msgstr ""
+msgstr "wie-minst-gedaan-heeft-eerst"
 
 msgid "random"
-msgstr ""
+msgstr "willekeurig"
 
 msgid "in-alphabetical-order"
-msgstr ""
+msgstr "in-alfabetische-volgorde"

localization/nl/chore_period_types.po

@@ -1,6 +1,5 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
-# Engelbert Mercelis <engelbertmercelis@gmail.com>, 2019
+# Daniel Polders <zigurana@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -8,7 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Engelbert Mercelis <engelbertmercelis@gmail.com>, 2019\n"
+"Last-Translator: Daniel Polders <zigurana@gmail.com>, 2020\n"
 "Language-Team: Dutch (https://www.transifex.com/grocy/teams/93189/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,16 +17,19 @@ msgstr ""
 "X-Domain: grocy/chore_types\n"
 
 msgid "manually"
-msgstr "Handmatig"
+msgstr "handmatig"
 
 msgid "dynamic-regular"
-msgstr "Dynamisch-regelmatig"
+msgstr "dynamisch-regelmatig"
 
 msgid "daily"
-msgstr "Dagelijks"
+msgstr "dagelijks"
 
 msgid "weekly"
-msgstr "Wekelijks"
+msgstr "wekelijks"
 
 msgid "monthly"
-msgstr "Maandelijks"
+msgstr "maandelijks"
+
+msgid "yearly"
+msgstr "jaarlijks"

localization/nl/demo_data.po

@@ -1,11 +1,13 @@
 # Translators:
-# Llewy <carlvanoene@gmail.com>, 2019
 # Adriaan Peeters <apeeters@lashout.net>, 2019
 # Grocy NL, 2019
 # Seppe <van.winkel.seppe@me.com>, 2019
 # Engelbert Mercelis <engelbertmercelis@gmail.com>, 2019
 # Niels Tholenaar <info@123quality.nl>, 2019
 # Frank Klaassen <frank@frankklaassen.nl>, 2019
+# gggg <bashankamp@gmail.com>, 2019
+# Kees van Nieuwenhuijzen <kees@vannieuwenhuijzen.com>, 2019
+# Llewy <carlvanoene@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -13,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Frank Klaassen <frank@frankklaassen.nl>, 2019\n"
+"Last-Translator: Llewy <carlvanoene@gmail.com>, 2019\n"
 "Language-Team: Dutch (https://www.transifex.com/grocy/teams/93189/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,7 +82,7 @@ msgid "Eggs"
 msgstr "Eieren"
 
 msgid "Noodles"
-msgstr "Noodles"
+msgstr "Noedels"
 
 msgid "Pickles"
 msgstr "Augurken"
@@ -166,9 +168,6 @@ msgstr "Duits"
 msgid "Italian"
 msgstr "Italiaans"
 
-msgid "Demo in different language"
-msgstr "Demo in een andere taal"
-
 msgid "This is the note content of the recipe ingredient"
 msgstr "Dit is de inhoud van de opmerking van het recept-ingrediënt"
 
@@ -199,7 +198,7 @@ msgid "Projects"
 msgstr "Projecten"
 
 msgid "Repair the garage door"
-msgstr "Herstel de garagepoort"
+msgstr "De garagedeur repareren"
 
 msgid "Fork and improve grocy"
 msgstr "Fork en verbeter grocy"
@@ -217,7 +216,7 @@ msgid "Tinned food"
 msgstr "Ingeblikt voedsel"
 
 msgid "Butchery products"
-msgstr "Slagerij producten"
+msgstr "Vleeswaren"
 
 msgid "Vegetables/Fruits"
 msgstr "Groenten/Fruit"
@@ -289,27 +288,66 @@ msgid "Polish"
 msgstr "Pools"
 
 msgid "Milk Chocolate"
-msgstr ""
+msgstr "Melk Chocolade"
 
 msgid "Dark Chocolate"
-msgstr ""
+msgstr "Pure Chocolade"
 
 msgid "Slice"
 msgid_plural "Slices"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Punt"
+msgstr[1] "Puntjes"
 
 msgid "Example userentity"
-msgstr ""
+msgstr "Voorbeeld gebruikersentiteit"
 
 msgid "This is an example user entity..."
-msgstr ""
+msgstr "Dit is een voorbeeld van een gebruikers entiteit......"
 
 msgid "Custom field"
-msgstr ""
+msgstr "Custom veld"
 
 msgid "Example field value..."
-msgstr ""
+msgstr "Voorbeeld veld waarde...."
 
 msgid "Waffle rolls"
+msgstr "Wafel rollen"
+
+msgid "Danish"
+msgstr "Deens"
+
+msgid "Dutch"
+msgstr "Nederlands"
+
+msgid "Norwegian"
+msgstr "Norwegen"
+
+msgid "Demo"
+msgstr "Demo"
+
+msgid "Stable version"
+msgstr "Stabiele versie"
+
+msgid "Preview version"
+msgstr "Preview versie"
+
+msgid "current release"
+msgstr "Huidige versie"
+
+msgid "not yet released"
+msgstr "Nog niet uitgegeven"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portugees (Brazilië)"
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
 msgstr ""

localization/nl/stock_transaction_types.po

@@ -1,5 +1,6 @@
 # Translators:
 # Bernd Bestel <bernd@berrnd.de>, 2019
+# Boding Clockchain <joost_nl@live.nl>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Boding Clockchain <joost_nl@live.nl>, 2020\n"
 "Language-Team: Dutch (https://www.transifex.com/grocy/teams/93189/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +20,12 @@ msgstr ""
 msgid "purchase"
 msgstr "Aankoop"
 
+msgid "transfer_from"
+msgstr "Overdragen van"
+
+msgid "transfer_to"
+msgstr "Overdragen naar"
+
 msgid "consume"
 msgstr "Consumeren"
 
@@ -27,3 +34,12 @@ msgstr "Voorraadcorrectie"
 
 msgid "product-opened"
 msgstr "Product geopend"
+
+msgid "stock-edit-old"
+msgstr "Bewerk oude voorraad"
+
+msgid "stock-edit-new"
+msgstr "Bewerk oude voorraad"
+
+msgid "self-production"
+msgstr "Eigen gemaakt"

localization/nl/userfield_types.po

@@ -1,6 +1,7 @@
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
 # Mitchel Nijkamp <mitchelnijkamp1@msn.com>, 2019
+# Kees van Nieuwenhuijzen <kees@vannieuwenhuijzen.com>, 2019
+# Daniel Polders <zigurana@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -8,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:43+0000\n"
-"Last-Translator: Mitchel Nijkamp <mitchelnijkamp1@msn.com>, 2019\n"
+"Last-Translator: Daniel Polders <zigurana@gmail.com>, 2020\n"
 "Language-Team: Dutch (https://www.transifex.com/grocy/teams/93189/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,25 +19,31 @@ msgstr ""
 "X-Domain: grocy/userfield_types\n"
 
 msgid "text-single-line"
-msgstr "Tekst (één regel)"
+msgstr "tekst (één regel)"
 
 msgid "text-multi-line"
-msgstr "Tekst (meerdere regels)"
+msgstr "tekst (meerdere regels)"
 
 msgid "number-integral"
-msgstr "Number (héél getal)"
+msgstr "nummer (héél getal)"
 
 msgid "number-decimal"
-msgstr "Nummer (decimaal)"
+msgstr "nummer (decimaal)"
 
 msgid "date"
-msgstr "Getal (zonder tijd)"
+msgstr "datum"
 
 msgid "datetime"
-msgstr "Datum en tijd"
+msgstr "datum en tijd"
 
 msgid "checkbox"
-msgstr "Checkbox"
+msgstr "selectievak"
 
 msgid "preset-list"
 msgstr "vooringestelde lijst"
+
+msgid "preset-checklist"
+msgstr "vooringestelde-lijst"
+
+msgid "link"
+msgstr "koppeling"

localization/no/demo_data.po

@@ -1,6 +1,6 @@
 # Translators:
 # Bernd Bestel <bernd@berrnd.de>, 2019
-# Marius Borø <blizzwave@gmail.com>, 2019
+# Marius Borø <blizzwave@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -8,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Marius Borø <blizzwave@gmail.com>, 2019\n"
+"Last-Translator: Marius Borø <blizzwave@gmail.com>, 2020\n"
 "Language-Team: Norwegian (https://www.transifex.com/grocy/teams/93189/no/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -322,10 +322,25 @@ msgid "Stable version"
 msgstr "Stabil versjon"
 
 msgid "Preview version"
-msgstr "Under utvikling versjon"
+msgstr "Versjon under utvikling"
 
 msgid "current release"
 msgstr "Nåværende versjon"
 
 msgid "not yet released"
 msgstr "enda ikke gitt ut"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portugisisk (Brasil)"
+
+msgid "This is a note"
+msgstr "Dette er et notat"
+
+msgid "Freezer"
+msgstr "Fryser"
+
+msgid "Hungarian"
+msgstr "Ungarsk"
+
+msgid "Slovak"
+msgstr "Slovakisk"

localization/no/stock_transaction_types.po

@@ -1,5 +1,5 @@
 # Translators:
-# Marius Borø <blizzwave@gmail.com>, 2019
+# Marius Borø <blizzwave@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -7,7 +7,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Marius Borø <blizzwave@gmail.com>, 2019\n"
+"Last-Translator: Marius Borø <blizzwave@gmail.com>, 2020\n"
 "Language-Team: Norwegian (https://www.transifex.com/grocy/teams/93189/no/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,12 @@ msgstr ""
 msgid "purchase"
 msgstr "innkjøp"
 
+msgid "transfer_from"
+msgstr "overføre_fra"
+
+msgid "transfer_to"
+msgstr "overføre_til"
+
 msgid "consume"
 msgstr "forbruk"
 
@@ -27,3 +33,12 @@ msgstr "beholdningsantall korreksjon"
 
 msgid "product-opened"
 msgstr "produkt åpnet"
+
+msgid "stock-edit-old"
+msgstr "beholdning_endre_gammel"
+
+msgid "stock-edit-new"
+msgstr "beholdning_endre_ny"
+
+msgid "self-production"
+msgstr "egenproduksjon"

localization/no/strings.po

@@ -1,7 +1,7 @@
 # Translators:
 # Bernd Bestel <bernd@berrnd.de>, 2019
 # Andreas Henden <chairman2s.ah@gmail.com>, 2019
-# Marius Borø <blizzwave@gmail.com>, 2019
+# Marius Borø <blizzwave@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Marius Borø <blizzwave@gmail.com>, 2019\n"
+"Last-Translator: Marius Borø <blizzwave@gmail.com>, 2020\n"
 "Language-Team: Norwegian (https://www.transifex.com/grocy/teams/93189/no/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -125,7 +125,7 @@ msgid "Stock quantity unit"
 msgstr "Forpakningstype i beholdningen"
 
 msgid "Stock amount"
-msgstr "Standardmengde"
+msgstr "Beholdningsantall"
 
 msgid "Last purchased"
 msgstr "Sist kjøpt"
@@ -830,7 +830,7 @@ msgid "Delete not possible"
 msgstr "Ikke mulig å slette"
 
 msgid "Equipment"
-msgstr "Instruksjonmanualer"
+msgstr "Instruksjonsmanualer"
 
 msgid "Instruction manual"
 msgstr "Instruksjonsmanual"
@@ -842,17 +842,16 @@ msgid "Notes"
 msgstr "Notater"
 
 msgid "Edit equipment"
-msgstr "Endre instruksjonmanualer for utstyr"
+msgstr "Endre instruksjonsmanual"
 
 msgid "Create equipment"
-msgstr "Opprett instruksjonmanualer for utstyr"
+msgstr "Opprett instruksjonmanualer for et utstyr"
 
 msgid ""
 "If you don't select a file, the current instruction manual will not be "
 "altered"
 msgstr ""
-"Hvis du ikke velger en instruksjonsmanual, vil nåværende instruksjonsmanual "
-"ikke bli endret"
+"Om ingen ny instruksjonsmanual blir lastet opp vil nåværende bli værende"
 
 msgid "No instruction manual available"
 msgstr "Ingen instruksjonsmanual tilgjengelig"
@@ -955,18 +954,18 @@ msgid ""
 "The first item in this list would be picked by the default rule which is "
 "\"First expiring first, then first in first out\""
 msgstr ""
-"Første produkt på listen vil bli konsumert først i henhold til regel: \"Går "
-"ut på dato først. Deretter først inn, først ut\"."
+"Første produkt på listen vil bli konsumert først i henhold til denne "
+"regelen: \"Går ut på dato først, deretter først inn, først ut\"."
 
 msgid "Mark %1$s of %2$s as open"
 msgstr "Merk %1$s av %2$s som åpen"
 
 msgid ""
-"When a product was marked as opened, the best before date will be replaced "
-"by today + this amount of days (a value of 0 disables this)"
+"When this product was marked as opened, the best before date will be "
+"replaced by today + this amount of days (a value of 0 disables this)"
 msgstr ""
-"Når et produkt blir merket som åpnet endres best før datoen fra i dag + "
-"dette antallet av dager. (Et 0 vil deaktivere dette)"
+"Når dette produktet merkes som åpnet vil best før datoen endres fra dagens "
+"dato + antall dager under"
 
 msgid "Default best before days after opened"
 msgstr "Standard best før dager etter åpnet"
@@ -977,9 +976,6 @@ msgstr "Merket %1$s av %2$s som åpnet"
 msgid "Mark as opened"
 msgstr "Merk som åpnet"
 
-msgid "Expires on %1$s; Bought on %2$s"
-msgstr "Går ut på dato %1$s, Kjøpt %2$s"
-
 msgid "Not opened"
 msgstr "Ikke åpnet"
 
@@ -1005,7 +1001,7 @@ msgid "Show clock in header"
 msgstr "Vis klokken på toppen av siden"
 
 msgid "Stock settings"
-msgstr "Beholdningsinnstillinger"
+msgstr "Beholdning - innstillinger"
 
 msgid "Shopping list to stock workflow"
 msgstr "Arbeidsflyt fra handleliste til beholding"
@@ -1148,8 +1144,8 @@ msgstr "Produkttelling"
 
 msgid "Type a new product name or barcode and hit TAB to start a workflow"
 msgstr ""
-"Skriv inn et nytt produkt eller strekkode, trykk så TAB for å starte "
-"prosessen"
+"Skriv inn et nytt produkt eller scan en strekkode, trykk så TAB for å starte"
+" innkjøps/ forbruksprosess"
 
 msgid ""
 "This will be used as the default setting when adding this product as a "
@@ -1189,7 +1185,7 @@ msgid "Average shelf life"
 msgstr "Gjennomsnittlig holdbarhetstid"
 
 msgid "Spoil rate"
-msgstr "\"Utgått på dato\" rate"
+msgstr "Prosenttall for hvor mye som har utgått på dato "
 
 msgid "Show more"
 msgstr "Vis mer"
@@ -1295,6 +1291,9 @@ msgstr "Ikke nok i beholdningen"
 msgid "Expiring soon days"
 msgstr "Går ut på dato snart dager"
 
+msgid "Default location"
+msgstr "Standard lokasjon"
+
 msgid "Default amount for purchase"
 msgstr "Standard mengde for innkjøp"
 
@@ -1651,31 +1650,245 @@ msgid "Miss"
 msgstr "Bom"
 
 msgid "Display recipe"
-msgstr ""
+msgstr "Vis oppskrift"
 
 msgid "Accumulate sub products min. stock amount"
-msgstr ""
+msgstr "Akkumulert underprodukter minimum beholdningsnivå"
 
 msgid ""
 "If enabled, the min. stock amount of sub products will be accumulated into "
 "this product, means the sub product will never be \"missing\", only this "
 "product"
 msgstr ""
+"Hvis aktivert vil minimum beholdningsnivå av under produkter bli akkumulert "
+"inn i dette produktet. Dette betyr at under produktet aldri vil \"mangle\", "
+"kunne dette produktet."
 
 msgid "Are you sure to remove this conversion?"
-msgstr ""
+msgstr "Er du sikker på at du ønsker å fjerne denne konverteringen?"
 
 msgid "Unit price"
-msgstr ""
+msgstr "Enhetspris"
 
 msgid "Total price"
-msgstr ""
+msgstr "Totalpris"
 
 msgid "in %s and based on the purchase quantity unit"
-msgstr ""
+msgstr "I %s og basert på innkjøpsforpakningen"
 
 msgid "Unlimited"
-msgstr ""
+msgstr "Evig"
 
 msgid "Clear"
+msgstr "Tøm"
+
+msgid "Are you sure to remove the included recipe \"%s\"?"
+msgstr "Er du sikker du ønsker å slette den inkluderte oppskriften \"%s\"?"
+
+msgid "Period interval"
+msgstr "Periodiskinterval"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s days"
 msgstr ""
+"Dette betyr at neste gjennomføring av denne husarbeidsoppgaven skal kun "
+"planlegges for hver %s dager"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s weeks"
+msgstr ""
+"Dette betyr at neste gjennomføring av denne husarbeidsoppgaven skal kun "
+"planlegges for hver %s uker"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s months"
+msgstr ""
+"Dette betyr at neste gjennomføring av denne husarbeidsoppgaven skal kun "
+"planlegges for hver %s måneder"
+
+msgid ""
+"This means the next execution of this chore is scheduled 1 year after the "
+"last execution"
+msgstr ""
+"Dette betyr at neste gjennomføring av denne husarbeidsoppgaven skal være 1  "
+"år etter forrige gjennomføring"
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s years"
+msgstr ""
+"Dette betyr at neste gjennomføring av denne husarbeidsoppgaven skal kun "
+"planlegges for hver %s år"
+
+msgid "Transfer"
+msgstr "Flytte produkt"
+
+msgid "From location"
+msgstr "Fra lokasjon"
+
+msgid "To location"
+msgstr "Til lokasjon"
+
+msgid "There are no units available at this location"
+msgstr "Det er ingen enheter tilgjengelig på denne lokasjonen"
+
+msgid "Amount: %1$s; Expires on %2$s; Bought on %3$s"
+msgstr "Mengde: %1$s; Best før %2$s; Kjøpt %3$s"
+
+msgid "Transfered %1$s of %2$s from %3$s to %4$s"
+msgstr "Flyttet %1$s %2$s fra %3$s til %4$s"
+
+msgid "Show stock entries"
+msgstr "Vis beholdningsoppføringer"
+
+msgid "Stock entries"
+msgstr "Beholdningsoppføringer"
+
+msgid "Best before date"
+msgstr "Best før dato"
+
+msgid "Purchased date"
+msgstr "Innkjøpsdato"
+
+msgid "Consume all %s for this stock entry"
+msgstr "Forbruk alle %s for denne beholdningsoppføringen"
+
+msgid "The amount cannot be lower than %1$s"
+msgstr "Mengden kan ikke være lavere enn %1$s"
+
+msgid "Stock entry successfully updated"
+msgstr "Beholdningsoppføring oppdatert"
+
+msgid "Edit stock entry"
+msgstr "Endre beholdningsoppføring"
+
+msgid ""
+"Camera access is on only possible when supported and allowed by your browser"
+" and when grocy is served via a secure (https://) connection"
+msgstr ""
+"Tilgang til kamera må støttes av din nettleser og grocy må serves via en "
+"sikker tilkobling (https://)"
+
+msgid "Keep screen on"
+msgstr "Skjerm alltid på"
+
+msgid "Keep screen on while displaying a \"fullscreen-card\""
+msgstr "Hold skjerm på når du bruker fullskjermsoversikt"
+
+msgid "A purchased date is required"
+msgstr "En innkjøpsdato kreves"
+
+msgid ""
+"When a product is selected, one unit (per serving in purchase quantity unit)"
+" will be added to stock on consuming this recipe"
+msgstr ""
+"Når du konsumere denne oppskriften vil den produsere en enhet av produktet "
+"du har valgt under. (Per forbruk enhet)"
+
+msgid "Produces product"
+msgstr "Lager produkt"
+
+msgid "This booking cannot be undone"
+msgstr "Denne registreringen kan ikke angres"
+
+msgid "Booking does not exist or was already undone"
+msgstr "Registeringen eksistere ikke eller har allerede blitt angret"
+
+msgid "Are you sure to delete API key \"%s\"?"
+msgstr "Er du sikker du ønsker slette API key \"%s\"?"
+
+msgid "Add note"
+msgstr "Legg til notat"
+
+msgid "Add note to %s"
+msgstr "Legg notat til %s"
+
+msgid "per day"
+msgstr "per dag"
+
+msgid "Compact view"
+msgstr "Kompakt visning"
+
+msgid "Normal view"
+msgstr "Vanlig visning"
+
+msgid "Only undone items"
+msgstr "Kun angrede enheter"
+
+msgid "Add product"
+msgstr "Legg til produkt"
+
+msgid "Add product to %s"
+msgstr "Legg produkt til %s"
+
+msgid "Consume all ingredients needed by this weeks recipes or products"
+msgstr ""
+"Forbruk alle ingredienser nødvendig for denne ukens oppskrifter eller "
+"produkter"
+
+msgid "Meal plan recipe"
+msgstr "Middagsplan-oppskrift"
+
+msgid "Meal plan note"
+msgstr "Middagsplan-notat"
+
+msgid "Meal plan product"
+msgstr "Middagsplan-produkt"
+
+msgid "Scan mode"
+msgstr "Scanne modus"
+
+msgid "on"
+msgstr "på"
+
+msgid "off"
+msgstr "av"
+
+msgid ""
+"Scan mode is on but not all required fields could be populated automatically"
+msgstr "Scannemodus er på, men ikke alle felt kan fylles ut automatisk"
+
+msgid "Is freezer"
+msgstr "Er fryser"
+
+msgid ""
+"When moving products from/to a freezer location, the products best before "
+"date is automatically adjusted according to the product settings"
+msgstr ""
+"Når produkter blir flyttet til/fra en fryskerlokasjon, endres best før "
+"datoen automatisk i forhold til produktinnstillingen"
+
+msgid ""
+"On moving this product to a freezer location (so when freezing it), the best"
+" before date will be replaced by today + this amount of days"
+msgstr ""
+"Når dette produktet blir flyttet til en fryskerlokasjon (produkt skal "
+"fryses), endres best før datoen fra i dag + antall dager under"
+
+msgid "Default best before days after freezing"
+msgstr "Standard best før dager etter frysing"
+
+msgid ""
+"On moving this product from a freezer location (so when thawing it), the "
+"best before date will be replaced by today + this amount of days"
+msgstr ""
+"Når dette produktet blir flyttet fra en fryskerlokasjon (produkt skal "
+"tines), endres best før datoen fra i dag + antall dager under"
+
+msgid "Default best before days after thawing"
+msgstr "Standard best før dager etter tining"
+
+msgid "This cannot be the same as the \"From\" location"
+msgstr "Dette kan ikke være det som \"Fra\" lokasjonen"
+
+msgid "Thawed"
+msgstr "Tint"
+
+msgid "Frozen"
+msgstr "Fryst"
+
+msgid "Are you sure to delete userentity \"%s\"?"
+msgstr "Er du sikker på at du ønsker slette userentity \"%s\"?"

localization/pl/userfield_types.po

@@ -40,3 +40,9 @@ msgstr "Pole wyboru"
 
 msgid "preset-list"
 msgstr "Lista opcji"
+
+msgid "preset-checklist"
+msgstr ""
+
+msgid "link"
+msgstr ""

localization/pt_BR/chore_assignment_types.po

@@ -0,0 +1,29 @@
+# Translators:
+# Danilo Vieira <cebikyn@gmail.com>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-09-17 10:45+0000\n"
+"Last-Translator: Danilo Vieira <cebikyn@gmail.com>, 2019\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/grocy/teams/93189/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Domain: grocy/chore_assignment_types\n"
+
+msgid "no-assignment"
+msgstr "não-designado"
+
+msgid "who-least-did-first"
+msgstr "quem-fez-menos-primeiro"
+
+msgid "random"
+msgstr "aleatório"
+
+msgid "in-alphabetical-order"
+msgstr "em-ordem-alfabética"

localization/pt_BR/chore_period_types.po

@@ -0,0 +1,37 @@
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2019
+# Danilo Vieira <cebikyn@gmail.com>, 2019
+# Jefferson Brito Passos dos Santos <jeffersantoss@gmail.com>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Jefferson Brito Passos dos Santos <jeffersantoss@gmail.com>, 2019\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/grocy/teams/93189/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Domain: grocy/chore_types\n"
+
+msgid "manually"
+msgstr "manualmente"
+
+msgid "dynamic-regular"
+msgstr "Regular dinâmico"
+
+msgid "daily"
+msgstr "diário"
+
+msgid "weekly"
+msgstr "semanal"
+
+msgid "monthly"
+msgstr "mensal"
+
+msgid "yearly"
+msgstr "anualmente"

localization/pt_BR/component_translations.po

@@ -0,0 +1,50 @@
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2019
+# Jefferson Brito Passos dos Santos <jeffersantoss@gmail.com>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Jefferson Brito Passos dos Santos <jeffersantoss@gmail.com>, 2019\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/grocy/teams/93189/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Domain: grocy/component_translations\n"
+
+msgid "timeago_locale"
+msgstr "ptbr"
+
+msgid "timeago_nan"
+msgstr "NaN anos atrás"
+
+msgid "moment_locale"
+msgstr "x"
+
+msgid "datatables_localization"
+msgstr ""
+"{\"sEmptyTable\":\"Não existem dados disponívels na "
+"tabela\",\"sInfo\":\"Showing _START_ to _END_ of _TOTAL_ "
+"entries\",\"sInfoEmpty\":\"Showing 0 to 0 of 0 "
+"entries\",\"sInfoFiltered\":\"(filtered from _MAX_ total "
+"entries)\",\"sInfoPostFix\":\"\",\"sInfoThousands\":\",\",\"sLengthMenu\":\"Show"
+" _MENU_ "
+"entries\",\"sLoadingRecords\":\"Carregando...\",\"sProcessing\":\"Processando...\",\"sSearch\":\"Search:\",\"sZeroRecords\":\"Nenhum"
+" registro correspondente "
+"encontrado\",\"oPaginate\":{\"sFirst\":\"Primeiro\",\"sLast\":\"Último\",\"sNext\":\"Próximo\",\"sPrevious\":\"Anterior\"},\"oAria\":{\"sSortAscending\":\":"
+" ativar para classificar coluna como ascendente\",\"sSortDescending\":\": "
+"ativar para classificar coluna como  descendente\"}}"
+
+msgid "summernote_locale"
+msgstr "x"
+
+msgid "fullcalendar_locale"
+msgstr "x"
+
+msgid "bootstrap-select_locale"
+msgstr "bootstrap-select_locale"

localization/pt_BR/demo_data.po

@@ -0,0 +1,346 @@
+# Translators:
+# Jefferson Brito Passos dos Santos <jeffersantoss@gmail.com>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Jefferson Brito Passos dos Santos <jeffersantoss@gmail.com>, 2019\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/grocy/teams/93189/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Domain: grocy/demo_data\n"
+
+msgid "Cookies"
+msgstr "Biscoitos"
+
+msgid "Chocolate"
+msgstr "Chocolate"
+
+msgid "Pantry"
+msgstr "Despensa"
+
+msgid "Candy cupboard"
+msgstr "Armário de doces"
+
+msgid "Tinned food cupboard"
+msgstr "Armário de Enlatados"
+
+msgid "Fridge"
+msgstr "Geladeira"
+
+msgid "Piece"
+msgid_plural "Pieces"
+msgstr[0] "Pedaço"
+msgstr[1] "Pedaços"
+
+msgid "Pack"
+msgid_plural "Packs"
+msgstr[0] "Pacote"
+msgstr[1] "Pacotes"
+
+msgid "Glass"
+msgid_plural "Glasses"
+msgstr[0] "Vidro"
+msgstr[1] "Vidros"
+
+msgid "Tin"
+msgid_plural "Tins"
+msgstr[0] "Enlatado"
+msgstr[1] "Enlatados"
+
+msgid "Can"
+msgid_plural "Cans"
+msgstr[0] "Lata"
+msgstr[1] "Latas"
+
+msgid "Bunch"
+msgid_plural "Bunches"
+msgstr[0] "Cacho"
+msgstr[1] "Cachos"
+
+msgid "Gummy bears"
+msgstr "Gomas"
+
+msgid "Crisps"
+msgstr "Batatinhas"
+
+msgid "Eggs"
+msgstr "Ovos"
+
+msgid "Noodles"
+msgstr "Noodles"
+
+msgid "Pickles"
+msgstr "Picles"
+
+msgid "Gulash soup"
+msgstr "Sopa de goulash"
+
+msgid "Yogurt"
+msgstr "Yogurt"
+
+msgid "Cheese"
+msgstr "Queijo"
+
+msgid "Cold cuts"
+msgstr "Cortes frios"
+
+msgid "Paprika"
+msgstr "Páprica"
+
+msgid "Cucumber"
+msgstr "Pepino"
+
+msgid "Radish"
+msgstr "Rabanete"
+
+msgid "Tomato"
+msgstr "Tomate"
+
+msgid "Changed towels in the bathroom"
+msgstr "Trocar toalhas do banheiro"
+
+msgid "Cleaned the kitchen floor"
+msgstr "Limpar o chão da cozinha"
+
+msgid "Warranty ends"
+msgstr "Término de Garantia"
+
+msgid "TV remote control"
+msgstr "Controle Remoto da TV"
+
+msgid "Alarm clock"
+msgstr "Despertador"
+
+msgid "Heat remote control"
+msgstr "Controle remoto do aquecedor"
+
+msgid "Lawn mowed in the garden"
+msgstr "Cortar a grama do jardim"
+
+msgid "Some good snacks"
+msgstr "Alguns lanches"
+
+msgid "Pizza dough"
+msgstr "Massa de pizza"
+
+msgid "Sieved tomatoes"
+msgstr "Tomates pelados"
+
+msgid "Salami"
+msgstr "Salame"
+
+msgid "Toast"
+msgstr "Torrada"
+
+msgid "Minced meat"
+msgstr "Carne Moída"
+
+msgid "Pizza"
+msgstr "Pizza"
+
+msgid "Spaghetti bolognese"
+msgstr "Espaguete à bolonhesa"
+
+msgid "Sandwiches"
+msgstr "Sanduiches"
+
+msgid "English"
+msgstr "Inglês"
+
+msgid "German"
+msgstr "Alemão"
+
+msgid "Italian"
+msgstr "Italiano"
+
+msgid "This is the note content of the recipe ingredient"
+msgstr "Este é o conteúdo do ingrediente da receita"
+
+msgid "Demo User"
+msgstr "Usuário de demonstração"
+
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] "Grama"
+msgstr[1] "Gramas"
+
+msgid "Flour"
+msgstr "Farinha"
+
+msgid "Pancakes"
+msgstr "Panquecas"
+
+msgid "Sugar"
+msgstr "Açucar"
+
+msgid "Home"
+msgstr "Casa"
+
+msgid "Life"
+msgstr "Vida"
+
+msgid "Projects"
+msgstr "Projetos"
+
+msgid "Repair the garage door"
+msgstr "Consertar o portão da Garagem"
+
+msgid "Fork and improve grocy"
+msgstr "Ajude a aprimorar o grocy"
+
+msgid "Find a solution for what to do when I forget the door keys"
+msgstr ""
+"Encontre uma solução para o que fazer quando eu esquecer as chaves da porta"
+
+msgid "Sweets"
+msgstr "Doces"
+
+msgid "Bakery products"
+msgstr "Produtos de confeitaria"
+
+msgid "Tinned food"
+msgstr "Alimentos enlatados"
+
+msgid "Butchery products"
+msgstr "Produtos de açougue"
+
+msgid "Vegetables/Fruits"
+msgstr "Vegetais/Frutas"
+
+msgid "Refrigerated products"
+msgstr "Produtos refrigerados"
+
+msgid "Coffee machine"
+msgstr "Máquina de café"
+
+msgid "Dishwasher"
+msgstr "Lava-louças"
+
+msgid "Liter"
+msgstr "Litro"
+
+msgid "Liters"
+msgstr "Litros"
+
+msgid "Bottle"
+msgstr "Garrafa"
+
+msgid "Bottles"
+msgstr "Garrafas"
+
+msgid "Milk"
+msgstr "Leite"
+
+msgid "Chocolate sauce"
+msgstr "Chocolate temperado"
+
+msgid "Milliliters"
+msgstr "Milimetros"
+
+msgid "Milliliter"
+msgstr "Milimetro"
+
+msgid "Bottom"
+msgstr "Inferior"
+
+msgid "Topping"
+msgstr "Cobertura"
+
+msgid "French"
+msgstr "Francês"
+
+msgid "Turkish"
+msgstr "Turco"
+
+msgid "Spanish"
+msgstr "Espanhol"
+
+msgid "Russian"
+msgstr "Russo"
+
+msgid "The thing which happens on the 5th of every month"
+msgstr "Coisas que ocorrem todo dia 5 de cada mês"
+
+msgid "The thing which happens daily"
+msgstr "Coisas que ocorrem diariamente"
+
+msgid "The thing which happens on Mondays and Wednesdays"
+msgstr "Coisas que ocorrem as segundas e quartas"
+
+msgid "Swedish"
+msgstr "Sueco"
+
+msgid "Polish"
+msgstr "Polonês"
+
+msgid "Milk Chocolate"
+msgstr "Chocolate Branco"
+
+msgid "Dark Chocolate"
+msgstr "Chocolate Amargo"
+
+msgid "Slice"
+msgid_plural "Slices"
+msgstr[0] "Fatia"
+msgstr[1] "Fatias"
+
+msgid "Example userentity"
+msgstr "Exemplo de entidade de usuário"
+
+msgid "This is an example user entity..."
+msgstr "Este é um exemplo de entidade de usuário"
+
+msgid "Custom field"
+msgstr "Campo customizado"
+
+msgid "Example field value..."
+msgstr "Exemplo de valor de campo"
+
+msgid "Waffle rolls"
+msgstr "Rolos de waffle"
+
+msgid "Danish"
+msgstr "Dinamarquês"
+
+msgid "Dutch"
+msgstr "Holandês"
+
+msgid "Norwegian"
+msgstr "Norueguês"
+
+msgid "Demo"
+msgstr "Demo"
+
+msgid "Stable version"
+msgstr "Versão estável"
+
+msgid "Preview version"
+msgstr "Versão de Prévia"
+
+msgid "current release"
+msgstr "versão atual"
+
+msgid "not yet released"
+msgstr "ainda não lançado"
+
+msgid "Portuguese (Brazil)"
+msgstr "Português (Brasil)"
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
+msgstr ""

localization/pt_BR/stock_transaction_types.po

@@ -0,0 +1,45 @@
+# Translators:
+# Danilo Vieira <cebikyn@gmail.com>, 2019
+# Arthur Vieira <skytakes.arthur@gmail.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Arthur Vieira <skytakes.arthur@gmail.com>, 2020\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/grocy/teams/93189/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Domain: grocy/stock_transaction_types\n"
+
+msgid "purchase"
+msgstr "comprar"
+
+msgid "transfer_from"
+msgstr "transferir de"
+
+msgid "transfer_to"
+msgstr "transferir para"
+
+msgid "consume"
+msgstr "consumir"
+
+msgid "inventory-correction"
+msgstr "correção de inventário"
+
+msgid "product-opened"
+msgstr "produto-aberto"
+
+msgid "stock-edit-old"
+msgstr "editar estoque antigo"
+
+msgid "stock-edit-new"
+msgstr "editar estoque novo"
+
+msgid "self-production"
+msgstr ""

localization/pt_BR/userfield_types.po

@@ -0,0 +1,49 @@
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2019
+# Danilo Vieira <cebikyn@gmail.com>, 2019
+# Jefferson Brito Passos dos Santos <jeffersantoss@gmail.com>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:43+0000\n"
+"Last-Translator: Jefferson Brito Passos dos Santos <jeffersantoss@gmail.com>, 2019\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/grocy/teams/93189/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Domain: grocy/userfield_types\n"
+
+msgid "text-single-line"
+msgstr "Texto (linha única)"
+
+msgid "text-multi-line"
+msgstr "Texto (Multiplas Linhas)"
+
+msgid "number-integral"
+msgstr "Número (inteiro)"
+
+msgid "number-decimal"
+msgstr "Número (decimal)"
+
+msgid "date"
+msgstr "Data (sem horário)"
+
+msgid "datetime"
+msgstr "Data e Hora"
+
+msgid "checkbox"
+msgstr "Caixa de Seleção"
+
+msgid "preset-list"
+msgstr "lista-predefinida"
+
+msgid "preset-checklist"
+msgstr "lista-de-verificação-predefinida"
+
+msgid "link"
+msgstr "link"

localization/ru/chore_assignment_types.po

@@ -1,5 +1,6 @@
 # Translators:
 # Pavel Pletenev <cpp.create@gmail.com>, 2019
+# First Name Second Name <greentail@protonmail.ch>, 2019
 # 
 msgid ""
 msgstr ""
@@ -7,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-09-17 10:45+0000\n"
-"Last-Translator: Pavel Pletenev <cpp.create@gmail.com>, 2019\n"
+"Last-Translator: First Name Second Name <greentail@protonmail.ch>, 2019\n"
 "Language-Team: Russian (https://www.transifex.com/grocy/teams/93189/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,13 +18,13 @@ msgstr ""
 "X-Domain: grocy/chore_assignment_types\n"
 
 msgid "no-assignment"
-msgstr "без-назначения"
+msgstr "не назначать"
 
 msgid "who-least-did-first"
-msgstr "кто-меньше-сделал-сначала"
+msgstr "сначала тот, кто реже выполнял"
 
 msgid "random"
 msgstr "случайно"
 
 msgid "in-alphabetical-order"
-msgstr "по-алфавиту"
+msgstr "по алфавиту"

localization/ru/demo_data.po

@@ -345,3 +345,18 @@ msgstr "текущий релиз"
 
 msgid "not yet released"
 msgstr "Пока не выпущено"
+
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
+msgstr ""

localization/ru/stock_transaction_types.po

@@ -1,5 +1,6 @@
 # Translators:
 # Bernd Bestel <bernd@berrnd.de>, 2019
+# First Name Second Name <greentail@protonmail.ch>, 2019
 # 
 msgid ""
 msgstr ""
@@ -7,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: First Name Second Name <greentail@protonmail.ch>, 2019\n"
 "Language-Team: Russian (https://www.transifex.com/grocy/teams/93189/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,10 +18,10 @@ msgstr ""
 "X-Domain: grocy/stock_transaction_types\n"
 
 msgid "purchase"
-msgstr "Купить"
+msgstr "купить"
 
 msgid "consume"
-msgstr "Употребить"
+msgstr "употребить"
 
 msgid "inventory-correction"
 msgstr "Исправление инвентаря"

localization/ru/strings.po

@@ -2,6 +2,7 @@
 # Bernd Bestel <bernd@berrnd.de>, 2019
 # Pavel Pletenev <cpp.create@gmail.com>, 2019
 # cool guy <eut53770@bcaoo.com>, 2019
+# First Name Second Name <greentail@protonmail.ch>, 2019
 # 
 msgid ""
 msgstr ""
@@ -9,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: cool guy <eut53770@bcaoo.com>, 2019\n"
+"Last-Translator: First Name Second Name <greentail@protonmail.ch>, 2019\n"
 "Language-Team: Russian (https://www.transifex.com/grocy/teams/93189/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 "X-Domain: grocy/strings\n"
 
 msgid "Stock overview"
-msgstr "Обзор склада"
+msgstr "Обзор запасов"
 
 msgid "%s product expires"
 msgid_plural "%s products expiring"
@@ -30,17 +31,17 @@ msgstr[3] "%s продуктов испортятся"
 
 msgid "within the next day"
 msgid_plural "within the next %s days"
-msgstr[0] "в течение завтра"
+msgstr[0] "в течение следующего дня"
 msgstr[1] "в течение %s дней"
 msgstr[2] "в течение %s дней"
 msgstr[3] "в течение %s дней"
 
 msgid "%s product is already expired"
 msgid_plural "%s products are already expired"
-msgstr[0] "%s продукт уже испортился"
-msgstr[1] "%sпродукта уже испортились"
-msgstr[2] "%s продуктов уже испортились"
-msgstr[3] "%s продуктов уже испортились"
+msgstr[0] "%s продукт испортился"
+msgstr[1] "%s продукта испортилось"
+msgstr[2] "%s продуктов испортилось"
+msgstr[3] "%s продуктов испортилось"
 
 msgid "%s product is below defined min. stock amount"
 msgid_plural "%s products are below defined min. stock amount"
@@ -54,10 +55,10 @@ msgstr "Продукт"
 
 msgid "%s Product"
 msgid_plural "%s Products"
-msgstr[0] "%s Продукт"
-msgstr[1] "%s Продукта"
-msgstr[2] "%s Продуктов"
-msgstr[3] "%s Продуктов"
+msgstr[0] "%s продукт"
+msgstr[1] "%s продукта"
+msgstr[2] "%s продуктов"
+msgstr[3] "%s продуктов"
 
 msgid "Amount"
 msgstr "Количество"
@@ -69,16 +70,16 @@ msgid "Logout"
 msgstr "Выйти"
 
 msgid "Chores overview"
-msgstr "Обзор работ по дому"
+msgstr "Обзор работ"
 
 msgid "Batteries overview"
-msgstr "Обзор батарей"
+msgstr "Обзор батареек"
 
 msgid "Purchase"
-msgstr "Покупка"
+msgstr "Купить"
 
 msgid "Consume"
-msgstr "Потребление"
+msgstr "Употребить"
 
 msgid "Inventory"
 msgstr "Инвентарь"
@@ -87,10 +88,10 @@ msgid "Shopping list"
 msgstr "Список покупок"
 
 msgid "Chore tracking"
-msgstr "Выполнить работу по дому"
+msgstr "Выполнить работу"
 
 msgid "Battery tracking"
-msgstr "Отслеживание аккумуляторов"
+msgstr "Отслеживание батареек"
 
 msgid "Locations"
 msgstr "Места"
@@ -99,13 +100,13 @@ msgid "Quantity units"
 msgstr "Единицы измерения"
 
 msgid "Chores"
-msgstr "Работы по дому"
+msgstr "Работы"
 
 msgid "Batteries"
-msgstr "Батареи"
+msgstr "Батарейки"
 
 msgid "Chore"
-msgstr "Работа по дому"
+msgstr "Работа"
 
 msgid "Next estimated tracking"
 msgstr "Следующий период отслеживания"
@@ -114,7 +115,7 @@ msgid "Last tracked"
 msgstr "Последнее время отслеживания"
 
 msgid "Battery"
-msgstr "Батарея"
+msgstr "Батарейка"
 
 msgid "Last charged"
 msgstr "Последний раз заряжалась"
@@ -999,11 +1000,9 @@ msgid "Mark %1$s of %2$s as open"
 msgstr "Открыть %1$s %2$s "
 
 msgid ""
-"When a product was marked as opened, the best before date will be replaced "
-"by today + this amount of days (a value of 0 disables this)"
+"When this product was marked as opened, the best before date will be "
+"replaced by today + this amount of days (a value of 0 disables this)"
 msgstr ""
-"Когда продукт помечается как открытый, срок годности заменится по формуле: "
-"сегодня + это количество дней (значение 0 отключает этот функционал)"
 
 msgid "Default best before days after opened"
 msgstr "Срок годности в днях по умолчанию после открытия"
@@ -1014,9 +1013,6 @@ msgstr "%2$s %1$s помечено открытым"
 msgid "Mark as opened"
 msgstr "Пометить как открытые"
 
-msgid "Expires on %1$s; Bought on %2$s"
-msgstr "Срок годности: %1$s; Куплено: %2$s"
-
 msgid "Not opened"
 msgstr "Не открыто"
 
@@ -1333,6 +1329,9 @@ msgstr "Не достаточно в запасе"
 msgid "Expiring soon days"
 msgstr "Дней до окончания срока годности"
 
+msgid "Default location"
+msgstr ""
+
 msgid "Default amount for purchase"
 msgstr "Количество покупки по умолчанию"
 
@@ -1722,3 +1721,192 @@ msgstr ""
 
 msgid "Clear"
 msgstr ""
+
+msgid "Are you sure to remove the included recipe \"%s\"?"
+msgstr ""
+
+msgid "Period interval"
+msgstr ""
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s days"
+msgstr ""
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s weeks"
+msgstr ""
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s months"
+msgstr ""
+
+msgid ""
+"This means the next execution of this chore is scheduled 1 year after the "
+"last execution"
+msgstr ""
+
+msgid ""
+"This means the next execution of this chore should only be scheduled every "
+"%s years"
+msgstr ""
+
+msgid "Transfer"
+msgstr ""
+
+msgid "From location"
+msgstr ""
+
+msgid "To location"
+msgstr ""
+
+msgid "There are no units available at this location"
+msgstr ""
+
+msgid "Amount: %1$s; Expires on %2$s; Bought on %3$s"
+msgstr ""
+
+msgid "Transfered %1$s of %2$s from %3$s to %4$s"
+msgstr ""
+
+msgid "Show stock entries"
+msgstr ""
+
+msgid "Stock entries"
+msgstr ""
+
+msgid "Best before date"
+msgstr ""
+
+msgid "Purchased date"
+msgstr ""
+
+msgid "Consume all %s for this stock entry"
+msgstr ""
+
+msgid "The amount cannot be lower than %1$s"
+msgstr ""
+
+msgid "Stock entry successfully updated"
+msgstr ""
+
+msgid "Edit stock entry"
+msgstr ""
+
+msgid ""
+"Camera access is on only possible when supported and allowed by your browser"
+" and when grocy is served via a secure (https://) connection"
+msgstr ""
+
+msgid "Keep screen on"
+msgstr ""
+
+msgid "Keep screen on while displaying a \"fullscreen-card\""
+msgstr ""
+
+msgid "A purchased date is required"
+msgstr ""
+
+msgid ""
+"When a product is selected, one unit (per serving in purchase quantity unit)"
+" will be added to stock on consuming this recipe"
+msgstr ""
+
+msgid "Produces product"
+msgstr ""
+
+msgid "This booking cannot be undone"
+msgstr ""
+
+msgid "Booking does not exist or was already undone"
+msgstr ""
+
+msgid "Are you sure to delete API key \"%s\"?"
+msgstr ""
+
+msgid "Add note"
+msgstr ""
+
+msgid "Add note to %s"
+msgstr ""
+
+msgid "per day"
+msgstr ""
+
+msgid "Compact view"
+msgstr ""
+
+msgid "Normal view"
+msgstr ""
+
+msgid "Only undone items"
+msgstr ""
+
+msgid "Add product"
+msgstr ""
+
+msgid "Add product to %s"
+msgstr ""
+
+msgid "Consume all ingredients needed by this weeks recipes or products"
+msgstr ""
+
+msgid "Meal plan recipe"
+msgstr ""
+
+msgid "Meal plan note"
+msgstr ""
+
+msgid "Meal plan product"
+msgstr ""
+
+msgid "Scan mode"
+msgstr ""
+
+msgid "on"
+msgstr ""
+
+msgid "off"
+msgstr ""
+
+msgid ""
+"Scan mode is on but not all required fields could be populated automatically"
+msgstr ""
+
+msgid "Is freezer"
+msgstr ""
+
+msgid ""
+"When moving products from/to a freezer location, the products best before "
+"date is automatically adjusted according to the product settings"
+msgstr ""
+
+msgid ""
+"On moving this product to a freezer location (so when freezing it), the best"
+" before date will be replaced by today + this amount of days"
+msgstr ""
+
+msgid "Default best before days after freezing"
+msgstr ""
+
+msgid ""
+"On moving this product from a freezer location (so when thawing it), the "
+"best before date will be replaced by today + this amount of days"
+msgstr ""
+
+msgid "Default best before days after thawing"
+msgstr ""
+
+msgid "This cannot be the same as the \"From\" location"
+msgstr ""
+
+msgid "Thawed"
+msgstr ""
+
+msgid "Frozen"
+msgstr ""
+
+msgid "Are you sure to delete userentity \"%s\"?"
+msgstr ""

localization/sk_SK/chore_assignment_types.po

@@ -0,0 +1,30 @@
+# Translators:
+# peter cerny <posli.to.semka@gmail.com>, 2020
+# Jose Riha <jose1711@gmail.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-09-17 10:45+0000\n"
+"Last-Translator: Jose Riha <jose1711@gmail.com>, 2020\n"
+"Language-Team: Slovak (Slovakia) (https://www.transifex.com/grocy/teams/93189/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
+"X-Domain: grocy/chore_assignment_types\n"
+
+msgid "no-assignment"
+msgstr "bez priradenia"
+
+msgid "who-least-did-first"
+msgstr "prednosť má najmenej vyťažovaná osoba"
+
+msgid "random"
+msgstr "náhodne"
+
+msgid "in-alphabetical-order"
+msgstr "abecedne"

localization/sk_SK/chore_period_types.po

@@ -0,0 +1,37 @@
+# Translators:
+# Marko Zbirka <illethrias@gmail.com>, 2019
+# peter cerny <posli.to.semka@gmail.com>, 2020
+# Jose Riha <jose1711@gmail.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Jose Riha <jose1711@gmail.com>, 2020\n"
+"Language-Team: Slovak (Slovakia) (https://www.transifex.com/grocy/teams/93189/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
+"X-Domain: grocy/chore_types\n"
+
+msgid "manually"
+msgstr "ručne"
+
+msgid "dynamic-regular"
+msgstr "dynamicky-pravidelne"
+
+msgid "daily"
+msgstr "denne"
+
+msgid "weekly"
+msgstr "týždenne"
+
+msgid "monthly"
+msgstr "mesačne"
+
+msgid "yearly"
+msgstr "ročne"

localization/sk_SK/component_translations.po

@@ -0,0 +1,49 @@
+# Translators:
+# Jose Riha <jose1711@gmail.com>, 2020
+# Bernd Bestel <bernd@berrnd.de>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2020\n"
+"Language-Team: Slovak (Slovakia) (https://www.transifex.com/grocy/teams/93189/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
+"X-Domain: grocy/component_translations\n"
+
+msgid "timeago_locale"
+msgstr "sk"
+
+msgid "timeago_nan"
+msgstr "pred NaN rokmi"
+
+msgid "moment_locale"
+msgstr "sk"
+
+msgid "datatables_localization"
+msgstr ""
+"{\"sEmptyTable\":\"Nie sú k dispozícii žiadne dáta\",\"sInfo\":\"Záznamy "
+"_START_ až _END_ z celkom _TOTAL_\",\"sInfoEmpty\":\"Záznamy 0 až 0 z celkom"
+" 0 \",\"sInfoFiltered\":\"(vyfiltrované spomedzi _MAX_ "
+"záznamov)\",\"sInfoPostFix\":\"\",\"sInfoThousands\":\",\",\"sLengthMenu\":\"Zobraz"
+" _MENU_ "
+"záznamov\",\"sLoadingRecords\":\"Načítavam...\",\"sProcessing\":\"Spracúvam...\",\"sSearch\":\"Hľadať:\",\"sZeroRecords\":\"Nenašli"
+" sa žiadne vyhovujúce "
+"záznamy\",\"oPaginate\":{\"sFirst\":\"Prvá\",\"sLast\":\"Posledná\",\"sNext\":\"Nasledujúca\",\"sPrevious\":\"Predchádzajúca\"},\"oAria\":{\"sSortAscending\":\":"
+" aktivujte na zoradenie stĺpca vzostupne\",\"sSortDescending\":\": aktivujte"
+" na zoradenie stĺpca zostupne\"}}"
+
+msgid "summernote_locale"
+msgstr "sk-SK"
+
+msgid "fullcalendar_locale"
+msgstr "sk"
+
+msgid "bootstrap-select_locale"
+msgstr "sk_SK"

localization/sk_SK/demo_data.po

@@ -0,0 +1,361 @@
+# Translators:
+# Jose Riha <jose1711@gmail.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Jose Riha <jose1711@gmail.com>, 2020\n"
+"Language-Team: Slovak (Slovakia) (https://www.transifex.com/grocy/teams/93189/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
+"X-Domain: grocy/demo_data\n"
+
+msgid "Cookies"
+msgstr "Sušienky"
+
+msgid "Chocolate"
+msgstr "Čokoláda"
+
+msgid "Pantry"
+msgstr "Komora"
+
+msgid "Candy cupboard"
+msgstr "Skrinka so sladkosťami"
+
+msgid "Tinned food cupboard"
+msgstr "Skrinka s konzervami"
+
+msgid "Fridge"
+msgstr "Chladnička"
+
+msgid "Piece"
+msgid_plural "Pieces"
+msgstr[0] "Kus"
+msgstr[1] "Kusy"
+msgstr[2] "Kusov"
+msgstr[3] "Kusov"
+
+msgid "Pack"
+msgid_plural "Packs"
+msgstr[0] "Balenie"
+msgstr[1] "Balenia"
+msgstr[2] "Balení"
+msgstr[3] "Balení"
+
+msgid "Glass"
+msgid_plural "Glasses"
+msgstr[0] "Pohár"
+msgstr[1] "Poháre"
+msgstr[2] "Pohárov"
+msgstr[3] "Pohárov"
+
+msgid "Tin"
+msgid_plural "Tins"
+msgstr[0] "Plechovka"
+msgstr[1] "Plechovky"
+msgstr[2] "Plechoviek"
+msgstr[3] "Plechoviek"
+
+msgid "Can"
+msgid_plural "Cans"
+msgstr[0] "Konzerva"
+msgstr[1] "Konzervy"
+msgstr[2] "Konzerv"
+msgstr[3] "Konzerv"
+
+msgid "Bunch"
+msgid_plural "Bunches"
+msgstr[0] "Strapec"
+msgstr[1] "Strapce"
+msgstr[2] "Strapcov"
+msgstr[3] "Strapcov"
+
+msgid "Gummy bears"
+msgstr "Gumoví medvedíci"
+
+msgid "Crisps"
+msgstr "Čipsy"
+
+msgid "Eggs"
+msgstr "Vajcia"
+
+msgid "Noodles"
+msgstr "Rezance"
+
+msgid "Pickles"
+msgstr "Čalamáda"
+
+msgid "Gulash soup"
+msgstr "Guláš"
+
+msgid "Yogurt"
+msgstr "Jogurt"
+
+msgid "Cheese"
+msgstr "Syr"
+
+msgid "Cold cuts"
+msgstr "Nárezy"
+
+msgid "Paprika"
+msgstr "Paprika"
+
+msgid "Cucumber"
+msgstr "Uhorka"
+
+msgid "Radish"
+msgstr "Reďkovka"
+
+msgid "Tomato"
+msgstr "Paradajka"
+
+msgid "Changed towels in the bathroom"
+msgstr "Vymenené uteráky v kúpeľni"
+
+msgid "Cleaned the kitchen floor"
+msgstr "Umytá dlážka v kuchyni"
+
+msgid "Warranty ends"
+msgstr "Záruka končí"
+
+msgid "TV remote control"
+msgstr "Diaľkové ovládanie TV"
+
+msgid "Alarm clock"
+msgstr "Budík"
+
+msgid "Heat remote control"
+msgstr "Diaľkové ovládanie klimatizácie"
+
+msgid "Lawn mowed in the garden"
+msgstr "Pokosený trávnik v záhrade"
+
+msgid "Some good snacks"
+msgstr "Nejaká dobrá mňamka"
+
+msgid "Pizza dough"
+msgstr "Cesto na pizzu"
+
+msgid "Sieved tomatoes"
+msgstr "Pretlak"
+
+msgid "Salami"
+msgstr "Saláma"
+
+msgid "Toast"
+msgstr "Hrianka"
+
+msgid "Minced meat"
+msgstr "Mleté mäso"
+
+msgid "Pizza"
+msgstr "Pizza"
+
+msgid "Spaghetti bolognese"
+msgstr "Boloňské špagety"
+
+msgid "Sandwiches"
+msgstr "Sendviče"
+
+msgid "English"
+msgstr "Angličtina"
+
+msgid "German"
+msgstr "Nemčina"
+
+msgid "Italian"
+msgstr "Taliančina"
+
+msgid "This is the note content of the recipe ingredient"
+msgstr "Toto je obsah poznámky pre ingredienciu"
+
+msgid "Demo User"
+msgstr "Používateľ dema"
+
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] "Gram"
+msgstr[1] "Gramy"
+msgstr[2] "Gramov"
+msgstr[3] "Gramov"
+
+msgid "Flour"
+msgstr "Múka"
+
+msgid "Pancakes"
+msgstr "Palacinky"
+
+msgid "Sugar"
+msgstr "Cukor"
+
+msgid "Home"
+msgstr "Domov"
+
+msgid "Life"
+msgstr "Život"
+
+msgid "Projects"
+msgstr "Projekty"
+
+msgid "Repair the garage door"
+msgstr "Opraviť garážové dvere"
+
+msgid "Fork and improve grocy"
+msgstr "Forknúť a vylepšiť grocy"
+
+msgid "Find a solution for what to do when I forget the door keys"
+msgstr "Nájsť riešenie čo robiť, keď zabudnem kľúče od domu"
+
+msgid "Sweets"
+msgstr "Sladkosti"
+
+msgid "Bakery products"
+msgstr "Pekárenské výrobky"
+
+msgid "Tinned food"
+msgstr "Jedlo v konzerve"
+
+msgid "Butchery products"
+msgstr "Mäsové výrobky"
+
+msgid "Vegetables/Fruits"
+msgstr "Zelenina/Ovocie"
+
+msgid "Refrigerated products"
+msgstr "Chladené výrobky"
+
+msgid "Coffee machine"
+msgstr "Kávovar"
+
+msgid "Dishwasher"
+msgstr "Umývačka riadu"
+
+msgid "Liter"
+msgstr "Liter"
+
+msgid "Liters"
+msgstr "Litre"
+
+msgid "Bottle"
+msgstr "Fľaša"
+
+msgid "Bottles"
+msgstr "Fľaše"
+
+msgid "Milk"
+msgstr "Mlieko"
+
+msgid "Chocolate sauce"
+msgstr "Čokoládová poleva"
+
+msgid "Milliliters"
+msgstr "Mililitre"
+
+msgid "Milliliter"
+msgstr "Mililiter"
+
+msgid "Bottom"
+msgstr "Základ"
+
+msgid "Topping"
+msgstr "Poleva"
+
+msgid "French"
+msgstr "Francúzština"
+
+msgid "Turkish"
+msgstr "Turečtina"
+
+msgid "Spanish"
+msgstr "Španielčina"
+
+msgid "Russian"
+msgstr "Ruština"
+
+msgid "The thing which happens on the 5th of every month"
+msgstr "Vec, ktorá sa deje 5. v každom mesiaci"
+
+msgid "The thing which happens daily"
+msgstr "Vec, ktorá sa deje každý deň"
+
+msgid "The thing which happens on Mondays and Wednesdays"
+msgstr "Vec, ktorá sa deje pondelky a stredy"
+
+msgid "Swedish"
+msgstr "Švédčina"
+
+msgid "Polish"
+msgstr "Poľština"
+
+msgid "Milk Chocolate"
+msgstr "Mliečna čokoláda"
+
+msgid "Dark Chocolate"
+msgstr "Horká čokoláda"
+
+msgid "Slice"
+msgid_plural "Slices"
+msgstr[0] "Krajec"
+msgstr[1] "Krajce"
+msgstr[2] "Krajcov"
+msgstr[3] "Krajcov"
+
+msgid "Example userentity"
+msgstr "Príklad používateľskej entity"
+
+msgid "This is an example user entity..."
+msgstr "Toto je prázdna používateľská entita..."
+
+msgid "Custom field"
+msgstr "Vlastné pole"
+
+msgid "Example field value..."
+msgstr "Príklad hodnoty poľa..."
+
+msgid "Waffle rolls"
+msgstr "Lievance"
+
+msgid "Danish"
+msgstr "Dánčina"
+
+msgid "Dutch"
+msgstr "Holandčina"
+
+msgid "Norwegian"
+msgstr "Nórčina"
+
+msgid "Demo"
+msgstr "Demo"
+
+msgid "Stable version"
+msgstr "Stabilná verzia"
+
+msgid "Preview version"
+msgstr "Vývojová verzia"
+
+msgid "current release"
+msgstr "aktuálne vydanie"
+
+msgid "not yet released"
+msgstr "zatiaľ nevydané"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portugalčina (brazílska)"
+
+msgid "This is a note"
+msgstr "Toto je poznámka"
+
+msgid "Freezer"
+msgstr "Mraznička"
+
+msgid "Hungarian"
+msgstr "Maďarčina"
+
+msgid "Slovak"
+msgstr "Slovenčina"

localization/sk_SK/stock_transaction_types.po

@@ -0,0 +1,44 @@
+# Translators:
+# Jose Riha <jose1711@gmail.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Jose Riha <jose1711@gmail.com>, 2020\n"
+"Language-Team: Slovak (Slovakia) (https://www.transifex.com/grocy/teams/93189/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
+"X-Domain: grocy/stock_transaction_types\n"
+
+msgid "purchase"
+msgstr "kúpiť"
+
+msgid "transfer_from"
+msgstr "prevod_z"
+
+msgid "transfer_to"
+msgstr "prevod_na"
+
+msgid "consume"
+msgstr "spotrebovať"
+
+msgid "inventory-correction"
+msgstr "inventár-oprava"
+
+msgid "product-opened"
+msgstr "výrobok-otvorený"
+
+msgid "stock-edit-old"
+msgstr "zásoby-úpravy-starý"
+
+msgid "stock-edit-new"
+msgstr "zásoby-úpravy-nový"
+
+msgid "self-production"
+msgstr "samoprodukcia"

localization/sk_SK/userfield_types.po

@@ -0,0 +1,47 @@
+# Translators:
+# Jose Riha <jose1711@gmail.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:43+0000\n"
+"Last-Translator: Jose Riha <jose1711@gmail.com>, 2020\n"
+"Language-Team: Slovak (Slovakia) (https://www.transifex.com/grocy/teams/93189/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
+"X-Domain: grocy/userfield_types\n"
+
+msgid "text-single-line"
+msgstr "text-jeden-riadok"
+
+msgid "text-multi-line"
+msgstr "text-viac-riadkov"
+
+msgid "number-integral"
+msgstr "číslo-celé"
+
+msgid "number-decimal"
+msgstr "číslo-desatinné"
+
+msgid "date"
+msgstr "dátum"
+
+msgid "datetime"
+msgstr "dátum a čas"
+
+msgid "checkbox"
+msgstr "zaškrtávacie políčko"
+
+msgid "preset-list"
+msgstr "voľby-zoznam"
+
+msgid "preset-checklist"
+msgstr "voľby-zaškrtávací-zoznam"
+
+msgid "link"
+msgstr "odkaz"

localization/stock_transaction_types.pot

@@ -15,6 +15,12 @@ msgstr ""
 msgid "purchase"
 msgstr ""
 
+msgid "transfer_from"
+msgstr ""
+
+msgid "transfer_to"
+msgstr ""
+
 msgid "consume"
 msgstr ""
 
@@ -23,3 +29,12 @@ msgstr ""
 
 msgid "product-opened"
 msgstr ""
+
+msgid "stock-edit-old"
+msgstr ""
+
+msgid "stock-edit-new"
+msgstr ""
+
+msgid "self-production"
+msgstr ""

localization/strings.pot

@@ -917,7 +917,7 @@ msgstr ""
 msgid "Mark %1$s of %2$s as open"
 msgstr ""
 
-msgid "When a product was marked as opened, the best before date will be replaced by today + this amount of days (a value of 0 disables this)"
+msgid "When this product was marked as opened, the best before date will be replaced by today + this amount of days (a value of 0 disables this)"
 msgstr ""
 
 msgid "Default best before days after opened"
@@ -929,9 +929,6 @@ msgstr ""
 msgid "Mark as opened"
 msgstr ""
 
-msgid "Expires on %1$s; Bought on %2$s"
-msgstr ""
-
 msgid "Not opened"
 msgstr ""
 
@@ -1210,6 +1207,9 @@ msgstr ""
 msgid "Expiring soon days"
 msgstr ""
 
+msgid "Default location"
+msgstr ""
+
 msgid "Default amount for purchase"
 msgstr ""
 
@@ -1543,3 +1543,171 @@ msgstr ""
 
 msgid "Clear"
 msgstr ""
+
+msgid "Are you sure to remove the included recipe \"%s\"?"
+msgstr ""
+
+msgid "Period interval"
+msgstr ""
+
+msgid "This means the next execution of this chore should only be scheduled every %s days"
+msgstr ""
+
+msgid "This means the next execution of this chore should only be scheduled every %s weeks"
+msgstr ""
+
+msgid "This means the next execution of this chore should only be scheduled every %s months"
+msgstr ""
+
+msgid "This means the next execution of this chore is scheduled 1 year after the last execution"
+msgstr ""
+
+msgid "This means the next execution of this chore should only be scheduled every %s years"
+msgstr ""
+
+msgid "Transfer"
+msgstr ""
+
+msgid "From location"
+msgstr ""
+
+msgid "To location"
+msgstr ""
+
+msgid "There are no units available at this location"
+msgstr ""
+
+msgid "Amount: %1$s; Expires on %2$s; Bought on %3$s"
+msgstr ""
+
+msgid "Transfered %1$s of %2$s from %3$s to %4$s"
+msgstr ""
+
+msgid "Show stock entries"
+msgstr ""
+
+msgid "Stock entries"
+msgstr ""
+
+msgid "Best before date"
+msgstr ""
+
+msgid "Purchased date"
+msgstr ""
+
+msgid "Consume all %s for this stock entry"
+msgstr ""
+
+msgid "The amount cannot be lower than %1$s"
+msgstr ""
+
+msgid "Stock entry successfully updated"
+msgstr ""
+
+msgid "Edit stock entry"
+msgstr ""
+
+msgid "Camera access is on only possible when supported and allowed by your browser and when grocy is served via a secure (https://) connection"
+msgstr ""
+
+msgid "Keep screen on"
+msgstr ""
+
+msgid "Keep screen on while displaying a \"fullscreen-card\""
+msgstr ""
+
+msgid "A purchased date is required"
+msgstr ""
+
+msgid "When a product is selected, one unit (per serving in purchase quantity unit) will be added to stock on consuming this recipe"
+msgstr ""
+
+msgid "Produces product"
+msgstr ""
+
+msgid "This booking cannot be undone"
+msgstr ""
+
+msgid "Booking does not exist or was already undone"
+msgstr ""
+
+msgid "Are you sure to delete API key \"%s\"?"
+msgstr ""
+
+msgid "Add note"
+msgstr ""
+
+msgid "Add note to %s"
+msgstr ""
+
+msgid "per day"
+msgstr ""
+
+msgid "Compact view"
+msgstr ""
+
+msgid "Normal view"
+msgstr ""
+
+msgid "Only undone items"
+msgstr ""
+
+msgid "Add product"
+msgstr ""
+
+msgid "Add product to %s"
+msgstr ""
+
+msgid "Consume all ingredients needed by this weeks recipes or products"
+msgstr ""
+
+msgid "Meal plan recipe"
+msgstr ""
+
+msgid "Meal plan note"
+msgstr ""
+
+msgid "Meal plan product"
+msgstr ""
+
+msgid "Scan mode"
+msgstr ""
+
+msgid "on"
+msgstr ""
+
+msgid "off"
+msgstr ""
+
+msgid "Scan mode is on but not all required fields could be populated automatically"
+msgstr ""
+
+msgid "Is freezer"
+msgstr ""
+
+msgid "When moving products from/to a freezer location, the products best before date is automatically adjusted according to the product settings"
+msgstr ""
+
+msgid "On moving this product to a freezer location (so when freezing it), the best before date will be replaced by today + this amount of days"
+msgstr ""
+
+msgid "Default best before days after freezing"
+msgstr ""
+
+msgid "On moving this product from a freezer location (so when thawing it), the best before date will be replaced by today + this amount of days"
+msgstr ""
+
+msgid "Default best before days after thawing"
+msgstr ""
+
+msgid "This cannot be the same as the \"From\" location"
+msgstr ""
+
+msgid "Thawed"
+msgstr ""
+
+msgid "Frozen"
+msgstr ""
+
+msgid "Are you sure to delete userentity \"%s\"?"
+msgstr ""

localization/sv_SE/chore_assignment_types.po

@@ -1,3 +1,6 @@
+# Translators:
+# Benjamin Tayehanpour <transifex@benjamin.tayehanpour.se>, 2019
+# Peter Wickenberg <peter@wickenberg.nu>, 2019
 # 
 msgid ""
 msgstr ""
@@ -5,6 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-09-17 10:45+0000\n"
+"Last-Translator: Peter Wickenberg <peter@wickenberg.nu>, 2019\n"
 "Language-Team: Swedish (Sweden) (https://www.transifex.com/grocy/teams/93189/sv_SE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,13 +18,13 @@ msgstr ""
 "X-Domain: grocy/chore_assignment_types\n"
 
 msgid "no-assignment"
-msgstr ""
+msgstr "Ingen uppgift"
 
 msgid "who-least-did-first"
-msgstr ""
+msgstr "Den som gjorde minst går först"
 
 msgid "random"
-msgstr ""
+msgstr "Slumpmässig"
 
 msgid "in-alphabetical-order"
-msgstr ""
+msgstr "I alfabetisk ordning"

localization/sv_SE/chore_period_types.po

@@ -1,5 +1,6 @@
 # Translators:
 # Bernd Bestel <bernd@berrnd.de>, 2019
+# Peter Wickenberg <peter@wickenberg.nu>, 2019
 # 
 msgid ""
 msgstr ""
@@ -7,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Peter Wickenberg <peter@wickenberg.nu>, 2019\n"
 "Language-Team: Swedish (Sweden) (https://www.transifex.com/grocy/teams/93189/sv_SE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,3 +31,6 @@ msgstr "Veckovis"
 
 msgid "monthly"
 msgstr "Månadsvis"
+
+msgid "yearly"
+msgstr "Årligen"

localization/sv_SE/demo_data.po

@@ -2,6 +2,7 @@
 # Mathias Fröjd <info@mcfrojd.com>, 2019
 # Bernd Bestel <bernd@berrnd.de>, 2019
 # Fredrik Hendeberg <fredrik@hendeberg.com>, 2019
+# Peter Wickenberg <peter@wickenberg.nu>, 2019
 # 
 msgid ""
 msgstr ""
@@ -9,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Fredrik Hendeberg <fredrik@hendeberg.com>, 2019\n"
+"Last-Translator: Peter Wickenberg <peter@wickenberg.nu>, 2019\n"
 "Language-Team: Swedish (Sweden) (https://www.transifex.com/grocy/teams/93189/sv_SE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -162,9 +163,6 @@ msgstr "Tysk"
 msgid "Italian"
 msgstr "Italienska"
 
-msgid "Demo in different language"
-msgstr "Demo på olika språk"
-
 msgid "This is the note content of the recipe ingredient"
 msgstr "Detta är anteckningsinnehållet i receptens ingrediens"
 
@@ -285,27 +283,66 @@ msgid "Polish"
 msgstr "Polska"
 
 msgid "Milk Chocolate"
-msgstr ""
+msgstr "Mjölkchoklad"
 
 msgid "Dark Chocolate"
-msgstr ""
+msgstr "Mörk chocklad"
 
 msgid "Slice"
 msgid_plural "Slices"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Skiva"
+msgstr[1] "Skivor"
 
 msgid "Example userentity"
-msgstr ""
+msgstr "Exempel användarenhet"
 
 msgid "This is an example user entity..."
-msgstr ""
+msgstr "Detta är ett exempel på en användarenhet..."
 
 msgid "Custom field"
-msgstr ""
+msgstr "Anpassat fält"
 
 msgid "Example field value..."
-msgstr ""
+msgstr "Anpassat fält värde..."
 
 msgid "Waffle rolls"
+msgstr "Våffelrullar"
+
+msgid "Danish"
+msgstr "Danska"
+
+msgid "Dutch"
+msgstr "Hollänska"
+
+msgid "Norwegian"
+msgstr "Norska"
+
+msgid "Demo"
+msgstr "Demo"
+
+msgid "Stable version"
+msgstr "Stabil version"
+
+msgid "Preview version"
+msgstr "Förhandsgrandskningsversion"
+
+msgid "current release"
+msgstr "Aktuell version"
+
+msgid "not yet released"
+msgstr "osläppt version"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portugisiska (Brasilien)"
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
 msgstr ""

localization/sv_SE/userfield_types.po

@@ -1,5 +1,8 @@
 # Translators:
 # Bernd Bestel <bernd@berrnd.de>, 2019
+# Fredrik Hendeberg <fredrik@hendeberg.com>, 2019
+# Jesper Sandström <jesper@languageconsulting.se>, 2019
+# Peter Wickenberg <peter@wickenberg.nu>, 2019
 # 
 msgid ""
 msgstr ""
@@ -7,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:43+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Last-Translator: Peter Wickenberg <peter@wickenberg.nu>, 2019\n"
 "Language-Team: Swedish (Sweden) (https://www.transifex.com/grocy/teams/93189/sv_SE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,13 +23,13 @@ msgid "text-single-line"
 msgstr "Text (en rad)"
 
 msgid "text-multi-line"
-msgstr "Text (multipla rader)"
+msgstr "Text (flera rader)"
 
 msgid "number-integral"
-msgstr "Nummer (integral)"
+msgstr "Antal (heltal)"
 
 msgid "number-decimal"
-msgstr "Nummer (decimal)"
+msgstr "Antal (decimal)"
 
 msgid "date"
 msgstr "Datum (utan tid)"
@@ -36,3 +39,12 @@ msgstr "Datum & tid"
 
 msgid "checkbox"
 msgstr "Kryssruta"
+
+msgid "preset-list"
+msgstr "mall-lista"
+
+msgid "preset-checklist"
+msgstr "förchecklista"
+
+msgid "link"
+msgstr "länk"

middleware/ApiKeyAuthMiddleware.php

@@ -22,7 +22,7 @@ class ApiKeyAuthMiddleware extends BaseMiddleware
 		$route = $request->getAttribute('route');
 		$routeName = $route->getName();
 
-		if (GROCY_IS_DEMO_INSTALL || GROCY_IS_EMBEDDED_INSTALL || GROCY_DISABLE_AUTH)
+		if (GROCY_MODE === 'dev' || GROCY_MODE === 'demo' || GROCY_MODE === 'prerelease' || GROCY_IS_EMBEDDED_INSTALL || GROCY_DISABLE_AUTH)
 		{
 			define('GROCY_AUTHENTICATED', true);
 			$response = $next($request, $response);

middleware/SessionAuthMiddleware.php

@@ -25,7 +25,7 @@ class SessionAuthMiddleware extends BaseMiddleware
 		{
 			$response = $next($request, $response);
 		}
-		elseif (GROCY_IS_DEMO_INSTALL || GROCY_IS_EMBEDDED_INSTALL || GROCY_DISABLE_AUTH)
+		elseif (GROCY_MODE === 'dev' || GROCY_MODE === 'demo' || GROCY_MODE === 'prerelease' || GROCY_IS_EMBEDDED_INSTALL || GROCY_DISABLE_AUTH)
 		{
 			$user = $sessionService->GetDefaultUser();
 			define('GROCY_AUTHENTICATED', true);

migrations/0093.sql

@@ -0,0 +1,41 @@
+DROP VIEW recipes_nestings_resolved;
+CREATE VIEW recipes_nestings_resolved
+AS
+WITH RECURSIVE r1(recipe_id, includes_recipe_id, includes_servings)
+AS (
+	SELECT id, id, 1
+	FROM recipes
+	
+	UNION ALL
+	
+	SELECT rn.recipe_id, r1.includes_recipe_id, rn.servings
+	FROM recipes_nestings rn, r1 r1
+	WHERE rn.includes_recipe_id = r1.recipe_id
+)
+SELECT
+	*,
+	1 AS id -- Dummy, LessQL needs an id column
+FROM r1;
+
+CREATE TRIGGER prevent_self_nested_recipes_INS BEFORE INSERT ON recipes_nestings
+BEGIN
+SELECT CASE WHEN((
+	SELECT 1
+	FROM recipes_nestings
+	WHERE NEW.recipe_id = NEW.includes_recipe_id
+	)
+	NOTNULL) THEN RAISE(ABORT, "Recursive nested recipe detected") END;
+END;
+
+CREATE TRIGGER prevent_self_nested_recipes_UPD BEFORE UPDATE ON recipes_nestings
+BEGIN
+SELECT CASE WHEN((
+	SELECT 1
+	FROM recipes_nestings
+	WHERE NEW.recipe_id = NEW.includes_recipe_id
+	)
+	NOTNULL) THEN RAISE(ABORT, "Recursive nested recipe detected") END;
+END;
+
+DELETE FROM recipes_nestings
+WHERE recipe_id = includes_recipe_id;

migrations/0094.sql

@@ -0,0 +1,48 @@
+ALTER TABLE chores
+ADD period_interval INTEGER NOT NULL DEFAULT 1 CHECK(period_interval > 0);
+
+DROP VIEW chores_current;
+CREATE VIEW chores_current
+AS
+SELECT
+	x.chore_id,
+	x.last_tracked_time,
+	CASE WHEN x.rollover = 1 AND DATETIME('now', 'localtime') > x.next_estimated_execution_time THEN
+		DATETIME(STRFTIME('%Y-%m-%d', DATETIME('now', 'localtime')) || ' ' || STRFTIME('%H:%M:%S', x.next_estimated_execution_time))
+	ELSE
+		x.next_estimated_execution_time
+	END AS next_estimated_execution_time,
+	x.track_date_only,
+	x.next_execution_assigned_to_user_id
+FROM (
+
+SELECT
+	h.id AS chore_id,
+	MAX(l.tracked_time) AS last_tracked_time,
+	CASE h.period_type
+		WHEN 'manually' THEN '2999-12-31 23:59:59'
+		WHEN 'dynamic-regular' THEN DATETIME(MAX(l.tracked_time), '+' || CAST(h.period_days AS TEXT) || ' day')
+		WHEN 'daily' THEN DATETIME(IFNULL(MAX(l.tracked_time), DATETIME('now', 'localtime')), '+' || CAST(h.period_interval AS TEXT) || ' day')
+		WHEN 'weekly' THEN
+			CASE
+				WHEN period_config LIKE '%sunday%' THEN DATETIME(IFNULL(MAX(l.tracked_time), DATETIME('now', 'localtime')), '1 days', '+' || CAST((h.period_interval - 1) * 7 AS TEXT) || ' days', 'weekday 0')
+				WHEN period_config LIKE '%monday%' THEN DATETIME(IFNULL(MAX(l.tracked_time), DATETIME('now', 'localtime')), '1 days', '+' || CAST((h.period_interval - 1) * 7 AS TEXT) || ' days', 'weekday 1')
+				WHEN period_config LIKE '%tuesday%' THEN DATETIME(IFNULL(MAX(l.tracked_time), DATETIME('now', 'localtime')), '1 days', '+' || CAST((h.period_interval - 1) * 7 AS TEXT) || ' days', 'weekday 2')
+				WHEN period_config LIKE '%wednesday%' THEN DATETIME(IFNULL(MAX(l.tracked_time), DATETIME('now', 'localtime')), '1 days', '+' || CAST((h.period_interval - 1) * 7 AS TEXT) || ' days', 'weekday 3')
+				WHEN period_config LIKE '%thursday%' THEN DATETIME(IFNULL(MAX(l.tracked_time), DATETIME('now', 'localtime')), '1 days', '+' || CAST((h.period_interval - 1) * 7 AS TEXT) || ' days', 'weekday 4')
+				WHEN period_config LIKE '%friday%' THEN DATETIME(IFNULL(MAX(l.tracked_time), DATETIME('now', 'localtime')), '1 days', '+' || CAST((h.period_interval - 1) * 7 AS TEXT) || ' days', 'weekday 5')
+				WHEN period_config LIKE '%saturday%' THEN DATETIME(IFNULL(MAX(l.tracked_time), DATETIME('now', 'localtime')), '1 days', '+' || CAST((h.period_interval - 1) * 7 AS TEXT) || ' days', 'weekday 6')
+			END
+		WHEN 'monthly' THEN DATETIME(IFNULL(MAX(l.tracked_time), DATETIME('now', 'localtime')), '+' || CAST(h.period_interval AS TEXT) || ' month', 'start of month', '+' || CAST(h.period_days - 1 AS TEXT) || ' day')
+		WHEN 'yearly' THEN DATETIME(IFNULL(MAX(l.tracked_time), DATETIME('now', 'localtime')), '+' || CAST(h.period_interval AS TEXT) || ' years')
+	END AS next_estimated_execution_time,
+	h.track_date_only,
+	h.rollover,
+	h.next_execution_assigned_to_user_id
+FROM chores h
+LEFT JOIN chores_log l
+	ON h.id = l.chore_id
+	AND l.undone = 0
+GROUP BY h.id, h.period_days
+
+) x;

migrations/0095.sql

@@ -0,0 +1,64 @@
+CREATE TRIGGER set_products_default_location_if_empty_stock AFTER INSERT ON stock
+BEGIN
+	UPDATE stock
+	SET location_id = (SELECT location_id FROM products where id = product_id)
+	WHERE id = NEW.id
+		AND location_id IS NULL;
+END;
+
+UPDATE stock
+SET location_id = (SELECT location_id FROM products where id = product_id)
+WHERE location_id IS NULL;
+
+CREATE TRIGGER set_products_default_location_if_empty_stock_log AFTER INSERT ON stock_log
+BEGIN
+	UPDATE stock_log
+	SET location_id = (SELECT location_id FROM products where id = product_id)
+	WHERE id = NEW.id
+		AND location_id IS NULL;
+END;
+
+UPDATE stock_log
+SET location_id = (SELECT location_id FROM products where id = product_id)
+WHERE location_id IS NULL;
+
+ALTER TABLE stock_log
+ADD correlation_id TEXT;
+
+ALTER TABLE stock_log
+ADD transaction_id TEXT;
+
+ALTER TABLE stock_log
+ADD stock_row_id INTEGER;
+
+DROP VIEW stock_current_locations;
+CREATE VIEW stock_current_locations
+AS
+SELECT
+	1 AS id, -- Dummy, LessQL needs an id column
+	s.product_id,
+	s.location_id AS location_id,
+	l.name AS location_name
+FROM stock s
+JOIN locations l
+	ON s.location_id = l.id
+GROUP BY s.product_id, s.location_id, l.name;
+
+ALTER TABLE recipes
+ADD product_id INTEGER;
+
+DROP VIEW recipes_resolved;
+CREATE VIEW recipes_resolved
+AS
+SELECT
+	1 AS id, -- Dummy, LessQL needs an id column
+	r.id AS recipe_id,
+	IFNULL(MIN(rpr.need_fulfilled), 1) AS need_fulfilled,
+	IFNULL(MIN(rpr.need_fulfilled_with_shopping_list), 1) AS need_fulfilled_with_shopping_list, (
+	SELECT COUNT(*) FROM recipes_pos_resolved WHERE recipe_id = r.id AND need_fulfilled = 0) AS missing_products_count,
+	IFNULL(SUM(rpr.costs), 0) AS costs,
+	IFNULL(SUM(rpr.calories), 0) AS calories
+FROM recipes r
+LEFT JOIN recipes_pos_resolved rpr
+	ON r.id = rpr.recipe_id
+GROUP BY r.id;

migrations/0096.sql

@@ -0,0 +1,163 @@
+PRAGMA legacy_alter_table = ON;
+
+ALTER TABLE meal_plan RENAME TO meal_plan_old;
+
+CREATE TABLE meal_plan (
+	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
+	day DATE NOT NULL,
+	type TEXT DEFAULT 'recipe',
+	recipe_id INTEGER,
+	recipe_servings INTEGER DEFAULT 1,
+	note TEXT,
+	product_id INTEGER,
+	product_amount REAL DEFAULT 0,
+	product_qu_id INTEGER,
+	row_created_timestamp DATETIME DEFAULT (datetime('now', 'localtime'))
+);
+
+INSERT INTO meal_plan
+	(day, recipe_id, recipe_servings, row_created_timestamp, type)
+SELECT day, recipe_id, servings, row_created_timestamp, 'recipe'
+FROM meal_plan_old;
+
+DROP TABLE meal_plan_old;
+
+CREATE TRIGGER create_internal_recipe AFTER INSERT ON meal_plan
+BEGIN
+	/* This contains practically the same logic as the trigger remove_internal_recipe */
+
+	-- Create a recipe per day
+	DELETE FROM recipes
+	WHERE name = NEW.day
+		AND type = 'mealplan-day';
+
+	INSERT OR REPLACE INTO recipes
+		(id, name, type)
+	VALUES
+		((SELECT MIN(id) - 1 FROM recipes), NEW.day, 'mealplan-day');
+	
+	-- Create a recipe per week
+	DELETE FROM recipes
+	WHERE name = LTRIM(STRFTIME('%Y-%W', NEW.day), '0')
+		AND type = 'mealplan-week';
+
+	INSERT INTO recipes
+		(id, name, type)
+	VALUES
+		((SELECT MIN(id) - 1 FROM recipes), LTRIM(STRFTIME('%Y-%W', NEW.day), '0'), 'mealplan-week');
+	
+	-- Delete all current nestings entries for the day and week recipe
+	DELETE FROM recipes_nestings
+	WHERE recipe_id IN (SELECT id FROM recipes WHERE name = NEW.day AND type = 'mealplan-day')
+		OR recipe_id IN (SELECT id FROM recipes WHERE name = NEW.day AND type = 'mealplan-week');
+
+	-- Add all recipes for this day as included recipes in the day-recipe
+	INSERT INTO recipes_nestings
+		(recipe_id, includes_recipe_id, servings)
+	SELECT (SELECT id FROM recipes WHERE name = NEW.day AND type = 'mealplan-day'), recipe_id, SUM(recipe_servings)
+	FROM meal_plan
+	WHERE day = NEW.day
+		AND type = 'recipe'
+		AND recipe_id IS NOT NULL
+	GROUP BY recipe_id;
+
+	-- Add all recipes for this week as included recipes in the week-recipe
+	INSERT INTO recipes_nestings
+		(recipe_id, includes_recipe_id, servings)
+	SELECT (SELECT id FROM recipes WHERE name = LTRIM(STRFTIME('%Y-%W', NEW.day), '0') AND type = 'mealplan-week'), recipe_id, SUM(recipe_servings)
+	FROM meal_plan
+	WHERE STRFTIME('%Y-%W', day) = STRFTIME('%Y-%W', NEW.day)
+		AND type = 'recipe'
+		AND recipe_id IS NOT NULL
+	GROUP BY recipe_id;
+
+	-- Add all products for this day as ingredients in the day-recipe
+	INSERT INTO recipes_pos
+		(recipe_id, product_id, amount, qu_id)
+	SELECT (SELECT id FROM recipes WHERE name = NEW.day AND type = 'mealplan-day'), product_id, SUM(product_amount), product_qu_id
+	FROM meal_plan
+	WHERE day = NEW.day
+		AND type = 'product'
+		AND product_id IS NOT NULL
+	GROUP BY product_id, product_qu_id;
+
+	-- Add all products for this week as ingredients recipes in the week-recipe
+	INSERT INTO recipes_pos
+		(recipe_id, product_id, amount, qu_id)
+	SELECT (SELECT id FROM recipes WHERE name = LTRIM(STRFTIME('%Y-%W', NEW.day), '0') AND type = 'mealplan-week'), product_id, SUM(product_amount), product_qu_id
+	FROM meal_plan
+	WHERE STRFTIME('%Y-%W', day) = STRFTIME('%Y-%W', NEW.day)
+		AND type = 'product'
+		AND product_id IS NOT NULL
+	GROUP BY product_id, product_qu_id;
+END;
+
+CREATE TRIGGER remove_internal_recipe AFTER DELETE ON meal_plan
+BEGIN
+	/* This contains practically the same logic as the trigger create_internal_recipe */
+
+	-- Create a recipe per day
+	DELETE FROM recipes
+	WHERE name = OLD.day
+		AND type = 'mealplan-day';
+
+	INSERT OR REPLACE INTO recipes
+		(id, name, type)
+	VALUES
+		((SELECT MIN(id) - 1 FROM recipes), OLD.day, 'mealplan-day');
+	
+	-- Create a recipe per week
+	DELETE FROM recipes
+	WHERE name = LTRIM(STRFTIME('%Y-%W', OLD.day), '0')
+		AND type = 'mealplan-week';
+
+	INSERT INTO recipes
+		(id, name, type)
+	VALUES
+		((SELECT MIN(id) - 1 FROM recipes), LTRIM(STRFTIME('%Y-%W', OLD.day), '0'), 'mealplan-week');
+	
+	-- Delete all current nestings entries for the day and week recipe
+	DELETE FROM recipes_nestings
+	WHERE recipe_id IN (SELECT id FROM recipes WHERE name = OLD.day AND type = 'mealplan-day')
+		OR recipe_id IN (SELECT id FROM recipes WHERE name = OLD.day AND type = 'mealplan-week');
+
+	-- Add all recipes for this day as included recipes in the day-recipe
+	INSERT INTO recipes_nestings
+		(recipe_id, includes_recipe_id, servings)
+	SELECT (SELECT id FROM recipes WHERE name = OLD.day AND type = 'mealplan-day'), recipe_id, SUM(recipe_servings)
+	FROM meal_plan
+	WHERE day = OLD.day
+		AND type = 'recipe'
+		AND recipe_id IS NOT NULL
+	GROUP BY recipe_id;
+
+	-- Add all recipes for this week as included recipes in the week-recipe
+	INSERT INTO recipes_nestings
+		(recipe_id, includes_recipe_id, servings)
+	SELECT (SELECT id FROM recipes WHERE name = LTRIM(STRFTIME('%Y-%W', OLD.day), '0') AND type = 'mealplan-week'), recipe_id, SUM(recipe_servings)
+	FROM meal_plan
+	WHERE STRFTIME('%Y-%W', day) = STRFTIME('%Y-%W', OLD.day)
+		AND type = 'recipe'
+		AND recipe_id IS NOT NULL
+	GROUP BY recipe_id;
+
+	-- Add all products for this day as ingredients in the day-recipe
+	INSERT INTO recipes_pos
+		(recipe_id, product_id, amount, qu_id)
+	SELECT (SELECT id FROM recipes WHERE name = OLD.day AND type = 'mealplan-day'), product_id, SUM(product_amount), product_qu_id
+	FROM meal_plan
+	WHERE day = OLD.day
+		AND type = 'product'
+		AND product_id IS NOT NULL
+	GROUP BY product_id, product_qu_id;
+
+	-- Add all products for this week as ingredients recipes in the week-recipe
+	INSERT INTO recipes_pos
+		(recipe_id, product_id, amount, qu_id)
+	SELECT (SELECT id FROM recipes WHERE name = LTRIM(STRFTIME('%Y-%W', OLD.day), '0') AND type = 'mealplan-week'), product_id, SUM(product_amount), product_qu_id
+	FROM meal_plan
+	WHERE STRFTIME('%Y-%W', day) = STRFTIME('%Y-%W', OLD.day)
+		AND type = 'product'
+		AND product_id IS NOT NULL
+	GROUP BY product_id, product_qu_id;
+END;

migrations/0097.sql

@@ -0,0 +1,31 @@
+ALTER TABLE products
+ADD default_best_before_days_after_freezing INTEGER NOT NULL DEFAULT 0;
+
+UPDATE products
+SET default_best_before_days_after_freezing = 0;
+
+ALTER TABLE products
+ADD default_best_before_days_after_thawing INTEGER NOT NULL DEFAULT 0;
+
+UPDATE products
+SET default_best_before_days_after_thawing = 0;
+
+ALTER TABLE locations
+ADD is_freezer TINYINT NOT NULL DEFAULT 0;
+
+UPDATE locations
+SET is_freezer = 0;
+
+DROP VIEW stock_current_locations;
+CREATE VIEW stock_current_locations
+AS
+SELECT
+	1 AS id, -- Dummy, LessQL needs an id column
+	s.product_id,
+	s.location_id AS location_id,
+	l.name AS location_name,
+	l.is_freezer AS location_is_freezer
+FROM stock s
+JOIN locations l
+	ON s.location_id = l.id
+GROUP BY s.product_id, s.location_id, l.name;

package.json

@@ -5,9 +5,11 @@
 		"@danielfarrell/bootstrap-combobox": "https://github.com/berrnd/bootstrap-combobox.git#master",
 		"@fortawesome/fontawesome-free": "^5.11.1",
 		"TagManager": "https://github.com/max-favilli/tagmanager.git#master",
+		"animate.css": "^3.7.2",
 		"bootbox": "^5.3.2",
 		"bootstrap": "^4.3.1",
 		"bootstrap-select": "^1.13.10",
+		"bootstrap-switch-button": "https://github.com/walidbagh/bootstrap-switch-button#Fix-module-export",
 		"chart.js": "^2.8.0",
 		"datatables.net": "^1.10.19",
 		"datatables.net-bs4": "^1.10.19",
@@ -20,15 +22,15 @@
 		"datatables.net-select": "^1.3.0",
 		"datatables.net-select-bs4": "^1.3.0",
 		"fullcalendar": "^3.10.1",
-		"gettext-translator": "^2.1.0",
+		"gettext-translator": "2.1.0",
 		"jquery": "^3.4.1",
 		"jquery-lazy": "^1.7.10",
 		"jquery-serializejson": "^2.9.0",
-		"jquery-ui-dist": "^1.12.1",
 		"moment": "^2.24.0",
+		"nosleep.js": "^0.9.0",
 		"quagga": "^0.12.1",
 		"sprintf-js": "^1.1.2",
-		"startbootstrap-sb-admin": "^4.0.0",
+		"startbootstrap-sb-admin": "4.0.0",
 		"summernote": "^0.8.12",
 		"swagger-ui-dist": "^3.23.10",
 		"tempusdominus-bootstrap-4": "https://github.com/berrnd/tempusdominus-bootstrap-4.git#master",

public/css/grocy.css

@@ -57,6 +57,7 @@ a.discrete-link:focus {
 	top: 0;
 	left: 0;
 	overflow: auto;
+	background-color: #ffffff;
  }
 
  /* Fixes smooth scrolling on iOS */
@@ -65,7 +66,7 @@ a.discrete-link:focus {
 	-webkit-overflow-scrolling: touch;
 }
 
-.fullscreen-card .card-header {
+.fullscreen-card .card-header-fullscreen {
 	z-index: 9999;
 	width: 100%;
 	position: fixed;
@@ -143,7 +144,8 @@ input::-webkit-inner-spin-button {
 	border-radius: 0;
 }
 
-.navbar-nav .dropdown-divider {
+.navbar-nav .dropdown-divider,
+.nav-item-divider {
 	border-top: 2px solid !important;
 	border-color: #d6d6d6 !important;
 }
@@ -317,6 +319,10 @@ html {
 	padding-right: 1.25em !important;
 }
 
+#sidebarResponsive .nav-item-sidebar {
+	line-height: 1;
+}
+
 /* Third party component customizations - Tempus Dominus */
 .bootstrap-datetimepicker-widget.dropdown-menu {
 	width: auto !important;

public/js/extensions.js

@@ -129,3 +129,46 @@ function IsJsonString(text)
 	}
 	return true;
 }
+
+function Delay(callable, delayMilliseconds)
+{
+	var timer = 0;
+	return function()
+	{
+		var context = this;
+		var args = arguments;
+		
+		clearTimeout(timer);
+		timer = setTimeout(function()
+		{
+			callable.apply(context, args);
+		}, delayMilliseconds || 0);
+	};
+}
+
+$.fn.isVisibleInViewport = function(extraHeightPadding = 0)
+{
+	var elementTop = $(this).offset().top;
+	var viewportTop = $(window).scrollTop() - extraHeightPadding;
+	
+	return elementTop + $(this).outerHeight() > viewportTop && elementTop < viewportTop + $(window).height();
+};
+
+function animateCSS(selector, animationName, callback, speed = "faster")
+{
+	var nodes = $(selector);
+	nodes.addClass('animated').addClass(speed).addClass(animationName);
+
+	function handleAnimationEnd()
+	{
+		nodes.removeClass('animated').removeClass(speed).removeClass(animationName);
+		nodes.unbind('animationend', handleAnimationEnd);
+
+		if (typeof callback === 'function')
+		{
+			callback();
+		}
+	}
+
+	nodes.on('animationend', handleAnimationEnd);
+}

public/js/grocy.js

@@ -258,11 +258,29 @@ if (!Grocy.ActiveNav.isEmpty())
 	var menuItem = $('#sidebarResponsive').find("[data-nav-for-page='" + Grocy.ActiveNav + "']");
 	menuItem.addClass('active-page');
 
-	var parentMenuSelector = menuItem.data("sub-menu-of");
-	if (typeof parentMenuSelector !== "undefined")
+	if (menuItem.length)
 	{
-		$(parentMenuSelector).collapse("show");
-		$(parentMenuSelector).prev(".nav-link-collapse").addClass("active-page");
+		var parentMenuSelector = menuItem.data("sub-menu-of");
+		if (typeof parentMenuSelector !== "undefined")
+		{
+			$(parentMenuSelector).collapse("show");
+			$(parentMenuSelector).prev(".nav-link-collapse").addClass("active-page");
+
+			$(parentMenuSelector).on("shown.bs.collapse", function (e)
+			{
+				if (!menuItem.isVisibleInViewport(75))
+				{
+					menuItem[0].scrollIntoView();
+				}
+			})
+		}
+		else
+		{
+			if (!menuItem.isVisibleInViewport(75))
+			{
+				menuItem[0].scrollIntoView();
+			}
+		}
 	}
 }
 
@@ -293,9 +311,9 @@ if (window.localStorage.getItem("sidebar_state") === "collapsed")
 }
 
 $.timeago.settings.allowFuture = true;
-RefreshContextualTimeago = function()
+RefreshContextualTimeago = function(rootSelector = "#page-content")
 {
-	$("time.timeago").each(function()
+	$(rootSelector + " time.timeago").each(function()
 	{
 		var element = $(this);
 
@@ -425,7 +443,7 @@ $(document).on("click", "select", function()
 });
 
 // Auto saving user setting controls
-$(".user-setting-control").on("change", function()
+$(document).on("change", ".user-setting-control", function()
 {
 	var element = $(this);
 	var settingKey = element.attr("data-setting-key");
@@ -526,9 +544,9 @@ $("#about-dialog-link").on("click", function()
 	});
 });
 
-function RefreshLocaleNumberDisplay()
+function RefreshLocaleNumberDisplay(rootSelector = "#page-content")
 {
-	$(".locale-number.locale-number-currency").each(function()
+	$(rootSelector + " .locale-number.locale-number-currency").each(function()
 	{
 		if (isNaN(parseFloat($(this).text())))
 		{
@@ -538,7 +556,7 @@ function RefreshLocaleNumberDisplay()
 		$(this).text(parseFloat($(this).text()).toLocaleString(undefined, { style: "currency", currency: Grocy.Currency }));
 	});
 
-	$(".locale-number.locale-number-quantity-amount").each(function()
+	$(rootSelector + " .locale-number.locale-number-quantity-amount").each(function()
 	{
 		if (isNaN(parseFloat($(this).text())))
 		{
@@ -548,7 +566,7 @@ function RefreshLocaleNumberDisplay()
 		$(this).text(parseFloat($(this).text()).toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: 3 }));
 	});
 
-	$(".locale-number.locale-number-generic").each(function ()
+	$(rootSelector + " .locale-number.locale-number-generic").each(function ()
 	{
 		if (isNaN(parseFloat($(this).text())))
 		{
@@ -614,10 +632,10 @@ $(document).on("click", ".show-as-dialog-link", function(e)
 		backdrop: true,
 		closeButton: false,
 		buttons: {
-			ok: {
-				label: __t('OK'),
-				className: 'btn-success responsive-button',
-				callback: function()
+			cancel: {
+				label: __t('Cancel'),
+				className: 'btn-secondary responsive-button',
+				callback: function ()
 				{
 					bootbox.hideAll();
 				}
@@ -625,3 +643,22 @@ $(document).on("click", ".show-as-dialog-link", function(e)
 		}
 	});
 });
+
+// Default DataTables initialisation settings
+$.extend(true, $.fn.dataTable.defaults, {
+	'paginate': false,
+	'deferRender': true,
+	'language': IsJsonString(__t('datatables_localization')) ? JSON.parse(__t('datatables_localization')) : { },
+	'scrollY': false,
+	'colReorder': true,
+	'stateSave': true,
+	'stateSaveParams': function (settings, data)
+	{
+		data.search.search = "";
+
+		data.columns.forEach(column =>
+		{
+			column.search.search = "";
+		});
+	}
+});