Support camera barcode scanning in recipepicker (references #1562)

Optimized new chore start date handling (references #1612)
Change yearly chore schedule to be on the same day each year (closes #817)
Use the last price for out of stock ingredients (closes #779)
Make it optionally possible to show the recipes list full-width (closes #1772)

.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);
+}

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,5 +1,5 @@
 ---
-name: Bug report
+name: Bug Report
 about: If you've found something that does not work, please report it to help improve
   grocy
 title: 'Bug: '
@@ -8,6 +8,10 @@ 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).
+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).
+
+If your problem is not reproducible, it's most likely not a bug - please use the r/grocy subreddit (=> https://www.reddit.com/r/grocy) for general questions / help.
+-->

.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

@@ -1,11 +1,13 @@
 ---
-name: Feature request
+name: Feature Request
 about: Ideas for improvements or new things which you would find useful are always
   welcome
-title: 'Feature request: '
+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.

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/new/choose) 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)
@@ -47,6 +47,7 @@ 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
+
 - 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
@@ -55,6 +56,7 @@ See [grocy/grocy-docker](https://github.com/grocy/grocy-docker) or [linuxserver/
 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 on [Transifex](https://www.transifex.com/grocy/grocy/dashboard/) if your language is incomplete or not available yet.
@@ -67,12 +69,18 @@ Also any translation which once reached a completion level of 70 % ([`strings` r
 
 _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
@@ -80,6 +88,7 @@ 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
@@ -88,6 +97,8 @@ The following shorthands are available:
   - 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: `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
@@ -95,54 +106,69 @@ The following shorthands are available:
 - 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`).
 
 ### 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/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/__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

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,68 @@ 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, below here are the defaults
+// 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
+
+// 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', 2); // Default decimal places allowed for prices
+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
+
+// 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
+
+// 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

@@ -10,7 +10,7 @@ class BaseApiController extends BaseController
 
 	const PATTERN_OPERATOR = '!?(=|~|<|>|(>=)|(<=)|(§))';
 
-	const PATTERN_VALUE = '[A-Za-z\p{L}\p{M}*_0-9.$#^| -]+';
+	const PATTERN_VALUE = '[A-Za-z\p{L}\p{M}0-9*_.$#^| -\\\]+';
 
 	protected $OpenApiSpec = null;
 

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';

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,11 +18,15 @@ 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']))
+				if (!isset($event['start']) || empty($event['start']))
 				{
 					continue;
 				}
@@ -37,13 +42,17 @@ class CalendarApiController extends BaseApiController
 					// All-day event
 					$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();
@@ -52,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 (FindObjectInArrayByPropertyValue($chores, 'id', $currentChore->chore_id)->period_type !== \Grocy\Services\ChoresService::CHORE_PERIOD_TYPE_MANUALLY)
+			{
+				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/OpenApiController.php

@@ -41,6 +41,7 @@ class OpenApiController extends BaseApiController
 		{
 			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,7 @@ class OpenApiController extends BaseApiController
 				array_push($spec->components->schemas->ExposedEntity_IncludingUserEntities_NotIncludingNotEditable->enum, $value);
 			}
 		}
+		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 +71,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 +81,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

@@ -140,13 +140,14 @@ class StockApiController extends BaseApiController
 			{
 				$transactionType = $requestBody['transactiontype'];
 			}
-			$runPrinterWebhook = false;
-			if (array_key_exists('print_stock_label', $requestBody) && intval($requestBody['print_stock_label']))
+
+			$stockLabelType = 0;
+			if (array_key_exists('stock_label_type', $requestBody) && is_numeric($requestBody['stock_label_type']))
 			{
-				$runPrinterWebhook = intval($requestBody['print_stock_label']);
+				$stockLabelType = intval($requestBody['stock_label_type']);
 			}
 
-			$transactionId = $this->getStockService()->AddProduct($args['productId'], $requestBody['amount'], $bestBeforeDate, $transactionType, $purchasedDate, $price, $locationId, $shoppingLocationId, $unusedTransactionId, $runPrinterWebhook);
+			$transactionId = $this->getStockService()->AddProduct($args['productId'], $requestBody['amount'], $bestBeforeDate, $transactionType, $purchasedDate, $price, $locationId, $shoppingLocationId, $unusedTransactionId, $stockLabelType);
 
 			$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)
@@ -494,7 +500,13 @@ 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']);
+			}
+
+			$transactionId = $this->getStockService()->InventoryProduct($args['productId'], $requestBody['new_amount'], $bestBeforeDate, $locationId, $price, $shoppingLocationId, $purchasedDate, $stockLabelType);
 			$args['transactionId'] = $transactionId;
 			return $this->StockTransactions($request, $response, $args);
 		}

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,21 @@ 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 ($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,

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

@@ -391,8 +391,7 @@
 									"type": "object",
 									"properties": {
 										"created_object_id": {
-											"type": "number",
-											"format": "integer",
+											"type": "integer",
 											"description": "The id of the created object"
 										}
 									}
@@ -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,19 @@
 									},
 									"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"
 									}
 								},
 								"example": {
@@ -1999,13 +1990,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 +2003,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 +2071,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 +2144,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 +2153,20 @@
 										"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)"
 									}
 								}
 							}
@@ -2246,7 +2234,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 +2423,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 +2435,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 +2519,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 +2532,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 +2600,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 +2673,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 +2682,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 +2755,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": {
@@ -2955,10 +2934,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 +2981,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 +3050,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 +3311,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"
 									}
@@ -3488,8 +3475,7 @@
 									"type": "object",
 									"properties": {
 										"created_object_id": {
-											"type": "number",
-											"format": "integer",
+											"type": "integer",
 											"description": "The id of the created recipe"
 										}
 									}
@@ -3510,6 +3496,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 +3658,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 +3811,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 +4354,17 @@
 						"type": "integer"
 					},
 					"qu_factor_purchase_to_stock": {
-						"type": "number",
-						"format": "number"
+						"type": "number"
 					},
 					"tare_weight": {
-						"type": "number",
-						"format": "number"
+						"type": "number"
 					},
 					"barcode": {
 						"type": "string",
 						"description": "Can contain multiple barcodes separated by comma"
 					},
 					"min_stock_amount": {
-						"type": "integer",
+						"type": "number",
 						"minimum": 0,
 						"default": 0
 					},
@@ -4314,6 +4388,9 @@
 					"shopping_location_id": {
 						"type": "integer"
 					},
+					"treat_opened_as_out_of_stock": {
+						"type": "integer"
+					},
 					"userfields": {
 						"type": "object",
 						"description": "Key/value pairs of userfields"
@@ -4446,7 +4523,7 @@
 						"type": "integer"
 					},
 					"amount": {
-						"type": "integer"
+						"type": "number"
 					},
 					"location_id": {
 						"type": "integer"
@@ -4542,8 +4619,7 @@
 						"type": "integer"
 					},
 					"costs": {
-						"type": "number",
-						"format": "number"
+						"type": "number"
 					}
 				},
 				"example": {
@@ -4578,26 +4654,23 @@
 						"format": "date-time"
 					},
 					"stock_amount": {
-						"type": "integer"
+						"type": "number"
 					},
 					"stock_amount_opened": {
-						"type": "integer"
+						"type": "number"
 					},
 					"next_due_date": {
 						"type": "string",
 						"format": "date-time"
 					},
 					"last_price": {
-						"type": "number",
-						"format": "number"
+						"type": "number"
 					},
 					"avg_price": {
-						"type": "number",
-						"format": "number"
+						"type": "number"
 					},
 					"oldest_price": {
-						"type": "number",
-						"format": "number"
+						"type": "number"
 					},
 					"last_shopping_location_id": {
 						"type": "integer"
@@ -4606,12 +4679,10 @@
 						"$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",
@@ -4692,8 +4763,7 @@
 						"format": "date-time"
 					},
 					"price": {
-						"type": "number",
-						"format": "float"
+						"type": "number"
 					},
 					"shopping_location": {
 						"$ref": "#/components/schemas/ShoppingLocation"
@@ -4716,12 +4786,10 @@
 						"type": "integer"
 					},
 					"amount": {
-						"type": "number",
-						"format": "number"
+						"type": "number"
 					},
 					"last_price": {
-						"type": "number",
-						"format": "float"
+						"type": "number"
 					},
 					"note": {
 						"type": "string"
@@ -4744,8 +4812,7 @@
 						"type": "integer"
 					},
 					"qu_factor_purchase_to_stock": {
-						"type": "number",
-						"format": "number"
+						"type": "number"
 					},
 					"barcode": {
 						"type": "string",
@@ -4781,6 +4848,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 +5107,7 @@
 						"type": "string",
 						"enum": [
 							"manually",
-							"dynamic-regular",
+							"hourly",
 							"daily",
 							"weekly",
 							"monthly"
@@ -5069,6 +5140,10 @@
 					"next_execution_assigned_to_user_id": {
 						"type": "integer"
 					},
+					"start_date": {
+						"type": "string",
+						"format": "date-time"
+					},
 					"row_created_timestamp": {
 						"type": "string",
 						"format": "date-time"
@@ -5155,8 +5230,7 @@
 						"format": "date-time"
 					},
 					"amount": {
-						"type": "number",
-						"format": "float"
+						"type": "number"
 					},
 					"location_id": {
 						"type": "integer"
@@ -5209,8 +5283,7 @@
 				"type": "object",
 				"properties": {
 					"amount": {
-						"type": "number",
-						"format": "float"
+						"type": "number"
 					},
 					"user_id": {
 						"type": "integer"
@@ -5580,7 +5653,9 @@
 					"stock",
 					"stock_current_locations",
 					"chores_log",
-					"meal_plan_sections"
+					"meal_plan_sections",
+					"products_last_purchased",
+					"products_average_price"
 				]
 			},
 			"ExposedEntityNoListing": {
@@ -5596,7 +5671,9 @@
 					"api_keys",
 					"stock",
 					"stock_current_locations",
-					"chores_log"
+					"chores_log",
+					"products_last_purchased",
+					"products_average_price"
 				]
 			},
 			"ExposedEntityNoDelete": {
@@ -5605,7 +5682,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;
 

localization/ca/chore_assignment_types.po

@@ -0,0 +1,30 @@
+# 
+# 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-09-17 10:45+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_assignment_types\n"
+
+msgid "no-assignment"
+msgstr "sense actius"
+
+msgid "who-least-did-first"
+msgstr ""
+
+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,397 @@
+# 
+# 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 "Changed towels in the bathroom"
+msgstr "Tovalloles del lavabo canviades"
+
+msgid "Cleaned the kitchen floor"
+msgstr "Terra de la cuina netejat"
+
+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 "Lawn mowed in the garden"
+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 "Home"
+msgstr "Casa"
+
+msgid "Life"
+msgstr "VIda"
+
+msgid "Projects"
+msgstr "Projectes"
+
+msgid "Repair the garage door"
+msgstr "Reparar la porta del garatge"
+
+msgid "Fork and improve grocy"
+msgstr ""
+
+msgid "Find a solution for what to do when I forget the door keys"
+msgstr "Trobar una solució sobre el què fer quan em deixo les claus de casa"
+
+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 "The thing which happens on the 5th of every month"
+msgstr "El que passa el dia 5 de cada mes"
+
+msgid "The thing which happens daily"
+msgstr "El que passa diàriament"
+
+msgid "The thing which happens on Mondays and Wednesdays"
+msgstr "El que passa els dilluns i els dimecres"
+
+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 ""

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_period_types.po

@@ -21,9 +21,6 @@ msgstr ""
 msgid "manually"
 msgstr "Manuální"
 
-msgid "dynamic-regular"
-msgstr "Dynamický"
-
 msgid "daily"
 msgstr "Denní"
 
@@ -35,3 +32,9 @@ msgstr "Měsíčně"
 
 msgid "yearly"
 msgstr "Ročně"
+
+msgid "hourly"
+msgstr ""
+
+msgid "adaptive"
+msgstr ""

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

@@ -409,3 +409,6 @@ msgstr ""
 
 msgid "Dinner"
 msgstr ""
+
+msgid "Catalan"
+msgstr ""

localization/cs/locales.po

@@ -121,3 +121,7 @@ msgstr "Tamilština"
 # Finnish
 msgid "fi"
 msgstr "Finština"
+
+# Catalan
+msgid "ca"
+msgstr ""

localization/cs/strings.po

@@ -380,13 +380,6 @@ msgstr "To znamená, že %s bude přidáno do zásob"
 msgid "This means %s will be removed from stock"
 msgstr "To znamená, že %s bude odebráno ze zásob"
 
-msgid ""
-"This means the next execution of this chore is scheduled %s days after the "
-"last execution"
-msgstr ""
-"To znamená, že příští provedení této povinnosti je naplánováno na %s dní po "
-"jejím posledním vykonání"
-
 msgid "Removed %1$s of %2$s from stock"
 msgstr "Odebráno %1$s z %2$s ze zásob"
 
@@ -961,9 +954,6 @@ msgstr "Porce"
 msgid "Costs"
 msgstr "Náklady"
 
-msgid "Based on the prices of the last purchase per product"
-msgstr "Založeno na cenách produktů při jejich posledním nákupu"
-
 msgid "The ingredients listed here result in this amount of servings"
 msgstr "Zobrazené suroviny odpovídají tomuto počtu porcí"
 
@@ -1271,9 +1261,6 @@ msgstr "Nikdy"
 msgid "Today"
 msgstr "Dnes"
 
-msgid "Consume %1$s of %2$s as spoiled"
-msgstr "Spotřebovat %1$s z %2$s jako zkažené"
-
 msgid "Not all ingredients of recipe \"%s\" are in stock, nothing removed"
 msgstr "Nejsou všechny suroviny z receptu \"%s\" v zásobě, nic nebude odebráno"
 
@@ -1375,29 +1362,52 @@ msgid "Assignment type"
 msgstr "Typ přiřazení"
 
 msgid ""
-"This means the next execution of this chore is scheduled 1 day after the "
+"This means the next execution of this chore is scheduled %s day after the "
 "last execution"
-msgstr ""
-"To znamená, že další splnění povinnosti je naplánováno každý 1 den po "
-"posledním splnění"
+msgid_plural ""
+"This means the next execution of this chore is scheduled %s days after the "
+"last execution"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 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 ""
-"To znamená, že další splnění povinnosti je naplánováno 1 den po posledním "
-"splnění, ale pouze všední dny vybrané níže"
+"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] ""
+msgstr[2] ""
+msgstr[3] ""
+
+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] ""
+msgstr[2] ""
+msgstr[3] ""
+
+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] ""
+msgstr[2] ""
+msgstr[3] ""
 
 msgid "This means the next execution of this chore is not scheduled"
 msgstr "To znamená, že další splnění povinnosti není naplánováno"
 
-msgid ""
-"This means the next execution of this chore is scheduled on the below "
-"selected day of each month"
-msgstr ""
-"To znamená, že další splnění povinnosti je naplánováno na níže zadaný den "
-"každého měsíce"
-
 msgid ""
 "This means the next execution of this chore will not be assigned to anyone"
 msgstr "To znamená, že další splnění povinnosti nebude nikomu zadáno"
@@ -1549,12 +1559,8 @@ msgstr "Sčítat minimální počet skladových zásob podřízených produktů"
 
 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 ""
-"Pokud je povoleno, minimální množství zásob podřízených produktů bude "
-"akumulováno do tohoto produktu. To znamená že podřízené produkty nikdy "
-"nebudou chybět, ale pouze tento produkt."
 
 msgid "Are you sure to remove this conversion?"
 msgstr "Opravdu chcete odstranit tento převod?"
@@ -1581,39 +1587,15 @@ msgid "Period interval"
 msgstr "Interval opakování"
 
 msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s days"
-msgstr ""
-"To znamená, že další splnění povinnosti by mělo plánováno pouze každých %s "
-"dní"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s weeks"
-msgstr ""
-"To znamená, že další splnění povinnosti by  mělo být plánováno každých %s "
-"týdnů"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s months"
-msgstr ""
-"To znamená, že další splnění povinnosti by mělo být plánováno pouze každý %s"
-" měsíc"
-
-msgid ""
-"This means the next execution of this chore is scheduled 1 year after the "
-"last execution"
-msgstr ""
-"To znamená, že další splnění povinnosti je naplánováno 1 rok po posledním "
-"splnění"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s years"
-msgstr ""
-"To znamená, že další splnění povinnosti by mělo být plánováno pouze každých "
-"%s let"
+"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] ""
+msgstr[2] ""
+msgstr[3] ""
 
 msgid "Transfer"
 msgstr "Přesun"
@@ -1860,21 +1842,12 @@ msgstr "Čárový kód pro produkt"
 msgid "Edit Barcode"
 msgstr "Upravit čárový kód"
 
-msgid "Not enough in stock (not included in costs), %s ingredient missing"
-msgstr "Nedostatečná zásoba (nezahrnuto v nákupech), %s ingrediencí chybí"
-
 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 ""
 
-msgid ""
-"Not enough in stock (not included in costs), %1$s missing, %2$s already on "
-"shopping list"
-msgstr ""
-"Nedostatečná zásoba (nezahrnuto v nákupech),  %1$s  chybí, %2$s již v "
-"nákupním seznamu"
-
 msgid "Quantity unit stock cannot be changed after first purchase"
 msgstr "Měrná jednotka zásob nemůže být změněna po prvním nákupu"
 
@@ -2287,8 +2260,8 @@ msgstr "Zachovat produkt"
 msgid "Product to remove"
 msgstr "Produkt k odstranění"
 
-msgid "Error while merging products"
-msgstr "Chyba při slučování produktů"
+msgid "Error while merging"
+msgstr ""
 
 msgid "After merging, this product will be kept"
 msgstr "Po sloučení bude tento produkt zachován"
@@ -2343,6 +2316,9 @@ msgstr ""
 msgid "Print on label printer"
 msgstr ""
 
+msgid "Default stock entry label"
+msgstr ""
+
 msgid "Stock entry label"
 msgstr ""
 
@@ -2355,14 +2331,6 @@ 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 ""
 
@@ -2503,3 +2471,93 @@ msgstr ""
 
 msgid "Are you sure to empty the shopping list?"
 msgstr ""
+
+msgid "This is the default which will be prefilled on purchase"
+msgstr ""
+
+msgid "Merge chores"
+msgstr ""
+
+msgid "Chore to keep"
+msgstr ""
+
+msgid "After merging, this chore will be kept"
+msgstr ""
+
+msgid "Chore to remove"
+msgstr ""
+
+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 ""
+
+msgid "%s task is due to be done today"
+msgid_plural "%s tasks are due to be done today"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+msgid "%s chore is due to be done today"
+msgid_plural "%s chores are due to be done today"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+msgid "%s battery is due to be charged today"
+msgid_plural "%s batteries are due to be charged today"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+msgid "Set to 0 to hide due soon filters/highlighting"
+msgstr ""
+
+msgid "Save & close"
+msgstr ""
+
+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 ""
+
+msgid "A start date is required"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+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 ""

localization/da/chore_period_types.po

@@ -2,7 +2,6 @@
 # Translators:
 # Troels Siggaard <troels@siggaard.com>, 2019
 # Rasmus Bojsen <rasmus@bojsen.cn>, 2019
-# Brian Moos Lindberg <brian@blueeel.dk>, 2019
 # 
 msgid ""
 msgstr ""
@@ -10,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: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
+"Last-Translator: Rasmus Bojsen <rasmus@bojsen.cn>, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,9 +21,6 @@ msgstr ""
 msgid "manually"
 msgstr "manuelt"
 
-msgid "dynamic-regular"
-msgstr "dynamisk-regelmæssig"
-
 msgid "daily"
 msgstr "daglig"
 
@@ -36,3 +32,9 @@ msgstr "månedlig"
 
 msgid "yearly"
 msgstr "årlig"
+
+msgid "hourly"
+msgstr ""
+
+msgid "adaptive"
+msgstr ""

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

@@ -6,6 +6,7 @@
 # Brian Moos Lindberg <brian@blueeel.dk>, 2019
 # Mihai Marinescu <mihai@marinescu.dk>, 2020
 # klavslund <klavslund@gmail.com>, 2021
+# Jesper Donnis, 2021
 # 
 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: Jesper Donnis, 2021\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"
@@ -389,10 +390,13 @@ msgid "Finnish"
 msgstr "Finsk"
 
 msgid "Breakfast"
-msgstr ""
+msgstr "Morgenmad"
 
 msgid "Lunch"
-msgstr ""
+msgstr "Frokost"
 
 msgid "Dinner"
+msgstr "Aftensmad"
+
+msgid "Catalan"
 msgstr ""

localization/da/locales.po

@@ -120,3 +120,7 @@ msgstr "ta"
 # Finnish
 msgid "fi"
 msgstr "fi"
+
+# Catalan
+msgid "ca"
+msgstr ""

localization/da/strings.po

@@ -8,6 +8,7 @@
 # Michael Winkel <mbw@mbw.dk>, 2021
 # klavslund <klavslund@gmail.com>, 2021
 # dark159123 <r.j.hansen@protonmail.com>, 2021
+# Jesper Donnis, 2021
 # 
 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: dark159123 <r.j.hansen@protonmail.com>, 2021\n"
+"Last-Translator: Jesper Donnis, 2021\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"
@@ -293,7 +294,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 +339,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 +365,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 +537,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"
@@ -928,9 +922,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"
 
@@ -1245,9 +1236,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 +1340,44 @@ msgid "Assignment type"
 msgstr "Opgavetype"
 
 msgid ""
-"This means the next execution of this chore is scheduled 1 day after the "
+"This means the next execution of this chore is scheduled %s 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"
+msgid_plural ""
+"This means the next execution of this chore is scheduled %s days after the "
+"last execution"
+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 +1531,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 +1559,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"
@@ -1709,7 +1683,7 @@ 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"
@@ -1762,7 +1736,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 +1760,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"
@@ -1839,23 +1813,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"
@@ -1912,7 +1874,7 @@ msgid "Language"
 msgstr "Sprog"
 
 msgid "User settings"
-msgstr "Bruger indstillinger"
+msgstr "Brugerindstillinger"
 
 msgid "Default"
 msgstr "Standard"
@@ -2015,7 +1977,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 +2083,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"
@@ -2286,8 +2248,8 @@ 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"
@@ -2324,32 +2286,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 +2324,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,22 +2338,22 @@ 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 ""
 
 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"
@@ -2404,67 +2363,70 @@ msgid "Mark this item as undone"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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,30 +2436,116 @@ 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 ""
+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 ""
+
+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] ""
+msgstr[1] ""
+
+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 ""
+
+msgid "Save & close"
+msgstr ""
+
+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 ""
+
+msgid "A start date is required"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+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 ""

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"
@@ -203,7 +203,7 @@ msgid "Sweets"
 msgstr "Süßigkeiten"
 
 msgid "Bakery products"
-msgstr "Bäckerei Produkte"
+msgstr "Bäckereiprodukte"
 
 msgid "Tinned food"
 msgstr "Konservern"
@@ -391,3 +391,6 @@ msgstr "Mittagessen"
 
 msgid "Dinner"
 msgstr "Abendessen"
+
+msgid "Catalan"
+msgstr "Katalanisch"

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"
@@ -120,3 +120,7 @@ msgstr "Tamil"
 # Finnish
 msgid "fi"
 msgstr "Finnisch"
+
+# Catalan
+msgid "ca"
+msgstr "Katalanisch"

localization/de/strings.po

@@ -3,7 +3,7 @@
 # Luca RHK <luca@rhk-in.de>, 2020
 # Tobias Wolter <mumpfpuffel@gmail.com>, 2020
 # @RubenKelevra <ruben@freifunk-nrw.de>, 2021
-# Bernd Bestel <bernd@berrnd.de>, 2021
+# Bernd Bestel <bernd@berrnd.de>, 2022
 # 
 msgid ""
 msgstr ""
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: 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"
@@ -364,13 +364,6 @@ msgstr "Das bedeutet %s wird dem Bestand hinzugefügt"
 msgid "This means %s will be removed from stock"
 msgstr "Das bedeutet %s wird aus dem Bestand entfernt"
 
-msgid ""
-"This means the next execution of this chore is scheduled %s days after the "
-"last execution"
-msgstr ""
-"Das bedeutet, dass eine erneute Ausführung der Hausarbeit %s Tage nach der "
-"letzten Ausführung geplant wird"
-
 msgid "Removed %1$s of %2$s from stock"
 msgstr "%1$s %2$s aus dem Bestand entfernt"
 
@@ -936,9 +929,6 @@ msgstr "Portionen"
 msgid "Costs"
 msgstr "Kosten"
 
-msgid "Based on the prices of the last purchase per product"
-msgstr "Basierend auf den Preisen des letzten Kaufs pro Produkt"
-
 msgid "The ingredients listed here result in this amount of servings"
 msgstr "Die hier aufgeführten Zutaten ergeben diese Menge an Portionen"
 
@@ -1258,9 +1248,6 @@ msgstr "Nie"
 msgid "Today"
 msgstr "Heute"
 
-msgid "Consume %1$s of %2$s as spoiled"
-msgstr "Verbrauche %1$s %2$s als verdorben"
-
 msgid "Not all ingredients of recipe \"%s\" are in stock, nothing removed"
 msgstr ""
 "Nicht alle Zutaten, die vom Rezept \"%s\" benötigt werden, sind vorrätig, es"
@@ -1367,30 +1354,61 @@ msgid "Assignment type"
 msgstr "Zuweisungstyp"
 
 msgid ""
-"This means the next execution of this chore is scheduled 1 day after the "
+"This means the next execution of this chore is scheduled %s day after the "
 "last execution"
-msgstr ""
-"Das bedeutet, dass eine erneute Ausführung der Hausarbeit 1 Tage nach der "
+msgid_plural ""
+"This means the next execution of this chore is scheduled %s days after the "
+"last execution"
+msgstr[0] ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit %s Tag nach der "
+"letzten Ausführung geplant wird"
+msgstr[1] ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit %s Tage nach der "
 "letzten Ausführung geplant wird"
 
 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 ""
-"Das bedeutet, dass eine erneute Ausführung der Hausarbeit 1 Tage nach der "
-"letzten Ausführung geplant wird, aber nur für unten ausgewählten Wochentage"
+"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] ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit %s Stunde nach der"
+" letzten Ausführung geplant wird"
+msgstr[1] ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit %s Stunden nach "
+"der letzten Ausführung geplant wird"
+
+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] ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit jede Woche an den "
+"ausgewählten Wochentagen geplant wird"
+msgstr[1] ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit alle %s Wochen an "
+"den ausgewählten Wochentagen geplant wird"
+
+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] ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit jeden Monat am "
+"ausgewählten Tag geplant wird"
+msgstr[1] ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit alle %s Monate am "
+"ausgewählten Tag geplant wird"
 
 msgid "This means the next execution of this chore is not scheduled"
 msgstr ""
 "Das bedeutet, dass eine erneute Ausführung der Hausarbeit nicht geplant wird"
 
-msgid ""
-"This means the next execution of this chore is scheduled on the below "
-"selected day of each month"
-msgstr ""
-"Das bedeutet, dass eine erneute Ausführung der Hausarbeit jeden Monat an dem"
-" unten ausgewählt Tag geplant wird"
-
 msgid ""
 "This means the next execution of this chore will not be assigned to anyone"
 msgstr ""
@@ -1546,12 +1564,10 @@ msgstr "Mindestbestände von untergeordneten Produkten aufsummieren"
 
 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 ""
 "Wenn aktiviert, werden die Mindestbestände von untergeordneten Produkten "
-"aufsummiert, heißt das untergeordnete Produkt wird nie \"fehlen\", nur "
-"dieses"
+"aufsummiert, heißt das untergeordnete Produkt wird nie fehlen, nur dieses"
 
 msgid "Are you sure to remove this conversion?"
 msgstr "Diese Umrechnung wirklich löschen?"
@@ -1578,39 +1594,17 @@ msgid "Period interval"
 msgstr "Periodenintervall"
 
 msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s days"
-msgstr ""
-"Das bedeutet, dass eine erneute Ausführung der Hausarbeit nur alle %s Tage "
-"geplant wird"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s weeks"
-msgstr ""
-"Das bedeutet, dass eine erneute Ausführung der Hausarbeit nur alle %s Wochen"
-" geplant wird"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s months"
-msgstr ""
-"Das bedeutet, dass eine erneute Ausführung der Hausarbeit nur alle %s Monate"
-" geplant wird"
-
-msgid ""
-"This means the next execution of this chore is scheduled 1 year after the "
-"last execution"
-msgstr ""
-"Das bedeutet, dass eine erneute Ausführung der Hausarbeit 1 Jahr nach der "
-"letzten Ausführung geplant wird"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s years"
-msgstr ""
-"Das bedeutet, dass eine erneute Ausführung der Hausarbeit nur alle %s Jahre "
-"geplant wird"
+"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] ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit jedes Jahr am "
+"gleichen Tag (basierend auf dem Startzeitpunkt) geplant wird"
+msgstr[1] ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit alle %s Jahre am "
+"gleichen Tag (basierend auf dem Startzeitpunkt) geplant wird"
 
 msgid "Transfer"
 msgstr "Umlagern"
@@ -1865,24 +1859,14 @@ msgstr "Barcode für Produkt"
 msgid "Edit Barcode"
 msgstr "Barcode bearbeiten"
 
-msgid "Not enough in stock (not included in costs), %s ingredient missing"
-msgstr ""
-"Nicht ausreichend im Bestand (nicht in den Kosten enthalten), %s Zutaten "
-"fehlen"
-
 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 ""
-"Basierend auf den Preisen der Standard-Verbrauchsregel \"Geöffnete zuerst, "
-"dann zuerst fällige, dann First In - First Out\""
-
-msgid ""
-"Not enough in stock (not included in costs), %1$s missing, %2$s already on "
-"shopping list"
-msgstr ""
-"Nicht ausreichend im Bestand (nicht in den Kosten enthalten), %1$s fehlen, "
-"%2$s stehen bereits auf dem Einkaufszettel"
+"Basierend auf den Preisen der Standard-Verbrauchsregel (Geöffnete zuerst, "
+"dann zuerst fällige, dann First In - First Out) für vorrätige Zutaten und "
+"auf dem letzten Preis für fehlende Zutaten"
 
 msgid "Quantity unit stock cannot be changed after first purchase"
 msgstr ""
@@ -1970,7 +1954,7 @@ msgid ""
 "Show purchased date on purchase and inventory page (otherwise the purchased "
 "date defaults to today)"
 msgstr ""
-"Einkaufsdattum auf der Einkauf- und Inventur-Seite anzeigen (ansonsten wird "
+"Einkaufsdatum auf der Einkauf- und Inventur-Seite anzeigen (ansonsten wird "
 "heute als Einkaufsdatum verwendet)"
 
 msgid "Common"
@@ -2062,8 +2046,8 @@ msgid ""
 "Show a warning when the due date of the purchased product is earlier than "
 "the next due date in stock"
 msgstr ""
-"Eine Warnung anzeigen, wenn das Fälligkeitsdatum des eingekauften Produkts "
-"früher ist als im Bestand"
+"Eine Warnung anzeigen, wenn das Fälligkeitsdatum des gekauften Produkts vor "
+"dem nächsten Fälligkeitsdatum von bereits vorrätigen Bestandseinträgen liegt"
 
 msgid "This is due earlier than already in-stock items"
 msgstr "Dies ist früher fällig als bereits vorhandene Bestandseinträge"
@@ -2339,8 +2323,8 @@ msgstr "Produkt, das behalten werden soll"
 msgid "Product to remove"
 msgstr "Produkt, das entfernt werden soll"
 
-msgid "Error while merging products"
-msgstr "Fehler beim Zusammenführen der Produkte"
+msgid "Error while merging"
+msgstr "Fehler beim Zusammenführen"
 
 msgid "After merging, this product will be kept"
 msgstr "Nach der Zusammenführung wird dieses Produkt erhalten bleiben"
@@ -2401,6 +2385,9 @@ msgstr "MHD"
 msgid "Print on label printer"
 msgstr "Auf Etikettendrucker drucken"
 
+msgid "Default stock entry label"
+msgstr "Standard Bestandseintrag-Etikett"
+
 msgid "Stock entry label"
 msgstr "Bestandseintrag-Etikett"
 
@@ -2413,16 +2400,6 @@ msgstr "Ein Etikett pro Einkauf"
 msgid "Label per unit"
 msgstr "Ein Etikett pro Einheit"
 
-msgid "Allow label printing per unit"
-msgstr "Erlaube Etikettendruck pro Einheit"
-
-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 ""
-"Erlaube Etikettendruck pro Einheit nach Umrechnung - Beispiel: 1 gekaufte "
-"Packung, die 10 Einheiten hinzufügt, druckt 10 Etiketten"
-
 msgid "Error while executing WebHook"
 msgstr "Fehler bei WebHook-Ausführung"
 
@@ -2565,3 +2542,96 @@ msgstr "Abschnitt"
 
 msgid "Are you sure to empty the shopping list?"
 msgstr "Sicher, dass der Einkaufszettel geleert werden soll?"
+
+msgid "This is the default which will be prefilled on purchase"
+msgstr "Dies ist die Standardeinstellung, die beim Einkauf vorbelegt wird"
+
+msgid "Merge chores"
+msgstr "Hausarbeiten zusammenführen"
+
+msgid "Chore to keep"
+msgstr "Hausarbeit, die behalten werden soll"
+
+msgid "After merging, this chore will be kept"
+msgstr "Nach der Zusammenführung wird diese Hausarbeit erhalten bleiben"
+
+msgid "Chore to remove"
+msgstr "Hausarbeit, die entfernt werden soll"
+
+msgid ""
+"After merging, all occurences of this chore will be replaced by the kept "
+"chore (means this chore will not exist anymore)"
+msgstr ""
+"Nach dem Zusammenführen werden alle Referenzen auf diese Hausarbeit durch "
+"die zu behaltende Hausarbeit ersetzt (d. h. diese Hausarbeit existiert dann "
+"nicht mehr)"
+
+msgid "Due today"
+msgstr "Heute fällig"
+
+msgid "%s task is due to be done today"
+msgid_plural "%s tasks are due to be done today"
+msgstr[0] "%s Aufgabe steht heute an"
+msgstr[1] "%s Aufgaben stehen heute an"
+
+msgid "%s chore is due to be done today"
+msgid_plural "%s chores are due to be done today"
+msgstr[0] "%s Hausarbeit steht heute an"
+msgstr[1] "%s Hausarbeiten stehen heute an"
+
+msgid "%s battery is due to be charged today"
+msgid_plural "%s batteries are due to be charged today"
+msgstr[0] "%s Batterie muss heute geladen werden"
+msgstr[1] "%s Batterien müssen heute geladen werden"
+
+msgid "Set to 0 to hide due soon filters/highlighting"
+msgstr "Auf 0 setzen, um \"Bald fällig\" Filter/Hervorhebungen zu deaktivieren"
+
+msgid "Save & close"
+msgstr "Speichern & schließen"
+
+msgid "Save & add another task"
+msgstr "Speichern & weitere Aufgabe hinzufügen"
+
+msgid "Treat opened as out of stock"
+msgstr "Geöffnete als nicht vorrätig behandeln"
+
+msgid ""
+"When enabled, opened items will be counted as missing for calculating if "
+"this product is below its minimum stock amount"
+msgstr ""
+"Wenn aktiviert, werden geöffnete Bestandseinträge für die Ermittlung des "
+"Mindestbestands als bereits verbraucht betrachtet"
+
+msgid "Skipped"
+msgstr "Übersprungen"
+
+msgid "Skip next chore schedule"
+msgstr "Nächste geplante Ausführung überspringen"
+
+msgid "Time"
+msgstr "Zeit"
+
+msgid "A start date is required"
+msgstr "Ein Startzeitpunkt ist erforderlich"
+
+msgid "Start date"
+msgstr "Startzeitpunkt"
+
+msgid "The start date cannot be changed when the chore was once tracked"
+msgstr ""
+"Der Startzeitpunkt kann nach der ersten Ausführung der Hausarbeit nicht mehr"
+" geändert werden"
+
+msgid "Show the recipe list and the recipe side by side"
+msgstr "Die Rezeptliste und das Rezept nebeneinander anzeigen"
+
+msgid ""
+"This means the next execution of this chore is scheduled dynamically based "
+"on the past average execution frequency"
+msgstr ""
+"Das bedeutet, dass eine erneute Ausführung der Hausarbeit dynamisch auf "
+"Basis der bisherigen durchschnittlichen Ausführungshäufigkeit geplant wird"
+
+msgid "Average execution frequency"
+msgstr "Durchschnittliche Ausführungshäufigkeit"

localization/demo_data.pot

@@ -386,3 +386,6 @@ msgstr ""
 
 msgid "Dinner"
 msgstr ""
+
+msgid "Catalan"
+msgstr ""

localization/el_GR/chore_period_types.po

@@ -20,9 +20,6 @@ msgstr ""
 msgid "manually"
 msgstr "χρειροκίνητα"
 
-msgid "dynamic-regular"
-msgstr "δυναμικό-κανονικό"
-
 msgid "daily"
 msgstr "ημερήσιο"
 
@@ -34,3 +31,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

@@ -394,3 +394,6 @@ msgstr "Γεύμα"
 
 msgid "Dinner"
 msgstr "Δείπνο"
+
+msgid "Catalan"
+msgstr ""

localization/el_GR/locales.po

@@ -121,3 +121,7 @@ msgstr "ta"
 # Finnish
 msgid "fi"
 msgstr "fi"
+
+# Catalan
+msgid "ca"
+msgstr ""

localization/el_GR/strings.po

@@ -368,13 +368,6 @@ msgstr "Αυτό σημαίνει ότι το% s θα προστεθεί στο
 msgid "This means %s will be removed from stock"
 msgstr "Αυτό σημαίνει ότι το% s θα αφαιρεθεί από το απόθεμα"
 
-msgid ""
-"This means the next execution of this chore is scheduled %s days after the "
-"last execution"
-msgstr ""
-"ΠροϊόνΑυτό σημαίνει ότι η επόμενη εκτέλεση αυτής της δουλειάς έχει "
-"προγραμματιστεί% s ημέρες μετά την τελευταία εκτέλεση"
-
 msgid "Removed %1$s of %2$s from stock"
 msgstr "Καταργήθηκε% 1 $ s από% 2 $ s από το απόθεμα"
 
@@ -932,9 +925,6 @@ msgstr "Μερίδες"
 msgid "Costs"
 msgstr "Δικαστικά έξοδα"
 
-msgid "Based on the prices of the last purchase per product"
-msgstr "Με βάση τις τιμές της τελευταίας αγοράς ανά προϊόν"
-
 msgid "The ingredients listed here result in this amount of servings"
 msgstr "Τα συστατικά που αναφέρονται εδώ οδηγούν σε αυτό το ποσό μερίδων"
 
@@ -1254,9 +1244,6 @@ msgstr "Ποτέ"
 msgid "Today"
 msgstr "Σήμερα"
 
-msgid "Consume %1$s of %2$s as spoiled"
-msgstr "Καταναλώστε% 1 $ s από% 2 $ s ως χαλασμένο"
-
 msgid "Not all ingredients of recipe \"%s\" are in stock, nothing removed"
 msgstr "Δεν υπάρχουν όλα τα συστατικά της συνταγής \"% s\", τίποτα δεν αφαιρείται"
 
@@ -1359,33 +1346,46 @@ msgid "Assignment type"
 msgstr "Τύπος εργασίας"
 
 msgid ""
-"This means the next execution of this chore is scheduled 1 day after the "
+"This means the next execution of this chore is scheduled %s day after the "
 "last execution"
-msgstr ""
-"Τελευταία αγοράΑυτό σημαίνει ότι η επόμενη εκτέλεση αυτής της δουλειάς έχει "
-"προγραμματιστεί 1 ημέρα μετά την τελευταία εκτέλεση"
+msgid_plural ""
+"This means the next execution of this chore is scheduled %s days after the "
+"last execution"
+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 ""
-"Τελευταία χρήσηΑυτό σημαίνει ότι η επόμενη εκτέλεση αυτής της δουλειάς έχει "
-"προγραμματιστεί 1 ημέρα μετά την τελευταία εκτέλεση, αλλά μόνο για τις "
-"καθημερινές που επιλέγονται παρακάτω"
+"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 ""
 "ΚακομαθημένοςΑυτό σημαίνει ότι η επόμενη εκτέλεση αυτής της δουλειάς δεν "
 "είναι προγραμματισμένη"
 
-msgid ""
-"This means the next execution of this chore is scheduled on the below "
-"selected day of each month"
-msgstr ""
-"Η αναζήτηση γραμμωτού κώδικα είναι απενεργοποιημένηΑυτό σημαίνει ότι η "
-"επόμενη εκτέλεση αυτής της δουλειάς έχει προγραμματιστεί την παρακάτω "
-"επιλεγμένη ημέρα κάθε μήνα"
-
 msgid ""
 "This means the next execution of this chore will not be assigned to anyone"
 msgstr ""
@@ -1542,12 +1542,8 @@ msgstr "Συσσώρευση υποπροϊόντων ελάχ. ποσό απο
 
 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 ""
-"ΠαρακολούθησηΕάν είναι ενεργοποιημένο, το ελάχιστο το απόθεμα των υπο-"
-"προϊόντων θα συσσωρευτεί σε αυτό το προϊόν, σημαίνει ότι το υπο-προϊόν δεν "
-"θα \"λείπει\" ποτέ, μόνο αυτό το προϊόν"
 
 msgid "Are you sure to remove this conversion?"
 msgstr "Είστε βέβαιοι ότι θα καταργήσετε αυτήν τη μετατροπή;"
@@ -1574,39 +1570,13 @@ msgid "Period interval"
 msgstr "Διάστημα περιόδου"
 
 msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s days"
-msgstr ""
-"Επισκόπηση μπαταρίαςΑυτό σημαίνει ότι η επόμενη εκτέλεση αυτής της δουλειάς "
-"θα πρέπει να προγραμματίζεται μόνο κάθε% s ημέρες"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s weeks"
-msgstr ""
-"Πλήθος κύκλων φόρτισηςΑυτό σημαίνει ότι η επόμενη εκτέλεση αυτής της "
-"δουλειάς θα πρέπει να προγραμματίζεται μόνο κάθε% s εβδομάδες"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s months"
-msgstr ""
-"Δημιουργία στοιχείου λίστας αγορώνΑυτό σημαίνει ότι η επόμενη εκτέλεση αυτής"
-" της δουλειάς θα πρέπει να προγραμματίζεται μόνο κάθε% s μήνες"
-
-msgid ""
-"This means the next execution of this chore is scheduled 1 year after the "
-"last execution"
-msgstr ""
-"Επεξεργασία στοιχείου λίστας αγορώνΑυτό σημαίνει ότι η επόμενη εκτέλεση "
-"αυτής της δουλειάς έχει προγραμματιστεί 1 έτος μετά την τελευταία εκτέλεση"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s years"
-msgstr ""
-"ΑποθηκεύσετεΑυτό σημαίνει ότι η επόμενη εκτέλεση αυτής της δουλειάς θα "
-"πρέπει να προγραμματίζεται μόνο κάθε% s χρόνια"
+"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 "ΜΕΤΑΦΟΡΑ"
@@ -1858,21 +1828,12 @@ msgstr "Barcode για "
 msgid "Edit Barcode"
 msgstr "Επεξεργασία Barcode"
 
-msgid "Not enough in stock (not included in costs), %s ingredient missing"
-msgstr ""
-"Γραμμικός κώδικαςΔεν υπάρχει αρκετό απόθεμα (δεν περιλαμβάνεται στο κόστος),"
-" %s λείπει συστατικό"
-
 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 ""
 
-msgid ""
-"Not enough in stock (not included in costs), %1$s missing, %2$s already on "
-"shopping list"
-msgstr "Προεπιλογή καλύτερη πριν από ημέρες"
-
 msgid "Quantity unit stock cannot be changed after first purchase"
 msgstr "Αγορά μονάδας ποσότητας"
 
@@ -2272,7 +2233,7 @@ msgstr ""
 msgid "Product to remove"
 msgstr ""
 
-msgid "Error while merging products"
+msgid "Error while merging"
 msgstr ""
 
 msgid "After merging, this product will be kept"
@@ -2326,6 +2287,9 @@ msgstr ""
 msgid "Print on label printer"
 msgstr "Εκτύπωση σε εκτυπωτή ετικετών"
 
+msgid "Default stock entry label"
+msgstr ""
+
 msgid "Stock entry label"
 msgstr ""
 
@@ -2338,14 +2302,6 @@ 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 ""
 
@@ -2482,3 +2438,87 @@ msgstr "Τμήμα"
 
 msgid "Are you sure to empty the shopping list?"
 msgstr ""
+
+msgid "This is the default which will be prefilled on purchase"
+msgstr ""
+
+msgid "Merge chores"
+msgstr ""
+
+msgid "Chore to keep"
+msgstr ""
+
+msgid "After merging, this chore will be kept"
+msgstr ""
+
+msgid "Chore to remove"
+msgstr ""
+
+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 ""
+
+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] ""
+msgstr[1] ""
+
+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 ""
+
+msgid "Save & close"
+msgstr ""
+
+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 ""
+
+msgid "A start date is required"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+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 ""

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

@@ -89,3 +89,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

@@ -395,3 +395,6 @@ msgstr "Lunch"
 
 msgid "Dinner"
 msgstr "Dinner"
+
+msgid "Catalan"
+msgstr ""

localization/en_GB/locales.po

@@ -89,3 +89,6 @@ msgstr "Tamil"
 
 msgid "fi"
 msgstr "Finnish"
+
+msgid "ca"
+msgstr "Catalan"

localization/en_GB/strings.po

@@ -363,13 +363,6 @@ msgstr "This means %s will be added to stock"
 msgid "This means %s will be removed from stock"
 msgstr "This means %s will be removed from stock"
 
-msgid ""
-"This means the next execution of this chore is scheduled %s days after the "
-"last execution"
-msgstr ""
-"This means the next execution of this chore is scheduled %s days after the "
-"last execution"
-
 msgid "Removed %1$s of %2$s from stock"
 msgstr "Removed %1$s of %2$s from stock"
 
@@ -924,9 +917,6 @@ msgstr "Servings"
 msgid "Costs"
 msgstr "Costs"
 
-msgid "Based on the prices of the last purchase per product"
-msgstr "Based on the prices of the last purchase per product"
-
 msgid "The ingredients listed here result in this amount of servings"
 msgstr "The ingredients listed here result in this amount of servings"
 
@@ -1237,9 +1227,6 @@ msgstr "Never"
 msgid "Today"
 msgstr "Today"
 
-msgid "Consume %1$s of %2$s as spoiled"
-msgstr "Consume %1$s of %2$s as spoiled"
-
 msgid "Not all ingredients of recipe \"%s\" are in stock, nothing removed"
 msgstr "Not all ingredients of recipe \"%s\" are in stock, nothing removed"
 
@@ -1343,29 +1330,44 @@ msgid "Assignment type"
 msgstr "Assignment type"
 
 msgid ""
-"This means the next execution of this chore is scheduled 1 day after the "
+"This means the next execution of this chore is scheduled %s day after the "
 "last execution"
-msgstr ""
-"This means the next execution of this chore is scheduled 1 day after the "
+msgid_plural ""
+"This means the next execution of this chore is scheduled %s days after the "
 "last execution"
+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 ""
-"This means the next execution of this chore is scheduled 1 day after the "
-"last execution, but only for the weekdays selected below"
+"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 "This means the next execution of this chore is not scheduled"
 
-msgid ""
-"This means the next execution of this chore is scheduled on the below "
-"selected day of each month"
-msgstr ""
-"This means the next execution of this chore is scheduled on the below "
-"selected day of each month"
-
 msgid ""
 "This means the next execution of this chore will not be assigned to anyone"
 msgstr ""
@@ -1517,12 +1519,8 @@ msgstr "Accumulate sub products min. stock amount"
 
 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 ""
-"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"
 
 msgid "Are you sure to remove this conversion?"
 msgstr "Are you sure to remove this conversion?"
@@ -1549,39 +1547,13 @@ msgid "Period interval"
 msgstr "Period interval"
 
 msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s days"
-msgstr ""
-"This means the next execution of this chore should only be scheduled every "
-"%s days"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s weeks"
-msgstr ""
-"This means the next execution of this chore should only be scheduled every "
-"%s weeks"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s months"
-msgstr ""
-"This means the next execution of this chore should only be scheduled every "
-"%s months"
-
-msgid ""
-"This means the next execution of this chore is scheduled 1 year after the "
-"last execution"
-msgstr ""
-"This means the next execution of this chore is scheduled 1 year after the "
-"last execution"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s years"
-msgstr ""
-"This means the next execution of this chore should only be scheduled every "
-"%s years"
+"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 "Transfer"
@@ -1828,22 +1800,11 @@ msgstr "Barcode for product"
 msgid "Edit Barcode"
 msgstr "Edit Barcode"
 
-msgid "Not enough in stock (not included in costs), %s ingredient missing"
-msgstr "Not enough in stock (not included in costs), %s ingredient missing"
-
 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 ""
-"Based on the prices of the default consume rule which is \"Opened first, "
-"then first due first, then first in first out\""
-
-msgid ""
-"Not enough in stock (not included in costs), %1$s missing, %2$s already on "
-"shopping list"
-msgstr ""
-"Not enough in stock (not included in costs), %1$s missing, %2$s already on "
-"shopping list"
 
 msgid "Quantity unit stock cannot be changed after first purchase"
 msgstr "Quantity unit stock cannot be changed after first purchase"
@@ -2288,8 +2249,8 @@ msgstr "Product to keep"
 msgid "Product to remove"
 msgstr "Product to remove"
 
-msgid "Error while merging products"
-msgstr "Error while merging products"
+msgid "Error while merging"
+msgstr ""
 
 msgid "After merging, this product will be kept"
 msgstr "After merging, this product will be kept"
@@ -2349,6 +2310,9 @@ msgstr "DD"
 msgid "Print on label printer"
 msgstr "Print on label printer"
 
+msgid "Default stock entry label"
+msgstr ""
+
 msgid "Stock entry label"
 msgstr "Stock entry label"
 
@@ -2361,16 +2325,6 @@ msgstr "Single label"
 msgid "Label per unit"
 msgstr "Label per unit"
 
-msgid "Allow label printing per unit"
-msgstr "Allow label printing per unit"
-
-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 ""
-"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"
-
 msgid "Error while executing WebHook"
 msgstr "Error while executing WebHook"
 
@@ -2512,3 +2466,87 @@ msgstr "Section"
 
 msgid "Are you sure to empty the shopping list?"
 msgstr "Are you sure to empty the shopping list?"
+
+msgid "This is the default which will be prefilled on purchase"
+msgstr ""
+
+msgid "Merge chores"
+msgstr ""
+
+msgid "Chore to keep"
+msgstr ""
+
+msgid "After merging, this chore will be kept"
+msgstr ""
+
+msgid "Chore to remove"
+msgstr ""
+
+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 ""
+
+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] ""
+msgstr[1] ""
+
+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 ""
+
+msgid "Save & close"
+msgstr ""
+
+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 ""
+
+msgid "A start date is required"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+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 ""

localization/es/chore_assignment_types.po

@@ -1,6 +1,7 @@
 # 
 # Translators:
 # Alberto Martin <ami232@gmail.com>, 2021
+# GRBaset, 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: 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"
@@ -21,7 +22,7 @@ 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

@@ -20,9 +20,6 @@ msgstr ""
 msgid "manually"
 msgstr "Manual"
 
-msgid "dynamic-regular"
-msgstr "Regular dinámico"
-
 msgid "daily"
 msgstr "Diaria"
 
@@ -34,3 +31,9 @@ msgstr "Mensual"
 
 msgid "yearly"
 msgstr "Anual"
+
+msgid "hourly"
+msgstr ""
+
+msgid "adaptive"
+msgstr ""

localization/es/component_translations.po

@@ -18,12 +18,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\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

@@ -397,3 +397,6 @@ msgstr "Almuerzo"
 
 msgid "Dinner"
 msgstr "Cena"
+
+msgid "Catalan"
+msgstr ""

localization/es/locales.po

@@ -120,3 +120,7 @@ msgstr "Tamil"
 # Finnish
 msgid "fi"
 msgstr "Finés"
+
+# Catalan
+msgid "ca"
+msgstr ""

localization/es/strings.po

@@ -12,6 +12,8 @@
 # Adrián R.G. <adrirgrillo@gmail.com>, 2021
 # victormce <victormce@gmail.com>, 2021
 # Fernando Sánchez <fernando.l.sanchez@gmail.com>, 2021
+# Juan José González-Abril, 2021
+# GRBaset, 2022
 # 
 msgid ""
 msgstr ""
@@ -19,7 +21,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: Fernando Sánchez <fernando.l.sanchez@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"
@@ -29,7 +31,7 @@ msgstr ""
 "X-Domain: grocy/strings\n"
 
 msgid "Stock overview"
-msgstr "Resumen de inventario"
+msgstr "Resumen de existencias"
 
 msgid "%s product expires"
 msgid_plural "%s products expiring"
@@ -348,7 +350,7 @@ msgid "Manage API keys"
 msgstr "Administrar las claves de API"
 
 msgid "REST API browser"
-msgstr ""
+msgstr "Explorador de API REST"
 
 msgid "API keys"
 msgstr "Claves de API"
@@ -374,13 +376,6 @@ msgstr "Esto quiere decir que %s será añadido al inventario"
 msgid "This means %s will be removed from stock"
 msgstr "Quiere decir que %s será eliminado del inventario"
 
-msgid ""
-"This means the next execution of this chore is scheduled %s days after the "
-"last execution"
-msgstr ""
-"Esto quiere decir que la siguiente ejecución de esta tarea está prevista "
-"para %s días después de la última ejecución"
-
 msgid "Removed %1$s of %2$s from stock"
 msgstr "Eliminado del inventario %1$s de %2$s"
 
@@ -943,9 +938,6 @@ msgstr "Raciones"
 msgid "Costs"
 msgstr "Coste"
 
-msgid "Based on the prices of the last purchase per product"
-msgstr "Basado en los precios por producto de la última compra"
-
 msgid "The ingredients listed here result in this amount of servings"
 msgstr ""
 "Los ingredientes que aparecen corresponden a esta cantidad de raciones"
@@ -1264,9 +1256,6 @@ msgstr "Nunca"
 msgid "Today"
 msgstr "Hoy"
 
-msgid "Consume %1$s of %2$s as spoiled"
-msgstr "Consumir %1$s de %2$s como dañado"
-
 msgid "Not all ingredients of recipe \"%s\" are in stock, nothing removed"
 msgstr ""
 "No todos los ingredientes de la receta \"%s\" están en el inventario, nada "
@@ -1373,32 +1362,46 @@ msgid "Assignment type"
 msgstr "Tipo de asignación"
 
 msgid ""
-"This means the next execution of this chore is scheduled 1 day after the "
+"This means the next execution of this chore is scheduled %s day after the "
 "last execution"
-msgstr ""
-"Esto significa que la próxima ejecución de esta tarea del hogar está "
-"programada 1 día después de la última ejecución"
+msgid_plural ""
+"This means the next execution of this chore is scheduled %s days after the "
+"last execution"
+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 ""
-"Esto significa que la próxima ejecución de esta tarea del hogar está "
-"programada 1 día después de la última ejecución, pero solo para los días de "
-"la semana seleccionados a continuación"
+"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 ""
 "Esto significa que la próxima ejecución de esta tarea del hogar no está "
 "programada"
 
-msgid ""
-"This means the next execution of this chore is scheduled on the below "
-"selected day of each month"
-msgstr ""
-"Esto significa que la próxima ejecución de esta tarea del hogar está "
-"programada para el día de cada mes seleccionado a continuación"
-
 msgid ""
 "This means the next execution of this chore will not be assigned to anyone"
 msgstr ""
@@ -1553,8 +1556,7 @@ msgstr "Acumular mínimos de existencias de subproductos"
 
 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 ""
 "Si está activado, los mínimos de existencias de los subproductos se "
 "acumularán en este producto. Los subproductos nunca faltarán, solo este "
@@ -1585,39 +1587,13 @@ msgid "Period interval"
 msgstr "Intervalo del período"
 
 msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s days"
-msgstr ""
-"Esto significa que la próxima ejecución de esta tarea del hogar solo debe "
-"programarse cada %s días"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s weeks"
-msgstr ""
-"Esto significa que la próxima ejecución de esta tarea del hogar solo debe "
-"programarse cada %s semanas"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s months"
-msgstr ""
-"Esto significa que la próxima ejecución de esta tarea del hogar solo debe "
-"programarse cada %s meses"
-
-msgid ""
-"This means the next execution of this chore is scheduled 1 year after the "
-"last execution"
-msgstr ""
-"Esto significa que la próxima ejecución de esta tarea del hogar está "
-"programada 1 año después de la última ejecución"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s years"
-msgstr ""
-"Esto significa que la próxima ejecución de esta tarea del hogar solo debe "
-"programarse cada %s años"
+"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 "Trasladar"
@@ -1870,25 +1846,11 @@ msgstr "Código de barras para el producto"
 msgid "Edit Barcode"
 msgstr "Modificar código de barras"
 
-msgid "Not enough in stock (not included in costs), %s ingredient missing"
-msgstr ""
-"No hay existencias suficientes (no incluidas en el coste): faltan %s "
-"ingredientes"
-
 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 ""
-"Según los precios de la regla de consumo predeterminada, que es \"Abiertos "
-"primero, luego el próximo en llegar a su fecha límite y luego el que se "
-"adquirió primero\""
-
-msgid ""
-"Not enough in stock (not included in costs), %1$s missing, %2$s already on "
-"shopping list"
-msgstr ""
-"No hay existencias suficientes (no incluidas en el coste): faltan %1$s "
-"ingredientes, %2$s ya están en la lista de la compra"
 
 msgid "Quantity unit stock cannot be changed after first purchase"
 msgstr ""
@@ -2144,6 +2106,10 @@ msgid ""
 "today + this amount of days, but only if the resulting date is not after the"
 " original due date (a value of 0 disables this)"
 msgstr ""
+"Cuando este producto se marque como abierto, la fecha límite será "
+"reemplazada por la fecha de hoy más este número de días, pero solo si la "
+"fecha resultante no está después de la fecha límite original (un valor de 0 "
+"desactiva esto)"
 
 msgid "Default due days after opened"
 msgstr ""
@@ -2343,8 +2309,8 @@ msgstr "Productos a mantener"
 msgid "Product to remove"
 msgstr "Productos a eliminar"
 
-msgid "Error while merging products"
-msgstr "Error al combinar productos"
+msgid "Error while merging"
+msgstr "Error al combinar"
 
 msgid "After merging, this product will be kept"
 msgstr "Después de combinar, este producto se mantendrá"
@@ -2394,61 +2360,59 @@ 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 es una referencia única a este %s en tu interfaz de grocy - "
+"imprímalo en un una etiqueta y escanéelo como cualquier otro código de "
+"barras"
 
 # Abbreviation for "due date"
 msgid "DD"
-msgstr ""
+msgstr "FL"
 
 msgid "Print on label printer"
-msgstr ""
+msgstr "Imprimir en impresora de etiquetas"
+
+msgid "Default stock entry label"
+msgstr "Etiqueta de entrada de inventario por defecto"
 
 msgid "Stock entry label"
-msgstr ""
+msgstr "Etiqueta de entrada de inventario"
 
 msgid "No label"
-msgstr ""
+msgstr "Sin etiqueta"
 
 msgid "Single label"
-msgstr ""
+msgstr "Etiqueta única"
 
 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 ""
+msgstr "Etiqueta por unidad"
 
 msgid "Error while executing WebHook"
-msgstr ""
+msgstr "Error al ejecutar WebHook"
 
 # Example: Print *Product* grocycode on label printer
 msgid "Print %s grocycode on label printer"
-msgstr ""
+msgstr "Imprimir grocycode de %s en impresora de etiquetas"
 
 msgid "Open stock entry label in new window"
-msgstr ""
+msgstr "Abrir etiqueta de entrada de inventario en una ventana nueva"
 
 msgid "Thermal printer"
-msgstr ""
+msgstr "Impresora térmica"
 
 msgid "Printing"
-msgstr ""
+msgstr "Imprimiendo"
 
 msgid "Connecting to printer..."
-msgstr ""
+msgstr "Conectando con la impresora..."
 
 msgid "Unable to print"
-msgstr ""
+msgstr "No se pudo imprimir"
 
 msgid "Only done items"
-msgstr ""
+msgstr "Solo elementos completados"
 
 msgid "Show only in-stock products"
-msgstr ""
+msgstr "Mostrar solo productos con existencias"
 
 msgid "Product description"
 msgstr "Descripción del producto"
@@ -2458,7 +2422,7 @@ msgid "%1$s per %2$s"
 msgstr "%1$s por %2$s"
 
 msgid "Mark this item as undone"
-msgstr ""
+msgstr "Marcar este elemento como no hecho"
 
 msgid "Mandatory"
 msgstr "Obligatorio"
@@ -2468,12 +2432,13 @@ msgstr "Campo de usuario obligatorio"
 
 msgid "When enabled, then this field must be filled on the destination form"
 msgstr ""
+"Cuando esté activado, este campo debe ser rellenado en el formulario destino"
 
 msgid "In-stock products"
-msgstr ""
+msgstr "Productos con existencias"
 
 msgid "Timestamp"
-msgstr ""
+msgstr "Marca temporal"
 
 msgid "Should not be frozen"
 msgstr "No debe congelarse"
@@ -2482,12 +2447,14 @@ msgid ""
 "When enabled, on moving this product to a freezer location (so when freezing"
 " it), a warning will be shown"
 msgstr ""
+"Cuando esté activado, al mover este producto a una ubicación de congelador "
+"(o sea, al congelarlo), se mostrará una advertencia"
 
 msgid "This product shouldn't be frozen"
 msgstr "Este producto no debe congelarse"
 
 msgid "Copy all meal plan entries of %s"
-msgstr ""
+msgstr "Copiar todas las entradas del plan de comidas de %s"
 
 msgid "A date is required"
 msgstr "Se requiere una fecha"
@@ -2499,23 +2466,23 @@ msgid "Add recipe"
 msgstr "Agregar receta"
 
 msgid "Copy this day"
-msgstr ""
+msgstr "Copiar este día"
 
 msgid "Date range"
-msgstr ""
+msgstr "Intervalo de fechas"
 
 msgid "%s month"
 msgid_plural "%s months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s mes"
+msgstr[1] "%s meses"
 
 msgid "%s year"
 msgid_plural "%s years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s año"
+msgstr[1] "%s años"
 
 msgid "Display product"
-msgstr ""
+msgstr "Mostrar producto"
 
 msgid "Copy recipe"
 msgstr "Copiar receta"
@@ -2524,37 +2491,127 @@ msgid "Copy of %s"
 msgstr "Copia de %s"
 
 msgid "Add decimal separator automatically for price inputs"
-msgstr ""
+msgstr "Añadir separador de decimales automáticamente para entradas de precio"
 
 msgid ""
 "When enabled, you always have to enter the value including decimal places, "
 "the decimal separator will be automatically added based on the amount of "
 "allowed decimal places"
 msgstr ""
+"Cuando esté activado, siempre tiene que introducir el valor incluyendo "
+"posiciones decimales, el separador decimal se añadirá automáticamente según "
+"la cantidad de posiciones decimales permitidas."
 
 msgid "Stock entry"
-msgstr ""
+msgstr "Entrada de inventario"
 
 msgid "Configure sections"
 msgstr "Configurar secciones"
 
 msgid "Meal plan sections"
-msgstr ""
+msgstr "Secciones del plan de comidas"
 
 msgid "Create meal plan section"
-msgstr ""
+msgstr "Crear sección del plan de comidas"
 
 msgid "Sections will be ordered by that number on the meal plan"
 msgstr "Las secciones se ordenarán por su número en el plan de comida"
 
 msgid "Edit meal plan section"
-msgstr ""
+msgstr "Editar sección del plan de comidas"
 
 msgid "Are you sure to delete meal plan section \"%s\"?"
-msgstr ""
+msgstr "¿Está seguro de querer eliminar la sección del plan de comidas \"%s\"?"
 
 msgid "Section"
-msgstr ""
+msgstr "Sección"
 
 msgid "Are you sure to empty the shopping list?"
 msgstr "¿Estás seguro de querer borrar la lista de la compra?"
+
+msgid "This is the default which will be prefilled on purchase"
+msgstr "Esta es la opción por defecto que será prerellenada al comprar"
+
+msgid "Merge chores"
+msgstr "Combinar tareas del hogar"
+
+msgid "Chore to keep"
+msgstr "Tarea del hogar a mantener"
+
+msgid "After merging, this chore will be kept"
+msgstr "Después de combinar, esta tarea del hogar se mantendrá"
+
+msgid "Chore to remove"
+msgstr "Tarea del hogar a eliminar"
+
+msgid ""
+"After merging, all occurences of this chore will be replaced by the kept "
+"chore (means this chore will not exist anymore)"
+msgstr ""
+"Después de combinar, todas las ocurrencias de esta tarea del hogar serán "
+"reemplazadas por la tarea del hogar mantenida (esta tarea del hogar dejará "
+"de existir)"
+
+msgid "Due today"
+msgstr "Con fecha límite hoy"
+
+msgid "%s task is due to be done today"
+msgid_plural "%s tasks are due to be done today"
+msgstr[0] "%s tarea debe hacerse hoy"
+msgstr[1] "%s tareas deben hacerse hoy"
+
+msgid "%s chore is due to be done today"
+msgid_plural "%s chores are due to be done today"
+msgstr[0] "%s tarea del hogar debe hacerse hoy"
+msgstr[1] "%s tareas del hogar deben hacerse hoy"
+
+msgid "%s battery is due to be charged today"
+msgid_plural "%s batteries are due to be charged today"
+msgstr[0] "%s batería debe cargarse hoy"
+msgstr[1] "%s baterías deben cargarse hoy"
+
+msgid "Set to 0 to hide due soon filters/highlighting"
+msgstr "Poner 0 para ocultar los filtros/resaltado de fecha límite próxima"
+
+msgid "Save & close"
+msgstr ""
+
+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 ""
+
+msgid "A start date is required"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+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 ""

localization/fi/chore_period_types.po

@@ -1,7 +1,6 @@
 # 
 # Translators:
 # Termitebug <rogueshadow@keemail.me>, 2020
-# jarkko hämäläinen <zeik@iki.fi>, 2020
 # 
 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: 2019-05-01 17:42+0000\n"
-"Last-Translator: jarkko hämäläinen <zeik@iki.fi>, 2020\n"
+"Last-Translator: Termitebug <rogueshadow@keemail.me>, 2020\n"
 "Language-Team: Finnish (https://www.transifex.com/grocy/teams/93189/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,9 +20,6 @@ msgstr ""
 msgid "manually"
 msgstr "käsin"
 
-msgid "dynamic-regular"
-msgstr "toistuu säännöllisesti"
-
 msgid "daily"
 msgstr "päivittäin"
 
@@ -35,3 +31,9 @@ msgstr "kuukausittain"
 
 msgid "yearly"
 msgstr "vuosittain"
+
+msgid "hourly"
+msgstr ""
+
+msgid "adaptive"
+msgstr ""

localization/fi/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 "fi"
-
-msgid "timeago_nan"
-msgstr "NaN vuotta"
-
 msgid "moment_locale"
 msgstr "fi"
 

localization/fi/demo_data.po

@@ -394,3 +394,6 @@ msgstr ""
 
 msgid "Dinner"
 msgstr ""
+
+msgid "Catalan"
+msgstr ""

localization/fi/locales.po

@@ -121,3 +121,7 @@ msgstr "ta"
 # Finnish
 msgid "fi"
 msgstr "fi"
+
+# Catalan
+msgid "ca"
+msgstr ""

localization/fi/strings.po

@@ -365,13 +365,6 @@ msgstr "Tämä tarkoittaa, että %s lisätään varastoon"
 msgid "This means %s will be removed from stock"
 msgstr "Tämä tarkoittaa, että %s poistetaan varastosta"
 
-msgid ""
-"This means the next execution of this chore is scheduled %s days after the "
-"last execution"
-msgstr ""
-"Tämä tarkoittaa, että kotityö ajastetaan %späivää edellisen suorituksen "
-"jälkeen"
-
 msgid "Removed %1$s of %2$s from stock"
 msgstr "Poistettiin %1$s tuotetta %2$s varastosta "
 
@@ -927,9 +920,6 @@ msgstr "Annosta"
 msgid "Costs"
 msgstr "Kustannukset"
 
-msgid "Based on the prices of the last purchase per product"
-msgstr "Pohjautuu viimeisiin ostohintoihin per tuote"
-
 msgid "The ingredients listed here result in this amount of servings"
 msgstr "Nämä ainesosat tuottavat tämän määrän annoksia"
 
@@ -1239,9 +1229,6 @@ msgstr "Ei koskaan"
 msgid "Today"
 msgstr "Tänään"
 
-msgid "Consume %1$s of %2$s as spoiled"
-msgstr "Kuluta %1$s tuotteesta %2$s pilaantuneena"
-
 msgid "Not all ingredients of recipe \"%s\" are in stock, nothing removed"
 msgstr "Reseptin \"%s\"  kaikkia ainesosia ei ole varastossa, ei poistettu mitään"
 
@@ -1345,31 +1332,45 @@ msgid "Assignment type"
 msgstr "Toimeksiannon tapa"
 
 msgid ""
-"This means the next execution of this chore is scheduled 1 day after the "
+"This means the next execution of this chore is scheduled %s day after the "
 "last execution"
-msgstr ""
-"Tämä tarkoittaa, että tämän kotityön seuraava suoritus aikataulutetaan 1 "
-"päivän päähän edellisestä suorituksesta"
+msgid_plural ""
+"This means the next execution of this chore is scheduled %s days after the "
+"last execution"
+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 ""
-"Tämä tarkoittaa, että tämän kotityön seuraava suoritus aikataulutetaan 1 "
-"päivän päähän edellisestä suorituksesta, mutta vain alla määriteltyinä "
-"viikonpäivinä"
+"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 ""
 "Tämä tarkoittaa, että tämän kotityön seuraavaa suoritusta ei aikatauluteta"
 
-msgid ""
-"This means the next execution of this chore is scheduled on the below "
-"selected day of each month"
-msgstr ""
-"Tämä tarkoittaa, että tämän kotityön seuraava suoritus aikataulutetaan "
-"suoritettavaksi alla valittuna kuukauden päivänä"
-
 msgid ""
 "This means the next execution of this chore will not be assigned to anyone"
 msgstr "Tämä tarkoittaa, että tätä kotityötä ei anneta toimeksi kenellekään"
@@ -1521,12 +1522,8 @@ msgstr "Lisää alatuotteiden varaston minimimäärät"
 
 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 ""
-"Jos tämä valitaan, niin alatuotteiden minimivarastömäärät lisätään tähän "
-"tuotteeseen, jolloin alatuote ei koskaan ole \"lopussa\", vaan vain tämä "
-"tuote."
 
 msgid "Are you sure to remove this conversion?"
 msgstr "Haluatko varmasti poistaa tämän muunnoksen?"
@@ -1553,39 +1550,13 @@ msgid "Period interval"
 msgstr "Intervalli"
 
 msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s days"
-msgstr ""
-"Tämä tarkoittaa, että tämän kotityön seuraava suoritus tulisi aikatauluttaa "
-"vain joka %s. päivälle"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s weeks"
-msgstr ""
-"Tämä tarkoittaa, että tämän kotityön seuraava suoritus tulisi aikatauluttaa "
-"vain joka %s. viikolle"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s months"
-msgstr ""
-"Tämä tarkoittaa, että tämän kotityön seuraava suoritus tulisi aikatauluttaa "
-"vain joka %s. kuukaudelle"
-
-msgid ""
-"This means the next execution of this chore is scheduled 1 year after the "
-"last execution"
-msgstr ""
-"Tämä tarkoittaa, että tämän kotityön seuraava suoritus on aikataulutettu 1 "
-"vuoden päähän edellisestä suorituksesta"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s years"
-msgstr ""
-"Tämä tarkoittaa, että tämän kotityön seuraava suoritus tulisi aikatauluttaa "
-"vain joka %s. vuotena"
+"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 "Siirrä"
@@ -1835,23 +1806,11 @@ msgstr "Viivakoodi tuotteelle"
 msgid "Edit Barcode"
 msgstr "Muokkaa viivakoodia"
 
-msgid "Not enough in stock (not included in costs), %s ingredient missing"
-msgstr ""
-"Ei tarpeeksi varastossa (ei sisälly kustannuksiin), puuttuu %s ainesta"
-
 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 ""
-"Perustuen hintoihin oletuksena olevasta kulutussäännöstä, joka on \"Ensin "
-"avattu ensin, sitten ensin vanheneva ensin, sitten ensin lisätty ensin\""
-
-msgid ""
-"Not enough in stock (not included in costs), %1$s missing, %2$s already on "
-"shopping list"
-msgstr ""
-"Ei tarpeeksi varastossa (ei sisälly kustannuksiin), %1$s puuttuu, %2$s on jo"
-" ostoslistalla"
 
 msgid "Quantity unit stock cannot be changed after first purchase"
 msgstr "Varastoyksikköä ei voi muuttaa ensimmäisen oston jälkeen"
@@ -2292,8 +2251,8 @@ msgstr "Säilytettävä tuote"
 msgid "Product to remove"
 msgstr "Poistettava tuote"
 
-msgid "Error while merging products"
-msgstr "Virhe yhdistettäessä tuotteita"
+msgid "Error while merging"
+msgstr ""
 
 msgid "After merging, this product will be kept"
 msgstr "Yhdistämisen jälkeen tämä tuote säilytetään"
@@ -2351,6 +2310,9 @@ msgstr ""
 msgid "Print on label printer"
 msgstr "Tulosta tarratulostimella"
 
+msgid "Default stock entry label"
+msgstr ""
+
 msgid "Stock entry label"
 msgstr ""
 
@@ -2363,14 +2325,6 @@ 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 ""
 
@@ -2510,3 +2464,87 @@ msgstr "Osio"
 
 msgid "Are you sure to empty the shopping list?"
 msgstr ""
+
+msgid "This is the default which will be prefilled on purchase"
+msgstr ""
+
+msgid "Merge chores"
+msgstr ""
+
+msgid "Chore to keep"
+msgstr ""
+
+msgid "After merging, this chore will be kept"
+msgstr ""
+
+msgid "Chore to remove"
+msgstr ""
+
+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 ""
+
+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] ""
+msgstr[1] ""
+
+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 ""
+
+msgid "Save & close"
+msgstr ""
+
+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 ""
+
+msgid "A start date is required"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+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 ""

localization/fr/chore_assignment_types.po

@@ -1,7 +1,7 @@
 # 
 # Translators:
 # Mathieu Fortin <mathieugfortin@gmail.com>, 2019
-# Juan RODRIGUEZ <juansero29@gmail.com>, 2020
+# Pierre Penninckx <ibizapeanut@gmail.com>, 2021
 # 
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-09-17 10:45+0000\n"
-"Last-Translator: Juan RODRIGUEZ <juansero29@gmail.com>, 2020\n"
+"Last-Translator: Pierre Penninckx <ibizapeanut@gmail.com>, 2021\n"
 "Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +19,13 @@ msgstr ""
 "X-Domain: grocy/chore_assignment_types\n"
 
 msgid "no-assignment"
-msgstr "pas-assigné"
+msgstr "non assigné"
 
 msgid "who-least-did-first"
-msgstr "celui-qui-a-fait-le-moins-d'abord"
+msgstr "d'abord celui qui a fait le moins"
 
 msgid "random"
 msgstr "aléatoire"
 
 msgid "in-alphabetical-order"
-msgstr "ordre-alphabétique"
+msgstr "par ordre alphabétique"

localization/fr/chore_period_types.po

@@ -1,8 +1,6 @@
 # 
 # Translators:
-# Bernd Bestel <bernd@berrnd.de>, 2019
-# Alex Deneuvillers <alex.deneuvillers@gmail.com>, 2019
-# Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019
+# Pierre Penninckx <ibizapeanut@gmail.com>, 2021
 # 
 msgid ""
 msgstr ""
@@ -10,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: Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019\n"
+"Last-Translator: Pierre Penninckx <ibizapeanut@gmail.com>, 2021\n"
 "Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +18,22 @@ msgstr ""
 "X-Domain: grocy/chore_types\n"
 
 msgid "manually"
-msgstr "Manuelle"
-
-msgid "dynamic-regular"
-msgstr "Régulière-dynamique"
+msgstr "manuellement"
 
 msgid "daily"
-msgstr "Journalière"
+msgstr "journalier"
 
 msgid "weekly"
-msgstr "Hebdomadaire"
+msgstr "hebdomadaire"
 
 msgid "monthly"
-msgstr "Mensuelle"
+msgstr "mensuel"
 
 msgid "yearly"
-msgstr "Annuelle"
+msgstr "annuel"
+
+msgid "hourly"
+msgstr ""
+
+msgid "adaptive"
+msgstr ""

localization/fr/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 "fr"
-
-msgid "timeago_nan"
-msgstr "Il y a NaN années"
-
 msgid "moment_locale"
 msgstr "fr"
 

localization/fr/demo_data.po

@@ -9,6 +9,8 @@
 # patate douce <poubel125@gmail.com>, 2020
 # nerdinator <florian.dupret@gmail.com>, 2020
 # C P <anoxy78@gmail.com>, 2020
+# Barthelemy Drabczuk, 2021
+# Zkryvix <angelo.frangione@gmail.com>, 2021
 # 
 msgid ""
 msgstr ""
@@ -16,7 +18,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: C P <anoxy78@gmail.com>, 2020\n"
+"Last-Translator: Zkryvix <angelo.frangione@gmail.com>, 2021\n"
 "Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +28,7 @@ msgstr ""
 "X-Domain: grocy/demo_data\n"
 
 msgid "Cookies"
-msgstr "Cookies"
+msgstr "Biscuits"
 
 msgid "Chocolate"
 msgstr "Chocolat"
@@ -394,10 +396,13 @@ msgid "Finnish"
 msgstr "Finnois"
 
 msgid "Breakfast"
-msgstr ""
+msgstr "Petit-déjeuner"
 
 msgid "Lunch"
-msgstr ""
+msgstr "Déjeuner"
 
 msgid "Dinner"
+msgstr "Dîner"
+
+msgid "Catalan"
 msgstr ""

localization/fr/locales.po

@@ -122,3 +122,7 @@ msgstr "ta"
 # Finnish
 msgid "fi"
 msgstr "fi"
+
+# Catalan
+msgid "ca"
+msgstr ""

localization/fr/strings.po

@@ -30,10 +30,12 @@
 # voslin <web@frugier.net>, 2021
 # Julien Pidoux <julien@pidoux.me>, 2021
 # Zorvalt - <zorvalt@protonmail.ch>, 2021
-# Zkryvix <angelo.frangione@gmail.com>, 2021
 # patate douce <poubel125@gmail.com>, 2021
 # Cedric Octave <transifex@octvcdrc.fr>, 2021
 # Alexandre Mechineau <admin@alexsaphir.com>, 2021
+# Pierre Penninckx <ibizapeanut@gmail.com>, 2021
+# Zkryvix <angelo.frangione@gmail.com>, 2021
+# chpego <chpego@chpego.fr>, 2022
 # 
 msgid ""
 msgstr ""
@@ -41,7 +43,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: Alexandre Mechineau <admin@alexsaphir.com>, 2021\n"
+"Last-Translator: chpego <chpego@chpego.fr>, 2022\n"
 "Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,8 +62,8 @@ msgstr[1] "%s produits périmés"
 
 msgid "within the next day"
 msgid_plural "within the next %s days"
-msgstr[0] "d'ici demain"
-msgstr[1] "d'ici %s jours"
+msgstr[0] "dans les 24 heures"
+msgstr[1] "dans les %s jours"
 
 msgid "%s product is already expired"
 msgid_plural "%s products are already expired"
@@ -90,7 +92,7 @@ msgid "Amount"
 msgstr "Quantité"
 
 msgid "Logout"
-msgstr "Déconnexion"
+msgstr "Déconnecter"
 
 msgid "Chores overview"
 msgstr "Aperçu des corvées"
@@ -255,7 +257,7 @@ msgid "Create store"
 msgstr "Créer magasin"
 
 msgid "Create quantity unit"
-msgstr "Créer un format"
+msgstr "Créer une unitée"
 
 msgid "Period type"
 msgstr "Type de période"
@@ -368,7 +370,7 @@ msgid "Manage API keys"
 msgstr "Gérer les clefs API"
 
 msgid "REST API browser"
-msgstr ""
+msgstr "Navigateur d'API REST"
 
 msgid "API keys"
 msgstr "Clefs API"
@@ -394,13 +396,6 @@ msgstr "%s sera ajouté au stock"
 msgid "This means %s will be removed from stock"
 msgstr "%s sera supprimé du stock"
 
-msgid ""
-"This means the next execution of this chore is scheduled %s days after the "
-"last execution"
-msgstr ""
-"La prochaine exécution de cette corvée sera programmée %s jours après la "
-"dernière exécution"
-
 msgid "Removed %1$s of %2$s from stock"
 msgstr "%1$s enlevée du stock de%2$s "
 
@@ -961,9 +956,6 @@ msgstr "Parts / Portions"
 msgid "Costs"
 msgstr "Coûts"
 
-msgid "Based on the prices of the last purchase per product"
-msgstr "Basé sur les prix du dernier achat du produit"
-
 msgid "The ingredients listed here result in this amount of servings"
 msgstr "Les ingrédients mentionnés ici correspondent à ce nombre de portions"
 
@@ -1278,9 +1270,6 @@ msgstr "Jamais"
 msgid "Today"
 msgstr "Aujourd'hui"
 
-msgid "Consume %1$s of %2$s as spoiled"
-msgstr "Consommer %1$s de %2$s comme périmée"
-
 msgid "Not all ingredients of recipe \"%s\" are in stock, nothing removed"
 msgstr ""
 "Des ingrédients de la recette \"%s\" sont manquants,\n"
@@ -1385,30 +1374,44 @@ msgid "Assignment type"
 msgstr "Type de tâche"
 
 msgid ""
-"This means the next execution of this chore is scheduled 1 day after the "
+"This means the next execution of this chore is scheduled %s day after the "
 "last execution"
-msgstr ""
-"La prochaine exécution de cette corvée sera programmé 1 jour après la "
-"dernière exécution"
+msgid_plural ""
+"This means the next execution of this chore is scheduled %s days after the "
+"last execution"
+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 ""
-"Signifie que la prochaine exécution de cette corvée est programmé 1 jour "
-"après la dernière exécution, mais uniquement pour les jours sélectionnés ci-"
-"dessous"
+"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 "Cette corvée n'a pas d'exécution de programmée. "
 
-msgid ""
-"This means the next execution of this chore is scheduled on the below "
-"selected day of each month"
-msgstr ""
-"Signifie que la prochaine exécution de cette corvée sera programmé à la date"
-" sélectionnée ci-dessous chaque mois"
-
 msgid ""
 "This means the next execution of this chore will not be assigned to anyone"
 msgstr ""
@@ -1562,12 +1565,11 @@ msgstr "Accumuler le stock minimal des sous produits"
 
 msgid ""
 "If enabled, the min. stock amount of sub products will be accumulated into "
-"this product, means the sub product will never be \"missing\", only this "
-"product"
+"this product, means the sub product will never be missing, only this product"
 msgstr ""
-"Si activé, la somme du stock minimal des sous produits sera accumulé sur ce "
-"produit, signifiant que le sous produit ne sera jamais \"en manque\", "
-"seulement ce produit"
+"Si l'option est activée, le stock minimum des sous-produits sera accumulé "
+"dans ce produit, ce qui signifie que les sous-produits ne seront jamais "
+"manquants, seulement ce produit."
 
 msgid "Are you sure to remove this conversion?"
 msgstr "Êtes-vous sûr de vouloir supprimer cette conversion ?"
@@ -1594,39 +1596,13 @@ msgid "Period interval"
 msgstr "Intervalle de temps"
 
 msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s days"
-msgstr ""
-"La prochaine exécution de cette corvée ne doit être uniquement programmée "
-"que tous les %s jours"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s weeks"
-msgstr ""
-"La prochaine exécution de cette corvée ne doit être uniquement programmée "
-"que toutes les %s semaines"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s months"
-msgstr ""
-"La prochaine exécution de cette corvée ne doit être uniquement programmée "
-"que tous les %s mois"
-
-msgid ""
-"This means the next execution of this chore is scheduled 1 year after the "
-"last execution"
-msgstr ""
-"La prochaine exécution de cette corvée sera programmé 1 an après la dernière"
-" exécution"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s years"
-msgstr ""
-"Signifie que la prochaine exécution de cette corvée ne doit uniquement être "
-"programmé que tous les %s ans"
+"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 "Transfert"
@@ -1878,22 +1854,11 @@ msgstr "Code-Barre du Produit"
 msgid "Edit Barcode"
 msgstr "Modifier le Code-barre"
 
-msgid "Not enough in stock (not included in costs), %s ingredient missing"
-msgstr "Pas assez en stock, il manque %s ingrédients."
-
 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 ""
-"Basé sur le prix correspondant à la règle de consommation par défaut : "
-"\"Ouvert en premier, puis périme en premier, puis plus ancien ajouté\""
-
-msgid ""
-"Not enough in stock (not included in costs), %1$s missing, %2$s already on "
-"shopping list"
-msgstr ""
-"Pas assez en stock (non inclus dans les coûts), manque %1$s, %2$s déjà dans "
-"la liste de courses"
 
 msgid "Quantity unit stock cannot be changed after first purchase"
 msgstr ""
@@ -1956,7 +1921,7 @@ msgid "User settings"
 msgstr "Paramètres utilisateur"
 
 msgid "Default"
-msgstr "Défaut"
+msgstr "Par défaut"
 
 msgid "Stock journal summary"
 msgstr "Synthèse du stock"
@@ -1974,7 +1939,7 @@ msgid "Value"
 msgstr "Valeur"
 
 msgid "%s total value"
-msgstr "%svaleur totale"
+msgstr "%s valeur totale"
 
 msgid ""
 "Show purchased date on purchase and inventory page (otherwise the purchased "
@@ -2147,6 +2112,10 @@ msgid ""
 "today + this amount of days, but only if the resulting date is not after the"
 " original due date (a value of 0 disables this)"
 msgstr ""
+"Quand ce produit est marqué comme ouvert, la date d'échéance sera remplacée "
+"par la date d'aujourd'hui plus ce nombre de jour, mais seulement si la "
+"nouvelle date ne se trouve pas après la date d'échéance originale (une "
+"valeur de 0 désactive ce comportement)"
 
 msgid "Default due days after opened"
 msgstr "Date de péremption après ouverture par défaut"
@@ -2176,8 +2145,8 @@ msgstr "Prochaine date de péremption"
 
 msgid "%s product is due"
 msgid_plural "%s products are due"
-msgstr[0] "%sproduit est périmé"
-msgstr[1] "%sdes produits sont exprimés"
+msgstr[0] "%s produit est périmé"
+msgstr[1] "%s produits seront périmés"
 
 msgid "Due date"
 msgstr "Date de péremption"
@@ -2341,8 +2310,8 @@ msgstr "Garder ce produit"
 msgid "Product to remove"
 msgstr "Retirer ce produit"
 
-msgid "Error while merging products"
-msgstr "Erreur lors de la fusion des produits"
+msgid "Error while merging"
+msgstr "Erreur lors de la fusion"
 
 msgid "After merging, this product will be kept"
 msgstr "Après fusion, ce produit sera conservé"
@@ -2386,94 +2355,89 @@ msgstr "Télécharger"
 
 # Example: Download *Product* grocycode
 msgid "Download %s grocycode"
-msgstr ""
+msgstr "Télécharger les grocycode %s "
 
 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 est une référence unique à ce %s dans grocy. Imprimez-le sur une "
+"étiquette et scannez-le comme tout autre code barre"
 
 # Abbreviation for "due date"
 msgid "DD"
-msgstr ""
+msgstr "dp."
 
 msgid "Print on label printer"
-msgstr "Imprimer sur une imprimante d'étiquette"
+msgstr "Imprimer sur une étiquette"
+
+msgid "Default stock entry label"
+msgstr "Étiquette d'entrée en stock par défaut"
 
 msgid "Stock entry label"
-msgstr ""
+msgstr "Étiquette d'élément en stock"
 
 msgid "No label"
 msgstr "Pas d'étiquette"
 
 msgid "Single label"
-msgstr "Etiquette unique"
+msgstr "Étiquette unique"
 
 msgid "Label per unit"
-msgstr "Etiquette par unité"
-
-msgid "Allow label printing per unit"
-msgstr "Permettre l'impression d'étiquette par unité"
-
-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 ""
-"Permettre l'impression d'une étiquette par unité (après conversion). 1 achat"
-" qui ajoute 10 produits imprime 10 étiquettes"
+msgstr "Étiquette par unité"
 
 msgid "Error while executing WebHook"
-msgstr "Erreur lors de l'exécution de WebHook"
+msgstr "Erreur lors de l'exécution du WebHook"
 
 # Example: Print *Product* grocycode on label printer
 msgid "Print %s grocycode on label printer"
-msgstr ""
+msgstr "Imprimer %s grocycode sur l'étiquette"
 
 msgid "Open stock entry label in new window"
-msgstr ""
+msgstr "Ouvrir le label du stock dans une nouvelle fenêtre"
 
 msgid "Thermal printer"
-msgstr ""
+msgstr "Imprimante thermique"
 
 msgid "Printing"
-msgstr ""
+msgstr "Impression en cours"
 
 msgid "Connecting to printer..."
-msgstr ""
+msgstr "Connexion à l'imprimante..."
 
 msgid "Unable to print"
-msgstr ""
+msgstr "Impossible d'imprimer"
 
 msgid "Only done items"
-msgstr ""
+msgstr "Seulement les éléments faits"
 
 msgid "Show only in-stock products"
-msgstr ""
+msgstr "Ne montrer que les produits en stock"
 
 msgid "Product description"
 msgstr "Description du produit"
 
 # Example: *3.21 USD* per *Pack*
 msgid "%1$s per %2$s"
-msgstr ""
+msgstr "%1$s par %2$s"
 
 msgid "Mark this item as undone"
-msgstr ""
+msgstr "Marquer l'élément comme défait"
 
 msgid "Mandatory"
-msgstr ""
+msgstr "Requis"
 
 msgid "Mandatory Userfield"
-msgstr ""
+msgstr "Champ utilisateur requis"
 
 msgid "When enabled, then this field must be filled on the destination form"
-msgstr ""
+msgstr "Lorsque activé, ce champ est requis dans le formulaire de destination"
 
 msgid "In-stock products"
-msgstr ""
+msgstr "Produits en stock"
 
 msgid "Timestamp"
-msgstr ""
+msgstr "Horodatage"
 
 msgid "Should not be frozen"
 msgstr "Ne doit pas être congelé"
@@ -2482,79 +2446,170 @@ msgid ""
 "When enabled, on moving this product to a freezer location (so when freezing"
 " it), a warning will be shown"
 msgstr ""
+"Lorsque activé, une alerte sera émise lorsque ce produit sera placé dans le "
+"congélateur"
 
 msgid "This product shouldn't be frozen"
 msgstr "Ce produit ne doit pas être congelé"
 
 msgid "Copy all meal plan entries of %s"
-msgstr ""
+msgstr "Copier toutes les entrées du régime %s"
 
 msgid "A date is required"
-msgstr ""
+msgstr "Une date est requise"
 
 msgid "Day"
-msgstr ""
+msgstr "Jour"
 
 msgid "Add recipe"
 msgstr "Ajouter recette"
 
 msgid "Copy this day"
-msgstr ""
+msgstr "Copier ce jour"
 
 msgid "Date range"
-msgstr ""
+msgstr "Période"
 
 msgid "%s month"
 msgid_plural "%s months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s mois"
+msgstr[1] "%s mois"
 
 msgid "%s year"
 msgid_plural "%s years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s an"
+msgstr[1] "%s ans"
 
 msgid "Display product"
-msgstr ""
+msgstr "Afficher le produit"
 
 msgid "Copy recipe"
 msgstr "Copier la recette"
 
 msgid "Copy of %s"
-msgstr ""
+msgstr "Copie de %s"
 
 msgid "Add decimal separator automatically for price inputs"
-msgstr ""
+msgstr "Ajout automatique du séparateur de décimales pour les prix"
 
 msgid ""
 "When enabled, you always have to enter the value including decimal places, "
 "the decimal separator will be automatically added based on the amount of "
 "allowed decimal places"
 msgstr ""
+"Lorsque activé, vous devez toujours entrer les valeurs en incluant les "
+"décimales, le séparateur de décimal sera automatiquement ajouté après le "
+"nombre requis de décimales"
 
 msgid "Stock entry"
-msgstr ""
+msgstr "Entrée dans le stock"
 
 msgid "Configure sections"
-msgstr ""
+msgstr "Configurer les sections"
 
 msgid "Meal plan sections"
-msgstr ""
+msgstr "Sections du régime"
 
 msgid "Create meal plan section"
-msgstr ""
+msgstr "Créer un section de régime"
 
 msgid "Sections will be ordered by that number on the meal plan"
-msgstr ""
+msgstr "Les sections seront triées par ce numéro dans le régime"
 
 msgid "Edit meal plan section"
-msgstr ""
+msgstr "Modifier la section du régime"
 
 msgid "Are you sure to delete meal plan section \"%s\"?"
-msgstr ""
+msgstr "Êtes-vous sûr de supprimer la section \"%s\" du régime?"
 
 msgid "Section"
-msgstr ""
+msgstr "Section"
 
 msgid "Are you sure to empty the shopping list?"
 msgstr "Voulez-vous vraiment vider la liste de courses ?"
+
+msgid "This is the default which will be prefilled on purchase"
+msgstr "Ceci est la valeur par défaut, qui va être préremplie à l'achat"
+
+msgid "Merge chores"
+msgstr "Fusionner les corvées"
+
+msgid "Chore to keep"
+msgstr "Corvée à garder"
+
+msgid "After merging, this chore will be kept"
+msgstr "Après fusion, cette corvée va être gardée"
+
+msgid "Chore to remove"
+msgstr "Corvée à enlever"
+
+msgid ""
+"After merging, all occurences of this chore will be replaced by the kept "
+"chore (means this chore will not exist anymore)"
+msgstr ""
+"Après la fusion, toutes les occurrences de cette corvée seront remplacées "
+"par la corvée conservée (ce qui signifie que cette corvée n'existera plus)."
+
+msgid "Due today"
+msgstr ""
+
+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] ""
+msgstr[1] ""
+
+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 ""
+
+msgid "Save & close"
+msgstr ""
+
+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 ""
+
+msgid "A start date is required"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+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 ""

localization/fr/userfield_types.po

@@ -4,6 +4,7 @@
 # Antonin DESFONTAINES <antonin.desfontaines@outlook.com>, 2019
 # Jordan COUTON <couton.jordan@gmail.com>, 2020
 # C P <anoxy78@gmail.com>, 2020
+# chpego <chpego@chpego.fr>, 2022
 # 
 msgid ""
 msgstr ""
@@ -11,7 +12,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: C P <anoxy78@gmail.com>, 2020\n"
+"Last-Translator: chpego <chpego@chpego.fr>, 2022\n"
 "Language-Team: French (https://www.transifex.com/grocy/teams/93189/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,7 +67,7 @@ msgstr "lien-avec-titre"
 
 # File
 msgid "file"
-msgstr "Fichier"
+msgstr "fichier"
 
 # Image
 msgid "image"

localization/he_IL/chore_period_types.po

@@ -1,7 +1,7 @@
 # 
 # Translators:
 # Bernd Bestel <bernd@berrnd.de>, 2019
-# Yaron Shahrabani <sh.yaron@gmail.com>, 2019
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2022
 # 
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
 "PO-Revision-Date: 2019-05-01 17:42+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>, 2019\n"
+"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>, 2022\n"
 "Language-Team: Hebrew (Israel) (https://www.transifex.com/grocy/teams/93189/he_IL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,9 +21,6 @@ msgstr ""
 msgid "manually"
 msgstr "ידני"
 
-msgid "dynamic-regular"
-msgstr "דינמי-מרווח קבוע"
-
 msgid "daily"
 msgstr "יומי"
 
@@ -35,3 +32,9 @@ msgstr "חודשי"
 
 msgid "yearly"
 msgstr "שנתי"
+
+msgid "hourly"
+msgstr "שעתי"
+
+msgid "adaptive"
+msgstr ""

localization/he_IL/component_translations.po

@@ -18,12 +18,6 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 "X-Domain: grocy/component_translations\n"
 
-msgid "timeago_locale"
-msgstr "he"
-
-msgid "timeago_nan"
-msgstr "לפני NaN שנים"
-
 msgid "moment_locale"
 msgstr "he"
 

localization/he_IL/demo_data.po

@@ -409,3 +409,6 @@ msgstr "ארוחת צהריים"
 
 msgid "Dinner"
 msgstr "ארוחת ערב"
+
+msgid "Catalan"
+msgstr ""

localization/he_IL/locales.po

@@ -120,3 +120,7 @@ msgstr "טמילית"
 # Finnish
 msgid "fi"
 msgstr "פינית"
+
+# Catalan
+msgid "ca"
+msgstr ""

localization/he_IL/strings.po

@@ -1,6 +1,6 @@
 # 
 # Translators:
-# Yaron Shahrabani <sh.yaron@gmail.com>, 2021
+# Yaron Shahrabani <sh.yaron@gmail.com>, 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: Yaron Shahrabani <sh.yaron@gmail.com>, 2021\n"
+"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>, 2022\n"
 "Language-Team: Hebrew (Israel) (https://www.transifex.com/grocy/teams/93189/he_IL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -370,13 +370,6 @@ msgstr "המשמעות היא הוספה של %s למלאי"
 msgid "This means %s will be removed from stock"
 msgstr "המשמעות היא הסרה של %s מהמלאי"
 
-msgid ""
-"This means the next execution of this chore is scheduled %s days after the "
-"last execution"
-msgstr ""
-"משמעות הדבר היא שהוצאת המטלה הזאת לפועל תתוזמן %s ימים לאחר ההוצאה הקודמת "
-"לפועל"
-
 msgid "Removed %1$s of %2$s from stock"
 msgstr "%1$s מתוך %2$s הוסרו מהמלאי"
 
@@ -943,9 +936,6 @@ msgstr "מנות"
 msgid "Costs"
 msgstr "עלויות"
 
-msgid "Based on the prices of the last purchase per product"
-msgstr "בהתבסס על מחירי הרכישה האחרונה לפי מוצר"
-
 msgid "The ingredients listed here result in this amount of servings"
 msgstr "הרכיבים שמופיעים כאן מספקים כמות כזאת של מנות"
 
@@ -1256,9 +1246,6 @@ msgstr "אף פעם"
 msgid "Today"
 msgstr "היום"
 
-msgid "Consume %1$s of %2$s as spoiled"
-msgstr "%1$s מתוך %2$s נצרכו כמקולקלים"
-
 msgid "Not all ingredients of recipe \"%s\" are in stock, nothing removed"
 msgstr "לא כל הרכיבים של המתכון „%s” נמצאים במלאי, לא הוסר דבר"
 
@@ -1360,28 +1347,52 @@ msgid "Assignment type"
 msgstr "סוג הקצאה"
 
 msgid ""
-"This means the next execution of this chore is scheduled 1 day after the "
+"This means the next execution of this chore is scheduled %s day after the "
 "last execution"
-msgstr ""
-"משמעות הדבר היא שהוצאת המטלה הזאת לפועל תתוזמן יום לאחר ההוצאה הקודמת לפועל"
+msgid_plural ""
+"This means the next execution of this chore is scheduled %s days after the "
+"last execution"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 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 ""
-"משמעות הדבר היא שההוצאה הבאה לפועל של המטלה הזאת מתוזמנת ליום לאחר ההוצאה "
-"האחרונה לפועל אך רק בימי השבוע שנבחרו להלן"
+"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] ""
+msgstr[2] ""
+msgstr[3] ""
+
+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] ""
+msgstr[2] ""
+msgstr[3] ""
+
+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] ""
+msgstr[2] ""
+msgstr[3] ""
 
 msgid "This means the next execution of this chore is not scheduled"
 msgstr "משמעות הדבר היא שההוצאה לפועל של המטלה הזאת לא תתוזמן"
 
-msgid ""
-"This means the next execution of this chore is scheduled on the below "
-"selected day of each month"
-msgstr ""
-"משמעות הדבר היא שהוצאת המטלה הזאת לפועל תתוזמן בימים שנבחרו להלן במהלך כל "
-"חודש"
-
 msgid ""
 "This means the next execution of this chore will not be assigned to anyone"
 msgstr "משמעות הדבר היא שההוצאה לפועל של המטלה הזאת לא תוקצה לאף אחד"
@@ -1532,11 +1543,10 @@ msgstr "צבירת תת־מוצרים עם כמות מלאי מזערית"
 
 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 ""
 "אם האפשרות פעילה, הכמות המזערית במלאי של תת־מוצרים תצטבר לכדי המוצר הזה, "
-"משמעות הדבר היא שתת־המוצר הזה אף פעם לא „יחסר”, רק המוצר הזה"
+"משמעות הדבר היא שתת־המוצר הזה אף פעם לא יחסר, רק המוצר הזה"
 
 msgid "Are you sure to remove this conversion?"
 msgstr "להסיר את ההמרה הזאת?"
@@ -1563,30 +1573,15 @@ msgid "Period interval"
 msgstr "תקופת הפרש"
 
 msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s days"
-msgstr "משמעות הדבר היא שהוצאת המטלה הזאת לפועל תתוזמן כל %s ימים בלבד"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s weeks"
-msgstr "משמעות הדבר היא שהוצאת המטלה הזאת לפועל תתוזמן כל %s שבועות בלבד"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s months"
-msgstr "משמעות הדבר היא שהוצאת המטלה הזאת לפועל תתוזמן כל %s חודשים בלבד"
-
-msgid ""
-"This means the next execution of this chore is scheduled 1 year after the "
-"last execution"
-msgstr ""
-"משמעות הדבר היא שהוצאת המטלה הזאת לפועל תתוזמן שנה לאחר ההוצאה הקודמת לפועל"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s years"
-msgstr "משמעות הדבר היא שהוצאת המטלה הזאת לפועל תתוזמן כל %s שנים בלבד"
+"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] ""
+msgstr[2] ""
+msgstr[3] ""
 
 msgid "Transfer"
 msgstr "העברה"
@@ -1832,20 +1827,11 @@ msgstr "ברקוד למוצר"
 msgid "Edit Barcode"
 msgstr "עריכת ברקוד"
 
-msgid "Not enough in stock (not included in costs), %s ingredient missing"
-msgstr "אין מספיק במלאי (לא כלול בעלויות), רכיב אחד חסר "
-
 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 ""
-"על בסיס המחירים של כלל צריכת בררת המחדל שהוא „הראשון שנפתח, לאחר מכן הראשון "
-"שתוקפו יפוג, לאחר מכן הראשון הנכנס הוא הראשון שיוצא”"
-
-msgid ""
-"Not enough in stock (not included in costs), %1$s missing, %2$s already on "
-"shopping list"
-msgstr "אין מספיק במלאי (לא כלול בעלויות), %1$s חסרים, %2$s כבר ברשימת הקניות"
 
 msgid "Quantity unit stock cannot be changed after first purchase"
 msgstr "לא ניתן לשנות את היחידה במלאי לאחר הרכישה הראשונה"
@@ -2279,8 +2265,8 @@ msgstr "מוצר להשאיר"
 msgid "Product to remove"
 msgstr "מוצר להסיר"
 
-msgid "Error while merging products"
-msgstr "שגיאה במיזוג מוצרים"
+msgid "Error while merging"
+msgstr "שגיאה במיזוג"
 
 msgid "After merging, this product will be kept"
 msgstr "לאחר המיזוג, המוצר הזה יישאר"
@@ -2339,6 +2325,9 @@ msgstr "פג"
 msgid "Print on label printer"
 msgstr "הדפסה במדפסת מדבקות"
 
+msgid "Default stock entry label"
+msgstr "תווית רשומת מלאי כבררת מחדל"
+
 msgid "Stock entry label"
 msgstr "תווית רשומת מלאי"
 
@@ -2351,16 +2340,6 @@ 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 ""
-"לאפשר הדפסה של תווית אחת ליחידה ברכישה (לאחר המרה) - למשל: אריזה אחת שנרכשה "
-"ומוסיפה 10 יחידות למלאי תוביל להדפסת 10 תוויות"
-
 msgid "Error while executing WebHook"
 msgstr "שגיאה בהפעלת התליית רשת"
 
@@ -2503,3 +2482,97 @@ msgstr "סעיף"
 
 msgid "Are you sure to empty the shopping list?"
 msgstr "לרוקן את רשימת הקניות?"
+
+msgid "This is the default which will be prefilled on purchase"
+msgstr "זו בררת המחדש שתמולא מראש בעת הרכישה"
+
+msgid "Merge chores"
+msgstr "מיזוג מטלות"
+
+msgid "Chore to keep"
+msgstr "מטלה להשאיר"
+
+msgid "After merging, this chore will be kept"
+msgstr "לאחר המיזור, המטלה הזאת תישאר"
+
+msgid "Chore to remove"
+msgstr "מטלה להסרה"
+
+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 "מסתיים היום"
+
+msgid "%s task is due to be done today"
+msgid_plural "%s tasks are due to be done today"
+msgstr[0] "משימה אמורה להסתיים היום"
+msgstr[1] "%s משימות אמורות להסתיים היום"
+msgstr[2] "%s משימות אמורות להסתיים היום"
+msgstr[3] "%s משימות אמורות להסתיים היום"
+
+msgid "%s chore is due to be done today"
+msgid_plural "%s chores are due to be done today"
+msgstr[0] "מטלה אמורה להסתיים היום"
+msgstr[1] "%s מטלות אמורות להסתיים היום"
+msgstr[2] "%s מטלות אמורות להסתיים היום"
+msgstr[3] "%s מטלות אמורות להסתיים היום"
+
+msgid "%s battery is due to be charged today"
+msgid_plural "%s batteries are due to be charged today"
+msgstr[0] "סוללה אמורה להיטען היום"
+msgstr[1] "%s סוללות אמורות להיטען היום"
+msgstr[2] "%s סוללות אמורות להיטען היום"
+msgstr[3] "%s סוללות אמורות להיטען היום"
+
+msgid "Set to 0 to hide due soon filters/highlighting"
+msgstr "0 מסתיר את סינון/הדגשת סיום קרב"
+
+msgid "Save & close"
+msgstr "לשמור ולסגור"
+
+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 "זמן"
+
+msgid "A start date is required"
+msgstr "צריך תאריך התחלה"
+
+msgid "Start date"
+msgstr "תאריך התחלה"
+
+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 ""

localization/hu/chore_period_types.po

@@ -20,9 +20,6 @@ msgstr ""
 msgid "manually"
 msgstr "manuálisan"
 
-msgid "dynamic-regular"
-msgstr "változó gyakorisággal"
-
 msgid "daily"
 msgstr "naponta"
 
@@ -34,3 +31,9 @@ msgstr "havonta"
 
 msgid "yearly"
 msgstr "évente"
+
+msgid "hourly"
+msgstr ""
+
+msgid "adaptive"
+msgstr ""

localization/hu/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 "hu"
-
-msgid "timeago_nan"
-msgstr "NaN éve"
-
 msgid "moment_locale"
 msgstr "hu"
 

localization/hu/demo_data.po

@@ -5,6 +5,7 @@
 # Bernd Bestel <bernd@berrnd.de>, 2020
 # Gabor Pilsits <gabor.pilsits@gmail.com>, 2020
 # Gábor Szellő <gabor.szello@gmail.com>, 2020
+# Vad Laszlo, 2021
 # 
 msgid ""
 msgstr ""
@@ -12,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: Gábor Szellő <gabor.szello@gmail.com>, 2020\n"
+"Last-Translator: Vad Laszlo, 2021\n"
 "Language-Team: Hungarian (https://www.transifex.com/grocy/teams/93189/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -388,10 +389,13 @@ msgid "Finnish"
 msgstr "Finn"
 
 msgid "Breakfast"
-msgstr ""
+msgstr "Reggeli"
 
 msgid "Lunch"
-msgstr ""
+msgstr "Ebéd"
 
 msgid "Dinner"
+msgstr "Vacsora"
+
+msgid "Catalan"
 msgstr ""

localization/hu/locales.po

@@ -120,3 +120,7 @@ msgstr "Tamil"
 # Finnish
 msgid "fi"
 msgstr "Finn"
+
+# Catalan
+msgid "ca"
+msgstr ""

localization/hu/strings.po

@@ -6,8 +6,10 @@
 # Gabor Pilsits <gabor.pilsits@gmail.com>, 2020
 # lakosd <login@lakosd.net>, 2020
 # Gábor Szellő <gabor.szello@gmail.com>, 2020
-# rozgonik <rozgonik1@gmail.com>, 2021
 # Peter Gyetvai <gyetpet@mailbox.org>, 2021
+# Vad Laszlo, 2021
+# Tallyrald, 2021
+# rozgonik <rozgonik1@gmail.com>, 2021
 # 
 msgid ""
 msgstr ""
@@ -15,7 +17,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: Peter Gyetvai <gyetpet@mailbox.org>, 2021\n"
+"Last-Translator: rozgonik <rozgonik1@gmail.com>, 2021\n"
 "Language-Team: Hungarian (https://www.transifex.com/grocy/teams/93189/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -342,7 +344,7 @@ msgid "Manage API keys"
 msgstr "API kulcsok kezelése"
 
 msgid "REST API browser"
-msgstr ""
+msgstr "REST API böngésző"
 
 msgid "API keys"
 msgstr "API kulcsok"
@@ -368,15 +370,8 @@ msgstr "Ez azt jelenti, %s hozzá lesz adva a készlethez"
 msgid "This means %s will be removed from stock"
 msgstr "Ez azt jelenti, %s el lesz távolítva a készletből"
 
-msgid ""
-"This means the next execution of this chore is scheduled %s days after the "
-"last execution"
-msgstr ""
-"Azt jelenti, hogy a házimunka következő végrehajtása %s nappal az utolsó "
-"végrehajtás utánra lesz beütemezve"
-
 msgid "Removed %1$s of %2$s from stock"
-msgstr "%1$s a %2$s-ből/ból el lett távolítva a készletből"
+msgstr "%1$s %2$s készletről levéve"
 
 msgid "About grocy"
 msgstr "Grocyról"
@@ -388,16 +383,16 @@ msgid "Released on"
 msgstr "Megjelent ekkor"
 
 msgid "Added %1$s of %2$s to stock"
-msgstr "%1$s a %2$s-ből/ból hozzá lett adva a készlethez"
+msgstr "%1$s %2$s készletre véve"
 
 msgid "Stock amount of %1$s is now %2$s"
-msgstr "A készlet %1$s-ból/ből jelenleg %2$s"
+msgstr "A(z) %1$s készlet jelenleg %2$s"
 
 msgid "Tracked execution of chore %1$s on %2$s"
 msgstr "Az elvégzett %1$s házimunka a %2$s -on naplózásra került"
 
 msgid "Tracked charge cycle of battery %1$s on %2$s"
-msgstr ""
+msgstr "A(z) %1$s elem %2$s időpontban feltöltve"
 
 msgid "Consume all %s which are currently in stock"
 msgstr "Összes készleten lévő %s felhasználása"
@@ -573,11 +568,11 @@ msgstr "Házimunka napló"
 
 msgid "0 means suggestions for the next charge cycle are disabled"
 msgstr ""
-"0 azt jelenti, hogy javaslatok a következő töltésiciklusra nincsenek "
+"0 azt jelenti, hogy javaslatok a következő töltési ciklusra nincsenek "
 "bekapcsolva"
 
 msgid "Charge cycle interval (days)"
-msgstr "Töltésiciklus intervallum (napok)"
+msgstr "Töltési ciklus intervallum (napok)"
 
 msgid "Last price"
 msgstr "Legutóbbi ár"
@@ -876,7 +871,7 @@ msgid "Add this item to stock"
 msgstr "Tétel készletre vétele"
 
 msgid "Adding shopping list item %1$s of %2$s"
-msgstr ""
+msgstr "%1$s készletre véve a(z) %2$s bevásárlólistán lévőből"
 
 msgid "Use a specific stock item"
 msgstr "Megadott készletelem használata"
@@ -937,9 +932,6 @@ msgstr "Adagok"
 msgid "Costs"
 msgstr "Költség"
 
-msgid "Based on the prices of the last purchase per product"
-msgstr ""
-
 msgid "The ingredients listed here result in this amount of servings"
 msgstr "A megadott alapanyagokból ennyi adag jön ki"
 
@@ -985,7 +977,7 @@ msgstr ""
 " iCal formátumban"
 
 msgid "Allow partial units in stock"
-msgstr ""
+msgstr "Részegységek engedése a készletben"
 
 msgid "Enable tare weight handling"
 msgstr "Tára súly kezelés engedélyezése"
@@ -1095,7 +1087,7 @@ msgid "Show less"
 msgstr "Kevesebb mutatása"
 
 msgid "The amount must be between %1$s and %2$s"
-msgstr "A mennyiség %1$s és %2$s között kell lennie"
+msgstr "A mennyiség %1$s és %2$s között kell legyen"
 
 msgid "Day of month"
 msgstr "Hónap napja"
@@ -1158,16 +1150,16 @@ msgid "Edit userfield"
 msgstr "Egyéni mező szerkesztése"
 
 msgid "Plural forms"
-msgstr ""
+msgstr "Többesszámok"
 
 msgid "One plural form per line, the current language requires"
-msgstr ""
+msgstr "Soronként egy többesszám, amit a jelenlegi nyelv megkíván"
 
 msgid "Plural count"
-msgstr ""
+msgstr "Többesszám darabszáma"
 
 msgid "Plural rule"
-msgstr ""
+msgstr "Többesszám szabálya"
 
 msgid "in plural form"
 msgstr "többesszámban"
@@ -1218,7 +1210,7 @@ msgid "Meal plan"
 msgstr "Menü terv"
 
 msgid "Add recipe on %s"
-msgstr ""
+msgstr "Recept hozzáadása ehhez: \"%s\""
 
 msgid "%s serving"
 msgid_plural "%s servings"
@@ -1232,16 +1224,17 @@ msgid "Configuration"
 msgstr "Konfiguráció"
 
 msgid "A predefined list of values, one per line"
-msgstr ""
+msgstr "Soronként egy előre meghatározott érték"
 
 msgid "Products"
 msgstr "Termékek"
 
 msgid "Marked task %s as completed on %s"
-msgstr ""
+msgstr "%s feladat készre jelölve %s időpontban"
 
 msgid "Booking has subsequent dependent bookings, undo not possible"
 msgstr ""
+"A foglaláshoz függő foglalások tartoznak, a visszavonás nem lehetséges"
 
 msgid "per serving"
 msgstr "per adag"
@@ -1252,9 +1245,6 @@ msgstr "Soha"
 msgid "Today"
 msgstr "Ma"
 
-msgid "Consume %1$s of %2$s as spoiled"
-msgstr "%1$s %2$s felhasználása romlottként"
-
 msgid "Not all ingredients of recipe \"%s\" are in stock, nothing removed"
 msgstr ""
 "Nincs a \"%s\" recept összes hozzávalója készleten, így nem használtunk fel "
@@ -1342,13 +1332,13 @@ msgid "QU conversions"
 msgstr "Mennyiségi egység átváltások"
 
 msgid "Product overrides"
-msgstr ""
+msgstr "Termékhez kötött felülbírálás"
 
 msgid "Override for product"
-msgstr ""
+msgstr "Felülbírálás egy termékhez"
 
 msgid "This equals %1$s %2$s"
-msgstr ""
+msgstr "Egyenlő ezzel: %1$s %2$s"
 
 msgid "Edit QU conversion"
 msgstr "Mennyiségi egység átváltás szerkesztése"
@@ -1360,29 +1350,44 @@ msgid "Assignment type"
 msgstr "Hozzárendelés típusa"
 
 msgid ""
-"This means the next execution of this chore is scheduled 1 day after the "
+"This means the next execution of this chore is scheduled %s day after the "
 "last execution"
-msgstr ""
-"Azt jelenti, hogy a házimunka következő végrehajtása 1 nappal az utolsó "
-"végrehajtás utánra lesz ütemezve"
+msgid_plural ""
+"This means the next execution of this chore is scheduled %s days after the "
+"last execution"
+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 ""
-"Azt jelenti, hogy a házimunka következő végrehajtása 1 nappal az utolsó "
-"végrehajtás utánra lesz ütemezve, de csak a lent kiválasztott napokon"
+"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 "Azt jelenti, hogy a házimunka következő végrehajtása nincs ütemezve"
 
-msgid ""
-"This means the next execution of this chore is scheduled on the below "
-"selected day of each month"
-msgstr ""
-"Azt jelenti, hogy a házimunka következő végrehajtása minden hónap lentebb "
-"kiválasztott napjára lesz ütemezve"
-
 msgid ""
 "This means the next execution of this chore will not be assigned to anyone"
 msgstr ""
@@ -1412,7 +1417,7 @@ msgid "Assign to"
 msgstr "Hozzárendelve"
 
 msgid "This assignment type requires that at least one is assigned"
-msgstr ""
+msgstr "A hozzárendelés típusa legalább egy hozzárendelést igényel"
 
 msgid "%s chore is assigned to me"
 msgid_plural "%s chores are assigned to me"
@@ -1465,13 +1470,13 @@ msgid "Configure fields"
 msgstr "Mezők testreszabása"
 
 msgid "Quantity unit plural form testing"
-msgstr ""
+msgstr "Mennyiségi egység többesszám tesztelés"
 
 msgid "Result"
 msgstr "Eredmény"
 
 msgid "Test plural forms"
-msgstr ""
+msgstr "Teszt többesszám"
 
 msgid "Scan a barcode"
 msgstr "Vonalkód beolvasása"
@@ -1536,12 +1541,10 @@ msgstr "Al-termékek minimális készlet mennyiségének halmozása"
 
 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 ""
-"Bekapcsolva az al-termékek minimális készlet mennyisége ebbe a termékbe lesz"
-" halmozva, vagyis az al-termék sose fog hiányozni, a hiány ennél a terméknél"
-" követhető"
+"Összeszámolja az altermékeket, így ebből a szülőtermékből keletkezik hiány "
+"az egyes altermékek helyett"
 
 msgid "Are you sure to remove this conversion?"
 msgstr "Biztosan törölni szeretnéd ezt az átváltást?"
@@ -1568,39 +1571,13 @@ msgid "Period interval"
 msgstr "Ciklus intervallum"
 
 msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s days"
-msgstr ""
-"Azt jelenti, hogy a házimunka következő végrehajtása csak %s naponként "
-"ütemezhető"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s weeks"
-msgstr ""
-"Azt jelenti, hogy a házimunka következő végrehajtása csak %s hetenként "
-"ütemezhető"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s months"
-msgstr ""
-"Azt jelenti, hogy a házimunka következő végrehajtása csak %s havonta "
-"ütemezhető"
-
-msgid ""
-"This means the next execution of this chore is scheduled 1 year after the "
-"last execution"
-msgstr ""
-"Azt jelenti, hogy a házimunka következő végrehajtása 1 évvel az utolsó "
-"végrehajtás utánra lesz ütemezve"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s years"
-msgstr ""
-"Azt jelenti, hogy a házimunka következő végrehajtása csak %s évente "
-"ütemezhető"
+"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 "Áthelyezés"
@@ -1851,24 +1828,11 @@ msgstr "Termék vonalkód"
 msgid "Edit Barcode"
 msgstr "Vonalkód szerkesztése"
 
-msgid "Not enough in stock (not included in costs), %s ingredient missing"
-msgstr ""
-"Nincs elegendő készleten (nem jelenik meg a költségben), %s hozzávaló "
-"hiányzik"
-
 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 ""
-"Alapértelmezett felhasználási szabály szerinti árak alapján, ami \"nyitott "
-"tétel, majd legkorábban lejáró, majd a legkorábban leltározott/FIFO\""
-
-msgid ""
-"Not enough in stock (not included in costs), %1$s missing, %2$s already on "
-"shopping list"
-msgstr ""
-"Nincs elegendő készleten (nem jelenik meg a költségben), %1$s hiányzik, %2$s"
-" már szerepel a bevásárlólistán"
 
 msgid "Quantity unit stock cannot be changed after first purchase"
 msgstr "A készletegység az első vásárlás után nem állítható át"
@@ -1940,7 +1904,7 @@ msgid "Journal summary for this product"
 msgstr "Termékhez tartozó napló összefoglaló"
 
 msgid "Consume exact amount"
-msgstr ""
+msgstr "Pontos mennyiség felhasználás"
 
 msgid "Value"
 msgstr "Érték"
@@ -1989,7 +1953,7 @@ msgid "New stock amount"
 msgstr "Új készlet mennyiség"
 
 msgid "Price per stock unit"
-msgstr ""
+msgstr "Készletegységenkénti ár"
 
 msgid "Table options"
 msgstr "Táblázat beállításai"
@@ -2117,6 +2081,9 @@ msgid ""
 "today + this amount of days, but only if the resulting date is not after the"
 " original due date (a value of 0 disables this)"
 msgstr ""
+"Felbontáskor a lejárati időt kicseréli a mai nap + a megadott napok "
+"összegére, azonban csak akkor, ha a számolt dátum az eredetinél nincs később"
+" (a 0 érték kikapcsolja a funkciót)"
 
 msgid "Default due days after opened"
 msgstr "Alapértelmezett fogyaszthatósági idő felbontás után"
@@ -2308,8 +2275,8 @@ msgstr "Megtartandó termék"
 msgid "Product to remove"
 msgstr "Eltávolítandó termék"
 
-msgid "Error while merging products"
-msgstr "Hiba a termékek összevonása során"
+msgid "Error while merging"
+msgstr "Hiba az összevonás közben"
 
 msgid "After merging, this product will be kept"
 msgstr "Összevonás után, ez a termék megmarad"
@@ -2346,32 +2313,38 @@ msgid "A product or a note is required"
 msgstr "Termék vagy jegyzet szükséges"
 
 msgid "grocycode"
-msgstr ""
+msgstr "Grocy kód"
 
 msgid "Download"
-msgstr ""
+msgstr "Letöltés"
 
 # Example: Download *Product* grocycode
 msgid "Download %s grocycode"
-msgstr ""
+msgstr "%s Grocy kód letöltés"
 
 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 ""
+"A Grocy kód egy egyedi vonalkód, amely a(z) %s Grocy-n belüli egyértelmű "
+"azonosítására szolgál - nyomtasd ki egy címkére és használd úgy, mint "
+"bármely más vonalkódot"
 
 # Abbreviation for "due date"
 msgid "DD"
 msgstr ""
 
 msgid "Print on label printer"
+msgstr "Nyomtatás címkenyomtatóval"
+
+msgid "Default stock entry label"
 msgstr ""
 
 msgid "Stock entry label"
 msgstr ""
 
 msgid "No label"
-msgstr ""
+msgstr "Nincs címke"
 
 msgid "Single label"
 msgstr ""
@@ -2379,123 +2352,121 @@ 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 ""
+msgstr "Webhook hívási hiba"
 
 # Example: Print *Product* grocycode on label printer
 msgid "Print %s grocycode on label printer"
-msgstr ""
+msgstr "%s Grocy kód címkenyomtatóra küldés"
 
 msgid "Open stock entry label in new window"
-msgstr ""
+msgstr "Készletbejegyzés címkéjének megnyitása új lapon"
 
 msgid "Thermal printer"
-msgstr ""
+msgstr "Hőnyomtató"
 
 msgid "Printing"
-msgstr ""
+msgstr "Nyomtatás"
 
 msgid "Connecting to printer..."
-msgstr ""
+msgstr "Kapcsolódás a nyomtatóhoz..."
 
 msgid "Unable to print"
-msgstr ""
+msgstr "Nem lehet nyomtatni"
 
 msgid "Only done items"
-msgstr ""
+msgstr "Csak elvégzett tételek"
 
 msgid "Show only in-stock products"
-msgstr ""
+msgstr "Csak a készleten lévő termékek mutatása"
 
 msgid "Product description"
-msgstr ""
+msgstr "Termékleírás"
 
 # Example: *3.21 USD* per *Pack*
 msgid "%1$s per %2$s"
-msgstr ""
+msgstr "%1$s / %2$s"
 
 msgid "Mark this item as undone"
-msgstr ""
+msgstr "Tétel megjelölése elvégzetlenként"
 
 msgid "Mandatory"
-msgstr ""
+msgstr "Kötelező"
 
 msgid "Mandatory Userfield"
 msgstr ""
 
 msgid "When enabled, then this field must be filled on the destination form"
 msgstr ""
+"Kötelezővé teszi ennek a mezőnek a kitöltését a kiválasztott entitáson"
 
 msgid "In-stock products"
-msgstr ""
+msgstr "Készleten lévő"
 
 msgid "Timestamp"
-msgstr ""
+msgstr "Időbélyeg"
 
 msgid "Should not be frozen"
-msgstr ""
+msgstr "Nem szabad lefagyasztani"
 
 msgid ""
 "When enabled, on moving this product to a freezer location (so when freezing"
 " it), a warning will be shown"
 msgstr ""
+"Megjelenít egy figyelmeztetést, amikor ez a termék fagyasztóba "
+"(fagyasztóként megjelölt helyre) kerül"
 
 msgid "This product shouldn't be frozen"
-msgstr ""
+msgstr "Ezt a terméket nem szabad lefagyasztani"
 
 msgid "Copy all meal plan entries of %s"
 msgstr ""
 
 msgid "A date is required"
-msgstr ""
+msgstr "Dátum megadása kötelező"
 
 msgid "Day"
-msgstr ""
+msgstr "Nap"
 
 msgid "Add recipe"
-msgstr ""
+msgstr "Recept hozzáadása"
 
 msgid "Copy this day"
-msgstr ""
+msgstr "Nap másolása"
 
 msgid "Date range"
-msgstr ""
+msgstr "Időintervallum"
 
 msgid "%s month"
 msgid_plural "%s months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s hónap"
+msgstr[1] "%s hónap"
 
 msgid "%s year"
 msgid_plural "%s years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s év"
+msgstr[1] "%s év"
 
 msgid "Display product"
 msgstr ""
 
 msgid "Copy recipe"
-msgstr ""
+msgstr "Recept másolás"
 
 msgid "Copy of %s"
-msgstr ""
+msgstr "%s másolata"
 
 msgid "Add decimal separator automatically for price inputs"
-msgstr ""
+msgstr "Tizedesvessző automatikus hozzáadása az árbeviteli mezőkhöz"
 
 msgid ""
 "When enabled, you always have to enter the value including decimal places, "
 "the decimal separator will be automatically added based on the amount of "
 "allowed decimal places"
 msgstr ""
+"Bekapcsolva mindig tizedesjegyekkel együtt kell megadni az értéket, a "
+"tizedesvessző automatikusan hozzáadódik a beállított tizedeshelyek száma "
+"alapján"
 
 msgid "Stock entry"
 msgstr ""
@@ -2523,3 +2494,89 @@ msgstr ""
 
 msgid "Are you sure to empty the shopping list?"
 msgstr ""
+
+msgid "This is the default which will be prefilled on purchase"
+msgstr "Alapértelmezett érték, ami vásárláskor automatikusan kitöltődik"
+
+msgid "Merge chores"
+msgstr "Házimunkák összevonása"
+
+msgid "Chore to keep"
+msgstr "Megmaradó házimunka"
+
+msgid "After merging, this chore will be kept"
+msgstr "Összevonás után ez a házimunka megmarad"
+
+msgid "Chore to remove"
+msgstr "Törlendő házimunka"
+
+msgid ""
+"After merging, all occurences of this chore will be replaced by the kept "
+"chore (means this chore will not exist anymore)"
+msgstr ""
+"Összevonás után az összes törlendő házimunka bejegyzést kicseréli a "
+"megmaradó házimunkára (tehát ez a házimunka megszűnik létezni)"
+
+msgid "Due today"
+msgstr ""
+
+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] ""
+msgstr[1] ""
+
+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 ""
+
+msgid "Save & close"
+msgstr ""
+
+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 ""
+
+msgid "A start date is required"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+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 ""

localization/it/chore_period_types.po

@@ -1,6 +1,6 @@
 # 
 # Translators:
-# Antonino Ursino <ninus_@libero.it>, 2020
+# Antonino Ursino <ninus_@libero.it>, 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: Antonino Ursino <ninus_@libero.it>, 2020\n"
+"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2022\n"
 "Language-Team: Italian (https://www.transifex.com/grocy/teams/93189/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,9 +20,6 @@ msgstr ""
 msgid "manually"
 msgstr "manualmente"
 
-msgid "dynamic-regular"
-msgstr "dinamico-periodico"
-
 msgid "daily"
 msgstr "giornalmente"
 
@@ -34,3 +31,9 @@ msgstr "mensilmente"
 
 msgid "yearly"
 msgstr "annualmente"
+
+msgid "hourly"
+msgstr "ogni ora"
+
+msgid "adaptive"
+msgstr "adattabile"

localization/it/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 "it"
-
-msgid "timeago_nan"
-msgstr "NaN anni"
-
 msgid "moment_locale"
 msgstr "it"
 

localization/it/demo_data.po

@@ -2,7 +2,7 @@
 # Translators:
 # Sergio Zampello <seriotv88@gmail.com>, 2019
 # Bernd Bestel <bernd@berrnd.de>, 2019
-# Antonino Ursino <ninus_@libero.it>, 2021
+# Antonino Ursino <ninus_@libero.it>, 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: Antonino Ursino <ninus_@libero.it>, 2021\n"
+"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2022\n"
 "Language-Team: Italian (https://www.transifex.com/grocy/teams/93189/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -394,3 +394,6 @@ msgstr "Pranzo"
 
 msgid "Dinner"
 msgstr "Cena"
+
+msgid "Catalan"
+msgstr "Catalano"

localization/it/locales.po

@@ -1,6 +1,6 @@
 # 
 # Translators:
-# Antonino Ursino <ninus_@libero.it>, 2020
+# Antonino Ursino <ninus_@libero.it>, 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: Antonino Ursino <ninus_@libero.it>, 2020\n"
+"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2022\n"
 "Language-Team: Italian (https://www.transifex.com/grocy/teams/93189/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -120,3 +120,7 @@ msgstr "Tamil"
 # Finnish
 msgid "fi"
 msgstr "Finlandese"
+
+# Catalan
+msgid "ca"
+msgstr "ca"

localization/it/strings.po

@@ -4,8 +4,8 @@
 # Matteo Piotto <matteo.piotto@welaika.com>, 2019
 # 42d76af3cd20bc399c7e8a413695959f, 2019
 # Matteo Piccina <altermatte@gmail.com>, 2021
-# Antonino Ursino <ninus_@libero.it>, 2021
 # Sergio Zampello <seriotv88@gmail.com>, 2021
+# Antonino Ursino <ninus_@libero.it>, 2022
 # 
 msgid ""
 msgstr ""
@@ -13,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: Sergio Zampello <seriotv88@gmail.com>, 2021\n"
+"Last-Translator: Antonino Ursino <ninus_@libero.it>, 2022\n"
 "Language-Team: Italian (https://www.transifex.com/grocy/teams/93189/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -366,13 +366,6 @@ msgstr "Questo vuol dire che%s sarà aggiunto alla dispensa"
 msgid "This means %s will be removed from stock"
 msgstr "Questo vuol dire che %s sarà rimosso dalla dispensa"
 
-msgid ""
-"This means the next execution of this chore is scheduled %s days after the "
-"last execution"
-msgstr ""
-"Questo significa che la prossima esecuzione di questa faccenda è programmata"
-" %s giorni dopo l'ultima esecuzione"
-
 msgid "Removed %1$s of %2$s from stock"
 msgstr "Rimosso %1$s di %2$s dalla dispensa"
 
@@ -937,9 +930,6 @@ msgstr "Porzioni"
 msgid "Costs"
 msgstr "Costi"
 
-msgid "Based on the prices of the last purchase per product"
-msgstr "Basato sui prezzi dell'ultimo acquisto per prodotto"
-
 msgid "The ingredients listed here result in this amount of servings"
 msgstr "Gli ingredienti elencati qui portano a questa quantità di porzioni"
 
@@ -1258,9 +1248,6 @@ msgstr "Mai"
 msgid "Today"
 msgstr "Oggi"
 
-msgid "Consume %1$s of %2$s as spoiled"
-msgstr "Consumare %1$s di %2$s come avariato"
-
 msgid "Not all ingredients of recipe \"%s\" are in stock, nothing removed"
 msgstr ""
 "Non tutti gli ingredienti della ricetta \"%s\" sono disponibili in dispensa,"
@@ -1366,32 +1353,62 @@ msgid "Assignment type"
 msgstr "Tipo di incarico"
 
 msgid ""
-"This means the next execution of this chore is scheduled 1 day after the "
+"This means the next execution of this chore is scheduled %s day after the "
 "last execution"
-msgstr ""
-"Questo significa che la prossima esecuzione di questa faccenda è programmata"
-" 1 giorno dopo l'ultima esecuzione"
+msgid_plural ""
+"This means the next execution of this chore is scheduled %s days after the "
+"last execution"
+msgstr[0] ""
+"Ciò significa che la prossima esecuzione di questa faccenda è programmata %s"
+" giorno dopo l'ultima esecuzione"
+msgstr[1] ""
+"Ciò significa che la prossima esecuzione di questa faccenda è programmata %s"
+" giorni dopo l'ultima esecuzione"
 
 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 ""
-"Questo significa che la prossima esecuzione di questa faccenda è prevista 1 "
-"giorno dopo l'ultima esecuzione, ma solo per i giorni feriali selezionati di"
-" seguito"
+"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] ""
+"Ciò significa che la prossima esecuzione di questa faccenda è programmata %s"
+" ora dopo l'ultima esecuzione"
+msgstr[1] ""
+"Ciò significa che la prossima esecuzione di questa faccenda è programmata %s"
+" ore dopo l'ultima esecuzione"
+
+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] ""
+"Ciò significa che la prossima esecuzione di questa faccenda è programmata   "
+"ogni settimana nei giorni selezionati"
+msgstr[1] ""
+"Ciò significa che la prossima esecuzione di questa faccenda è programmata "
+"ogni %s settimane nei giorni selezionati"
+
+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] ""
+"Ciò significa che la prossima esecuzione di questa faccenda è programmata "
+"nel giorno selezionato ogni mese"
+msgstr[1] ""
+"Ciò significa che la prossima esecuzione di questa faccenda è programmata "
+"nel giorno selezionato ogni %s mesi"
 
 msgid "This means the next execution of this chore is not scheduled"
 msgstr ""
 "Questo significa che la prossima esecuzione di questa faccenda non è "
 "programmata"
 
-msgid ""
-"This means the next execution of this chore is scheduled on the below "
-"selected day of each month"
-msgstr ""
-"Questo significa che la prossima esecuzione di questa faccenda è programmata"
-" nel giorno selezionato di seguito di ogni mese"
-
 msgid ""
 "This means the next execution of this chore will not be assigned to anyone"
 msgstr ""
@@ -1549,11 +1566,10 @@ msgstr "Quantità in dispensa minima di sottoprodotti accumulati"
 
 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 ""
-"Se abilitato,. la quantità  min. di sottoprodotti sarà accumulata in questo "
-"prodotto, il che significa che il sottoprodotto non sarà mai \"mancante\", "
+"Se abilitato, la quantità min. di scorte di sottoprodotti verrà accumulata "
+"in questo prodotto, il che significa che il sottoprodotto non mancherà mai, "
 "solo questo prodotto"
 
 msgid "Are you sure to remove this conversion?"
@@ -1581,39 +1597,17 @@ msgid "Period interval"
 msgstr "Intervallo di tempo"
 
 msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s days"
-msgstr ""
-"Questo significa che la prossima esecuzione di questa faccenda dovrebbe "
-"essere programmata solo ogni %s giorni"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s weeks"
-msgstr ""
-"Questo significa che la prossima esecuzione di questa faccenda dovrebbe "
-"essere programmata solo ogni %s settimane"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s months"
-msgstr ""
-"Questo significa che la prossima esecuzione di questa faccenda dovrebbe "
-"essere programmata solo ogni %s mesi"
-
-msgid ""
-"This means the next execution of this chore is scheduled 1 year after the "
-"last execution"
-msgstr ""
-"Questo significa che la prossima esecuzione di questa faccenda è prevista 1 "
-"anno dopo l'ultima esecuzione"
-
-msgid ""
-"This means the next execution of this chore should only be scheduled every "
-"%s years"
-msgstr ""
-"Questo significa che la prossima esecuzione di questa faccenda dovrebbe "
-"essere programmata solo ogni %s anni"
+"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] ""
+"Ciò significa che la prossima esecuzione di questa faccenda è programmata "
+"ogni anno nello stesso giorno (in base alla data di inizio)"
+msgstr[1] ""
+"Ciò significa che la prossima esecuzione di questa faccenda è programmata "
+"ogni %s anni nello stesso giorno (in base alla data di inizio)"
 
 msgid "Transfer"
 msgstr "Trasferisci"
@@ -1866,24 +1860,14 @@ msgstr "Codice a Barre per il prodotto"
 msgid "Edit Barcode"
 msgstr "Modifica Codice a Barre"
 
-msgid "Not enough in stock (not included in costs), %s ingredient missing"
-msgstr ""
-"Insufficiente in dispensa (non incluso nei costi), ingrediente mancante %s"
-
 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 ""
-"In base ai prezzi della regola di consumo predefinita che è \"Prima quello "
-"aperto, poi prima quello in scadenza, poi il primo entrato è il primo "
-"uscito\""
-
-msgid ""
-"Not enough in stock (not included in costs), %1$s missing, %2$s already on "
-"shopping list"
-msgstr ""
-"Non abbastanza in dispensa (non incluso nei costi), %1$s mancante, %2$s già "
-"sulla lista della spesa"
+"Basato sui prezzi della regola di consumo predefinita (prima quello aperto, "
+"poi prima quello in scadenza, poi prima quello che è in uscita per primo) "
+"per gli ingredienti in dispensa e sull'ultimo prezzo per quelli mancanti"
 
 msgid "Quantity unit stock cannot be changed after first purchase"
 msgstr ""
@@ -2346,8 +2330,8 @@ msgstr "Prodotto da conservare"
 msgid "Product to remove"
 msgstr "Prodotto da rimuovere"
 
-msgid "Error while merging products"
-msgstr "Errore durante l'unione dei prodotti"
+msgid "Error while merging"
+msgstr "Errore durante l'unione"
 
 msgid "After merging, this product will be kept"
 msgstr "Dopo l'unione, questo prodotto verrà mantenuto"
@@ -2407,6 +2391,9 @@ msgstr "Scad."
 msgid "Print on label printer"
 msgstr "Stampa su stampante per etichette"
 
+msgid "Default stock entry label"
+msgstr "Etichetta predefinita di immissione in dispensa "
+
 msgid "Stock entry label"
 msgstr "Etichetta della voce di dispensa"
 
@@ -2419,17 +2406,6 @@ msgstr "Etichetta singola"
 msgid "Label per unit"
 msgstr "Etichetta per unità"
 
-msgid "Allow label printing per unit"
-msgstr "Consenti la stampa di etichette per unità"
-
-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 ""
-"Consenti la stampa di un'etichetta per unità al momento dell'acquisto (dopo "
-"la conversione) - ad es. 1 confezione acquistata aggiungendo 10 pezzi in "
-"dispensa stamperebbe 10 etichette"
-
 msgid "Error while executing WebHook"
 msgstr "Errore durante l'esecuzione di WebHook"
 
@@ -2573,3 +2549,98 @@ msgstr "Sezione"
 
 msgid "Are you sure to empty the shopping list?"
 msgstr "Sei sicuro di svuotare la lista della spesa?"
+
+msgid "This is the default which will be prefilled on purchase"
+msgstr ""
+"Questa è l'impostazione predefinita che verrà precompilata al momento "
+"dell'acquisto"
+
+msgid "Merge chores"
+msgstr "Unisci faccende"
+
+msgid "Chore to keep"
+msgstr "Faccende da mantenere"
+
+msgid "After merging, this chore will be kept"
+msgstr "Dopo l'unione, questa faccenda sarà mantenuta"
+
+msgid "Chore to remove"
+msgstr "Faccenda da rimuovere"
+
+msgid ""
+"After merging, all occurences of this chore will be replaced by the kept "
+"chore (means this chore will not exist anymore)"
+msgstr ""
+"Dopo l'unione, tutte le occorrenze di questa faccenda saranno sostituite "
+"dalla faccenda mantenuta (significa che questa faccenda non esisterà più)"
+
+msgid "Due today"
+msgstr "Da fare oggi"
+
+msgid "%s task is due to be done today"
+msgid_plural "%s tasks are due to be done today"
+msgstr[0] "%s attività che dovrebbe essere svolta oggi"
+msgstr[1] "%s attività che dovrebbero essere svolte oggi"
+
+msgid "%s chore is due to be done today"
+msgid_plural "%s chores are due to be done today"
+msgstr[0] "%s faccenda che dovrebbe essere fatta oggi"
+msgstr[1] "%s faccende dovrebbero essere fatte oggi"
+
+msgid "%s battery is due to be charged today"
+msgid_plural "%s batteries are due to be charged today"
+msgstr[0] "%s batteria che dovrebbe essere caricata oggi"
+msgstr[1] "%s batterie che dovrebbero essere caricate oggi"
+
+msgid "Set to 0 to hide due soon filters/highlighting"
+msgstr "Impostare su 0 per nascondere filtri/evidenziazioni a breve"
+
+msgid "Save & close"
+msgstr "Salva e chiudi"
+
+msgid "Save & add another task"
+msgstr "Salva e aggiungi un'altra attività"
+
+msgid "Treat opened as out of stock"
+msgstr "Considera aperto come esaurito"
+
+msgid ""
+"When enabled, opened items will be counted as missing for calculating if "
+"this product is below its minimum stock amount"
+msgstr ""
+"Se abilitato, gli articoli aperti saranno conteggiati come mancanti per "
+"calcolare se questo prodotto è inferiore alla sua quantità minima in "
+"dispensa "
+
+msgid "Skipped"
+msgstr "Saltato"
+
+msgid "Skip next chore schedule"
+msgstr "Salta la prossima faccenda programmata"
+
+msgid "Time"
+msgstr "Volta"
+
+msgid "A start date is required"
+msgstr "È richiesta una data di inizio"
+
+msgid "Start date"
+msgstr "Data d'inizio"
+
+msgid "The start date cannot be changed when the chore was once tracked"
+msgstr ""
+"La data di inizio non può essere modificata quando la faccenda è stata "
+"tracciata una volta"
+
+msgid "Show the recipe list and the recipe side by side"
+msgstr "Mostra l'elenco delle ricette e la ricetta fianco a fianco"
+
+msgid ""
+"This means the next execution of this chore is scheduled dynamically based "
+"on the past average execution frequency"
+msgstr ""
+"Ciò significa che l'esecuzione successiva di questa faccenda è pianificata "
+"dinamicamente in base alla frequenza di esecuzione media passata"
+
+msgid "Average execution frequency"
+msgstr "Frequenza media di esecuzione"