Prepared next release

Wasn't a problem of the web frontend, only possible by externally/manually using the API and not thinking about that that's bullshit.

.devtools/create_release_package.bat

@@ -13,6 +13,6 @@ del "%releasePath%\grocy_%version%.zip"
 7za a -r "%releasePath%\grocy_%version%.zip" "%projectPath%\*" -xr!.* -xr!build.bat -xr!composer.json -xr!composer.lock -xr!package.json -xr!yarn.lock -xr!docs
 7za a "%releasePath%\grocy_%version%.zip" "%projectPath%\public\.htaccess"
 7za rn "%releasePath%\grocy_%version%.zip" .htaccess public\.htaccess
-7za d "%releasePath%\grocy_%version%.zip" data\*.* data\storage data\viewcache\*
+7za d "%releasePath%\grocy_%version%.zip" data\*.* data\storage data\viewcache\* changelog\__TEMPLATE.md
 7za a "%releasePath%\grocy_%version%.zip" "%projectPath%\data\.htaccess"
 7za rn "%releasePath%\grocy_%version%.zip" .htaccess data\.htaccess

.devtools/data_generation_scripts/9999_big_stock.php

@@ -0,0 +1,27 @@
+<?php
+
+// This is executed inside DatabaseMigrationService class/context
+
+use Grocy\Services\StockService;
+
+$PRODUCTS = [3, 4, 5, 6, 7, 8];
+
+$i = 1;
+$days = -1;
+while ($i <= 500)
+{
+	$productId = $PRODUCTS[array_rand($PRODUCTS)];
+	$transactionId1 = $this->getStockService()->AddProduct($productId, 1, date('Y-m-d', strtotime('+180 days')), StockService::TRANSACTION_TYPE_PURCHASE, date('Y-m-d', strtotime("$days days")), XRandomPrice());
+	$transactionId2 = $this->getStockService()->ConsumeProduct($productId, 1, false, StockService::TRANSACTION_TYPE_CONSUME);
+
+	$this->getDatabaseService()->ExecuteDbStatement("UPDATE stock_log SET row_created_timestamp = DATETIME(row_created_timestamp, '$days days') WHERE transaction_id = '$transactionId1'");
+	$this->getDatabaseService()->ExecuteDbStatement("UPDATE stock_log SET row_created_timestamp = DATETIME(row_created_timestamp, '$days days') WHERE transaction_id = '$transactionId2'");
+
+	$days--;
+	$i++;
+}
+
+function XRandomPrice()
+{
+	return mt_rand(2 * 100, 25 * 100) / 100 / 4;
+}

.devtools/data_generation_scripts/9999_lots_recipes.php

@@ -0,0 +1,16 @@
+<?php
+
+// This is executed inside DatabaseMigrationService class/context
+
+use Grocy\Services\RecipesService;
+
+$recipesService = RecipesService::getInstance();
+
+for ($i = 1; $i <= 87; $i++)
+{
+	$recipesService->CopyRecipe(1);
+	$recipesService->CopyRecipe(2);
+	$recipesService->CopyRecipe(3);
+	$recipesService->CopyRecipe(4);
+	$recipesService->CopyRecipe(5);
+}

.devtools/transifex_check_for_new_languages.bat

@@ -0,0 +1,3 @@
+pushd ..
+tx pull --all --resources grocy.strings --minimum-perc=70
+popd

.devtools/transifex_download.bat

@@ -1,6 +1,9 @@
 pushd ..
-tx pull --all --minimum-perc=70 --force
-tx pull --language en_GB --force
+for /d %%d in (localization\*) do (
+	if %%~nxd neq en (
+		tx pull --languages %%~nxd --force
+	)
+)
 copy /Y localization\en\userfield_types.po localization\en_GB\userfield_types.po
 copy /Y localization\en\stock_transaction_types.po localization\en_GB\stock_transaction_types.po
 copy /Y localization\en\component_translations.po localization\en_GB\component_translations.po

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: ["https://grocy.info/#say-thanks"]

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,22 @@
+---
+name: Bug Report
+about: If you've found something that does not work, please report it to help improve
+  grocy
+title: 'Bug: '
+labels: bug
+assignees: ''
+
+---
+
+<!--
+Please make sure to:
+
+- Describe the bug as detailed as possible by providing the exact steps how to reproduce it
+- Attach screenshots where useful
+- Check if the problem was maybe already reported or fixed by searching open and closed issues here
+- Keep it to one topic per issue
+
+Please also try to reproduce the problem on the pre-release demo: => https://demo-prerelease.grocy.info
+- Use a private demo instance to make your example persistent
+- If the problem is not reproducible there, it's most likely not a bug - please use the r/grocy subreddit for general questions / help: => https://www.reddit.com/r/grocy
+-->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,13 +0,0 @@
----
-name: Bug report
-about: If you've found something that does not work, please report it to help improve
-  grocy
-title: 'Bug: '
-labels: bug
-assignees: ''
-
----
-
-Please describe the bug as detailed as possible, provide the steps how to reproduce it and maybe attach screenshots where useful.
-
-Please also check if your bug was maybe already fixed by searching closed issues here or by trying to reproduce your problem on the [pre-release demo](https://demo-prerelease.grocy.info/) (use a *private demo instance* if you want to make your example persistent).

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-    - name: Question / Help
+    - name: Questions / Help
       url: https://www.reddit.com/r/grocy
       about: Please use the r/grocy subreddit for general questions / help

.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,17 @@
+---
+name: Feature Request
+about: Ideas for improvements or new things which you would find useful are always
+  welcome
+title: 'Feature Request: '
+labels: enhancement
+assignees: ''
+
+---
+
+<!--
+Please make sure to:
+
+- Describe what you would find useful
+- Check if your idea was maybe already requested by searching open requests here
+- Keep it to one topic per request
+-->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,11 +0,0 @@
----
-name: Feature request
-about: Ideas for improvements or new things which you would find useful are always
-  welcome
-title: 'Feature request: '
-labels: enhancement
-assignees: ''
-
----
-
-Please describe what you would find useful and please also check (by searching open requests here) if that was maybe already requested.

.github/SECURITY.md

@@ -0,0 +1,5 @@
+grocy is not an enterprise application and neither one you (should) host publicly (means without authentication) on the internet.
+
+So unless something really bad can be abused _unauthenticated_, please just open a regular issue on the [Issue Tracker](https://github.com/grocy/grocy/issues/new/choose).
+
+You can also contact me directly, please see [berrnd.de](https://berrnd.de) for any contact information.

.gitignore

@@ -1,4 +1,5 @@
 /public/node_modules
 /vendor
 /.release
-embedded.txt
+embedded.txt
+.DS_Store

.tx/config

@@ -1,56 +1,56 @@
 [main]
 host = https://www.transifex.com
 
-[grocy.chore_period_types]
-file_filter = localization/<lang>/chore_period_types.po
-source_file = localization/chore_period_types.pot
-source_lang = en
-type = PO
-
-[grocy.chore_assignment_types]
+[o:grocy:p:grocy:r:chore_assignment_types]
 file_filter = localization/<lang>/chore_assignment_types.po
 source_file = localization/chore_assignment_types.pot
 source_lang = en
-type = PO
+type        = PO
 
-[grocy.component_translations]
+[o:grocy:p:grocy:r:chore_period_types]
+file_filter = localization/<lang>/chore_period_types.po
+source_file = localization/chore_period_types.pot
+source_lang = en
+type        = PO
+
+[o:grocy:p:grocy:r:component_translations]
 file_filter = localization/<lang>/component_translations.po
 source_file = localization/component_translations.pot
 source_lang = en
-type = PO
+type        = PO
 
-[grocy.demo_data]
+[o:grocy:p:grocy:r:demo_data]
 file_filter = localization/<lang>/demo_data.po
 source_file = localization/demo_data.pot
 source_lang = en
-type = PO
+type        = PO
 
-[grocy.stock_transaction_types]
-file_filter = localization/<lang>/stock_transaction_types.po
-source_file = localization/stock_transaction_types.pot
-source_lang = en
-type = PO
-
-[grocy.strings]
-file_filter = localization/<lang>/strings.po
-source_file = localization/strings.pot
-source_lang = en
-type = PO
-
-[grocy.userfield_types]
-file_filter = localization/<lang>/userfield_types.po
-source_file = localization/userfield_types.pot
-source_lang = en
-type = PO
-
-[grocy.permissions]
-file_filter = localization/<lang>/permissions.po
-source_file = localization/permissions.pot
-source_lang = en
-type = PO
-
-[grocy.locales]
+[o:grocy:p:grocy:r:locales]
 file_filter = localization/<lang>/locales.po
 source_file = localization/locales.pot
 source_lang = en
-type = PO
+type        = PO
+
+[o:grocy:p:grocy:r:permissions]
+file_filter = localization/<lang>/permissions.po
+source_file = localization/permissions.pot
+source_lang = en
+type        = PO
+
+[o:grocy:p:grocy:r:stock_transaction_types]
+file_filter = localization/<lang>/stock_transaction_types.po
+source_file = localization/stock_transaction_types.pot
+source_lang = en
+type        = PO
+
+[o:grocy:p:grocy:r:strings]
+file_filter = localization/<lang>/strings.po
+source_file = localization/strings.pot
+source_lang = en
+type        = PO
+
+[o:grocy:p:grocy:r:userfield_types]
+file_filter = localization/<lang>/userfield_types.po
+source_file = localization/userfield_types.pot
+source_lang = en
+type        = PO

.vscode/settings.json

@@ -12,6 +12,5 @@
 	"html.format.wrapAttributes": "force",
 	"html.format.wrapLineLength": 0,
 	"php-cs-fixer.formatHtml": true,
-	"php-cs-fixer.autoFixBySemicolon": true,
-	"php-cs-fixer.onsave": true,
-}
+	"php-cs-fixer.autoFixBySemicolon": true
+}

README.md

@@ -7,28 +7,28 @@
 -----
 
 ## Give it a try
+
 - Public demo of the latest stable version (`release` branch) → [https://demo.grocy.info](https://demo.grocy.info)
 - Public demo of the current development version (`master` branch) → [https://demo-prerelease.grocy.info](https://demo-prerelease.grocy.info)
 
-## Questions / Help / Bug reporting / Feature requests
-There is the [r/grocy subreddit](https://www.reddit.com/r/grocy) to connect with other grocy users and getting help.
+## Questions / Help / Bug Reports / Feature Requests
 
-If you've found something that does not work or if you have an idea for an improvement or new things which you would find useful, feel free to open a request on the [issue tracker](https://github.com/grocy/grocy/issues) here.
+- General help and usage questions →  [r/grocy subreddit](https://www.reddit.com/r/grocy)
+- Bug Reports and Feature Requests → [Issue Tracker](https://github.com/grocy/grocy/issues/new/choose)
 
-Please don't send me private messages regarding grocy help. I check the issue tracker and the subreddit pretty much daily, but don't provide grocy support beyond that.
+_Please don't send me private messages or call me regarding grocy help. I check the issue tracker and the subreddit pretty much daily, but don't provide grocy support beyond that._
 
 ## Community contributions
-See the website for a list of community contributed Add-ons / Tools: [https://grocy.info/addons](https://grocy.info/addons)
 
-## Motivation
-A household needs to be managed. I did this so far (almost 10 years) with my first self written software (a C# Windows forms application) and with a bunch of Excel sheets. The software is a pain to use and Excel is Excel. So I searched for and tried different things for a (very) long time, nothing 100 % fitted, so this is my aim for a "complete household management"-thing. ERP your fridge!
+See the website for a list of community contributed Add-ons / Tools. → [https://grocy.info/addons](https://grocy.info/addons)
 
 ## How to install
+
 > Checkout [grocy-desktop](https://github.com/grocy/grocy-desktop), if you want to run grocy without having to manage a webserver just like a normal (Windows) desktop application.
 >
 > Directly download the [latest release](https://releases.grocy.info/latest-desktop) - the installation is nothing more than just clicking 2 times "next".
 
-See [https://grocy.info/links](https://grocy.info/links) for some installation guides and troubleshooting help.
+See the website for some installation guides and troubleshooting help. → [https://grocy.info/links](https://grocy.info/links)
 
 grocy is technically a pretty simple PHP application, so the basic notes to get it running are:
 - Unpack the [latest release](https://releases.grocy.info/latest)
@@ -37,9 +37,8 @@ grocy is technically a pretty simple PHP application, so the basic notes to get
 - The webserver root should point to the `public` directory
 - Include `try_files $uri /index.php$is_args$query_string;` in your location block if you use nginx
   - Or disable URL rewriting (see the option `DISABLE_URL_REWRITING` in `data/config.php`)
-- Based on user reports, the minmimum required/working runtime is PHP 7.2 with SQLite 3.9.0
-  - However, I don't really care about supporting old runtime stuff, currently everything is only tested against (means 100 % works with) PHP 8.0 with SQLite 3.27.2
 - → Default login is user `admin` with password `admin`, please change the password immediately (user menu at the top right corner)
+- _Currently everything is only tested against (means 100 % works with) PHP 8.0 with SQLite 3.27.2_
 
 Alternatively clone this repository (the `release` branch always references the latest released version, or checkout the latest tagged revision) and install Composer and Yarn dependencies manually.
 
@@ -48,27 +47,40 @@ Alternatively clone this repository (the `release` branch always references the
 See [grocy/grocy-docker](https://github.com/grocy/grocy-docker) or [linuxserver/docker-grocy](https://github.com/linuxserver/docker-grocy) for instructions.
 
 ## How to update
-Just overwrite everything with the latest release while keeping the `data` directory, check `config-dist.php` for new configuration options and add them to your `data/config.php` where appropriate (the default values from `config-dist.php` will be used for not in `data/config.php` defined settings). Just to be sure, please empty `data/viewcache`.
+
+- Overwrite everything with the [latest release](https://releases.grocy.info/latest) while keeping the `data` directory
+- Check `config-dist.php` for new configuration options and add them to your `data/config.php` where appropriate (the default values from `config-dist.php` will be used for not in `data/config.php` defined settings)
+- Empty the `data/viewcache` directory
+- Visit the main route once to apply database migrations ([see below](https://github.com/grocy/grocy#database-migrations))
 
 If you run grocy on Linux, there is also `update.sh` (remember to make the script executable (`chmod +x update.sh`) and ensure that you have `unzip` installed) which does exactly this and additionally creates a backup (`.tgz` archive) of the current installation in `data/backups` (backups older than 60 days will be deleted during the update).
 
 ## Localization
+
 grocy is fully localizable - the default language is English (integrated into code), a German localization is always maintained by me.
-You can easily help translating grocy at https://www.transifex.com/grocy/grocy, if your language is incomplete or not available yet.
-(The default language can be set in `data/config.php`, e. g. `Setting('DEFAULT_LOCALE', 'it');` and there is also a user setting (see the user settings page) to set a different language per user).
+
+You can easily help translating grocy on [Transifex](https://www.transifex.com/grocy/grocy/dashboard/) if your language is incomplete or not available yet.
+
+The default language can be set in `data/config.php`, e. g. `Setting('DEFAULT_LOCALE', 'it');` and there is also a user setting (see the user settings page) to set a different language per user.
 
 The [pre-release demo](https://demo-prerelease.grocy.info) is available for any translation which is at least 70 % 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 once reached a completion level of 70 % will be included in releases.
+Also any translation which once reached a completion level of 70 % ([`strings` resource](https://www.transifex.com/grocy/grocy/strings/)) will be included in releases.
 
 _RTL languages are unfortunately not yet supported._
 
+## Motivation
+
+A household needs to be managed. I did this so far (almost 10 years) with my first self written software (a C# Windows forms application) and with a bunch of Excel sheets. The software was a pain to use at the end and Excel is Excel. So I searched for and tried different things for a (very) long time, nothing 100 % fitted, so this is my aim for a "complete household management"-thing. ERP your fridge!
+
 ## Things worth to know
 
 ### REST API
+
 See the integrated Swagger UI instance on [/api](https://demo.grocy.info/api).
 
 ### Barcode readers & camera scanning
+
 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 [Quagga2](https://github.com/ericblade/quagga2), 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
@@ -76,69 +88,87 @@ Additionally it's also possible to use your device camera to scan a barcode by u
 _My personal recommendation: Use a USB barcode laser scanner. They are cheap and work 1000 % better, faster, under any lighting condition and from any angle._
 
 ### Input shorthands for date fields
+
 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`
+  - Example: `0517` will be converted to `2021-05-17`
 - `YYYYMMDD` gets expanded to the proper ISO-8601 notation
-  - Example: `20190417` will be converted to `2019-04-17`
+  - Example: `20210417` will be converted to `2021-04-17`
 - `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 are never overdue)
+  - Example: `202107e` will be converted to `2021-07-31`
+- `[+/-]n[d/m/y]` gets expanded to a date relative to today, while adding (**+**) or subtracting (**-**) the **n**umber of**d**ays/**m**onths/**y**ears, in proper notation
+  - Example: `+1m` will be converted to the same day next month
+- `x` gets expanded to `2999-12-31` (which is an alias for "never overdue")
 - 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.
 Example: Button "**P** Add as new product" can be "pressed" by using the `P` key on your keyboard.
 
 ### Barcode lookup via external services
+
 Products can be directly added to the database via looking them up against external services by a barcode.
 This is currently only possible through the REST API.
 There is no plugin included for any service, see the reference implementation in `data/plugins/DemoBarcodeLookupPlugin.php`.
 
 ### Database migrations
+
 Database schema migration is automatically done when visiting the root (`/`) route (click on the logo in the left upper edge).
 
 _Please note: Database migrations are supposed to work between releases, not between every commit. If you want to run the current `master` branch (which is the development version), however, you need to handle that (and maybe more) yourself._
 
 ### Disable certain features
-If you don't use certain feature sets of grocy (for example if you don't need "Chores"), there are feature flags per major feature set to hide/disable the related UI elements (see `config-dist.php`)
+
+If you don't use certain feature sets of grocy (for example if you don't need "Chores"), there are feature flags per major feature set to hide/disable the related UI elements (see `config-dist.php`).
 
 ### Adding your own CSS or JS without to have to modify the application itself
+
 - When the file `data/custom_js.html` exists, the contents of the file will be added just before `</body>` (end of body) on every page
 - 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 `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)).
 
 In embedded mode, settings can be overridden by text files in `data/settingoverrides`, the file name must be `<SettingName>.txt` (e. g. `BASE_URL.txt`) and the content must be the setting value (normally one single line).
 
-## Contributing / Say thanks
+## Contributing / Say Thanks
+
 Any help is more than appreciated. Feel free to pick any open unassigned issue and submit a pull request, but please leave a short comment or assign the issue yourself, to avoid working on the same thing.
 
 See https://grocy.info/#say-thanks for more ideas if you just want to say thanks.
 
 ## Roadmap
+
 There is none. The progress of a specific bug/enhancement is always tracked in the corresponding issue, at least by commit comment references.
 
 ## Screenshots
-#### Stock overview
+
+### Stock overview
+
 ![Stock overview](https://github.com/grocy/grocy/raw/master/.github/publication_assets/stock.png "Stock overview")
 
-#### Shopping List
+### Shopping List
+
 ![Shopping List](https://github.com/grocy/grocy/raw/master/.github/publication_assets/shoppinglist.png "Shopping List")
 
-#### Meal Plan
+### Meal Plan
+
 ![Meal Plan](https://github.com/grocy/grocy/raw/master/.github/publication_assets/mealplan.png "Meal Plan")
 
-#### Chores overview
+### Chores overview
+
 ![Chores overview](https://github.com/grocy/grocy/raw/master/.github/publication_assets/chores.png "Chores overview")
 
 ## License
+
 The MIT License (MIT)

changelog/53_2.5.1_2019-09-28.md

@@ -3,7 +3,7 @@
 - Fixed that the "X products are already expired" count on the stock overview page was wrong
 - Fixed that after product actions (consume/purchase/etc.) on the stock overview page the highlighting of the row was maybe wrong
 - After product actions (consume/purchase/etc.) on the stock overview page on a sub product, now also the parent product (row) is refreshed
-- It's now possible to accumulate min. stock amounts on parent product level (new option per product, means the sub product will never be "missing" then, only the parent product)
+- It's now possible to accumulate min. stock amounts on parent product level (new option per product, means the sub product will never be missing then, only the parent product)
 - On the purchase page there is now an option to select that the price is the total price (for the whole amount) - below the price field, defaults to "Unit price" (as it was until now), when set to "Total price", the entered price will be divided by the amount before posting
 - "Average shelf life" on the product card now displays just "Unlimited" when the resulting value would be > 200 years (for products which never expire, as they have a best before date of 2999-12-31)
 

changelog/62_3.1.0_2021-07-16.md

@@ -113,7 +113,9 @@
 - Fixed that the "Manage users" and "Manage API keys" menu was not shown when using reverse proxy authentication
 
 ### API improvements/fixes
-> ❗ Numbers are now returned as numbers (so technically without quotes around them, were strings for nearly all endpoints before - should practically be no real difference)
+> ~~❗ Numbers are now returned as numbers (so technically without quotes around them, were strings for nearly all endpoints before - should practically be no real difference)~~
+>
+> => ❗❗❗ This has been reverted after this (v3.1.0) release since it had unintended side effects
 - Added a new endpoint `/system/localization-strings` to get the localization strings (gettext JSON representation; in the by the user desired language)
 - Added a new endpoint `/recipes/{recipeId}/copy` to copy a recipe
 - The `GET /chores` endpoint now also returns the `next_execution_assigned_user` object per chore (like the endpoint `GET /chores​/{choreId}` already did for a single chore)

changelog/63_3.1.1_2021-08-21.md

@@ -0,0 +1,16 @@
+- Fixed that the upgrade failed when having "> 2 times duplicate" (means the same barcode was added more than 2 times) product barcodes
+- Fixed that the upgrade failed when having unsupported parent/child product nesting levels
+  - More information on this: Only 1 level is currently supported; creating > 1 level nestings was _never_ possible via the UI/frontend, but not checked/enforced by the backend before `v3.0.0` - so it was potentially possible via the API (or any third party app/tool which utilizes it) to create such a nesting which then made this upgrade to fail
+- Fixed that it was not possible to select a chore/battery on the corresponding tracking pages by mouse/touch
+- Fixed that grouping by columns in tables may caused duplicate groups
+- Fixed that grocycode camera barcode scanning didn't recognize the scanned code for chore/battery tracking
+- Fixed that when having any "Track date only" chore on the calendar, the iCal export was broken
+- Optimized the meal plan page to be properly printable (thanks @MrKrisKrisu)
+
+### API
+> ❗ The release before (v3.1.0) introduced that "numbers are now returned as numbers": **This was reverted** since it had unintended side effects (so all fields are technically strings now again, just like before - sorry for that)
+- Fixed that `missing_products` of the `/stock/volatile` endpoint also contained inactive products
+- Fixed that when having multiple Userfields for an entity, the `/objects/{entity}` endpoint returned wrong Userfield values
+- Fixed that the `/stock/products/by-barcode/{barcode}/consume` and `/stock/products/by-barcode/{barcode}/transfer` endpoints haven't used the stock entry given by a stock entry grocycode (thanks @lowlee for the initial work on this)
+- Fixed that the "Stock by-barcode" API routes were broken for normal barcodes (only grocycodes were accepted) (thanks @larsverp)
+- Fixed that the "Stock by-barcode" API routes also accepted chore or battery grocycodes (thanks @lowlee)

changelog/64_3.1.2_2021-09-27.md

@@ -0,0 +1,12 @@
+- Fixed that the "Add all list items to stock" shopping list workflow did not work for more than ~6 items (thanks @tjhowse)
+- Fixed that plural form handling (e.g. for quantity units) was wrong for negative numbers
+- Fixed that the context menu entries `Consume` and `Transfer` on the stock overview page were disabled when the amount in stock was < 1
+- Fixed that on consuming a product from not the products default location, the products default location was recorded in the stock journal
+- Fixed that when undoing a stock consume transaction from not the products default location, the corresponding amount was always added back to to the products defaullt location
+- Fixed that when having multiple quantity unit conversions for a products default QU purchase, on purchase was potentially a wrong conversion factor picked
+- Fixed that when there was any chore with a schedule, but without a "next estimated tracking" date/time, the iCal export was broken
+- The product and chore edit pages now have bottom-sticky save buttons
+- A product picture can now be added when creating a product (was currently only possible when editing a product)
+
+### API
+- Fixed that international characters and spaces were not allowed in API query filters

changelog/65_3.1.3_2021-11-14.md

@@ -0,0 +1,19 @@
+- The "Below min. stock amount" filter on the stock overview page now also includes due-soon, overdue or already expired products
+- The default shopping list (named "Shopping list"; localized) can now be renamed
+- Added the products average price as a (hidden by default) column on the stock overview page
+- Added a new "Presets for new products" stock setting for the "Default due days" option of new products
+- When adding (purchase) a product with "Default due days after freezing" set directly to a freezer location, the due date is now prefilled by that (instead of the normal "Default due days") (thanks @grahamc for the initial work on this)
+- Chores can now be merged (new item in the context-/more-menu on the chores list page)
+- Fixed that "Label per unit" stock entry labels (on purchase) weren't unique per unit
+- Fixed that the "Add as new product" productpicker workflow, started from the shopping list item form, always selected the default shopping list after finishing the flow
+- Fixed that when undoing a product opened transaction and when the product has "Default due days after opened" set, the original due date wasn't restored
+- Fixed that "Track date only"-chores were shown as overdue on the due day on the chores overview page
+- Fixed that dropdown filters for tables maybe did not work after reordering columns
+- Fixed that auto night mode over midnight did not always work
+- Fixed that the labels of context-/more-menu items were not readable in Night Mode (thanks @corbolais)
+- Fixed that the "Stay logged in permanently" checkbox on the login page had no effect (thanks @0)
+
+### API
+- New endpoint `/chores/{choreIdToKeep}/merge/{choreIdToRemove}` for merging chores
+- Endpoint `/stock/products/{productId}/add` API endpoint: The (optional) request body parameter `print_stock_label` was renamed to `stock_label_type`
+- Fixed that backslashes were not allowed in API query filters

changelog/66_3.2.0_2022-02-11.md

@@ -0,0 +1,79 @@
+### Stock
+
+- The `config.php` option `FEATURE_SETTING_STOCK_COUNT_OPENED_PRODUCTS_AGAINST_MINIMUM_STOCK_AMOUNT` was removed and is now a new product option `Treat opened as out of stock`, means, if opened stock entries will be counted as missing for calculating if a product is below its minimum stock amount, can now be configured per product
+  - The existing option will be migrated to all existing products, so no changed behavior after the update
+  - There is also a new stock setting (section "Presets for new products") which can be used to configure the default when adding products (also that will be set based on the old setting on migration)
+- When using/scanning a stock entry grocycode on the consume page, the amount is now prefilled by the stock entry amount (making it essentially possible to consume the corresponding stock entry in one go)
+- Stock entry labels get now also printed on inventory (only when adding products, same option "Stock entry label" like on the purchase page)
+- Fixed that stock entry labels on purchase were printed, even when "No label" was selected (was only a problem when running label printer WebHooks server side)
+- Fixed that formatted (HTML) text for the (hidden by default) product description column on the stock overview page was not correctly displayed
+- Fixed that numeric and date-time sorting of table columns on the stock entries page did not work correctly (thanks @MasterofJOKers)
+- Fixed that the consume page/dialog wasn't properly initialized when opening it from the stock entries page
+- Fixed that entries for not existing users were missing on the stock journal
+
+### Recipes
+
+- Optimized recipe costs calculation to better reflect the current real costs: Out of stock ingredients now use the last price
+  - Background: Before v3.0.0 recipe costs were only based on the last price per product and since v3.0.0 the "real costs" (based on the default consume rule "Opened first, then first due first, then first in first out") are used, means out of stock items have no price - so using the last price for out of stock items should reflect the current real costs better
+- Added a new recipes setting (top right corner settings menu) "Show the recipe list and the recipe side by side" (defaults to enabled, so no changed behaviour when not configured)
+  - When disabled, on the recipes page, the recipe list is displayed full-width and the recipe will be shown in a popup instead of on the right side
+- Recipes are now also grocycode enabled (works like any other grocycode; download/print it via the recipes edit page or the more/context menu on the recipes page; use/scan it at any place a recipe can be selected)
+- Performance improvements (page loading time) of the recipes page
+- Fixed that when adding missing recipe ingredients, with the option "Only check if any amount is in stock" enabled, to the shopping list, unit conversions (if any) weren't considered
+- Fixed that the recipe stock fulfillment information about shopping list amounts was not correct when the ingredient had a decimal amount
+
+### Meal plan
+
+- Meal plan sections can now (optionally) define a time, which will then be displayed on the meal plan section header and used for the corresponding calendar events
+  - Additionally the correspnding calendar event now also mentions the meal plan section name
+- The day/week view can now be toggled
+  - New button on top right corner of the meal plan (only visible on bigger screens)
+  - On smaller screen the day view is still the default (no change)
+- Fixed that the meal plan showed the total calories per recipe (instead of per serving as stated by the suffix)
+
+### Chores
+
+- Chore schedules can now be skipped
+  - New button on the chores overview and chore tracking page
+  - Skipped schedules will be highlighted accordingly on the chore journal
+- Added a new chore option "Start date" which is used as a schedule starting point when the chore was never tracked
+  - Until now, the schedule starting point was the first tracked execution
+  - For all existing chores, the start date will be set to the first tracked execution time (or today, for chores which were never tracked) on migration
+- The `Yearly` period type has been changed to be schedule the chore on the _same day_ each year
+  - This period type scheduled chores 1 year _after the last execution_ before, which is also possible by using the `Daily` period type and a period interval of 365 days; all existing `Yearly` schedules will be converted to that on migration
+- Added a new `Hourly` period type (to schedule chores every `x` hours)
+- Added a new `Adaptive` period type (to schedule chores dynamically based on the past average execution frequency)
+- Removed the period type `Dynamic regular`, since it's the same as `Daily`
+  - All existing `Dynamic regular` schedules will be converted to that on migration
+- The chorecard now also shows the average execution frequency (how often the chore was executed in the past on average)
+
+### Calendar
+
+- Fixed that when having a task without a due date, the iCal export was broken
+
+### Tasks
+
+- Added a "Save & add another task"-button on the add task dialog to quickly create multiple tasks without having to close/reopen the dialog
+- Fixed that when editing a task without a due date, `1970-01-01` was shown
+
+### General
+
+- Added a separate status filter and table row highlighting (blue) on the chores, tasks and batteries overview pages for items due today
+  - Additionally, the "due soon" days of chores/tasks/batteries (top right corner settings menu) can be set to `0` to disable that filter/highlighting
+- Optimized relative time display (also fixed a phrasing problem for some languages, e.g. Hungarian) (thanks @Tallyrald)
+- New input shorthand `[+/-]n[d/m/y]` for date fields to quickly input a date relative to today (adding (**+**) or subtracting (**-**) the **n**umber of **d**ays/**m**onths/**y**ears, see the full list of available shorthands [here](https://github.com/grocy/grocy#input-shorthands-for-date-fields))
+- When using LDAP authentication, the configured `LDAP_UID_ATTR` is now used to compare if the user already exists instead of the username entered on the login page (that prevents creating multiple users if you enter the username in different notations) (thanks @FloSet)
+- When using reverse proxy authentication (`ReverseProxyAuthMiddleware`), it's now also possible to pass the username in an environment variable instead of an HTTP header (new `config.php` option `REVERSE_PROXY_AUTH_USE_ENV`) (thanks @Forceu)
+- The `config.php` option `DISABLE_BROWSER_BARCODE_CAMERA_SCANNING` has been renamed to `FEATURE_FLAG_DISABLE_BROWSER_BARCODE_CAMERA_SCANNING`
+- Fixed that when having a quantity unit matching any application string, the translation of that string was used to display that unit
+- Fixed that the logout button/menu was missing when using external authentication (e.g. LDAP)
+- New translations: (thanks all the translators)
+  - Catalan (demo available at https://ca.demo.grocy.info)
+
+### API
+
+- The API endpoint `/stock/shoppinglist/clear` has now a new optional request body parameter `done_only` (to only remove done items from the given shopping list, defaults to `false`)
+- The API endpoint `/chores/{choreId}/execute` has now a new optional request body parameter `skipped` (to skip the next chore schedule, defaults to `false`)
+- The API endpoint `/chores/{choreId}` has new response field/property `average_execution_frequency_hours` (contains the average past execution frequency in hours or `null`, when the chore was never executed before)
+- New API endpoint `/recipes/{recipeId}/printlabel` (to print recipe grocycodes on the configured label printer)
+- Fixed that the barcode lookup for the "Stock by-barcode" API endpoints was case sensitive

changelog/67_3.3.0_2022-04-08.md

@@ -0,0 +1,121 @@
+### New feature: Notes and Userfields for stock entries
+
+- Stock entries can now have notes
+  - For example to distinguish between same, yet different products (e.g. having only a generic product "Chocolate" and note in that field what special one it is exactly this time - as an alternative to have sub products)
+  - Or for example to track ownership of stock items when sharing the fridge with your flatmates
+  - => New field on the purchase and inventory (and stock entry edit) page
+  - => New column on the stock entries and stock journal page
+  - => Visible also in the "Use a specific stock item" dropdown on the consume and transfer page
+- Additionally it's also possible to add arbitrary own fields by using Userfields
+  - => Configure the desired Userfields for the entity `stock`
+  - => Those Userfields are then visible on the same places as mentioned above for the built-in "Note" field
+
+### New feature: Recipes "Due score"
+
+- A number (new column on the recipes page) which represents a score which is higher the more ingredients, of the corresponding recipe, currently in stock are due soon, overdue or already expired
+  - Or in other words: A score to see which recipes to cook to not waste already overdue/expired or due soon products
+- The score is in detail based on:
+  - 1 point for each due soon ingredient (based on the stock setting "Due soon days")
+  - 10 points per overdue ingredient
+  - 20 points per expired ingredient
+  - (or else 0)
+- The corresponding ingredient is also highlighted in red/yellow/grey (same colors as on the stock overview page)
+
+### Stock
+
+- It's now possible to change a products stock QU, even after it was once added to stock
+  - When the product was once added to stock, there needs to exist a corresponding unit conversion for the new QU
+- Product card, stock overiew and stock entries page optimizations regarding displaying prices:
+  - Prices are now shown per default purchase quantity unit, instead of per stock QU and when clicking/hovering, a tooltip shows the price per stock QU
+  - The price history chart is now based on the value per purchase QU, instead of per stock QU
+- New product option "Default consume location" (not mandatory, defaults to not set / empty)
+  - When set, stock entries at that location will be consumed first
+  - => This will be automatically taken into account when consuming from the stock overview page and all other places where no specific location can be selected
+  - => On the consume page the location is preselected in the following order:
+    1. The new default consume location, if the product currently has any stock there, otherwise
+    2. The products default location, if the product currently has any stock there, otherwise
+    3. The first location where the product currently has any stock
+- Optimized quantity unit conversion handling:
+  - The option "Create inverse QU conversion" was removed when creating a QU conversion
+  - => Instead the corresponding inverse conversion is now always created/updated/deleted automatically
+- New product option "Disable own stock" (defaults to disabled)
+  - When enabled, the corresponding product can't have own stock, means it will not be selectable on purchase (useful for parent products which are just used as a summary/total view of the sub products)
+- The location content sheet can now optionally list also out of stock products (at the products default location, new checkbox "Show only in-stock products" at the top of the page, defaults to enabled)
+- Added a location filter to the stock entries page
+- Added the product grocycode as a (hidden by default) column to the products list (master data)
+- The price entered on the inventory page is now related to the selected quantity unit (like on the purchase page, was always related to the products stock QU before)
+- Fixed that consuming via the consume page was not possible when `FEATURE_FLAG_STOCK_LOCATION_TRACKING` was disabled
+
+### Shopping list
+
+- Added a new shopping list setting (top right corner settings menu) to automatically add products, that are below their defined min. stock amount, to the shopping list (defaults to disabled)
+- Fixed that when using "Add products that are below defined min. stock amount", the calculated missing amount was wrong for products which had the new product option `Treat opened as out of stock` set and when having at least one opened stock entry
+
+### Recipes
+
+- When a parent product is used as an ingredient, which is currently not in stock itself, the substituted product (so the one which was already taken into account when consuming the recipe) is now displayed below the ingredient and the costs (and calories) are taken from that one, to reflect the current real costs even better
+- Added a new recipes setting (top right corner settings menu) "Show a little checkbox next to each ingredient to mark it as done" (defaults to disabled)
+  - When enabled, next to each ingredient a little checkbox will be shown
+  - When clicked, the ingredient is crossed out
+  - This status is not saved, means reset when the page is reloaded
+- Fixed that consuming recipes was possible when not all ingredients were in stock (and this potentially consumed some of the in stock ingredients; not matching the message "nothing removed")
+- Fixed that the price of the "Produces product"-product, which is added to stock on consuming a recipe, was wrong (was the recipe total costs multiplied by the serving amount instead of only the recipe total costs)
+- Fixed that calories of recipe ingredients were displayed with an indefinite number of decimal places
+- Fixed that ingredient amounts were wrong for multi-nested (> 2 levels) recipes, when the included recipe used an serving amount other than 1
+- Fixed that searching/filtering the recipe gallery view did not work correctly
+- Fixed that searching/filtering recipes by products did not work (e.g. via the context-/more menu option "Search for recipes containing this product" on the stock overview page)
+
+### Meal plan
+
+- The day is now editable on the edit dialog of any meal plan entry, which makes it possible to move entries to a different day
+- Fixed that it was not possible to print the meal plan (and other pages) in landscape (thanks @miguelangel-nubla)
+
+### Chores
+
+- The `Daily` period type has been changed to schedule the chore at the _same time_ (based on the start date) each `n` days
+  - This period type scheduled chores `n` days _after the last execution_ before, which is also possible by using the `Hourly` period type and a corresponding period interval; all existing `Daily` schedules will be converted to that on migration
+- It's now possible to manually reschedule / assign chores
+  - New entry "Reschedule next execution" in the context/more menu on the chores overview page
+  - If you have rescheduled a chore and want to continue the normal schedule/assignment instead, use the "Clear" button in the same dialog
+  - Rescheduled/reassigned chores will be highlighted with an corresponding icon next to the "Next estimated tracking date" / "Assigned to"
+- Optimized that when skipping chores via the chore tracking page, the given time is used as the "skipped time", not the scheduled next estimated tracking time of the corresponding chore (making it essentially possible to skip more then one schedule at once)
+- Fixed that when consuming a parent product on chore execution (chore option "Consume product on chore execution"), no child products were used if the parent product itself is not in stock
+- Fixed that the upgrade to v3.2.0 failed when having any former "Dynamic Regular" chore with a "Period interval" of `0` (which makes absolutely no sense in reality)
+
+### Tasks
+
+- Fixed that tasks without a due date were highlighted in red (like overdue tasks)
+
+### Batteries
+
+- Fixed that the batteries overview page was broken when there was any battery Userfield with enabled "Show as column in tables" option
+- Fixed that grocycode label printer printing didn't work from the battery edit page (master data) (thanks @andreheuer)
+- Fixed that undoing a battery charge cycle had no effect on "Last charged" and "Next planned charge cycle" of the corresponding battery
+
+### Equipment
+
+- It's now possible to add multiple files (PDFs / manuals) to each equipment
+  - Define as many Userfields for the entity `equipment` and use the type `File`
+  - => Each of those File-Userfields will be shown as a separate tab on the equipment page
+
+### Userfields
+
+- Userfields of type "Date & time" and "Date (without time)" have now the option to default to now / today for new objects (new Userfield option "Default value")
+
+### General
+
+- Optimized form validation: Save / submit buttons are now not disabled when the form is invalid, the invalid / missing fields are instead highlighted when trying to submit / save the form (making it more obvious which fields are invalid / missing exactly)
+- Night mode can now use / follow the system preferred color scheme
+  - The view/user setting "Enable night mode" has been removed and replaced by "Night mode" which now defaults to "Use system setting" (which uses the system preferred color scheme, "On" and "Off" are other possible options to always enable/disable night mode)
+- Some night mode style refinements
+- Fixed an server error (on every page) when not having any quantity unit
+- New translations: (thanks all the translators)
+  - Slovenian (demo available at <https://sl.demo.grocy.info>)
+
+### API
+
+- Added a new endpoint `GET /stock/locations/{locationId}/entries` to get all stock entries of a given location (similar to the already existing endpoint `GET /stock/products/{productId}/entries`)
+- Endpoint `/recipes/{recipeId}/consume`: Fixed that consuming partially fulfilled recipes was possible, although an error was already returned in that case (and potentially some of the in stock ingredients were consumed in fact)
+- Endpoint `/stock/products/{productId}`:
+  - New field/property `current_price` which returns the current price of the corresponding product, based on the stock entry to use next (defined by the default consume rule "Opened first, then first due first, then first in first out") or on the last price if the product is currently not in stock
+  - The field/property  `oldest_price` is deprecated and will be removed in a future version (this had no real sense, currently returns the same as `current_price`)

changelog/68_3.3.1_2022-06-10.md

@@ -0,0 +1,33 @@
+### Stock
+
+- New product option "Move on open" (defaults to disabled)
+  - When enabled, on marking the product as opened, the corresponding amount will be moved to the products default consume location
+  - (Thanks @RosemaryOrchard)
+- The stock setting "Decimal places allowed for prices" has been split into separate settings for input and displaying prices (the existing setting will be set for both new options on migration, so no changed behavior when not configured)
+- Optimized that when the plural form(s) of a quantity unit is/are not provided, the singular form is used to display plural amounts
+- Fixed that "Automatically add products that are below their defined min. stock amount to the shopping list" (stock setting) was only done when consuming products, not when opening them
+- Fixed that the price history chart (product card) showed the price on a wrong date when having multiple purchases on the same date from different stores
+
+### Recipes
+
+- Fixed that when a substituted product is used to display costs and calories (so when a parent product ingredient is currently not in stock itself), no unit conversions were considered for costs/calories calculation
+- Fixed that the displayed "already on the shopping list"-amount (for missing ingredients) was wrong when the products "Factor purchase to stock quantity unit" wasn't 1
+
+### Chores
+
+- Fixed that rescheduling of "Track date only"-chores for today was not possible
+
+### Calendar
+
+- Fixed that clicking on meal plan product and notes calendar entries redirected to an invalid page
+
+### General
+
+- LDAP authentication: Optimized that it's not required that LDAP accounts need to have a first-/lastname
+
+### API
+
+- Endpoint `/stock/products/{productId}`: New field/property `default_consume_location` (contains the products default consume location object)
+- Endpoint `/stock/products/{productId}/add`: Fixed that the request body parameter `transaction_type` was ignored / always set to `purchase`
+- Fixed that the endpoint `/stock/products/by-barcode/{barcode}/open` didn't handle stock entries provided by a grocycode (thanks @jtommi)
+- Fixed that less or equal (`<=`) and greater or equal (`>=`) filter comparisons didn't work (optional `query[]` request query parameter on most endpoints)

changelog/69_3.3.2_2022-11-12.md

@@ -0,0 +1,42 @@
+### Stock
+
+- Improved that when editing a unit conversion, the "Quantity unit from" and "Quantity unit to" of the corresponding inverse conversion is now also updated accordingly if changed (until now only the factor was updated automatically)
+- Changed that the "Move on open" product option can now always be used/set, even when the "Default location" and "Default conume location" are the same
+- Fixed that stock entry notes were lost when consuming/opening/transferring a partial amount of the corresponding stock entry (thanks @akoshpinter)
+- Fixed that the average shelf life of a product (on the productcard) was wrong when the corresponding stock entry was edited
+- Fixed that when the stock setting "Decimal places allowed for amounts" was set to `0`, unit conversion (if any) failed when adding the corresponding product to stock
+- Fixed that consuming a parent product which is not in stock itself (so essentially using any of the child products) may failed when unit conversions were involved (the current stock amount check was wrong in that case)
+- Fixed that the status button counters on the stock overview page ("X products are overdue" and so on) included products which have the option `Never show on stock overview` enabled
+- Fixed that adding Userfields to existing stock entries was not possible (only editing existing Userfield values, e.g. added during purchase or inventory, was possible)
+- Fixed that it was not possible to change a products stock QU, when the needed unit conversion (old QU => new QU) was only defined globally (means on QU level) or by the products "Factor purchase to stock quantity unit"
+- Fixed that when changing a products stock QU, the products "Quick consume mount", "Energy (kcal)" and "Tare weight" wasn't updated according to the corresponding unit conversion factor
+- Fixed that when changing a products stock QU, the product barcode amounts were also changed based on the corresponding unit conversion factor
+
+### Shopping list
+
+- Fixed that products could not be added to the shopping list via barcode scanning
+
+### Recipes
+
+- Fixed that headlines in the recipe description (preparation text) were removed on saving
+- Fixed that the default consume rule was not always applied correctly when a recipe consumed a substituted ingredient (so when having a parent product in the recipe which is currently not in stock itself)
+
+### Userfields
+
+- Fixed that edit forms were broken when editing an object with `null` Userfields (so when the field for that object was not set before / on the initial object creation)
+
+### General
+
+- It's now possible to edit a user without necessarily updating the users password
+- Fixed that column reordering didn't work on the stock overview, stock entries and shopping list page when showing column which are not shown by default
+- Fixed that when running label printer WebHooks client side (so when `LABEL_PRINTER_RUN_SERVER` = `false`), the setting `LABEL_PRINTER_HOOK_JSON` was ignored (the WebHook data was always sent as form data)
+- Fixed that granular user permissions (like "Shopping list / Add items" or "Equipment") didn't allow to add/edit the corresponding items without also having the "Edit master data" permission
+- New translations: (thanks all the translators)
+  - Lithuanian (demo available at <https://lt.demo.grocy.info>)
+  - Ukrainian (demo available at <https://uk.demo.grocy.info>)
+
+### API
+
+- Endpoint `/stock/volatile`
+  - The field/property `missing_products` now also contains the `product` object
+- Endpoint `/recipes/{recipeId}/consume`: Fixed (again) that consuming partially fulfilled recipes was possible, although an error was already returned in that case (and potentially some of the in stock ingredients were consumed in fact)

changelog/__TEMPLATE.md

@@ -0,0 +1,55 @@
+> ⚠️ xxxBREAKING CHANGESxxx
+
+> ❗ xxxImportant upgrade informationXXX
+
+### New feature: xxxx
+
+- xxx
+
+### Stock
+
+- xxx
+
+### Shopping list
+
+- xxx
+
+### Recipes
+
+- xxx
+
+### Meal plan
+
+- xxx
+
+### Chores
+
+- xxx
+
+### Calendar
+
+- xxx
+
+### Tasks
+
+- xxx
+
+### Batteries
+
+- xxx
+
+### Equipment
+
+- xxx
+
+### Userfields
+
+- xxx
+
+### General
+
+- xxx
+
+### API
+
+- xxx

composer.json

@@ -1,6 +1,6 @@
 {
 	"require": {
-		"php": ">=8.0",
+		"php": "^8.0",
 		"slim/slim": "^4.0",
 		"slim/psr7": "^1.0",
 		"slim/http": "^1.0",

config-dist.php

@@ -1,16 +1,16 @@
 <?php
 
-// Settings can also be overwritten in two ways
+// Settings can also be overwritten in two ways:
 //
-// First priority
+// First priority:
 // A .txt file with the same name as the setting in /data/settingoverrides
 // the content of the file is used as the setting value
 //
-// Second priority
+// Second priority:
 // An environment variable with the same name as the setting and prefix "GROCY_"
 // so for example "GROCY_BASE_URL"
 //
-// Third priority
+// Third priority:
 // The settings defined here below
 
 // Either "production", "dev", "demo" or "prerelease"
@@ -18,11 +18,11 @@
 // demo data will be populated during database migrations
 Setting('MODE', 'production');
 
-// Either "en" or "de" or the directory name of
-// one of the other available localization folders in the "/localization" directory
+// The directory name of one of the available localization folders
+// in the "/localization" directory (e.g. "en" or "de")
 Setting('DEFAULT_LOCALE', 'en');
 
-// This is used to define the first day of a week for calendar views in the frontend,
+// This is used to define the first day of a week for calendar views,
 // leave empty to use the locale default
 // Needs to be a number where Sunday = 0, Monday = 1 and so forth
 Setting('CALENDAR_FIRST_DAY_OF_WEEK', '');
@@ -30,14 +30,19 @@ Setting('CALENDAR_FIRST_DAY_OF_WEEK', '');
 // If calendars should show week numbers
 Setting('CALENDAR_SHOW_WEEK_OF_YEAR', true);
 
+// 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', '');
+
 // To keep it simple: grocy does not handle any currency conversions,
 // this here is used to format all money values,
-// so doesn't really matter, but should be the
+// so doesn't really matter, but needs to be the
 // ISO 4217 code of the currency ("USD", "EUR", "GBP", etc.)
 Setting('CURRENCY', 'USD');
 
 // When running grocy in a subdirectory, this should be set to the relative path, otherwise empty
-// It needs to be set to the part (of the URL) after the document root,
+// It needs to be set to the part (of the URL) AFTER the document root,
 // if URL rewriting is disabled, including index.php
 // Example with URL Rewriting support:
 //  Root URL = https://example.com/grocy
@@ -53,15 +58,15 @@ Setting('BASE_PATH', '');
 Setting('BASE_URL', '/');
 
 // The plugin to use for external barcode lookups,
-// must be the filename without .php extension and must be located in /data/plugins,
+// must be the filename (folder /data/plugins) without the .php extension,
 // see /data/plugins/DemoBarcodeLookupPlugin.php for an example implementation
 Setting('STOCK_BARCODE_LOOKUP_PLUGIN', 'DemoBarcodeLookupPlugin');
 
 // If, however, your webserver does not support URL rewriting, set this to true
 Setting('DISABLE_URL_REWRITING', false);
 
-// Specify an custom homepage if desired - by default the homepage will be set to the stock overview page,
-// this needs to be one of the following values:
+// Specify an custom homepage if desired, by default the homepage will be set to the stock overview page
+// This needs to be one of the following values:
 // stock, shoppinglist, recipes, chores, tasks, batteries, equipment, calendar, mealplan
 Setting('ENTRY_PAGE', 'stock');
 
@@ -73,11 +78,11 @@ Setting('DISABLE_AUTH', false);
 // or any class that implements Grocy\Middleware\AuthMiddleware
 Setting('AUTH_CLASS', 'Grocy\Middleware\DefaultAuthMiddleware');
 
-// When using ReverseProxyAuthMiddleware,
-// the name of the HTTP header which your reverse proxy uses to pass the username (on successful authentication)
-Setting('REVERSE_PROXY_AUTH_HEADER', 'REMOTE_USER');
+// Options when using ReverseProxyAuthMiddleware
+Setting('REVERSE_PROXY_AUTH_HEADER', 'REMOTE_USER'); // The name of the HTTP header which your reverse proxy uses to pass the username (on successful authentication)
+Setting('REVERSE_PROXY_AUTH_USE_ENV', false); // Set to true if the username is passed as environment variable
 
-// LDAP options when using LdapAuthMiddleware
+// Options when using LdapAuthMiddleware
 Setting('LDAP_ADDRESS', ''); // Example value "ldap://vm-dc2019.local.berrnd.net"
 Setting('LDAP_BASE_DN', ''); // Example value "DC=local,DC=berrnd,DC=net"
 Setting('LDAP_BIND_DN', ''); // Example value "CN=grocy_bind_account,OU=service_accounts,DC=local,DC=berrnd,DC=net"
@@ -85,116 +90,37 @@ Setting('LDAP_BIND_PW', ''); // Password for the above account
 Setting('LDAP_USER_FILTER', ''); // Example value "(OU=grocy_users)"
 Setting('LDAP_UID_ATTR', ''); // Windows AD: "sAMAccountName", OpenLDAP: "uid", GLAuth: "cn"
 
-// 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 permissions for new users
 // the array needs to contain the technical/constant names
-// see the file controllers/Users/User.php for possible values
+// See the file controllers/Users/User.php for possible values
 Setting('DEFAULT_PERMISSIONS', ['ADMIN']);
 
-// 1D (=> Code128) or 2D (=> DataMatrix)
+// "1D" (=> Code128) or "2D" (=> DataMatrix)
 Setting('GROCYCODE_TYPE', '1D');
 
+
 // Label printer settings
-// This is the URI that grocy will POST to when asked to print a label
-Setting('LABEL_PRINTER_WEBHOOK', '');
-// This setting decides whether the webhook will be called server- or clientside
-// If the machine grocy runs on has a network connection to the host the webhook receiver is on, this is probably a good idea
-// If, for example, grocy runs in the cloud and your printer daemon runs locally to you, set this to false to let your browser call the webhook instead
-Setting('LABEL_PRINTER_RUN_SERVER', true);
-// Additional parameters supplied to the webhook
-Setting('LABEL_PRINTER_PARAMS', ['font_family' => 'Source Sans Pro (Regular)']);
-// TRUE to use JSON or FALSE to use normal POST request variables
-Setting('LABEL_PRINTER_HOOK_JSON', false);
+Setting('LABEL_PRINTER_WEBHOOK', ''); // The URI that grocy will POST to when asked to print a label
+Setting('LABEL_PRINTER_RUN_SERVER', true); // Whether the webhook will be called server- or client-side
+Setting('LABEL_PRINTER_PARAMS', ['font_family' => 'Source Sans Pro (Regular)']); // Additional parameters supplied to the webhook
+Setting('LABEL_PRINTER_HOOK_JSON', false); // TRUE to use JSON or FALSE to use normal POST request variables
+
 
 // Thermal printer options
 // Thermal printers are receipt printers, not regular printers,
 // the printer must support the ESC/POS protocol, see https://github.com/mike42/escpos-php
-Setting('TPRINTER_IS_NETWORK_PRINTER', false); // Set to true if it's' a network printer
+Setting('TPRINTER_IS_NETWORK_PRINTER', false); // Set to true if it's a network printer
 Setting('TPRINTER_PRINT_QUANTITY_NAME', true); // Set to false if you do not want to print the quantity names (related to the shopping list)
 Setting('TPRINTER_PRINT_NOTES', true); // Set to false if you do not want to print notes (related to the shopping list)
 Setting('TPRINTER_IP', '127.0.0.1'); // IP of the network printer (does only matter if it's a network printer)
-Setting('TPRINTER_PORT', 9100); // Port of the network printer
+Setting('TPRINTER_PORT', 9100); // Port of the network printer (does only matter if it's a network printer)
 Setting('TPRINTER_CONNECTOR', '/dev/usb/lp0'); // Printer device (does only matter if you use a locally attached printer)
 // For USB on Linux this is often '/dev/usb/lp0', for serial printers it could be similar to '/dev/ttyS0'
 // Make sure that the user that runs the webserver has permissions to write to the printer - on Linux add your webserver user to the LP group with usermod -a -G lp www-data
 
 
-// Default user settings
-// These settings can be changed per user, here the defaults
-// are defined which are used when the user has not changed the setting so far
-
-// Night mode related
-DefaultUserSetting('night_mode_enabled', false); // If night mode is enabled always
-DefaultUserSetting('auto_night_mode_enabled', false); // If night mode is enabled automatically when inside a given time range (see the two settings below)
-DefaultUserSetting('auto_night_mode_time_range_from', '20:00'); // Format HH:mm
-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)
-DefaultUserSetting('product_presets_qu_id', -1); // Default quantity unit id for new products (-1 means no quantity unit is preset)
-DefaultUserSetting('stock_decimal_places_amounts', 4); // Default decimal places allowed for amounts
-DefaultUserSetting('stock_decimal_places_prices', 2); // Default decimal places allowed for prices
-DefaultUserSetting('stock_auto_decimal_separator_prices', false);
-DefaultUserSetting('stock_due_soon_days', 5);
-DefaultUserSetting('stock_default_purchase_amount', 0);
-DefaultUserSetting('stock_default_consume_amount', 1);
-DefaultUserSetting('stock_default_consume_amount_use_quick_consume_amount', false);
-DefaultUserSetting('scan_mode_consume_enabled', false);
-DefaultUserSetting('scan_mode_purchase_enabled', false);
-DefaultUserSetting('show_icon_on_stock_overview_page_when_product_is_on_shopping_list', true);
-DefaultUserSetting('show_purchased_date_on_purchase', false); // Whether the purchased date should be editable on purchase (defaults to today otherwise)
-DefaultUserSetting('show_warning_on_purchase_when_due_date_is_earlier_than_next', true); // Show a warning on purchase when the due date of the purchased product is earlier than the next due date in stock
-
-// Shopping list settings
-DefaultUserSetting('shopping_list_to_stock_workflow_auto_submit_when_prefilled', false); // Automatically do the booking using the last price and the amount of the shopping list item, if the product has "Default due days" set
-DefaultUserSetting('shopping_list_show_calendar', false);
-
-// Recipe settings
-DefaultUserSetting('recipe_ingredients_group_by_product_group', false); // Group recipe ingredients by their product group
-
-// Chores settings
-DefaultUserSetting('chores_due_soon_days', 5);
-
-// Batteries settings
-DefaultUserSetting('batteries_due_soon_days', 5);
-
-// Tasks settings
-DefaultUserSetting('tasks_due_soon_days', 5);
-
-// If the page should be automatically reloaded when there was an external change
-DefaultUserSetting('auto_reload_on_db_change', false);
-
-// Show a clock in the header next to the logo or not
-DefaultUserSetting('show_clock_in_header', false);
-
-// Component configuration for Quagga2 - read https://github.com/ericblade/quagga2#configobject for details
-// Below is a generic good configuration,
-// for an iPhone 7 Plus, halfsample = true, patchsize = small, frequency = 5 yields very good results
-DefaultUserSetting('quagga2_numofworkers', 4);
-DefaultUserSetting('quagga2_halfsample', false);
-DefaultUserSetting('quagga2_patchsize', 'medium');
-DefaultUserSetting('quagga2_frequency', 10);
-DefaultUserSetting('quagga2_debug', true);
-
-
 // Feature flags
-// grocy was initially about "stock management for your household", many other things
-// came and still come by, because they are useful - here you can disable the parts
-// which you don't need to have a less cluttered UI
+// Here you can disable the parts which you don't need to have a less cluttered UI
 // (set the setting to "false" to disable the corresponding part, which should be self explanatory)
 Setting('FEATURE_FLAG_STOCK', true);
 Setting('FEATURE_FLAG_SHOPPINGLIST', true);
@@ -218,5 +144,73 @@ Setting('FEATURE_FLAG_CHORES_ASSIGNMENTS', true);
 Setting('FEATURE_FLAG_THERMAL_PRINTER', false);
 
 // Feature settings
-Setting('FEATURE_SETTING_STOCK_COUNT_OPENED_PRODUCTS_AGAINST_MINIMUM_STOCK_AMOUNT', true); // When set to true, opened items will be counted as missing for calculating if a product is below its minimum stock amount
+Setting('FEATURE_FLAG_DISABLE_BROWSER_BARCODE_CAMERA_SCANNING', false); // Set this to true if you want to disable the ability to scan a barcode via the device camera (Browser API)
 Setting('FEATURE_FLAG_AUTO_TORCH_ON_WITH_CAMERA', true); // Enables the torch automatically (if the device has one)
+
+
+// Default user settings
+// These settings can be changed per user and via the UI,
+// below are the defaults which are used when the user has not changed the setting so far
+
+// Night mode related
+DefaultUserSetting('night_mode', 'follow-system'); // "on" = Night mode is always on ; "off" = Night mode is always off / "follow-system" = System preferred color schema is used
+DefaultUserSetting('auto_night_mode_enabled', false); // If night mode is enabled automatically when inside a given time range (see the two settings below)
+DefaultUserSetting('auto_night_mode_time_range_from', '20:00'); // Format HH:mm
+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('night_mode_enabled_internal', false); // Internal setting if night mode is actually enabled (based on the other settings)
+
+// Generic settings
+DefaultUserSetting('auto_reload_on_db_change', false); // If the page should be automatically reloaded when there was an external change
+DefaultUserSetting('show_clock_in_header', false); // Show a clock in the header next to the logo or not
+DefaultUserSetting('keep_screen_on', false); // If the screen should always be kept on
+DefaultUserSetting('keep_screen_on_when_fullscreen_card', false); // If the screen should be kept 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)
+DefaultUserSetting('product_presets_qu_id', -1); // Default quantity unit id for new products (-1 means no quantity unit is preset)
+DefaultUserSetting('product_presets_default_due_days', 0); // Default due days for new products (-1 means that the product will be never overdue)
+DefaultUserSetting('product_presets_treat_opened_as_out_of_stock', true); // Default "Treat opened as out of stock" option for new products
+DefaultUserSetting('stock_decimal_places_amounts', 4); // Default decimal places allowed for amounts
+DefaultUserSetting('stock_decimal_places_prices_input', 2); // Default decimal places allowed for prices (input)
+DefaultUserSetting('stock_decimal_places_prices_display', 2); // Default decimal places allowed for prices (display)
+DefaultUserSetting('stock_auto_decimal_separator_prices', false);  // If the decimal separator should be set automatically for amount inputs
+DefaultUserSetting('stock_due_soon_days', 5); // The "expiring soon" days
+DefaultUserSetting('stock_default_purchase_amount', 0); // The default amount prefilled on the purchase page
+DefaultUserSetting('stock_default_consume_amount', 1); // The default amount prefilled on the consume page
+DefaultUserSetting('stock_default_consume_amount_use_quick_consume_amount', false); // If the products quick consume amount should be prefilled on the consume page
+DefaultUserSetting('scan_mode_consume_enabled', false); // If scan mode on the consume page is enabled
+DefaultUserSetting('scan_mode_purchase_enabled', false); // If scan mode on the purchase page is enabled
+DefaultUserSetting('show_icon_on_stock_overview_page_when_product_is_on_shopping_list', true); // When enabled, an icon is shown on the stock overview page (next to the product name) when the prodcut is currently on a shopping list
+DefaultUserSetting('show_purchased_date_on_purchase', false); // Whether the purchased date should be editable on purchase (defaults to today otherwise)
+DefaultUserSetting('show_warning_on_purchase_when_due_date_is_earlier_than_next', true); // Show a warning on purchase when the due date of the purchased product is earlier than the next due date in stock
+
+// Shopping list settings
+DefaultUserSetting('shopping_list_to_stock_workflow_auto_submit_when_prefilled', false); // Automatically do the booking using the last price and the amount of the shopping list item, if the product has "Default due days" set
+DefaultUserSetting('shopping_list_show_calendar', false); // When enabled, a small (month view) calendar will be shown on the shopping list page
+DefaultUserSetting('shopping_list_auto_add_below_min_stock_amount', false); // If products should be automatically added to the shopping list when they are below their min. stock amount
+DefaultUserSetting('shopping_list_auto_add_below_min_stock_amount_list_id', 1); // When the above setting is enabled, the id of the shopping list to which the products will be added
+
+// Recipe settings
+DefaultUserSetting('recipe_ingredients_group_by_product_group', false); // Group recipe ingredients by their product group
+DefaultUserSetting('recipes_show_list_side_by_side', true); // If the recipe should be displayed next to recipe list on the recipes page
+DefaultUserSetting('recipes_show_ingredient_checkbox', false); // When enabled, a little checkbox will be shown next to each ingredient to mark it as done
+
+// Chores settings
+DefaultUserSetting('chores_due_soon_days', 5); // The "due soon" days
+
+// Batteries settings
+DefaultUserSetting('batteries_due_soon_days', 5); // The "due soon" days
+
+// Tasks settings
+DefaultUserSetting('tasks_due_soon_days', 5); // The "due soon" days
+
+// Component configuration for Quagga2 - read https://github.com/ericblade/quagga2#configobject for details
+// Below is a generic good configuration,
+// for an iPhone 7 Plus, halfsample = true, patchsize = small, frequency = 5 yields very good results
+DefaultUserSetting('quagga2_numofworkers', 4);
+DefaultUserSetting('quagga2_halfsample', false);
+DefaultUserSetting('quagga2_patchsize', 'medium');
+DefaultUserSetting('quagga2_frequency', 10);
+DefaultUserSetting('quagga2_debug', true);

controllers/BaseApiController.php

@@ -8,9 +8,9 @@ class BaseApiController extends BaseController
 {
 	const PATTERN_FIELD = '[A-Za-z_][A-Za-z0-9_]+';
 
-	const PATTERN_OPERATOR = '!?(=|~|<|>|(>=)|(<=)|(§))';
+	const PATTERN_OPERATOR = '!?((>=)|(<=)|=|~|<|>|(§))';
 
-	const PATTERN_VALUE = '[A-Za-z\x{0400}-\x{04FF}_0-9.$#^|-]+';
+	const PATTERN_VALUE = '[A-Za-z\p{L}\p{M}0-9*_.$#^| -\\\]+';
 
 	protected $OpenApiSpec = null;
 
@@ -21,7 +21,7 @@ class BaseApiController extends BaseController
 			$response = $response->withHeader('Cache-Control', 'max-age=2592000');
 		}
 
-		$response->getBody()->write(json_encode($data, JSON_NUMERIC_CHECK));
+		$response->getBody()->write(json_encode($data));
 		return $response;
 	}
 

controllers/BaseController.php

@@ -126,10 +126,11 @@ class BaseController
 		$this->View->set('__t', function (string $text, ...$placeholderValues) use ($localizationService) {
 			return $localizationService->__t($text, $placeholderValues);
 		});
-		$this->View->set('__n', function ($number, $singularForm, $pluralForm) use ($localizationService) {
-			return $localizationService->__n($number, $singularForm, $pluralForm);
+		$this->View->set('__n', function ($number, $singularForm, $pluralForm, $isQu = false) use ($localizationService) {
+			return $localizationService->__n($number, $singularForm, $pluralForm, $isQu);
 		});
 		$this->View->set('LocalizationStrings', $localizationService->GetPoAsJsonString());
+		$this->View->set('LocalizationStringsQu', $localizationService->GetPoAsJsonStringQu());
 
 		// TODO: Better handle this generically based on the current language (header in .po file?)
 		$dir = 'ltr';
@@ -210,12 +211,13 @@ class BaseController
 		{
 			$htmlPurifierConfig = \HTMLPurifier_Config::createDefault();
 			$htmlPurifierConfig->set('Cache.SerializerPath', GROCY_DATAPATH . '/viewcache');
-			$htmlPurifierConfig->set('HTML.Allowed', 'div,b,strong,i,em,u,a[href|title|target],iframe[src|width|height|frameborder],ul,ol,li,p[style],br,span[style],img[width|height|alt|src],table[border|width|style],tbody,tr,td,th,blockquote,*[style|class|id]');
+			$htmlPurifierConfig->set('HTML.Allowed', 'div,b,strong,i,em,u,a[href|title|target],iframe[src|width|height|frameborder],ul,ol,li,p[style],br,span[style],img[style|width|height|alt|src],table[border|width|style],tbody,tr,td,th,blockquote,*[style|class|id],h1,h2,h3,h4,h5,h6');
 			$htmlPurifierConfig->set('Attr.EnableID', true);
 			$htmlPurifierConfig->set('HTML.SafeIframe', true);
-			$htmlPurifierConfig->set('CSS.AllowedProperties', 'font,font-size,font-weight,font-style,font-family,text-decoration,padding-left,color,background-color,text-align');
+			$htmlPurifierConfig->set('CSS.AllowedProperties', 'font,font-size,font-weight,font-style,font-family,text-decoration,padding-left,color,background-color,text-align,width,height');
 			$htmlPurifierConfig->set('URI.AllowedSchemes', ['data' => true, 'http' => true, 'https' => true]);
 			$htmlPurifierConfig->set('URI.SafeIframeRegexp', '%^.*%'); // Allow any iframe source
+			$htmlPurifierConfig->set('CSS.MaxImgLength', null);
 
 			self::$htmlPurifierInstance = new \HTMLPurifier($htmlPurifierConfig);
 		}
@@ -228,12 +230,12 @@ class BaseController
 			if (!is_bool($value) && !is_array($value))
 			{
 				$value = self::$htmlPurifierInstance->purify($value);
-			}
 
-			// Allow some special chars
-			if (!is_array($value))
-			{
+				// Allow some special chars
+				// Maybe also possible through HTMLPurifier config (http://htmlpurifier.org/live/configdoc/plain.html)
 				$value = str_replace('&', '&', $value);
+				$value = str_replace('>', '>', $value);
+				$value = str_replace('&lt;', '<', $value);
 			}
 		}
 

controllers/BatteriesController.php

@@ -80,9 +80,30 @@ class BatteriesController extends BaseController
 		$usersService = $this->getUsersService();
 		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['batteries_due_soon_days'];
 
+		$batteries = $this->getDatabase()->batteries()->where('active = 1')->orderBy('name', 'COLLATE NOCASE');
+		$currentBatteries = $this->getBatteriesService()->GetCurrent();
+		foreach ($currentBatteries as $currentBattery)
+		{
+			if (FindObjectInArrayByPropertyValue($batteries, 'id', $currentBattery->battery_id)->charge_interval_days > 0)
+			{
+				if ($currentBattery->next_estimated_charge_time < date('Y-m-d H:i:s'))
+				{
+					$currentBattery->due_type = 'overdue';
+				}
+				elseif ($currentBattery->next_estimated_charge_time <= date('Y-m-d 23:59:59'))
+				{
+					$currentBattery->due_type = 'duetoday';
+				}
+				elseif ($nextXDays > 0 && $currentBattery->next_estimated_charge_time <= date('Y-m-d H:i:s', strtotime('+' . $nextXDays . ' days')))
+				{
+					$currentBattery->due_type = 'duesoon';
+				}
+			}
+		}
+
 		return $this->renderPage($response, 'batteriesoverview', [
-			'batteries' => $this->getDatabase()->batteries()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
-			'current' => $this->getBatteriesService()->GetCurrent(),
+			'batteries' => $batteries,
+			'current' => $currentBatteries,
 			'nextXDays' => $nextXDays,
 			'userfields' => $this->getUserfieldsService()->GetFields('batteries'),
 			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('batteries')

controllers/CalendarApiController.php

@@ -4,6 +4,7 @@ namespace Grocy\Controllers;
 
 use Eluceo\iCal\Domain\Entity\Calendar;
 use Eluceo\iCal\Domain\Entity\Event;
+use Eluceo\iCal\Domain\Entity\TimeZone;
 use Eluceo\iCal\Domain\ValueObject\Date;
 use Eluceo\iCal\Domain\ValueObject\DateTime;
 use Eluceo\iCal\Domain\ValueObject\SingleDay;
@@ -17,10 +18,19 @@ class CalendarApiController extends BaseApiController
 		try
 		{
 			$events = $this->getCalendarService()->GetEvents();
+			$minDate = null;
+			$maxDate = null;
 
 			$vCalendar = new Calendar();
+			$vCalendar->setProductIdentifier('grocy');
+
 			foreach ($events as $event)
 			{
+				if (!isset($event['start']) || empty($event['start']))
+				{
+					continue;
+				}
+
 				$description = '';
 				if (isset($event['description']))
 				{
@@ -30,15 +40,19 @@ class CalendarApiController extends BaseApiController
 				if ($event['date_format'] === 'date' || (isset($event['allDay']) && $event['allDay']))
 				{
 					// All-day event
-					$date = new Date(\DateTimeImmutable::createFromFormat('Y-m-d', $event['start']));
+					$date = new Date(\DateTimeImmutable::createFromFormat('Y-m-d', substr($event['start'], 0, 10)));
 					$vEventOccurrence = new SingleDay($date);
+
+					$compareDate = \DateTimeImmutable::createFromFormat('Y-m-d', substr($event['start'], 0, 10));
 				}
 				else
 				{
 					// Time-point event
-					$start = new DateTime(\DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $event['start']), false);
-					$end = new DateTime(\DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $event['start']), false);
+					$start = new DateTime(\DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $event['start']), true);
+					$end = new DateTime(\DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $event['start']), true);
 					$vEventOccurrence = new TimeSpan($start, $end);
+
+					$compareDate = \DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $event['start']);
 				}
 
 				$vEvent = new Event();
@@ -47,6 +61,20 @@ class CalendarApiController extends BaseApiController
 					->setDescription($description);
 
 				$vCalendar->addEvent($vEvent);
+
+				if ($minDate == null || $compareDate < $minDate)
+				{
+					$minDate = $compareDate;
+				}
+				if ($maxDate == null || $compareDate > $maxDate)
+				{
+					$maxDate = $compareDate;
+				}
+			}
+
+			if ($minDate != null && $maxDate != null)
+			{
+				$vCalendar->addTimeZone(TimeZone::createFromPhpDateTimeZone(new \DateTimeZone(date_default_timezone_get()), $minDate, $maxDate));
 			}
 
 			$response->write((new CalendarFactory())->createCalendar($vCalendar));

controllers/ChoresApiController.php

@@ -73,6 +73,12 @@ class ChoresApiController extends BaseApiController
 				$trackedTime = $requestBody['tracked_time'];
 			}
 
+			$skipped = false;
+			if (array_key_exists('skipped', $requestBody) && filter_var($requestBody['skipped'], FILTER_VALIDATE_BOOLEAN) !== false)
+			{
+				$skipped = $requestBody['skipped'];
+			}
+
 			$doneBy = GROCY_USER_ID;
 			if (array_key_exists('done_by', $requestBody) && !empty($requestBody['done_by']))
 			{
@@ -84,7 +90,7 @@ class ChoresApiController extends BaseApiController
 				User::checkPermission($request, User::PERMISSION_CHORE_TRACK_EXECUTION);
 			}
 
-			$choreExecutionId = $this->getChoresService()->TrackChore($args['choreId'], $trackedTime, $doneBy);
+			$choreExecutionId = $this->getChoresService()->TrackChore($args['choreId'], $trackedTime, $doneBy, $skipped);
 			return $this->ApiResponse($response, $this->getDatabase()->chores_log($choreExecutionId));
 		}
 		catch (\Exception $ex)
@@ -131,4 +137,24 @@ class ChoresApiController extends BaseApiController
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
+
+	public function MergeChores(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		User::checkPermission($request, User::PERMISSION_MASTER_DATA_EDIT);
+
+		try
+		{
+			if (filter_var($args['choreIdToKeep'], FILTER_VALIDATE_INT) === false || filter_var($args['choreIdToRemove'], FILTER_VALIDATE_INT) === false)
+			{
+				throw new \Exception('Provided {choreIdToKeep} or {choreIdToRemove} is not a valid integer');
+			}
+
+			$this->ApiResponse($response, $this->getChoresService()->MergeChores($args['choreIdToKeep'], $args['choreIdToRemove']));
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
 }

controllers/ChoresController.php

@@ -94,9 +94,30 @@ class ChoresController extends BaseController
 		$usersService = $this->getUsersService();
 		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['chores_due_soon_days'];
 
+		$chores = $this->getDatabase()->chores()->orderBy('name', 'COLLATE NOCASE');
+		$currentChores = $this->getChoresService()->GetCurrent();
+		foreach ($currentChores as $currentChore)
+		{
+			if (!empty($currentChore->next_estimated_execution_time))
+			{
+				if ($currentChore->next_estimated_execution_time < date('Y-m-d H:i:s'))
+				{
+					$currentChore->due_type = 'overdue';
+				}
+				elseif ($currentChore->next_estimated_execution_time <= date('Y-m-d 23:59:59'))
+				{
+					$currentChore->due_type = 'duetoday';
+				}
+				elseif ($nextXDays > 0 && $currentChore->next_estimated_execution_time <= date('Y-m-d H:i:s', strtotime('+' . $nextXDays . ' days')))
+				{
+					$currentChore->due_type = 'duesoon';
+				}
+			}
+		}
+
 		return $this->renderPage($response, 'choresoverview', [
-			'chores' => $this->getDatabase()->chores()->orderBy('name', 'COLLATE NOCASE'),
-			'currentChores' => $this->getChoresService()->GetCurrent(),
+			'chores' => $chores,
+			'currentChores' => $currentChores,
 			'nextXDays' => $nextXDays,
 			'userfields' => $this->getUserfieldsService()->GetFields('chores'),
 			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('chores'),

controllers/ExceptionController.php

@@ -77,7 +77,8 @@ class ExceptionController extends BaseApiController
 		}
 
 		return $this->renderPage($response->withStatus(500), 'errors/500', [
-			'exception' => $exception
+			'exception' => $exception,
+			'system_info' => $this->getApplicationService()->GetSystemInfo()
 		]);
 	}
 }

controllers/GenericEntityApiController.php

@@ -9,7 +9,26 @@ class GenericEntityApiController extends BaseApiController
 {
 	public function AddObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		User::checkPermission($request, User::PERMISSION_MASTER_DATA_EDIT);
+		if ($args['entity'] == 'shopping_list' || $args['entity'] == 'shopping_lists')
+		{
+			User::checkPermission($request, User::PERMISSION_SHOPPINGLIST_ITEMS_ADD);
+		}
+		elseif ($args['entity'] == 'recipes' || $args['entity'] == 'recipes_pos' || $args['entity'] == 'recipes_nestings')
+		{
+			User::checkPermission($request, User::PERMISSION_RECIPES);
+		}
+		elseif ($args['entity'] == 'meal_plan')
+		{
+			User::checkPermission($request, User::PERMISSION_RECIPES_MEALPLAN);
+		}
+		elseif ($args['entity'] == 'equipment')
+		{
+			User::checkPermission($request, User::PERMISSION_EQUIPMENT);
+		}
+		else
+		{
+			User::checkPermission($request, User::PERMISSION_MASTER_DATA_EDIT);
+		}
 
 		if ($this->IsValidExposedEntity($args['entity']) && !$this->IsEntityWithNoEdit($args['entity']))
 		{
@@ -48,7 +67,26 @@ class GenericEntityApiController extends BaseApiController
 
 	public function DeleteObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		User::checkPermission($request, User::PERMISSION_MASTER_DATA_EDIT);
+		if ($args['entity'] == 'shopping_list' || $args['entity'] == 'shopping_lists')
+		{
+			User::checkPermission($request, User::PERMISSION_SHOPPINGLIST_ITEMS_DELETE);
+		}
+		elseif ($args['entity'] == 'recipes' || $args['entity'] == 'recipes_pos' || $args['entity'] == 'recipes_nestings')
+		{
+			User::checkPermission($request, User::PERMISSION_RECIPES);
+		}
+		elseif ($args['entity'] == 'meal_plan')
+		{
+			User::checkPermission($request, User::PERMISSION_RECIPES_MEALPLAN);
+		}
+		elseif ($args['entity'] == 'equipment')
+		{
+			User::checkPermission($request, User::PERMISSION_EQUIPMENT);
+		}
+		else
+		{
+			User::checkPermission($request, User::PERMISSION_MASTER_DATA_EDIT);
+		}
 
 		if ($this->IsValidExposedEntity($args['entity']) && !$this->IsEntityWithNoDelete($args['entity']))
 		{
@@ -76,7 +114,26 @@ class GenericEntityApiController extends BaseApiController
 
 	public function EditObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		User::checkPermission($request, User::PERMISSION_MASTER_DATA_EDIT);
+		if ($args['entity'] == 'shopping_list' || $args['entity'] == 'shopping_lists')
+		{
+			User::checkPermission($request, User::PERMISSION_SHOPPINGLIST_ITEMS_ADD);
+		}
+		elseif ($args['entity'] == 'recipes' || $args['entity'] == 'recipes_pos' || $args['entity'] == 'recipes_nestings')
+		{
+			User::checkPermission($request, User::PERMISSION_RECIPES);
+		}
+		elseif ($args['entity'] == 'meal_plan')
+		{
+			User::checkPermission($request, User::PERMISSION_RECIPES_MEALPLAN);
+		}
+		elseif ($args['entity'] == 'equipment')
+		{
+			User::checkPermission($request, User::PERMISSION_EQUIPMENT);
+		}
+		else
+		{
+			User::checkPermission($request, User::PERMISSION_MASTER_DATA_EDIT);
+		}
 
 		if ($this->IsValidExposedEntity($args['entity']) && !$this->IsEntityWithNoEdit($args['entity']))
 		{
@@ -161,7 +218,7 @@ class GenericEntityApiController extends BaseApiController
 				$userfieldKeyValuePairs = null;
 				foreach ($userfields as $userfield)
 				{
-					$value = FindObjectInArrayByPropertyValue($allUserfieldValues, 'object_id', $object->id);
+					$value = FindObjectInArrayByPropertyValue(FindAllObjectsInArrayByPropertyValue($allUserfieldValues, 'object_id', $object->id), 'name', $userfield->name);
 					if ($value)
 					{
 						$userfieldKeyValuePairs[$userfield->name] = $value->value;

controllers/OpenApiController.php

@@ -36,11 +36,12 @@ class OpenApiController extends BaseApiController
 		$spec->info->description = str_replace('PlaceHolderManageApiKeysUrl', $this->AppContainer->get('UrlManager')->ConstructUrl('/manageapikeys'), $spec->info->description);
 		$spec->servers[0]->url = $this->AppContainer->get('UrlManager')->ConstructUrl('/api');
 
-		$spec->components->schemas->ExposedEntity_IncludingUserEntities = clone $spec->components->schemas->ExposedEntity;
+		$spec->components->schemas->ExposedEntity_IncludingUserEntities = clone $spec->components->schemas->StringEnumTemplate;;
 		foreach ($this->getUserfieldsService()->GetEntities() as $userEntity)
 		{
 			array_push($spec->components->schemas->ExposedEntity_IncludingUserEntities->enum, $userEntity);
 		}
+		sort($spec->components->schemas->ExposedEntity_IncludingUserEntities->enum);
 
 		$spec->components->schemas->ExposedEntity_NotIncludingNotEditable = clone $spec->components->schemas->StringEnumTemplate;
 		foreach ($spec->components->schemas->ExposedEntity->enum as $value)
@@ -50,6 +51,7 @@ class OpenApiController extends BaseApiController
 				array_push($spec->components->schemas->ExposedEntity_NotIncludingNotEditable->enum, $value);
 			}
 		}
+		sort($spec->components->schemas->ExposedEntity_NotIncludingNotEditable->enum);
 
 		$spec->components->schemas->ExposedEntity_IncludingUserEntities_NotIncludingNotEditable = clone $spec->components->schemas->StringEnumTemplate;
 		foreach ($spec->components->schemas->ExposedEntity_IncludingUserEntities->enum as $value)
@@ -59,6 +61,8 @@ class OpenApiController extends BaseApiController
 				array_push($spec->components->schemas->ExposedEntity_IncludingUserEntities_NotIncludingNotEditable->enum, $value);
 			}
 		}
+		array_push($spec->components->schemas->ExposedEntity_IncludingUserEntities_NotIncludingNotEditable->enum, 'stock'); // TODO: Don't hardcode this here - stock entries are normally not editable, but the corresponding Userfields are
+		sort($spec->components->schemas->ExposedEntity_IncludingUserEntities_NotIncludingNotEditable->enum);
 
 		$spec->components->schemas->ExposedEntity_NotIncludingNotDeletable = clone $spec->components->schemas->StringEnumTemplate;
 		foreach ($spec->components->schemas->ExposedEntity->enum as $value)
@@ -68,6 +72,7 @@ class OpenApiController extends BaseApiController
 				array_push($spec->components->schemas->ExposedEntity_NotIncludingNotDeletable->enum, $value);
 			}
 		}
+		sort($spec->components->schemas->ExposedEntity_NotIncludingNotDeletable->enum);
 
 		$spec->components->schemas->ExposedEntity_NotIncludingNotListable = clone $spec->components->schemas->StringEnumTemplate;
 		foreach ($spec->components->schemas->ExposedEntity->enum as $value)
@@ -77,6 +82,7 @@ class OpenApiController extends BaseApiController
 				array_push($spec->components->schemas->ExposedEntity_NotIncludingNotListable->enum, $value);
 			}
 		}
+		sort($spec->components->schemas->ExposedEntity_NotIncludingNotListable->enum);
 
 		return $this->ApiResponse($response, $spec);
 	}

controllers/RecipesApiController.php

@@ -3,6 +3,8 @@
 namespace Grocy\Controllers;
 
 use Grocy\Controllers\Users\User;
+use Grocy\Helpers\WebhookRunner;
+use Grocy\Helpers\Grocycode;
 
 class RecipesApiController extends BaseApiController
 {
@@ -76,4 +78,28 @@ class RecipesApiController extends BaseApiController
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
+
+	public function RecipePrintLabel(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		try
+		{
+			$recipe = $this->getDatabase()->recipes()->where('id', $args['recipeId'])->fetch();
+
+			$webhookData = array_merge([
+				'recipe' => $recipe->name,
+				'grocycode' => (string)(new Grocycode(Grocycode::RECIPE, $args['recipeId'])),
+			], GROCY_LABEL_PRINTER_PARAMS);
+
+			if (GROCY_LABEL_PRINTER_RUN_SERVER)
+			{
+				(new WebhookRunner())->run(GROCY_LABEL_PRINTER_WEBHOOK, $webhookData, GROCY_LABEL_PRINTER_HOOK_JSON);
+			}
+
+			return $this->ApiResponse($response, $webhookData);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
 }

controllers/RecipesController.php

@@ -3,9 +3,12 @@
 namespace Grocy\Controllers;
 
 use Grocy\Services\RecipesService;
+use Grocy\Helpers\Grocycode;
 
 class RecipesController extends BaseController
 {
+	use GrocycodeTrait;
+
 	public function MealPlan(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$start = date('Y-m-d');
@@ -56,7 +59,7 @@ class RecipesController extends BaseController
 			'fullcalendarEventSources' => $events,
 			'recipes' => $recipes,
 			'internalRecipes' => $this->getDatabase()->recipes()->where("id IN (SELECT recipe_id FROM meal_plan_internal_recipe_relation WHERE $mealPlanWhereTimespan)")->fetchAll(),
-			'recipesResolved' => $this->getRecipesService()->GetRecipesResolved2("recipe_id IN (SELECT recipe_id FROM meal_plan_internal_recipe_relation WHERE $mealPlanWhereTimespan)"),
+			'recipesResolved' => $this->getRecipesService()->GetRecipesResolved("recipe_id IN (SELECT recipe_id FROM meal_plan_internal_recipe_relation WHERE $mealPlanWhereTimespan)"),
 			'products' => $this->getDatabase()->products()->orderBy('name', 'COLLATE NOCASE'),
 			'quantityUnits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'),
 			'quantityUnitConversionsResolved' => $this->getDatabase()->quantity_unit_conversions_resolved(),
@@ -71,7 +74,6 @@ class RecipesController extends BaseController
 		$recipesResolved = $this->getRecipesService()->GetRecipesResolved('recipe_id > 0');
 
 		$selectedRecipe = null;
-
 		if (isset($request->getQueryParams()['recipe']))
 		{
 			$selectedRecipe = $this->getDatabase()->recipes($request->getQueryParams()['recipe']);
@@ -96,7 +98,7 @@ class RecipesController extends BaseController
 		$renderArray = [
 			'recipes' => $recipes,
 			'recipesResolved' => $recipesResolved,
-			'recipePositionsResolved' => $this->getDatabase()->recipes_pos_resolved()->where('recipe_type', RecipesService::RECIPE_TYPE_NORMAL),
+			'recipePositionsResolved' => $this->getDatabase()->recipes_pos_resolved()->where('recipe_id', $selectedRecipe->id),
 			'selectedRecipe' => $selectedRecipe,
 			'products' => $this->getDatabase()->products(),
 			'quantityUnits' => $this->getDatabase()->quantity_units(),
@@ -153,8 +155,6 @@ class RecipesController extends BaseController
 			'mode' => $recipeId == 'new' ? 'create' : 'edit',
 			'products' => $this->getDatabase()->products()->orderBy('name', 'COLLATE NOCASE'),
 			'quantityunits' => $this->getDatabase()->quantity_units(),
-			'recipePositionsResolved' => $this->getRecipesService()->GetRecipesPosResolved(),
-			'recipesResolved' => $this->getRecipesService()->GetRecipesResolved(),
 			'recipes' => $this->getDatabase()->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name', 'COLLATE NOCASE'),
 			'recipeNestings' => $this->getDatabase()->recipes_nestings()->where('recipe_id', $recipeId),
 			'userfields' => $this->getUserfieldsService()->GetFields('recipes'),
@@ -216,4 +216,10 @@ class RecipesController extends BaseController
 			'mealplanSections' => $this->getDatabase()->meal_plan_sections()->where('id > 0')->orderBy('sort_number')
 		]);
 	}
+
+	public function RecipeGrocycodeImage(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		$gc = new Grocycode(Grocycode::RECIPE, $args['recipeId']);
+		return $this->ServeGrocycodeImage($request, $response, $gc);
+	}
 }

controllers/StockApiController.php

@@ -100,53 +100,54 @@ class StockApiController extends BaseApiController
 			}
 
 			$bestBeforeDate = null;
-
 			if (array_key_exists('best_before_date', $requestBody) && IsIsoDate($requestBody['best_before_date']))
 			{
 				$bestBeforeDate = $requestBody['best_before_date'];
 			}
 
 			$purchasedDate = date('Y-m-d');
-
 			if (array_key_exists('purchased_date', $requestBody) && IsIsoDate($requestBody['purchased_date']))
 			{
 				$purchasedDate = $requestBody['purchased_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'];
 			}
 
 			$shoppingLocationId = null;
-
 			if (array_key_exists('shopping_location_id', $requestBody) && is_numeric($requestBody['shopping_location_id']))
 			{
 				$shoppingLocationId = $requestBody['shopping_location_id'];
 			}
 
 			$transactionType = StockService::TRANSACTION_TYPE_PURCHASE;
-
-			if (array_key_exists('transaction_type', $requestBody) && !empty($requestBody['transactiontype']))
+			if (array_key_exists('transaction_type', $requestBody) && !empty($requestBody['transaction_type']))
 			{
-				$transactionType = $requestBody['transactiontype'];
-			}
-			$runPrinterWebhook = false;
-			if (array_key_exists('print_stock_label', $requestBody) && intval($requestBody['print_stock_label']))
-			{
-				$runPrinterWebhook = intval($requestBody['print_stock_label']);
+				$transactionType = $requestBody['transaction_type'];
 			}
 
-			$transactionId = $this->getStockService()->AddProduct($args['productId'], $requestBody['amount'], $bestBeforeDate, $transactionType, $purchasedDate, $price, $locationId, $shoppingLocationId, $unusedTransactionId, $runPrinterWebhook);
+			$stockLabelType = 0;
+			if (array_key_exists('stock_label_type', $requestBody) && is_numeric($requestBody['stock_label_type']))
+			{
+				$stockLabelType = intval($requestBody['stock_label_type']);
+			}
+
+			$note = null;
+			if (array_key_exists('note', $requestBody))
+			{
+				$note = $requestBody['note'];
+			}
+
+			$transactionId = $this->getStockService()->AddProduct($args['productId'], $requestBody['amount'], $bestBeforeDate, $transactionType, $purchasedDate, $price, $locationId, $shoppingLocationId, $unusedTransactionId, $stockLabelType, false, $note);
 
 			$args['transactionId'] = $transactionId;
 			return $this->StockTransactions($request, $response, $args);
@@ -232,13 +233,18 @@ class StockApiController extends BaseApiController
 			$requestBody = $this->GetParsedAndFilteredRequestBody($request);
 
 			$listId = 1;
-
 			if (array_key_exists('list_id', $requestBody) && !empty($requestBody['list_id']) && is_numeric($requestBody['list_id']))
 			{
 				$listId = intval($requestBody['list_id']);
 			}
 
-			$this->getStockService()->ClearShoppingList($listId);
+			$doneOnly = false;
+			if (array_key_exists('done_only', $requestBody) && filter_var($requestBody['done_only'], FILTER_VALIDATE_BOOLEAN) !== false)
+			{
+				$doneOnly = boolval($requestBody['done_only']);
+			}
+
+			$this->getStockService()->ClearShoppingList($listId, $doneOnly);
 			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
@@ -323,6 +329,18 @@ class StockApiController extends BaseApiController
 		try
 		{
 			$args['productId'] = $this->getStockService()->GetProductIdFromBarcode($args['barcode']);
+
+			if (Grocycode::Validate($args['barcode']))
+			{
+				$gc = new Grocycode($args['barcode']);
+				if ($gc->GetExtraData())
+				{
+					$requestBody = $request->getParsedBody();
+					$requestBody['stock_entry_id'] = $gc->GetExtraData()[0];
+					$request = $request->withParsedBody($requestBody);
+				}
+			}
+
 			return $this->ConsumeProduct($request, $response, $args);
 		}
 		catch (\Exception $ex)
@@ -376,34 +394,36 @@ class StockApiController extends BaseApiController
 			}
 
 			$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'];
 			}
 
 			$shoppingLocationId = null;
-
 			if (array_key_exists('shopping_location_id', $requestBody) && is_numeric($requestBody['shopping_location_id']))
 			{
 				$shoppingLocationId = $requestBody['shopping_location_id'];
 			}
 
-			$transactionId = $this->getStockService()->EditStockEntry($args['entryId'], $requestBody['amount'], $bestBeforeDate, $locationId, $shoppingLocationId, $price, $requestBody['open'], $requestBody['purchased_date']);
+			$note = null;
+			if (array_key_exists('note', $requestBody))
+			{
+				$note = $requestBody['note'];
+			}
+
+			$transactionId = $this->getStockService()->EditStockEntry($args['entryId'], $requestBody['amount'], $bestBeforeDate, $locationId, $shoppingLocationId, $price, $requestBody['open'], $requestBody['purchased_date'], $note);
 			$args['transactionId'] = $transactionId;
 			return $this->StockTransactions($request, $response, $args);
 		}
@@ -482,7 +502,19 @@ class StockApiController extends BaseApiController
 				$shoppingLocationId = $requestBody['shopping_location_id'];
 			}
 
-			$transactionId = $this->getStockService()->InventoryProduct($args['productId'], $requestBody['new_amount'], $bestBeforeDate, $locationId, $price, $shoppingLocationId, $purchasedDate);
+			$stockLabelType = 0;
+			if (array_key_exists('stock_label_type', $requestBody) && is_numeric($requestBody['stock_label_type']))
+			{
+				$stockLabelType = intval($requestBody['stock_label_type']);
+			}
+
+			$note = null;
+			if (array_key_exists('note', $requestBody))
+			{
+				$note = $requestBody['note'];
+			}
+
+			$transactionId = $this->getStockService()->InventoryProduct($args['productId'], $requestBody['new_amount'], $bestBeforeDate, $locationId, $price, $shoppingLocationId, $purchasedDate, $stockLabelType, $note);
 			$args['transactionId'] = $transactionId;
 			return $this->StockTransactions($request, $response, $args);
 		}
@@ -551,6 +583,18 @@ class StockApiController extends BaseApiController
 		try
 		{
 			$args['productId'] = $this->getStockService()->GetProductIdFromBarcode($args['barcode']);
+
+			if (Grocycode::Validate($args['barcode']))
+			{
+				$gc = new Grocycode($args['barcode']);
+				if ($gc->GetExtraData())
+				{
+					$requestBody = $request->getParsedBody();
+					$requestBody['stock_entry_id'] = $gc->GetExtraData()[0];
+					$request = $request->withParsedBody($requestBody);
+				}
+			}
+
 			return $this->OpenProduct($request, $response, $args);
 		}
 		catch (\Exception $ex)
@@ -604,7 +648,12 @@ class StockApiController extends BaseApiController
 			$allowSubproductSubstitution = true;
 		}
 
-		return $this->FilteredApiResponse($response, $this->getStockService()->GetProductStockEntries($args['productId'], false, $allowSubproductSubstitution, true), $request->getQueryParams());
+		return $this->FilteredApiResponse($response, $this->getStockService()->GetProductStockEntries($args['productId'], false, $allowSubproductSubstitution), $request->getQueryParams());
+	}
+
+	public function LocationStockEntries(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
+	{
+		return $this->FilteredApiResponse($response, $this->getStockService()->GetLocationStockEntries($args['locationId']), $request->getQueryParams());
 	}
 
 	public function ProductStockLocations(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -805,6 +854,18 @@ class StockApiController extends BaseApiController
 		try
 		{
 			$args['productId'] = $this->getStockService()->GetProductIdFromBarcode($args['barcode']);
+
+			if (Grocycode::Validate($args['barcode']))
+			{
+				$gc = new Grocycode($args['barcode']);
+				if ($gc->GetExtraData())
+				{
+					$requestBody = $request->getParsedBody();
+					$requestBody['stock_entry_id'] = $gc->GetExtraData()[0];
+					$request = $request->withParsedBody($requestBody);
+				}
+			}
+
 			return $this->TransferProduct($request, $response, $args);
 		}
 		catch (\Exception $ex)

controllers/StockController.php

@@ -24,12 +24,13 @@ class StockController extends BaseController
 	public function Inventory(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'inventory', [
-			'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
+			'products' => $this->getDatabase()->products()->where('active = 1 AND no_own_stock = 0')->orderBy('name', 'COLLATE NOCASE'),
 			'barcodes' => $this->getDatabase()->product_barcodes_comma_separated(),
 			'shoppinglocations' => $this->getDatabase()->shopping_locations()->orderBy('name', 'COLLATE NOCASE'),
 			'locations' => $this->getDatabase()->locations()->orderBy('name', 'COLLATE NOCASE'),
 			'quantityUnits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'),
-			'quantityUnitConversionsResolved' => $this->getDatabase()->quantity_unit_conversions_resolved()
+			'quantityUnitConversionsResolved' => $this->getDatabase()->quantity_unit_conversions_resolved(),
+			'userfields' => $this->getUserfieldsService()->GetFields('stock')
 		]);
 	}
 
@@ -59,7 +60,9 @@ class StockController extends BaseController
 			'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
 			'locations' => $this->getDatabase()->locations()->orderBy('name', 'COLLATE NOCASE'),
 			'users' => $usersService->GetUsersAsDto(),
-			'transactionTypes' => GetClassConstants('\Grocy\Services\StockService', 'TRANSACTION_TYPE_')
+			'transactionTypes' => GetClassConstants('\Grocy\Services\StockService', 'TRANSACTION_TYPE_'),
+			'userfieldsStock' => $this->getUserfieldsService()->GetFields('stock'),
+			'userfieldValuesStock' => $this->getUserfieldsService()->GetAllValues('stock')
 		]);
 	}
 
@@ -69,7 +72,7 @@ class StockController extends BaseController
 			'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
 			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'),
 			'locations' => $this->getDatabase()->locations()->orderBy('name', 'COLLATE NOCASE'),
-			'currentStockLocationContent' => $this->getStockService()->GetCurrentStockLocationContent()
+			'currentStockLocationContent' => $this->getStockService()->GetCurrentStockLocationContent(isset($request->getQueryParams()['include_out_of_stock']))
 		]);
 	}
 
@@ -160,6 +163,7 @@ class StockController extends BaseController
 				'locations' => $this->getDatabase()->locations()->orderBy('name'),
 				'barcodes' => $this->getDatabase()->product_barcodes()->orderBy('barcode'),
 				'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'),
+				'quantityunitsStock' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'),
 				'shoppinglocations' => $this->getDatabase()->shopping_locations()->orderBy('name', 'COLLATE NOCASE'),
 				'productgroups' => $this->getDatabase()->product_groups()->orderBy('name', 'COLLATE NOCASE'),
 				'userfields' => $this->getUserfieldsService()->GetFields('products'),
@@ -177,6 +181,7 @@ class StockController extends BaseController
 				'locations' => $this->getDatabase()->locations()->orderBy('name', 'COLLATE NOCASE'),
 				'barcodes' => $this->getDatabase()->product_barcodes()->orderBy('barcode'),
 				'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'),
+				'quantityunitsStock' => $this->getDatabase()->quantity_units()->where('id IN (SELECT to_qu_id FROM quantity_unit_conversions_resolved WHERE product_id = :1) OR NOT EXISTS(SELECT 1 FROM stock_log WHERE product_id = :1)', $product->id)->orderBy('name', 'COLLATE NOCASE'),
 				'shoppinglocations' => $this->getDatabase()->shopping_locations()->orderBy('name', 'COLLATE NOCASE'),
 				'productgroups' => $this->getDatabase()->product_groups()->orderBy('name', 'COLLATE NOCASE'),
 				'userfields' => $this->getUserfieldsService()->GetFields('products'),
@@ -254,12 +259,13 @@ class StockController extends BaseController
 	public function Purchase(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'purchase', [
-			'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
+			'products' => $this->getDatabase()->products()->where('active = 1 AND no_own_stock = 0')->orderBy('name', 'COLLATE NOCASE'),
 			'barcodes' => $this->getDatabase()->product_barcodes_comma_separated(),
 			'shoppinglocations' => $this->getDatabase()->shopping_locations()->orderBy('name', 'COLLATE NOCASE'),
 			'locations' => $this->getDatabase()->locations()->orderBy('name', 'COLLATE NOCASE'),
 			'quantityUnits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'),
-			'quantityUnitConversionsResolved' => $this->getDatabase()->quantity_unit_conversions_resolved()
+			'quantityUnitConversionsResolved' => $this->getDatabase()->quantity_unit_conversions_resolved(),
+			'userfields' => $this->getUserfieldsService()->GetFields('stock')
 		]);
 	}
 
@@ -394,6 +400,7 @@ class StockController extends BaseController
 		{
 			return $this->renderPage($response, 'shoppinglistitemform', [
 				'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
+				'barcodes' => $this->getDatabase()->product_barcodes_comma_separated(),
 				'shoppingLists' => $this->getDatabase()->shopping_lists()->orderBy('name', 'COLLATE NOCASE'),
 				'mode' => 'create',
 				'quantityUnits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'),
@@ -406,6 +413,7 @@ class StockController extends BaseController
 			return $this->renderPage($response, 'shoppinglistitemform', [
 				'listItem' => $this->getDatabase()->shopping_list($args['itemId']),
 				'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
+				'barcodes' => $this->getDatabase()->product_barcodes_comma_separated(),
 				'shoppingLists' => $this->getDatabase()->shopping_lists()->orderBy('name', 'COLLATE NOCASE'),
 				'mode' => 'edit',
 				'quantityUnits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'),
@@ -417,7 +425,9 @@ class StockController extends BaseController
 
 	public function ShoppingListSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'shoppinglistsettings');
+		return $this->renderPage($response, 'shoppinglistsettings', [
+			'shoppingLists' => $this->getDatabase()->shopping_lists()->orderBy('name', 'COLLATE NOCASE')
+		]);
 	}
 
 	public function ShoppingLocationEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -454,7 +464,8 @@ class StockController extends BaseController
 			'stockEntry' => $this->getDatabase()->stock()->where('id', $args['entryId'])->fetch(),
 			'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
 			'shoppinglocations' => $this->getDatabase()->shopping_locations()->orderBy('name', 'COLLATE NOCASE'),
-			'locations' => $this->getDatabase()->locations()->orderBy('name', 'COLLATE NOCASE')
+			'locations' => $this->getDatabase()->locations()->orderBy('name', 'COLLATE NOCASE'),
+			'userfields' => $this->getUserfieldsService()->GetFields('stock')
 		]);
 	}
 
@@ -496,15 +507,17 @@ class StockController extends BaseController
 			'stockEntries' => $this->getDatabase()->stock()->orderBy('product_id'),
 			'currentStockLocations' => $this->getStockService()->GetCurrentStockLocations(),
 			'nextXDays' => $nextXDays,
-			'userfields' => $this->getUserfieldsService()->GetFields('products'),
-			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('products')
+			'userfieldsProducts' => $this->getUserfieldsService()->GetFields('products'),
+			'userfieldValuesProducts' => $this->getUserfieldsService()->GetAllValues('products'),
+			'userfieldsStock' => $this->getUserfieldsService()->GetFields('stock'),
+			'userfieldValuesStock' => $this->getUserfieldsService()->GetAllValues('stock')
 		]);
 	}
 
 	public function Transfer(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'transfer', [
-			'products' => $this->getDatabase()->products()->where('active = 1')->where('id IN (SELECT product_id from stock_current WHERE amount_aggregated > 0)')->orderBy('name', 'COLLATE NOCASE'),
+			'products' => $this->getDatabase()->products()->where('active = 1')->where('no_own_stock = 0 AND id IN (SELECT product_id from stock_current WHERE amount_aggregated > 0)')->orderBy('name', 'COLLATE NOCASE'),
 			'barcodes' => $this->getDatabase()->product_barcodes_comma_separated(),
 			'locations' => $this->getDatabase()->locations()->orderBy('name', 'COLLATE NOCASE'),
 			'quantityUnits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'),

controllers/TasksController.php

@@ -6,6 +6,9 @@ class TasksController extends BaseController
 {
 	public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
+		$usersService = $this->getUsersService();
+		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['tasks_due_soon_days'];
+
 		if (isset($request->getQueryParams()['include_done']))
 		{
 			$tasks = $this->getDatabase()->tasks()->orderBy('name', 'COLLATE NOCASE');
@@ -15,8 +18,25 @@ class TasksController extends BaseController
 			$tasks = $this->getTasksService()->GetCurrent();
 		}
 
-		$usersService = $this->getUsersService();
-		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['tasks_due_soon_days'];
+		foreach ($tasks as $task)
+		{
+			if (empty($task->due_date))
+			{
+				$task->due_type = '';
+			}
+			elseif ($task->due_date < date('Y-m-d 23:59:59', strtotime('-1 days')))
+			{
+				$task->due_type = 'overdue';
+			}
+			elseif ($task->due_date <= date('Y-m-d 23:59:59'))
+			{
+				$task->due_type = 'duetoday';
+			}
+			elseif ($nextXDays > 0 && $task->due_date <= date('Y-m-d 23:59:59', strtotime('+' . $nextXDays . ' days')))
+			{
+				$task->due_type = 'duesoon';
+			}
+		}
 
 		return $this->renderPage($response, 'tasks', [
 			'tasks' => $tasks,

controllers/Users/User.php

@@ -83,16 +83,12 @@ class User
 		return $user->getPermissionList();
 	}
 
-	public static function checkPermission($request, string ...$permissions): void
+	public static function checkPermission($request, string $permission): void
 	{
 		$user = new self();
-
-		foreach ($permissions as $permission)
+		if (!$user->hasPermission($permission))
 		{
-			if (!$user->hasPermission($permission))
-			{
-				throw new PermissionMissingException($request, $permission);
-			}
+			throw new PermissionMissingException($request, $permission);
 		}
 	}
 

docs/label-printing.md

@@ -13,7 +13,7 @@ should print, a POST request to a configured URL is made. The target then is res
 Reference implementation
 ---
 
-The webhook was developed and tested against a Brother QL-600 label printer, using endless 62mm label paper. The webhook provider implementation was
+The webhook was developed and tested against a Brother QL-600 label printer, using Brother DK-2205 endless 62mm label paper. The webhook provider implementation was
 implemented into [a fork of brother_ql_web](https://github.com/mistressofjellyfish/brother_ql_web).
 
 Webhook request

grocy.openapi.json

@@ -60,7 +60,7 @@
 	"paths": {
 		"/system/info": {
 			"get": {
-				"summary": "Returns information about the installed grocy, PHP and SQLite version",
+				"summary": "Returns information about the installed grocy version, PHP runtime and OS",
 				"tags": [
 					"System"
 				],
@@ -391,8 +391,7 @@
 									"type": "object",
 									"properties": {
 										"created_object_id": {
-											"type": "number",
-											"format": "integer",
+											"type": "integer",
 											"description": "The id of the created object"
 										}
 									}
@@ -639,7 +638,7 @@
 						"required": true,
 						"description": "A valid object id of the given entity",
 						"schema": {
-							"type": "integer"
+							"type": "string"
 						}
 					}
 				],
@@ -688,7 +687,7 @@
 						"required": true,
 						"description": "A valid object id of the given entity",
 						"schema": {
-							"type": "integer"
+							"type": "string"
 						}
 					}
 				],
@@ -764,7 +763,7 @@
 						"required": false,
 						"description": "Only when using `force_serve_as` = `picture`: Downscale the picture to the given height while maintaining the aspect ratio",
 						"schema": {
-							"type": "integer"
+							"type": "number"
 						}
 					},
 					{
@@ -773,7 +772,7 @@
 						"required": false,
 						"description": "Only when using `force_serve_as` = `picture`: Downscale the picture to the given width while maintaining the aspect ratio",
 						"schema": {
-							"type": "integer"
+							"type": "number"
 						}
 					}
 				],
@@ -1480,7 +1479,6 @@
 								"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": {
@@ -1490,7 +1488,6 @@
 									},
 									"price": {
 										"type": "number",
-										"format": "number",
 										"description": "The price per stock quantity unit in configured currency"
 									},
 									"open": {
@@ -1498,13 +1495,11 @@
 										"description": "If the stock entry was already opened or not"
 									},
 									"location_id": {
-										"type": "number",
-										"format": "integer",
+										"type": "integer",
 										"description": "If omitted, the default location of the product is used"
 									},
 									"shopping_location_id": {
-										"type": "number",
-										"format": "integer",
+										"type": "integer",
 										"description": "If omitted, no store will be affected"
 									},
 									"purchased_date": {
@@ -1891,7 +1886,6 @@
 								"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": {
@@ -1904,22 +1898,23 @@
 									},
 									"price": {
 										"type": "number",
-										"format": "number",
 										"description": "The price per stock quantity unit in configured currency"
 									},
 									"location_id": {
-										"type": "number",
-										"format": "integer",
+										"type": "integer",
 										"description": "If omitted, the default location of the product is used"
 									},
 									"shopping_location_id": {
-										"type": "number",
-										"format": "integer",
+										"type": "integer",
 										"description": "If omitted, no store will be affected"
 									},
-									"print_stock_label": {
-										"type": "boolean",
-										"description": "True when the stock entry label should be printed"
+									"stock_label_type": {
+										"type": "integer",
+										"description": "`1` = No label, `2` = Single label, `3` = Label per unit"
+									},
+									"note": {
+										"type": "string",
+										"description": "An optional note for the corresponding stock entry"
 									}
 								},
 								"example": {
@@ -1999,13 +1994,11 @@
 										"description": "A specific stock entry id to consume, if used, the amount has to be 1"
 									},
 									"recipe_id": {
-										"type": "number",
-										"format": "integer",
+										"type": "integer",
 										"description": "A valid recipe id for which this product was used (for statistical purposes only)"
 									},
 									"location_id": {
-										"type": "number",
-										"format": "integer",
+										"type": "integer",
 										"description": "A valid location id (if supplied, only stock at the given location is considered, if ommitted, stock of any location is considered)"
 									},
 									"exact_amount": {
@@ -2014,7 +2007,7 @@
 									},
 									"allow_subproduct_substitution": {
 										"type": "boolean",
-										"description": "`True` when any in-stock sub product should be used when the given product is a parent product and currently not in-stock"
+										"description": "`true` when any in-stock sub product should be used when the given product is a parent product and currently not in-stock"
 									}
 								},
 								"example": {
@@ -2082,13 +2075,11 @@
 										"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",
+										"type": "integer",
 										"description": "A valid location id, the location from where the product should be transfered"
 									},
 									"location_id_to": {
-										"type": "number",
-										"format": "integer",
+										"type": "integer",
 										"description": "A valid location id, the location to where the product should be transfered"
 									},
 									"stock_entry_id": {
@@ -2157,7 +2148,7 @@
 								"type": "object",
 								"properties": {
 									"new_amount": {
-										"type": "integer",
+										"type": "number",
 										"description": "The new current amount for the given product - 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": {
@@ -2166,19 +2157,24 @@
 										"description": "The due date which applies to added products"
 									},
 									"shopping_location_id": {
-										"type": "number",
-										"format": "integer",
+										"type": "integer",
 										"description": "If omitted, no store will be affected"
 									},
 									"location_id": {
-										"type": "number",
-										"format": "integer",
+										"type": "integer",
 										"description": "If omitted, the default location of the product is used (only applies to added products)"
 									},
 									"price": {
 										"type": "number",
-										"format": "number",
 										"description": "If omitted, the last price of the product is used (only applies to added products)"
+									},
+									"stock_label_type": {
+										"type": "integer",
+										"description": "`1` = No label, `2` = Single label, `3` = Label per unit (only applies to added products)"
+									},
+									"note": {
+										"type": "string",
+										"description": "An optional note for the corresponding stock entry (only applies to added products)"
 									}
 								}
 							}
@@ -2246,7 +2242,7 @@
 									},
 									"allow_subproduct_substitution": {
 										"type": "boolean",
-										"description": "`True` when any in-stock sub product should be used when the given product is a parent product and currently not in-stock"
+										"description": "`true` when any in-stock sub product should be used when the given product is a parent product and currently not in-stock"
 									}
 								},
 								"example": {
@@ -2435,7 +2431,6 @@
 								"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": {
@@ -2448,12 +2443,10 @@
 									},
 									"price": {
 										"type": "number",
-										"format": "number",
 										"description": "The price per stock quantity unit in configured currency"
 									},
 									"location_id": {
-										"type": "number",
-										"format": "integer",
+										"type": "integer",
 										"description": "If omitted, the default location of the product is used"
 									}
 								},
@@ -2534,13 +2527,11 @@
 										"description": "A specific stock entry id to consume, if used, the amount has to be 1"
 									},
 									"recipe_id": {
-										"type": "number",
-										"format": "integer",
+										"type": "integer",
 										"description": "A valid recipe id for which this product was used (for statistical purposes only)"
 									},
 									"location_id": {
-										"type": "number",
-										"format": "integer",
+										"type": "integer",
 										"description": "A valid location id (if supplied, only stock at the given location is considered, if ommitted, stock of any location is considered)"
 									},
 									"exact_amount": {
@@ -2549,7 +2540,7 @@
 									},
 									"allow_subproduct_substitution": {
 										"type": "boolean",
-										"description": "`True` when any in-stock sub product should be used when the given product is a parent product and currently not in-stock"
+										"description": "`rue` when any in-stock sub product should be used when the given product is a parent product and currently not in-stock"
 									}
 								},
 								"example": {
@@ -2617,13 +2608,11 @@
 										"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",
+										"type": "integer",
 										"description": "A valid location id, the location from where the product should be transfered"
 									},
 									"location_id_to": {
-										"type": "number",
-										"format": "integer",
+										"type": "integer",
 										"description": "A valid location id, the location to where the product should be transfered"
 									},
 									"stock_entry_id": {
@@ -2692,7 +2681,7 @@
 								"type": "object",
 								"properties": {
 									"new_amount": {
-										"type": "integer",
+										"type": "number",
 										"description": "The new current amount for the given product - 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": {
@@ -2701,13 +2690,11 @@
 										"description": "The due date which applies to added products"
 									},
 									"location_id": {
-										"type": "number",
-										"format": "integer",
+										"type": "integer",
 										"description": "If omitted, the default location of the product is used (only applies to added products)"
 									},
 									"price": {
 										"type": "number",
-										"format": "number",
 										"description": "If omitted, the last price of the product is used (only applies to added products)"
 									}
 								}
@@ -2776,7 +2763,7 @@
 									},
 									"allow_subproduct_substitution": {
 										"type": "boolean",
-										"description": "`True` when any in-stock sub product should be used when the given product is a parent product and currently not in-stock"
+										"description": "`rue` when any in-stock sub product should be used when the given product is a parent product and currently not in-stock"
 									}
 								},
 								"example": {
@@ -2813,6 +2800,72 @@
 				}
 			}
 		},
+		"/stock/locations/{locationId}/entries": {
+			"get": {
+				"summary": "Returns all stock entries of the given location",
+				"tags": [
+					"Stock"
+				],
+				"parameters": [
+					{
+						"in": "path",
+						"name": "locationId",
+						"required": true,
+						"description": "A valid location id",
+						"schema": {
+							"type": "integer"
+						}
+					},
+					{
+						"$ref": "#/components/parameters/query"
+					},
+					{
+						"$ref": "#/components/parameters/order"
+					},
+					{
+						"$ref": "#/components/parameters/limit"
+					},
+					{
+						"$ref": "#/components/parameters/offset"
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "An array of StockEntry objects",
+						"content": {
+							"application/json": {
+								"schema": {
+									"type": "array",
+									"items": {
+										"$ref": "#/components/schemas/StockEntry"
+									}
+								}
+							}
+						}
+					},
+					"400": {
+						"description": "The operation was not successful (possible errors are: Not existing location)",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/Error400"
+								}
+							}
+						}
+					},
+					"500": {
+						"description": "The operation was not successful (possible errors are invalid field names or conditions in filter parameters provided)",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/Error500"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
 		"/stock/shoppinglist/add-missing-products": {
 			"post": {
 				"summary": "Adds currently missing products (below defined min. stock amount) to the given shopping list",
@@ -2955,10 +3008,15 @@
 									"list_id": {
 										"type": "integer",
 										"description": "The shopping list id to clear, when omitted, the default shopping list (with id 1) is used"
+									},
+									"done_only": {
+										"type": "boolean",
+										"description": "When `true`, only done items will be removed (defaults to `false` when ommited)"
 									}
 								},
 								"example": {
-									"list_id": 2
+									"list_id": 2,
+									"done_only": false
 								}
 							}
 						}
@@ -2997,15 +3055,19 @@
 								"properties": {
 									"product_id": {
 										"type": "integer",
-										"description": "A valid product id of the item on the shopping list"
+										"description": "A valid product id of the product to be added"
+									},
+									"qu_id": {
+										"type": "integer",
+										"description": "A valid quantity unit id (used only for display; the amount needs to be related to the products stock QU), when omitted, the products stock QU is used"
 									},
 									"list_id": {
 										"type": "integer",
 										"description": "A valid shopping list id, when omitted, the default shopping list (with id 1) is used"
 									},
 									"product_amount": {
-										"type": "integer",
-										"description": "The amount of product units to add, when omitted, the default amount of 1 is used"
+										"type": "number",
+										"description": "The amount (related to the products stock QU) to add, when omitted, the default amount of 1 is used"
 									},
 									"note": {
 										"type": "string",
@@ -3062,7 +3124,7 @@
 										"description": "A valid shopping list id, when omitted, the default shopping list (with id 1) is used"
 									},
 									"product_amount": {
-										"type": "integer",
+										"type": "number",
 										"description": "The amount of product units to remove, when omitted, the default amount of 1 is used"
 									}
 								},
@@ -3323,8 +3385,7 @@
 									"excludedProductIds": {
 										"type": "array",
 										"items": {
-											"type": "number",
-											"format": "integer"
+											"type": "integer"
 										},
 										"description": "An optional array of product ids to exclude them from being put on the shopping list"
 									}
@@ -3401,6 +3462,16 @@
 				"responses": {
 					"204": {
 						"description": "The operation was successful"
+					},
+					"400": {
+						"description": "The operation was not successful (possible errors are: Invalid recipe id, recipe need is not fulfilled)",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/Error400"
+								}
+							}
+						}
 					}
 				}
 			}
@@ -3488,8 +3559,7 @@
 									"type": "object",
 									"properties": {
 										"created_object_id": {
-											"type": "number",
-											"format": "integer",
+											"type": "integer",
 											"description": "The id of the created recipe"
 										}
 									}
@@ -3510,6 +3580,48 @@
 				}
 			}
 		},
+		"/recipes/{recipeId}/printlabel": {
+			"get": {
+				"summary": "Prints the grocycode label of the given recipe on the configured label printer",
+				"tags": [
+					"Recipes"
+				],
+				"parameters": [
+					{
+						"in": "path",
+						"name": "recipeId",
+						"required": true,
+						"description": "A valid recipe id",
+						"schema": {
+							"type": "integer"
+						}
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "The operation was successful",
+						"content": {
+							"application/json": {
+								"schema": {
+									"type": "object",
+									"description": "WebHook data"
+								}
+							}
+						}
+					},
+					"400": {
+						"description": "The operation was not successful (possible errors are: Not existing recipe, error on WebHook execution)",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/Error400"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
 		"/chores": {
 			"get": {
 				"summary": "Returns all chores incl. the next estimated execution time per chore",
@@ -3630,6 +3742,11 @@
 									"done_by": {
 										"type": "integer",
 										"description": "A valid user id of who executed this chore, when omitted, the currently authenticated user will be used"
+									},
+									"skipped": {
+										"type": "boolean",
+										"default": false,
+										"description": "`true` when the execution should be tracked as skipped, defaults to `false` when omitted"
 									}
 								}
 							}
@@ -3778,6 +3895,49 @@
 				}
 			}
 		},
+		"/chores/{choreIdToKeep}/merge/{choreIdToRemove}": {
+			"post": {
+				"summary": "Merges two chores into one",
+				"tags": [
+					"Chores"
+				],
+				"parameters": [
+					{
+						"in": "path",
+						"name": "choreIdToKeep",
+						"required": true,
+						"description": "A valid chore id of the chore to keep",
+						"schema": {
+							"type": "integer"
+						}
+					},
+					{
+						"in": "path",
+						"name": "choreIdToRemove",
+						"required": true,
+						"description": "A valid chore id of the chore to remove",
+						"schema": {
+							"type": "integer"
+						}
+					}
+				],
+				"responses": {
+					"204": {
+						"description": "The operation was successful"
+					},
+					"400": {
+						"description": "The operation was not successful (possible errors are: Invalid chore id)",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/Error400"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
 		"/batteries": {
 			"get": {
 				"summary": "Returns all batteries incl. the next estimated charge time per battery",
@@ -4278,19 +4438,13 @@
 						"type": "integer"
 					},
 					"qu_factor_purchase_to_stock": {
-						"type": "number",
-						"format": "number"
+						"type": "number"
 					},
 					"tare_weight": {
-						"type": "number",
-						"format": "number"
-					},
-					"barcode": {
-						"type": "string",
-						"description": "Can contain multiple barcodes separated by comma"
+						"type": "number"
 					},
 					"min_stock_amount": {
-						"type": "integer",
+						"type": "number",
 						"minimum": 0,
 						"default": 0
 					},
@@ -4314,9 +4468,24 @@
 					"shopping_location_id": {
 						"type": "integer"
 					},
+					"treat_opened_as_out_of_stock": {
+						"type": "integer"
+					},
+					"no_own_stock": {
+						"type": "integer"
+					},
 					"userfields": {
 						"type": "object",
 						"description": "Key/value pairs of userfields"
+					},
+					"should_not_be_frozen": {
+						"type": "integer"
+					},
+					"default_consume_location_id": {
+						"type": "integer"
+					},
+					"move_on_open": {
+						"type": "integer"
 					}
 				},
 				"example": {
@@ -4327,7 +4496,6 @@
 					"qu_id_purchase": "3",
 					"qu_id_stock": "3",
 					"qu_factor_purchase_to_stock": "1.0",
-					"barcode": "cok1",
 					"min_stock_amount": "8",
 					"default_best_before_days": "0",
 					"row_created_timestamp": "2019-05-02 20:12:26",
@@ -4338,7 +4506,10 @@
 					"tare_weight": "0.0",
 					"not_check_stock_fulfillment_for_recipes": "0",
 					"shopping_location_id": null,
-					"userfields": null
+					"userfields": null,
+					"should_not_be_frozen": "1",
+					"default_consume_location_id": "5",
+					"move_on_open": "1"
 				}
 			},
 			"QuantityUnit": {
@@ -4446,7 +4617,7 @@
 						"type": "integer"
 					},
 					"amount": {
-						"type": "integer"
+						"type": "number"
 					},
 					"location_id": {
 						"type": "integer"
@@ -4506,6 +4677,9 @@
 						"type": "string",
 						"format": "date"
 					},
+					"note": {
+						"type": "string"
+					},
 					"row_created_timestamp": {
 						"type": "string",
 						"format": "date-time"
@@ -4542,8 +4716,7 @@
 						"type": "integer"
 					},
 					"costs": {
-						"type": "number",
-						"format": "number"
+						"type": "number"
 					}
 				},
 				"example": {
@@ -4578,10 +4751,10 @@
 						"format": "date-time"
 					},
 					"stock_amount": {
-						"type": "integer"
+						"type": "number"
 					},
 					"stock_amount_opened": {
-						"type": "integer"
+						"type": "number"
 					},
 					"next_due_date": {
 						"type": "string",
@@ -4589,15 +4762,20 @@
 					},
 					"last_price": {
 						"type": "number",
-						"format": "number"
+						"description": "The price of the last purchase of the corresponding product"
 					},
 					"avg_price": {
 						"type": "number",
-						"format": "number"
+						"description": "The average price af all stock entries currently in stock of the corresponding product"
+					},
+					"current_price": {
+						"type": "number",
+						"description": "The current price of the corresponding product, based on the stock entry to use next (defined by the default consume rule \"Opened first, then first due first, then first in first out\") or on the last price if the product is currently not in stock"
 					},
 					"oldest_price": {
 						"type": "number",
-						"format": "number"
+						"description": "This field is deprecated and will be removed in a future version (currently returns the same as `current_price`)",
+						"deprecated": true
 					},
 					"last_shopping_location_id": {
 						"type": "integer"
@@ -4606,16 +4784,17 @@
 						"$ref": "#/components/schemas/Location"
 					},
 					"average_shelf_life_days": {
-						"type": "number",
-						"format": "integer"
+						"type": "number"
 					},
 					"spoil_rate_percent": {
-						"type": "number",
-						"format": "number"
+						"type": "number"
 					},
 					"has_childs": {
 						"type": "boolean",
-						"description": "True when the product is a parent products of others"
+						"description": "True when the product is a parent product of others"
+					},
+					"default_location": {
+						"$ref": "#/components/schemas/Location"
 					}
 				},
 				"example": {
@@ -4627,7 +4806,6 @@
 						"qu_id_purchase": "3",
 						"qu_id_stock": "3",
 						"qu_factor_purchase_to_stock": "1.0",
-						"barcode": "cok1",
 						"min_stock_amount": "8",
 						"default_best_before_days": "0",
 						"row_created_timestamp": "2019-05-02 20:12:26",
@@ -4671,7 +4849,7 @@
 					},
 					"last_price": null,
 					"avg_price": null,
-					"oldest_price": null,
+					"current_price": null,
 					"last_shopping_location_id": null,
 					"next_due_date": "2019-07-07",
 					"location": {
@@ -4681,7 +4859,8 @@
 						"row_created_timestamp": "2019-05-02 20:12:25"
 					},
 					"average_shelf_life_days": -1,
-					"spoil_rate_percent": 0
+					"spoil_rate_percent": 0,
+					"default_consume_location": null
 				}
 			},
 			"ProductPriceHistory": {
@@ -4692,8 +4871,7 @@
 						"format": "date-time"
 					},
 					"price": {
-						"type": "number",
-						"format": "float"
+						"type": "number"
 					},
 					"shopping_location": {
 						"$ref": "#/components/schemas/ShoppingLocation"
@@ -4716,12 +4894,10 @@
 						"type": "integer"
 					},
 					"amount": {
-						"type": "number",
-						"format": "number"
+						"type": "number"
 					},
 					"last_price": {
-						"type": "number",
-						"format": "float"
+						"type": "number"
 					},
 					"note": {
 						"type": "string"
@@ -4744,8 +4920,7 @@
 						"type": "integer"
 					},
 					"qu_factor_purchase_to_stock": {
-						"type": "number",
-						"format": "number"
+						"type": "number"
 					},
 					"barcode": {
 						"type": "string",
@@ -4781,6 +4956,10 @@
 					},
 					"next_execution_assigned_user": {
 						"$ref": "#/components/schemas/UserDto"
+					},
+					"average_execution_frequency_hours": {
+						"type": "integer",
+						"description": "Contains the average past execution frequency in hours or `null`, when the chore was never executed before"
 					}
 				},
 				"example": {
@@ -5036,7 +5215,7 @@
 						"type": "string",
 						"enum": [
 							"manually",
-							"dynamic-regular",
+							"hourly",
 							"daily",
 							"weekly",
 							"monthly"
@@ -5069,6 +5248,17 @@
 					"next_execution_assigned_to_user_id": {
 						"type": "integer"
 					},
+					"start_date": {
+						"type": "string",
+						"format": "date-time"
+					},
+					"rescheduled_date": {
+						"type": "string",
+						"format": "date-time"
+					},
+					"rescheduled_next_execution_assigned_to_user_id": {
+						"type": "integer"
+					},
 					"row_created_timestamp": {
 						"type": "string",
 						"format": "date-time"
@@ -5120,7 +5310,7 @@
 					},
 					"used_date": {
 						"type": "string",
-						"format": "date-time"
+						"format": "date"
 					},
 					"spoiled": {
 						"type": "boolean",
@@ -5135,6 +5325,9 @@
 					"transaction_type": {
 						"$ref": "#/components/schemas/StockTransactionType"
 					},
+					"note": {
+						"type": "string"
+					},
 					"row_created_timestamp": {
 						"type": "string",
 						"format": "date-time"
@@ -5155,8 +5348,7 @@
 						"format": "date-time"
 					},
 					"amount": {
-						"type": "number",
-						"format": "float"
+						"type": "number"
 					},
 					"location_id": {
 						"type": "integer"
@@ -5209,8 +5401,7 @@
 				"type": "object",
 				"properties": {
 					"amount": {
-						"type": "number",
-						"format": "float"
+						"type": "number"
 					},
 					"user_id": {
 						"type": "integer"
@@ -5338,6 +5529,12 @@
 					"next_execution_assigned_to_user_id": {
 						"type": "integer"
 					},
+					"is_rescheduled": {
+						"type": "boolean"
+					},
+					"is_reassigned": {
+						"type": "boolean"
+					},
 					"next_execution_assigned_user": {
 						"$ref": "#/components/schemas/UserDto"
 					}
@@ -5580,7 +5777,9 @@
 					"stock",
 					"stock_current_locations",
 					"chores_log",
-					"meal_plan_sections"
+					"meal_plan_sections",
+					"products_last_purchased",
+					"products_average_price"
 				]
 			},
 			"ExposedEntityNoListing": {
@@ -5596,7 +5795,9 @@
 					"api_keys",
 					"stock",
 					"stock_current_locations",
-					"chores_log"
+					"chores_log",
+					"products_last_purchased",
+					"products_average_price"
 				]
 			},
 			"ExposedEntityNoDelete": {
@@ -5605,7 +5806,9 @@
 					"stock_log",
 					"stock",
 					"stock_current_locations",
-					"chores_log"
+					"chores_log",
+					"products_last_purchased",
+					"products_average_price"
 				]
 			},
 			"ExposedEntityEditRequiresAdmin": {

helpers/Grocycode.php

@@ -23,6 +23,8 @@ class Grocycode
 
 	public const CHORE = 'c';
 
+	public const RECIPE = 'r';
+
 	public const MAGIC = 'grcy';
 
 	/**
@@ -55,7 +57,7 @@ class Grocycode
 	/**
 	 * An array that registers all valid grocycode types. Register yours here by appending to this array.
 	 */
-	public static $Items = [self::PRODUCT, self::BATTERY, self::CHORE];
+	public static $Items = [self::PRODUCT, self::BATTERY, self::CHORE, self::RECIPE];
 
 	private $type;
 
@@ -77,7 +79,7 @@ class Grocycode
 			$gc = new self($code);
 			return true;
 		}
-		catch (Exception $e)
+		catch (\Exception $e)
 		{
 			return false;
 		}
@@ -110,7 +112,7 @@ class Grocycode
 	 */
 	private function setFromCode($code)
 	{
-		$parts = array_reverse(explode(':', $barcode));
+		$parts = array_reverse(explode(':', $code));
 		if (array_pop($parts) != self::MAGIC)
 		{
 			throw new \Exception('Not a grocycode');
@@ -122,7 +124,7 @@ class Grocycode
 		}
 
 		$this->id = array_pop($parts);
-		$this->extra_data = array_reverse($parse);
+		$this->extra_data = array_reverse($parts);
 	}
 
 	/**

helpers/PrerequisiteChecker.php

@@ -4,8 +4,12 @@ class ERequirementNotMet extends Exception
 {
 }
 
-const REQUIRED_PHP_EXTENSIONS = ['fileinfo', 'pdo_sqlite', 'gd', 'ctype', 'json', 'intl', 'zlib'];
-const REQUIRED_SQLITE_VERSION = '3.9.0';
+const REQUIRED_PHP_EXTENSIONS = ['fileinfo', 'pdo_sqlite', 'gd', 'ctype', 'json', 'intl', 'zlib', 'mbstring',
+	// These are core extensions, so normally can't be missing, but seems to be the case, however, on FreeBSD
+	'filter', 'iconv', 'tokenizer'
+];
+
+const REQUIRED_SQLITE_VERSION = '3.22.0';
 
 class PrerequisiteChecker
 {

localization/ca/chore_assignment_types.po

@@ -0,0 +1,31 @@
+# 
+# Translators:
+# gimy16 <gimy16@hotmail.com>, 2021
+# Carles Riera <blauigris@gmail.com>, 2022
+# 
+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: Carles Riera <blauigris@gmail.com>, 2022\n"
+"Language-Team: Catalan (https://www.transifex.com/grocy/teams/93189/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/chore_assignment_types\n"
+
+msgid "no-assignment"
+msgstr "sense actius"
+
+msgid "who-least-did-first"
+msgstr "qui menys ha fet primer"
+
+msgid "random"
+msgstr "aleatori"
+
+msgid "in-alphabetical-order"
+msgstr "en ordre alfabètic"

localization/ca/chore_period_types.po

@@ -0,0 +1,40 @@
+# 
+# Translators:
+# Joan Rodas <joanrc93@gmail.com>, 2020
+# gimy16 <gimy16@hotmail.com>, 2021
+# 
+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: gimy16 <gimy16@hotmail.com>, 2021\n"
+"Language-Team: Catalan (https://www.transifex.com/grocy/teams/93189/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/chore_types\n"
+
+msgid "manually"
+msgstr "manualment"
+
+msgid "daily"
+msgstr "diari"
+
+msgid "weekly"
+msgstr "setmanalment"
+
+msgid "monthly"
+msgstr "mensual"
+
+msgid "yearly"
+msgstr "anual"
+
+msgid "hourly"
+msgstr ""
+
+msgid "adaptive"
+msgstr ""

localization/ca/component_translations.po

@@ -0,0 +1,99 @@
+# 
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2022
+# 
+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>, 2022\n"
+"Language-Team: Catalan (https://www.transifex.com/grocy/teams/93189/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/component_translations\n"
+
+msgid "moment_locale"
+msgstr "ca"
+
+msgid "datatables_localization"
+msgstr ""
+"{\"processing\":\"Processant...\",\"lengthMenu\":\"Mostra _MENU_ "
+"registres\",\"zeroRecords\":\"No s'han trobat "
+"registres\",\"emptyTable\":\"No hi ha registres disponible en aquesta "
+"taula\",\"info\":\"Mostrant del _START_ al _END_ d'un total de _TOTAL_ "
+"registres\",\"infoEmpty\":\"No hi ha registres "
+"disponibles\",\"infoFiltered\":\"(filtrat de _MAX_ "
+"registres)\",\"search\":\"Cerca:\",\"infoThousands\":\".\",\"decimal\":\",\",\"loadingRecords\":\"Carregant...\",\"paginate\":{\"first\":\"Primer\",\"previous\":\"Anterior\",\"next\":\"Següent\",\"last\":\"Últim\"},\"aria\":{\"sortAscending\":\":"
+" Activa per ordenar la columna de manera ascendent\",\"sortDescending\":\": "
+"Activa per ordenar la columna de manera "
+"descendent\"},\"buttons\":{\"print\":\"Imprimeix\",\"copy\":\"Copia\",\"colvis\":\"Columnes\",\"copyTitle\":\"Copia"
+" al portapapers\",\"copySuccess\":{\"1\":\"1 fila copiada\",\"_\":\"%d files"
+" copiades\"},\"pageLength\":{\"-1\":\"Mostra totes les "
+"files\",\"_\":\"Mostra %d "
+"files\"},\"pdf\":\"PDF\",\"collection\":\"Col·lecció\",\"colvisRestore\":\"Restaurar"
+" visibilitat\",\"copyKeys\":\"Pressiona ctrl o poma + C per copiar les dades"
+" de la tabla al teu "
+"portapaper\",\"csv\":\"CSV\",\"excel\":\"Excel\",\"renameState\":\"Cambiar "
+"nom\"},\"select\":{\"rows\":{\"1\":\"1 fila seleccionada\",\"_\":\"%d files "
+"seleccionades\"},\"cells\":{\"1\":\"1 fila seleccionada\",\"_\":\"%d files "
+"seleccionades\"},\"columns\":{\"1\":\"1 columna seleccionada\",\"_\":\"%d "
+"columnes "
+"seleccionades\"}},\"autoFill\":{\"cancel\":\"Cancel·lar\",\"fillHorizontal\":\"Omple"
+" les cel·les horitzontalment\",\"fillVertical\":\"Omple les cel·les "
+"verticalment\",\"fill\":\"Omple totes les cel·les amb "
+"<i>%d</i>\"},\"thousands\":\".\",\"datetime\":{\"hours\":\"Hora\",\"minutes\":\"Minut\",\"seconds\":\"Segons\",\"unknown\":\"Desconegut\",\"amPm\":[\"am\",\"pm\"],\"previous\":\"Anterior\",\"next\":\"Següent\",\"months\":{\"0\":\"Gener\",\"1\":\"Febrer\",\"2\":\"Març\",\"3\":\"Abril\",\"4\":\"Maig\",\"5\":\"Juny\",\"6\":\"Julio\",\"7\":\"Agost\",\"8\":\"Septembre\",\"9\":\"Octubre\",\"10\":\"Novembre\",\"11\":\"Desembre\"}},\"editor\":{\"close\":\"Tancar\",\"create\":{\"button\":\"Nou\",\"title\":\"Crear"
+" nova "
+"entrada\",\"submit\":\"Crear\"},\"edit\":{\"button\":\"Editar\",\"title\":\"Editar"
+" "
+"entrada\",\"submit\":\"Actualitzar\"},\"remove\":{\"button\":\"Eliminar\",\"title\":\"Eliminar\",\"submit\":\"Eliminar\",\"confirm\":{\"1\":\"Està"
+" segir de voler elmiminar 1 fila?\",\"_\":\"Està segur de voler eliminar %d "
+"files?\"}},\"error\":{\"system\":\"Ha ocurregut un error de sistema (Més "
+"informació)\"},\"multi\":{\"title\":\"Múltiples valors\",\"info\":\"El ítems"
+" seleccionts contenen diferent valors per aquesta entrada. Per editar i "
+"configurar tots els ítems per a aquesta entrada al mateix valor, prem o "
+"clica tabular aquí, d'altra vanda, mantindrán els seus valors "
+"individuals\",\"restore\":\"Desfés el canvi\",\"noMulti\":\"Aquest camp pot "
+"ser editat indifidualment; però no com a part d'un "
+"grup\"}},\"searchBuilder\":{\"add\":\"Afegir "
+"condició\",\"clearAll\":\"Eliminar "
+"tot\",\"condition\":\"Condició\",\"conditions\":{\"date\":{\"after\":\"Després\",\"before\":\"Abans\",\"between\":\"Entre\",\"empty\":\"Buit\",\"equals\":\"Iguals\",\"not\":\"No\",\"notBetween\":\"No"
+" entre\",\"notEmpty\":\"No "
+"buit\"},\"number\":{\"between\":\"Entre\",\"empty\":\"Buit\",\"equals\":\"Iguals\",\"gt\":\"Major"
+" que\",\"gte\":\"Mejor o igual a\",\"lt\":\"Menor que\",\"lte\":\"Menor o "
+"igual a\",\"not\":\"No\",\"notBetween\":\"No entre\",\"notEmpty\":\"No "
+"buit\"},\"string\":{\"contains\":\"Conté\",\"empty\":\"Buit\",\"endsWith\":\"Finalitza"
+" amb\",\"equals\":\"Iguals\",\"not\":\"No\",\"notEmpty\":\"No "
+"buit\",\"startsWith\":\"Comença amb\",\"notEnds\":\"No acaba "
+"amb\",\"notStarts\":\"No comença amb\",\"notContains\":\"No "
+"inclou\"},\"array\":{\"equals\":\"Iguals\",\"empty\":\"Buit\",\"contains\":\"Conté\",\"not\":\"No\",\"notEmpty\":\"No"
+" buit\",\"without\":\"Sense\"}},\"data\":\"Data\",\"deleteTitle\":\"Esborrar"
+" regla de filtrat\",\"leftTitle\":\"Criteri de "
+"desindentació\",\"logicAnd\":\"I\",\"logicOr\":\"O\",\"rightTitle\":\"Criteri"
+" d'indentació\",\"value\":\"Valor\",\"title\":{\"0\":\"Constructor de "
+"cerca\",\"_\":\"Constructor de cerca (%d)\"},\"button\":{\"0\":\"Constructor"
+" de cerca\",\"_\":\"Constructor de cerca "
+"(%d)\"}},\"searchPanes\":{\"clearMessage\":\"Eborrar "
+"tot\",\"collapse\":{\"0\":\"Panells de cerca\",\"_\":\"Panells de cerca "
+"(%d)\"},\"count\":\"{total}\",\"countFiltered\":\"{monstrat} "
+"({total})\",\"emptyPanes\":\"No panells de "
+"cerca\",\"loadMessage\":\"Carregant panells de cerca\",\"title\":\"Filtes "
+"actius - %d\",\"collapseMessage\":\"Colapsar Tot\",\"showMessage\":\"Mostrar"
+" tot\"},\"stateRestore\":{\"renameLabel\":\"Nuevo nomm perpara "
+"%s\",\"renameButton\":\"Cambiar "
+"nom\",\"removeSubmit\":\"Eliminar\",\"removeJoiner\":\"i\",\"removeError\":\"Error"
+" eliminant el registre\",\"removeConfirm\":\"¿Segur que vol eliminar aquest "
+"%s?\",\"emptyError\":\"El nom no pot estar buit\"}}"
+
+msgid "summernote_locale"
+msgstr "ca-ES"
+
+msgid "fullcalendar_locale"
+msgstr "ca"
+
+msgid "bootstrap-select_locale"
+msgstr "en_US"

localization/ca/demo_data.po

@@ -0,0 +1,388 @@
+# 
+# Translators:
+# Joan Rodas <joanrc93@gmail.com>, 2020
+# gimy16 <gimy16@hotmail.com>, 2021
+# 
+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: gimy16 <gimy16@hotmail.com>, 2021\n"
+"Language-Team: Catalan (https://www.transifex.com/grocy/teams/93189/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/demo_data\n"
+
+msgid "Cookies"
+msgstr "Galetes"
+
+msgid "Chocolate"
+msgstr "Xocolata"
+
+msgid "Pantry"
+msgstr "rebost"
+
+msgid "Candy cupboard"
+msgstr ""
+
+msgid "Tinned food cupboard"
+msgstr ""
+
+msgid "Fridge"
+msgstr "Nevera"
+
+msgid "Piece"
+msgid_plural "Pieces"
+msgstr[0] "Peces"
+msgstr[1] "Trossos"
+
+msgid "Pack"
+msgid_plural "Packs"
+msgstr[0] "Paquet"
+msgstr[1] "Paquets"
+
+msgid "Glass"
+msgid_plural "Glasses"
+msgstr[0] "Got"
+msgstr[1] "Gots"
+
+msgid "Tin"
+msgid_plural "Tins"
+msgstr[0] "Pot"
+msgstr[1] "Pots"
+
+msgid "Can"
+msgid_plural "Cans"
+msgstr[0] "Llauna"
+msgstr[1] "Llaunes"
+
+msgid "Bunch"
+msgid_plural "Bunches"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Gummy bears"
+msgstr ""
+
+msgid "Crisps"
+msgstr ""
+
+msgid "Eggs"
+msgstr "Ous"
+
+msgid "Noodles"
+msgstr "Fideus"
+
+msgid "Pickles"
+msgstr "Encurtits"
+
+msgid "Gulash soup"
+msgstr "Gulash"
+
+msgid "Yogurt"
+msgstr "iogurt"
+
+msgid "Cheese"
+msgstr "Formatge"
+
+msgid "Cold cuts"
+msgstr "Embotits"
+
+msgid "Paprika"
+msgstr "Pebrot"
+
+msgid "Cucumber"
+msgstr "Cogombre"
+
+msgid "Radish"
+msgstr "Rave"
+
+msgid "Tomato"
+msgstr "Tomàquet"
+
+msgid "Change towels in the bathroom"
+msgstr ""
+
+msgid "Mop the kitchen floor"
+msgstr ""
+
+msgid "Warranty ends"
+msgstr "S'acaba la garantia"
+
+msgid "TV remote control"
+msgstr "Comandament a distància"
+
+msgid "Alarm clock"
+msgstr "Alarma"
+
+msgid "Heat remote control"
+msgstr ""
+
+msgid "Take out the trash"
+msgstr ""
+
+msgid "Some good snacks"
+msgstr "Uns bons aperitius"
+
+msgid "Pizza dough"
+msgstr "Massa de pizza"
+
+msgid "Sieved tomatoes"
+msgstr ""
+
+msgid "Salami"
+msgstr "Salami"
+
+msgid "Toast"
+msgstr "Torrada"
+
+msgid "Minced meat"
+msgstr "Carn picada"
+
+msgid "Pizza"
+msgstr "Pizza"
+
+msgid "Spaghetti bolognese"
+msgstr "Espaguetis a la bolonyesa"
+
+msgid "Sandwiches"
+msgstr "Entrepans"
+
+msgid "English"
+msgstr "Anglès"
+
+msgid "German"
+msgstr "Alemany"
+
+msgid "Italian"
+msgstr "Italià"
+
+msgid "This is the note content of the recipe ingredient"
+msgstr ""
+
+msgid "Demo User"
+msgstr "Usuari de prova"
+
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] "Gram"
+msgstr[1] "Grams"
+
+msgid "Flour"
+msgstr "Farina"
+
+msgid "Pancakes"
+msgstr ""
+
+msgid "Sugar"
+msgstr "Sucre"
+
+msgid "Sweets"
+msgstr "Llaminadures"
+
+msgid "Bakery products"
+msgstr "Productes de fleca"
+
+msgid "Tinned food"
+msgstr "Menjar en conserva"
+
+msgid "Butchery products"
+msgstr "Productes de carnisseria"
+
+msgid "Vegetables/Fruits"
+msgstr "Verdures / Fruites"
+
+msgid "Refrigerated products"
+msgstr "Productes refrigerats"
+
+msgid "Coffee machine"
+msgstr "Màquina de cafè"
+
+msgid "Dishwasher"
+msgstr "Rentaplats"
+
+msgid "Liter"
+msgstr "Litre"
+
+msgid "Liters"
+msgstr "Litres"
+
+msgid "Bottle"
+msgstr "Ampolla"
+
+msgid "Bottles"
+msgstr "Ampolles"
+
+msgid "Milk"
+msgstr "Llet"
+
+msgid "Chocolate sauce"
+msgstr ""
+
+msgid "Milliliters"
+msgstr "Mil·lilitres"
+
+msgid "Milliliter"
+msgstr "Mil·lilitre"
+
+msgid "Bottom"
+msgstr "Fons"
+
+msgid "Topping"
+msgstr "Cobertura"
+
+msgid "French"
+msgstr "Francès"
+
+msgid "Turkish"
+msgstr "Turc"
+
+msgid "Spanish"
+msgstr "Espanyol"
+
+msgid "Russian"
+msgstr "Rus"
+
+msgid "Vacuum the living room floor"
+msgstr ""
+
+msgid "Clean the litter box"
+msgstr ""
+
+msgid "Change the bed sheets"
+msgstr ""
+
+msgid "Swedish"
+msgstr "Suec"
+
+msgid "Polish"
+msgstr "Polonès"
+
+msgid "Milk Chocolate"
+msgstr "Xocolata amb llet"
+
+msgid "Dark Chocolate"
+msgstr "Xocolata negra"
+
+msgid "Slice"
+msgid_plural "Slices"
+msgstr[0] "Tall"
+msgstr[1] "Talls"
+
+msgid "Example userentity"
+msgstr "Identitat d'usuari d'exemple"
+
+msgid "This is an example user entity..."
+msgstr "Aquest és una identitat d'usuari d'exemple"
+
+msgid "Custom field"
+msgstr "Camp personalitzat"
+
+msgid "Example field value..."
+msgstr "Exemple de valor de camp"
+
+msgid "Waffle rolls"
+msgstr "Gofres"
+
+msgid "Danish"
+msgstr "Danès"
+
+msgid "Dutch"
+msgstr "Holandès"
+
+msgid "Norwegian"
+msgstr "Noruec"
+
+msgid "Demo"
+msgstr "Demostració"
+
+msgid "Stable version"
+msgstr "Versió estable"
+
+msgid "Preview version"
+msgstr "Versió prèvia"
+
+msgid "current release"
+msgstr "Versió actual"
+
+msgid "not yet released"
+msgstr "Encara no publicat"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portuguès (Brasil)"
+
+msgid "This is a note"
+msgstr "Això és una nota"
+
+msgid "Freezer"
+msgstr "Congelador"
+
+msgid "Hungarian"
+msgstr "Hongarès"
+
+msgid "Slovak"
+msgstr "Eslovac"
+
+msgid "Czech"
+msgstr "Txec"
+
+msgid "Portuguese (Portugal)"
+msgstr "Portuguès (Portugal)"
+
+# Use a in your country well known supermarket name
+msgid "DemoSupermarket1"
+msgstr "Supermercat de prova 1"
+
+# Use a in your country well known supermarket name
+msgid "DemoSupermarket2"
+msgstr "Supermercat de prova 2"
+
+msgid "Japanese"
+msgstr "Japonès"
+
+msgid "Chinese (Taiwan)"
+msgstr "Xinès (Taiwan)"
+
+msgid "Greek"
+msgstr "Grec"
+
+msgid "Korean"
+msgstr "Coreà"
+
+msgid "Chinese (China)"
+msgstr "Xinès (Xina)"
+
+msgid "Hebrew (Israel)"
+msgstr "Hebreu (Israel)"
+
+msgid "Tamil"
+msgstr "Tàmil"
+
+msgid "Finnish"
+msgstr "Finès"
+
+msgid "Breakfast"
+msgstr ""
+
+msgid "Lunch"
+msgstr ""
+
+msgid "Dinner"
+msgstr ""
+
+msgid "Catalan"
+msgstr ""
+
+msgid "Slovenian"
+msgstr ""
+
+msgid "Lithuanian"
+msgstr ""
+
+msgid "Ukrainian"
+msgstr ""

localization/ca/locales.po

@@ -0,0 +1,134 @@
+# 
+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: 2020-08-31 19:11+0000\n"
+"Language-Team: Catalan (https://www.transifex.com/grocy/teams/93189/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/locales\n"
+
+# Czech
+msgid "cs"
+msgstr ""
+
+# Danish
+msgid "da"
+msgstr ""
+
+# German
+msgid "de"
+msgstr ""
+
+# Greek
+msgid "el_GR"
+msgstr ""
+
+# English
+msgid "en"
+msgstr ""
+
+# English (Great Britain)
+msgid "en_GB"
+msgstr ""
+
+# Spanish
+msgid "es"
+msgstr ""
+
+# French
+msgid "fr"
+msgstr ""
+
+# Hungarian
+msgid "hu"
+msgstr ""
+
+# Italian
+msgid "it"
+msgstr ""
+
+# Japanese
+msgid "ja"
+msgstr ""
+
+# Korean
+msgid "ko_KR"
+msgstr ""
+
+# Dutch
+msgid "nl"
+msgstr ""
+
+# Norwegian
+msgid "no"
+msgstr ""
+
+# Polish
+msgid "pl"
+msgstr ""
+
+# Portuguese (Brazil)
+msgid "pt_BR"
+msgstr ""
+
+# Portuguese (Portugal)
+msgid "pt_PT"
+msgstr ""
+
+# Russian
+msgid "ru"
+msgstr ""
+
+# Slovak
+msgid "sk_SK"
+msgstr ""
+
+# Slovenian
+msgid "sl"
+msgstr ""
+
+# Swedish
+msgid "sv_SE"
+msgstr ""
+
+# Turkish
+msgid "tr"
+msgstr ""
+
+# Chinese (Taiwan)
+msgid "zh_TW"
+msgstr ""
+
+# Chinese (China)
+msgid "zh_CN"
+msgstr ""
+
+# Hebrew (Israel)
+msgid "he_IL"
+msgstr ""
+
+# Tamil
+msgid "ta"
+msgstr ""
+
+# Finnish
+msgid "fi"
+msgstr ""
+
+# Catalan
+msgid "ca"
+msgstr ""
+
+# Lithuanian
+msgid "lt"
+msgstr ""
+
+# Ukrainian
+msgid "uk"
+msgstr ""

localization/ca/permissions.po

@@ -0,0 +1,138 @@
+# 
+# Translators:
+# gimy16 <gimy16@hotmail.com>, 2021
+# 
+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: 2020-08-29 16:33+0000\n"
+"Last-Translator: gimy16 <gimy16@hotmail.com>, 2021\n"
+"Language-Team: Catalan (https://www.transifex.com/grocy/teams/93189/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/permissions\n"
+
+# All permissions
+msgid "ADMIN"
+msgstr "ADMIN"
+
+# Create users
+msgid "USERS_CREATE"
+msgstr "USUARIS_CREACIÓ"
+
+# Edit users (including passwords)
+msgid "USERS_EDIT"
+msgstr "USUARIS_EDICIÓ"
+
+# Show users
+msgid "USERS_READ"
+msgstr "USUARIS_LECTURA"
+
+# Edit own user data / change own password
+msgid "USERS_EDIT_SELF"
+msgstr "USUARIS_EDICIÓ_PRÒPIA"
+
+# Undo charge cycle
+msgid "BATTERIES_UNDO_CHARGE_CYCLE"
+msgstr "PILES-SENSE-CICLE-DE-CÀRREGA"
+
+# Track charge cycle
+msgid "BATTERIES_TRACK_CHARGE_CYCLE"
+msgstr "CICLE DE CÀRREGA DE PILES"
+
+# Track execution
+msgid "CHORE_TRACK_EXECUTION"
+msgstr "SEGUIMENT-D'EXECUCIÓ-DE-LA-FEINA"
+
+# Undo execution
+msgid "CHORE_UNDO_EXECUTION"
+msgstr "EXECUCIÓ-NO-REALITZADA-DE-LA-FEINA"
+
+# Edit master data
+msgid "MASTER_DATA_EDIT"
+msgstr ""
+
+# Undo execution
+msgid "TASKS_UNDO_EXECUTION"
+msgstr "EXECUCIÓ-NO-REALITZADA-DE-LES-TASQUES"
+
+# Mark completed
+msgid "TASKS_MARK_COMPLETED"
+msgstr "TASQUES_COMPLETADES"
+
+# Edit stock entries
+msgid "STOCK_EDIT"
+msgstr "EDITAR_ESTOC"
+
+# Transfer
+msgid "STOCK_TRANSFER"
+msgstr "TRANSFERÈNCIA_D'ESTOC"
+
+# Inventory
+msgid "STOCK_INVENTORY"
+msgstr "ESTOC_A_L'INVENTARI"
+
+# Consume
+msgid "STOCK_CONSUME"
+msgstr "ESTOC_CONSUMIT"
+
+# Open products
+msgid "STOCK_OPEN"
+msgstr "ESTOC_OBERT"
+
+# Purchase
+msgid "STOCK_PURCHASE"
+msgstr "COMPRA_ESTOCS"
+
+# Add items
+msgid "SHOPPINGLIST_ITEMS_ADD"
+msgstr "ELEMENTS_AFEGITS_DE_LA_LLISTA_DE_LA_COMPRA"
+
+# Remove items
+msgid "SHOPPINGLIST_ITEMS_DELETE"
+msgstr ""
+
+# User management
+msgid "USERS"
+msgstr "USUARIS"
+
+# Stock
+msgid "STOCK"
+msgstr "ESTOC"
+
+# Shopping list
+msgid "SHOPPINGLIST"
+msgstr "LLISTA DE LA COMPRA"
+
+# Chores
+msgid "CHORES"
+msgstr "FEINES"
+
+# Batteries
+msgid "BATTERIES"
+msgstr "PILES"
+
+# Tasks
+msgid "TASKS"
+msgstr "TASQUES"
+
+# Recipes
+msgid "RECIPES"
+msgstr "RECEPTES"
+
+# Equipment
+msgid "EQUIPMENT"
+msgstr "EQUIP"
+
+# Calendar
+msgid "CALENDAR"
+msgstr "CALENDARI"
+
+# Meal plan
+msgid "RECIPES_MEALPLAN"
+msgstr "RECEPTES_MENÚ"

localization/ca/stock_transaction_types.po

@@ -0,0 +1,45 @@
+# 
+# Translators:
+# gimy16 <gimy16@hotmail.com>, 2021
+# 
+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: gimy16 <gimy16@hotmail.com>, 2021\n"
+"Language-Team: Catalan (https://www.transifex.com/grocy/teams/93189/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/stock_transaction_types\n"
+
+msgid "purchase"
+msgstr "compra"
+
+msgid "transfer_from"
+msgstr "Transferència_des_de"
+
+msgid "transfer_to"
+msgstr "Transferència_cap_a"
+
+msgid "consume"
+msgstr "Consum"
+
+msgid "inventory-correction"
+msgstr "Correcció_d'inventari"
+
+msgid "product-opened"
+msgstr "Producte_obert"
+
+msgid "stock-edit-old"
+msgstr "Edició_d'estoc_antic"
+
+msgid "stock-edit-new"
+msgstr "Edició_d'estoc_nou"
+
+msgid "self-production"
+msgstr "Producció_pròpia"

localization/ca/userfield_types.po

@@ -0,0 +1,70 @@
+# 
+# Translators:
+# gimy16 <gimy16@hotmail.com>, 2021
+# 
+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: gimy16 <gimy16@hotmail.com>, 2021\n"
+"Language-Team: Catalan (https://www.transifex.com/grocy/teams/93189/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/userfield_types\n"
+
+# Text (single line)
+msgid "text-single-line"
+msgstr "text-línia-única"
+
+# Text (multi line)
+msgid "text-multi-line"
+msgstr "text-línies-múltiples"
+
+# Number (integral)
+msgid "number-integral"
+msgstr "nombre-integral"
+
+# Number (decimal)
+msgid "number-decimal"
+msgstr "nombre-decimal"
+
+# Date (without time)
+msgid "date"
+msgstr "data"
+
+# Date & time
+msgid "datetime"
+msgstr "data-hora"
+
+# Checkbox
+msgid "checkbox"
+msgstr "casella-de-selecció"
+
+# Select list (a single item can be selected)
+msgid "preset-list"
+msgstr "llista-preestablerta"
+
+# Select list (multiple items can be selected)
+msgid "preset-checklist"
+msgstr "llistat-de-comprovació-predeterminat"
+
+# Link
+msgid "link"
+msgstr "enllaç"
+
+# Link (with title)
+msgid "link-with-title"
+msgstr "enllaç-amb-títol"
+
+# File
+msgid "file"
+msgstr "arxiu"
+
+# Image
+msgid "image"
+msgstr "imatge"

localization/chore_period_types.pot

@@ -15,9 +15,6 @@ msgstr ""
 msgid "manually"
 msgstr ""
 
-msgid "dynamic-regular"
-msgstr ""
-
 msgid "daily"
 msgstr ""
 
@@ -29,3 +26,9 @@ msgstr ""
 
 msgid "yearly"
 msgstr ""
+
+msgid "hourly"
+msgstr ""
+
+msgid "adaptive"
+msgstr ""

localization/component_translations.pot

@@ -12,12 +12,6 @@ msgstr ""
 "Language: en\n"
 "X-Domain: grocy/component_translations\n"
 
-msgid "timeago_locale"
-msgstr ""
-
-msgid "timeago_nan"
-msgstr ""
-
 msgid "moment_locale"
 msgstr ""
 

localization/cs/chore_assignment_types.po

@@ -1,6 +1,7 @@
 # 
 # Translators:
 # Radim Kabeláč <radim.ekk@gmail.com>, 2020
+# Pavel Paseka, 2022
 # 
 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-09-17 10:45+0000\n"
-"Last-Translator: Radim Kabeláč <radim.ekk@gmail.com>, 2020\n"
+"Last-Translator: Pavel Paseka, 2022\n"
 "Language-Team: Czech (https://www.transifex.com/grocy/teams/93189/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,13 +19,13 @@ msgstr ""
 "X-Domain: grocy/chore_assignment_types\n"
 
 msgid "no-assignment"
-msgstr "bez-přiřazení"
+msgstr "bez určení"
 
 msgid "who-least-did-first"
-msgstr "poslední-je-první"
+msgstr "ten, kdo plnil povinnost nejméně"
 
 msgid "random"
 msgstr "náhodně"
 
 msgid "in-alphabetical-order"
-msgstr "řazení-podle-abecedy"
+msgstr "podle abecedy"

localization/cs/chore_period_types.po

@@ -2,6 +2,7 @@
 # Translators:
 # Tomas Reznicek <tomas.reznicek@gmail.com>, 2019
 # Michal Petříček <michal@petricek.org>, 2019
+# Pavel Paseka, 2022
 # 
 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: Michal Petříček <michal@petricek.org>, 2019\n"
+"Last-Translator: Pavel Paseka, 2022\n"
 "Language-Team: Czech (https://www.transifex.com/grocy/teams/93189/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,9 +22,6 @@ msgstr ""
 msgid "manually"
 msgstr "Manuální"
 
-msgid "dynamic-regular"
-msgstr "Dynamický"
-
 msgid "daily"
 msgstr "Denní"
 
@@ -35,3 +33,9 @@ msgstr "Měsíčně"
 
 msgid "yearly"
 msgstr "Ročně"
+
+msgid "hourly"
+msgstr "Každou hodinu"
+
+msgid "adaptive"
+msgstr "Automatický"

localization/cs/component_translations.po

@@ -1,7 +1,6 @@
 # 
 # Translators:
 # Tomas Reznicek <tomas.reznicek@gmail.com>, 2019
-# Radim Kabeláč <radim.ekk@gmail.com>, 2020
 # Bernd Bestel <bernd@berrnd.de>, 2020
 # 
 msgid ""
@@ -19,12 +18,6 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 "X-Domain: grocy/component_translations\n"
 
-msgid "timeago_locale"
-msgstr "cs"
-
-msgid "timeago_nan"
-msgstr "před NaN lety"
-
 msgid "moment_locale"
 msgstr "cs"
 

localization/cs/demo_data.po

@@ -3,6 +3,7 @@
 # Michal Petříček <michal@petricek.org>, 2019
 # Ondřej Suk <ondra.suk.55@gmail.com>, 2020
 # Radim Kabeláč <radim.ekk@gmail.com>, 2020
+# Pavel Paseka, 2022
 # 
 msgid ""
 msgstr ""
@@ -10,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: Radim Kabeláč <radim.ekk@gmail.com>, 2020\n"
+"Last-Translator: Pavel Paseka, 2022\n"
 "Language-Team: Czech (https://www.transifex.com/grocy/teams/93189/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +36,7 @@ msgid "Tinned food cupboard"
 msgstr "Skříňka s konzervami"
 
 msgid "Fridge"
-msgstr "Lednička"
+msgstr "Chladnička"
 
 msgid "Piece"
 msgid_plural "Pieces"
@@ -118,11 +119,11 @@ msgstr "Ředkev"
 msgid "Tomato"
 msgstr "Rajče"
 
-msgid "Changed towels in the bathroom"
-msgstr "Vyměněny ručníky v koupeně"
+msgid "Change towels in the bathroom"
+msgstr "Vyměnit ručníky v koupelně"
 
-msgid "Cleaned the kitchen floor"
-msgstr "Vytřena podlaha v kuchyni"
+msgid "Mop the kitchen floor"
+msgstr "Vytřít podlahu v kuchyni"
 
 msgid "Warranty ends"
 msgstr "Záruka končí"
@@ -136,8 +137,8 @@ msgstr "Budík"
 msgid "Heat remote control"
 msgstr "Dálkové ovládání k topení"
 
-msgid "Lawn mowed in the garden"
-msgstr "Posekán trávník na zahradě"
+msgid "Take out the trash"
+msgstr "Vynést odpadkový koš"
 
 msgid "Some good snacks"
 msgstr "Nějaké dobroty"
@@ -183,10 +184,10 @@ msgstr "Demo uživatel"
 
 msgid "Gram"
 msgid_plural "Grams"
-msgstr[0] "Gram"
-msgstr[1] "Gramů"
-msgstr[2] "Gramů"
-msgstr[3] "Gramů"
+msgstr[0] "gram"
+msgstr[1] "gramy"
+msgstr[2] "gramů"
+msgstr[3] "gramů"
 
 msgid "Flour"
 msgstr "Mouka"
@@ -197,24 +198,6 @@ msgstr "Palačinky"
 msgid "Sugar"
 msgstr "Cukr"
 
-msgid "Home"
-msgstr "Domov"
-
-msgid "Life"
-msgstr "Život"
-
-msgid "Projects"
-msgstr "Projekty"
-
-msgid "Repair the garage door"
-msgstr "Opravit garážová vrata"
-
-msgid "Fork and improve grocy"
-msgstr "Forknout a vylepšit grocy"
-
-msgid "Find a solution for what to do when I forget the door keys"
-msgstr "Najít řešení situace, když si zapomenu klíče od domova"
-
 msgid "Sweets"
 msgstr "Sladkosti"
 
@@ -240,16 +223,16 @@ msgid "Dishwasher"
 msgstr "Myčka nádobí"
 
 msgid "Liter"
-msgstr "Litr"
+msgstr "litr"
 
 msgid "Liters"
-msgstr "Litry"
+msgstr "litry"
 
 msgid "Bottle"
-msgstr "Láhev"
+msgstr "láhev"
 
 msgid "Bottles"
-msgstr "Láhve"
+msgstr "láhve"
 
 msgid "Milk"
 msgstr "Mléko"
@@ -258,10 +241,10 @@ msgid "Chocolate sauce"
 msgstr "Čokoládová poleva"
 
 msgid "Milliliters"
-msgstr "Mililitry"
+msgstr "mililitry"
 
 msgid "Milliliter"
-msgstr "Mililitr"
+msgstr "mililitr"
 
 msgid "Bottom"
 msgstr "Dno"
@@ -281,14 +264,14 @@ msgstr "Španělština"
 msgid "Russian"
 msgstr "Ruština"
 
-msgid "The thing which happens on the 5th of every month"
-msgstr "Událost opakující se 5. den každý měsíc"
+msgid "Vacuum the living room floor"
+msgstr "Vysát v obývacím pokoji"
 
-msgid "The thing which happens daily"
-msgstr "Událost opakující se každý den"
+msgid "Clean the litter box"
+msgstr "Vyčistit odpadkový koš"
 
-msgid "The thing which happens on Mondays and Wednesdays"
-msgstr "Událost opakující se každé pondělí a středu"
+msgid "Change the bed sheets"
+msgstr "Vyměnit povlečení"
 
 msgid "Swedish"
 msgstr "Švédština"
@@ -310,10 +293,10 @@ msgstr[2] "Plátky"
 msgstr[3] "Plátky"
 
 msgid "Example userentity"
-msgstr "Příklad uživatelské entity"
+msgstr "Příklad uživatelské tabulky"
 
 msgid "This is an example user entity..."
-msgstr "Toto je ukázková položka uživatelské entity"
+msgstr "Toto je ukázková položka uživatelské tabulky"
 
 msgid "Custom field"
 msgstr "Vlastní pole"
@@ -340,13 +323,13 @@ msgid "Stable version"
 msgstr "Stabilní verze"
 
 msgid "Preview version"
-msgstr "Preview verze"
+msgstr "Vývojová verze"
 
 msgid "current release"
-msgstr "aktuální vydání"
+msgstr "Aktuální verze"
 
 msgid "not yet released"
-msgstr "zatím nevydáno"
+msgstr "zatím nevydaná"
 
 msgid "Portuguese (Brazil)"
 msgstr "Portugalština (Brazílie)"
@@ -393,19 +376,31 @@ msgid "Chinese (China)"
 msgstr "Čínština (Čína)"
 
 msgid "Hebrew (Israel)"
-msgstr "Hebrejsky (Izraeil)"
+msgstr "Hebrejština (Izrael)"
 
 msgid "Tamil"
-msgstr ""
+msgstr "Tamilština"
 
 msgid "Finnish"
-msgstr "Finsky"
+msgstr "Finština"
 
 msgid "Breakfast"
-msgstr ""
+msgstr "Snídaně"
 
 msgid "Lunch"
-msgstr ""
+msgstr "Oběd"
 
 msgid "Dinner"
-msgstr ""
+msgstr "Večeře"
+
+msgid "Catalan"
+msgstr "Katalánština"
+
+msgid "Slovenian"
+msgstr "Slovinština"
+
+msgid "Lithuanian"
+msgstr "Litevština"
+
+msgid "Ukrainian"
+msgstr "Ukrajinština"

localization/cs/locales.po

@@ -2,6 +2,7 @@
 # Translators:
 # Radim Kabeláč <radim.ekk@gmail.com>, 2020
 # Jarda Tesar <intossh@gmail.com>, 2021
+# Pavel Paseka, 2022
 # 
 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: 2020-08-31 19:11+0000\n"
-"Last-Translator: Jarda Tesar <intossh@gmail.com>, 2021\n"
+"Last-Translator: Pavel Paseka, 2022\n"
 "Language-Team: Czech (https://www.transifex.com/grocy/teams/93189/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -68,7 +69,7 @@ msgstr "Korejština"
 
 # Dutch
 msgid "nl"
-msgstr "Nizozemština"
+msgstr "Holandština"
 
 # Norwegian
 msgid "no"
@@ -94,6 +95,10 @@ msgstr "Ruština"
 msgid "sk_SK"
 msgstr "Slovenština"
 
+# Slovenian
+msgid "sl"
+msgstr "Slovinština"
+
 # Swedish
 msgid "sv_SE"
 msgstr "Švédština"
@@ -104,11 +109,11 @@ msgstr "Turečtina"
 
 # Chinese (Taiwan)
 msgid "zh_TW"
-msgstr "Čínština (Tradiční)"
+msgstr "Čínština (Taiwan)"
 
 # Chinese (China)
 msgid "zh_CN"
-msgstr "Čínština (Zjednodušená)"
+msgstr "Čínština (Čína)"
 
 # Hebrew (Israel)
 msgid "he_IL"
@@ -121,3 +126,15 @@ msgstr "Tamilština"
 # Finnish
 msgid "fi"
 msgstr "Finština"
+
+# Catalan
+msgid "ca"
+msgstr "Katalánština"
+
+# Lithuanian
+msgid "lt"
+msgstr "Litevština"
+
+# Ukrainian
+msgid "uk"
+msgstr "Ukrajinština"

localization/cs/permissions.po

@@ -1,7 +1,6 @@
 # 
 # Translators:
-# Radim Kabeláč <radim.ekk@gmail.com>, 2020
-# Jarda Tesar <intossh@gmail.com>, 2021
+# Pavel Paseka, 2022
 # 
 msgid ""
 msgstr ""
@@ -9,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2020-08-29 16:33+0000\n"
-"Last-Translator: Jarda Tesar <intossh@gmail.com>, 2021\n"
+"Last-Translator: Pavel Paseka, 2022\n"
 "Language-Team: Czech (https://www.transifex.com/grocy/teams/93189/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,120 +19,120 @@ msgstr ""
 
 # All permissions
 msgid "ADMIN"
-msgstr "ADMINISTRATOR"
+msgstr "Administrátor"
 
 # Create users
 msgid "USERS_CREATE"
-msgstr "UZIVATELE_VYTVORIT"
+msgstr "Vytvořit uživatele"
 
 # Edit users (including passwords)
 msgid "USERS_EDIT"
-msgstr "UZIVATELE_EDITACE"
+msgstr "Upravovat uživatele"
 
 # Show users
 msgid "USERS_READ"
-msgstr "UZIVATEL_CTENI"
+msgstr "Zobrazení uživatelů"
 
 # Edit own user data / change own password
 msgid "USERS_EDIT_SELF"
-msgstr "UZIVATELE_EDITOVAT_SEBE"
+msgstr "Smí editovat sebe"
 
 # Undo charge cycle
 msgid "BATTERIES_UNDO_CHARGE_CYCLE"
-msgstr "BATERIE_VRACENI_NABIJECI_CYKLUS"
+msgstr "Odznačit provedení nabíjení/výměny baterií"
 
 # Track charge cycle
 msgid "BATTERIES_TRACK_CHARGE_CYCLE"
-msgstr "BATERIE_SLEDOVANI_NABIJECI_CYKLUS"
+msgstr "Označit provedení nabíjení/výměny baterií"
 
 # Track execution
 msgid "CHORE_TRACK_EXECUTION"
-msgstr "POVINNOST_SLEDOVANI_VYKONANI"
+msgstr "Označit povinnost jako splněnou"
 
 # Undo execution
 msgid "CHORE_UNDO_EXECUTION"
-msgstr "POVINNOST_VYKONANI_VRACENI"
+msgstr "Odznačit povinnost jako splněnou"
 
 # Edit master data
 msgid "MASTER_DATA_EDIT"
-msgstr "ZAKLADNI_DATA_EDIT"
+msgstr "Upravovat Základní data"
 
 # Undo execution
 msgid "TASKS_UNDO_EXECUTION"
-msgstr "UKOL_VYKONANI_VRACENI"
+msgstr "Odznačit úkol jako splněný"
 
 # Mark completed
 msgid "TASKS_MARK_COMPLETED"
-msgstr "UKOLY_OZNACIT_HOTOVO"
+msgstr "Označit úkol jako splněný"
 
 # Edit stock entries
 msgid "STOCK_EDIT"
-msgstr "ZASOBY_EDITACE"
+msgstr "Upravovat stav zásob"
 
 # Transfer
 msgid "STOCK_TRANSFER"
-msgstr "PREVOD_ZASOB"
+msgstr "Převádět zásoby"
 
 # Inventory
 msgid "STOCK_INVENTORY"
-msgstr "ZASOBA_INVENTAR"
+msgstr "Provádět Inventuru zásob"
 
 # Consume
 msgid "STOCK_CONSUME"
-msgstr "ZASOBY_SPOTREBOVAT"
+msgstr "Spotřebovávat zásoby"
 
 # Open products
 msgid "STOCK_OPEN"
-msgstr "ZASOBY_OTEVRIT"
+msgstr "Otevřít balení"
 
 # Purchase
 msgid "STOCK_PURCHASE"
-msgstr "ZASOBA_NAKUP"
+msgstr "Zaznamenat nákup"
 
 # Add items
 msgid "SHOPPINGLIST_ITEMS_ADD"
-msgstr "NAKUPNISEZNAM_POLOZKA_PRIDANO"
+msgstr "Přidat položku nákupního seznamu"
 
 # Remove items
 msgid "SHOPPINGLIST_ITEMS_DELETE"
-msgstr "NAKUPNISEZNAM_POLOZKA_SMAZANO"
+msgstr "Smazat položku nákupního seznamu"
 
 # User management
 msgid "USERS"
-msgstr "UZIVATEL"
+msgstr "Uživatel"
 
 # Stock
 msgid "STOCK"
-msgstr "ZASOBA"
+msgstr "Zásoby"
 
 # Shopping list
 msgid "SHOPPINGLIST"
-msgstr "NAKUPNISEZNAM"
+msgstr "Nákupní seznam"
 
 # Chores
 msgid "CHORES"
-msgstr "POVINOSTI"
+msgstr "Povinnosti"
 
 # Batteries
 msgid "BATTERIES"
-msgstr "BATERIE"
+msgstr "Baterie"
 
 # Tasks
 msgid "TASKS"
-msgstr "UKOL"
+msgstr "Úkoly"
 
 # Recipes
 msgid "RECIPES"
-msgstr "RECEPTY"
+msgstr "Recepty"
 
 # Equipment
 msgid "EQUIPMENT"
-msgstr "VYBAVENI"
+msgstr "Vybavení"
 
 # Calendar
 msgid "CALENDAR"
-msgstr "KALENDAR"
+msgstr "Přístup ke kalendáři"
 
 # Meal plan
 msgid "RECIPES_MEALPLAN"
-msgstr "RECEPTY_STRAVOVACIPLANY"
+msgstr "Jídelníček"

localization/cs/stock_transaction_types.po

@@ -1,9 +1,6 @@
 # 
 # Translators:
-# Tomas Reznicek <tomas.reznicek@gmail.com>, 2019
-# Michal Franc, 2020
-# Ondřej Suk <ondra.suk.55@gmail.com>, 2020
-# Radim Kabeláč <radim.ekk@gmail.com>, 2020
+# Pavel Paseka, 2022
 # 
 msgid ""
 msgstr ""
@@ -11,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: Radim Kabeláč <radim.ekk@gmail.com>, 2020\n"
+"Last-Translator: Pavel Paseka, 2022\n"
 "Language-Team: Czech (https://www.transifex.com/grocy/teams/93189/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,28 +18,28 @@ msgstr ""
 "X-Domain: grocy/stock_transaction_types\n"
 
 msgid "purchase"
-msgstr "Nákup"
+msgstr "nákup"
 
 msgid "transfer_from"
-msgstr "Převod z"
+msgstr "převod z"
 
 msgid "transfer_to"
-msgstr "Převod do"
+msgstr "převod do"
 
 msgid "consume"
-msgstr "Spotřeba"
+msgstr "spotřeba"
 
 msgid "inventory-correction"
-msgstr "Úprava zásoby"
+msgstr "změna zásob"
 
 msgid "product-opened"
-msgstr "Otevření balení"
+msgstr "otevření balení"
 
 msgid "stock-edit-old"
-msgstr "zasoba-editace-stary"
+msgstr "změna zásob – stará"
 
 msgid "stock-edit-new"
-msgstr "zasoba-editace-novy"
+msgstr "změna zásob – nová"
 
 msgid "self-production"
-msgstr "vlastni-produkce"
+msgstr "vlastní výroba"

localization/cs/userfield_types.po

@@ -2,7 +2,7 @@
 # Translators:
 # Tomas Reznicek <tomas.reznicek@gmail.com>, 2019
 # Michal Franc, 2020
-# Radim Kabeláč <radim.ekk@gmail.com>, 2020
+# Pavel Paseka, 2022
 # 
 msgid ""
 msgstr ""
@@ -10,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: Radim Kabeláč <radim.ekk@gmail.com>, 2020\n"
+"Last-Translator: Pavel Paseka, 2022\n"
 "Language-Team: Czech (https://www.transifex.com/grocy/teams/93189/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,7 +33,7 @@ msgstr "Celé číslo"
 
 # Number (decimal)
 msgid "number-decimal"
-msgstr "Číslo s desetinami"
+msgstr "Desetinné číslo"
 
 # Date (without time)
 msgid "date"
@@ -61,12 +61,12 @@ msgstr "Odkaz"
 
 # Link (with title)
 msgid "link-with-title"
-msgstr ""
+msgstr "Odkaz s nadpisem"
 
 # File
 msgid "file"
-msgstr "soubor"
+msgstr "Soubor"
 
 # Image
 msgid "image"
-msgstr "obrazek"
+msgstr "Obrázek"

localization/da/chore_period_types.po

@@ -2,7 +2,7 @@
 # Translators:
 # Troels Siggaard <troels@siggaard.com>, 2019
 # Rasmus Bojsen <rasmus@bojsen.cn>, 2019
-# Brian Moos Lindberg <brian@blueeel.dk>, 2019
+# Brian Moos Lindberg <brian@blueeel.dk>, 2022
 # 
 msgid ""
 msgstr ""
@@ -10,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: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
+"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2022\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"
@@ -22,9 +22,6 @@ msgstr ""
 msgid "manually"
 msgstr "manuelt"
 
-msgid "dynamic-regular"
-msgstr "dynamisk-regelmæssig"
-
 msgid "daily"
 msgstr "daglig"
 
@@ -36,3 +33,9 @@ msgstr "månedlig"
 
 msgid "yearly"
 msgstr "årlig"
+
+msgid "hourly"
+msgstr "timevis"
+
+msgid "adaptive"
+msgstr "adaptiv"

localization/da/component_translations.po

@@ -17,12 +17,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Domain: grocy/component_translations\n"
 
-msgid "timeago_locale"
-msgstr "da"
-
-msgid "timeago_nan"
-msgstr "for NaN år"
-
 msgid "moment_locale"
 msgstr "da"
 

localization/da/demo_data.po

@@ -3,9 +3,10 @@
 # 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
 # Mihai Marinescu <mihai@marinescu.dk>, 2020
 # klavslund <klavslund@gmail.com>, 2021
+# Jesper Donnis, 2021
+# Brian Moos Lindberg <brian@blueeel.dk>, 2022
 # 
 msgid ""
 msgstr ""
@@ -13,7 +14,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: klavslund <klavslund@gmail.com>, 2021\n"
+"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2022\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"
@@ -109,11 +110,11 @@ msgstr "Radisse"
 msgid "Tomato"
 msgstr "Tomat"
 
-msgid "Changed towels in the bathroom"
-msgstr "Skiftede håndklæder i badeværelset"
+msgid "Change towels in the bathroom"
+msgstr "Udskift håndklæder på badeværelset"
 
-msgid "Cleaned the kitchen floor"
-msgstr "Gjorde køkkengulvet rent"
+msgid "Mop the kitchen floor"
+msgstr "Vask køkkengulvet"
 
 msgid "Warranty ends"
 msgstr "Reklamationsret udløber"
@@ -127,8 +128,8 @@ msgstr "Væggeur"
 msgid "Heat remote control"
 msgstr "Fjernbetjening til varme"
 
-msgid "Lawn mowed in the garden"
-msgstr "Græsset blev slået i haven"
+msgid "Take out the trash"
+msgstr "Gå ud med skraldet"
 
 msgid "Some good snacks"
 msgstr "Nogle gode snacks"
@@ -186,24 +187,6 @@ msgstr "Pandekager"
 msgid "Sugar"
 msgstr "Sukker"
 
-msgid "Home"
-msgstr "Hjem"
-
-msgid "Life"
-msgstr "Livet"
-
-msgid "Projects"
-msgstr "Projekter"
-
-msgid "Repair the garage door"
-msgstr "Reparer garagedøren"
-
-msgid "Fork and improve grocy"
-msgstr "Fork og forbedre grocy"
-
-msgid "Find a solution for what to do when I forget the door keys"
-msgstr "Find en løsning på hvad jeg gør, når jeg glemmer nøglen til huset"
-
 msgid "Sweets"
 msgstr "Slik"
 
@@ -270,14 +253,14 @@ msgstr "Spansk"
 msgid "Russian"
 msgstr "Russisk"
 
-msgid "The thing which happens on the 5th of every month"
-msgstr "Det der sker hver den 5. i måneden"
+msgid "Vacuum the living room floor"
+msgstr "Støvsug stuegulvet"
 
-msgid "The thing which happens daily"
-msgstr "Det der sker dagligt"
+msgid "Clean the litter box"
+msgstr "Rengør kattebakken"
 
-msgid "The thing which happens on Mondays and Wednesdays"
-msgstr "Det der sker på mandage og onsdage"
+msgid "Change the bed sheets"
+msgstr "Skift sengetøj"
 
 msgid "Swedish"
 msgstr "Svensk"
@@ -389,10 +372,22 @@ msgid "Finnish"
 msgstr "Finsk"
 
 msgid "Breakfast"
-msgstr ""
+msgstr "Morgenmad"
 
 msgid "Lunch"
-msgstr ""
+msgstr "Frokost"
 
 msgid "Dinner"
+msgstr "Aftensmad"
+
+msgid "Catalan"
+msgstr ""
+
+msgid "Slovenian"
+msgstr "Slovensk"
+
+msgid "Lithuanian"
+msgstr "Litauisk"
+
+msgid "Ukrainian"
 msgstr ""

localization/da/locales.po

@@ -1,6 +1,7 @@
 # 
 # Translators:
 # klavslund <klavslund@gmail.com>, 2021
+# Brian Moos Lindberg <brian@blueeel.dk>, 2022
 # 
 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: 2020-08-31 19:11+0000\n"
-"Last-Translator: klavslund <klavslund@gmail.com>, 2021\n"
+"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2022\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"
@@ -93,6 +94,10 @@ msgstr "ru"
 msgid "sk_SK"
 msgstr "sk_SK"
 
+# Slovenian
+msgid "sl"
+msgstr "sl"
+
 # Swedish
 msgid "sv_SE"
 msgstr "sv_SE"
@@ -120,3 +125,15 @@ msgstr "ta"
 # Finnish
 msgid "fi"
 msgstr "fi"
+
+# Catalan
+msgid "ca"
+msgstr ""
+
+# Lithuanian
+msgid "lt"
+msgstr "lt"
+
+# Ukrainian
+msgid "uk"
+msgstr ""

localization/da/strings.po

@@ -1,13 +1,14 @@
 # 
 # Translators:
-# dark159123 <r.j.hansen@protonmail.com>, 2019
 # Bernd Bestel <bernd@berrnd.de>, 2019
 # Troels Siggaard <troels@siggaard.com>, 2019
-# Brian Moos Lindberg <brian@blueeel.dk>, 2019
 # Mihai Marinescu <mihai@marinescu.dk>, 2020
 # Kim Bardrum <kim.bardrum@gmail.com>, 2021
 # Michael Winkel <mbw@mbw.dk>, 2021
 # klavslund <klavslund@gmail.com>, 2021
+# dark159123 <r.j.hansen@protonmail.com>, 2021
+# Jesper Donnis, 2021
+# Brian Moos Lindberg <brian@blueeel.dk>, 2022
 # 
 msgid ""
 msgstr ""
@@ -15,7 +16,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: klavslund <klavslund@gmail.com>, 2021\n"
+"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2022\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"
@@ -262,9 +263,6 @@ msgstr "Rediger placering"
 msgid "Edit store"
 msgstr "Rediger butik"
 
-msgid "Record data"
-msgstr "Optag data"
-
 msgid "Manage master data"
 msgstr "Administrer stamdata"
 
@@ -293,7 +291,7 @@ msgid "Invalid credentials, please try again"
 msgstr "Ugyldig brugernavn og/eller adgangskode, prøv igen"
 
 msgid "Are you sure to delete battery \"%s\"?"
-msgstr "Er du sikker på du vil slette batteriet \"%s\"?"
+msgstr "Er du sikker på du vil slette batteri \"%s\"?"
 
 msgid "Yes"
 msgstr "Ja"
@@ -338,7 +336,7 @@ msgid "Manage API keys"
 msgstr "Administrer API nøgler"
 
 msgid "REST API browser"
-msgstr ""
+msgstr "REST API browser"
 
 msgid "API keys"
 msgstr "API nøgler"
@@ -364,13 +362,6 @@ msgstr "Dette betyder %s bliver tilføjet til beholdningen"
 msgid "This means %s will be removed from stock"
 msgstr "Dette betyder at %s bliver fjernet fra beholdningen"
 
-msgid ""
-"This means the next execution of this chore is scheduled %s days after the "
-"last execution"
-msgstr ""
-"Det betyder at næste udførelse af dette gøremål er planlagt %sdage efter "
-"sidste udførelse."
-
 msgid "Removed %1$s of %2$s from stock"
 msgstr "Fjerede %1$s af %2$s fra beholdningen"
 
@@ -543,7 +534,7 @@ msgid "Last name"
 msgstr "Efternavn"
 
 msgid "A username is required"
-msgstr "Brugernavnet er påkrævet"
+msgstr "Et brugernavn er påkrævet"
 
 msgid "Confirm password"
 msgstr "Gentag adgangskoden"
@@ -729,12 +720,6 @@ msgstr "Status"
 msgid "Below min. stock amount"
 msgstr "Under min. beholdningsantal"
 
-msgid "Expiring soon"
-msgstr "Udløber snart"
-
-msgid "Already expired"
-msgstr "Allerede udløbet"
-
 msgid "Due soon"
 msgstr "Forfalder snart"
 
@@ -747,9 +732,6 @@ msgstr "Vis indstillinger"
 msgid "Auto reload on external changes"
 msgstr "Auto genindlæs ved eksterne ændringer"
 
-msgid "Enable night mode"
-msgstr "Aktiver nat-tilstand"
-
 msgid "Auto enable in time range"
 msgstr "Auto aktivering i tidsintervallet"
 
@@ -874,11 +856,9 @@ msgid "Use a specific stock item"
 msgstr "Brug en bestemt lagervare"
 
 msgid ""
-"The first item in this list would be picked by the default rule which is "
-"\"Opened first, then first due first, then first in first out\""
+"The first item in this list would be picked by the default rule consume rule"
+" (Opened first, then first due first, then first in first out)"
 msgstr ""
-"Beholdninger nedskrives efter reglen: 1. Allerede åbnet, 2. Bedst før dato, "
-"3. Først indkøbt"
 
 msgid "Mark %1$s of %2$s as open"
 msgstr "Marker %1$s %2$s som åben"
@@ -928,9 +908,6 @@ msgstr "Portioner"
 msgid "Costs"
 msgstr "Omkostninger"
 
-msgid "Based on the prices of the last purchase per product"
-msgstr "Baseret på prisen af sidste køb per vare"
-
 msgid "The ingredients listed here result in this amount of servings"
 msgstr "Ingredienslisten vist her resulterer i følgende antal portioner"
 
@@ -974,9 +951,6 @@ msgstr ""
 "Brug følgende (offentlige) URL til at dele eller integrere kalenderen i "
 "iCal-format"
 
-msgid "Allow partial units in stock"
-msgstr "Tillad kun delvise enheder i beholdningen"
-
 msgid "Enable tare weight handling"
 msgstr "Aktiver emballagevægthåndtering"
 
@@ -1174,9 +1148,6 @@ msgstr "Ikke nok på lager, men allerede på indkøbslisten"
 msgid "Not enough in stock"
 msgstr "Ikke nok på lager"
 
-msgid "Expiring soon days"
-msgstr "Udløber snart - antal dage"
-
 msgid "Default location"
 msgstr "Standardplacering"
 
@@ -1210,9 +1181,6 @@ msgstr "Forbrug %1$s af %2$s"
 msgid "Meal plan"
 msgstr "Madplan"
 
-msgid "Add recipe on %s"
-msgstr "Tilføj opskrift på %s"
-
 msgid "%s serving"
 msgid_plural "%s servings"
 msgstr[0] "%s portion"
@@ -1245,9 +1213,6 @@ msgstr "Aldrig"
 msgid "Today"
 msgstr "Idag"
 
-msgid "Consume %1$s of %2$s as spoiled"
-msgstr "Forbrug %1$s af %2$s som har overskredet holdbarhedsdatoen"
-
 msgid "Not all ingredients of recipe \"%s\" are in stock, nothing removed"
 msgstr ""
 "Ikke alle ingredienser til opskrift \"%s\" er i beholdningen, intet fjernet"
@@ -1352,29 +1317,44 @@ msgid "Assignment type"
 msgstr "Opgavetype"
 
 msgid ""
-"This means the next execution of this chore is scheduled 1 day after the "
-"last execution"
-msgstr ""
-"Det betyder at den næste udførelse af dette gøremål er planlagt 1 dag efter "
-"sidste udførelse"
+"This means the next execution of this chore is scheduled at the same time "
+"(based on the start date) every day"
+msgid_plural ""
+"This means the next execution of this chore is scheduled at the same time "
+"(based on the start date) every %s days"
+msgstr[0] ""
+msgstr[1] ""
 
 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 ""
-"Det betyder at den næste udførelse af dette gøremål er planlagt 1 dag efter "
-"sidste udførelse, men kun på de dage der er valgt herunder"
+"This means the next execution of this chore is scheduled %s hour after the "
+"last execution"
+msgid_plural ""
+"This means the next execution of this chore is scheduled %s hours after the "
+"last execution"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"This means the next execution of this chore is scheduled every week on the "
+"selected weekdays"
+msgid_plural ""
+"This means the next execution of this chore is scheduled every %s weeks on "
+"the selected weekdays"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"This means the next execution of this chore is scheduled on the selected day"
+" every month"
+msgid_plural ""
+"This means the next execution of this chore is scheduled on the selected day"
+" every %s months"
+msgstr[0] ""
+msgstr[1] ""
 
 msgid "This means the next execution of this chore is not scheduled"
 msgstr "Det betyder at næste udførelse af dette gøremål ikke er planlagt"
 
-msgid ""
-"This means the next execution of this chore is scheduled on the below "
-"selected day of each month"
-msgstr ""
-"Det betyder at næste udførelse af dette gøremål er planlagt på den nedenfor "
-"valgte dag i hver måned"
-
 msgid ""
 "This means the next execution of this chore will not be assigned to anyone"
 msgstr ""
@@ -1528,12 +1508,8 @@ msgstr "Akkumuler underordnede varers minimumbeholdning"
 
 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"
+"this product, means the sub product will never be missing, only this product"
 msgstr ""
-"Hvis aktiveret bliver minimumsbeholdning for underordnede varer akkumuleret "
-"ind i denne vare så det kun er denne vare der \"mangler\" og ikke de "
-"underordnede"
 
 msgid "Are you sure to remove this conversion?"
 msgstr "Er du sikker på at du vil fjerne denne konvertering"
@@ -1560,38 +1536,13 @@ msgid "Period interval"
 msgstr "Periodeinterval"
 
 msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s days"
-msgstr ""
-"Det betyder at den næste udførelse af dette gøremål kun bør planlægges hver "
-"%s dage"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s weeks"
-msgstr ""
-"Det betyder at den næste udførelse af dette gøremål kun bør planlægges hver "
-"%s uger"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s months"
-msgstr ""
-"Det betyder at den næste udførsel af dette gøremål kun bør planlægges hver "
-"%s måneder"
-
-msgid ""
-"This means the next execution of this chore is scheduled 1 year after the "
-"last execution"
-msgstr ""
-"Det betyder at næste udførsel af dette gøremål er planlagt 1 år efter sidste"
-" udførsel"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s years"
-msgstr ""
-"Det betyder at næste udførsel af dette gøremål kun bør planlægges hver %s år"
+"This means the next execution of this chore is scheduled every year on the "
+"same day (based on the start date)"
+msgid_plural ""
+"This means the next execution of this chore is scheduled every %s years on "
+"the same day (based on the start date)"
+msgstr[0] ""
+msgstr[1] ""
 
 msgid "Transfer"
 msgstr "Skift placering"
@@ -1670,9 +1621,6 @@ msgstr "Er du sikker på at du vil slette API nøglen \"%s\"?"
 msgid "Add note"
 msgstr "Tilføj note"
 
-msgid "Add note on %s"
-msgstr "Tilføj note for %s"
-
 msgid "per day"
 msgstr "per dag"
 
@@ -1682,9 +1630,6 @@ msgstr "Fortryd kun varer"
 msgid "Add product"
 msgstr "Tilføj vare"
 
-msgid "Add product on %s"
-msgstr "Tilføj vare på %s"
-
 msgid "Consume all ingredients needed by this weeks recipes or products"
 msgstr "Nedskriv alle beholdninger med denne uges varer, eller opskrifter?"
 
@@ -1709,19 +1654,12 @@ msgstr "fra"
 msgid ""
 "Scan mode is on but not all required fields could be populated automatically"
 msgstr ""
-"Vare-skanning er slået til, men ikke allle felter kunne opdateres "
+"Vare-skanning er slået til, men alle krævede felter kunne ikke opdateres "
 "automatisk."
 
 msgid "Is freezer"
 msgstr "Er en 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 en vare flyttes fra/til fryseren justeres bedst før og udløbsdatoer i "
-"henhold til varens opsætning."
-
 msgid "This cannot be the same as the \"From\" location"
 msgstr "Kan ikke være det samme som “Fra” lokation"
 
@@ -1740,15 +1678,6 @@ msgstr "Indkøbsliste, opsætning"
 msgid "Show a month-view calendar"
 msgstr "Vis kalender, månedsoversigt"
 
-msgid "Edit note on %s"
-msgstr "Rediger note for %s"
-
-msgid "Edit product on %s"
-msgstr "Rediger vare for %1"
-
-msgid "Edit recipe on %s"
-msgstr "Rediger opskrift på %s"
-
 msgid "Desired servings"
 msgstr "Antal portioner"
 
@@ -1762,7 +1691,7 @@ msgid "Recipe card"
 msgstr "Opskrift"
 
 msgid "Group ingredients by their product group"
-msgstr "Grupper ingridienser efter varegruppe"
+msgstr "Grupper ingredienser efter varegruppe"
 
 msgid "Unknown store"
 msgstr "Ubekendt butik"
@@ -1786,10 +1715,10 @@ msgid "Mark this item as done"
 msgstr "Marker dette punkt som færdigt"
 
 msgid "Edit this item"
-msgstr "Rediger denne emne"
+msgstr "Rediger dette emne"
 
 msgid "Delete this item"
-msgstr "Slette dette punkt"
+msgstr "Slet dette punkt"
 
 msgid "Show an icon if the product is already on the shopping list"
 msgstr "Vis hvis denne vare allerede findes i indkøbslisten"
@@ -1800,9 +1729,6 @@ msgstr "Kalorier"
 msgid "means %1$s per %2$s"
 msgstr "betyder %1$ per %2$"
 
-msgid "Create inverse QU conversion"
-msgstr "Opret omvendt mængdeberegning"
-
 msgid "Create recipe"
 msgstr "Tilføj opskrift"
 
@@ -1839,26 +1765,11 @@ msgstr "Stregkode for vare"
 msgid "Edit Barcode"
 msgstr "Rediger stregkode"
 
-msgid "Not enough in stock (not included in costs), %s ingredient missing"
-msgstr ""
-"Ikke nok på lager, (ikke inkuderet i prisberegning). %s ingrediens mangler"
-
 msgid ""
-"Based on the prices of the default consume rule which is \"Opened first, "
-"then first due first, then first in first out\""
+"Based on the prices of the default consume rule (Opened first, then first "
+"due first, then first in first out) for in-stock ingredients and on the last"
+" price for missing ones"
 msgstr ""
-"Prisen nedskrives efter følgende regel: 1. Allerede åbnet, 2. Bedst før "
-"dato, 3. Først indkøbt "
-
-msgid ""
-"Not enough in stock (not included in costs), %1$s missing, %2$s already on "
-"shopping list"
-msgstr ""
-"Der er ikke nok på lager, (ikke inkluderet i priberegningen). %1$s mangler. "
-"%2$s er i indkøbslisten"
-
-msgid "Quantity unit stock cannot be changed after first purchase"
-msgstr "Lagerenhed kan ikke ændres efter første indkøb"
 
 msgid "Clear filter"
 msgstr "Ryd filter"
@@ -1912,7 +1823,7 @@ msgid "Language"
 msgstr "Sprog"
 
 msgid "User settings"
-msgstr "Bruger indstillinger"
+msgstr "Brugerindstillinger"
 
 msgid "Default"
 msgstr "Standard"
@@ -1923,9 +1834,6 @@ msgstr "Lager historik oversigt"
 msgid "Journal summary"
 msgstr "Journal oversigt"
 
-msgid "Journal summary for this product"
-msgstr "Vare oversigt"
-
 msgid "Consume exact amount"
 msgstr "Nedskriv med nøjagtig mængde"
 
@@ -1948,12 +1856,6 @@ msgstr "Fælles"
 msgid "Decimal places allowed for amounts"
 msgstr "Antal decimaler for mængder"
 
-msgid "Decimal places allowed for prices"
-msgstr "Antal decimaler for priser"
-
-msgid "Stock entries for this product"
-msgstr "Lager beholdninger for denne vare"
-
 msgid "Edit shopping list"
 msgstr "Rediger indkøbsliste"
 
@@ -2015,7 +1917,7 @@ msgid "Consume this stock entry as spoiled"
 msgstr "Nedskriv denne vare som kasseret"
 
 msgid "Configure user permissions"
-msgstr "Tilpas bruger rettigheder"
+msgstr "Tilpas brugerrettigheder"
 
 msgid "Show a QR-Code for this API key"
 msgstr "Vis QR kode for API nøglen"
@@ -2121,7 +2023,7 @@ msgid "Default due days after thawing"
 msgstr "Bedst før dage efter optøning"
 
 msgid "Next due date"
-msgstr "Næste forfaldsdato"
+msgstr "Næste udløbsdato"
 
 msgid "%s product is due"
 msgid_plural "%s products are due"
@@ -2143,7 +2045,7 @@ msgid "Expired"
 msgstr "Udløbet"
 
 msgid "Due soon days"
-msgstr "Udløber snart, (dage)"
+msgstr "Forfalder snart, (dage)"
 
 msgid "Add overdue/expired products"
 msgstr "Tilføj varer der er udløbet, for gamle"
@@ -2214,7 +2116,7 @@ msgid "Use the products \"Quick consume amount\""
 msgstr "Brug varens værdi for ‘hurtig nedskrivning’"
 
 msgid "Disabled"
-msgstr "De-aktiveret"
+msgstr "Deaktiveret"
 
 msgid ""
 "This also removes any stock amount, the journal and all other references of "
@@ -2226,7 +2128,7 @@ msgstr ""
 "beholde historikken."
 
 msgid "Show disabled"
-msgstr "Vis de-aktiverede"
+msgstr "Vis deaktiverede"
 
 msgid "Never show on stock overview"
 msgstr "Vis aldrig på lageroversigten"
@@ -2286,18 +2188,16 @@ msgstr "Vare der beholdes"
 msgid "Product to remove"
 msgstr "Vare der slettes"
 
-msgid "Error while merging products"
-msgstr "Fejl under sammenlægning af varer"
+msgid "Error while merging"
+msgstr "Fejl i sammenlægning"
 
 msgid "After merging, this product will be kept"
 msgstr "Efter sammenlægning bibeholdes denne vare"
 
 msgid ""
-"After merging, all occurences of this product will be replaced by \"Product "
-"to keep\" (means this product will not exist anymore)"
+"After merging, all occurences of this product will be replaced by the kept "
+"product (means this product will not exist anymore)"
 msgstr ""
-"Efter sammenlægning vil alle instanser af denne vare blive erstattet med den"
-" nye vare. Den oprindelige vare vil ikke længere findes."
 
 msgid "Merge"
 msgstr "Sammenlæg"
@@ -2324,32 +2224,37 @@ msgid "A product or a note is required"
 msgstr "Der behøves en vare eller en note"
 
 msgid "grocycode"
-msgstr ""
+msgstr "grocycode"
 
 msgid "Download"
-msgstr ""
+msgstr "Download"
 
 # Example: Download *Product* grocycode
 msgid "Download %s grocycode"
-msgstr ""
+msgstr "Download %s grocycode"
 
 msgid ""
 "grocycode is a unique referer to this %s in your grocy instance - print it "
 "onto a label and scan it like any other barcode"
 msgstr ""
+"grocycode er en unik reference til %s i din grocy installation - print den "
+"på en label og skan den som enhver anden stregkode"
 
 # Abbreviation for "due date"
 msgid "DD"
 msgstr ""
 
 msgid "Print on label printer"
+msgstr "Print på labelprinter"
+
+msgid "Default stock entry label"
 msgstr ""
 
 msgid "Stock entry label"
 msgstr ""
 
 msgid "No label"
-msgstr ""
+msgstr "Ingen label"
 
 msgid "Single label"
 msgstr ""
@@ -2357,20 +2262,12 @@ msgstr ""
 msgid "Label per unit"
 msgstr ""
 
-msgid "Allow label printing per unit"
-msgstr ""
-
-msgid ""
-"Allow printing of one label per unit on purchase (after conversion) - e.g. 1"
-" purchased pack adding 10 pieces of stock would print 10 labels"
-msgstr ""
-
 msgid "Error while executing WebHook"
 msgstr ""
 
 # Example: Print *Product* grocycode on label printer
 msgid "Print %s grocycode on label printer"
-msgstr ""
+msgstr "Print %s grocycode på labelprinter"
 
 msgid "Open stock entry label in new window"
 msgstr ""
@@ -2379,92 +2276,95 @@ msgid "Thermal printer"
 msgstr ""
 
 msgid "Printing"
-msgstr ""
+msgstr "Printer"
 
 msgid "Connecting to printer..."
-msgstr ""
+msgstr "Forbinder til printer..."
 
 msgid "Unable to print"
-msgstr ""
+msgstr "Kan ikke printe"
 
 msgid "Only done items"
-msgstr ""
+msgstr "Kun færdige punkter"
 
 msgid "Show only in-stock products"
-msgstr ""
+msgstr "Vis kun varer på lager"
 
 msgid "Product description"
-msgstr ""
+msgstr "Produktbeskrivelse"
 
 # Example: *3.21 USD* per *Pack*
 msgid "%1$s per %2$s"
 msgstr ""
 
 msgid "Mark this item as undone"
-msgstr ""
+msgstr "Marker dette punkt som ufærdigt"
 
 msgid "Mandatory"
-msgstr ""
+msgstr "Obligatorisk"
 
 msgid "Mandatory Userfield"
-msgstr ""
+msgstr "Obligatorisk brugerfelt"
 
 msgid "When enabled, then this field must be filled on the destination form"
 msgstr ""
+"Når dette felt er aktiveret, skal dette felt udfyldes i destinationsskemaet"
 
 msgid "In-stock products"
-msgstr ""
+msgstr "Varer på lager"
 
 msgid "Timestamp"
-msgstr ""
+msgstr "Tidsstempel"
 
 msgid "Should not be frozen"
-msgstr ""
+msgstr "Bør ikke fryses"
 
 msgid ""
 "When enabled, on moving this product to a freezer location (so when freezing"
 " it), a warning will be shown"
 msgstr ""
+"Når aktiveret vil der blive vist en advarsel når denne vare flyttes til en "
+"fryser (dvs fryses)."
 
 msgid "This product shouldn't be frozen"
-msgstr ""
+msgstr "Dette produkt bør ikke fryses"
 
 msgid "Copy all meal plan entries of %s"
 msgstr ""
 
 msgid "A date is required"
-msgstr ""
+msgstr "En dato er påkrævet"
 
 msgid "Day"
-msgstr ""
+msgstr "Dag"
 
 msgid "Add recipe"
-msgstr ""
+msgstr "Tilføj opskrift"
 
 msgid "Copy this day"
-msgstr ""
+msgstr "Kopier denne dag"
 
 msgid "Date range"
-msgstr ""
+msgstr "Datointerval"
 
 msgid "%s month"
 msgid_plural "%s months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s måned"
+msgstr[1] "%s måneder"
 
 msgid "%s year"
 msgid_plural "%s years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s år"
+msgstr[1] "%s år"
 
 msgid "Display product"
-msgstr ""
+msgstr "Vis vare"
 
 msgid "Copy recipe"
-msgstr ""
+msgstr "Kopier opskrift"
 
 msgid "Copy of %s"
-msgstr ""
+msgstr "Kopi af %s"
 
 msgid "Add decimal separator automatically for price inputs"
 msgstr ""
@@ -2474,27 +2374,218 @@ msgid ""
 "the decimal separator will be automatically added based on the amount of "
 "allowed decimal places"
 msgstr ""
+"Når aktiveret, skal du altid angive værdien med decimaler, "
+"decimalseparatoren sættes automatisk ud fra det tilladte antal decimaler"
 
 msgid "Stock entry"
-msgstr ""
+msgstr "Lagerpostering"
 
 msgid "Configure sections"
-msgstr ""
+msgstr "Konfigurér sektioner"
 
 msgid "Meal plan sections"
-msgstr ""
+msgstr "Madplanssektioner"
 
 msgid "Create meal plan section"
-msgstr ""
+msgstr "Opret madplanssektion"
 
 msgid "Sections will be ordered by that number on the meal plan"
-msgstr ""
+msgstr "Sektioner bliver sorteret efter dette nummer i madplanen"
 
 msgid "Edit meal plan section"
-msgstr ""
+msgstr "Rediger madplanssektion"
 
 msgid "Are you sure to delete meal plan section \"%s\"?"
-msgstr ""
+msgstr "Er du sikker på at du vil slette madplanssektionen \"%s\"?"
 
 msgid "Section"
+msgstr "Sektion"
+
+msgid "Are you sure to empty the shopping list?"
+msgstr "Er du sikker på du vil tømme indkøbslisten?"
+
+msgid "This is the default which will be prefilled on purchase"
+msgstr ""
+
+msgid "Merge chores"
+msgstr "Sammenlæg gøremål"
+
+msgid "Chore to keep"
+msgstr "Gøremål der skal beholdes"
+
+msgid "After merging, this chore will be kept"
+msgstr ""
+
+msgid "Chore to remove"
+msgstr "Gøremål der skal fjernes"
+
+msgid ""
+"After merging, all occurences of this chore will be replaced by the kept "
+"chore (means this chore will not exist anymore)"
+msgstr ""
+
+msgid "Due today"
+msgstr "Forfalder i dag"
+
+msgid "%s task is due to be done today"
+msgid_plural "%s tasks are due to be done today"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "%s chore is due to be done today"
+msgid_plural "%s chores are due to be done today"
+msgstr[0] "%s gøremål forfalder i dag"
+msgstr[1] "%s gøremål forfalder i dag"
+
+msgid "%s battery is due to be charged today"
+msgid_plural "%s batteries are due to be charged today"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Set to 0 to hide due soon filters/highlighting"
+msgstr "Sæt til 0 for at skjule filtre/fremhævninger for snarlig forfald"
+
+msgid "Save & close"
+msgstr "Gem & luk"
+
+msgid "Save & add another task"
+msgstr ""
+
+msgid "Treat opened as out of stock"
+msgstr ""
+
+msgid ""
+"When enabled, opened items will be counted as missing for calculating if "
+"this product is below its minimum stock amount"
+msgstr ""
+
+msgid "Skipped"
+msgstr ""
+
+msgid "Skip next chore schedule"
+msgstr ""
+
+msgid "Time"
+msgstr "Tid"
+
+msgid "A start date is required"
+msgstr "En startdato er påkrævet"
+
+msgid "Start date"
+msgstr "Startdato"
+
+msgid "The start date cannot be changed when the chore was once tracked"
+msgstr ""
+
+msgid "Show the recipe list and the recipe side by side"
+msgstr ""
+
+msgid ""
+"This means the next execution of this chore is scheduled dynamically based "
+"on the past average execution frequency"
+msgstr ""
+
+msgid "Average execution frequency"
+msgstr ""
+
+msgid "Reschedule next execution"
+msgstr ""
+
+msgid "This can only be in the future"
+msgstr ""
+
+msgid "Rescheduled"
+msgstr ""
+
+msgid "Due score"
+msgstr ""
+
+msgid ""
+"The higher this number is, the more ingredients currently in stock are due "
+"soon, overdue or already expired"
+msgstr ""
+
+msgid "Disable own stock"
+msgstr "Deaktiver egen lagerbeholdning"
+
+msgid ""
+"When enabled, this product can't have own stock, means it will not be "
+"selectable on purchase (useful for parent products which are just used as a "
+"summary/total view of the child products)"
+msgstr ""
+"Hvis aktiveret kan denne vare ikke have egen beholdning. Det betyder den "
+"ikke kan indvælges ved køb (anvendelig ved overordnet vare som blot benyttes"
+" til summering af underordnede varer)."
+
+msgid "Out of stock items will be shown at the products default location"
+msgstr ""
+
+msgid "Show a little checkbox next to each ingredient to mark it as done"
+msgstr ""
+"Vis en lille boks ved siden af hver ingrediens til at markere som færdigt"
+
+msgid ""
+"The ingredient is crossed out when clicked, the status is not saved, means "
+"reset when the page is reloaded"
+msgstr ""
+
+msgid ""
+"The parent product %1$s is currently not in stock, %2$s is the current next "
+"sub product based on the default consume rule (Opened first, then first due "
+"first, then first in first out)"
+msgstr ""
+
+msgid "Night mode"
+msgstr "Nattilstand"
+
+msgid "On"
+msgstr "Til"
+
+msgid "Use system setting"
+msgstr "Benyt systemindstilling"
+
+msgid "Off"
+msgstr "Fra"
+
+msgid ""
+"Automatically add products that are below their defined min. stock amount to"
+" the shopping list"
+msgstr ""
+
+msgid "Reassigned"
+msgstr ""
+
+msgid "Default value"
+msgstr "Standardværdi"
+
+msgid "Now / today"
+msgstr "Nu / i dag"
+
+msgid "Add meal plan entry"
+msgstr ""
+
+msgid "Edit meal plan entry"
+msgstr ""
+
+msgid "Default consume location"
+msgstr "Standard forbrugsplacering"
+
+msgid "Stock entries at this location will be consumed first"
+msgstr "Vareposteringer på denne placering vil bliver forbrugt først"
+
+msgid "Move on open"
+msgstr "Flyt ved åbning"
+
+msgid ""
+"When enabled, on marking this product as opened, the corresponding amount "
+"will be moved to the default consume location"
+msgstr ""
+
+msgid "Moved to %1$s"
+msgstr "Flyttet til %1$s"
+
+msgid "Decimal places allowed for prices (input)"
+msgstr ""
+
+msgid "Decimal places allowed for prices (display)"
 msgstr ""

localization/de/chore_period_types.po

@@ -1,6 +1,6 @@
 # 
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2021
+# Bernd Bestel <bernd@berrnd.de>, 2022
 # 
 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: Bernd Bestel <bernd@berrnd.de>, 2021\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2022\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"
@@ -20,9 +20,6 @@ msgstr ""
 msgid "manually"
 msgstr "Manuell"
 
-msgid "dynamic-regular"
-msgstr "Dynamisch regelmäßig"
-
 msgid "daily"
 msgstr "Täglich"
 
@@ -34,3 +31,9 @@ msgstr "Monatlich"
 
 msgid "yearly"
 msgstr "Jährlich"
+
+msgid "hourly"
+msgstr "Stündlich"
+
+msgid "adaptive"
+msgstr "Adaptiv"

localization/de/component_translations.po

@@ -17,12 +17,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Domain: grocy/component_translations\n"
 
-msgid "timeago_locale"
-msgstr "de"
-
-msgid "timeago_nan"
-msgstr "vor NaN Jahren"
-
 msgid "moment_locale"
 msgstr "de"
 

localization/de/demo_data.po

@@ -1,6 +1,6 @@
 # 
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2021
+# Bernd Bestel <bernd@berrnd.de>, 2022
 # 
 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: Bernd Bestel <bernd@berrnd.de>, 2021\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2022\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"
@@ -104,11 +104,11 @@ msgstr "Radieschen"
 msgid "Tomato"
 msgstr "Tomaten"
 
-msgid "Changed towels in the bathroom"
-msgstr "Handtücher im Bad gewechselt"
+msgid "Change towels in the bathroom"
+msgstr "Handtücher im Badezimmer wechseln"
 
-msgid "Cleaned the kitchen floor"
-msgstr "Küchenboden gewischt"
+msgid "Mop the kitchen floor"
+msgstr "Küchenboden wischen"
 
 msgid "Warranty ends"
 msgstr "Garantie endet"
@@ -122,8 +122,8 @@ msgstr "Wecker"
 msgid "Heat remote control"
 msgstr "Fernbedienung Heizung"
 
-msgid "Lawn mowed in the garden"
-msgstr "Rasen im Garten gemäht"
+msgid "Take out the trash"
+msgstr "Müll rausbringen"
 
 msgid "Some good snacks"
 msgstr "Paar gute Snacks"
@@ -181,29 +181,11 @@ msgstr "Pfannkuchen"
 msgid "Sugar"
 msgstr "Zucker"
 
-msgid "Home"
-msgstr "Zuhause"
-
-msgid "Life"
-msgstr "Leben"
-
-msgid "Projects"
-msgstr "Projekte"
-
-msgid "Repair the garage door"
-msgstr "Garagentor reparieren"
-
-msgid "Fork and improve grocy"
-msgstr "grocy forken und verbessern"
-
-msgid "Find a solution for what to do when I forget the door keys"
-msgstr "Eine Lösung für \"Haustürschlüssel vergessen\" finden"
-
 msgid "Sweets"
 msgstr "Süßigkeiten"
 
 msgid "Bakery products"
-msgstr "Bäckerei Produkte"
+msgstr "Bäckereiprodukte"
 
 msgid "Tinned food"
 msgstr "Konservern"
@@ -265,14 +247,14 @@ msgstr "Spanisch"
 msgid "Russian"
 msgstr "Russisch"
 
-msgid "The thing which happens on the 5th of every month"
-msgstr "Das, was am 5. jedes Monats zu tun ist"
+msgid "Vacuum the living room floor"
+msgstr "Boden im Wohnzimmer saugen"
 
-msgid "The thing which happens daily"
-msgstr "Das, was täglich zu tun ist"
+msgid "Clean the litter box"
+msgstr "Katzenklo sauber machen"
 
-msgid "The thing which happens on Mondays and Wednesdays"
-msgstr "Das, was Montags und Mittwochs zu tun ist"
+msgid "Change the bed sheets"
+msgstr "Bettwäsche wechseln"
 
 msgid "Swedish"
 msgstr "Schwedisch"
@@ -391,3 +373,15 @@ msgstr "Mittagessen"
 
 msgid "Dinner"
 msgstr "Abendessen"
+
+msgid "Catalan"
+msgstr "Katalanisch"
+
+msgid "Slovenian"
+msgstr "Slowenisch"
+
+msgid "Lithuanian"
+msgstr "Litauisch"
+
+msgid "Ukrainian"
+msgstr "Ukrainisch"

localization/de/locales.po

@@ -1,6 +1,6 @@
 # 
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2020
+# Bernd Bestel <bernd@berrnd.de>, 2022
 # 
 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: 2020-08-31 19:11+0000\n"
-"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2020\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2022\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"
@@ -93,6 +93,10 @@ msgstr "Russisch"
 msgid "sk_SK"
 msgstr "Slowakisch"
 
+# Slovenian
+msgid "sl"
+msgstr "Slowenisch"
+
 # Swedish
 msgid "sv_SE"
 msgstr "Schwedisch"
@@ -120,3 +124,15 @@ msgstr "Tamil"
 # Finnish
 msgid "fi"
 msgstr "Finnisch"
+
+# Catalan
+msgid "ca"
+msgstr "Katalanisch"
+
+# Lithuanian
+msgid "lt"
+msgstr "Litauisch"
+
+# Ukrainian
+msgid "uk"
+msgstr "Ukrainisch"

localization/demo_data.pot

@@ -99,10 +99,10 @@ msgstr ""
 msgid "Tomato"
 msgstr ""
 
-msgid "Changed towels in the bathroom"
+msgid "Change towels in the bathroom"
 msgstr ""
 
-msgid "Cleaned the kitchen floor"
+msgid "Mop the kitchen floor"
 msgstr ""
 
 msgid "Warranty ends"
@@ -117,7 +117,7 @@ msgstr ""
 msgid "Heat remote control"
 msgstr ""
 
-msgid "Lawn mowed in the garden"
+msgid "Take out the trash"
 msgstr ""
 
 msgid "Some good snacks"
@@ -176,24 +176,6 @@ msgstr ""
 msgid "Sugar"
 msgstr ""
 
-msgid "Home"
-msgstr ""
-
-msgid "Life"
-msgstr ""
-
-msgid "Projects"
-msgstr ""
-
-msgid "Repair the garage door"
-msgstr ""
-
-msgid "Fork and improve grocy"
-msgstr ""
-
-msgid "Find a solution for what to do when I forget the door keys"
-msgstr ""
-
 msgid "Sweets"
 msgstr ""
 
@@ -260,13 +242,13 @@ msgstr ""
 msgid "Russian"
 msgstr ""
 
-msgid "The thing which happens on the 5th of every month"
+msgid "Vacuum the living room floor"
 msgstr ""
 
-msgid "The thing which happens daily"
+msgid "Clean the litter box"
 msgstr ""
 
-msgid "The thing which happens on Mondays and Wednesdays"
+msgid "Change the bed sheets"
 msgstr ""
 
 msgid "Swedish"
@@ -386,3 +368,15 @@ msgstr ""
 
 msgid "Dinner"
 msgstr ""
+
+msgid "Catalan"
+msgstr ""
+
+msgid "Slovenian"
+msgstr ""
+
+msgid "Lithuanian"
+msgstr ""
+
+msgid "Ukrainian"
+msgstr ""

localization/el_GR/chore_period_types.po

@@ -1,6 +1,7 @@
 # 
 # Translators:
 # datablitz7 <plant7@gmail.com>, 2019
+# emmker kats, 2022
 # 
 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: datablitz7 <plant7@gmail.com>, 2019\n"
+"Last-Translator: emmker kats, 2022\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/grocy/teams/93189/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,9 +21,6 @@ msgstr ""
 msgid "manually"
 msgstr "χρειροκίνητα"
 
-msgid "dynamic-regular"
-msgstr "δυναμικό-κανονικό"
-
 msgid "daily"
 msgstr "ημερήσιο"
 
@@ -34,3 +32,9 @@ msgstr "μηνιαίο"
 
 msgid "yearly"
 msgstr "ετήσιο"
+
+msgid "hourly"
+msgstr "ωριαίο"
+
+msgid "adaptive"
+msgstr ""

localization/el_GR/component_translations.po

@@ -17,12 +17,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Domain: grocy/component_translations\n"
 
-msgid "timeago_locale"
-msgstr "el"
-
-msgid "timeago_nan"
-msgstr "πριν NaN χρόνια"
-
 msgid "moment_locale"
 msgstr "el"
 

localization/el_GR/demo_data.po

@@ -2,6 +2,7 @@
 # Translators:
 # datablitz7 <plant7@gmail.com>, 2019
 # ByteGet, 2020
+# Thodoris Kalatzis <teo.kal@hotmail.com>, 2021
 # 
 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: ByteGet, 2020\n"
+"Last-Translator: Thodoris Kalatzis <teo.kal@hotmail.com>, 2021\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/grocy/teams/93189/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -105,11 +106,11 @@ msgstr "Ραδίκι"
 msgid "Tomato"
 msgstr "Τομάτα"
 
-msgid "Changed towels in the bathroom"
-msgstr "Άλλαγμα πετσετών στο μπάνιο"
+msgid "Change towels in the bathroom"
+msgstr ""
 
-msgid "Cleaned the kitchen floor"
-msgstr "Καθάρισμα πατώματος κουζίνας"
+msgid "Mop the kitchen floor"
+msgstr ""
 
 msgid "Warranty ends"
 msgstr "Λήξη εγγύησης"
@@ -123,8 +124,8 @@ msgstr "Ξυπνητήρι"
 msgid "Heat remote control"
 msgstr "Τηλεκοντρόλ θέρμανσης"
 
-msgid "Lawn mowed in the garden"
-msgstr "Κούρεμα γρασιδιού στον κήπο"
+msgid "Take out the trash"
+msgstr ""
 
 msgid "Some good snacks"
 msgstr "Μερικά καλά σνακ"
@@ -182,25 +183,6 @@ msgstr "Τηγανήτες"
 msgid "Sugar"
 msgstr "Ζάχαρη"
 
-msgid "Home"
-msgstr "Σπίτι"
-
-msgid "Life"
-msgstr "Ζωή"
-
-msgid "Projects"
-msgstr "Σχέδιο"
-
-msgid "Repair the garage door"
-msgstr "Επισκευάστε την πόρτα του γκαράζ"
-
-msgid "Fork and improve grocy"
-msgstr "Fork και Βελτιώστε το grocy"
-
-msgid "Find a solution for what to do when I forget the door keys"
-msgstr ""
-"Βρείτε μια λύση για το τι πρέπει να κάνω όταν ξεχάσω τα κλειδιά της πόρτας"
-
 msgid "Sweets"
 msgstr "Γλυκά"
 
@@ -267,14 +249,14 @@ msgstr "Ισπανικά"
 msgid "Russian"
 msgstr "Ρώσικα"
 
-msgid "The thing which happens on the 5th of every month"
-msgstr "Το πράγμα που συμβαίνει στις 5 κάθε μήνα"
+msgid "Vacuum the living room floor"
+msgstr ""
 
-msgid "The thing which happens daily"
-msgstr "Το πράγμα που συμβαίνει καθημερινά"
+msgid "Clean the litter box"
+msgstr ""
 
-msgid "The thing which happens on Mondays and Wednesdays"
-msgstr "Αυτό που συμβαίνει Δευτέρα και Τετάρτη"
+msgid "Change the bed sheets"
+msgstr ""
 
 msgid "Swedish"
 msgstr "Σουηδικά"
@@ -374,22 +356,34 @@ msgid "Korean"
 msgstr "Κορεάτικα"
 
 msgid "Chinese (China)"
-msgstr ""
+msgstr "Κινεζικά (Κίνα)"
 
 msgid "Hebrew (Israel)"
-msgstr ""
+msgstr "Εβραϊκά (Ισραήλ)"
 
 msgid "Tamil"
-msgstr ""
+msgstr "Ταμίλ"
 
 msgid "Finnish"
-msgstr ""
+msgstr "Φινλανδικά"
 
 msgid "Breakfast"
-msgstr ""
+msgstr "Πρωϊνό"
 
 msgid "Lunch"
-msgstr ""
+msgstr "Γεύμα"
 
 msgid "Dinner"
+msgstr "Δείπνο"
+
+msgid "Catalan"
+msgstr ""
+
+msgid "Slovenian"
+msgstr ""
+
+msgid "Lithuanian"
+msgstr ""
+
+msgid "Ukrainian"
 msgstr ""

localization/el_GR/locales.po

@@ -1,6 +1,7 @@
 # 
 # Translators:
 # ByteGet, 2020
+# Thodoris Kalatzis <teo.kal@hotmail.com>, 2021
 # 
 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: 2020-08-31 19:11+0000\n"
-"Last-Translator: ByteGet, 2020\n"
+"Last-Translator: Thodoris Kalatzis <teo.kal@hotmail.com>, 2021\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/grocy/teams/93189/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,6 +94,10 @@ msgstr "ru"
 msgid "sk_SK"
 msgstr "sk_SK"
 
+# Slovenian
+msgid "sl"
+msgstr ""
+
 # Swedish
 msgid "sv_SE"
 msgstr "sv_SE"
@@ -107,16 +112,28 @@ msgstr "zh_TW"
 
 # Chinese (China)
 msgid "zh_CN"
-msgstr ""
+msgstr "zh_CN"
 
 # Hebrew (Israel)
 msgid "he_IL"
-msgstr ""
+msgstr "he_IL"
 
 # Tamil
 msgid "ta"
-msgstr ""
+msgstr "ta"
 
 # Finnish
 msgid "fi"
+msgstr "fi"
+
+# Catalan
+msgid "ca"
+msgstr ""
+
+# Lithuanian
+msgid "lt"
+msgstr ""
+
+# Ukrainian
+msgid "uk"
 msgstr ""

localization/el_GR/userfield_types.po

@@ -2,6 +2,7 @@
 # Translators:
 # Dionysios Gkotsis <bloodsak4@yahoo.gr>, 2020
 # ByteGet, 2020
+# Thodoris Kalatzis <teo.kal@hotmail.com>, 2021
 # 
 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:43+0000\n"
-"Last-Translator: ByteGet, 2020\n"
+"Last-Translator: Thodoris Kalatzis <teo.kal@hotmail.com>, 2021\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/grocy/teams/93189/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,12 +61,12 @@ msgstr "σύνδεσμος"
 
 # Link (with title)
 msgid "link-with-title"
-msgstr ""
+msgstr "σύνδεσμος με τίτλο"
 
 # File
 msgid "file"
-msgstr ""
+msgstr "αρχείο"
 
 # Image
 msgid "image"
-msgstr ""
+msgstr "εικόνα"

localization/en/chore_period_types.po

@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
@@ -16,9 +16,6 @@ msgstr ""
 msgid "manually"
 msgstr "Manually"
 
-msgid "dynamic-regular"
-msgstr "Dynamic regular"
-
 msgid "daily"
 msgstr "Daily"
 
@@ -30,3 +27,9 @@ msgstr "Monthly"
 
 msgid "yearly"
 msgstr "Yearly"
+
+msgid "hourly"
+msgstr "Hourly"
+
+msgid "adaptive"
+msgstr "Adaptive"

localization/en/locales.po

@@ -69,6 +69,9 @@ msgstr "Russian"
 msgid "sk_SK"
 msgstr "Slovak"
 
+msgid "sl"
+msgstr "Slovenian"
+
 msgid "sv_SE"
 msgstr "Swedish"
 
@@ -89,3 +92,6 @@ msgstr "Tamil"
 
 msgid "fi"
 msgstr "Finnish"
+
+msgid "ca"
+msgstr "Catalan"

localization/en_GB/chore_period_types.po

@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
@@ -16,9 +16,6 @@ msgstr ""
 msgid "manually"
 msgstr "Manually"
 
-msgid "dynamic-regular"
-msgstr "Dynamic regular"
-
 msgid "daily"
 msgstr "Daily"
 
@@ -30,3 +27,9 @@ msgstr "Monthly"
 
 msgid "yearly"
 msgstr "Yearly"
+
+msgid "hourly"
+msgstr "Hourly"
+
+msgid "adaptive"
+msgstr "Adaptive"

localization/en_GB/demo_data.po

@@ -4,6 +4,8 @@
 # duck. <me@duck.me.uk>, 2020
 # John Coles <john@johncoles.com>, 2020
 # Chris H <cjh861@outlook.com>, 2021
+# David Knapman <dai.knapz@gmail.com>, 2021
+# Johnnie Blows, 2022
 # 
 msgid ""
 msgstr ""
@@ -11,7 +13,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: Chris H <cjh861@outlook.com>, 2021\n"
+"Last-Translator: Johnnie Blows, 2022\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"
@@ -107,11 +109,11 @@ msgstr "Radish"
 msgid "Tomato"
 msgstr "Tomato"
 
-msgid "Changed towels in the bathroom"
-msgstr "Changed towels in the bathroom"
+msgid "Change towels in the bathroom"
+msgstr "Change towels in the bathroom"
 
-msgid "Cleaned the kitchen floor"
-msgstr "Cleaned the kitchen floor"
+msgid "Mop the kitchen floor"
+msgstr "Mop the kitchen floor"
 
 msgid "Warranty ends"
 msgstr "Warranty ends"
@@ -125,8 +127,8 @@ msgstr "Alarm clock"
 msgid "Heat remote control"
 msgstr "Heat remote control"
 
-msgid "Lawn mowed in the garden"
-msgstr "Lawn mowed in the garden"
+msgid "Take out the trash"
+msgstr "Take out the rubbish"
 
 msgid "Some good snacks"
 msgstr "Some good snacks"
@@ -184,24 +186,6 @@ msgstr "Pancakes"
 msgid "Sugar"
 msgstr "Sugar"
 
-msgid "Home"
-msgstr "Home"
-
-msgid "Life"
-msgstr "Life"
-
-msgid "Projects"
-msgstr "Projects"
-
-msgid "Repair the garage door"
-msgstr "Repair the garage door"
-
-msgid "Fork and improve grocy"
-msgstr "Fork and improve grocy"
-
-msgid "Find a solution for what to do when I forget the door keys"
-msgstr "Find a solution for what to do when I forget the door keys"
-
 msgid "Sweets"
 msgstr "Sweets"
 
@@ -268,14 +252,14 @@ msgstr "Spanish"
 msgid "Russian"
 msgstr "Russian"
 
-msgid "The thing which happens on the 5th of every month"
-msgstr "The thing which happens on the 5th of every month"
+msgid "Vacuum the living room floor"
+msgstr "Vacuum the living room floor"
 
-msgid "The thing which happens daily"
-msgstr "The thing which happens daily"
+msgid "Clean the litter box"
+msgstr "Clean the litter box"
 
-msgid "The thing which happens on Mondays and Wednesdays"
-msgstr "The thing which happens on Mondays and Wednesdays"
+msgid "Change the bed sheets"
+msgstr "Change the bed linen"
 
 msgid "Swedish"
 msgstr "Swedish"
@@ -387,10 +371,22 @@ msgid "Finnish"
 msgstr "Finnish"
 
 msgid "Breakfast"
-msgstr ""
+msgstr "Breakfast"
 
 msgid "Lunch"
-msgstr ""
+msgstr "Lunch"
 
 msgid "Dinner"
+msgstr "Dinner"
+
+msgid "Catalan"
+msgstr "Catalan"
+
+msgid "Slovenian"
+msgstr "Slovenian"
+
+msgid "Lithuanian"
+msgstr ""
+
+msgid "Ukrainian"
 msgstr ""

localization/en_GB/locales.po

@@ -69,6 +69,9 @@ msgstr "Russian"
 msgid "sk_SK"
 msgstr "Slovak"
 
+msgid "sl"
+msgstr "Slovenian"
+
 msgid "sv_SE"
 msgstr "Swedish"
 
@@ -89,3 +92,6 @@ msgstr "Tamil"
 
 msgid "fi"
 msgstr "Finnish"
+
+msgid "ca"
+msgstr "Catalan"

localization/es/chore_assignment_types.po

@@ -1,6 +1,7 @@
 # 
 # Translators:
 # Alberto Martin <ami232@gmail.com>, 2021
+# GRBaset, 2022
 # 
 msgid ""
 msgstr ""
@@ -8,20 +9,20 @@ 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: Alberto Martin <ami232@gmail.com>, 2021\n"
+"Last-Translator: GRBaset, 2022\n"
 "Language-Team: Spanish (https://www.transifex.com/grocy/teams/93189/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 "X-Domain: grocy/chore_assignment_types\n"
 
 msgid "no-assignment"
 msgstr "No asignar"
 
 msgid "who-least-did-first"
-msgstr "Quien menos, primero"
+msgstr "Quien hizo menos, primero"
 
 msgid "random"
 msgstr "Al azar"

localization/es/chore_period_types.po

@@ -1,6 +1,6 @@
 # 
 # Translators:
-# Alberto Martin <ami232@gmail.com>, 2021
+# GRBaset, 2022
 # 
 msgid ""
 msgstr ""
@@ -8,29 +8,32 @@ 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: Alberto Martin <ami232@gmail.com>, 2021\n"
+"Last-Translator: GRBaset, 2022\n"
 "Language-Team: Spanish (https://www.transifex.com/grocy/teams/93189/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 "X-Domain: grocy/chore_types\n"
 
 msgid "manually"
-msgstr "Manual"
-
-msgid "dynamic-regular"
-msgstr "Regular dinámico"
+msgstr "manualmente"
 
 msgid "daily"
-msgstr "Diaria"
+msgstr "diariamente"
 
 msgid "weekly"
-msgstr "Semanal"
+msgstr "semanalmente"
 
 msgid "monthly"
-msgstr "Mensual"
+msgstr "mensualmente"
 
 msgid "yearly"
-msgstr "Anual"
+msgstr "anualmente"
+
+msgid "hourly"
+msgstr "cada hora"
+
+msgid "adaptive"
+msgstr "adaptivo"

localization/es/component_translations.po

@@ -1,7 +1,7 @@
 # 
 # Translators:
 # Bernd Bestel <bernd@berrnd.de>, 2019
-# Jose Rugel <joserugel@gmail.com>, 2020
+# José Rugel <joserugel@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
@@ -9,21 +9,15 @@ 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: Jose Rugel <joserugel@gmail.com>, 2020\n"
+"Last-Translator: José Rugel <joserugel@gmail.com>, 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/grocy/teams/93189/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 "X-Domain: grocy/component_translations\n"
 
-msgid "timeago_locale"
-msgstr "es"
-
-msgid "timeago_nan"
-msgstr "Hace NaN años"
-
 msgid "moment_locale"
 msgstr "es"
 

localization/es/demo_data.po

@@ -3,9 +3,11 @@
 # Ankue <ankue.spam@gmail.com>, 2019
 # Fernando Sánchez <fernando.l.sanchez@gmail.com>, 2019
 # Igor Perez <igordiablo@hotmail.com>, 2020
-# Jose Rugel <joserugel@gmail.com>, 2020
+# José Rugel <joserugel@gmail.com>, 2020
 # Alan Pucheta <apucheta@protonmail.com>, 2020
 # Alberto Martin <ami232@gmail.com>, 2021
+# victormce <victormce@gmail.com>, 2021
+# GRBaset, 2022
 # 
 msgid ""
 msgstr ""
@@ -13,13 +15,13 @@ 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: Alberto Martin <ami232@gmail.com>, 2021\n"
+"Last-Translator: GRBaset, 2022\n"
 "Language-Team: Spanish (https://www.transifex.com/grocy/teams/93189/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 "X-Domain: grocy/demo_data\n"
 
 msgid "Cookies"
@@ -44,31 +46,37 @@ msgid "Piece"
 msgid_plural "Pieces"
 msgstr[0] "Pieza"
 msgstr[1] "Piezas"
+msgstr[2] "Piezas"
 
 msgid "Pack"
 msgid_plural "Packs"
 msgstr[0] "Paquetes"
 msgstr[1] "Paquetes"
+msgstr[2] "Paquetes"
 
 msgid "Glass"
 msgid_plural "Glasses"
 msgstr[0] "Vaso"
 msgstr[1] "Vasos"
+msgstr[2] "Vasos"
 
 msgid "Tin"
 msgid_plural "Tins"
 msgstr[0] "Envases"
 msgstr[1] "Latas"
+msgstr[2] "Latas"
 
 msgid "Can"
 msgid_plural "Cans"
 msgstr[0] "Lata"
 msgstr[1] "Envases"
+msgstr[2] "Envases"
 
 msgid "Bunch"
 msgid_plural "Bunches"
 msgstr[0] "Puñados"
 msgstr[1] "Puñados"
+msgstr[2] "Puñados"
 
 msgid "Gummy bears"
 msgstr "Ositos de goma"
@@ -109,11 +117,11 @@ msgstr "Rábano"
 msgid "Tomato"
 msgstr "Tomate"
 
-msgid "Changed towels in the bathroom"
-msgstr "Cambiar las toallas del baño"
+msgid "Change towels in the bathroom"
+msgstr ""
 
-msgid "Cleaned the kitchen floor"
-msgstr "Limpiar el suelo de la cocina"
+msgid "Mop the kitchen floor"
+msgstr ""
 
 msgid "Warranty ends"
 msgstr "Final de la garantía"
@@ -127,8 +135,8 @@ msgstr "Despertador"
 msgid "Heat remote control"
 msgstr "Mando a distancia de la calefacción"
 
-msgid "Lawn mowed in the garden"
-msgstr "Cortar el césped del jardín"
+msgid "Take out the trash"
+msgstr ""
 
 msgid "Some good snacks"
 msgstr "Cosas de picar"
@@ -176,6 +184,7 @@ msgid "Gram"
 msgid_plural "Grams"
 msgstr[0] "Gramo"
 msgstr[1] "Gramos"
+msgstr[2] "Gramos"
 
 msgid "Flour"
 msgstr "Harina"
@@ -186,24 +195,6 @@ msgstr "Panqueques"
 msgid "Sugar"
 msgstr "Azúcar"
 
-msgid "Home"
-msgstr "Inicio"
-
-msgid "Life"
-msgstr "Vida"
-
-msgid "Projects"
-msgstr "Proyectos"
-
-msgid "Repair the garage door"
-msgstr "Reparar la puerta del garaje"
-
-msgid "Fork and improve grocy"
-msgstr "Forkear y mejorar grocy"
-
-msgid "Find a solution for what to do when I forget the door keys"
-msgstr "Encontrar una solución a qué hacer cuando me olvido las llaves"
-
 msgid "Sweets"
 msgstr "Dulces"
 
@@ -270,14 +261,14 @@ msgstr "Español"
 msgid "Russian"
 msgstr "Ruso"
 
-msgid "The thing which happens on the 5th of every month"
-msgstr "Lo que ocurre el día 5 de cada mes"
+msgid "Vacuum the living room floor"
+msgstr ""
 
-msgid "The thing which happens daily"
-msgstr "Lo que ocurre diariamente"
+msgid "Clean the litter box"
+msgstr ""
 
-msgid "The thing which happens on Mondays and Wednesdays"
-msgstr "Lo que ocurre los lunes y los miércoles"
+msgid "Change the bed sheets"
+msgstr ""
 
 msgid "Swedish"
 msgstr "Sueco"
@@ -295,6 +286,7 @@ msgid "Slice"
 msgid_plural "Slices"
 msgstr[0] "Loncha"
 msgstr[1] "Lonchas"
+msgstr[2] "Lonchas"
 
 msgid "Example userentity"
 msgstr "Entidad personalizada de ejemplo"
@@ -389,10 +381,22 @@ msgid "Finnish"
 msgstr "Finés"
 
 msgid "Breakfast"
-msgstr ""
+msgstr "Desayuno"
 
 msgid "Lunch"
-msgstr ""
+msgstr "Almuerzo"
 
 msgid "Dinner"
+msgstr "Cena"
+
+msgid "Catalan"
+msgstr "Catalán"
+
+msgid "Slovenian"
+msgstr ""
+
+msgid "Lithuanian"
+msgstr ""
+
+msgid "Ukrainian"
 msgstr ""