Prepared next release

* bugfix variable name

* Typo: curent->current

.devtools/transifex_download.bat

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

.devtools/update_dependencies.bat

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

.gitattributes

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

.tx/config

@@ -1,37 +1,44 @@
 [main]
 host = https://www.transifex.com
 
-[grocy.stringsphp]
-file_filter = localization/<lang>/strings.php
-minimum_perc = 0
-source_file = localization/en/strings.php
+[grocy.chore_period_types]
+file_filter = localization/<lang>/chore_period_types.po
+source_file = localization/chore_period_types.pot
 source_lang = en
-type = PHP_ARRAY
+type = PO
 
-[grocy.stock_transaction_typesphp]
-file_filter = localization/<lang>/stock_transaction_types.php
-minimum_perc = 0
-source_file = localization/en/stock_transaction_types.php
+[grocy.chore_assignment_types]
+file_filter = localization/<lang>/chore_assignment_types.po
+source_file = localization/chore_assignment_types.pot
 source_lang = en
-type = PHP_ARRAY
+type = PO
 
-[grocy.chore_typesphp]
-file_filter = localization/<lang>/chore_types.php
-minimum_perc = 0
-source_file = localization/en/chore_types.php
+[grocy.component_translations]
+file_filter = localization/<lang>/component_translations.po
+source_file = localization/component_translations.pot
 source_lang = en
-type = PHP_ARRAY
+type = PO
 
-[grocy.component_translationsphp]
-file_filter = localization/<lang>/component_translations.php
-minimum_perc = 0
-source_file = localization/en/component_translations.php
+[grocy.demo_data]
+file_filter = localization/<lang>/demo_data.po
+source_file = localization/demo_data.pot
 source_lang = en
-type = PHP_ARRAY
+type = PO
 
-[grocy.demo_dataphp]
-file_filter = localization/<lang>/demo_data.php
-minimum_perc = 0
-source_file = localization/en/demo_data.php
+[grocy.stock_transaction_types]
+file_filter = localization/<lang>/stock_transaction_types.po
+source_file = localization/stock_transaction_types.pot
 source_lang = en
-type = PHP_ARRAY
+type = PO
+
+[grocy.strings]
+file_filter = localization/<lang>/strings.po
+source_file = localization/strings.pot
+source_lang = en
+type = PO
+
+[grocy.userfield_types]
+file_filter = localization/<lang>/userfield_types.po
+source_file = localization/userfield_types.pot
+source_lang = en
+type = PO

README.md

@@ -5,17 +5,21 @@ ERP beyond your fridge
 - Public demo of the latest stable version → [https://demo.grocy.info](https://demo.grocy.info)
 - Public demo of the latest pre-release version (current master branch) → [https://demo-prerelease.grocy.info](https://demo-prerelease.grocy.info)
 
+## Getting in touch
+There is the [r/grocy subreddit](https://www.reddit.com/r/grocy) to connect with other grocy users. 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 an issue in the [issue tracker](https://github.com/grocy/grocy/issues) here.
+
+## 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!
 
 ## How to install
-> **NEW**
->
-> There is now grocy-desktop if you want to run grocy without a webserver just like a normal (windows) desktop application.
+> Checkout grocy-desktop, if you want to run grocy without a webserver just like a normal (windows) desktop application.
 >
 > See https://github.com/grocy/grocy-desktop or directly download the [latest release](https://releases.grocy.info/latest-desktop) - the installation is nothing more than just clicking 2 times "next"...
 
-Just unpack the [latest release](https://releases.grocy.info/latest) on your PHP (SQLite (3.8.3 or higher) extension required, currently only tested with PHP 7.2) enabled webserver (webservers root should point to the `public` directory), copy `config-dist.php` to `data/config.php`, edit it to your needs, ensure that the `data` directory is writable and you're ready to go, (to make writable `chown -R www-data:www-data data/`). Default login is user `admin` with password `admin`, please change the password immediately (see user menu).
+Just unpack the [latest release](https://releases.grocy.info/latest) on your PHP (SQLite (3.8.3 or higher) extension required, currently only tested with PHP 7.3) enabled webserver (webservers root should point to the `public` directory), copy `config-dist.php` to `data/config.php`, edit it to your needs, ensure that the `data` directory is writable and you're ready to go, (to make it writable, maybe use `chown -R www-data:www-data data/`). Default login is user `admin` with password `admin`, please change the password immediately (see user menu).
 
 Alternatively clone this repository and install Composer and Yarn dependencies manually.
 
@@ -23,33 +27,38 @@ If you use nginx as your webserver, please include `try_files $uri /index.php;`
 
 If, however, your webserver does not support URL rewriting, set `DISABLE_URL_REWRITING` in `data/config.php` (`Setting('DISABLE_URL_REWRITING', true);`).
 
+See the website for further installation guides and troubleshooting help: https://grocy.info/links
+
 ## How to run using Docker
 
-See [grocy/grocy-docker](https://github.com/grocy/grocy-docker) for instructions.
+See [grocy/grocy-docker](https://github.com/grocy/grocy-docker) or [linuxserver/docker-grocy](https://github.com/linuxserver/docker-grocy) for instructions.
 
 ## How to update
-Just overwrite everything with the latest release while keeping the `data` directory, check `config-dist.php` for new configuration options and add them to your `data/config.php` (the default from values `config-dist.php` will be used for not in `data/config.php` defined settings). Just to be sure, please empty `data/viewcache`.
+Just overwrite everything with the latest release while keeping the `data` directory, check `config-dist.php` for new configuration options and add them to your `data/config.php` where appropriate (the default values from `config-dist.php` will be used for not in `data/config.php` defined settings). Just to be sure, please empty `data/viewcache`.
 
-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).
+If you run grocy on Linux, there is also `update.sh` (remember to make the script executable (`chmod +x update.sh`) and ensure that you have `unzip` installed) which does exactly this and additionally creates a backup (`.tgz` archive) of the current installation in `data/backups` (backups older than 60 days will be deleted during the update).
 
 ## Localization
 grocy is fully localizable - the default language is English (integrated into code), a German localization is always maintained by me.
 You can easily help translating grocy at https://www.transifex.com/grocy/grocy, if your language is incomplete or not available yet.
 (Language can be changed in `data/config.php`, e. g. `Setting('CULTURE', 'it');`)
 
-### Maintaining your own localization
-As the German translation will always be the most complete one, for maintaining your localization it would be easiest when you compare your localization with the German one with a diff tool of your choice.
+The [pre-release demo](https://demo-prerelease.grocy.info) is available for any translation which is at least 80 % complete and will pull the translations from Transifex 10 minutes past every hour, so you can have a kind of instant preview of your contributed translations. Thank you!
+
+Also any translation which reached a completion level of 80 % will be included in releases.
 
 ## Things worth to know
 
 ### REST API & data model documentation
-See the integrated Swagger UI instance on [/api](https://demo-en.grocy.info/api).
+See the integrated Swagger UI instance on [/api](https://demo.grocy.info/api).
 
-### Barcode readers
-Some fields also allow to select a value by scanning a barcode. It works best when your barcode reader prefixes every barcode with a letter which is normally not part of a item name (I use a `$`) and sends a `TAB` after a scan.
+### 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 [QuaggaJS](https://github.com/serratus/quaggaJS), totally offline / client-side camera stream processing, please note due to browser security restrictions, this only works when serving grocy via a secure connection (`https://`)). Quick video demo: https://www.youtube.com/watch?v=Y5YH6IJFnfc
 
 ### Input shorthands for date fields
-For (productivity) reasons all date (and time) input fields use the ISO-8601 format regardless of localization.
+For (productivity) reasons all date (and time) input (and display) fields use the ISO-8601 format regardless of localization.
 The following shorthands are available:
 - `MMDD` gets expanded to the given day on the current year, if > today, or to the given day next year, if < today, in proper notation
   - Example: `0517` will be converted to `2018-05-17`
@@ -58,8 +67,10 @@ The following shorthands are available:
 - `YYYYMMe` or `YYYYMM+` gets expanded to the end of the given month in the given year in proper notation
   - Example: `201807e` will be converted to `2018-07-31`
 - `x` gets expanded to `2999-12-31` (which I use for products which never expire)
-- Down/up arrow keys will increase/decrease the date by one day
+- Down/up arrow keys will increase/decrease the date by 1 day
 - Right/left arrow keys will increase/decrease the date by 1 week
+- Shift + down/up arrow keys will increase/decrease the date by 1 month
+- Shift + right/left arrow keys will increase/decrease the date by 1 year
 
 ### Keyboard shorthands for buttons
 Wherever a button contains a bold highlighted letter, this is a shortcut key.
@@ -81,13 +92,18 @@ If you don't use certain feature sets of grocy (for example if you don't need "C
 - When the file `data/custom_css.html` exists, the contents of the file will be added just before `</head>` (end of head) on every page
 
 ### Demo mode
-When the file `data/demo.txt` exists, the application will work in a demo mode which means authentication is disabled and some demo data will be generated during the database schema migration.
+When the `MODE` setting is set to `dev`, `demo` or `prerelease`, the application will work in a demo mode which means authentication is disabled and some demo data will be generated during the database schema migration.
 
 ### Embedded mode
 When the file `embedded.txt` exists, it must contain a valid and writable path which will be used as the data directory instead of `data` and authentication will be disabled (used in [grocy-desktop](https://github.com/grocy/grocy-desktop)).
 
 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
+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.
+
 ## Screenshots
 #### Dashboard
 ![Dashboard](https://github.com/grocy/grocy/raw/master/publication_assets/dashboard.png "Dashboard")

app.php

@@ -19,26 +19,27 @@ else
 	define('GROCY_DATAPATH', __DIR__ . '/data');
 }
 
-// Definitions for demo mode
-if (file_exists(GROCY_DATAPATH . '/demo.txt'))
-{
-	define('GROCY_IS_DEMO_INSTALL', true);
-	if (!defined('GROCY_USER_ID'))
-	{
-		define('GROCY_USER_ID', 1);
-	}
-}
-else
-{
-	define('GROCY_IS_DEMO_INSTALL', false);
-}
-
 // Load composer dependencies
 require_once __DIR__ . '/vendor/autoload.php';
 
 // Load config files
 require_once GROCY_DATAPATH . '/config.php';
-require_once __DIR__ . '/config-dist.php'; //For not in own config defined values we use the default ones
+require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
+
+// Definitions for dev/demo/prerelease mode
+if (GROCY_MODE === 'dev' || GROCY_MODE === 'demo' || GROCY_MODE === 'prerelease')
+{
+	define('GROCY_USER_ID', 1);
+}
+
+// Definitions for disabled authentication mode
+if (GROCY_DISABLE_AUTH === true)
+{
+	if (!defined('GROCY_USER_ID'))
+	{
+		define('GROCY_USER_ID', 1);
+	}
+}
 
 // Setup base application
 $appContainer = new \Slim\Container([

changelog/18_1.9.0_2018-04-21.md

@@ -1 +1 @@
-- Documented the REST API and data model, see the integrated instance of Swagger UI at [/api](https://demo-en.grocy.info/api)
+- Documented the REST API and data model, see the integrated instance of Swagger UI at [/api](https://demo.grocy.info/api)

changelog/25_1.13.0_2018-07-12.md

@@ -1,3 +1,3 @@
 - Upgraded Bootstrap and some other dependencies (grocy now looks even better!)
 - Added Italian translation (thanks @davidoskky)
-  - => Demo for this language available at: https://demo-it.grocy.info
+  - => Demo for this language available at: https://it.demo.grocy.info

changelog/26_1.13.1_2018-07-12.md

@@ -2,4 +2,4 @@ This was released shortly after the last release to fix a small regression bug,
 
 - Upgraded Bootstrap and some other dependencies (grocy now looks even better!)
 - Added Italian translation (thanks @davidoskky)
-  - => Demo for this language available at: https://demo-it.grocy.info
+  - => Demo for this language available at: https://it.demo.grocy.info

changelog/27_1.14.0_2018-07-15.md

@@ -1,8 +1,8 @@
 - New feature: **Recipes**
   - Organize a list of products, amounts and a description into recipes and see at a glance if everything needed is in stock or put the missing things with one click on the shopping list
-  - Try it live on the demo page: => https://demo-en.grocy.info/recipes
+  - Try it live on the demo page: => https://demo.grocy.info/recipes
 - Added norwegian translation (thanks @BlizzWave)
-  - Demo available at: => https://demo-no.grocy.info
+  - Demo available at: => https://no.demo.grocy.info
 - A lot of small UI improvements
   - Columns in tables can now be reordered
   - Show a calendar on the shopping list page (useful, at least for me)

changelog/39_1.23.0_2018-11-24.md

@@ -9,7 +9,7 @@
 - New feature: Calendar
   - Shows all upcoming product expirations, due chores, due tasks and due battery charge cycles
 - New translation: French (thanks all the translators)
-  - As for all languages, a demo is available at: https://demo-fr.grocy.info
+  - As for all languages, a demo is available at: https://fr.demo.grocy.info
 - Small other improvements
   - Allow fraction numbers for recipe ingredients when not checked against stock and add an option to not check stock for a recipe position
   - The current time can now be shown in the header (see the settings menu next to the user icon)

changelog/43_2.0.0_2019-03-06.md

@@ -1,4 +1,4 @@
-- Breaking change: The API has been completely reworked, please review [the documentation](https://demo-en.grocy.info/api) before updating when you are using the API
+- Breaking change: The API has been completely reworked, please review [the documentation](https://demo.grocy.info/api) before updating when you are using the API
 - New feature: Tare weight handling
   - An option per product
   - Imagine this: You have flour in jars, the jar weighs 500 grams, currently there are 1000 grams in stock, the new weight including the jar is 1100 grams - grocy can now calculate the used amount on consume/purchase/inventory automatically, you only have to enter the weighed amount including the jar (demo product to showcase this "Flour")
@@ -9,13 +9,13 @@
   - A new option per recipe to not check against the amount already on the shopping list when putting all missing ingredients on it (by default, only the amount not already on the shopping list is added, when this is enabled, always the whole missing amount will be put on the shopping list)
   - On consume, there can now be tracked for which recipe it was, this is also tracked automatically when using the "Consume all ingredients needed by this recipe" button (for future statistical purposes)
   - Recipes can now have pictures
-  - New "gallery view" for recipes (demo available at https://demo-en.grocy.info/recipes?tab=gallery)
+  - New "gallery view" for recipes (demo available at https://demo.grocy.info/recipes?tab=gallery)
 - Stock improvements
   - It is now optionally possible to have partial units in stock (option per product)
   - On purchase, a different location can now be assigned (imagine you have two freezers, by default you store your pizza there, but sometimes there)
 - New translations: (thanks all the translators)
-  - Spanish (demo available at https://demo-es.grocy.info)
-  - Turkish (demo available at https://demo-tr.grocy.info)
+  - Spanish (demo available at https://es.demo.grocy.info)
+  - Turkish (demo available at https://tr.demo.grocy.info)
 - Other improvements
   - The calendar can now be shared/integrated in iCal format (button in the header on the calendar page)
   - Added feature flags to hide/disable certain parts of grocy when you don't use them (for example hide "Chores" and all related UI elements, when you don't use it, see `config-dist.php`)

changelog/44_2.1.0_2019-03-09.md

@@ -7,4 +7,4 @@
   - The changelog is now included as markdown files (in `/changelog` directory, one file per release with a filename in format `<ReleaseNumber>_<Version>_<ReleaseDateIso>.md`) and shown in the about dialog
   - Please review your `CURRENCY` setting in `data/config.php`, see also `config-dist.php` - this should be the ISO 4217 code of the currency to properly work with the JS `toLocaleString` function
 - New translation: (thanks all the translators)
-  - Russian (demo available at https://demo-ru.grocy.info)
+  - Russian (demo available at https://ru.demo.grocy.info)

changelog/47_2.4.0_2019-05-10.md

@@ -0,0 +1,34 @@
+- New feature: Userfields
+  - Attach any custom field to any entity (Products, Locations, Euqipment, etc.)
+  - Userfields can have types (Text, Number, Date, etc.)
+  - Will be shown / can be filled on the edit page of the corresponding entity and will also optionally show in the corresponding tables (inclcudes overview pages)
+  - => Can be configured under Master data / Userfields
+- New feature: Meal planning
+  - Simple approach for the beginning (more to come): A week view where you can add recipes for each day (new menu entry in the sidebar, below calendar)
+  - Of course it's also possible to put missing things directly on the shopping list from there, also for a complete week at once
+- General improvements
+  - The "expires soon" or "due soon" days (yelllow bar at the top of each overview page) can now be configured
+    - => New settings page for each area under the settings icon at the top right
+- Stock improvements
+  - It's now possible to have multiple / named shopping lists
+    - Automations still use the default shopping list and also the default shopping list cannot be deleted
+  - More information on the product card like "Spoil rate" or "Average shelf life"
+  - It's now possible to set a price for added products during inventory
+  - It's now possible to customize the default amount for purchase/consume (see stock settings under the settings icon on the top right)
+- Chores improvements
+  - New recurrence patterns - chores can now also be "scheduled" to repat daily/weekly/monthly
+  - It's now possible to track the day of a chore execution only (without the time, option per chore)
+- Recipe improvements
+  - It's now possible to enter a "variable amount" (e. g. if a recipe needs "1 - 2 cups"), the original amount is still used for stock fulfillment checking (if enabled for that recipe ingredient)
+- New translations: (thanks all the translators)
+  - Swedish (demo available at https://sv.demo.grocy.info)
+  - Polish (demo available at https://pl.demo.grocy.info)
+- Internal improvement: Localizations are now handled via gettext, both on server and client side
+  - Mainly to properly handle languages with more than 2 plural forms
+  - This involved some string changes which results in a needed (re)translation of about 20 strings (excluding demo data)
+  - Also applies to quantity units, n-plural forms can be entered on the quantity unit edit page
+  - It's not required to install the PHP gettext extension, on both, server and client, managed implementations of gettext are used ([oscarotero/Gettext](https://github.com/oscarotero/Gettext) & [oscarotero/gettext-translator](https://github.com/oscarotero/gettext-translator))
+- Some other small fixes and improvements
+  - The "Add as barcode to existing product" productpicker workflow failed to add the barcode to the given product
+  - Recipes can now be filter by stock availability
+  - Added a feature flag (`config.php` setting) to also be able to hide all stock related UI elements and routes

changelog/48_2.4.1_2019-05-16.md

@@ -0,0 +1,2 @@
+- Fixed a performance problem for loading data tables related to the new Userfields feature
+- Fixed that when using single quotes in a product name did not trigger the workflow popup

changelog/49_2.4.2_2019-06-09.md

@@ -0,0 +1,11 @@
+- Fixed that deleting meal plan entries did not work
+- Fixed a problem that the user settings were not properly initialized for the frontend JS part when not logged only (so potentially affected only the login page)
+- Fixed an issue that the shopping list did not load when a plural translation for a quantity unit was missing
+- Fixed that tooltips were visible forever when consuming all products on the stock overview page
+- Fixed that login did not work when "Stay logged in permanently" was set and grocy runs on a 32-bit system (thanks @matejdro)
+- Fixed page reloads when "Auto reload on external changes" is enabled and there is unsaved form data (the detection did not work for forms in modal dialogs, e. g. when adding a entry to the meal plan)
+- Fixed (again) that the product picker did not work properly when the product name contains single quotes
+- Fixed that a entered barcode on the product edit page was only saved when "adding" it to the barcodes list by pressing `TAB` (is now automatically added to the list also when just leaving the field)
+- Improved that errors/messages from the API are shown properly when undoing a stock booking is not possible (stock journal page)
+- Improved night mode CSS (done by @BlizzWave, thanks!)
+- A new localization for `en_GB` is now always included - nothing is really translated there, it's only about component "translations" that e. g. the first day of the week is correct for calendars

changelog/50_2.4.3_2019-07-06.md

@@ -0,0 +1,16 @@
+- Fixed the messed up message/toast after consuming a product from the stock overview page
+- Fixed that "Track date only" chores were always tracked today, regardless of the given date
+- Fixed that the "week costs" were wrong after removing a meal plan entry
+- Fixed wrong recipes costs calculation with nested recipes when the base recipe servings are > 1 (also affected the meal plan when adding such a recipe there)
+- Fixed consuming recipes did not consume ingredients of the nested recipes
+- Improved recipes API - added new endpoints to get stock fulfillment information (thanks @Aerex)
+- Improved date display for products that never expires (instead of "2999-12-31" now just "Never" will be shown)
+- Improved date display for dates of today and no time (instead of the hours since midnight now just "Today" will be shown)
+- Improved shopping list handling
+  - Items can now be switched between lists (there is a shopping list dropdown on the item edit page)
+  - Items can now be marked as "done" (new check mark button per item, when clicked, the item will be displayed greyed out, when clicked again the item will be displayed normally again)
+- Improved that products can now also be consumed as spoiled from the stock overview page (option in the more/context menu per line)
+- Added a "consume this recipe"-button to the meal plan (and also a button to consume all recipes for a whole week)
+- Added the possibility to undo a task (new button per task, only visible when task is already completed) and also a corresponding API endpoint
+- Added a new `config.php` setting `DISABLE_AUTH` to be able to disable authentication / the login screen, defaults to `false`
+- Added a new `config.php` setting `CALENDAR_FIRST_DAY_OF_WEEK` to be able to change the first day of a week used for calendar views (meal plan for example) in the frontend, defaults to locale default

changelog/51_2.4.4_2019-07-07.md

@@ -0,0 +1,6 @@
+- Fixed that price data (last price & chart) was not taken from inventory correction bookings, only purchases
+- Fixed weekly chores were scheduled on the same day after execution
+- Fixed that undone chores were also included in "Last tracked"
+- Fixed the date-time-picker width was too narrow sometimes
+- Improved that execution dates of "Track date only" chores will never display the time part
+- Improved date display for products that never expire (again, there was a display problem after consuming an item on the stock overview page)

changelog/52_2.5.0_2019-09-22.md

@@ -0,0 +1,107 @@
+### New feature: Custom entities / objects / lists
+- Custom entities are based on Userfields and can be used to add any custom lists you want to have in grocy
+- They can have an own menu entry in the sidebar
+- => See "Manage master data" -> "Userentities" or try it on the demo: https://demo.grocy.info/userobjects/exampleuserentity
+
+### New feature: Use the device camera for barcode scanning
+- Available on any barcode-enabled field (so currently only for picking products) - a new camera button at the right of side the text field
+- Implemented using [QuaggaJS](https://github.com/serratus/quaggaJS) - camera stream processing happens totally offline / client-side
+- Please note due to browser security restrictions, this only works when serving grocy via a secure connection (`https://`)
+- There is also a `config.php` setting `DISABLE_BROWSER_BARCODE_CAMERA_SCANNING` to disable this, if you don't need it at all (defaults to `false`)
+- I you have problems that barcodes are not recognized properly, there is a little "barcode scanner testing page" at [/barcodescannertesting](https://demo.grocy.info/barcodescannertesting)
+- => Quick video demo: https://www.youtube.com/watch?v=Y5YH6IJFnfc
+
+### Stock improvements/fixes
+- Products can now have variations (nested products)
+  - Define the parent product for a product on the product edit page (only one level is possible, means a product which is used as a parent product in another product, cannot have a parent product itself)
+  - Parent and sub products can have stock (both are regular products, no difference from that side)
+  - On the stock overview page, the aggregated amount is displayed next to the amount (sigma sign)
+  - When a recipe needs a parent product, the need is also fulfilled when enough sub product(s) are in stock
+- Quantity units can now be linked (related measurements / unit conversion)
+  - On the quantity unit edit page default conversion can be defined for each unit
+  - Products "inherit" the default conversion and additionally can have their own / override the default ones
+- It's now possible to print a "Location Content Sheet" with the current stock per location - new button at the top of the stock overview page (thought to hang it at the location, note used amounts on paper and track it in grocy later)
+- Stock overview page improvements
+  - Options in the more/context-menu to directly open the purchase/consume/inventory pages prefilled with the current product in a popup/dialog
+  - Option in the more/context-menu to add the current product directly to a shopping list
+  - Option in the more/context-menu to search for recipes containing the current product
+  - It's now possible to undo stock bookings ("Undo"-button in the success message, like it was already possible on the purchase/consume/inventory pages)
+  - Improved that on any stock changes the corresponding product table row is properly refreshed
+- New `config.php` setting `FEATURE_SETTING_STOCK_COUNT_OPENED_PRODUCTS_AGAINST_MINIMUM_STOCK_AMOUNT` to configure if opened products should be considered for minimum stock amounts (defaults to `true`, so opened products will now be considered missing by default - please change this setting if you want the old behavior)
+- The product description now can have formattings (HTML/WYSIWYG editor like for recipes)
+- Products now have a new field for calories (kcal, per stock quantity unit)
+- "Factor purchase to stock quantity unit" (product option) can now also be a decimal number when "Allow partial units in stock" is enabled
+- New "Sub feature flags" in `config.php` to disable some sub-features (hide the corresponding UI elements) if you don't need them (all new feature flags default to `true`, so no changed behavior when not configured)
+  - `FEATURE_FLAG_STOCK_PRICE_TRACKING` to disable product price tracking
+  - `FEATURE_FLAG_STOCK_LOCATION_TRACKING` to disable product location tracking
+  - `FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING` to disable product best before date tracking
+  - `FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING` to disable product opened tracking
+- Fixed/refined some things regarding purchase/consume/inventory of products with enabled tare weight handling (nothing was broken, but the success popups may not displayed the correct amount that was posted)
+- Fixed that "Spoil rate" and "Average shelf life" on the product card was wrong in most cases
+- When going to the product edit page, after saving the product, it will now always return to the previous page
+
+### Shopping list improvements
+- Shopping lists now have a notes field (HTML/WYSIWYG editor, just to save some notes per shopping list)
+- Shopping lists can now be printed (new button next to the add/delete shopping list button)
+
+### Recipe improvements
+- Based on the new linked quantity units, recipe ingredients can now use any product related unit, the amount is calculated according to the conversion factor of the unit relation
+- Based on the new calories field per product, the calories per recipe are now shown based on the selected servings (in the header, next to the costs)
+- New option "price factor" per recipe ingredient (defaults to `1`) - the resulting costs of the recipe ingredient will be multiplied by that factor
+  - Use this for example for spices in combination with "Only check if a single unit is in stock" to not take the full price of a pack of pepper into account for a recipe
+- The search field on the recipe overview page now also searches for product names of recipe ingredients (means it's possible to search a recipe by a product name)
+- Fixed a problem where the meal plan did not load when a recipe, which was already added to the meal plan, was deleted
+
+### Chores improvements
+- Chores can now be assigned to users
+  - Option per chore, different "assignment types" like "Random", "Who least did first", etc.
+  - On the chores overview page, the list can be filtered to only show chores assigned to the currently logged in user (or to any other user)
+- New option "Due date rollover" per chore which means the chore can never be overdue, the due date will shift forward each day when due
+- New option "Consume product on chore execution" per chore to automatically consume a product when a chore execution is tracked
+- When tracking an execution from the chores overview page, filters are re-applied afterwards (means when you have filtered the page to only show overdue chores and after the execution the chore is not overdue anymore, it will now be immediately hidden)
+
+### Equipment improvements/fixes
+- Fixed that the delete button not always deleted the currently selected equipment item
+
+### Userfield improvements/fixes
+- New Userfield type "Select list" for a list of predefined values where a single or also multiple values can then be selected on the entity object
+- New Userfield type "Link" - a single-line-textbox where the content will be rendered as a clickable link
+- Userfields of type "checkbox" are rendered as a checkmark in tables when checked (instead of "1" as till now)
+- Product Userfields are now also rendered on the shopping list (for items which have a product referenced)
+- Fixed that the Userfield type "Preset list" had always the caption "Product group" instead of the configured one (thanks @oncleben31)
+
+### General & other improvements/fixes
+- Added a new `config.php` setting `CALENDAR_SHOW_WEEK_OF_YEAR` to configure if calendars should show week numbers (defaults to `true`)
+- Fixed that date/time pickers not considered the `config.php` setting `CALENDAR_FIRST_DAY_OF_WEEK`
+- Improved the handling which entry page to use with disabled feature flags (thanks @nielstholenaar)
+- Boolean settings provided via environment variables (so the strings `true` and `false`) are now parsed correctly (thanks @mduret)
+- All uploaded pictures (currently for products and recipes) are now automatically downscaled to the appropriate size when serving them to improve page load times (this requires the `php-gd` extension, if not installed, images will not be downscaled)
+- It's now possible to test plural forms of quantity units (button on the quantity unit edit page, only visible if the current language requires more than 2 plural forms)
+- On the login page the sidebar an all top-navbar menus is now hidden
+- New translations: (thanks all the translators)
+  - Danish (demo available at https://da.demo.grocy.info)
+  - Dutch (demo available at https://nl.demo.grocy.info)
+- Internal change for how the localizations for the demo instances are handled
+  - For the pre-release demo now all currently supported languages are available (was already the case for the stable demo)
+    - Additionally all language files which reached the completion limit of 80 % will now be automatically pulled from Transifex 10 minutes past every hour (to have a kind of instant preview of changed translations)
+  - The URLs have changed, I'll try to keep all existing URLs redirecting properly for a long time
+    - If you want to link to the demo, please only use https://demo.grocy.info (stable demo) or https://demo-prerelease.grocy.info (current master branch demo)
+
+### API improvements & non-breaking changes
+- New endpoint `/objects/{entity}/search/{searchString}` to search for objects by name (contains search)
+- New endpoint `/stock/shoppinglist/add-product` to add a product to a shopping list (thanks @Forceu)
+- New endpoint `/stock/shoppinglist/remove-product` to remove a product from a shopping list (thanks @Forceu)
+- New endpoint `/chores/executions/calculate-next-assignments` to (re)calculate next user assignments for a single or all chores
+- New endpoint `/stock/products/by-barcode/{barcode}/add` to add a product to stock by its barcode
+- New endpoint `/stock/products/by-barcode/{barcode}/consume` to remove a product to stock by its barcode
+- New endpoint `/stock/products/by-barcode/{barcode}/inventory` to inventory a product by its barcode
+- New endpoint `/stock/products/by-barcode/{barcode}/open` to mark a product as opened by its barcode
+- New endpoint `/stock/bookings/{bookingId}` to retrieve a single stock booking
+- Endpoint `GET /files/{group}/{fileName}` can now also downscale pictures (see API documentation on [/api](https://demo.grocy.info/api))
+- When adding a product (through `stock/product/{productId}/add` or `stock/product/{productId}/inventory`) with omitted best before date and if the given product has "Default best before days" set, the best before date is calculated based on that (so far always today was used which is still the case when no date is supplied and also the product has no "Default best before days set) (thanks @Forceu)
+- Field `stock_amount` of endpoint `/stock/products/{productId}` now returns `0` instead of `null` when the given product is not in stock (thanks @Forceu)
+- Fixed that `/system/db-changed-time` always returned the current time (more or less) due to that that time is the database file modification time and the database is effectively changed on each request because of session information tracking - which now explicitly does not change the database file modification time, so this should work again to determine if any data changes happened
+- It's now also possible to provide the API key via a query parameter (same name as the header, so `GROCY-API-KEY`)
+
+#### Say thanks
+Because there were some questions about that in the past: If grocy is useful for you, [say thanks](https://grocy.info/#say-thanks)!

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

@@ -0,0 +1,37 @@
+### Stock improvements/fixes
+- Fixed that barcode lookups now compare the whole barcode, not parts of it (e. g. when you have two products with the barcodes `$1` and `$10` and scan `$1` maybe the product of `$10` was found till now)
+- 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)
+- 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)
+
+### Shopping list improvements
+- When adding a product to the shopping list from the new context/more menu from the stock overview page and if the product is already on the shopping list, the amount of that entry will be updated acccordingly instead of adding a new (double) shopping list item
+- Added a "clear" button above the new notes field on the shopping list page to quickly clear the notes field with one click
+
+### Recipe improvements/fixes
+- Fixed a problem regarding quantity unit conversion handling for recipe ingredients of products with no unit relations, but only a different purchase/stock quantity unit
+- It's now possible to display a recipe directly from the meal plan (new "eye button") (thanks @kriddles)
+- Improved the responsiveness of the meal plan and calendar page by automatically switching to a day calendar view on smaller screens (thanks for the idea @kriddles)
+
+### Chores improvements
+- There is now a new sub feature flag `FEATURE_FLAG_CHORES_ASSIGNMENTS` to disable chore assignments if you don't need them (defaults to `true`, so no changed behavior when not configured)
+
+### Calendar improvements
+- The calendar now also contains all planned recipes from the meal plan on the corresponding day
+- Improved that dates in the iCal calendar export now include the server timezone
+
+### Custom lists/fields improvements
+- Optimized the custom lists page that it can be printed properly (search field etc. is hidden when printing the page)
+
+### General & other improvements/fixes
+- Fixed that the browser barcode scanner button was not clickable on iOS Safari & other small styles fixes/improvements for iOS Safari (thanks @DeeeeLAN)
+- It's now also possible to set the meal plan page as the default/entry page (`config.php` setting `ENTRY_PAGE`) (thanks @lwis)
+- Some UI detail-refinements
+- In the header of the product-/chore-/battery-card there is now also a button to directly jump to the journal of the current product/chore/battery
+
+### API improvements/fixes
+- The API Endpoint `GET /files/{group}/{fileName}` now also returns a `Cache-Control` header (defaults fixed to 30 days) to further increase page load times
+- Fixed that the API endpoint `/stock/shoppinglist/add-product` failed when a product should be added which was not already on the shopping list (thanks @Forceu)

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

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

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

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

composer.json

@@ -1,12 +1,14 @@
 {
 	"require": {
 		"php": ">=7.2",
-		"slim/slim": "^3.8",
-		"morris/lessql": "^0.3.4",
+		"slim/slim": "^3.12.2",
+		"morris/lessql": "^0.4.1",
 		"rubellum/slim-blade-view": "^0.1.1",
-		"tuupola/cors-middleware": "^0.7.0",
-		"eluceo/ical": "^0.15.0",
-		"erusev/parsedown": "^1.7.1"
+		"tuupola/cors-middleware": "^1.0.0",
+		"eluceo/ical": "^0.15.1",
+		"erusev/parsedown": "^1.7.3",
+		"gettext/gettext": "^4.6.3",
+		"gumlet/php-image-resize": "^1.9.2"
 	},
 	"autoload": {
 		"psr-4": {

config-dist.php

@@ -14,16 +14,26 @@
 # The settings defined here below
 
 
-# Either "production", "dev" or "prerelease"
+# Either "production", "dev", "demo" or "prerelease"
+# When not "production", authentication will be disabled and
+# demo data will be populated during database migrations
 Setting('MODE', 'production');
 
-# Either "en" or "de" or the filename (without extension) of
-# one of the other available localization files in the "/localization" directory
+# Either "en" or "de" or the directory name of
+# one of the other available localization folders in the "/localization" directory
 Setting('CULTURE', 'en');
 
+# This is used to define the first day of a week for calendar views in the frontend,
+# 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', '');
+
+# If calendars should show week numbers
+Setting('CALENDAR_SHOW_WEEK_OF_YEAR', true);
+
 # To keep it simple: grocy does not handle any currency conversions,
 # this here is used to format all money values,
-# so doesn't matter really matter, but should be the
+# so doesn't really matter, but should be the
 # ISO 4217 code of the currency ("USD", "EUR", "GBP", etc.)
 Setting('CURRENCY', 'USD');
 
@@ -37,11 +47,25 @@ Setting('BASE_URL', '/');
 # 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
+# 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,
+# this needs to be one of the following values:
+# stock, shoppinglist, recipes, chores, tasks, batteries, equipment, calendar, mealplan
+Setting('ENTRY_PAGE', 'stock');
 
+# Set this to true if you want to disable authentication / the login screen,
+# places where user context is needed will then use the default (first existing) user
+Setting('DISABLE_AUTH', false);
+
+# Set this to true if you want to disable the ability to scan a barcode via the device camera (Browser API)
+Setting('DISABLE_BROWSER_BARCODE_CAMERA_SCANNING', false);
+
+# Set this if you want to have a different start day for the weekly meal plan view,
+# leave empty to use CALENDAR_FIRST_DAY_OF_WEEK (see above)
+# Needs to be a number where Sunday = 0, Monday = 1 and so forth
+Setting('MEAL_PLAN_FIRST_DAY_OF_WEEK', '');
 
 
 # Default user settings
@@ -55,9 +79,29 @@ 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_expring_soon_days', 5);
+DefaultUserSetting('stock_default_purchase_amount', 0);
+DefaultUserSetting('stock_default_consume_amount', 1);
+DefaultUserSetting('scan_mode_consume_enabled', false);
+DefaultUserSetting('scan_mode_purchase_enabled', false);
+
+# Chores settings
+DefaultUserSetting('chores_due_soon_days', 5);
+
+# 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
@@ -72,13 +116,12 @@ DefaultUserSetting('show_clock_in_header', false);
 DefaultUserSetting('shopping_list_to_stock_workflow_auto_submit_when_prefilled', false);
 
 
-
-
 # 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
 # (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);
 Setting('FEATURE_FLAG_RECIPES', true);
 Setting('FEATURE_FLAG_CHORES', true);
@@ -86,3 +129,17 @@ Setting('FEATURE_FLAG_TASKS', true);
 Setting('FEATURE_FLAG_BATTERIES', true);
 Setting('FEATURE_FLAG_EQUIPMENT', true);
 Setting('FEATURE_FLAG_CALENDAR', true);
+
+
+# Sub feature flags
+Setting('FEATURE_FLAG_STOCK_PRICE_TRACKING', true);
+Setting('FEATURE_FLAG_STOCK_LOCATION_TRACKING', true);
+Setting('FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING', true);
+Setting('FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING', true);
+Setting('FEATURE_FLAG_STOCK_PRODUCT_FREEZING', true);
+Setting('FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS', true);
+Setting('FEATURE_FLAG_CHORES_ASSIGNMENTS', true);
+
+
+# Feature settings
+Setting('FEATURE_SETTING_STOCK_COUNT_OPENED_PRODUCTS_AGAINST_MINIMUM_STOCK_AMOUNT', true); // When set to false, opened products will not be considered for minimum stock amounts

controllers/BaseController.php

@@ -16,27 +16,21 @@ class BaseController
 		$localizationService = new LocalizationService(GROCY_CULTURE);
 		$this->LocalizationService = $localizationService;
 
-		if (GROCY_MODE === 'prerelease')
-		{
-			$commitHash = trim(exec('git log --pretty="%h" -n1 HEAD'));
-			$commitDate = trim(exec('git log --date=iso --pretty="%cd" -n1 HEAD'));
-			
-			$container->view->set('version', "pre-release-$commitHash");
-			$container->view->set('releaseDate', \substr($commitDate, 0, 19));
-		}
-		else
-		{
-			$applicationService = new ApplicationService();
-			$versionInfo = $applicationService->GetInstalledVersion();
-			$container->view->set('version', $versionInfo->Version);
-			$container->view->set('releaseDate', $versionInfo->ReleaseDate);
-		}
+		$applicationService = new ApplicationService();
+		$versionInfo = $applicationService->GetInstalledVersion();
+		$container->view->set('version', $versionInfo->Version);
+		$container->view->set('releaseDate', $versionInfo->ReleaseDate);
 
-		$container->view->set('localizationStrings', $localizationService->GetCurrentCultureLocalizations());
-		$container->view->set('L', function($text, ...$placeholderValues) use($localizationService)
+		$container->view->set('__t', function(string $text, ...$placeholderValues) use($localizationService)
 		{
-			return $localizationService->Localize($text, ...$placeholderValues);
+			return $localizationService->__t($text, $placeholderValues);
 		});
+		$container->view->set('__n', function($number, $singularForm, $pluralForm) use($localizationService)
+		{
+			return $localizationService->__n($number, $singularForm, $pluralForm);
+		});
+		$container->view->set('GettextPo', $localizationService->GetPoAsJsonString());
+
 		$container->view->set('U', function($relativePath, $isResource = false) use($container)
 		{
 			return $container->UrlManager->ConstructUrl($relativePath, $isResource);
@@ -59,6 +53,8 @@ class BaseController
 		}
 		$container->view->set('featureFlags', $constants);
 
+		$container->view->set('userentitiesForSidebar', $this->Database->userentities()->where('show_in_sidebar_menu = 1')->orderBy('name'));
+
 		try
 		{
 			$usersService = new UsersService();
@@ -66,6 +62,10 @@ class BaseController
 			{
 				$container->view->set('userSettings', $usersService->GetUserSettings(GROCY_USER_ID));
 			}
+			else
+			{
+				$container->view->set('userSettings', null);
+			}
 		}
 		catch (\Exception $ex)
 		{

controllers/BatteriesController.php

@@ -3,6 +3,8 @@
 namespace Grocy\Controllers;
 
 use \Grocy\Services\BatteriesService;
+use \Grocy\Services\UsersService;
+use \Grocy\Services\UserfieldsService;
 
 class BatteriesController extends BaseController
 {
@@ -10,16 +12,23 @@ class BatteriesController extends BaseController
 	{
 		parent::__construct($container);
 		$this->BatteriesService = new BatteriesService();
+		$this->UserfieldsService = new UserfieldsService();
 	}
 
 	protected $BatteriesService;
+	protected $UserfieldsService;
 
 	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
+		$usersService = new UsersService();
+		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['batteries_due_soon_days'];
+
 		return $this->AppContainer->view->render($response, 'batteriesoverview', [
 			'batteries' => $this->Database->batteries()->orderBy('name'),
 			'current' => $this->BatteriesService->GetCurrent(),
-			'nextXDays' => 5
+			'nextXDays' => $nextXDays,
+			'userfields' => $this->UserfieldsService->GetFields('batteries'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('batteries')
 		]);
 	}
 
@@ -33,7 +42,9 @@ class BatteriesController extends BaseController
 	public function BatteriesList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'batteries', [
-			'batteries' => $this->Database->batteries()->orderBy('name')
+			'batteries' => $this->Database->batteries()->orderBy('name'),
+			'userfields' => $this->UserfieldsService->GetFields('batteries'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('batteries')
 		]);
 	}
 
@@ -42,14 +53,16 @@ class BatteriesController extends BaseController
 		if ($args['batteryId'] == 'new')
 		{
 			return $this->AppContainer->view->render($response, 'batteryform', [
-				'mode' => 'create'
+				'mode' => 'create',
+				'userfields' => $this->UserfieldsService->GetFields('batteries')
 			]);
 		}
 		else
 		{
 			return $this->AppContainer->view->render($response, 'batteryform', [
 				'battery' =>  $this->Database->batteries($args['batteryId']),
-				'mode' => 'edit'
+				'mode' => 'edit',
+				'userfields' => $this->UserfieldsService->GetFields('batteries')
 			]);
 		}
 	}
@@ -61,4 +74,9 @@ class BatteriesController extends BaseController
 			'batteries' => $this->Database->batteries()->orderBy('name')
 		]);
 	}
+
+	public function BatteriesSettings(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'batteriessettings');
+	}
 }

controllers/CalendarApiController.php

@@ -26,12 +26,21 @@ class CalendarApiController extends BaseApiController
 			$events = $this->CalendarService->GetEvents();
 			foreach($events as $event)
 			{
+				$date = new \DateTime($event['start']);
+				$date->setTimezone(date_default_timezone_get());
+				
+				if ($event['date_format'] === 'date')
+				{
+					$date->setTime(23, 59, 59);
+				}
+
 				$vEvent = new \Eluceo\iCal\Component\Event();
-				$vEvent->setDtStart(new \DateTime($event['start']))
-					->setDtEnd(new \DateTime($event['start']))
+				$vEvent->setDtStart($date)
+					->setDtEnd($date)
 					->setSummary($event['title'])
+					->setDescription($event['description'])
 					->setNoTime($event['date_format'] === 'date')
-					->setUseUtc(false);
+					->setUseTimezone(true);
 				
 				$vCalendar->addComponent($vEvent);
 			}

controllers/ChoresApiController.php

@@ -21,7 +21,7 @@ class ChoresApiController extends BaseApiController
 		try
 		{
 			$trackedTime = date('Y-m-d H:i:s');
-			if (array_key_exists('tracked_time', $requestBody) && IsIsoDateTime($requestBody['tracked_time']))
+			if (array_key_exists('tracked_time', $requestBody) && (IsIsoDateTime($requestBody['tracked_time']) || IsIsoDate($requestBody['tracked_time'])))
 			{
 				$trackedTime = $requestBody['tracked_time'];
 			}
@@ -70,4 +70,37 @@ class ChoresApiController extends BaseApiController
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
+
+	public function CalculateNextExecutionAssignments(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$requestBody = $request->getParsedBody();
+
+			$choreId = null;
+			if (array_key_exists('chore_id', $requestBody) && !empty($requestBody['chore_id']) && is_numeric($requestBody['chore_id']))
+			{
+				$choreId = intval($requestBody['chore_id']);
+			}
+
+			if ($choreId === null)
+			{
+				$chores = $this->Database->chores();
+				foreach ($chores as $chore)
+				{
+					$this->ChoresService->CalculateNextExecutionAssignment($chore->id);
+				}
+			}
+			else
+			{
+				$this->ChoresService->CalculateNextExecutionAssignment($choreId);
+			}
+
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
 }

controllers/ChoresController.php

@@ -3,6 +3,8 @@
 namespace Grocy\Controllers;
 
 use \Grocy\Services\ChoresService;
+use \Grocy\Services\UsersService;
+use \Grocy\Services\UserfieldsService;
 
 class ChoresController extends BaseController
 {
@@ -10,16 +12,24 @@ class ChoresController extends BaseController
 	{
 		parent::__construct($container);
 		$this->ChoresService = new ChoresService();
+		$this->UserfieldsService = new UserfieldsService();
 	}
 
 	protected $ChoresService;
+	protected $UserfieldsService;
 
 	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
+		$usersService = new UsersService();
+		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['chores_due_soon_days'];
+
 		return $this->AppContainer->view->render($response, 'choresoverview', [
 			'chores' => $this->Database->chores()->orderBy('name'),
 			'currentChores' => $this->ChoresService->GetCurrent(),
-			'nextXDays' => 5
+			'nextXDays' => $nextXDays,
+			'userfields' => $this->UserfieldsService->GetFields('chores'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('chores'),
+			'users' => $usersService->GetUsersAsDto()
 		]);
 	}
 
@@ -34,7 +44,9 @@ class ChoresController extends BaseController
 	public function ChoresList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'chores', [
-			'chores' => $this->Database->chores()->orderBy('name')
+			'chores' => $this->Database->chores()->orderBy('name'),
+			'userfields' => $this->UserfieldsService->GetFields('chores'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('chores')
 		]);
 	}
 
@@ -49,20 +61,36 @@ class ChoresController extends BaseController
 
 	public function ChoreEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
+		$usersService = new UsersService();
+		$users = $usersService->GetUsersAsDto();
+
 		if ($args['choreId'] == 'new')
 		{
 			return $this->AppContainer->view->render($response, 'choreform', [
-				'periodTypes' => GetClassConstants('\Grocy\Services\ChoresService'),
-				'mode' => 'create'
+				'periodTypes' => GetClassConstants('\Grocy\Services\ChoresService', 'CHORE_PERIOD_TYPE_'),
+				'mode' => 'create',
+				'userfields' => $this->UserfieldsService->GetFields('chores'),
+				'assignmentTypes' => GetClassConstants('\Grocy\Services\ChoresService', 'CHORE_ASSIGNMENT_TYPE_'),
+				'users' => $users,
+				'products' => $this->Database->products()->orderBy('name')
 			]);
 		}
 		else
 		{
 			return $this->AppContainer->view->render($response, 'choreform', [
 				'chore' =>  $this->Database->chores($args['choreId']),
-				'periodTypes' => GetClassConstants('\Grocy\Services\ChoresService'),
-				'mode' => 'edit'
+				'periodTypes' => GetClassConstants('\Grocy\Services\ChoresService', 'CHORE_PERIOD_TYPE_'),
+				'mode' => 'edit',
+				'userfields' => $this->UserfieldsService->GetFields('chores'),
+				'assignmentTypes' => GetClassConstants('\Grocy\Services\ChoresService', 'CHORE_ASSIGNMENT_TYPE_'),
+				'users' => $users,
+				'products' => $this->Database->products()->orderBy('name')
 			]);
 		}
 	}
+
+	public function ChoresSettings(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'choressettings');
+	}
 }

controllers/EquipmentController.php

@@ -2,13 +2,24 @@
 
 namespace Grocy\Controllers;
 
+use \Grocy\Services\UserfieldsService;
 
 class EquipmentController extends BaseController
 {
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->UserfieldsService = new UserfieldsService();
+	}
+
+	protected $UserfieldsService;
+
 	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'equipment', [
-			'equipment' => $this->Database->equipment()->orderBy('name')
+			'equipment' => $this->Database->equipment()->orderBy('name'),
+			'userfields' => $this->UserfieldsService->GetFields('equipment'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('equipment')
 		]);
 	}
 
@@ -17,14 +28,16 @@ class EquipmentController extends BaseController
 		if ($args['equipmentId'] == 'new')
 		{
 			return $this->AppContainer->view->render($response, 'equipmentform', [
-				'mode' => 'create'
+				'mode' => 'create',
+				'userfields' => $this->UserfieldsService->GetFields('equipment')
 			]);
 		}
 		else
 		{
 			return $this->AppContainer->view->render($response, 'equipmentform', [
 				'equipment' =>  $this->Database->equipment($args['equipmentId']),
-				'mode' => 'edit'
+				'mode' => 'edit',
+				'userfields' => $this->UserfieldsService->GetFields('equipment')
 			]);
 		}
 	}

controllers/FilesApiController.php

@@ -51,11 +51,37 @@ class FilesApiController extends BaseApiController
 				throw new \Exception('Invalid filename');
 			}
 
-			$filePath = $this->FilesService->GetFilePath($args['group'], $fileName);
+			$forceServeAs = null;
+			if (isset($request->getQueryParams()['force_serve_as']) && !empty($request->getQueryParams()['force_serve_as']))
+			{
+				$forceServeAs = $request->getQueryParams()['force_serve_as'];
+			}
+
+			if ($forceServeAs == FilesService::FILE_SERVE_TYPE_PICTURE)
+			{
+				$bestFitHeight = null;
+				if (isset($request->getQueryParams()['best_fit_height']) && !empty($request->getQueryParams()['best_fit_height']) && is_numeric($request->getQueryParams()['best_fit_height']))
+				{
+					$bestFitHeight = $request->getQueryParams()['best_fit_height'];
+				}
+
+				$bestFitWidth = null;
+				if (isset($request->getQueryParams()['best_fit_width']) && !empty($request->getQueryParams()['best_fit_width']) && is_numeric($request->getQueryParams()['best_fit_width']))
+				{
+					$bestFitWidth = $request->getQueryParams()['best_fit_width'];
+				}
+
+				$filePath = $this->FilesService->DownscaleImage($args['group'], $fileName, $bestFitHeight, $bestFitWidth);
+			}
+			else
+			{
+				$filePath = $this->FilesService->GetFilePath($args['group'], $fileName);
+			}
 
 			if (file_exists($filePath))
 			{
 				$response->write(file_get_contents($filePath));
+				$response = $response->withHeader('Cache-Control', 'max-age=2592000');
 				$response = $response->withHeader('Content-Type', mime_content_type($filePath));
 				return $response->withHeader('Content-Disposition', 'inline; filename="' . $fileName . '"');
 			}

controllers/GenericEntityApiController.php

@@ -2,8 +2,18 @@
 
 namespace Grocy\Controllers;
 
+use \Grocy\Services\UserfieldsService;
+
 class GenericEntityApiController extends BaseApiController
 {
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->UserfieldsService = new UserfieldsService();
+	}
+
+	protected $UserfieldsService;
+
 	public function GetObjects(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		if ($this->IsValidEntity($args['entity']) && !$this->IsEntityWithPreventedListing($args['entity']))
@@ -44,7 +54,9 @@ class GenericEntityApiController extends BaseApiController
 				$newRow = $this->Database->{$args['entity']}()->createRow($requestBody);
 				$newRow->save();
 				$success = $newRow->isClean();
-				return $this->EmptyApiResponse($response);
+				return $this->ApiResponse(array(
+					'created_object_id' => $this->Database->lastInsertId()
+				));
 			}
 			catch (\Exception $ex)
 			{
@@ -101,6 +113,57 @@ class GenericEntityApiController extends BaseApiController
 		}
 	}
 
+	public function SearchObjects(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if ($this->IsValidEntity($args['entity']) && !$this->IsEntityWithPreventedListing($args['entity']))
+		{
+			try
+			{
+				return $this->ApiResponse($this->Database->{$args['entity']}()->where('name LIKE ?', '%' . $args['searchString'] . '%'));
+			}
+			catch (\PDOException $ex)
+			{
+				return $this->GenericErrorResponse($response, 'The given entity has no field "name"');
+			}
+		}
+		else
+		{
+			return $this->GenericErrorResponse($response, 'Entity does not exist or is not exposed');
+		}
+	}
+
+	public function GetUserfields(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			return $this->ApiResponse($this->UserfieldsService->GetValues($args['entity'], $args['objectId']));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function SetUserfields(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$requestBody = $request->getParsedBody();
+
+		try
+		{
+			if ($requestBody === null)
+			{
+				throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
+			}
+
+			$this->UserfieldsService->SetValues($args['entity'], $args['objectId'], $requestBody);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
 	private function IsValidEntity($entity)
 	{
 		return in_array($entity, $this->OpenApiSpec->components->internalSchemas->ExposedEntity->enum);
@@ -108,6 +171,6 @@ class GenericEntityApiController extends BaseApiController
 
 	private function IsEntityWithPreventedListing($entity)
 	{
-		return in_array($entity, $this->OpenApiSpec->components->internalSchemas->ExposedEntitiesPreventListing->enum);
+		return !in_array($entity, $this->OpenApiSpec->components->internalSchemas->ExposedEntityButNoListing->enum);
 	}
 }

controllers/GenericEntityController.php

@@ -0,0 +1,104 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\UserfieldsService;
+
+class GenericEntityController extends BaseController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->UserfieldsService = new UserfieldsService();
+	}
+
+	protected $UserfieldsService;
+
+	public function UserfieldsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'userfields', [
+			'userfields' => $this->UserfieldsService->GetAllFields(),
+			'entities' => $this->UserfieldsService->GetEntities()
+		]);
+	}
+
+	public function UserentitiesList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'userentities', [
+			'userentities' => $this->Database->userentities()->orderBy('name')
+		]);
+	}
+
+	public function UserobjectsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$userentity = $this->Database->userentities()->where('name = :1', $args['userentityName'])->fetch();
+
+		return $this->AppContainer->view->render($response, 'userobjects', [
+			'userentity' => $userentity,
+			'userobjects' => $this->Database->userobjects()->where('userentity_id = :1', $userentity->id),
+			'userfields' => $this->UserfieldsService->GetFields('userentity-' . $args['userentityName']),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('userentity-' . $args['userentityName'])
+		]);
+	}
+
+	public function UserfieldEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if ($args['userfieldId'] == 'new')
+		{
+			return $this->AppContainer->view->render($response, 'userfieldform', [
+				'mode' => 'create',
+				'userfieldTypes' => $this->UserfieldsService->GetFieldTypes(),
+				'entities' => $this->UserfieldsService->GetEntities()
+			]);
+		}
+		else
+		{
+			return $this->AppContainer->view->render($response, 'userfieldform', [
+				'mode' => 'edit',
+				'userfield' =>  $this->UserfieldsService->GetField($args['userfieldId']),
+				'userfieldTypes' => $this->UserfieldsService->GetFieldTypes(),
+				'entities' => $this->UserfieldsService->GetEntities()
+			]);
+		}
+	}
+
+	public function UserentityEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if ($args['userentityId'] == 'new')
+		{
+			return $this->AppContainer->view->render($response, 'userentityform', [
+				'mode' => 'create'
+			]);
+		}
+		else
+		{
+			return $this->AppContainer->view->render($response, 'userentityform', [
+				'mode' => 'edit',
+				'userentity' =>  $this->Database->userentities($args['userentityId'])
+			]);
+		}
+	}
+
+	public function UserobjectEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$userentity = $this->Database->userentities()->where('name = :1', $args['userentityName'])->fetch();
+
+		if ($args['userobjectId'] == 'new')
+		{
+			return $this->AppContainer->view->render($response, 'userobjectform', [
+				'userentity' => $userentity,
+				'mode' => 'create',
+				'userfields' => $this->UserfieldsService->GetFields('userentity-' . $args['userentityName'])
+			]);
+		}
+		else
+		{
+			return $this->AppContainer->view->render($response, 'userobjectform', [
+				'userentity' => $userentity,
+				'mode' => 'edit',
+				'userobject' =>  $this->Database->userobjects($args['userobjectId']),
+				'userfields' => $this->UserfieldsService->GetFields('userentity-' . $args['userentityName'])
+			]);
+		}
+	}
+}

controllers/LoginController.php

@@ -30,7 +30,7 @@ class LoginController extends BaseController
 			if ($user !== null && password_verify($inputPassword, $user->password))
 			{
 				$sessionKey = $this->SessionService->CreateSession($user->id, $stayLoggedInPermanently);
-				setcookie($this->SessionCookieName, $sessionKey, intval(time() + 31220640000)); // Cookie expires in 999 years, but session validity is up to SessionService
+				setcookie($this->SessionCookieName, $sessionKey, PHP_INT_SIZE == 4 ? PHP_INT_MAX : PHP_INT_MAX>>32); // Cookie expires never, but session validity is up to SessionService
 
 				if (password_needs_rehash($user->password, PASSWORD_DEFAULT))
 				{

controllers/RecipesApiController.php

@@ -1,43 +1,68 @@
-<?php
-
-namespace Grocy\Controllers;
-
-use \Grocy\Services\RecipesService;
-
-class RecipesApiController extends BaseApiController
-{
-	public function __construct(\Slim\Container $container)
-	{
-		parent::__construct($container);
-		$this->RecipesService = new RecipesService();
-	}
-
-	protected $RecipesService;
-
-	public function AddNotFulfilledProductsToShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
-	{
-		$requestBody = $request->getParsedBody();
-		$excludedProductIds = null;
-
-		if ($requestBody !== null && array_key_exists('excludedProductIds', $requestBody))
-		{
-			$excludedProductIds = $requestBody['excludedProductIds'];
-		}
-		
-		$this->RecipesService->AddNotFulfilledProductsToShoppingList($args['recipeId'], $excludedProductIds);
-		return $this->EmptyApiResponse($response);
-	}
-
-	public function ConsumeRecipe(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
-	{
-		try
-		{
-			$this->RecipesService->ConsumeRecipe($args['recipeId']);
-			return $this->EmptyApiResponse($response);
-		}
-		catch (\Exception $ex)
-		{
-			return $this->GenericErrorResponse($response, $ex->getMessage());
-		}
-	}
-}
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\RecipesService;
+
+class RecipesApiController extends BaseApiController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->RecipesService = new RecipesService();
+	}
+
+	protected $RecipesService;
+
+	public function AddNotFulfilledProductsToShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$requestBody = $request->getParsedBody();
+		$excludedProductIds = null;
+
+		if ($requestBody !== null && array_key_exists('excludedProductIds', $requestBody))
+		{
+			$excludedProductIds = $requestBody['excludedProductIds'];
+		}
+		
+		$this->RecipesService->AddNotFulfilledProductsToShoppingList($args['recipeId'], $excludedProductIds);
+		return $this->EmptyApiResponse($response);
+	}
+
+	public function ConsumeRecipe(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$this->RecipesService->ConsumeRecipe($args['recipeId']);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function GetRecipeFulfillment(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{ 
+			if(!isset($args['recipeId']))
+			{
+				return $this->ApiResponse($this->RecipesService->GetRecipesResolved());
+			}
+
+			$recipeResolved = FindObjectInArrayByPropertyValue($this->RecipesService->GetRecipesResolved(), 'recipe_id', $args['recipeId']);
+			if(!$recipeResolved)
+			{
+				throw new \Exception('Recipe does not exist');
+			}
+			else
+			{
+				return $this->ApiResponse($recipeResolved);
+			}
+		} 
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+}

controllers/RecipesController.php

@@ -3,6 +3,8 @@
 namespace Grocy\Controllers;
 
 use \Grocy\Services\RecipesService;
+use \Grocy\Services\StockService;
+use \Grocy\Services\UserfieldsService;
 
 class RecipesController extends BaseController
 {
@@ -10,13 +12,24 @@ class RecipesController extends BaseController
 	{
 		parent::__construct($container);
 		$this->RecipesService = new RecipesService();
+		$this->StockService = new StockService();
+		$this->UserfieldsService = new UserfieldsService();
 	}
 
 	protected $RecipesService;
+	protected $StockService;
+	protected $UserfieldsService;
 
 	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$recipes = $this->Database->recipes()->orderBy('name');
+		if (isset($request->getQueryParams()['include-internal']))
+		{
+			$recipes = $this->Database->recipes()->orderBy('name');
+		}
+		else
+		{
+			$recipes = $this->Database->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name');
+		}
 		$recipesResolved = $this->RecipesService->GetRecipesResolved();
 
 		$selectedRecipe = null;
@@ -53,11 +66,15 @@ class RecipesController extends BaseController
 			'selectedRecipe' => $selectedRecipe,
 			'selectedRecipePositionsResolved' => $selectedRecipePositionsResolved,
 			'products' => $this->Database->products(),
-			'quantityunits' => $this->Database->quantity_units(),
+			'quantityUnits' => $this->Database->quantity_units(),
 			'selectedRecipeSubRecipes' => $selectedRecipeSubRecipes,
 			'selectedRecipeSubRecipesPositions' => $selectedRecipeSubRecipesPositions,
 			'includedRecipeIdsAbsolute' => $includedRecipeIdsAbsolute,
-			'selectedRecipeTotalCosts' => FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $selectedRecipe->id)->costs
+			'selectedRecipeTotalCosts' => FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $selectedRecipe->id)->costs,
+			'selectedRecipeTotalCalories' => FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $selectedRecipe->id)->calories,
+			'userfields' => $this->UserfieldsService->GetFields('recipes'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('recipes'),
+			'quantityUnitConversionsResolved' => $this->Database->quantity_unit_conversions_resolved()
 		]);
 	}
 
@@ -66,8 +83,8 @@ class RecipesController extends BaseController
 		$recipeId = $args['recipeId'];
 		if ($recipeId  == 'new')
 		{
-			$newRecipe = $this->Database->recipes()->createRow(array(
-				'name' => $this->LocalizationService->Localize('New recipe')
+			$newRecipe = $this->Database->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->createRow(array(
+				'name' => $this->LocalizationService->__t('New recipe')
 			));
 			$newRecipe->save();
 
@@ -78,12 +95,14 @@ class RecipesController extends BaseController
 			'recipe' =>  $this->Database->recipes($recipeId),
 			'recipePositions' =>  $this->Database->recipes_pos()->where('recipe_id', $recipeId),
 			'mode' => 'edit',
-			'products' => $this->Database->products(),
+			'products' => $this->Database->products()->orderBy('name'),
 			'quantityunits' => $this->Database->quantity_units(),
 			'recipePositionsResolved' => $this->RecipesService->GetRecipesPosResolved(),
 			'recipesResolved' => $this->RecipesService->GetRecipesResolved(),
-			'recipes' =>  $this->Database->recipes()->orderBy('name'),
-			'recipeNestings' =>  $this->Database->recipes_nestings()->where('recipe_id', $recipeId)
+			'recipes' =>  $this->Database->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name'),
+			'recipeNestings' =>  $this->Database->recipes_nestings()->where('recipe_id', $recipeId),
+			'userfields' => $this->UserfieldsService->GetFields('recipes'),
+			'quantityUnitConversionsResolved' => $this->Database->quantity_unit_conversions_resolved()
 		]);
 	}
 
@@ -94,8 +113,10 @@ class RecipesController extends BaseController
 			return $this->AppContainer->view->render($response, 'recipeposform', [
 				'mode' => 'create',
 				'recipe' => $this->Database->recipes($args['recipeId']),
+				'recipePos' => new \stdClass(),
 				'products' => $this->Database->products()->orderBy('name'),
-				'quantityUnits' => $this->Database->quantity_units()->orderBy('name')
+				'quantityUnits' => $this->Database->quantity_units()->orderBy('name'),
+				'quantityUnitConversionsResolved' => $this->Database->quantity_unit_conversions_resolved()
 			]);
 		}
 		else
@@ -105,8 +126,52 @@ class RecipesController extends BaseController
 				'recipe' =>  $this->Database->recipes($args['recipeId']),
 				'recipePos' => $this->Database->recipes_pos($args['recipePosId']),
 				'products' => $this->Database->products()->orderBy('name'),
-				'quantityUnits' => $this->Database->quantity_units()->orderBy('name')
+				'quantityUnits' => $this->Database->quantity_units()->orderBy('name'),
+				'quantityUnitConversionsResolved' => $this->Database->quantity_unit_conversions_resolved()
 			]);
 		}
 	}
+
+	public function MealPlan(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$recipes = $this->Database->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->fetchAll();
+		
+		$events = array();
+		foreach($this->Database->meal_plan() as $mealPlanEntry)
+		{
+			$recipe = FindObjectInArrayByPropertyValue($recipes, 'id', $mealPlanEntry['recipe_id']);
+			$title = '';
+			if ($recipe !== null)
+			{
+				$title = $recipe->name;
+			}
+
+			$productDetails = null;
+			if ($mealPlanEntry['product_id'] !== null)
+			{
+				$productDetails = $this->StockService->GetProductDetails($mealPlanEntry['product_id']);
+			}
+
+			$events[] = array(
+				'id' => $mealPlanEntry['id'],
+				'title' => $title,
+				'start' => $mealPlanEntry['day'],
+				'date_format' => 'date',
+				'recipe' => json_encode($recipe),
+				'mealPlanEntry' => json_encode($mealPlanEntry),
+				'type' => $mealPlanEntry['type'],
+				'productDetails' => json_encode($productDetails)
+			);
+		}
+
+		return $this->AppContainer->view->render($response, 'mealplan', [
+			'fullcalendarEventSources' => $events,
+			'recipes' => $recipes,
+			'internalRecipes' => $this->Database->recipes()->whereNot('type', RecipesService::RECIPE_TYPE_NORMAL)->fetchAll(),
+			'recipesResolved' => $this->RecipesService->GetRecipesResolved(),
+			'products' => $this->Database->products()->orderBy('name'),
+			'quantityUnits' => $this->Database->quantity_units()->orderBy('name'),
+			'quantityUnitConversionsResolved' => $this->Database->quantity_unit_conversions_resolved()
+		]);
+	}
 }

controllers/StockApiController.php

@@ -67,7 +67,7 @@ class StockApiController extends BaseApiController
 				throw new \Exception('An amount is required');
 			}
 
-			$bestBeforeDate = date('Y-m-d');
+			$bestBeforeDate = null;
 			if (array_key_exists('best_before_date', $requestBody) && IsIsoDate($requestBody['best_before_date']))
 			{
 				$bestBeforeDate = $requestBody['best_before_date'];
@@ -100,6 +100,116 @@ class StockApiController extends BaseApiController
 		}
 	}
 
+	public function AddProductByBarcode(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$args['productId'] = $this->StockService->GetProductIdFromBarcode($args['barcode']);
+			return $this->AddProduct($request, $response, $args);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function EditStockEntry(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$requestBody = $request->getParsedBody();
+
+		try
+		{
+			if ($requestBody === null)
+			{
+				throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
+			}
+
+			if (!array_key_exists('amount', $requestBody))
+			{
+				throw new \Exception('An amount is required');
+			}
+
+			$bestBeforeDate = null;
+			if (array_key_exists('best_before_date', $requestBody) && IsIsoDate($requestBody['best_before_date']))
+			{
+				$bestBeforeDate = $requestBody['best_before_date'];
+			}
+
+			$price = null;
+			if (array_key_exists('price', $requestBody) && is_numeric($requestBody['price']))
+			{
+				$price = $requestBody['price'];
+			}
+
+			$locationId = null;
+			if (array_key_exists('location_id', $requestBody) && is_numeric($requestBody['location_id']))
+			{
+				$locationId = $requestBody['location_id'];
+			}
+
+			$bookingId = $this->StockService->EditStockEntry($args['entryId'], $requestBody['amount'], $bestBeforeDate, $locationId, $price, $requestBody['open'], $requestBody['purchased_date']);
+			return $this->ApiResponse($this->Database->stock_log($bookingId));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function TransferProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$requestBody = $request->getParsedBody();
+
+		try
+		{
+			if ($requestBody === null)
+			{
+				throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
+			}
+
+			if (!array_key_exists('amount', $requestBody))
+			{
+				throw new \Exception('An amount is required');
+			}
+
+			if (!array_key_exists('location_id_from', $requestBody))
+			{
+				throw new \Exception('A transfer from location is required');
+			}
+
+			if (!array_key_exists('location_id_to', $requestBody))
+			{
+				throw new \Exception('A transfer to location is required');
+			}
+
+			$specificStockEntryId = 'default';
+			if (array_key_exists('stock_entry_id', $requestBody) && !empty($requestBody['stock_entry_id']))
+			{
+				$specificStockEntryId = $requestBody['stock_entry_id'];
+			}
+
+			$bookingId = $this->StockService->TransferProduct($args['productId'], $requestBody['amount'], $requestBody['location_id_from'], $requestBody['location_id_to'], $specificStockEntryId);
+			return $this->ApiResponse($this->Database->stock_log($bookingId));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function TransferProductByBarcode(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$args['productId'] = $this->StockService->GetProductIdFromBarcode($args['barcode']);
+			return $this->TransferProduct($request, $response, $args);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
 	public function ConsumeProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
@@ -134,13 +244,19 @@ class StockApiController extends BaseApiController
 				$specificStockEntryId = $requestBody['stock_entry_id'];
 			}
 
+			$locationId = null;
+			if (array_key_exists('location_id', $requestBody) && !empty($requestBody['location_id']) && is_numeric($requestBody['location_id']))
+			{
+				$locationId = $requestBody['location_id'];
+			}
+
 			$recipeId = null;
 			if (array_key_exists('recipe_id', $requestBody) && is_numeric($requestBody['recipe_id']))
 			{
 				$recipeId = $requestBody['recipe_id'];
 			}
 
-			$bookingId = $this->StockService->ConsumeProduct($args['productId'], $requestBody['amount'], $spoiled, $transactionType, $specificStockEntryId, $recipeId);
+			$bookingId = $this->StockService->ConsumeProduct($args['productId'], $requestBody['amount'], $spoiled, $transactionType, $specificStockEntryId, $recipeId, $locationId);
 			return $this->ApiResponse($this->Database->stock_log($bookingId));
 		}
 		catch (\Exception $ex)
@@ -149,6 +265,19 @@ class StockApiController extends BaseApiController
 		}
 	}
 
+	public function ConsumeProductByBarcode(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$args['productId'] = $this->StockService->GetProductIdFromBarcode($args['barcode']);
+			return $this->ConsumeProduct($request, $response, $args);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
 	public function InventoryProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
@@ -165,7 +294,7 @@ class StockApiController extends BaseApiController
 				throw new \Exception('An new amount is required');
 			}
 
-			$bestBeforeDate = date('Y-m-d');
+			$bestBeforeDate = null;
 			if (array_key_exists('best_before_date', $requestBody) && IsIsoDate($requestBody['best_before_date']))
 			{
 				$bestBeforeDate = $requestBody['best_before_date'];
@@ -177,7 +306,13 @@ class StockApiController extends BaseApiController
 				$locationId = $requestBody['location_id'];
 			}
 
-			$bookingId = $this->StockService->InventoryProduct($args['productId'], $requestBody['new_amount'], $bestBeforeDate, $locationId);
+			$price = null;
+			if (array_key_exists('price', $requestBody) && is_numeric($requestBody['price']))
+			{
+				$price = $requestBody['price'];
+			}
+
+			$bookingId = $this->StockService->InventoryProduct($args['productId'], $requestBody['new_amount'], $bestBeforeDate, $locationId, $price);
 			return $this->ApiResponse($this->Database->stock_log($bookingId));
 		}
 		catch (\Exception $ex)
@@ -186,6 +321,19 @@ class StockApiController extends BaseApiController
 		}
 	}
 
+	public function InventoryProductByBarcode(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$args['productId'] = $this->StockService->GetProductIdFromBarcode($args['barcode']);
+			return $this->InventoryProduct($request, $response, $args);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
 	public function OpenProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		$requestBody = $request->getParsedBody();
@@ -217,12 +365,25 @@ class StockApiController extends BaseApiController
 		}
 	}
 
+	public function OpenProductByBarcode(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$args['productId'] = $this->StockService->GetProductIdFromBarcode($args['barcode']);
+			return $this->OpenProduct($request, $response, $args);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
 	public function CurrentStock(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->ApiResponse($this->StockService->GetCurrentStock());
 	}
 
-	public function CurrentVolatilStock(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function CurrentVolatileStock(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		$nextXDays = 5;
 		if (isset($request->getQueryParams()['expiring_days']) && !empty($request->getQueryParams()['expiring_days']) && is_numeric($request->getQueryParams()['expiring_days']))
@@ -242,14 +403,122 @@ class StockApiController extends BaseApiController
 
 	public function AddMissingProductsToShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$this->StockService->AddMissingProductsToShoppingList();
-		return $this->EmptyApiResponse($response);
+		try
+		{
+			$requestBody = $request->getParsedBody();
+
+			$listId = 1;
+			if (array_key_exists('list_id', $requestBody) && !empty($requestBody['list_id']) && is_numeric($requestBody['list_id']))
+			{
+				$listId = intval($requestBody['list_id']);
+			}
+
+			$this->StockService->AddMissingProductsToShoppingList($listId);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
 	}
 
 	public function ClearShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$this->StockService->ClearShoppingList();
-		return $this->EmptyApiResponse($response);
+		try
+		{
+			$requestBody = $request->getParsedBody();
+
+			$listId = 1;
+			if (array_key_exists('list_id', $requestBody) && !empty($requestBody['list_id']) && is_numeric($requestBody['list_id']))
+			{
+				$listId = intval($requestBody['list_id']);
+			}
+
+			$this->StockService->ClearShoppingList($listId);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+
+	public function AddProductToShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$requestBody = $request->getParsedBody();
+
+			$listId = 1;
+			$amount = 1;
+			$productId = null;
+			$note = null;
+			if (array_key_exists('list_id', $requestBody) && !empty($requestBody['list_id']) && is_numeric($requestBody['list_id']))
+			{
+				$listId = intval($requestBody['list_id']);
+			}
+			if (array_key_exists('product_amount', $requestBody) && !empty($requestBody['product_amount']) && is_numeric($requestBody['product_amount']))
+			{
+				$amount = intval($requestBody['product_amount']);
+			}
+			if (array_key_exists('product_id', $requestBody) && !empty($requestBody['product_id']) && is_numeric($requestBody['product_id']))
+			{
+				$productId = intval($requestBody['product_id']);
+			}
+			if (array_key_exists('note', $requestBody) && !empty($requestBody['note']))
+			{
+				$note = $requestBody['note'];
+			}
+
+			if ($productId == null)
+			{
+				throw new \Exception("No product id was supplied");
+			}
+
+			$this->StockService->AddProductToShoppingList($productId, $amount, $note, $listId);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function RemoveProductFromShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$requestBody = $request->getParsedBody();
+
+			$listId = 1;
+			$amount = 1;
+			$productId = null;
+			if (array_key_exists('list_id', $requestBody) && !empty($requestBody['list_id']) && is_numeric($requestBody['list_id']))
+			{
+				$listId = intval($requestBody['list_id']);
+			}
+			if (array_key_exists('product_amount', $requestBody) && !empty($requestBody['product_amount']) && is_numeric($requestBody['product_amount']))
+			{
+				$amount = intval($requestBody['product_amount']);
+			}
+			if (array_key_exists('product_id', $requestBody) && !empty($requestBody['product_id']) && is_numeric($requestBody['product_id']))
+			{
+				$productId = intval($requestBody['product_id']);
+			}
+
+			if ($productId == null)
+			{
+				throw new \Exception("No product id was supplied");
+			}
+
+			$this->StockService->RemoveProductFromShoppingList($productId, $amount, $listId);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
 	}
 
 	public function ExternalBarcodeLookup(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
@@ -283,8 +552,75 @@ class StockApiController extends BaseApiController
 		}
 	}
 
+	public function UndoTransaction(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$this->ApiResponse($this->StockService->UndoTransaction($args['transactionId']));
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
 	public function ProductStockEntries(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		return $this->ApiResponse($this->StockService->GetProductStockEntries($args['productId']));
+		$allowSubproductSubstitution = false;
+		if (isset($request->getQueryParams()['include_sub_products']) && filter_var($request->getQueryParams()['include_sub_products'], FILTER_VALIDATE_BOOLEAN))
+		{
+			$allowSubproductSubstitution = true;
+		}
+
+		return $this->ApiResponse($this->StockService->GetProductStockEntries($args['productId'], false, $allowSubproductSubstitution));
+	}
+
+	public function ProductStockLocations(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->ApiResponse($this->StockService->GetProductStockLocations($args['productId']));
+	}
+
+	public function StockEntry(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->ApiResponse($this->StockService->GetStockEntry($args['entryId']));
+	}
+
+	public function StockBooking(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$stockLogRow = $this->Database->stock_log($args['bookingId']);
+
+			if ($stockLogRow === null)
+			{
+				throw new \Exception('Stock booking does not exist');
+			}
+			
+			return $this->ApiResponse($stockLogRow);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function StockTransactions(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$transactionRows = $this->Database->stock_log()->where('transaction_id = :1', $args['transactionId'])->fetchAll();
+
+			if (count($transactionRows) === 0)
+			{
+				throw new \Exception('No transaction was found by the given transaction id');
+			}
+			
+			return $this->ApiResponse($transactionRows);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
 	}
 }

controllers/StockController.php

@@ -3,6 +3,8 @@
 namespace Grocy\Controllers;
 
 use \Grocy\Services\StockService;
+use \Grocy\Services\UsersService;
+use \Grocy\Services\UserfieldsService;
 
 class StockController extends BaseController
 {
@@ -11,21 +13,45 @@ class StockController extends BaseController
 	{
 		parent::__construct($container);
 		$this->StockService = new StockService();
+		$this->UserfieldsService = new UserfieldsService();
 	}
 
 	protected $StockService;
+	protected $UserfieldsService;
 
 	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
+		$usersService = new UsersService();
+		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_expring_soon_days'];
+
 		return $this->AppContainer->view->render($response, 'stockoverview', [
 			'products' => $this->Database->products()->orderBy('name'),
 			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
 			'locations' => $this->Database->locations()->orderBy('name'),
-			'currentStock' => $this->StockService->GetCurrentStock(),
+			'currentStock' => $this->StockService->GetCurrentStock(true),
 			'currentStockLocations' => $this->StockService->GetCurrentStockLocations(),
 			'missingProducts' => $this->StockService->GetMissingProducts(),
-			'nextXDays' => 5,
-			'productGroups' => $this->Database->product_groups()->orderBy('name')
+			'nextXDays' => $nextXDays,
+			'productGroups' => $this->Database->product_groups()->orderBy('name'),
+			'userfields' => $this->UserfieldsService->GetFields('products'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('products')
+		]);
+	}
+
+	public function Stockentries(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$usersService = new UsersService();
+		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_expring_soon_days'];
+
+		return $this->AppContainer->view->render($response, 'stockentries', [
+			'products' => $this->Database->products()->orderBy('name'),
+			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
+			'locations' => $this->Database->locations()->orderBy('name'),
+			'stockEntries' => $this->Database->stock()->orderBy('product_id'),
+			'currentStockLocations' => $this->StockService->GetCurrentStockLocations(),
+			'nextXDays' => $nextXDays,
+			'userfields' => $this->UserfieldsService->GetFields('products'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('products')
 		]);
 	}
 
@@ -41,7 +67,17 @@ class StockController extends BaseController
 	{
 		return $this->AppContainer->view->render($response, 'consume', [
 			'products' => $this->Database->products()->orderBy('name'),
-			'recipes' => $this->Database->recipes()->orderBy('name')
+			'recipes' => $this->Database->recipes()->orderBy('name'),
+			'locations' => $this->Database->locations()->orderBy('name')
+		]);
+	}
+
+	public function Transfer(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'transfer', [
+			'products' => $this->Database->products()->orderBy('name'),
+			'recipes' => $this->Database->recipes()->orderBy('name'),
+			'locations' => $this->Database->locations()->orderBy('name')
 		]);
 	}
 
@@ -53,14 +89,33 @@ class StockController extends BaseController
 		]);
 	}
 
+	public function StockEntryEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'stockentryform', [
+			'stockEntry' => $this->Database->stock()->where('id', $args['entryId'])->fetch(),
+			'products' => $this->Database->products()->orderBy('name'),
+			'locations' => $this->Database->locations()->orderBy('name')
+		]);
+	}
+
 	public function ShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
+		$listId = 1;
+		if (isset($request->getQueryParams()['list']))
+		{
+			$listId = $request->getQueryParams()['list'];
+		}
+
 		return $this->AppContainer->view->render($response, 'shoppinglist', [
-			'listItems' => $this->Database->shopping_list(),
+			'listItems' => $this->Database->shopping_list()->where('shopping_list_id = :1', $listId),
 			'products' => $this->Database->products()->orderBy('name'),
 			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
 			'missingProducts' => $this->StockService->GetMissingProducts(),
-			'productGroups' => $this->Database->product_groups()->orderBy('name')
+			'productGroups' => $this->Database->product_groups()->orderBy('name'),
+			'shoppingLists' => $this->Database->shopping_lists()->orderBy('name'),
+			'selectedShoppingListId' => $listId,
+			'userfields' => $this->UserfieldsService->GetFields('products'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('products')
 		]);
 	}
 
@@ -70,7 +125,9 @@ class StockController extends BaseController
 			'products' => $this->Database->products()->orderBy('name'),
 			'locations' => $this->Database->locations()->orderBy('name'),
 			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
-			'productGroups' => $this->Database->product_groups()->orderBy('name')
+			'productGroups' => $this->Database->product_groups()->orderBy('name'),
+			'userfields' => $this->UserfieldsService->GetFields('products'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('products')
 		]);
 	}
 
@@ -86,7 +143,9 @@ class StockController extends BaseController
 	public function LocationsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'locations', [
-			'locations' => $this->Database->locations()->orderBy('name')
+			'locations' => $this->Database->locations()->orderBy('name'),
+			'userfields' => $this->UserfieldsService->GetFields('locations'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('locations')
 		]);
 	}
 
@@ -94,14 +153,18 @@ class StockController extends BaseController
 	{
 		return $this->AppContainer->view->render($response, 'productgroups', [
 			'productGroups' => $this->Database->product_groups()->orderBy('name'),
-			'products' => $this->Database->products()->orderBy('name')
+			'products' => $this->Database->products()->orderBy('name'),
+			'userfields' => $this->UserfieldsService->GetFields('product_groups'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('product_groups')
 		]);
 	}
 
 	public function QuantityUnitsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'quantityunits', [
-			'quantityunits' => $this->Database->quantity_units()->orderBy('name')
+			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
+			'userfields' => $this->UserfieldsService->GetFields('quantity_units'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('quantity_units')
 		]);
 	}
 
@@ -113,17 +176,26 @@ class StockController extends BaseController
 				'locations' =>  $this->Database->locations()->orderBy('name'),
 				'quantityunits' =>  $this->Database->quantity_units()->orderBy('name'),
 				'productgroups' => $this->Database->product_groups()->orderBy('name'),
+				'userfields' => $this->UserfieldsService->GetFields('products'),
+				'products' => $this->Database->products()->where('parent_product_id IS NULL')->orderBy('name'),
+				'isSubProductOfOthers' => false,
 				'mode' => 'create'
 			]);
 		}
 		else
 		{
+			$product = $this->Database->products($args['productId']);
+
 			return $this->AppContainer->view->render($response, 'productform', [
-				'product' =>  $this->Database->products($args['productId']),
+				'product' =>  $product,
 				'locations' =>  $this->Database->locations()->orderBy('name'),
 				'quantityunits' =>  $this->Database->quantity_units()->orderBy('name'),
 				'productgroups' => $this->Database->product_groups()->orderBy('name'),
-				'mode' => 'edit'
+				'userfields' => $this->UserfieldsService->GetFields('products'),
+				'products' => $this->Database->products()->where('id != :1 AND parent_product_id IS NULL', $product->id)->orderBy('name'),
+				'isSubProductOfOthers' => $this->Database->products()->where('parent_product_id = :1', $product->id)->count() !== 0,
+				'mode' => 'edit',
+				'quConversions' => $this->Database->quantity_unit_conversions()
 			]);
 		}
 	}
@@ -133,14 +205,16 @@ class StockController extends BaseController
 		if ($args['locationId'] == 'new')
 		{
 			return $this->AppContainer->view->render($response, 'locationform', [
-				'mode' => 'create'
+				'mode' => 'create',
+				'userfields' => $this->UserfieldsService->GetFields('locations')
 			]);
 		}
 		else
 		{
 			return $this->AppContainer->view->render($response, 'locationform', [
 				'location' =>  $this->Database->locations($args['locationId']),
-				'mode' => 'edit'
+				'mode' => 'edit',
+				'userfields' => $this->UserfieldsService->GetFields('locations')
 			]);
 		}
 	}
@@ -150,14 +224,16 @@ class StockController extends BaseController
 		if ($args['productGroupId'] == 'new')
 		{
 			return $this->AppContainer->view->render($response, 'productgroupform', [
-				'mode' => 'create'
+				'mode' => 'create',
+				'userfields' => $this->UserfieldsService->GetFields('product_groups')
 			]);
 		}
 		else
 		{
 			return $this->AppContainer->view->render($response, 'productgroupform', [
 				'group' =>  $this->Database->product_groups($args['productGroupId']),
-				'mode' => 'edit'
+				'mode' => 'edit',
+				'userfields' => $this->UserfieldsService->GetFields('product_groups')
 			]);
 		}
 	}
@@ -167,14 +243,24 @@ class StockController extends BaseController
 		if ($args['quantityunitId'] == 'new')
 		{
 			return $this->AppContainer->view->render($response, 'quantityunitform', [
-				'mode' => 'create'
+				'mode' => 'create',
+				'userfields' => $this->UserfieldsService->GetFields('quantity_units'),
+				'pluralCount' => $this->LocalizationService->GetPluralCount(),
+				'pluralRule' => $this->LocalizationService->GetPluralDefinition()
 			]);
 		}
 		else
 		{
+			$quantityUnit = $this->Database->quantity_units($args['quantityunitId']);
+
 			return $this->AppContainer->view->render($response, 'quantityunitform', [
-				'quantityunit' =>  $this->Database->quantity_units($args['quantityunitId']),
-				'mode' => 'edit'
+				'quantityUnit' =>  $quantityUnit,
+				'mode' => 'edit',
+				'userfields' => $this->UserfieldsService->GetFields('quantity_units'),
+				'pluralCount' => $this->LocalizationService->GetPluralCount(),
+				'pluralRule' => $this->LocalizationService->GetPluralDefinition(),
+				'defaultQuConversions' => $this->Database->quantity_unit_conversions()->where('from_qu_id = :1 AND product_id IS NULL', $quantityUnit->id),
+				'quantityUnits' => $this->Database->quantity_units()
 			]);
 		}
 	}
@@ -183,16 +269,35 @@ class StockController extends BaseController
 	{
 		if ($args['itemId'] == 'new')
 		{
-			return $this->AppContainer->view->render($response, 'shoppinglistform', [
+			return $this->AppContainer->view->render($response, 'shoppinglistitemform', [
 				'products' =>  $this->Database->products()->orderBy('name'),
+				'shoppingLists' => $this->Database->shopping_lists()->orderBy('name'),
+				'mode' => 'create'
+			]);
+		}
+		else
+		{
+			return $this->AppContainer->view->render($response, 'shoppinglistitemform', [
+				'listItem' =>  $this->Database->shopping_list($args['itemId']),
+				'products' =>  $this->Database->products()->orderBy('name'),
+				'shoppingLists' => $this->Database->shopping_lists()->orderBy('name'),
+				'mode' => 'edit'
+			]);
+		}
+	}
+
+	public function ShoppingListEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if ($args['listId'] == 'new')
+		{
+			return $this->AppContainer->view->render($response, 'shoppinglistform', [
 				'mode' => 'create'
 			]);
 		}
 		else
 		{
 			return $this->AppContainer->view->render($response, 'shoppinglistform', [
-				'listItem' =>  $this->Database->shopping_list($args['itemId']),
-				'products' =>  $this->Database->products()->orderBy('name'),
+				'shoppingList' =>  $this->Database->shopping_lists($args['listId']),
 				'mode' => 'edit'
 			]);
 		}
@@ -202,8 +307,63 @@ class StockController extends BaseController
 	{
 		return $this->AppContainer->view->render($response, 'stockjournal', [
 			'stockLog' => $this->Database->stock_log()->orderBy('row_created_timestamp', 'DESC'),
+			'locations' => $this->Database->locations()->orderBy('name'),
 			'products' => $this->Database->products()->orderBy('name'),
 			'quantityunits' => $this->Database->quantity_units()->orderBy('name')
 		]);
 	}
+
+	public function LocationContentSheet(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'locationcontentsheet', [
+			'products' => $this->Database->products()->orderBy('name'),
+			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
+			'locations' => $this->Database->locations()->orderBy('name'),
+			'currentStockLocationContent' => $this->StockService->GetCurrentStockLocationContent()
+		]);
+	}
+
+	public function QuantityUnitConversionEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$product = null;
+		if (isset($request->getQueryParams()['product']))
+		{
+			$product = $this->Database->products($request->getQueryParams()['product']);
+		}
+
+		$defaultQuUnit = null;
+		if (isset($request->getQueryParams()['qu-unit']))
+		{
+			$defaultQuUnit = $this->Database->quantity_units($request->getQueryParams()['qu-unit']);
+		}
+
+		if ($args['quConversionId'] == 'new')
+		{
+			return $this->AppContainer->view->render($response, 'quantityunitconversionform', [
+				'mode' => 'create',
+				'userfields' => $this->UserfieldsService->GetFields('quantity_unit_conversions'),
+				'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
+				'product' => $product,
+				'defaultQuUnit' => $defaultQuUnit
+			]);
+		}
+		else
+		{
+			return $this->AppContainer->view->render($response, 'quantityunitconversionform', [
+				'quConversion' =>  $this->Database->quantity_unit_conversions($args['quConversionId']),
+				'mode' => 'edit',
+				'userfields' => $this->UserfieldsService->GetFields('quantity_unit_conversions'),
+				'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
+				'product' => $product,
+				'defaultQuUnit' => $defaultQuUnit
+			]);
+		}
+	}
+
+	public function QuantityUnitPluralFormTesting(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'quantityunitpluraltesting', [
+			'quantityUnits' => $this->Database->quantity_units()->orderBy('name')
+		]);
+	}
 }

controllers/SystemApiController.php

@@ -32,7 +32,7 @@ class SystemApiController extends BaseApiController
 			{
 				$requestBody = $request->getParsedBody();
 
-				$this->LocalizationService->LogMissingLocalization(GROCY_CULTURE, $requestBody['text']);
+				$this->LocalizationService->CheckAndAddMissingTranslationToPot($requestBody['text']);
 				return $this->EmptyApiResponse($response);
 			}
 			catch (\Exception $ex)

controllers/SystemController.php

@@ -8,27 +8,90 @@ use \Grocy\Services\DemoDataGeneratorService;
 
 class SystemController extends BaseController
 {
+	protected $ApplicationService;
+
 	public function __construct(\Slim\Container $container)
 	{
 		parent::__construct($container);
 		$this->ApplicationService = new ApplicationService();
 	}
 
-	protected $ApplicationService;
-
 	public function Root(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		// Schema migration is done here
 		$databaseMigrationService = new DatabaseMigrationService();
 		$databaseMigrationService->MigrateDatabase();
 
-		if (GROCY_IS_DEMO_INSTALL)
+		if (GROCY_MODE === 'dev' || GROCY_MODE === 'demo' || GROCY_MODE === 'prerelease')
 		{
 			$demoDataGeneratorService = new DemoDataGeneratorService();
 			$demoDataGeneratorService->PopulateDemoData();
 		}
 
-		return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/stockoverview'));
+		return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl($this->GetEntryPageRelative()));
+	}
+
+	/**
+	 * Get the entry page of the application based on the value of the entry page setting.
+	 *
+	 * We fallback to the about page when no entry page is specified or
+	 * when the specified entry page has been disabled.
+	 *
+	 * @return string
+	 */
+	private function GetEntryPageRelative()
+	{
+		if (defined('GROCY_ENTRY_PAGE')) {
+			$entryPage = constant('GROCY_ENTRY_PAGE');
+		} else {
+			$entryPage = 'stock';
+		}
+
+		// Stock
+		if ($entryPage === 'stock' && constant('GROCY_FEATURE_FLAG_STOCK')) {
+			return '/stockoverview';
+		}
+
+		// Shoppinglist
+		if ($entryPage === 'shoppinglist' && constant('GROCY_FEATURE_FLAG_SHOPPINGLIST')) {
+			return '/shoppinglist';
+		}
+
+		// Recipes
+		if ($entryPage === 'recipes' && constant('GROCY_FEATURE_FLAG_RECIPES')) {
+			return '/recipes';
+		}
+
+		// Chores
+		if ($entryPage === 'chores' && constant('GROCY_FEATURE_FLAG_CHORES')) {
+			return '/choresoverview';
+		}
+
+		// Tasks
+		if ($entryPage === 'tasks' && constant('GROCY_FEATURE_FLAG_TASKS')) {
+			return '/tasks';
+		}
+
+		// Batteries
+		if ($entryPage === 'batteries' && constant('GROCY_FEATURE_FLAG_BATTERIES')) {
+			return '/batteriesoverview';
+		}
+
+		if ($entryPage === 'equipment' && constant('GROCY_FEATURE_FLAG_EQUIPMENT')) {
+			return '/equipment';
+		}
+
+		// Calendar
+		if ($entryPage === 'calendar' && constant('GROCY_FEATURE_FLAG_CALENDAR')) {
+			return '/calendar';
+		}
+		
+		// Meal Plan
+		if ($entryPage === 'mealplan' && constant('GROCY_FEATURE_FLAG_RECIPES')) {
+			return '/mealplan';
+		}
+
+		return '/about';
 	}
 
 	public function About(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
@@ -38,4 +101,9 @@ class SystemController extends BaseController
 			'changelog' => $this->ApplicationService->GetChangelog()
 		]);
 	}
+
+	public function BarcodeScannerTesting(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'barcodescannertesting');
+	}
 }

controllers/TasksApiController.php

@@ -39,4 +39,17 @@ class TasksApiController extends BaseApiController
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
+
+	public function UndoTask(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$this->TasksService->UndoTask($args['taskId']);
+			return $this->EmptyApiResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
 }

controllers/TasksController.php

@@ -3,6 +3,8 @@
 namespace Grocy\Controllers;
 
 use \Grocy\Services\TasksService;
+use \Grocy\Services\UsersService;
+use \Grocy\Services\UserfieldsService;
 
 class TasksController extends BaseController
 {
@@ -10,9 +12,11 @@ class TasksController extends BaseController
 	{
 		parent::__construct($container);
 		$this->TasksService = new TasksService();
+		$this->UserfieldsService = new UserfieldsService();
 	}
 
 	protected $TasksService;
+	protected $UserfieldsService;
 
 	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
@@ -25,11 +29,16 @@ class TasksController extends BaseController
 			$tasks = $this->TasksService->GetCurrent();
 		}
 
+		$usersService = new UsersService();
+		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['tasks_due_soon_days'];
+
 		return $this->AppContainer->view->render($response, 'tasks', [
 			'tasks' => $tasks,
-			'nextXDays' => 5,
+			'nextXDays' => $nextXDays,
 			'taskCategories' => $this->Database->task_categories()->orderBy('name'),
-			'users' => $this->Database->users()
+			'users' => $this->Database->users(),
+			'userfields' => $this->UserfieldsService->GetFields('tasks'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('tasks')
 		]);
 	}
 
@@ -40,7 +49,8 @@ class TasksController extends BaseController
 			return $this->AppContainer->view->render($response, 'taskform', [
 				'mode' => 'create',
 				'taskCategories' => $this->Database->task_categories()->orderBy('name'),
-				'users' => $this->Database->users()->orderBy('username')
+				'users' => $this->Database->users()->orderBy('username'),
+				'userfields' => $this->UserfieldsService->GetFields('tasks')
 			]);
 		}
 		else
@@ -49,7 +59,8 @@ class TasksController extends BaseController
 				'task' =>  $this->Database->tasks($args['taskId']),
 				'mode' => 'edit',
 				'taskCategories' => $this->Database->task_categories()->orderBy('name'),
-				'users' => $this->Database->users()->orderBy('username')
+				'users' => $this->Database->users()->orderBy('username'),
+				'userfields' => $this->UserfieldsService->GetFields('tasks')
 			]);
 		}
 	}
@@ -57,7 +68,9 @@ class TasksController extends BaseController
 	public function TaskCategoriesList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'taskcategories', [
-			'taskCategories' => $this->Database->task_categories()->orderBy('name')
+			'taskCategories' => $this->Database->task_categories()->orderBy('name'),
+			'userfields' => $this->UserfieldsService->GetFields('task_categories'),
+			'userfieldValues' => $this->UserfieldsService->GetAllValues('task_categories')
 		]);
 	}
 
@@ -66,15 +79,22 @@ class TasksController extends BaseController
 		if ($args['categoryId'] == 'new')
 		{
 			return $this->AppContainer->view->render($response, 'taskcategoryform', [
-				'mode' => 'create'
+				'mode' => 'create',
+				'userfields' => $this->UserfieldsService->GetFields('task_categories')
 			]);
 		}
 		else
 		{
 			return $this->AppContainer->view->render($response, 'taskcategoryform', [
 				'category' =>  $this->Database->task_categories($args['categoryId']),
-				'mode' => 'edit'
+				'mode' => 'edit',
+				'userfields' => $this->UserfieldsService->GetFields('task_categories')
 			]);
 		}
 	}
+
+	public function TasksSettings(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'taskssettings');
+	}
 }

data/viewcache/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

helpers/extensions.php

@@ -82,16 +82,26 @@ function SumArrayValue($array, $propertyName)
 	$sum = 0;
 	foreach($array as $object)
 	{
-		$sum += $object->{$propertyName};
+		$sum += floatval($object->{$propertyName});
 	}
 
 	return $sum;
 }
 
-function GetClassConstants($className)
+function GetClassConstants($className, $prefix = null)
 {
 	$r = new ReflectionClass($className);
-	return $r->getConstants();
+	$constants = $r->getConstants();
+
+	if ($prefix === null)
+	{
+		return $constants;
+	}
+	else
+	{
+		$matchingKeys = preg_grep('!^' . $prefix . '!', array_keys($constants));
+		return array_intersect_key($constants, array_flip($matchingKeys));
+	}
 }
 
 function RandomString($length, $allowedChars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
@@ -140,7 +150,18 @@ function Setting(string $name, $value)
 		}
 		elseif (getenv('GROCY_' . $name) !== false) // An environment variable with the same name and prefix GROCY_ overwrites the given setting
 		{
-			define('GROCY_' . $name, getenv('GROCY_' . $name));
+			if (strtolower(getenv('GROCY_' . $name)) === "true")
+			{
+				define('GROCY_' . $name, true);
+			}
+			elseif (strtolower(getenv('GROCY_' . $name)) === "false")
+			{
+				define('GROCY_' . $name, false);
+			}
+			else
+			{
+				define('GROCY_' . $name, getenv('GROCY_' . $name));
+			}
 		}
 		else
 		{
@@ -163,7 +184,7 @@ function DefaultUserSetting(string $name, $value)
 function GetUserDisplayName($user)
 {
 	$displayName = '';
-	
+
 	if (empty($user->first_name) && !empty($user->last_name))
 	{
 		$displayName = $user->last_name;
@@ -184,16 +205,6 @@ function GetUserDisplayName($user)
 	return $displayName;
 }
 
-function Pluralize($number, $singularForm, $pluralForm)
-{
-	$text = $singularForm;
-	if ($number != 1 && $pluralForm !== null && !empty($pluralForm))
-	{
-		$text = $pluralForm;
-	}
-	return $text;
-}
-
 function IsValidFileName($fileName)
 {
 	if(preg_match('=^[^/?*;:{}\\\\]+\.[^/?*;:{}\\\\]+$=', $fileName))
@@ -203,3 +214,25 @@ function IsValidFileName($fileName)
 
 	return false;
 }
+
+function IsJsonString($text)
+{
+	json_decode($text);
+	return (json_last_error() == JSON_ERROR_NONE);
+}
+
+function string_starts_with($haystack, $needle)
+{
+	return (substr($haystack, 0, strlen($needle)) === $needle);
+}
+
+function string_ends_with($haystack, $needle)
+{
+	$length = strlen($needle);
+	if ($length == 0)
+	{
+		return true;
+	}
+
+	return (substr($haystack, -$length) === $needle);
+}

localization/chore_assignment_types.pot

@@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Translation migration from old PHP array files\n"
+"Language-Team: http://www.transifex.com/grocy/grocy/language/en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01T17:59:17+00:00\n"
+"Language: en\n"
+"X-Domain: grocy/chore_assignment_types\n"
+
+msgid "no-assignment"
+msgstr ""
+
+msgid "who-least-did-first"
+msgstr ""
+
+msgid "random"
+msgstr ""
+
+msgid "in-alphabetical-order"
+msgstr ""

localization/chore_period_types.pot

@@ -0,0 +1,31 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Translation migration from old PHP array files\n"
+"Language-Team: http://www.transifex.com/grocy/grocy/language/en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01T17:59:17+00:00\n"
+"Language: en\n"
+"X-Domain: grocy/chore_types\n"
+
+msgid "manually"
+msgstr ""
+
+msgid "dynamic-regular"
+msgstr ""
+
+msgid "daily"
+msgstr ""
+
+msgid "weekly"
+msgstr ""
+
+msgid "monthly"
+msgstr ""
+
+msgid "yearly"
+msgstr ""

localization/component_translations.pot

@@ -0,0 +1,34 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Translation migration from old PHP array files\n"
+"Language-Team: http://www.transifex.com/grocy/grocy/language/en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01T17:59:17+00:00\n"
+"Language: en\n"
+"X-Domain: grocy/component_translations\n"
+
+msgid "timeago_locale"
+msgstr ""
+
+msgid "timeago_nan"
+msgstr ""
+
+msgid "moment_locale"
+msgstr ""
+
+msgid "datatables_localization"
+msgstr ""
+
+msgid "summernote_locale"
+msgstr ""
+
+msgid "fullcalendar_locale"
+msgstr ""
+
+msgid "bootstrap-select_locale"
+msgstr ""

localization/da/chore_assignment_types.po

@@ -0,0 +1,29 @@
+# Translators:
+# Troels Siggaard <troels@siggaard.com>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-09-17 10:45+0000\n"
+"Last-Translator: Troels Siggaard <troels@siggaard.com>, 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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/chore_assignment_types\n"
+
+msgid "no-assignment"
+msgstr "ingen-tildeling"
+
+msgid "who-least-did-first"
+msgstr "hvem-mindst-gjorde-først"
+
+msgid "random"
+msgstr "tilfældig"
+
+msgid "in-alphabetical-order"
+msgstr "i-alfabetisk-rækkefølge"

localization/da/chore_period_types.po

@@ -0,0 +1,37 @@
+# Translators:
+# Troels Siggaard <troels@siggaard.com>, 2019
+# Rasmus Bojsen <rasmus@bojsen.cn>, 2019
+# Brian Moos Lindberg <brian@blueeel.dk>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
+"Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/chore_types\n"
+
+msgid "manually"
+msgstr "manuelt"
+
+msgid "dynamic-regular"
+msgstr "dynamisk-regelmæssig"
+
+msgid "daily"
+msgstr "daglig"
+
+msgid "weekly"
+msgstr "ugentlig"
+
+msgid "monthly"
+msgstr "månedlig"
+
+msgid "yearly"
+msgstr "årlig"

localization/da/chore_types.php

@@ -1,6 +0,0 @@
-<?php
-
-return array(
-	'manually' => 'Manuelt',
-	'dynamic-regular' => 'Dynamic regular'
-);

localization/da/component_translations.php

@@ -1,10 +0,0 @@
-<?php
-
-return array(
-	'timeago_locale' => 'en',
-	'timeago_nan' => 'NaN years ago',
-	'moment_locale' => 'x',
-	'datatables_localization' => '{"sEmptyTable":"No data available in table","sInfo":"Showing _START_ to _END_ of _TOTAL_ entries","sInfoEmpty":"Showing 0 to 0 of 0 entries","sInfoFiltered":"(filtered from _MAX_ total entries)","sInfoPostFix":"","sInfoThousands":",","sLengthMenu":"Show _MENU_ entries","sLoadingRecords":"Loading...","sProcessing":"Processing...","sSearch":"Search:","sZeroRecords":"No matching records found","oPaginate":{"sFirst":"First","sLast":"Last","sNext":"Next","sPrevious":"Previous"},"oAria":{"sSortAscending":": activate to sort column ascending","sSortDescending":": activate to sort column descending"}}',
-	'summernote_locale' => 'x',
-	'fullcalendar_locale' => 'x'
-);

localization/da/component_translations.po

@@ -0,0 +1,55 @@
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"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"
+
+msgid "datatables_localization"
+msgstr ""
+"{\n"
+"\"sProcessing\": \"Henter...\",\n"
+"\"sLengthMenu\": \"Vis _MENU_ linjer\",\n"
+"\"sZeroRecords\": \"Ingen linjer matcher s&oslash;gningen\",\n"
+"\"sInfo\": \"Viser _START_ til _END_ af _TOTAL_ linjer\",\n"
+"\"sInfoEmpty\": \"Viser 0 til 0 af 0 linjer\",\n"
+"\"sInfoFiltered\": \"(filtreret fra _MAX_ linjer)\",\n"
+"\"sInfoPostFix\": \"\",\n"
+"\"sSearch\": \"S&oslash;g:\",\n"
+"\"sUrl\": \"\",\n"
+"\"oPaginate\": {\n"
+"\"sFirst\": \"F&oslash;rste\",\n"
+"\"sPrevious\": \"Forrige\",\n"
+"\"sNext\": \"N&aelig;ste\",\n"
+"\"sLast\": \"Sidste\"\n"
+"}\n"
+"}"
+
+msgid "summernote_locale"
+msgstr "da-DK"
+
+msgid "fullcalendar_locale"
+msgstr "da"
+
+msgid "bootstrap-select_locale"
+msgstr "da_DK"

localization/da/demo_data.php

@@ -1,90 +0,0 @@
-<?php
-
-return array(
-	'Cookies' => 'Småkager',
-	'Chocolate' => 'chokolade',
-	'Pantry' => 'Spisekammer',
-	'Candy cupboard' => 'Slik skuffe',
-	'Tinned food cupboard' => 'Dåsemadsskab',
-	'Fridge' => 'Køleskab',
-	'Piece' => 'Styk',
-	'Pieces' => 'Stykker',
-	'Pack' => 'Pakke',
-	'Packs' => 'Pakker',
-	'Glass' => 'Glas',
-	'Glasses' => 'Glas',
-	'Tin' => 'Beholder',
-	'Tins' => 'Beholdere',
-	'Can' => 'Dåse',
-	'Cans' => 'Dåser',
-	'Bunch' => 'Bundt',
-	'Bunches' => 'Bundt',
-	'Gummy bears' => 'Vingummi bamser',
-	'Crisps' => 'Chips',
-	'Eggs' => 'Æg',
-	'Noodles' => 'Nudler',
-	'Pickles' => 'Syltede agurker',
-	'Gulash soup' => 'Gulash',
-	'Yogurt' => 'Yoghurt',
-	'Cheese' => 'Ost',
-	'Cold cuts' => 'Pålæg',
-	'Paprika' => 'Paprika',
-	'Cucumber' => 'Agurk',
-	'Radish' => 'Radisse',
-	'Tomato' => 'Tomat',
-	'Changed towels in the bathroom' => 'Skiftede håndklæder i badeværelset',
-	'Cleaned the kitchen floor' => 'Gjorde køkkengulvet rent',
-	'Warranty ends' => 'Reklamationsret udløber',
-	'TV remote control' => 'Fjernbetjening',
-	'Alarm clock' => 'Vægge ur',
-	'Heat remote control' => 'Varmefjernbetjening',
-	'Lawn mowed in the garden' => 'Græs slået',
-	'Some good snacks' => 'Nogle gode snacks',
-	'Pizza dough' => 'Pizza dej',
-	'Sieved tomatoes' => 'Sigtede tomater',
-	'Salami' => 'Salami',
-	'Toast' => 'Toast',
-	'Minced meat' => 'Hakkekød',
-	'Pizza' => 'Pizza',
-	'Spaghetti bolognese' => 'Spaghetti bolognese',
-	'Sandwiches' => 'Sandwiches',
-	'English' => 'Engelsk',
-	'German' => 'Tysk',
-	'Italian' => 'Italiænsk',
-	'Demo in different language' => 'Demo i et andet sprog',
-	'This is the note content of the recipe ingredient' => 'Dette er indholdet af opskrift ingrediensens notefelt',
-	'Demo User' => 'Demo Bruger',
-	'Gram' => 'Gram',
-	'Grams' => 'Gram',
-	'Flour' => 'Mel',
-	'Pancakes' => 'Pandekager',
-	'Sugar' => 'Sukker',
-	'Home' => 'Hjem',
-	'Life' => 'Liv',
-	'Projects' => 'Projekter',
-	'Repair the garage door' => 'Reparér garagedøren',
-	'Fork and improve grocy' => 'Fork og forbedre grocy',
-	'Find a solution for what to do when I forget the door keys' => 'Find en løsning for når jeg glemmer husnøglen',
-	'Sweets' => 'Slik',
-	'Bakery products' => 'Bageriprodukter',
-	'Tinned food' => 'Dåsemad',
-	'Butchery products' => 'Slagteriprodukter',
-	'Vegetables/Fruits' => 'Frugt og grønt',
-	'Refrigerated products' => 'Nedkølede produkter',
-	'Coffee machine' => 'Kaffemaskine',
-	'Dishwasher' => 'Opvasker',
-	'Liter' => 'Liter',
-	'Liters' => 'Liter',
-	'Bottle' => 'Flaske',
-	'Bottles' => 'Flasker',
-	'Milk' => 'Mælk',
-	'Chocolate sauce' => 'Chokoladesauce',
-	'Milliliters' => 'Milliliter',
-	'Milliliter' => 'Milliliter',
-	'Bottom' => 'Bund',
-	'Topping' => 'Topping',
-	'French' => 'Fransk',
-	'Turkish' => 'Turkish',
-	'Spanish' => 'Spanish',
-	'Russian' => 'Russian'
-);

localization/da/demo_data.po

@@ -0,0 +1,348 @@
+# Translators:
+# dark159123 <r.j.hansen@protonmail.com>, 2019
+# Troels Siggaard <troels@siggaard.com>, 2019
+# Rasmus Bojsen <rasmus@bojsen.cn>, 2019
+# Brian Moos Lindberg <brian@blueeel.dk>, 2019
+# 
+msgid ""
+msgstr ""
+"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: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
+"Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/demo_data\n"
+
+msgid "Cookies"
+msgstr "Småkager"
+
+msgid "Chocolate"
+msgstr "Chokolade"
+
+msgid "Pantry"
+msgstr "Spisekammer"
+
+msgid "Candy cupboard"
+msgstr "Slikskuffe"
+
+msgid "Tinned food cupboard"
+msgstr "Dåsemadsskab"
+
+msgid "Fridge"
+msgstr "Køleskab"
+
+msgid "Piece"
+msgid_plural "Pieces"
+msgstr[0] "stk"
+msgstr[1] "stk"
+
+msgid "Pack"
+msgid_plural "Packs"
+msgstr[0] "Pakke"
+msgstr[1] "Pakker"
+
+msgid "Glass"
+msgid_plural "Glasses"
+msgstr[0] "Glas"
+msgstr[1] "Glas"
+
+msgid "Tin"
+msgid_plural "Tins"
+msgstr[0] "Dåse"
+msgstr[1] "Dåser"
+
+msgid "Can"
+msgid_plural "Cans"
+msgstr[0] "Dåse"
+msgstr[1] "Dåser"
+
+msgid "Bunch"
+msgid_plural "Bunches"
+msgstr[0] "Klase"
+msgstr[1] "Klaser"
+
+msgid "Gummy bears"
+msgstr "Vingummibamser"
+
+msgid "Crisps"
+msgstr "Chips"
+
+msgid "Eggs"
+msgstr "Æg"
+
+msgid "Noodles"
+msgstr "Nudler"
+
+msgid "Pickles"
+msgstr "Syltede agurker"
+
+msgid "Gulash soup"
+msgstr "Gullashsuppe"
+
+msgid "Yogurt"
+msgstr "Yoghurt"
+
+msgid "Cheese"
+msgstr "Ost"
+
+msgid "Cold cuts"
+msgstr "Pålæg"
+
+msgid "Paprika"
+msgstr "Paprika"
+
+msgid "Cucumber"
+msgstr "Agurk"
+
+msgid "Radish"
+msgstr "Radisse"
+
+msgid "Tomato"
+msgstr "Tomat"
+
+msgid "Changed towels in the bathroom"
+msgstr "Skiftede håndklæder i badeværelset"
+
+msgid "Cleaned the kitchen floor"
+msgstr "Gjorde køkkengulvet rent"
+
+msgid "Warranty ends"
+msgstr "Reklamationsret udløber"
+
+msgid "TV remote control"
+msgstr "Fjernbetjening til TV'et"
+
+msgid "Alarm clock"
+msgstr "Væggeur"
+
+msgid "Heat remote control"
+msgstr "Fjernbetjening til varme"
+
+msgid "Lawn mowed in the garden"
+msgstr "Græsset blev slået i haven"
+
+msgid "Some good snacks"
+msgstr "Nogle gode snacks"
+
+msgid "Pizza dough"
+msgstr "Pizzadej"
+
+msgid "Sieved tomatoes"
+msgstr "Sigtede tomater"
+
+msgid "Salami"
+msgstr "Salami"
+
+msgid "Toast"
+msgstr "Toast"
+
+msgid "Minced meat"
+msgstr "Hakkekød"
+
+msgid "Pizza"
+msgstr "Pizza"
+
+msgid "Spaghetti bolognese"
+msgstr "Spaghetti bolognese"
+
+msgid "Sandwiches"
+msgstr "Sandwich"
+
+msgid "English"
+msgstr "Engelsk"
+
+msgid "German"
+msgstr "Tysk"
+
+msgid "Italian"
+msgstr "Italiensk"
+
+msgid "This is the note content of the recipe ingredient"
+msgstr "Dette er indholdet af opskrift-ingrediensens notefeltet"
+
+msgid "Demo User"
+msgstr "Demobruger"
+
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] "Gram"
+msgstr[1] "Gram"
+
+msgid "Flour"
+msgstr "Mel"
+
+msgid "Pancakes"
+msgstr "Pandekager"
+
+msgid "Sugar"
+msgstr "Sukker"
+
+msgid "Home"
+msgstr "Hjem"
+
+msgid "Life"
+msgstr "Livet"
+
+msgid "Projects"
+msgstr "Projekter"
+
+msgid "Repair the garage door"
+msgstr "Reparer garagedøren"
+
+msgid "Fork and improve grocy"
+msgstr "Fork og forbedre grocy"
+
+msgid "Find a solution for what to do when I forget the door keys"
+msgstr "Find en løsning på hvad jeg gør, når jeg glemmer nøglen til huset"
+
+msgid "Sweets"
+msgstr "Slik"
+
+msgid "Bakery products"
+msgstr "Bagværk"
+
+msgid "Tinned food"
+msgstr "Dåsemad"
+
+msgid "Butchery products"
+msgstr "Slagteriprodukter"
+
+msgid "Vegetables/Fruits"
+msgstr "Frugt og grønt"
+
+msgid "Refrigerated products"
+msgstr "Køleskabsvarer"
+
+msgid "Coffee machine"
+msgstr "Kaffemaskine"
+
+msgid "Dishwasher"
+msgstr "Opvaskemaskine"
+
+msgid "Liter"
+msgstr "Liter"
+
+msgid "Liters"
+msgstr "Liter"
+
+msgid "Bottle"
+msgstr "Flaske"
+
+msgid "Bottles"
+msgstr "Flasker"
+
+msgid "Milk"
+msgstr "Mælk"
+
+msgid "Chocolate sauce"
+msgstr "Chokoladesauce"
+
+msgid "Milliliters"
+msgstr "Milliliter"
+
+msgid "Milliliter"
+msgstr "Milliliter"
+
+msgid "Bottom"
+msgstr "Bund"
+
+msgid "Topping"
+msgstr "Topping"
+
+msgid "French"
+msgstr "Fransk"
+
+msgid "Turkish"
+msgstr "Tyrkisk"
+
+msgid "Spanish"
+msgstr "Spansk"
+
+msgid "Russian"
+msgstr "Russisk"
+
+msgid "The thing which happens on the 5th of every month"
+msgstr "Det der sker hver den 5. i måneden"
+
+msgid "The thing which happens daily"
+msgstr "Det der sker dagligt"
+
+msgid "The thing which happens on Mondays and Wednesdays"
+msgstr "Det der sker på mandage og onsdage"
+
+msgid "Swedish"
+msgstr "Svensk"
+
+msgid "Polish"
+msgstr "Polsk"
+
+msgid "Milk Chocolate"
+msgstr "Mælkechokolade"
+
+msgid "Dark Chocolate"
+msgstr "Mørk chokolade"
+
+msgid "Slice"
+msgid_plural "Slices"
+msgstr[0] "Skive"
+msgstr[1] "Skiver"
+
+msgid "Example userentity"
+msgstr "Eksempel-brugerenhed"
+
+msgid "This is an example user entity..."
+msgstr "Dette er en eksempel-brugerenhed..."
+
+msgid "Custom field"
+msgstr "Brugerdefineret felt"
+
+msgid "Example field value..."
+msgstr "Eksempel-feltværdi..."
+
+msgid "Waffle rolls"
+msgstr "Vaffelruller"
+
+msgid "Danish"
+msgstr "Dansk"
+
+msgid "Dutch"
+msgstr "Hollandsk"
+
+msgid "Norwegian"
+msgstr "Norsk"
+
+msgid "Demo"
+msgstr "Demo"
+
+msgid "Stable version"
+msgstr "Stabil version"
+
+msgid "Preview version"
+msgstr "Forhåndsvisningsversion"
+
+msgid "current release"
+msgstr "aktuel udgivelse"
+
+msgid "not yet released"
+msgstr "Ikke frigivet endnu"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portugisisk (Brasilien)"
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
+msgstr ""

localization/da/stock_transaction_types.php

@@ -1,8 +0,0 @@
-<?php
-
-return array(
-	'purchase' => 'Køb',
-	'consume' => 'Brug',
-	'inventory-correction' => 'Beholdningsrettelse',
-	'product-opened' => 'Produkt åbnet'
-);

localization/da/stock_transaction_types.po

@@ -0,0 +1,45 @@
+# Translators:
+# Troels Siggaard <troels@siggaard.com>, 2019
+# Brian Moos Lindberg <brian@blueeel.dk>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Brian Moos Lindberg <brian@blueeel.dk>, 2019\n"
+"Language-Team: Danish (https://www.transifex.com/grocy/teams/93189/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/stock_transaction_types\n"
+
+msgid "purchase"
+msgstr "køb"
+
+msgid "transfer_from"
+msgstr "flyt_fra"
+
+msgid "transfer_to"
+msgstr "flyt_til"
+
+msgid "consume"
+msgstr "forbrug"
+
+msgid "inventory-correction"
+msgstr "beholdningsrettelse"
+
+msgid "product-opened"
+msgstr "produkt-åbnet"
+
+msgid "stock-edit-old"
+msgstr "lager-redigering-gammel"
+
+msgid "stock-edit-new"
+msgstr "lager-redigering-ny"
+
+msgid "self-production"
+msgstr ""

localization/da/strings.php

@@ -1,348 +0,0 @@
-<?php
-
-return array(
-	'Stock overview' => 'Beholdnings oversigt',
-	'#1 products expiring within the next #2 days' => '#1 produkter der udløber inden for de næste #2 dage',
-	'#1 products are already expired' => '#1 produkter er allerede udløbede',
-	'#1 products are below defined min. stock amount' => 'Beholdningen af #1 produkter er under minimums antallet',
-	'Product' => 'Produkt',
-	'Amount' => 'Mængde',
-	'Next best before date' => 'Næste bedst før dato',
-	'Logout' => 'Log ud',
-	'Chores overview' => 'Pligt oversigt',
-	'Batteries overview' => 'Batteri oversigt',
-	'Purchase' => 'Køb',
-	'Consume' => 'Brug',
-	'Inventory' => 'Beholdning',
-	'Shopping list' => 'Indkøbsliste',
-	'Chore tracking' => 'Pligt overvågning',
-	'Battery tracking' => 'Batteri overvågning',
-	'Products' => 'Produkter',
-	'Locations' => 'Steder',
-	'Quantity units' => 'Mængde enheder',
-	'Chores' => 'Pligter',
-	'Batteries' => 'Batterier',
-	'Chore' => 'Pligt',
-	'Next estimated tracking' => 'Next estimated tracking',
-	'Last tracked' => 'Sidst overvåget',
-	'Battery' => 'Batteri',
-	'Last charged' => 'Sidst opladt',
-	'Next planned charge cycle' => 'Næste planlagte opladning',
-	'Best before' => 'Bedst før',
-	'OK' => 'OK',
-	'Product overview' => 'Produkt oversigt',
-	'Stock quantity unit' => 'Standard enhed',
-	'Stock amount' => 'Standard mængde',
-	'Last purchased' => 'Sidst købt',
-	'Last used' => 'Sidst brugt',
-	'Spoiled' => 'Udløbet',
-	'Barcode lookup is disabled' => 'Stregkode opslag er slået fra',
-	'will be added to the list of barcodes for the selected product on submit' => 'Bliver tilføjet til stregkodelisten for det valgte produkt når du sender',
-	'New amount' => 'Ny mængde',
-	'Note' => 'Note',
-	'Tracked time' => 'Overvåget tid',
-	'Chore overview' => 'Pligt oversigt',
-	'Tracked count' => 'Antal overvågede',
-	'Battery overview' => 'Batteri oversigt',
-	'Charge cycles count' => 'Antal opladninger',
-	'Create shopping list item' => 'Lav indkøbsliste punkt',
-	'Edit shopping list item' => 'Ændr indkøbsliste punkt',
-	'Save' => 'Gem',
-	'Add' => 'Tilføj',
-	'Name' => 'Navn',
-	'Location' => 'Sted',
-	'Min. stock amount' => 'Mindste beholdning',
-	'QU purchase' => 'QU køb',
-	'QU stock' => 'QU beholdning',
-	'QU factor' => 'QU factor',
-	'Description' => 'Beskrivelse',
-	'Create product' => 'Lav produkt',
-	'Barcode(s)' => 'Stegkode(r)',
-	'Minimum stock amount' => 'Minimum mængde',
-	'Default best before days' => 'Standard bedst før dage',
-	'Quantity unit purchase' => 'Quantity unit purchase',
-	'Quantity unit stock' => 'Quantity unit stock',
-	'Factor purchase to stock quantity unit' => 'Factor purchase to stock quantity unit',
-	'Create location' => 'Lav placering',
-	'Create quantity unit' => 'Lav mængde enhed',
-	'Period type' => 'Periode type',
-	'Period days' => 'Period days',
-	'Create chore' => 'Lav pligt',
-	'Used in' => 'Brugt i',
-	'Create battery' => 'Lav batteri',
-	'Edit battery' => 'Ændr batteri',
-	'Edit chore' => 'Ændr pligt',
-	'Edit quantity unit' => 'Ændr mængde enhed',
-	'Edit product' => 'Ændr produkt',
-	'Edit location' => 'Ændr placering',
-	'Record data' => 'Optag data',
-	'Manage master data' => 'Manage master data',
-	'This will apply to added products' => 'Dette vil gælde tilføjede produkter',
-	'never' => 'aldrig',
-	'Add products that are below defined min. stock amount' => 'Tilføj produkter der er under minimumsantallet',
-	'For purchases this amount of days will be added to today for the best before date suggestion' => 'For purchases this amount of days will be added to today for the best before date suggestion',
-	'This means 1 #1 purchased will be converted into #2 #3 in stock' => 'Dette betyder at 1 #1 bliver lavet om til #2 #3 i beholdningen',
-	'Login' => 'Login',
-	'Username' => 'Brugernavn',
-	'Password' => 'Kode',
-	'Invalid credentials, please try again' => 'Ugyldige informationer, prøv igen',
-	'Are you sure to delete battery "#1"?' => 'Er du sikker på du vil slette batteriet "#1"?',
-	'Yes' => 'Ja',
-	'No' => 'Nej',
-	'Are you sure to delete chore "#1"?' => 'Er du sikker på du vil slette pligten "#1"?',
-	'"#1" could not be resolved to a product, how do you want to proceed?' => '"#1" kunne ikke findes som produkt. Hvordan vil du fortsætte?',
-	'Create or assign product' => 'Lav eller tilknyt produkt',
-	'Cancel' => 'Afbryd',
-	'Add as new product' => 'Tilføj som nyt produkt',
-	'Add as barcode to existing product' => 'Tilføj som stregkode til et eksisterende produkt',
-	'Add as new product and prefill barcode' => 'Tilføj som nyt produkt og udfyld stregkoden på forhånd',
-	'Are you sure to delete quantity unit "#1"?' => 'Er du sikker på du vil slette mængde enheden "#1"?',
-	'Are you sure to delete product "#1"?' => 'Er du sikker på du vil slette produktet "#1"?',
-	'Are you sure to delete location "#1"?' => 'Er du sikker på du vil slette placeringen "#1"?',
-	'Manage API keys' => 'Styr API nøgler',
-	'REST API & data model documentation' => 'REST API & datamodel dokumentation',
-	'API keys' => 'API nøgler',
-	'Create new API key' => 'Lav ny API nøgle',
-	'API key' => 'API nøgle',
-	'Expires' => 'Udløber',
-	'Created' => 'Lavet',
-	'This product is not in stock' => 'Dette produkt er ikke i beholdningen',
-	'This means #1 will be added to stock' => 'Dette betyder #1 bliver tilføjet til beholdningen',
-	'This means #1 will be removed from stock' => 'Dette betyder at #1 bliver fjernet fra beholdningen',
-	'This means it is estimated that a new execution of this chore is tracked #1 days after the last was tracked' => 'This means it is estimated that a new execution of this chore is tracked #1 days after the last was tracked',
-	'Removed #1 #2 of #3 from stock' => 'Fjernede #1 #2 af #3 fra beholdningen',
-	'About grocy' => 'Omkring Grocy',
-	'Close' => 'Luk',
-	'#1 batteries are due to be charged within the next #2 days' => '#1 batterier skal oplades indenfor de næste #2 dage',
-	'#1 batteries are overdue to be charged' => '#1 batterier trænger til at blive opladt',
-	'#1 chores are due to be done within the next #2 days' => '#1 pligter skal udfyldes indenfor de næste #2 dage',
-	'#1 chores are overdue to be done' => '#1 pligter skulle have været gjort',
-	'Released on' => 'Released on',
-	'Consume #3 #1 of #2' => 'Brug #3 #1 af #2',
-	'Added #1 #2 of #3 to stock' => 'Tilføjede #1 #2 af #3 til beholdningen',
-	'Stock amount of #1 is now #2 #3' => 'Mængden af #1 er nu #2 #3',
-	'Tracked execution of chore #1 on #2' => 'Overvågede udførslen af pligt #1 på #2',
-	'Tracked charge cycle of battery #1 on #2' => 'Tracked charge cycle of battery #1 on #2',
-	'Consume all #1 which are currently in stock' => 'Brug alle #1 i beholdningen',
-	'All' => 'Alle',
-	'Track charge cycle of battery #1' => 'Overvåg opladningscyklus af batteri #1',
-	'Track execution of chore #1' => 'Track execution of chore #1',
-	'Filter by location' => 'Filtre med placering',
-	'Search' => 'Søg',
-	'Not logged in' => 'Ikke logget ind',
-	'You have to select a product' => 'Du skal vælge et produkt',
-	'You have to select a chore' => 'Du skal vælge en pligt',
-	'You have to select a battery' => 'Du skal vælge et batteri',
-	'A name is required' => 'Du skal vælge et navn',
-	'A location is required' => 'Du skal vælge en placering',
-	'The amount cannot be lower than #1' => 'Mængden kan ikek kvære lavere end #1',
-	'This cannot be negative' => 'Dette kan ikke være negativt',
-	'A quantity unit is required' => 'Du skal vælge en enhed for mængden',
-	'A period type is required' => 'Du skal vælge en slags periode',
-	'A best before date is required and must be later than today' => 'Du skal vælge en bedst før dato som er senere end i dag',
-	'Settings' => 'Indstillinger',
-	'This can only be before now' => 'Dette skal være før nu',
-	'Calendar' => 'Kalender',
-	'Recipes' => 'Opskrifter',
-	'Edit recipe' => 'Ændr opskrift',
-	'New recipe' => 'Ny opskrift',
-	'Ingredients list' => 'Ingrediens liste',
-	'Add recipe ingredient' => 'Tilføj ingrediens til opskrift',
-	'Edit recipe ingredient' => 'Ændr ingrediens til opskrift',
-	'Are you sure to delete recipe "#1"?' => 'Er du sikker på du vil slette opskriften "#1"?',
-	'Are you sure to delete recipe ingredient "#1"?' => 'Er du sikker på du vil slette ingrediensen "#1" fra opskriften?',
-	'Are you sure to empty the shopping list?' => 'Er du sikker på du vil tømme indkøbslisten?',
-	'Clear list' => 'Ryd liste',
-	'Requirements fulfilled' => 'Skal udfyldes',
-	'Put missing products on shopping list' => 'Sæt manglende produkter på en indkøbsliste',
-	'Not enough in stock, #1 ingredients missing' => 'Der er ikke nok i beholdningen. Der mangler #1 ingredienser. ',
-	'Enough in stock' => 'Der er nok i beholdningen',
-	'Not enough in stock, #1 ingredients missing but already on the shopping list' => 'Der er ikke nok i beholdningen.  Der mangler #1 ingredienser som allerede er på indkøbslisten',
-	'Expand to fullscreen' => 'Udvid til fuldskærm',
-	'Ingredients' => 'Ingredienser',
-	'Preparation' => 'Tilberedning',
-	'Recipe' => 'Opskrift',
-	'Not enough in stock, #1 missing, #2 already on shopping list' => 'Der er ikke nok i beholdningen. Der mangler #1, #2 er allerede i beholdningen',
-	'Show notes' => 'Vis noter',
-	'Put missing amount on shopping list' => 'Put manglende mængde på indkøbsliste',
-	'Are you sure to put all missing ingredients for recipe "#1" on the shopping list?' => 'Er du sikker på du vil sætte alle manglende ingredienser til "#1" på indkøbslisten?',
-	'Added for recipe #1' => 'Tilføjet til opskriften #1',
-	'Manage users' => 'Manage users',
-	'User' => 'Bruger',
-	'Users' => 'Brugere',
-	'Are you sure to delete user "#1"?' => 'Er du sikker på du vil slette brugeren "#1"?',
-	'Create user' => 'Lav bruger',
-	'Edit user' => 'Ændr bruger',
-	'First name' => 'First name',
-	'Last name' => 'Last name',
-	'A username is required' => 'A username is required',
-	'Confirm password' => 'Confirm password',
-	'Passwords do not match' => 'Passwords do not match',
-	'Change password' => 'Change password',
-	'Done by' => 'Done by',
-	'Last done by' => 'Last done by',
-	'Unknown' => 'Unknown',
-	'Filter by chore' => 'Filter by chore',
-	'Chores journal' => 'Chores journal',
-	'0 means suggestions for the next charge cycle are disabled' => '0 means suggestions for the next charge cycle are disabled',
-	'Charge cycle interval (days)' => 'Charge cycle interval (days)',
-	'Last price' => 'Last price',
-	'Price history' => 'Price history',
-	'No price history available' => 'No price history available',
-	'Price' => 'Price',
-	'in #1 per purchase quantity unit' => 'in #1 per purchase quantity unit',
-	'The price cannot be lower than #1' => 'The price cannot be lower than #1',
-	'#1 product expires within the next #2 days' => '#1 product expires within the next #2 days',
-	'#1 product is already expired' => '#1 product is already expired',
-	'#1 product is below defined min. stock amount' => '#1 product is below defined min. stock amount',
-	'Unit' => 'Unit',
-	'Units' => 'Units',
-	'#1 chore is due to be done within the next #2 days' => '#1 chore is due to be done within the next #2 days',
-	'#1 chore is overdue to be done' => '#1 chore is overdue to be done',
-	'#1 battery is due to be charged within the next #2 days' => '#1 battery is due to be charged within the next #2 days',
-	'#1 battery is overdue to be charged' => '#1 battery is overdue to be charged',
-	'#1 unit was automatically added and will apply in addition to the amount entered here' => '#1 unit was automatically added and will apply in addition to the amount entered here',
-	'in singular form' => 'in singular form',
-	'in plural form' => 'in plural form',
-	'Never expires' => 'Never expires',
-	'This cannot be lower than #1' => 'This cannot be lower than #1',
-	'-1 means that this product never expires' => '-1 means that this product never expires',
-	'Quantity unit' => 'Quantity unit',
-	'Only check if a single unit is in stock (a different quantity can then be used above)' => 'Only check if a single unit is in stock (a different quantity can then be used above)',
-	'Are you sure to consume all ingredients needed by recipe "#1" (ingredients marked with "check only if a single unit is in stock" will be ignored)?' => 'Are you sure to consume all ingredients needed by recipe "#1" (ingredients marked with "check only if a single unit is in stock" will be ignored)?',
-	'Removed all ingredients of recipe "#1" from stock' => 'Removed all ingredients of recipe "#1" from stock',
-	'Consume all ingredients needed by this recipe' => 'Consume all ingredients needed by this recipe',
-	'Click to show technical details' => 'Click to show technical details',
-	'Error while saving, probably this item already exists' => 'Error while saving, probably this item already exists',
-	'Error details' => 'Error details',
-	'Tasks' => 'Tasks',
-	'Show done tasks' => 'Show done tasks',
-	'Task' => 'Task',
-	'Due' => 'Due',
-	'Assigned to' => 'Assigned to',
-	'Mark task "#1" as completed' => 'Mark task "#1" as completed',
-	'Uncategorized' => 'Uncategorized',
-	'Task categories' => 'Task categories',
-	'Create task' => 'Create task',
-	'A due date is required' => 'A due date is required',
-	'Category' => 'Category',
-	'Edit task' => 'Edit task',
-	'Are you sure to delete task "#1"?' => 'Are you sure to delete task "#1"?',
-	'#1 task is due to be done within the next #2 days' => '#1 task is due to be done within the next #2 days',
-	'#1 tasks are due to be done within the next #2 days' => '#1 tasks are due to be done within the next #2 days',
-	'#1 task is overdue to be done' => '#1 task is overdue to be done',
-	'#1 tasks are overdue to be done' => '#1 tasks are overdue to be done',
-	'Edit task category' => 'Edit task category',
-	'Create task category' => 'Create task category',
-	'Product groups' => 'Product groups',
-	'Ungrouped' => 'Ungrouped',
-	'Create product group' => 'Create product group',
-	'Edit product group' => 'Edit product group',
-	'Product group' => 'Product group',
-	'Are you sure to delete product group "#1"?' => 'Are you sure to delete product group "#1"?',
-	'Stay logged in permanently' => 'Stay logged in permanently',
-	'When not set, you will get logged out at latest after 30 days' => 'When not set, you will get logged out at latest after 30 days',
-	'Filter by status' => 'Filter by status',
-	'Below min. stock amount' => 'Below min. stock amount',
-	'Expiring soon' => 'Expiring soon',
-	'Already expired' => 'Already expired',
-	'Due soon' => 'Due soon',
-	'Overdue' => 'Overdue',
-	'View settings' => 'View settings',
-	'Auto reload on external changes' => 'Auto reload on external changes',
-	'Enable night mode' => 'Enable night mode',
-	'Auto enable in time range' => 'Auto enable in time range',
-	'From' => 'From',
-	'in format' => 'in format',
-	'To' => 'To',
-	'Time range goes over midnight' => 'Time range goes over midnight',
-	'Product picture' => 'Product picture',
-	'No file selected' => 'No file selected',
-	'If you don\'t select a file, the current picture will not be altered' => 'If you don\'t select a file, the current picture will not be altered',
-	'Delete' => 'Delete',
-	'The current picture will be deleted when you save the product' => 'The current picture will be deleted when you save the product',
-	'Select file' => 'Select file',
-	'Image of product #1' => 'Image of product #1',
-	'This product cannot be deleted because it is in stock, please remove the stock amount first.' => 'This product cannot be deleted because it is in stock, please remove the stock amount first.',
-	'Delete not possible' => 'Delete not possible',
-	'Equipment' => 'Equipment',
-	'Instruction manual' => 'Instruction manual',
-	'The selected equipment has no instruction manual' => 'The selected equipment has no instruction manual',
-	'Notes' => 'Notes',
-	'Edit equipment' => 'Edit equipment',
-	'Create equipment' => 'Create equipment',
-	'If you don\'t select a file, the current instruction manual will not be altered' => 'If you don\'t select a file, the current instruction manual will not be altered',
-	'No instruction manual available' => 'No instruction manual available',
-	'The current instruction manual will be deleted when you save the equipment' => 'The current instruction manual will be deleted when you save the equipment',
-	'No picture available' => 'No picture available',
-	'Filter by product group' => 'Filter by product group',
-	'Presets for new products' => 'Presets for new products',
-	'Included recipes' => 'Included recipes',
-	'A recipe is required' => 'A recipe is required',
-	'Add included recipe' => 'Add included recipe',
-	'Edit included recipe' => 'Edit included recipe',
-	'Group' => 'Group',
-	'This will be used as a headline to group ingredients together' => 'This will be used as a headline to group ingredients together',
-	'Journal' => 'Journal',
-	'Stock journal' => 'Stock journal',
-	'Filter by product' => 'Filter by product',
-	'Booking time' => 'Booking time',
-	'Booking type' => 'Booking type',
-	'Undo booking' => 'Undo booking',
-	'Undone on' => 'Undone on',
-	'Batteries journal' => 'Batteries journal',
-	'Filter by battery' => 'Filter by battery',
-	'Undo charge cycle' => 'Undo charge cycle',
-	'Undo chore execution' => 'Undo chore execution',
-	'Chore execution successfully undone' => 'Chore execution successfully undone',
-	'Undo' => 'Undo',
-	'Booking successfully undone' => 'Booking successfully undone',
-	'Charge cycle successfully undone' => 'Charge cycle successfully undone',
-	'This cannot be negative and must be an integral number' => 'This cannot be negative and must be an integral number',
-	'Disable stock fulfillment checking for this ingredient' => 'Disable stock fulfillment checking for this ingredient',
-	'Add all list items to stock' => 'Add all list items to stock',
-	'Add #3 #1 of #2 to stock' => 'Add #3 #1 of #2 to stock',
-	'Adding shopping list item #1 of #2' => 'Adding shopping list item #1 of #2',
-	'Use a specific stock item' => 'Use a specific stock item',
-	'The first item in this list would be picked by the default rule which is "First expiring first, then first in first out"' => 'The first item in this list would be picked by the default rule which is "First expiring first, then first in first out"',
-	'Mark #3 #1 of #2 as open' => 'Mark #3 #1 of #2 as open',
-	'When a product was marked as opened, the best before date will be replaced by today + this amount of days (a value of 0 disables this)' => 'When a product was marked as opened, the best before date will be replaced by today + this amount of days (a value of 0 disables this)',
-	'Default best before days after opened' => 'Default best before days after opened',
-	'Marked #1 #2 of #3 as opened' => 'Marked #1 #2 of #3 as opened',
-	'Mark as opened' => 'Mark as opened',
-	'Expires on #1; Bought on #2' => 'Expires on #1; Bought on #2',
-	'Not opened' => 'Not opened',
-	'Opened' => 'Opened',
-	'Mark #3 #1 of #2 as open' => 'Mark #3 #1 of #2 as open',
-	'#1 opened' => '#1 opened',
-	'Product expires' => 'Product expires',
-	'Task due' => 'Task due',
-	'Chore due' => 'Chore due',
-	'Battery charge cycle due' => 'Battery charge cycle due',
-	'Show clock in header' => 'Show clock in header',
-	'Stock settings' => 'Stock settings',
-	'Shopping list to stock workflow' => 'Shopping list to stock workflow',
-	'Automatically do the booking using the last price and the amount of the shopping list item, if the product has "Default best before days" set' => 'Automatically do the booking using the last price and the amount of the shopping list item, if the product has "Default best before days" set',
-	'Skip' => 'Skip',
-	'Servings' => 'Servings',
-	'Costs' => 'Costs',
-	'Based on the prices of the last purchase per product' => 'Based on the prices of the last purchase per product',
-	'The ingredients listed here result in this amount of servings' => 'The ingredients listed here result in this amount of servings',
-	'Do not check against the shopping list when adding missing items to it' => 'Do not check against the shopping list when adding missing items to it',
-	'By default the amount to be added to the shopping list is "needed amount - stock amount - shopping list amount" - when this is enabled, it is only checked against the stock amount, not against what is already on the shopping list' => 'By default the amount to be added to the shopping list is "needed amount - stock amount - shopping list amount" - when this is enabled, it is only checked against the stock amount, not against what is already on the shopping list',
-	'Picture' => 'Picture',
-	'Uncheck ingredients to not put them on the shopping list' => 'Uncheck ingredients to not put them on the shopping list',
-	'This is for statistical purposes only' => 'This is for statistical purposes only',
-	'You have to select a recipe' => 'You have to select a recipe',
-	'Key type' => 'Key type',
-	'Share/Integrate calendar (iCal)' => 'Share/Integrate calendar (iCal)',
-	'Use the following (public) URL to share or integrate the calendar in iCal format' => 'Use the following (public) URL to share or integrate the calendar in iCal format',
-	'Allow partial units in stock' => 'Allow partial units in stock',
-	'Enable tare weight handling' => 'Enable tare weight handling',
-	'This is useful e.g. for flour in jars - on purchase/consume/inventory you always weigh the whole jar, the amount to be posted is then automatically calculated based on what is in stock and the tare weight defined below' => 'This is useful e.g. for flour in jars - on purchase/consume/inventory you always weigh the whole jar, the amount to be posted is then automatically calculated based on what is in stock and the tare weight defined below',
-	'Tare weight' => 'Tare weight',
-	'Tare weight handling enabled - please weigh the whole container, the amount to be posted will be automatically calculcated' => 'Tare weight handling enabled - please weigh the whole container, the amount to be posted will be automatically calculcated',
-	'You have to select a location' => 'You have to select a location',
-	'List' => 'List',
-	'Gallery' => 'Gallery'
-);

localization/da/userfield_types.po

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

localization/de/chore_assignment_types.po

@@ -0,0 +1,29 @@
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-09-17 10:45+0000\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/chore_assignment_types\n"
+
+msgid "no-assignment"
+msgstr "Niemandem zuweisen"
+
+msgid "who-least-did-first"
+msgstr "Wer es am seltensten gemacht hat zuerst"
+
+msgid "random"
+msgstr "Zufällig"
+
+msgid "in-alphabetical-order"
+msgstr "In alphabetischer Reihenfolge"

localization/de/chore_period_types.po

@@ -0,0 +1,35 @@
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/chore_types\n"
+
+msgid "manually"
+msgstr "Manuell"
+
+msgid "dynamic-regular"
+msgstr "Dynamisch regelmäßig"
+
+msgid "daily"
+msgstr "Täglich"
+
+msgid "weekly"
+msgstr "Wöchentlich"
+
+msgid "monthly"
+msgstr "Monatlich"
+
+msgid "yearly"
+msgstr "Jährlich"

localization/de/chore_types.php

@@ -1,6 +0,0 @@
-<?php
-
-return array(
-	'manually' => 'Manuell',
-	'dynamic-regular' => 'Dynamisch regelmäßig'
-);

localization/de/component_translations.php

@@ -1,10 +0,0 @@
-<?php
-
-return array(
-	'timeago_locale' => 'de',
-	'timeago_nan' => 'vor NaN Jahren',
-	'moment_locale' => 'de',
-	'datatables_localization' => '{"sEmptyTable":"Keine Daten in der Tabelle vorhanden","sInfo":"_START_ bis _END_ von _TOTAL_ Einträgen","sInfoEmpty":"Keine Daten vorhanden","sInfoFiltered":"(gefiltert von _MAX_ Einträgen)","sInfoPostFix":"","sInfoThousands":".","sLengthMenu":"_MENU_ Einträge anzeigen","sLoadingRecords":"Wird geladen ..","sProcessing":"Bitte warten ..","sSearch":"Suchen","sZeroRecords":"Keine Einträge vorhanden","oPaginate":{"sFirst":"Erste","sPrevious":"Zurück","sNext":"Nächste","sLast":"Letzte"},"oAria":{"sSortAscending":": aktivieren, um Spalte aufsteigend zu sortieren","sSortDescending":": aktivieren, um Spalte absteigend zu sortieren"},"select":{"rows":{"0":"Zum Auswählen auf eine Zeile klicken","1":"1 Zeile ausgewählt","_":"%d Zeilen ausgewählt"}},"buttons":{"print":"Drucken","colvis":"Spalten","copy":"Kopieren","copyTitle":"In Zwischenablage kopieren","copyKeys":"Taste <i>ctrl</i> oder <i>⌘</i> + <i>C</i> um Tabelle<br>in Zwischenspeicher zu kopieren.<br><br>Um abzubrechen die Nachricht anklicken oder Escape drücken.","copySuccess":{"1":"1 Spalte kopiert","_":"%d Spalten kopiert"}}}',
-	'summernote_locale' => 'de-DE',
-	'fullcalendar_locale' => 'de'
-);

localization/de/component_translations.po

@@ -0,0 +1,57 @@
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"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"
+
+msgid "datatables_localization"
+msgstr ""
+"{\"sEmptyTable\":\"Keine Daten in der Tabelle "
+"vorhanden\",\"sInfo\":\"_START_ bis _END_ von _TOTAL_ "
+"Einträgen\",\"sInfoEmpty\":\"Keine Daten "
+"vorhanden\",\"sInfoFiltered\":\"(gefiltert von _MAX_ "
+"Einträgen)\",\"sInfoPostFix\":\"\",\"sInfoThousands\":\".\",\"sLengthMenu\":\"_MENU_"
+" Einträge anzeigen\",\"sLoadingRecords\":\"Wird geladen "
+"..\",\"sProcessing\":\"Bitte warten "
+"..\",\"sSearch\":\"Suchen\",\"sZeroRecords\":\"Keine Einträge "
+"vorhanden\",\"oPaginate\":{\"sFirst\":\"Erste\",\"sPrevious\":\"Zurück\",\"sNext\":\"Nächste\",\"sLast\":\"Letzte\"},\"oAria\":{\"sSortAscending\":\":"
+" aktivieren, um Spalte aufsteigend zu sortieren\",\"sSortDescending\":\": "
+"aktivieren, um Spalte absteigend zu "
+"sortieren\"},\"select\":{\"rows\":{\"0\":\"Zum Auswählen auf eine Zeile "
+"klicken\",\"1\":\"1 Zeile ausgewählt\",\"_\":\"%d Zeilen "
+"ausgewählt\"}},\"buttons\":{\"print\":\"Drucken\",\"colvis\":\"Spalten\",\"copy\":\"Kopieren\",\"copyTitle\":\"In"
+" Zwischenablage kopieren\",\"copyKeys\":\"Taste <i>ctrl</i> oder <i>⌘</i> + "
+"<i>C</i> um Tabelle<br>in Zwischenspeicher zu kopieren.<br><br>Um "
+"abzubrechen die Nachricht anklicken oder Escape "
+"drücken.\",\"copySuccess\":{\"1\":\"1 Spalte kopiert\",\"_\":\"%d Spalten "
+"kopiert\"}}}"
+
+msgid "summernote_locale"
+msgstr "de-DE"
+
+msgid "fullcalendar_locale"
+msgstr "de"
+
+msgid "bootstrap-select_locale"
+msgstr "de_DE"

localization/de/demo_data.php

@@ -1,90 +0,0 @@
-<?php
-
-return array(
-	'Cookies' => 'Cookies',
-	'Chocolate' => 'Schokolade',
-	'Pantry' => 'Vorratskammer',
-	'Candy cupboard' => 'Süßigkeitenschrank',
-	'Tinned food cupboard' => 'Konservenschrank',
-	'Fridge' => 'Kühlschrank',
-	'Piece' => 'Stück',
-	'Pieces' => 'Stücke',
-	'Pack' => 'Packung',
-	'Packs' => 'Packungen',
-	'Glass' => 'Glas',
-	'Glasses' => 'Gläser',
-	'Tin' => 'Dose',
-	'Tins' => 'Dosen',
-	'Can' => 'Becher',
-	'Cans' => 'Becher',
-	'Bunch' => 'Bund',
-	'Bunches' => 'Bunde',
-	'Gummy bears' => 'Gummibärchen',
-	'Crisps' => 'Chips',
-	'Eggs' => 'Eier',
-	'Noodles' => 'Nudeln',
-	'Pickles' => 'Essiggurken',
-	'Gulash soup' => 'Gulaschsuppe',
-	'Yogurt' => 'Joghurt',
-	'Cheese' => 'Käse',
-	'Cold cuts' => 'Aufschnitt',
-	'Paprika' => 'Paprika',
-	'Cucumber' => 'Gurke',
-	'Radish' => 'Radieschen',
-	'Tomato' => 'Tomaten',
-	'Changed towels in the bathroom' => 'Handtücher im Bad gewechselt',
-	'Cleaned the kitchen floor' => 'Küchenboden gewischt',
-	'Warranty ends' => 'Garantie endet',
-	'TV remote control' => 'TV Fernbedienung',
-	'Alarm clock' => 'Wecker',
-	'Heat remote control' => 'Fernbedienung Heizung',
-	'Lawn mowed in the garden' => 'Rasen im Garten gemäht',
-	'Some good snacks' => 'Paar gute Snacks',
-	'Pizza dough' => 'Pizzateig',
-	'Sieved tomatoes' => 'Passierte Tomaten',
-	'Salami' => 'Salami',
-	'Toast' => 'Toast',
-	'Minced meat' => 'Hackfleisch',
-	'Pizza' => 'Pizza',
-	'Spaghetti bolognese' => 'Spaghetti Bolognese',
-	'Sandwiches' => 'Belegte Toasts',
-	'English' => 'Englisch',
-	'German' => 'Deutsch',
-	'Italian' => 'Italienisch',
-	'Demo in different language' => 'Demo in anderer Sprache',
-	'This is the note content of the recipe ingredient' => 'Dies ist der Inhalt der Notiz der Zutat',
-	'Demo User' => 'Demo Benutzer',
-	'Gram' => 'Gramm',
-	'Grams' => 'Gramm',
-	'Flour' => 'Mehl',
-	'Pancakes' => 'Pfannkuchen',
-	'Sugar' => 'Zucker',
-	'Home' => 'Zuhause',
-	'Life' => 'Leben',
-	'Projects' => 'Projekte',
-	'Repair the garage door' => 'Garagentor reparieren',
-	'Fork and improve grocy' => 'grocy forken und verbessern',
-	'Find a solution for what to do when I forget the door keys' => 'Eine Lösung für "Haustürschlüssel vergessen" finden',
-	'Sweets' => 'Süßigkeiten',
-	'Bakery products' => 'Bäckerei Produkte',
-	'Tinned food' => 'Konservern',
-	'Butchery products' => 'Metzgerei',
-	'Vegetables/Fruits' => 'Obst/Gemüse',
-	'Refrigerated products' => 'Kühlregal',
-	'Coffee machine' => 'Kaffeemaschine',
-	'Dishwasher' => 'Spülmaschine',
-	'Liter' => 'Liter',
-	'Liters' => 'Liter',
-	'Bottle' => 'Flasche',
-	'Bottles' => 'Flaschen',
-	'Milk' => 'Milch',
-	'Chocolate sauce' => 'Schokoladensoße',
-	'Milliliters' => 'Milliliter',
-	'Milliliter' => 'Milliliter',
-	'Bottom' => 'Boden',
-	'Topping' => 'Belag',
-	'French' => 'Französisch',
-	'Turkish' => 'Türkisch',
-	'Spanish' => 'Spanisch',
-	'Russian' => 'Russisch'
-);

localization/de/demo_data.po

@@ -0,0 +1,345 @@
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2020\n"
+"Language-Team: German (https://www.transifex.com/grocy/teams/93189/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/demo_data\n"
+
+msgid "Cookies"
+msgstr "Cookies"
+
+msgid "Chocolate"
+msgstr "Schokolade"
+
+msgid "Pantry"
+msgstr "Vorratskammer"
+
+msgid "Candy cupboard"
+msgstr "Süßigkeitenschrank"
+
+msgid "Tinned food cupboard"
+msgstr "Konservenschrank"
+
+msgid "Fridge"
+msgstr "Kühlschrank"
+
+msgid "Piece"
+msgid_plural "Pieces"
+msgstr[0] "Stück"
+msgstr[1] "Stücke"
+
+msgid "Pack"
+msgid_plural "Packs"
+msgstr[0] "Packung"
+msgstr[1] "Packungen"
+
+msgid "Glass"
+msgid_plural "Glasses"
+msgstr[0] "Glas"
+msgstr[1] "Gläser"
+
+msgid "Tin"
+msgid_plural "Tins"
+msgstr[0] "Dose"
+msgstr[1] "Dosen"
+
+msgid "Can"
+msgid_plural "Cans"
+msgstr[0] "Becher"
+msgstr[1] "Becher"
+
+msgid "Bunch"
+msgid_plural "Bunches"
+msgstr[0] "Bund"
+msgstr[1] "Bunde"
+
+msgid "Gummy bears"
+msgstr "Gummibärchen"
+
+msgid "Crisps"
+msgstr "Chips"
+
+msgid "Eggs"
+msgstr "Eier"
+
+msgid "Noodles"
+msgstr "Nudeln"
+
+msgid "Pickles"
+msgstr "Essiggurken"
+
+msgid "Gulash soup"
+msgstr "Gulaschsuppe"
+
+msgid "Yogurt"
+msgstr "Joghurt"
+
+msgid "Cheese"
+msgstr "Käse"
+
+msgid "Cold cuts"
+msgstr "Aufschnitt"
+
+msgid "Paprika"
+msgstr "Paprika"
+
+msgid "Cucumber"
+msgstr "Gurke"
+
+msgid "Radish"
+msgstr "Radieschen"
+
+msgid "Tomato"
+msgstr "Tomaten"
+
+msgid "Changed towels in the bathroom"
+msgstr "Handtücher im Bad gewechselt"
+
+msgid "Cleaned the kitchen floor"
+msgstr "Küchenboden gewischt"
+
+msgid "Warranty ends"
+msgstr "Garantie endet"
+
+msgid "TV remote control"
+msgstr "TV Fernbedienung"
+
+msgid "Alarm clock"
+msgstr "Wecker"
+
+msgid "Heat remote control"
+msgstr "Fernbedienung Heizung"
+
+msgid "Lawn mowed in the garden"
+msgstr "Rasen im Garten gemäht"
+
+msgid "Some good snacks"
+msgstr "Paar gute Snacks"
+
+msgid "Pizza dough"
+msgstr "Pizzateig"
+
+msgid "Sieved tomatoes"
+msgstr "Passierte Tomaten"
+
+msgid "Salami"
+msgstr "Salami"
+
+msgid "Toast"
+msgstr "Toast"
+
+msgid "Minced meat"
+msgstr "Hackfleisch"
+
+msgid "Pizza"
+msgstr "Pizza"
+
+msgid "Spaghetti bolognese"
+msgstr "Spaghetti Bolognese"
+
+msgid "Sandwiches"
+msgstr "Belegte Toasts"
+
+msgid "English"
+msgstr "Englisch"
+
+msgid "German"
+msgstr "Deutsch"
+
+msgid "Italian"
+msgstr "Italienisch"
+
+msgid "This is the note content of the recipe ingredient"
+msgstr "Dies ist der Inhalt der Notiz der Zutat"
+
+msgid "Demo User"
+msgstr "Demo Benutzer"
+
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] "Gramm"
+msgstr[1] "Gramm"
+
+msgid "Flour"
+msgstr "Mehl"
+
+msgid "Pancakes"
+msgstr "Pfannkuchen"
+
+msgid "Sugar"
+msgstr "Zucker"
+
+msgid "Home"
+msgstr "Zuhause"
+
+msgid "Life"
+msgstr "Leben"
+
+msgid "Projects"
+msgstr "Projekte"
+
+msgid "Repair the garage door"
+msgstr "Garagentor reparieren"
+
+msgid "Fork and improve grocy"
+msgstr "grocy forken und verbessern"
+
+msgid "Find a solution for what to do when I forget the door keys"
+msgstr "Eine Lösung für \"Haustürschlüssel vergessen\" finden"
+
+msgid "Sweets"
+msgstr "Süßigkeiten"
+
+msgid "Bakery products"
+msgstr "Bäckerei Produkte"
+
+msgid "Tinned food"
+msgstr "Konservern"
+
+msgid "Butchery products"
+msgstr "Metzgerei"
+
+msgid "Vegetables/Fruits"
+msgstr "Obst/Gemüse"
+
+msgid "Refrigerated products"
+msgstr "Kühlregal"
+
+msgid "Coffee machine"
+msgstr "Kaffeemaschine"
+
+msgid "Dishwasher"
+msgstr "Spülmaschine"
+
+msgid "Liter"
+msgstr "Liter"
+
+msgid "Liters"
+msgstr "Liter"
+
+msgid "Bottle"
+msgstr "Flasche"
+
+msgid "Bottles"
+msgstr "Flaschen"
+
+msgid "Milk"
+msgstr "Milch"
+
+msgid "Chocolate sauce"
+msgstr "Schokoladensoße"
+
+msgid "Milliliters"
+msgstr "Milliliter"
+
+msgid "Milliliter"
+msgstr "Milliliter"
+
+msgid "Bottom"
+msgstr "Boden"
+
+msgid "Topping"
+msgstr "Belag"
+
+msgid "French"
+msgstr "Französisch"
+
+msgid "Turkish"
+msgstr "Türkisch"
+
+msgid "Spanish"
+msgstr "Spanisch"
+
+msgid "Russian"
+msgstr "Russisch"
+
+msgid "The thing which happens on the 5th of every month"
+msgstr "Das, was am 5. jedes Monats zu tun ist"
+
+msgid "The thing which happens daily"
+msgstr "Das, was täglich zu tun ist"
+
+msgid "The thing which happens on Mondays and Wednesdays"
+msgstr "Das, was Montags und Mittwochs zu tun ist"
+
+msgid "Swedish"
+msgstr "Schwedisch"
+
+msgid "Polish"
+msgstr "Polnisch"
+
+msgid "Milk Chocolate"
+msgstr "Milchschokolade"
+
+msgid "Dark Chocolate"
+msgstr "Zartbitterschokolade"
+
+msgid "Slice"
+msgid_plural "Slices"
+msgstr[0] "Scheibe"
+msgstr[1] "Scheiben"
+
+msgid "Example userentity"
+msgstr "Beispiel Benutzerentität"
+
+msgid "This is an example user entity..."
+msgstr "Dies ist eine Beispiel-Benutzerentität"
+
+msgid "Custom field"
+msgstr "Benutzerdefiniertes Feld"
+
+msgid "Example field value..."
+msgstr "Beispiel Feldwert..."
+
+msgid "Waffle rolls"
+msgstr "Waffelröllchen"
+
+msgid "Danish"
+msgstr "Dänisch"
+
+msgid "Dutch"
+msgstr "Niederländisch"
+
+msgid "Norwegian"
+msgstr "Norwegisch"
+
+msgid "Demo"
+msgstr "Demo"
+
+msgid "Stable version"
+msgstr "Stabile Version"
+
+msgid "Preview version"
+msgstr "Vorschauversion"
+
+msgid "current release"
+msgstr "aktuelles Release"
+
+msgid "not yet released"
+msgstr "noch nicht freigegeben"
+
+msgid "Portuguese (Brazil)"
+msgstr "Portugiesisch (Brasilien)"
+
+msgid "This is a note"
+msgstr "Dies ist eine Notiz"
+
+msgid "Freezer"
+msgstr "Gefrierschrank"
+
+msgid "Hungarian"
+msgstr "Ungarisch"
+
+msgid "Slovak"
+msgstr "Slowakisch"

localization/de/stock_transaction_types.php

@@ -1,8 +0,0 @@
-<?php
-
-return array(
-	'purchase' => 'Einkauf',
-	'consume' => 'Verbrauch',
-	'inventory-correction' => 'Inventur-Korrektur',
-	'product-opened' => 'Produkt geöffnet'
-);

localization/de/stock_transaction_types.po

@@ -0,0 +1,44 @@
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2020\n"
+"Language-Team: German (https://www.transifex.com/grocy/teams/93189/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/stock_transaction_types\n"
+
+msgid "purchase"
+msgstr "Einkauf"
+
+msgid "transfer_from"
+msgstr "Umlagerung von"
+
+msgid "transfer_to"
+msgstr "Umlagerung nach"
+
+msgid "consume"
+msgstr "Verbrauch"
+
+msgid "inventory-correction"
+msgstr "Inventur-Korrektur"
+
+msgid "product-opened"
+msgstr "Produkt geöffnet"
+
+msgid "stock-edit-old"
+msgstr "Bestandseintrag bearbeitet (alte Werte)"
+
+msgid "stock-edit-new"
+msgstr "Bestandseintrag bearbeitet (neue Werte)"
+
+msgid "self-production"
+msgstr "Eigenproduktion"

localization/de/strings.php

@@ -1,362 +0,0 @@
-<?php
-
-return array(
-	'Stock overview' => 'Bestand',
-	'#1 products expiring within the next #2 days' => '#1 Produkte laufen innerhalb der nächsten #2 Tage ab',
-	'#1 products are already expired' => '#1 Produkte sind bereits abgelaufen',
-	'#1 products are below defined min. stock amount' => '#1 Produkte sind unter Mindestbestand',
-	'Product' => 'Produkt',
-	'Amount' => 'Menge',
-	'Next best before date' => 'Nächstes MHD',
-	'Logout' => 'Abmelden',
-	'Chores overview' => 'Hausarbeiten',
-	'Batteries overview' => 'Batterien',
-	'Purchase' => 'Einkauf',
-	'Consume' => 'Verbrauch',
-	'Inventory' => 'Inventur',
-	'Shopping list' => 'Einkaufszettel',
-	'Chore tracking' => 'Hausarbeiten-Ausführung',
-	'Battery tracking' => 'Batterie-Ladezyklus',
-	'Products' => 'Produkte',
-	'Locations' => 'Standorte',
-	'Quantity units' => 'Mengeneinheiten',
-	'Chores' => 'Hausarbeiten',
-	'Batteries' => 'Batterien',
-	'Chore' => 'Hausarbeit',
-	'Next estimated tracking' => 'Nächste geplante Ausführung',
-	'Last tracked' => 'Zuletzt ausgeführt',
-	'Battery' => 'Batterie',
-	'Last charged' => 'Zuletzt geladen',
-	'Next planned charge cycle' => 'Nächster geplanter Ladezyklus',
-	'Best before' => 'MHD',
-	'OK' => 'OK',
-	'Product overview' => 'Produktübersicht',
-	'Stock quantity unit' => 'Mengeneinheit Bestand',
-	'Stock amount' => 'Bestand',
-	'Last purchased' => 'Zuletzt gekauft',
-	'Last used' => 'Zuletzt benutzt',
-	'Spoiled' => 'Verdorben',
-	'Barcode lookup is disabled' => 'Barcode-Suche ist deaktiviert',
-	'will be added to the list of barcodes for the selected product on submit' => 'wird der Liste der Barcodes für das ausgewählte Produkt beim Speichern hinzugefügt',
-	'New amount' => 'Neue Menge',
-	'Note' => 'Notiz',
-	'Tracked time' => 'Ausführungszeit',
-	'Chore overview' => 'Hausarbeit Übersicht',
-	'Tracked count' => 'Ausführungsanzahl',
-	'Battery overview' => 'Batterie Übersicht',
-	'Charge cycles count' => 'Ladezyklen',
-	'Create shopping list item' => 'Einkaufszettel Eintrag erstellen',
-	'Edit shopping list item' => 'Einkaufszettel Eintrag bearbeiten',
-	'Save' => 'Speichern',
-	'Add' => 'Hinzufügen',
-	'Name' => 'Name',
-	'Location' => 'Standort',
-	'Min. stock amount' => 'Mindestbestand',
-	'QU purchase' => 'ME Einkauf',
-	'QU stock' => 'ME Bestand',
-	'QU factor' => 'ME-Faktor',
-	'Description' => 'Beschreibung',
-	'Create product' => 'Produkt erstellen',
-	'Barcode(s)' => 'Barcode(s)',
-	'Minimum stock amount' => 'Mindestbestand',
-	'Default best before days' => 'Standard Haltbarkeit in Tagen',
-	'Quantity unit purchase' => 'Mengeneinheit Einkauf',
-	'Quantity unit stock' => 'Mengeneinheit Bestand',
-	'Factor purchase to stock quantity unit' => 'Faktor Mengeneinheit Einkauf zu Mengeneinheit Bestand',
-	'Create location' => 'Standort erstellen',
-	'Create quantity unit' => 'Mengeneinheit erstellen',
-	'Period type' => 'Periodentyp',
-	'Period days' => 'Tage/Periode',
-	'Create chore' => 'Hausarbeit erstellen',
-	'Used in' => 'Benutzt in',
-	'Create battery' => 'Batterie erstellen',
-	'Edit battery' => 'Batterie bearbeiten',
-	'Edit chore' => 'Hausarbeit bearbeiten',
-	'Edit quantity unit' => 'Mengeneinheit bearbeiten',
-	'Edit product' => 'Produkt bearbeiten',
-	'Edit location' => 'Standort bearbeiten',
-	'Record data' => 'Daten erfassen',
-	'Manage master data' => 'Stammdaten verwalten',
-	'This will apply to added products' => 'Dies gilt für hinzugefügte Produkte',
-	'never' => 'nie',
-	'Add products that are below defined min. stock amount' => 'Produkte unter Mindestbestand hinzufügen',
-	'For purchases this amount of days will be added to today for the best before date suggestion' => 'Bei Einkäufen wird hierauf basierend das MHD vorausgefüllt',
-	'This means 1 #1 purchased will be converted into #2 #3 in stock' => 'Das bedeutet 1 #1 im Einkauf entsprechen #2 #3 im Bestand',
-	'Login' => 'Anmelden',
-	'Username' => 'Benutzername',
-	'Password' => 'Passwort',
-	'Invalid credentials, please try again' => 'Ungültige Zugangsdaten, bitte versuche es erneut',
-	'Are you sure to delete battery "#1"?' => 'Battery "#1" wirklich löschen?',
-	'Yes' => 'Ja',
-	'No' => 'Nein',
-	'Are you sure to delete chore "#1"?' => 'Hausarbeit "#1" wirklich löschen?',
-	'"#1" could not be resolved to a product, how do you want to proceed?' => '"#1" konnte nicht zu einem Produkt aufgelöst werden, wie möchtest du weiter machen?',
-	'Create or assign product' => 'Produkt erstellen oder verknüpfen',
-	'Cancel' => 'Abbrechen',
-	'Add as new product' => 'Als neues Produkt hinzufügen',
-	'Add as barcode to existing product' => 'Barcode vorhandenem Produkt zuweisen',
-	'Add as new product and prefill barcode' => 'Neues Produkt erstellen und Barcode vorbelegen',
-	'Are you sure to delete quantity unit "#1"?' => 'Mengeneinheit "#1" wirklich löschen?',
-	'Are you sure to delete product "#1"?' => 'Produkt "#1" wirklich löschen?',
-	'Are you sure to delete location "#1"?' => 'Standort "#1" wirklich löschen?',
-	'Manage API keys' => 'API-Keys verwalten',
-	'REST API & data model documentation' => 'REST-API & Datenmodell Dokumentation',
-	'API keys' => 'API-Keys',
-	'Create new API key' => 'Neuen API-Key erstellen',
-	'API key' => 'API-Key',
-	'Expires' => 'Läuft ab',
-	'Created' => 'Erstellt',
-	'This product is not in stock' => 'Dieses Produkt ist nicht vorrätig',
-	'This means #1 will be added to stock' => 'Das bedeutet #1 wird dem Bestand hinzugefügt',
-	'This means #1 will be removed from stock' => 'Das bedeutet #1 wird aus dem Bestand entfernt',
-	'This means it is estimated that a new execution of this chore is tracked #1 days after the last was tracked' => 'Das bedeutet, dass eine erneute Ausführung der Hausarbeit #1 Tage nach der letzten Ausführung geplant wird',
-	'Removed #1 #2 of #3 from stock' => '#1 #2 #3 aus dem Bestand entfernt',
-	'About grocy' => 'Über grocy',
-	'Close' => 'Schließen',
-	'#1 batteries are due to be charged within the next #2 days' => '#1 Batterien müssen in den nächsten #2 Tagen geladen werden',
-	'#1 batteries are overdue to be charged' => '#1 Batterien sind überfällig',
-	'#1 chores are due to be done within the next #2 days' => '#1 Hausarbeiten stehen in den nächsten #2 Tagen an',
-	'#1 chores are overdue to be done' => '#1 Hausarbeiten sind überfällig',
-	'Released on' => 'Veröffentlicht am',
-	'Consume #3 #1 of #2' => 'Verbrauche #3 #1 #2',
-	'Added #1 #2 of #3 to stock' => '#1 #2 #3 dem Bestand hinzugefügt',
-	'Stock amount of #1 is now #2 #3' => 'Es sind nun #2 #3 #1 im Bestand',
-	'Tracked execution of chore #1 on #2' => 'Ausführung von #1 am #2 erfasst',
-	'Tracked charge cycle of battery #1 on #2' => 'Ladezyklus für Batterie #1 am #2 erfasst',
-	'Consume all #1 which are currently in stock' => 'Verbrauche den kompletten Bestand von #1',
-	'All' => 'Alle',
-	'Track charge cycle of battery #1' => 'Erfasse einen Ladezyklus für Batterie #1',
-	'Track execution of chore #1' => 'Erfasse eine Ausführung von #1',
-	'Filter by location' => 'Nach Standort filtern',
-	'Search' => 'Suche',
-	'Not logged in' => 'Nicht angemeldet',
-	'You have to select a product' => 'Ein Produkt muss ausgewählt werden',
-	'You have to select a chore' => 'Eine Hausarbeit muss ausgewählt werden',
-	'You have to select a battery' => 'Eine Batterie muss ausgewählt werden',
-	'A name is required' => 'Ein Name ist erforderlich',
-	'A location is required' => 'Ein Standort ist erforderlich',
-	'The amount cannot be lower than #1' => 'Die Menge darf nicht kleiner als #1 sein',
-	'This cannot be negative' => 'Dies darf nicht negativ sein',
-	'A quantity unit is required' => 'Eine Mengeneinheit muss ausgewählt werden',
-	'A period type is required' => 'Eine Periodentyp muss ausgewählt werden',
-	'A best before date is required' => 'Ein Mindesthaltbarkeitsdatum ist erforderlich',
-	'Settings' => 'Einstellungen',
-	'This can only be before now' => 'Dies kann nur vor jetzt sein',
-	'Calendar' => 'Kalender',
-	'Recipes' => 'Rezepte',
-	'Edit recipe' => 'Rezept bearbeiten',
-	'New recipe' => 'Neues Rezept',
-	'Ingredients list' => 'Zutatenliste',
-	'Add recipe ingredient' => 'Rezeptzutat hinzufügen',
-	'Edit recipe ingredient' => 'Rezeptzutat bearbeiten',
-	'Are you sure to delete recipe "#1"?' => 'Rezept "#1" wirklich löschen?',
-	'Are you sure to delete recipe ingredient "#1"?' => 'Rezeptzutat "#1" wirklich löschen?',
-	'Are you sure to empty the shopping list?' => 'Sicher, dass den Einkaufszettel geleert werden soll?',
-	'Clear list' => 'Liste leeren',
-	'Requirements fulfilled' => 'Bedarf im Bestand',
-	'Put missing products on shopping list' => 'Fehlende Produkte auf den Einkaufszettel setzen',
-	'Not enough in stock, #1 ingredients missing' => 'Nicht ausreichend im Bestand, #1 Zutaten fehlen',
-	'Enough in stock' => 'Bestand reicht aus',
-	'Not enough in stock, #1 ingredients missing but already on the shopping list' => 'Bestand nicht ausreichend, #1 Zutaten fehlen, stehen aber bereits auf dem Einkaufszettel',
-	'Expand to fullscreen' => 'Auf ganzen Bildschirm vergrößern',
-	'Ingredients' => 'Zutaten',
-	'Preparation' => 'Zubereitung',
-	'Recipe' => 'Rezept',
-	'Not enough in stock, #1 missing, #2 already on shopping list' => 'Nicht ausreichend im Bestand, #1 fehlen, #2 stehen bereits auf dem Einkaufszettel',
-	'Show notes' => 'Notizen anzeigen',
-	'Put missing amount on shopping list' => 'Fehlende Menge auf den Einkaufszettel setzen',
-	'Are you sure to put all missing ingredients for recipe "#1" on the shopping list?' => 'Sicher alle fehlenden Zutaten für Rezept "#1" auf die Einkaufsliste zu setzen?',
-	'Added for recipe #1' => 'Hinzugefügt für Rezept #1',
-	'Manage users' => 'Benutzer verwalten',
-	'User' => 'Benutzer',
-	'Users' => 'Benutzer',
-	'Are you sure to delete user "#1"?' => 'Benutzer "#1" wirklich löschen?',
-	'Create user' => 'Benutzer erstellen',
-	'Edit user' => 'Benutzer bearbeiten',
-	'First name' => 'Vorname',
-	'Last name' => 'Nachname',
-	'A username is required' => 'Ein Benutzername ist erforderlich',
-	'Confirm password' => 'Passwort bestätigen',
-	'Passwords do not match' => 'Passwörter stimmen nicht überein',
-	'Change password' => 'Passwort ändern',
-	'Done by' => 'Ausgeführt von',
-	'Last done by' => 'Zuletzt ausgeführt von',
-	'Unknown' => 'Unbekannt',
-	'Filter by chore' => 'Nach Hausarbeit filtern',
-	'Chores journal' => 'Hausarbeitenjournal',
-	'0 means suggestions for the next charge cycle are disabled' => '0 bedeutet dass Vorschläge für den nächsten Ladezyklus deaktiviert sind',
-	'Charge cycle interval (days)' => 'Ladezyklusintervall (Tage)',
-	'Last price' => 'Letzter Preis',
-	'Price history' => 'Preisentwicklung',
-	'No price history available' => 'Keine Preisdaten verfügbar',
-	'Price' => 'Preis',
-	'in #1 per purchase quantity unit' => 'in #1 pro Einkaufsmengeneinheit',
-	'The price cannot be lower than #1' => 'Der Preis darf nicht niedriger als #1 sein',
-	'#1 product expires within the next #2 days' => '#1 Produkt läuft innerhalb der nächsten #2 Tage ab',
-	'#1 product is already expired' => '#1 Produkt ist bereits abgelaufen',
-	'#1 product is below defined min. stock amount' => '#1 Produkt ist unter Mindestbestand',
-	'Unit' => 'Einheit',
-	'Units' => 'Einheiten',
-	'#1 chore is due to be done within the next #2 days' => '#1 Hausarbeit steht in den nächsten #2 Tagen an',
-	'#1 chore is overdue to be done' => '#1 Hausarbeit ist überfällig',
-	'#1 battery is due to be charged within the next #2 days' => '#1 Batterie muss in den nächsten #2 Tagen geladen werden',
-	'#1 battery is overdue to be charged' => '#1 Batterie ist überfällig',
-	'#1 unit was automatically added and will apply in addition to the amount entered here' => '#1 Einheit wurde automatisch hinzugefügt und gilt zusätzlich der hier eingegebenen Menge',
-	'in singular form' => 'in der Einzahl',
-	'in plural form' => 'in der Mehrzahl',
-	'Never expires' => 'Läuft nie ab',
-	'This cannot be lower than #1' => 'Dies darf nicht kleiner als #1 sein',
-	'-1 means that this product never expires' => '-1 bedeuet, dass dieses Produkt niemals abläuft',
-	'Quantity unit' => 'Mengeneinheit',
-	'Only check if a single unit is in stock (a different quantity can then be used above)' => 'Nur prüfen, ob eine einzelne Einheit vorrätig ist (eine abweichende Mengeneinheit kann dann oben verwendet werden)',
-	'Are you sure to consume all ingredients needed by recipe "#1" (ingredients marked with "check only if a single unit is in stock" will be ignored)?' => 'Sicher, dass alle Zutaten die vom Rezept "#1" benötigt werden aus dem Bestand entfernt werden sollen (Zutaten markiert mit "nur prüfen, ob eine einzelne Einheit vorrätig ist" werden ignoriert)?',
-	'Removed all ingredients of recipe "#1" from stock' => 'Alle Zutaten, die vom Rezept "#1" benötigt werden, wurdem aus dem Bestand entfernt',
-	'Consume all ingredients needed by this recipe' => 'Alle Zutaten, die von diesem Rezept benötigt werden, aus dem Bestand enternen',
-	'Click to show technical details' => 'Klick um technische Details anzuzeigen',
-	'Error while saving, probably this item already exists' => 'Fehler beim Speichern, möglicherweise existiert das Element bereits',
-	'Error details' => 'Fehlerdetails',
-	'Tasks' => 'Aufgaben',
-	'Show done tasks' => 'Erledigte Aufgaben anzeigen',
-	'Task' => 'Aufgabe',
-	'Due' => 'Fällig',
-	'Assigned to' => 'Zugewiesen an',
-	'Mark task "#1" as completed' => 'Aufgabe "#1" als erledigt markieren',
-	'Uncategorized' => 'Nicht kategorisiert',
-	'Task categories' => 'Aufgabenkategorien',
-	'Create task' => 'Aufgabe erstellen',
-	'A due date is required' => 'Ein Fälligkeitsdatum ist erforderlich',
-	'Category' => 'Kategorie',
-	'Edit task' => 'Aufgabe bearbeiten',
-	'Are you sure to delete task "#1"?' => 'Aufgabe "#1" wirklich löschen?',
-	'#1 task is due to be done within the next #2 days' => '#1 Aufgabe steht in den nächsten #2 Tagen an',
-	'#1 tasks are due to be done within the next #2 days' => '#1 Aufgaben stehen in den nächsten #2 Tagen an',
-	'#1 task is overdue to be done' => '#1 Aufgabe ist überfällig',
-	'#1 tasks are overdue to be done' => '#1 Aufgaben sind überfällig',
-	'Edit task category' => 'Aufgabenkategorie bearbeiten',
-	'Create task category' => 'Aufgabenkategorie erstellen',
-	'Product groups' => 'Produktgruppen',
-	'Ungrouped' => 'Ungruppiert',
-	'Create product group' => 'Produktgruppe erstellen',
-	'Edit product group' => 'Produktgruppe bearbeiten',
-	'Product group' => 'Produktgruppe',
-	'Are you sure to delete product group "#1"?' => 'Produktgruppe "#1" wirklich löschen?',
-	'Stay logged in permanently' => 'Dauerhaft angemeldet bleiben',
-	'When not set, you will get logged out at latest after 30 days' => 'Wenn nicht gesetzt, wirst du spätestens nach 30 Tagen automatisch abgemeldet',
-	'Filter by status' => 'Nach Status filtern',
-	'Below min. stock amount' => 'Unter Mindestbestand',
-	'Expiring soon' => 'Bald ablaufend',
-	'Already expired' => 'Bereits abgelaufen',
-	'Due soon' => 'Bald fällig',
-	'Overdue' => 'Überfällig',
-	'View settings' => 'Ansichtseinstellungen',
-	'Auto reload on external changes' => 'Autom. akt. bei externen Änderungen',
-	'Enable night mode' => 'Nachtmodus aktivieren',
-	'Auto enable in time range' => 'Autom. akt. in diesem Zeitraum',
-	'From' => 'Von',
-	'in format' => 'im Format',
-	'To' => 'Bis',
-	'Time range goes over midnight' => 'Zeitraum geht über Mitternacht',
-	'Product picture' => 'Produktbild',
-	'No file selected' => 'Keine Datei ausgewählt',
-	'If you don\'t select a file, the current picture will not be altered' => 'Wenn du keine Datei auswählst, wird das aktuelle Bild nicht verändert',
-	'Delete' => 'Löschen',
-	'The current picture will be deleted when you save the product' => 'Das aktuelle Bild wird beim Speichern des Produkts gelöscht',
-	'Select file' => 'Datei auswählen',
-	'Image of product #1' => 'Bild des Produkts #1',
-	'This product cannot be deleted because it is in stock, please remove the stock amount first.' => 'Dieses Produkt kann nicht gelöscht werden, da es auf Lager ist, bitte  zuerst den Bestand entfernen.',
-	'Delete not possible' => 'Löschen nicht möglich',
-	'Equipment' => 'Ausstattung',
-	'Instruction manual' => 'Bedienungsanleitung',
-	'The selected equipment has no instruction manual' => 'Das ausgewählte Gerät hat keine Bedienungsanleitung',
-	'Notes' => 'Notizen',
-	'Edit equipment' => 'Geräte bearbeiten',
-	'Create equipment' => 'Geräte erstellen',
-	'If you don\'t select a file, the current instruction manual will not be altered' => 'Wenn du keine Datei auswählst, wird die aktuelle Bedienungsanleitung nicht verändert',
-	'No instruction manual available' => 'Keine Bedienungsanleitung vorhanden',
-	'The current instruction manual will be deleted when you save the equipment' => 'Die aktuelle Bedienungsanleitung wird beim Speichern des Geräts gelöscht',
-	'No picture available' => 'Kein Bild vorhanden',
-	'Filter by product group' => 'Nach Produktgruppe filtern',
-	'Presets for new products' => 'Vorgaben für neue Produkte',
-	'Included recipes' => 'Enthaltene Rezepte',
-	'A recipe is required' => 'Ein Rezept ist erforderlich',
-	'Add included recipe' => 'Enthaltenes Rezept hinzufügen',
-	'Edit included recipe' => 'Enthaltenes Rezept bearbeiten',
-	'Group' => 'Gruppe',
-	'This will be used as a headline to group ingredients together' => 'Dies wird als Überschrift verwendet, um  Zutaten zusammenzufassen',
-	'Journal' => 'Journal',
-	'Stock journal' => 'Bestandsjournal',
-	'Filter by product' => 'Nach Produkt filtern',
-	'Booking time' => 'Buchungszeit',
-	'Booking type' => 'Buchungsart',
-	'Undo booking' => 'Buchung rückgängig machen',
-	'Undone on' => 'Rückgängig gemacht am',
-	'Batteries journal' => 'Batteriejournal',
-	'Filter by battery' => 'Nach Batterie filtern',
-	'Undo charge cycle' => 'Ladezyklus rückgängig machen',
-	'Undo chore execution' => 'Ausführung rückgängig machen',
-	'Chore execution successfully undone' => 'Ausführung erfolgreich rückgängig gemacht',
-	'Undo' => 'Rückgängig machen',
-	'Booking successfully undone' => 'Buchung erfolgreich rückgängig gemacht',
-	'Charge cycle successfully undone' => 'Ladezyklus erfolgreich rückgängig gemacht',
-	'This cannot be negative and must be an integral number' => 'Diese darf nicht negativ und muss eine ganze Zahl sein',
-	'Disable stock fulfillment checking for this ingredient' => 'Bestandsprüfung für diese Zutat deaktivieren',
-	'Add all list items to stock' => 'Alle Einträge zum Bestand hinzufügen',
-	'Add #3 #1 of #2 to stock' => 'Füge #3 #1 of #2 dem Bestand hinzu',
-	'Adding shopping list item #1 of #2' => 'Bearbeite Einkausfzettel-Eintrag #1 von #2',
-	'Use a specific stock item' => 'Einen bestimmten Bestandseintrag verwenden',
-	'The first item in this list would be picked by the default rule which is "First expiring first, then first in first out"' => 'Der erste Eintrag in dieser Liste würde von der Standardregel "Zuerst ablaufende zuerst, dann First In - First Out" ausgewählt werden',
-	'Mark #3 #1 of #2 as open' => '#3 #1 von #2 als geöffnet markieren',
-	'When a product was marked as opened, the best before date will be replaced by today + this amount of days (a value of 0 disables this)' => 'Wenn ein Produkt als geöffnet markiert wurde, wird das Mindesthaltbarkeitsdatum durch heute + diese Anzahl von Tagen ersetzt (ein Wert von 0 deaktiviert dies)',
-	'Default best before days after opened' => 'Standard Haltbarkeit in Tagen nach dem Öffnen',
-	'Marked #1 #2 of #3 as opened' => '#1 #2 von #3 als geöffnet markiert',
-	'Mark as opened' => 'Als geöffnet markieren',
-	'Expires on #1; Bought on #2' => 'Läuft ab am #1; Gekauft am #2',
-	'Not opened' => 'Nicht geöffnet',
-	'Opened' => 'Geöffnet',
-	'Mark #3 #1 of #2 as open' => '#3 #1 von #2 als geöffnet markieren',
-	'#1 opened' => '#1 geöffnet',
-	'Product expires' => 'Produkt läuft ab',
-	'Task due' => 'Aufgabe fällig',
-	'Chore due' => 'Hausarbeit fällig',
-	'Battery charge cycle due' => 'Battery-Ladezyklus fällig',
-	'Show clock in header' => 'Uhr in der Kopfzeile anzeigen',
-	'Stock settings' => 'Bestandseinstellungen',
-	'Shopping list to stock workflow' => 'Einkaufsliste -> Bestand Workflow',
-	'Automatically do the booking using the last price and the amount of the shopping list item, if the product has "Default best before days" set' => 'Buchung automatisch ausführen, wenn das Produkt "Standard Haltbarkeit in Tagen" hinterlegt hat (als Preis wird der letzte Preis verwendet)',
-	'Skip' => 'Überspringen',
-	'Servings' => 'Portionen',
-	'Costs' => 'Kosten',
-	'Based on the prices of the last purchase per product' => 'Basierend auf den Preisen des letzten Kaufs pro Produkt',
-	'The ingredients listed here result in this amount of servings' => 'Die hier aufgeführten Zutaten ergeben diese Menge an Portionen',
-	'Do not check against the shopping list when adding missing items to it' => 'Nicht gegen die bereits auf der Einkaufsliste vorhandene Menge prüfen, wenn fehlende Zutaten auf die Einkaufsliste gesetzt werden',
-	'By default the amount to be added to the shopping list is "needed amount - stock amount - shopping list amount" - when this is enabled, it is only checked against the stock amount, not against what is already on the shopping list' => 'Standardmäßig ist die Menge, die der Einkaufsliste hinzugefügt werden soll, "benötigte Menge - Lagerbestand - Menge bereits auf der Einkaufsliste" - wenn dies aktiviert ist, wird nur gegen den Lagerbestand geprüft, nicht gegen das, was bereits auf der Einkaufsliste steht',
-	'Picture' => 'Bild',
-	'Uncheck ingredients to not put them on the shopping list' => 'Entferne den Haken einer Zutat, um diese nicht auf die Einkaufsliste zu übernehmen',
-	'This is for statistical purposes only' => 'Dies wird nur für Auswertezwecke benötigt',
-	'You have to select a recipe' => 'Ein Rezept muss ausgewählt werden',
-	'Key type' => 'Schlusseltyp',
-	'Share/Integrate calendar (iCal)' => 'Kalender teilen/integrieren (iCal)',
-	'Use the following (public) URL to share or integrate the calendar in iCal format' => 'Verwende die folgende (öffentliche) URL, um den Kalender im iCal-Format zu teilen oder zu integrieren',
-	'Allow partial units in stock' => 'Teilmengen im Bestand zulassen',
-	'Enable tare weight handling' => 'Taragewichtbehandlung aktivieren',
-	'This is useful e.g. for flour in jars - on purchase/consume/inventory you always weigh the whole jar, the amount to be posted is then automatically calculated based on what is in stock and the tare weight defined below' => 'Dies ist z.B. für Mehl im Glas nützlich - beim Buchen eines Kaufs/Verbrauchs oder bei der Inventur musst du dann immer das gesamte Glas wiegen, die zu buchende Menge wird dann automatisch basierend auf dem Bestand und dem unten definierten Eigengewicht berechnet',
-	'Tare weight' => 'Taragewicht',
-	'Tare weight handling enabled - please weigh the whole container, the amount to be posted will be automatically calculcated' => 'Taragewichtbehandlung aktiviert - bitte den gesamten Behälter wiegen, die zu buchende Menge wird automatisch berechnet',
-	'You have to select a location' => 'Ein Standort muss ausgewählt werden',
-	'List' => 'Liste',
-	'Gallery' => 'Galerie',
-	'The current picture will be deleted when you save the recipe' => 'Das aktuelle Bild wird beim Speichern des Rezepts gelöscht ',
-	'Show product details' => 'Produktdetails anzeigen',
-	'Stock journal for this product' => 'Bestandsjournal für dieses Produkt',
-	'Show chore details' => 'Hausarbeitdetails anzeigen',
-	'Journal for this chore' => 'Journal für dieses Hausarbeit',
-	'Show battery details' => 'Batteriedetails anzeigen',
-	'Journal for this battery' => 'Journal für diese Batterie',
-	'System info' => 'Systeminformationen',
-	'Changelog' => 'Änderungsprotokoll',
-	'will be multiplied a factor of #1 to get #2' => 'wird mit dem Faktor #1 multipliziert um #2 zu erhalten',
-	'The given date is earlier than today, are you sure?' => 'Das angegebene Datum ist früher als heute, bist du sicher?',
-	'Product count' => 'Produktanzahl',
-	'Type a new product name or barcode and hit TAB to start a workflow' => 'Gib einen neuen Produktnamen oder Barcode ein und drücke TAB um einen Workflow zu starten',
-	'This will be used as the default setting when adding this product as a recipe ingredient' => 'Dies wird als Standardeinstellung verwendet wenn dieses Produkt als Rezeptzutat hinzugefügt wird'
-);

localization/de/userfield_types.po

@@ -0,0 +1,47 @@
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:43+0000\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/userfield_types\n"
+
+msgid "text-single-line"
+msgstr "Text (einzeilig)"
+
+msgid "text-multi-line"
+msgstr "Text (mehrzeilig)"
+
+msgid "number-integral"
+msgstr "Zahl (Ganzzahl)"
+
+msgid "number-decimal"
+msgstr "Zahl (mit Dezimalstellen)"
+
+msgid "date"
+msgstr "Datum (ohne Zeitanteil)"
+
+msgid "datetime"
+msgstr "Datum & Zeit"
+
+msgid "checkbox"
+msgstr "Kontrollkästchen"
+
+msgid "preset-list"
+msgstr "Auswahlliste (feste Werte, einzelner Wert kann ausgewählt werden)"
+
+msgid "preset-checklist"
+msgstr "Auswahlliste (feste Werte, mehrere Werte können ausgewählt werden)"
+
+msgid "link"
+msgstr "Link"

localization/demo_data.pot

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

localization/en/chore_assignment_types.po

@@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Translation migration from old PHP array files\n"
+"Language-Team: http://www.transifex.com/grocy/grocy/language/en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01T17:59:17+00:00\n"
+"Language: en\n"
+"X-Domain: grocy/chore_assignment_types\n"
+
+msgid "no-assignment"
+msgstr "No assignment"
+
+msgid "who-least-did-first"
+msgstr "Who least did first"
+
+msgid "random"
+msgstr "Random"
+
+msgid "in-alphabetical-order"
+msgstr "In alphabetical order"

localization/en/chore_period_types.po

@@ -0,0 +1,32 @@
+# 
+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-01T17:59:17+00:00\n"
+"Last-Translator: Translation migration from old PHP array files\n"
+"Language-Team: http://www.transifex.com/grocy/grocy/language/en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"X-Domain: grocy/chore_types\n"
+
+msgid "manually"
+msgstr "Manually"
+
+msgid "dynamic-regular"
+msgstr "Dynamic regular"
+
+msgid "daily"
+msgstr "Daily"
+
+msgid "weekly"
+msgstr "Weekly"
+
+msgid "monthly"
+msgstr "Monthly"
+
+msgid "yearly"
+msgstr "Yearly"

localization/en/chore_types.php

@@ -1,6 +0,0 @@
-<?php
-
-return array(
-	'manually' => 'Manually',
-	'dynamic-regular' => 'Dynamic regular'
-);

localization/en/component_translations.php

@@ -1,10 +0,0 @@
-<?php
-
-return array(
-	'timeago_locale' => 'en',
-	'timeago_nan' => 'NaN years ago',
-	'moment_locale' => 'x',
-	'datatables_localization' => '{"sEmptyTable":"No data available in table","sInfo":"Showing _START_ to _END_ of _TOTAL_ entries","sInfoEmpty":"Showing 0 to 0 of 0 entries","sInfoFiltered":"(filtered from _MAX_ total entries)","sInfoPostFix":"","sInfoThousands":",","sLengthMenu":"Show _MENU_ entries","sLoadingRecords":"Loading...","sProcessing":"Processing...","sSearch":"Search:","sZeroRecords":"No matching records found","oPaginate":{"sFirst":"First","sLast":"Last","sNext":"Next","sPrevious":"Previous"},"oAria":{"sSortAscending":": activate to sort column ascending","sSortDescending":": activate to sort column descending"}}',
-	'summernote_locale' => 'x',
-	'fullcalendar_locale' => 'x'
-);

localization/en/component_translations.po

@@ -0,0 +1,34 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Translation migration from old PHP array files\n"
+"Language-Team: http://www.transifex.com/grocy/grocy/language/en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01T17:59:17+00:00\n"
+"Language: en\n"
+"X-Domain: grocy/component_translations\n"
+
+msgid "timeago_locale"
+msgstr "en"
+
+msgid "timeago_nan"
+msgstr "NaN years ago"
+
+msgid "moment_locale"
+msgstr "x"
+
+msgid "datatables_localization"
+msgstr "{\"sEmptyTable\":\"No data available in table\",\"sInfo\":\"Showing _START_ to _END_ of _TOTAL_ entries\",\"sInfoEmpty\":\"Showing 0 to 0 of 0 entries\",\"sInfoFiltered\":\"(filtered from _MAX_ total entries)\",\"sInfoPostFix\":\"\",\"sInfoThousands\":\",\",\"sLengthMenu\":\"Show _MENU_ entries\",\"sLoadingRecords\":\"Loading...\",\"sProcessing\":\"Processing...\",\"sSearch\":\"Search:\",\"sZeroRecords\":\"No matching records found\",\"oPaginate\":{\"sFirst\":\"First\",\"sLast\":\"Last\",\"sNext\":\"Next\",\"sPrevious\":\"Previous\"},\"oAria\":{\"sSortAscending\":\": activate to sort column ascending\",\"sSortDescending\":\": activate to sort column descending\"}}"
+
+msgid "summernote_locale"
+msgstr "x"
+
+msgid "fullcalendar_locale"
+msgstr "x"
+
+msgid "bootstrap-select_locale"
+msgstr "x"

localization/en/demo_data.php

@@ -1,90 +0,0 @@
-<?php
-
-return array(
-	'Cookies' => 'Cookies',
-	'Chocolate' => 'Chocolate',
-	'Pantry' => 'Pantry',
-	'Candy cupboard' => 'Candy cupboard',
-	'Tinned food cupboard' => 'Tinned food cupboard',
-	'Fridge' => 'Fridge',
-	'Piece' => 'Piece',
-	'Pieces' => 'Pieces',
-	'Pack' => 'Pack',
-	'Packs' => 'Packs',
-	'Glass' => 'Glass',
-	'Glasses' => 'Glasses',
-	'Tin' => 'Tin',
-	'Tins' => 'Tins',
-	'Can' => 'Can',
-	'Cans' => 'Cans',
-	'Bunch' => 'Bunch',
-	'Bunches' => 'Bunches',
-	'Gummy bears' => 'Gummy bears',
-	'Crisps' => 'Crisps',
-	'Eggs' => 'Eggs',
-	'Noodles' => 'Noodles',
-	'Pickles' => 'Pickles',
-	'Gulash soup' => 'Gulash soup',
-	'Yogurt' => 'Yogurt',
-	'Cheese' => 'Cheese',
-	'Cold cuts' => 'Cold cuts',
-	'Paprika' => 'Paprika',
-	'Cucumber' => 'Cucumber',
-	'Radish' => 'Radish',
-	'Tomato' => 'Tomato',
-	'Changed towels in the bathroom' => 'Changed towels in the bathroom',
-	'Cleaned the kitchen floor' => 'Cleaned the kitchen floor',
-	'Warranty ends' => 'Warranty ends',
-	'TV remote control' => 'TV remote control',
-	'Alarm clock' => 'Alarm clock',
-	'Heat remote control' => 'Heat remote control',
-	'Lawn mowed in the garden' => 'Lawn mowed in the garden',
-	'Some good snacks' => 'Some good snacks',
-	'Pizza dough' => 'Pizza dough',
-	'Sieved tomatoes' => 'Sieved tomatoes',
-	'Salami' => 'Salami',
-	'Toast' => 'Toast',
-	'Minced meat' => 'Minced meat',
-	'Pizza' => 'Pizza',
-	'Spaghetti bolognese' => 'Spaghetti bolognese',
-	'Sandwiches' => 'Sandwiches',
-	'English' => 'English',
-	'German' => 'German',
-	'Italian' => 'Italian',
-	'Demo in different language' => 'Demo in different language',
-	'This is the note content of the recipe ingredient' => 'This is the note content of the recipe ingredient',
-	'Demo User' => 'Demo User',
-	'Gram' => 'Gram',
-	'Grams' => 'Grams',
-	'Flour' => 'Flour',
-	'Pancakes' => 'Pancakes',
-	'Sugar' => 'Sugar',
-	'Home' => 'Home',
-	'Life' => 'Life',
-	'Projects' => 'Projects',
-	'Repair the garage door' => 'Repair the garage door',
-	'Fork and improve grocy' => 'Fork and improve grocy',
-	'Find a solution for what to do when I forget the door keys' => 'Find a solution for what to do when I forget the door keys',
-	'Sweets' => 'Sweets',
-	'Bakery products' => 'Bakery products',
-	'Tinned food' => 'Tinned food',
-	'Butchery products' => 'Butchery products',
-	'Vegetables/Fruits' => 'Vegetables/Fruits',
-	'Refrigerated products' => 'Refrigerated products',
-	'Coffee machine' => 'Coffee machine',
-	'Dishwasher' => 'Dishwasher',
-	'Liter' => 'Liter',
-	'Liters' => 'Liters',
-	'Bottle' => 'Bottle',
-	'Bottles' => 'Bottles',
-	'Milk' => 'Milk',
-	'Chocolate sauce' => 'Chocolate sauce',
-	'Milliliters' => 'Milliliters',
-	'Milliliter' => 'Milliliter',
-	'Bottom' => 'Bottom',
-	'Topping' => 'Topping',
-	'French' => 'French',
-	'Turkish' => 'Turkish',
-	'Spanish' => 'Spanish',
-	'Russian' => 'Russian'
-);

localization/en/demo_data.po

@@ -0,0 +1,286 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Translation migration from old PHP array files\n"
+"Language-Team: http://www.transifex.com/grocy/grocy/language/en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01T17:59:17+00:00\n"
+"Language: en\n"
+"X-Domain: grocy/demo_data\n"
+
+msgid "Cookies"
+msgstr "Cookies"
+
+msgid "Chocolate"
+msgstr "Chocolate"
+
+msgid "Pantry"
+msgstr "Pantry"
+
+msgid "Candy cupboard"
+msgstr "Candy cupboard"
+
+msgid "Tinned food cupboard"
+msgstr "Tinned food cupboard"
+
+msgid "Fridge"
+msgstr "Fridge"
+
+msgid "Piece"
+msgstr "Piece"
+
+msgid "Pieces"
+msgstr "Pieces"
+
+msgid "Pack"
+msgstr "Pack"
+
+msgid "Packs"
+msgstr "Packs"
+
+msgid "Glass"
+msgstr "Glass"
+
+msgid "Glasses"
+msgstr "Glasses"
+
+msgid "Tin"
+msgstr "Tin"
+
+msgid "Tins"
+msgstr "Tins"
+
+msgid "Can"
+msgstr "Can"
+
+msgid "Cans"
+msgstr "Cans"
+
+msgid "Bunch"
+msgstr "Bunch"
+
+msgid "Bunches"
+msgstr "Bunches"
+
+msgid "Gummy bears"
+msgstr "Gummy bears"
+
+msgid "Crisps"
+msgstr "Crisps"
+
+msgid "Eggs"
+msgstr "Eggs"
+
+msgid "Noodles"
+msgstr "Noodles"
+
+msgid "Pickles"
+msgstr "Pickles"
+
+msgid "Gulash soup"
+msgstr "Gulash soup"
+
+msgid "Yogurt"
+msgstr "Yogurt"
+
+msgid "Cheese"
+msgstr "Cheese"
+
+msgid "Cold cuts"
+msgstr "Cold cuts"
+
+msgid "Paprika"
+msgstr "Paprika"
+
+msgid "Cucumber"
+msgstr "Cucumber"
+
+msgid "Radish"
+msgstr "Radish"
+
+msgid "Tomato"
+msgstr "Tomato"
+
+msgid "Changed towels in the bathroom"
+msgstr "Changed towels in the bathroom"
+
+msgid "Cleaned the kitchen floor"
+msgstr "Cleaned the kitchen floor"
+
+msgid "Warranty ends"
+msgstr "Warranty ends"
+
+msgid "TV remote control"
+msgstr "TV remote control"
+
+msgid "Alarm clock"
+msgstr "Alarm clock"
+
+msgid "Heat remote control"
+msgstr "Heat remote control"
+
+msgid "Lawn mowed in the garden"
+msgstr "Lawn mowed in the garden"
+
+msgid "Some good snacks"
+msgstr "Some good snacks"
+
+msgid "Pizza dough"
+msgstr "Pizza dough"
+
+msgid "Sieved tomatoes"
+msgstr "Sieved tomatoes"
+
+msgid "Salami"
+msgstr "Salami"
+
+msgid "Toast"
+msgstr "Toast"
+
+msgid "Minced meat"
+msgstr "Minced meat"
+
+msgid "Pizza"
+msgstr "Pizza"
+
+msgid "Spaghetti bolognese"
+msgstr "Spaghetti bolognese"
+
+msgid "Sandwiches"
+msgstr "Sandwiches"
+
+msgid "English"
+msgstr "English"
+
+msgid "German"
+msgstr "German"
+
+msgid "Italian"
+msgstr "Italian"
+
+msgid "Demo in different language"
+msgstr "Demo in different language"
+
+msgid "This is the note content of the recipe ingredient"
+msgstr "This is the note content of the recipe ingredient"
+
+msgid "Demo User"
+msgstr "Demo User"
+
+msgid "Gram"
+msgstr "Gram"
+
+msgid "Grams"
+msgstr "Grams"
+
+msgid "Flour"
+msgstr "Flour"
+
+msgid "Pancakes"
+msgstr "Pancakes"
+
+msgid "Sugar"
+msgstr "Sugar"
+
+msgid "Home"
+msgstr "Home"
+
+msgid "Life"
+msgstr "Life"
+
+msgid "Projects"
+msgstr "Projects"
+
+msgid "Repair the garage door"
+msgstr "Repair the garage door"
+
+msgid "Fork and improve grocy"
+msgstr "Fork and improve grocy"
+
+msgid "Find a solution for what to do when I forget the door keys"
+msgstr "Find a solution for what to do when I forget the door keys"
+
+msgid "Sweets"
+msgstr "Sweets"
+
+msgid "Bakery products"
+msgstr "Bakery products"
+
+msgid "Tinned food"
+msgstr "Tinned food"
+
+msgid "Butchery products"
+msgstr "Butchery products"
+
+msgid "Vegetables/Fruits"
+msgstr "Vegetables/Fruits"
+
+msgid "Refrigerated products"
+msgstr "Refrigerated products"
+
+msgid "Coffee machine"
+msgstr "Coffee machine"
+
+msgid "Dishwasher"
+msgstr "Dishwasher"
+
+msgid "Liter"
+msgstr "Liter"
+
+msgid "Liters"
+msgstr "Liters"
+
+msgid "Bottle"
+msgstr "Bottle"
+
+msgid "Bottles"
+msgstr "Bottles"
+
+msgid "Milk"
+msgstr "Milk"
+
+msgid "Chocolate sauce"
+msgstr "Chocolate sauce"
+
+msgid "Milliliters"
+msgstr "Milliliters"
+
+msgid "Milliliter"
+msgstr "Milliliter"
+
+msgid "Bottom"
+msgstr "Bottom"
+
+msgid "Topping"
+msgstr "Topping"
+
+msgid "French"
+msgstr "French"
+
+msgid "Turkish"
+msgstr "Turkish"
+
+msgid "Spanish"
+msgstr "Spanish"
+
+msgid "Russian"
+msgstr "Russian"
+
+msgid "The thing which happens on the 5th of every month"
+msgstr "The thing which happens on the 5th of every month"
+
+msgid "The thing which happens daily"
+msgstr "The thing which happens daily"
+
+msgid "The thing which happens on Mondays and Wednesdays"
+msgstr "The thing which happens on Mondays and Wednesdays"
+
+msgid "Swedish"
+msgstr "Swedish"
+
+msgid "Polish"
+msgstr "Polish"

localization/en/stock_transaction_types.php

@@ -1,8 +0,0 @@
-<?php
-
-return array(
-	'purchase' => 'Purchase',
-	'consume' => 'Consume',
-	'inventory-correction' => 'Inventory correction',
-	'product-opened' => 'Product opened'
-);

localization/en/stock_transaction_types.po

@@ -0,0 +1,40 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Translation migration from old PHP array files\n"
+"Language-Team: http://www.transifex.com/grocy/grocy/language/en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01T17:59:17+00:00\n"
+"Language: en\n"
+"X-Domain: grocy/stock_transaction_types\n"
+
+msgid "purchase"
+msgstr "Purchase"
+
+msgid "transfer_to"
+msgstr "Transfer To"
+
+msgid "transfer_from"
+msgstr "Transfer From"
+
+msgid "consume"
+msgstr "Consume"
+
+msgid "inventory-correction"
+msgstr "Inventory correction"
+
+msgid "product-opened"
+msgstr "Product opened"
+
+msgid "stock-edit-old"
+msgstr "Stock entry edited (old values)"
+
+msgid "stock-edit-new"
+msgstr "Stock entry edited (new values)"
+
+msgid "self-production"
+msgstr "Self-production"

localization/en/strings.php

@@ -1,362 +0,0 @@
-<?php
-
-return array(
-	'Stock overview' => 'Stock overview',
-	'#1 products expiring within the next #2 days' => '#1 products expiring within the next #2 days',
-	'#1 products are already expired' => '#1 products are already expired',
-	'#1 products are below defined min. stock amount' => '#1 products are below defined min. stock amount',
-	'Product' => 'Product',
-	'Amount' => 'Amount',
-	'Next best before date' => 'Next best before date',
-	'Logout' => 'Logout',
-	'Chores overview' => 'Chores overview',
-	'Batteries overview' => 'Batteries overview',
-	'Purchase' => 'Purchase',
-	'Consume' => 'Consume',
-	'Inventory' => 'Inventory',
-	'Shopping list' => 'Shopping list',
-	'Chore tracking' => 'Chore tracking',
-	'Battery tracking' => 'Battery tracking',
-	'Products' => 'Products',
-	'Locations' => 'Locations',
-	'Quantity units' => 'Quantity units',
-	'Chores' => 'Chores',
-	'Batteries' => 'Batteries',
-	'Chore' => 'Chore',
-	'Next estimated tracking' => 'Next estimated tracking',
-	'Last tracked' => 'Last tracked',
-	'Battery' => 'Battery',
-	'Last charged' => 'Last charged',
-	'Next planned charge cycle' => 'Next planned charge cycle',
-	'Best before' => 'Best before',
-	'OK' => 'OK',
-	'Product overview' => 'Product overview',
-	'Stock quantity unit' => 'Stock quantity unit',
-	'Stock amount' => 'Stock amount',
-	'Last purchased' => 'Last purchased',
-	'Last used' => 'Last used',
-	'Spoiled' => 'Spoiled',
-	'Barcode lookup is disabled' => 'Barcode lookup is disabled',
-	'will be added to the list of barcodes for the selected product on submit' => 'will be added to the list of barcodes for the selected product on submit',
-	'New amount' => 'New amount',
-	'Note' => 'Note',
-	'Tracked time' => 'Tracked time',
-	'Chore overview' => 'Chore overview',
-	'Tracked count' => 'Tracked count',
-	'Battery overview' => 'Battery overview',
-	'Charge cycles count' => 'Charge cycles count',
-	'Create shopping list item' => 'Create shopping list item',
-	'Edit shopping list item' => 'Edit shopping list item',
-	'Save' => 'Save',
-	'Add' => 'Add',
-	'Name' => 'Name',
-	'Location' => 'Location',
-	'Min. stock amount' => 'Min. stock amount',
-	'QU purchase' => 'QU purchase',
-	'QU stock' => 'QU stock',
-	'QU factor' => 'QU factor',
-	'Description' => 'Description',
-	'Create product' => 'Create product',
-	'Barcode(s)' => 'Barcode(s)',
-	'Minimum stock amount' => 'Minimum stock amount',
-	'Default best before days' => 'Default best before days',
-	'Quantity unit purchase' => 'Quantity unit purchase',
-	'Quantity unit stock' => 'Quantity unit stock',
-	'Factor purchase to stock quantity unit' => 'Factor purchase to stock quantity unit',
-	'Create location' => 'Create location',
-	'Create quantity unit' => 'Create quantity unit',
-	'Period type' => 'Period type',
-	'Period days' => 'Period days',
-	'Create chore' => 'Create chore',
-	'Used in' => 'Used in',
-	'Create battery' => 'Create battery',
-	'Edit battery' => 'Edit battery',
-	'Edit chore' => 'Edit chore',
-	'Edit quantity unit' => 'Edit quantity unit',
-	'Edit product' => 'Edit product',
-	'Edit location' => 'Edit location',
-	'Record data' => 'Record data',
-	'Manage master data' => 'Manage master data',
-	'This will apply to added products' => 'This will apply to added products',
-	'never' => 'never',
-	'Add products that are below defined min. stock amount' => 'Add products that are below defined min. stock amount',
-	'For purchases this amount of days will be added to today for the best before date suggestion' => 'For purchases this amount of days will be added to today for the best before date suggestion',
-	'This means 1 #1 purchased will be converted into #2 #3 in stock' => 'This means 1 #1 purchased will be converted into #2 #3 in stock',
-	'Login' => 'Login',
-	'Username' => 'Username',
-	'Password' => 'Password',
-	'Invalid credentials, please try again' => 'Invalid credentials, please try again',
-	'Are you sure to delete battery "#1"?' => 'Are you sure to delete battery "#1"?',
-	'Yes' => 'Yes',
-	'No' => 'No',
-	'Are you sure to delete chore "#1"?' => 'Are you sure to delete chore "#1"?',
-	'"#1" could not be resolved to a product, how do you want to proceed?' => '"#1" could not be resolved to a product, how do you want to proceed?',
-	'Create or assign product' => 'Create or assign product',
-	'Cancel' => 'Cancel',
-	'Add as new product' => 'Add as new product',
-	'Add as barcode to existing product' => 'Add as barcode to existing product',
-	'Add as new product and prefill barcode' => 'Add as new product and prefill barcode',
-	'Are you sure to delete quantity unit "#1"?' => 'Are you sure to delete quantity unit "#1"?',
-	'Are you sure to delete product "#1"?' => 'Are you sure to delete product "#1"?',
-	'Are you sure to delete location "#1"?' => 'Are you sure to delete location "#1"?',
-	'Manage API keys' => 'Manage API keys',
-	'REST API & data model documentation' => 'REST API & data model documentation',
-	'API keys' => 'API keys',
-	'Create new API key' => 'Create new API key',
-	'API key' => 'API key',
-	'Expires' => 'Expires',
-	'Created' => 'Created',
-	'This product is not in stock' => 'This product is not in stock',
-	'This means #1 will be added to stock' => 'This means #1 will be added to stock',
-	'This means #1 will be removed from stock' => 'This means #1 will be removed from stock',
-	'This means it is estimated that a new execution of this chore is tracked #1 days after the last was tracked' => 'This means it is estimated that a new execution of this chore is tracked #1 days after the last was tracked',
-	'Removed #1 #2 of #3 from stock' => 'Removed #1 #2 of #3 from stock',
-	'About grocy' => 'About grocy',
-	'Close' => 'Close',
-	'#1 batteries are due to be charged within the next #2 days' => '#1 batteries are due to be charged within the next #2 days',
-	'#1 batteries are overdue to be charged' => '#1 batteries are overdue to be charged',
-	'#1 chores are due to be done within the next #2 days' => '#1 chores are due to be done within the next #2 days',
-	'#1 chores are overdue to be done' => '#1 chores are overdue to be done',
-	'Released on' => 'Released on',
-	'Consume #3 #1 of #2' => 'Consume #3 #1 of #2',
-	'Added #1 #2 of #3 to stock' => 'Added #1 #2 of #3 to stock',
-	'Stock amount of #1 is now #2 #3' => 'Stock amount of #1 is now #2 #3',
-	'Tracked execution of chore #1 on #2' => 'Tracked execution of chore #1 on #2',
-	'Tracked charge cycle of battery #1 on #2' => 'Tracked charge cycle of battery #1 on #2',
-	'Consume all #1 which are currently in stock' => 'Consume all #1 which are currently in stock',
-	'All' => 'All',
-	'Track charge cycle of battery #1' => 'Track charge cycle of battery #1',
-	'Track execution of chore #1' => 'Track execution of chore #1',
-	'Filter by location' => 'Filter by location',
-	'Search' => 'Search',
-	'Not logged in' => 'Not logged in',
-	'You have to select a product' => 'You have to select a product',
-	'You have to select a chore' => 'You have to select a chore',
-	'You have to select a battery' => 'You have to select a battery',
-	'A name is required' => 'A name is required',
-	'A location is required' => 'A location is required',
-	'The amount cannot be lower than #1' => 'The amount cannot be lower than #1',
-	'This cannot be negative' => 'This cannot be negative',
-	'A quantity unit is required' => 'A quantity unit is required',
-	'A period type is required' => 'A period type is required',
-	'A best before date is required' => 'A best before date is required',
-	'Settings' => 'Settings',
-	'This can only be before now' => 'This can only be before now',
-	'Calendar' => 'Calendar',
-	'Recipes' => 'Recipes',
-	'Edit recipe' => 'Edit recipe',
-	'New recipe' => 'New recipe',
-	'Ingredients list' => 'Ingredients list',
-	'Add recipe ingredient' => 'Add recipe ingredient',
-	'Edit recipe ingredient' => 'Edit recipe ingredient',
-	'Are you sure to delete recipe "#1"?' => 'Are you sure to delete recipe "#1"?',
-	'Are you sure to delete recipe ingredient "#1"?' => 'Are you sure to delete recipe ingredient "#1"?',
-	'Are you sure to empty the shopping list?' => 'Are you sure to empty the shopping list?',
-	'Clear list' => 'Clear list',
-	'Requirements fulfilled' => 'Requirements fulfilled',
-	'Put missing products on shopping list' => 'Put missing products on shopping list',
-	'Not enough in stock, #1 ingredients missing' => 'Not enough in stock, #1 ingredients missing',
-	'Enough in stock' => 'Enough in stock',
-	'Not enough in stock, #1 ingredients missing but already on the shopping list' => 'Not enough in stock, #1 ingredients missing but already on the shopping list',
-	'Expand to fullscreen' => 'Expand to fullscreen',
-	'Ingredients' => 'Ingredients',
-	'Preparation' => 'Preparation',
-	'Recipe' => 'Recipe',
-	'Not enough in stock, #1 missing, #2 already on shopping list' => 'Not enough in stock, #1 missing, #2 already on shopping list',
-	'Show notes' => 'Show notes',
-	'Put missing amount on shopping list' => 'Put missing amount on shopping list',
-	'Are you sure to put all missing ingredients for recipe "#1" on the shopping list?' => 'Are you sure to put all missing ingredients for recipe "#1" on the shopping list?',
-	'Added for recipe #1' => 'Added for recipe #1',
-	'Manage users' => 'Manage users',
-	'User' => 'User',
-	'Users' => 'Users',
-	'Are you sure to delete user "#1"?' => 'Are you sure to delete user "#1"?',
-	'Create user' => 'Create user',
-	'Edit user' => 'Edit user',
-	'First name' => 'First name',
-	'Last name' => 'Last name',
-	'A username is required' => 'A username is required',
-	'Confirm password' => 'Confirm password',
-	'Passwords do not match' => 'Passwords do not match',
-	'Change password' => 'Change password',
-	'Done by' => 'Done by',
-	'Last done by' => 'Last done by',
-	'Unknown' => 'Unknown',
-	'Filter by chore' => 'Filter by chore',
-	'Chores journal' => 'Chores journal',
-	'0 means suggestions for the next charge cycle are disabled' => '0 means suggestions for the next charge cycle are disabled',
-	'Charge cycle interval (days)' => 'Charge cycle interval (days)',
-	'Last price' => 'Last price',
-	'Price history' => 'Price history',
-	'No price history available' => 'No price history available',
-	'Price' => 'Price',
-	'in #1 per purchase quantity unit' => 'in #1 per purchase quantity unit',
-	'The price cannot be lower than #1' => 'The price cannot be lower than #1',
-	'#1 product expires within the next #2 days' => '#1 product expires within the next #2 days',
-	'#1 product is already expired' => '#1 product is already expired',
-	'#1 product is below defined min. stock amount' => '#1 product is below defined min. stock amount',
-	'Unit' => 'Unit',
-	'Units' => 'Units',
-	'#1 chore is due to be done within the next #2 days' => '#1 chore is due to be done within the next #2 days',
-	'#1 chore is overdue to be done' => '#1 chore is overdue to be done',
-	'#1 battery is due to be charged within the next #2 days' => '#1 battery is due to be charged within the next #2 days',
-	'#1 battery is overdue to be charged' => '#1 battery is overdue to be charged',
-	'#1 unit was automatically added and will apply in addition to the amount entered here' => '#1 unit was automatically added and will apply in addition to the amount entered here',
-	'in singular form' => 'in singular form',
-	'in plural form' => 'in plural form',
-	'Never expires' => 'Never expires',
-	'This cannot be lower than #1' => 'This cannot be lower than #1',
-	'-1 means that this product never expires' => '-1 means that this product never expires',
-	'Quantity unit' => 'Quantity unit',
-	'Only check if a single unit is in stock (a different quantity can then be used above)' => 'Only check if a single unit is in stock (a different quantity can then be used above)',
-	'Are you sure to consume all ingredients needed by recipe "#1" (ingredients marked with "check only if a single unit is in stock" will be ignored)?' => 'Are you sure to consume all ingredients needed by recipe "#1" (ingredients marked with "check only if a single unit is in stock" will be ignored)?',
-	'Removed all ingredients of recipe "#1" from stock' => 'Removed all ingredients of recipe "#1" from stock',
-	'Consume all ingredients needed by this recipe' => 'Consume all ingredients needed by this recipe',
-	'Click to show technical details' => 'Click to show technical details',
-	'Error while saving, probably this item already exists' => 'Error while saving, probably this item already exists',
-	'Error details' => 'Error details',
-	'Tasks' => 'Tasks',
-	'Show done tasks' => 'Show done tasks',
-	'Task' => 'Task',
-	'Due' => 'Due',
-	'Assigned to' => 'Assigned to',
-	'Mark task "#1" as completed' => 'Mark task "#1" as completed',
-	'Uncategorized' => 'Uncategorized',
-	'Task categories' => 'Task categories',
-	'Create task' => 'Create task',
-	'A due date is required' => 'A due date is required',
-	'Category' => 'Category',
-	'Edit task' => 'Edit task',
-	'Are you sure to delete task "#1"?' => 'Are you sure to delete task "#1"?',
-	'#1 task is due to be done within the next #2 days' => '#1 task is due to be done within the next #2 days',
-	'#1 tasks are due to be done within the next #2 days' => '#1 tasks are due to be done within the next #2 days',
-	'#1 task is overdue to be done' => '#1 task is overdue to be done',
-	'#1 tasks are overdue to be done' => '#1 tasks are overdue to be done',
-	'Edit task category' => 'Edit task category',
-	'Create task category' => 'Create task category',
-	'Product groups' => 'Product groups',
-	'Ungrouped' => 'Ungrouped',
-	'Create product group' => 'Create product group',
-	'Edit product group' => 'Edit product group',
-	'Product group' => 'Product group',
-	'Are you sure to delete product group "#1"?' => 'Are you sure to delete product group "#1"?',
-	'Stay logged in permanently' => 'Stay logged in permanently',
-	'When not set, you will get logged out at latest after 30 days' => 'When not set, you will get logged out at latest after 30 days',
-	'Filter by status' => 'Filter by status',
-	'Below min. stock amount' => 'Below min. stock amount',
-	'Expiring soon' => 'Expiring soon',
-	'Already expired' => 'Already expired',
-	'Due soon' => 'Due soon',
-	'Overdue' => 'Overdue',
-	'View settings' => 'View settings',
-	'Auto reload on external changes' => 'Auto reload on external changes',
-	'Enable night mode' => 'Enable night mode',
-	'Auto enable in time range' => 'Auto enable in time range',
-	'From' => 'From',
-	'in format' => 'in format',
-	'To' => 'To',
-	'Time range goes over midnight' => 'Time range goes over midnight',
-	'Product picture' => 'Product picture',
-	'No file selected' => 'No file selected',
-	'If you don\'t select a file, the current picture will not be altered' => 'If you don\'t select a file, the current picture will not be altered',
-	'Delete' => 'Delete',
-	'The current picture will be deleted when you save the product' => 'The current picture will be deleted when you save the product',
-	'Select file' => 'Select file',
-	'Image of product #1' => 'Image of product #1',
-	'This product cannot be deleted because it is in stock, please remove the stock amount first.' => 'This product cannot be deleted because it is in stock, please remove the stock amount first.',
-	'Delete not possible' => 'Delete not possible',
-	'Equipment' => 'Equipment',
-	'Instruction manual' => 'Instruction manual',
-	'The selected equipment has no instruction manual' => 'The selected equipment has no instruction manual',
-	'Notes' => 'Notes',
-	'Edit equipment' => 'Edit equipment',
-	'Create equipment' => 'Create equipment',
-	'If you don\'t select a file, the current instruction manual will not be altered' => 'If you don\'t select a file, the current instruction manual will not be altered',
-	'No instruction manual available' => 'No instruction manual available',
-	'The current instruction manual will be deleted when you save the equipment' => 'The current instruction manual will be deleted when you save the equipment',
-	'No picture available' => 'No picture available',
-	'Filter by product group' => 'Filter by product group',
-	'Presets for new products' => 'Presets for new products',
-	'Included recipes' => 'Included recipes',
-	'A recipe is required' => 'A recipe is required',
-	'Add included recipe' => 'Add included recipe',
-	'Edit included recipe' => 'Edit included recipe',
-	'Group' => 'Group',
-	'This will be used as a headline to group ingredients together' => 'This will be used as a headline to group ingredients together',
-	'Journal' => 'Journal',
-	'Stock journal' => 'Stock journal',
-	'Filter by product' => 'Filter by product',
-	'Booking time' => 'Booking time',
-	'Booking type' => 'Booking type',
-	'Undo booking' => 'Undo booking',
-	'Undone on' => 'Undone on',
-	'Batteries journal' => 'Batteries journal',
-	'Filter by battery' => 'Filter by battery',
-	'Undo charge cycle' => 'Undo charge cycle',
-	'Undo chore execution' => 'Undo chore execution',
-	'Chore execution successfully undone' => 'Chore execution successfully undone',
-	'Undo' => 'Undo',
-	'Booking successfully undone' => 'Booking successfully undone',
-	'Charge cycle successfully undone' => 'Charge cycle successfully undone',
-	'This cannot be negative and must be an integral number' => 'This cannot be negative and must be an integral number',
-	'Disable stock fulfillment checking for this ingredient' => 'Disable stock fulfillment checking for this ingredient',
-	'Add all list items to stock' => 'Add all list items to stock',
-	'Add #3 #1 of #2 to stock' => 'Add #3 #1 of #2 to stock',
-	'Adding shopping list item #1 of #2' => 'Adding shopping list item #1 of #2',
-	'Use a specific stock item' => 'Use a specific stock item',
-	'The first item in this list would be picked by the default rule which is "First expiring first, then first in first out"' => 'The first item in this list would be picked by the default rule which is "First expiring first, then first in first out"',
-	'Mark #3 #1 of #2 as open' => 'Mark #3 #1 of #2 as open',
-	'When a product was marked as opened, the best before date will be replaced by today + this amount of days (a value of 0 disables this)' => 'When a product was marked as opened, the best before date will be replaced by today + this amount of days (a value of 0 disables this)',
-	'Default best before days after opened' => 'Default best before days after opened',
-	'Marked #1 #2 of #3 as opened' => 'Marked #1 #2 of #3 as opened',
-	'Mark as opened' => 'Mark as opened',
-	'Expires on #1; Bought on #2' => 'Expires on #1; Bought on #2',
-	'Not opened' => 'Not opened',
-	'Opened' => 'Opened',
-	'Mark #3 #1 of #2 as open' => 'Mark #3 #1 of #2 as open',
-	'#1 opened' => '#1 opened',
-	'Product expires' => 'Product expires',
-	'Task due' => 'Task due',
-	'Chore due' => 'Chore due',
-	'Battery charge cycle due' => 'Battery charge cycle due',
-	'Show clock in header' => 'Show clock in header',
-	'Stock settings' => 'Stock settings',
-	'Shopping list to stock workflow' => 'Shopping list to stock workflow',
-	'Automatically do the booking using the last price and the amount of the shopping list item, if the product has "Default best before days" set' => 'Automatically do the booking using the last price and the amount of the shopping list item, if the product has "Default best before days" set',
-	'Skip' => 'Skip',
-	'Servings' => 'Servings',
-	'Costs' => 'Costs',
-	'Based on the prices of the last purchase per product' => 'Based on the prices of the last purchase per product',
-	'The ingredients listed here result in this amount of servings' => 'The ingredients listed here result in this amount of servings',
-	'Do not check against the shopping list when adding missing items to it' => 'Do not check against the shopping list when adding missing items to it',
-	'By default the amount to be added to the shopping list is "needed amount - stock amount - shopping list amount" - when this is enabled, it is only checked against the stock amount, not against what is already on the shopping list' => 'By default the amount to be added to the shopping list is "needed amount - stock amount - shopping list amount" - when this is enabled, it is only checked against the stock amount, not against what is already on the shopping list',
-	'Picture' => 'Picture',
-	'Uncheck ingredients to not put them on the shopping list' => 'Uncheck ingredients to not put them on the shopping list',
-	'This is for statistical purposes only' => 'This is for statistical purposes only',
-	'You have to select a recipe' => 'You have to select a recipe',
-	'Key type' => 'Key type',
-	'Share/Integrate calendar (iCal)' => 'Share/Integrate calendar (iCal)',
-	'Use the following (public) URL to share or integrate the calendar in iCal format' => 'Use the following (public) URL to share or integrate the calendar in iCal format',
-	'Allow partial units in stock' => 'Allow partial units in stock',
-	'Enable tare weight handling' => 'Enable tare weight handling',
-	'This is useful e.g. for flour in jars - on purchase/consume/inventory you always weigh the whole jar, the amount to be posted is then automatically calculated based on what is in stock and the tare weight defined below' => 'This is useful e.g. for flour in jars - on purchase/consume/inventory you always weigh the whole jar, the amount to be posted is then automatically calculated based on what is in stock and the tare weight defined below',
-	'Tare weight' => 'Tare weight',
-	'Tare weight handling enabled - please weigh the whole container, the amount to be posted will be automatically calculcated' => 'Tare weight handling enabled - please weigh the whole container, the amount to be posted will be automatically calculcated',
-	'You have to select a location' => 'You have to select a location',
-	'List' => 'List',
-	'Gallery' => 'Gallery',
-	'The current picture will be deleted when you save the recipe' => 'The current picture will be deleted when you save the recipe',
-	'Show product details' => 'Show product details',
-	'Stock journal for this product' => 'Stock journal for this product',
-	'Show chore details' => 'Show chore details',
-	'Journal for this chore' => 'Journal for this chore',
-	'Show battery details' => 'Show battery details',
-	'Journal for this battery' => 'Journal for this battery',
-	'System info' => 'System info',
-	'Changelog' => 'Changelog',
-	'will be multiplied a factor of #1 to get #2' => 'will be multiplied a factor of #1 to get #2',
-	'The given date is earlier than today, are you sure?' => 'The given date is earlier than today, are you sure?',
-	'Product count' => 'Product count',
-	'Type a new product name or barcode and hit TAB to start a workflow' => 'Type a new product name or barcode and hit TAB to start a workflow',
-	'This will be used as the default setting when adding this product as a recipe ingredient' => 'This will be used as the default setting when adding this product as a recipe ingredient'
-);

localization/en/userfield_types.po

@@ -0,0 +1,43 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Translation migration from old PHP array files\n"
+"Language-Team: http://www.transifex.com/grocy/grocy/language/en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01T17:59:17+00:00\n"
+"Language: en\n"
+"X-Domain: grocy/userfield_types\n"
+
+msgid "text-single-line"
+msgstr "Text (single line)"
+
+msgid "text-multi-line"
+msgstr "Text (multi line)"
+
+msgid "number-integral"
+msgstr "Number (integral)"
+
+msgid "number-decimal"
+msgstr "Number (decimal)"
+
+msgid "date"
+msgstr "Date (without time)"
+
+msgid "datetime"
+msgstr "Date & time"
+
+msgid "checkbox"
+msgstr "Checkbox"
+
+msgid "preset-list"
+msgstr "Select list (a single item can be selected)"
+
+msgid "preset-checklist"
+msgstr "Select list (multiple items can be selected)"
+
+msgid "link"
+msgstr "Link"

localization/en_GB/chore_assignment_types.po

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

localization/en_GB/chore_period_types.po

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

localization/en_GB/component_translations.po

@@ -0,0 +1,48 @@
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Language-Team: English (United Kingdom) (https://www.transifex.com/grocy/teams/93189/en_GB/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/component_translations\n"
+
+msgid "timeago_locale"
+msgstr "en"
+
+msgid "timeago_nan"
+msgstr "NaN years ago"
+
+msgid "moment_locale"
+msgstr "en-gb"
+
+msgid "datatables_localization"
+msgstr ""
+"{\"sEmptyTable\":\"No data available in table\",\"sInfo\":\"Showing _START_ "
+"to _END_ of _TOTAL_ entries\",\"sInfoEmpty\":\"Showing 0 to 0 of 0 "
+"entries\",\"sInfoFiltered\":\"(filtered from _MAX_ total "
+"entries)\",\"sInfoPostFix\":\"\",\"sInfoThousands\":\",\",\"sLengthMenu\":\"Show"
+" _MENU_ "
+"entries\",\"sLoadingRecords\":\"Loading...\",\"sProcessing\":\"Processing...\",\"sSearch\":\"Search:\",\"sZeroRecords\":\"No"
+" matching records "
+"found\",\"oPaginate\":{\"sFirst\":\"First\",\"sLast\":\"Last\",\"sNext\":\"Next\",\"sPrevious\":\"Previous\"},\"oAria\":{\"sSortAscending\":\":"
+" activate to sort column ascending\",\"sSortDescending\":\": activate to "
+"sort column descending\"}}"
+
+msgid "summernote_locale"
+msgstr "en-gb"
+
+msgid "fullcalendar_locale"
+msgstr "en-gb"
+
+msgid "bootstrap-select_locale"
+msgstr "x"

localization/en_GB/demo_data.po

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

localization/en_GB/stock_transaction_types.po

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

localization/en_GB/userfield_types.po

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

localization/es/chore_assignment_types.po

@@ -0,0 +1,29 @@
+# Translators:
+# Fernando Sánchez <fernando.l.sanchez@gmail.com>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-09-17 10:45+0000\n"
+"Last-Translator: Fernando Sánchez <fernando.l.sanchez@gmail.com>, 2019\n"
+"Language-Team: Spanish (https://www.transifex.com/grocy/teams/93189/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/chore_assignment_types\n"
+
+msgid "no-assignment"
+msgstr "sin-asignar"
+
+msgid "who-least-did-first"
+msgstr "quien-menos-primero"
+
+msgid "random"
+msgstr "al-azar"
+
+msgid "in-alphabetical-order"
+msgstr "orden-alfabético"

localization/es/chore_period_types.po

@@ -0,0 +1,32 @@
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Language-Team: Spanish (https://www.transifex.com/grocy/teams/93189/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/chore_types\n"
+
+msgid "manually"
+msgstr "Manualmente"
+
+msgid "dynamic-regular"
+msgstr "Dinámico regular"
+
+msgid "daily"
+msgstr "Diario"
+
+msgid "weekly"
+msgstr "Semanal"
+
+msgid "monthly"
+msgstr "Mensual"

localization/es/chore_types.php

@@ -1,6 +0,0 @@
-<?php
-
-return array(
-	'manually' => 'Manualmente',
-	'dynamic-regular' => 'Dinámico regular'
-);

localization/es/component_translations.php

@@ -1,10 +0,0 @@
-<?php
-
-return array(
-	'timeago_locale' => 'es',
-	'timeago_nan' => 'Hace NaN años',
-	'moment_locale' => 'es',
-	'datatables_localization' => '{"sEmptyTable":"Sin datos en la tabla","sInfo":"Mostrando de  _START_ a _END_ de _TOTAL_ entradas","sInfoEmpty":"Mostrando de 0 a 0 de 0 entradas","sInfoFiltered":"(filtrando a _MAX_ entradas máximas)","sInfoPostFix":"","sInfoThousands":",","sLengthMenu":"Mostrar _MENU_ entradas","sLoadingRecords":"Cargando...","sProcessing":"Procesando...","sSearch":"Buscar:","sZeroRecords":"No se han encontrado resultados coincidentes","oPaginate":{"sFirst":"Primero","sLast":"Último","sNext":"Siguiente","sPrevious":"Anterior"},"oAria":{"sSortAscending":": activar para ordenar ascendentemente","sSortDescending":": activar para ordenar descendentemente"}}',
-	'summernote_locale' => 'es-ES',
-	'fullcalendar_locale' => 'es'
-);

localization/es/component_translations.po

@@ -0,0 +1,48 @@
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2019\n"
+"Language-Team: Spanish (https://www.transifex.com/grocy/teams/93189/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/component_translations\n"
+
+msgid "timeago_locale"
+msgstr "es"
+
+msgid "timeago_nan"
+msgstr "Hace NaN años"
+
+msgid "moment_locale"
+msgstr "es"
+
+msgid "datatables_localization"
+msgstr ""
+"{\"sEmptyTable\":\"Sin datos en la tabla\",\"sInfo\":\"Mostrando de  _START_"
+" a _END_ de _TOTAL_ entradas\",\"sInfoEmpty\":\"Mostrando de 0 a 0 de 0 "
+"entradas\",\"sInfoFiltered\":\"(filtrando a _MAX_ entradas "
+"máximas)\",\"sInfoPostFix\":\"\",\"sInfoThousands\":\",\",\"sLengthMenu\":\"Mostrar"
+" _MENU_ "
+"entradas\",\"sLoadingRecords\":\"Cargando...\",\"sProcessing\":\"Procesando...\",\"sSearch\":\"Buscar:\",\"sZeroRecords\":\"No"
+" se han encontrado resultados "
+"coincidentes\",\"oPaginate\":{\"sFirst\":\"Primero\",\"sLast\":\"Último\",\"sNext\":\"Siguiente\",\"sPrevious\":\"Anterior\"},\"oAria\":{\"sSortAscending\":\":"
+" activar para ordenar ascendentemente\",\"sSortDescending\":\": activar para"
+" ordenar descendentemente\"}}"
+
+msgid "summernote_locale"
+msgstr "es-ES"
+
+msgid "fullcalendar_locale"
+msgstr "es"
+
+msgid "bootstrap-select_locale"
+msgstr "es_ES"

localization/es/demo_data.php

@@ -1,90 +0,0 @@
-<?php
-
-return array(
-	'Cookies' => 'Galletas',
-	'Chocolate' => 'Chocolate',
-	'Pantry' => 'Despensa',
-	'Candy cupboard' => 'Estante de los dulces',
-	'Tinned food cupboard' => 'Estante de las latas',
-	'Fridge' => 'Nevera',
-	'Piece' => 'Pieza',
-	'Pieces' => 'Piezas',
-	'Pack' => 'Pack',
-	'Packs' => 'Packs',
-	'Glass' => 'Vaso',
-	'Glasses' => 'Vasos',
-	'Tin' => 'Envase',
-	'Tins' => 'Envases',
-	'Can' => 'Lata',
-	'Cans' => 'Latas',
-	'Bunch' => 'Puñado',
-	'Bunches' => 'Puñados',
-	'Gummy bears' => 'Ositos',
-	'Crisps' => 'Patatas fritas',
-	'Eggs' => 'Huevos',
-	'Noodles' => 'Fideos',
-	'Pickles' => 'Pepinillos',
-	'Gulash soup' => 'Sopa',
-	'Yogurt' => 'Yogurt',
-	'Cheese' => 'Queso',
-	'Cold cuts' => 'Fiambres',
-	'Paprika' => 'Pimentón',
-	'Cucumber' => 'Pepino',
-	'Radish' => 'Rábano',
-	'Tomato' => 'Tomate',
-	'Changed towels in the bathroom' => 'Cambiar las toallas del baño',
-	'Cleaned the kitchen floor' => 'Limpiar el suelo de la cocina',
-	'Warranty ends' => 'Final de la garantía',
-	'TV remote control' => 'Mando de la TV',
-	'Alarm clock' => 'Despertador',
-	'Heat remote control' => 'Mando de la calefacción',
-	'Lawn mowed in the garden' => 'Cortar el césped del jardín',
-	'Some good snacks' => 'Cosas de picar',
-	'Pizza dough' => 'Masa de pizza',
-	'Sieved tomatoes' => 'Tomate triturado',
-	'Salami' => 'Salami',
-	'Toast' => 'Tostada',
-	'Minced meat' => 'Carne picada',
-	'Pizza' => 'Pizza',
-	'Spaghetti bolognese' => 'Spaghetti boloñesa',
-	'Sandwiches' => 'Bocadillos',
-	'English' => 'Inglés',
-	'German' => 'Alemán',
-	'Italian' => 'Italiano',
-	'Demo in different language' => 'Demo en otro idioma',
-	'This is the note content of the recipe ingredient' => 'Este es el contenido de la nota del ingrediente de la receta',
-	'Demo User' => 'Usuario de demostración',
-	'Gram' => 'Gramo',
-	'Grams' => 'Gramos',
-	'Flour' => 'Harina',
-	'Pancakes' => 'Tortitas',
-	'Sugar' => 'Azucar',
-	'Home' => 'Casa',
-	'Life' => 'Vida',
-	'Projects' => 'Proyectos',
-	'Repair the garage door' => 'Reparar la puerta del garaje',
-	'Fork and improve grocy' => 'Forkea y mejora grocy',
-	'Find a solution for what to do when I forget the door keys' => 'Encontrar una solución a qué hacer cuando me olvido las llaves',
-	'Sweets' => 'Dulces',
-	'Bakery products' => 'Productos de panadería',
-	'Tinned food' => 'Comida en lata',
-	'Butchery products' => 'Productos de carnicería',
-	'Vegetables/Fruits' => 'Verduras/Frutas',
-	'Refrigerated products' => 'Productos refrigerados',
-	'Coffee machine' => 'Máquina de café',
-	'Dishwasher' => 'Lavavajillas',
-	'Liter' => 'Litro',
-	'Liters' => 'Litros',
-	'Bottle' => 'Botella',
-	'Bottles' => 'Botellas',
-	'Milk' => 'Leche',
-	'Chocolate sauce' => 'Salsa de chocolate',
-	'Milliliters' => 'Mililitros',
-	'Milliliter' => 'Mililitro',
-	'Bottom' => 'Fondo',
-	'Topping' => 'Parte superior',
-	'French' => 'Francés',
-	'Turkish' => 'Turkish',
-	'Spanish' => 'Spanish',
-	'Russian' => 'Russian'
-);

localization/es/demo_data.po

@@ -0,0 +1,347 @@
+# Translators:
+# Bernd Bestel <bernd@berrnd.de>, 2019
+# Ankue <ankue.spam@gmail.com>, 2019
+# Fernando Sánchez <fernando.l.sanchez@gmail.com>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
+"PO-Revision-Date: 2019-05-01 17:42+0000\n"
+"Last-Translator: Fernando Sánchez <fernando.l.sanchez@gmail.com>, 2019\n"
+"Language-Team: Spanish (https://www.transifex.com/grocy/teams/93189/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Domain: grocy/demo_data\n"
+
+msgid "Cookies"
+msgstr "Galletas"
+
+msgid "Chocolate"
+msgstr "Chocolate"
+
+msgid "Pantry"
+msgstr "Despensa"
+
+msgid "Candy cupboard"
+msgstr "Estante de los dulces"
+
+msgid "Tinned food cupboard"
+msgstr "Estante de las latas"
+
+msgid "Fridge"
+msgstr "Nevera"
+
+msgid "Piece"
+msgid_plural "Pieces"
+msgstr[0] "Pieza"
+msgstr[1] "Piezas"
+
+msgid "Pack"
+msgid_plural "Packs"
+msgstr[0] "Paquetes"
+msgstr[1] "Paquetes"
+
+msgid "Glass"
+msgid_plural "Glasses"
+msgstr[0] "Vaso"
+msgstr[1] "Vasos"
+
+msgid "Tin"
+msgid_plural "Tins"
+msgstr[0] "Envases"
+msgstr[1] "Envases"
+
+msgid "Can"
+msgid_plural "Cans"
+msgstr[0] "Lata"
+msgstr[1] "Latas"
+
+msgid "Bunch"
+msgid_plural "Bunches"
+msgstr[0] "Puñados"
+msgstr[1] "Puñados"
+
+msgid "Gummy bears"
+msgstr "Ositos"
+
+msgid "Crisps"
+msgstr "Patatas fritas"
+
+msgid "Eggs"
+msgstr "Huevos"
+
+msgid "Noodles"
+msgstr "Fideos"
+
+msgid "Pickles"
+msgstr "Pepinillos"
+
+msgid "Gulash soup"
+msgstr "Sopa"
+
+msgid "Yogurt"
+msgstr "Yogurt"
+
+msgid "Cheese"
+msgstr "Queso"
+
+msgid "Cold cuts"
+msgstr "Fiambres"
+
+msgid "Paprika"
+msgstr "Pimentón"
+
+msgid "Cucumber"
+msgstr "Pepino"
+
+msgid "Radish"
+msgstr "Rábano"
+
+msgid "Tomato"
+msgstr "Tomate"
+
+msgid "Changed towels in the bathroom"
+msgstr "Cambiar las toallas del baño"
+
+msgid "Cleaned the kitchen floor"
+msgstr "Limpiar el suelo de la cocina"
+
+msgid "Warranty ends"
+msgstr "Final de la garantía"
+
+msgid "TV remote control"
+msgstr "Mando de la TV"
+
+msgid "Alarm clock"
+msgstr "Despertador"
+
+msgid "Heat remote control"
+msgstr "Mando de la calefacción"
+
+msgid "Lawn mowed in the garden"
+msgstr "Cortar el césped del jardín"
+
+msgid "Some good snacks"
+msgstr "Cosas de picar"
+
+msgid "Pizza dough"
+msgstr "Masa de pizza"
+
+msgid "Sieved tomatoes"
+msgstr "Tomate triturado"
+
+msgid "Salami"
+msgstr "Salami"
+
+msgid "Toast"
+msgstr "Tostada"
+
+msgid "Minced meat"
+msgstr "Carne picada"
+
+msgid "Pizza"
+msgstr "Pizza"
+
+msgid "Spaghetti bolognese"
+msgstr "Spaghetti boloñesa"
+
+msgid "Sandwiches"
+msgstr "Bocadillos"
+
+msgid "English"
+msgstr "Inglés"
+
+msgid "German"
+msgstr "Alemán"
+
+msgid "Italian"
+msgstr "Italiano"
+
+msgid "This is the note content of the recipe ingredient"
+msgstr "Este es el contenido de la nota del ingrediente de la receta"
+
+msgid "Demo User"
+msgstr "Usuario de demostración"
+
+msgid "Gram"
+msgid_plural "Grams"
+msgstr[0] "Gramo"
+msgstr[1] "Gramos"
+
+msgid "Flour"
+msgstr "Harina"
+
+msgid "Pancakes"
+msgstr "Tortitas"
+
+msgid "Sugar"
+msgstr "Azucar"
+
+msgid "Home"
+msgstr "Casa"
+
+msgid "Life"
+msgstr "Vida"
+
+msgid "Projects"
+msgstr "Proyectos"
+
+msgid "Repair the garage door"
+msgstr "Reparar la puerta del garaje"
+
+msgid "Fork and improve grocy"
+msgstr "Forkea y mejora grocy"
+
+msgid "Find a solution for what to do when I forget the door keys"
+msgstr "Encontrar una solución a qué hacer cuando me olvido las llaves"
+
+msgid "Sweets"
+msgstr "Dulces"
+
+msgid "Bakery products"
+msgstr "Productos de panadería"
+
+msgid "Tinned food"
+msgstr "Comida en lata"
+
+msgid "Butchery products"
+msgstr "Productos de carnicería"
+
+msgid "Vegetables/Fruits"
+msgstr "Verduras/Frutas"
+
+msgid "Refrigerated products"
+msgstr "Productos refrigerados"
+
+msgid "Coffee machine"
+msgstr "Máquina de café"
+
+msgid "Dishwasher"
+msgstr "Lavavajillas"
+
+msgid "Liter"
+msgstr "Litro"
+
+msgid "Liters"
+msgstr "Litros"
+
+msgid "Bottle"
+msgstr "Botella"
+
+msgid "Bottles"
+msgstr "Botellas"
+
+msgid "Milk"
+msgstr "Leche"
+
+msgid "Chocolate sauce"
+msgstr "Salsa de chocolate"
+
+msgid "Milliliters"
+msgstr "Mililitros"
+
+msgid "Milliliter"
+msgstr "Mililitro"
+
+msgid "Bottom"
+msgstr "Fondo"
+
+msgid "Topping"
+msgstr "Parte superior"
+
+msgid "French"
+msgstr "Francés"
+
+msgid "Turkish"
+msgstr "Turkish"
+
+msgid "Spanish"
+msgstr "Spanish"
+
+msgid "Russian"
+msgstr "Ruso"
+
+msgid "The thing which happens on the 5th of every month"
+msgstr "Lo que ocurre el día 5 de cada mes"
+
+msgid "The thing which happens daily"
+msgstr "Lo que ocurre diariamente"
+
+msgid "The thing which happens on Mondays and Wednesdays"
+msgstr "Lo que ocurre los lunes y los miércoles"
+
+msgid "Swedish"
+msgstr "Sueco"
+
+msgid "Polish"
+msgstr "Polaco"
+
+msgid "Milk Chocolate"
+msgstr "Chocolate con leche"
+
+msgid "Dark Chocolate"
+msgstr "Chocolate negro"
+
+msgid "Slice"
+msgid_plural "Slices"
+msgstr[0] "Lonchas"
+msgstr[1] "Lonchas"
+
+msgid "Example userentity"
+msgstr ""
+
+msgid "This is an example user entity..."
+msgstr ""
+
+msgid "Custom field"
+msgstr ""
+
+msgid "Example field value..."
+msgstr ""
+
+msgid "Waffle rolls"
+msgstr ""
+
+msgid "Danish"
+msgstr ""
+
+msgid "Dutch"
+msgstr ""
+
+msgid "Norwegian"
+msgstr ""
+
+msgid "Demo"
+msgstr ""
+
+msgid "Stable version"
+msgstr ""
+
+msgid "Preview version"
+msgstr ""
+
+msgid "current release"
+msgstr ""
+
+msgid "not yet released"
+msgstr ""
+
+msgid "Portuguese (Brazil)"
+msgstr ""
+
+msgid "This is a note"
+msgstr ""
+
+msgid "Freezer"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Slovak"
+msgstr ""