Updated version.json

Added new changelog and update translations
Make demo product locations a little bit more realistic
2025-09-16 17:56:51 +00:00 · 2019-03-10 16:29:02 +01:00 · 2019-03-10 16:27:34 +01:00 · 2019-03-10 16:18:24 +01:00 · 2019-03-10 16:08:15 +01:00 · 2019-03-10 16:02:13 +01:00
247 changed files with 8541 additions and 2087 deletions
--- a/.devtools/create_release_package.bat
+++ b/.devtools/create_release_package.bat
@@ -0,0 +1,16 @@
+set projectPath=%~dp0
+if %projectPath:~-1%==\ set projectPath=%projectPath:~0,-1%
+set projectPath=%projectPath%\..
+
+set releasePath=%projectPath%\.release
+mkdir "%releasePath%"
+
+copy "%projectPath%\version.json" versiontemp.json
+for /f "tokens=*" %%a in ('jq .Version versiontemp.json --raw-output') do set version=%%a
+del versiontemp.json
+
+del "%releasePath%\grocy_%version%.zip"
+7za a -r "%releasePath%\grocy_%version%.zip" "%projectPath%\*" -xr!.* -xr!build.bat -xr!composer.json -xr!composer.lock -xr!package.json -xr!yarn.lock -xr!publication_assets
+7za a "%releasePath%\grocy_%version%.zip" "%projectPath%\public\.htaccess"
+7za rn "%releasePath%\grocy_%version%.zip" .htaccess public\.htaccess
+7za d "%releasePath%\grocy_%version%.zip" data\*.* data\storage data\viewcache\*
--- a/.devtools/install_dependencies.bat
+++ b/.devtools/install_dependencies.bat
@@ -0,0 +1,4 @@
+pushd ..
+call composer install
+yarn install
+popd
--- a/.devtools/transifex_download.bat
+++ b/.devtools/transifex_download.bat
@@ -0,0 +1,3 @@
+pushd ..
+tx pull --all --minimum-perc=90
+popd
--- a/.devtools/transifex_upload.bat
+++ b/.devtools/transifex_upload.bat
@@ -0,0 +1,3 @@
+pushd ..
+tx push --source
+popd
--- a/.devtools/update_dependencies.bat
+++ b/.devtools/update_dependencies.bat
@@ -0,0 +1,4 @@
+pushd ..
+call composer update
+yarn upgrade
+popd
--- a/README.md
+++ b/README.md
@@ -73,6 +73,9 @@ There is no plugin included for any service, see the reference implementation in
 ### Database migrations
 Database schema migration is automatically done when visiting the root (`/`) route (click on the logo in the left upper edge).

+### Disable certain features
+If you don't use certain feature sets of grocy (for example if you don't need "Chores"), there are feature flags per major feature set to hide/disable the related UI elements (see `config-dist.php`)
+
 ### Adding your own CSS or JS without to have to modify the application itself
 - When the file `data/custom_js.html` exists, the contents of the file will be added just before `</body>` (end of body) on every page
 - When the file `data/custom_css.html` exists, the contents of the file will be added just before `</head>` (end of head) on every page
--- a/build.bat
+++ b/build.bat
@@ -1,13 +0,0 @@
-set projectPath=%~dp0
-if %projectPath:~-1%==\ set projectPath=%projectPath:~0,-1%
-
-set releasePath=%projectPath%\.release
-mkdir "%releasePath%"
-
-for /f "tokens=*" %%a in ('build_tools\jq.exe .Version version.json --raw-output') do set version=%%a
-
-del "%releasePath%\grocy_%version%.zip"
-"build_tools\7za.exe" a -r "%releasePath%\grocy_%version%.zip" "%projectPath%\*" -xr!.* -xr!build_tools -xr!build.bat -xr!composer.json -xr!composer.lock -xr!package.json -xr!yarn.lock -xr!publication_assets
-"build_tools\7za.exe" a "%releasePath%\grocy_%version%.zip" "%projectPath%\public\.htaccess"
-"build_tools\7za.exe" rn "%releasePath%\grocy_%version%.zip" .htaccess public\.htaccess
-"build_tools\7za.exe" d "%releasePath%\grocy_%version%.zip" data\*.* data\storage data\viewcache\*
--- a/build_tools/7za.exe
+++ b/build_tools/7za.exe
--- a/build_tools/jq.exe
+++ b/build_tools/jq.exe
--- a/changelog/10_1.4.0_2017-06-04.md
+++ b/changelog/10_1.4.0_2017-06-04.md
@@ -0,0 +1 @@
+- Added a login screen and switched to cookie/session based authentication instead of HTTP-basic-auth
--- a/changelog/11_1.5.0_2017-07-25.md
+++ b/changelog/11_1.5.0_2017-07-25.md
@@ -0,0 +1,2 @@
+- New feature: Habit tracking
+- Fixed an issue which prevented that the databse is correctly created on unix systems
--- a/changelog/12_1.6.0_2017-11-06.md
+++ b/changelog/12_1.6.0_2017-11-06.md
@@ -0,0 +1,2 @@
+- New feature: Rechargeable battery management
+- Improved productivity of input forms
--- a/changelog/13_1.6.1_2017-11-09.md
+++ b/changelog/13_1.6.1_2017-11-09.md
@@ -0,0 +1 @@
+- Improved sidebar responsiveness
--- a/changelog/14_1.7.0_2018-04-15.md
+++ b/changelog/14_1.7.0_2018-04-15.md
@@ -0,0 +1,2 @@
+- Allow to add anything to the shopping list, not only products
+- Major project refactoring
--- a/changelog/15_1.8.0_2018-04-16.md
+++ b/changelog/15_1.8.0_2018-04-16.md
@@ -0,0 +1 @@
+- grocy is now fully localizable and ships by default with English and German translations
--- a/changelog/16_1.8.1_2018-04-18.md
+++ b/changelog/16_1.8.1_2018-04-18.md
@@ -0,0 +1,2 @@
+- New configuration option "BASE_URL" to define base installation URL (should make subdirectory installations possible, see #3)
+- Added some missing translations
--- a/changelog/17_1.8.2_2018-04-18.md
+++ b/changelog/17_1.8.2_2018-04-18.md
@@ -0,0 +1 @@
+- Fixed login form didn't respect the configured BASE_URL
--- a/changelog/18_1.9.0_2018-04-21.md
+++ b/changelog/18_1.9.0_2018-04-21.md
@@ -0,0 +1 @@
+- Documented the REST API and data model, see the integrated instance of Swagger UI at [/api](https://demo-en.grocy.info/api)
--- a/changelog/19_1.9.1_2018-04-22.md
+++ b/changelog/19_1.9.1_2018-04-22.md
@@ -0,0 +1 @@
+- Added validation of all API requests and improved Swagger/OpenAPI description
--- a/changelog/1_0.1.0_2017-04-15.md
+++ b/changelog/1_0.1.0_2017-04-15.md
@@ -0,0 +1 @@
+- Basic features, mainly about a interface to record grocery purchases and consumptions
--- a/changelog/20_1.9.2_2018-04-22.md
+++ b/changelog/20_1.9.2_2018-04-22.md
@@ -0,0 +1 @@
+- Added a plugin system for looking up products against external services by barcode, see #6 for reference
--- a/changelog/21_1.10.0_2018-05-12.md
+++ b/changelog/21_1.10.0_2018-05-12.md
@@ -0,0 +1,4 @@
+- It's now possible to consume products directly from stock overview with one click
+- Added due/overdue info on bateries- and habits overview (like on stock overview)
+- Reworked general page layout and improved responsiveness (see #9 and thanks @d-Rickyy-b)
+- Translations fixes
--- a/changelog/22_1.11.0_2018-06-15.md
+++ b/changelog/22_1.11.0_2018-06-15.md
@@ -0,0 +1 @@
+- Added an option to not use URL rewriting (for webservers which, however, don't support URL rewriting)
--- a/changelog/23_1.12.0_2018-07-08.md
+++ b/changelog/23_1.12.0_2018-07-08.md
@@ -0,0 +1,2 @@
+- On the stockoverview it's now possible to filter the products by location
+- All dropdowns are now sorted alphabetically
--- a/changelog/24_1.12.1_2018-07-08.md
+++ b/changelog/24_1.12.1_2018-07-08.md
@@ -0,0 +1 @@
+- Bug fix for location filtering on stock overview page did not work in all browsers
--- a/changelog/25_1.13.0_2018-07-12.md
+++ b/changelog/25_1.13.0_2018-07-12.md
@@ -0,0 +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
--- a/changelog/26_1.13.1_2018-07-12.md
+++ b/changelog/26_1.13.1_2018-07-12.md
@@ -0,0 +1,5 @@
+This was released shortly after the last release to fix a small regression bug, original changes from Version 1.13.0:
+
+- 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
--- a/changelog/27_1.14.0_2018-07-15.md
+++ b/changelog/27_1.14.0_2018-07-15.md
@@ -0,0 +1,13 @@
+- 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
+- Added norwegian translation (thanks @BlizzWave)
+  - Demo available at: => https://demo-no.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)
+  - Table column ordering and sorting is now remembered
+  - Sidebar collapse state is now remembered
+  - Fixed datetimepicker border
+  - Keep the parent sidebar menu item expanded if the active page is a sub menu item
+- Custom JS/CSS file names have changed [see README](https://github.com/berrnd/grocy#adding-your-own-css-or-js-without-to-have-to-modify-the-application-itself)
--- a/changelog/28_1.15.0_2018-07-22.md
+++ b/changelog/28_1.15.0_2018-07-22.md
@@ -0,0 +1,9 @@
+- New related project: **grocy-desktop**
+  - => https://github.com/berrnd/grocy-desktop
+  - Run grocy without a webserver just like a normal (windows) desktop application
+  - New "embedded mode" for grocy to help running in "desktop application mode" [see README](https://github.com/berrnd/grocy#embedded-mode)
+- New datepicker shorthands and improvements
+  - `YYYYMMe` or `YYYYMM+` gets expanded to the end of the given month in the given year in proper notation
+  - Changed: `MMDD` will be expanded to the given day next year if > today
+  - [see README](https://github.com/berrnd/grocy#input-shorthands-for-date-fields)
+- Some other small bug fixes
--- a/changelog/29_1.16.0_2018-07-25.md
+++ b/changelog/29_1.16.0_2018-07-25.md
@@ -0,0 +1,8 @@
+- Replaced the single user (so far defined in `/data/config.php`) with a multi-user management
+  - The currently defined user will automatically be migrated, please remove `HTTP_USER` and `HTTP_PASSWORD` from your config file afterwards
+  - For this it was necessary to delete all sessions and API keys during the migration
+- Added an update script (`/update.sh`) to make updates (on Linux machines) easier
+  - See also ["How to update" in README](https://github.com/berrnd/grocy#how-to-update)
+- Added the possibility to track who did a habit
+- Added a rudimentary habit analysis possibility
+- Different small UI, code and translation improvements
--- a/changelog/2_0.2.0_2017-04-16.md
+++ b/changelog/2_0.2.0_2017-04-16.md
@@ -0,0 +1 @@
+- General improvements, the work goes on...
--- a/changelog/30_1.17.0_2018-08-04.md
+++ b/changelog/30_1.17.0_2018-08-04.md
@@ -0,0 +1,4 @@
+- Basic product price tracking (can be entered on purchase, a little price history chart is shown in the product card - right side on purchase/consume/etc. pages)
+- Proper pluralization of everything (for quantity units you can enter the plural form in master data)
+- On all overview pages the statistics shown in the header are now updated when doing changes directly on the page (e. g. consuming a product)
+- Lots of small fixes and improvements (form validation, translations - thanks for keeping the norwegian translation always updated @BlizzWave, other small bugs)
--- a/changelog/31_1.18.0_2018-08-11.md
+++ b/changelog/31_1.18.0_2018-08-11.md
@@ -0,0 +1,5 @@
+- The complete row is now refreshed on changes on all overview pages
+- Added a checkbox to set the "never expires date" in best before date inputs (alternative to shortcut "x")
+- Recipes can now have arbitrary quantity units and stock is only checked for one unit then (imagine you have sugar in "Packs" in stock but your recipe "Pancakes" needs 200 grams)
+- Added a "consume this recipe button" to remove all ingredients of a recipe from stock with one click
+- Other small UI changes/improvements
--- a/changelog/32_1.18.1_2018-09-08.md
+++ b/changelog/32_1.18.1_2018-09-08.md
@@ -0,0 +1 @@
+- Some smaller UI bug fixes and enhancements (thanks again for all the testing @BlizzWave)
--- a/changelog/33_1.19.0_2018-09-24.md
+++ b/changelog/33_1.19.0_2018-09-24.md
@@ -0,0 +1,6 @@
+- New feature: Tasks / To-do list
+- Renamed habits to chores as this is more what it is about
+- Products can now be organized in product groups, this group is also used to group the items on the shopping list (you can use this to optimize your way in the supermarket for example)
+- Added an option to stay logged in permanently (checkbox on the login page)
+- When the database was changed externally, the current page is automatically reloaded when there was no input for at least 50 seconds
+- Fixed some minor UI bugs
--- a/changelog/34_1.19.1_2018-09-27.md
+++ b/changelog/34_1.19.1_2018-09-27.md
@@ -0,0 +1,2 @@
+- The colored info bars on top of all (overview)pages can now be clicked to filter the table accordingly
+- Fixed some minor mostly UI related bugs
--- a/changelog/35_1.19.2_2018-09-29.md
+++ b/changelog/35_1.19.2_2018-09-29.md
@@ -0,0 +1,2 @@
+- Important bug fix: All forms were submitted twice when using ENTER instead of the OK/Save button
+- Norwegian translation updates (thanks @BlizzWave )
--- a/changelog/36_1.20.0_2018-09-30.md
+++ b/changelog/36_1.20.0_2018-09-30.md
@@ -0,0 +1,3 @@
+- New optional "Night Mode" (thanks a lot @BlizzWave, can also be activated automatically by a time range - see the new dropdown menu next to the user menu)
+- Docker support (thanks @talmai)
+- Fixed some minor UI bugs
--- a/changelog/37_1.21.0_2018-10-06.md
+++ b/changelog/37_1.21.0_2018-10-06.md
@@ -0,0 +1,6 @@
+- New feature: Equipment
+  - Manage all your household equipment/devices in one place and have the information/instruction manual at hand when needed
+- New feature: Products can now have pictures
+  - Add them in the product edit page
+  - Will be shown in the productcard (purchase/consume/etc. pages) and when you click the product name on the stock overview page (a little image icon next to the product name indicates if the product has an image)
+- Recipes and the new equipment edit page now have a little editor with text formatting capabilities
--- a/changelog/38_1.22.0_2018-10-27.md
+++ b/changelog/38_1.22.0_2018-10-27.md
@@ -0,0 +1,14 @@
+- Added a journal for stock bookings, chore executions and battery charge cycles
+  - => Button in each line on the overview pages or the "Journal" button next to the headline on every overview page
+- Added the possibility to undo any stock booking, chore execution and battery charge cycle
+  - => Button in the success popup while booking a purchase/consume/etc. or on the new journal pages (see above)
+- Presets for new products are now configurable
+  - => "Presets for new products" button next to the headline on the products list page
+- Recipes can now be nested (include a recipe into another one)
+- Recipe ingredients can now be grouped together which will result in headlines per group in the rendered recipe
+  - => Group can be set on the recipe position edit page, demo recipe is "Pizza")
+- On the stock overview page, the product card is now shown when clicking the product name
+- Added option to filter by product group on stock overview page
+- When auto reloading on external changes is enabled, the page is not reloaded when there is a fullscreen card active (recipe/equipment instruction manual)
+- On the product-/chore-/batterycard there is now a link to the edit page of the corresponding item
+- Some other minor bug fixes
--- a/changelog/39_1.23.0_2018-11-24.md
+++ b/changelog/39_1.23.0_2018-11-24.md
@@ -0,0 +1,18 @@
+- New feature: "Shopping list to stock workflow"
+  - Add a single shopping list item or all at once to stock directly from the shopping list
+  - There are new "stock settings" under settings menu in the top right corner
+  - You can enable there, that all products which have "Default best before days" set, are added without confirmation in this workflow
+  - => This means, you can add the whole shopping list to stock with one click, if you want
+- Improved stock handling
+  - On consume, a specific stock item can now be picked
+  - A stock item can now be marked as "opened" (on the consume page or directly from stock overview, visible in the product card and on the stock overview page)
+- 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
+- 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)
+- Changed: Docker related things are now in a separate repository: https://github.com/grocy/grocy-docker
+- Changed: Translations are now managed with Transifex: https://www.transifex.com/grocy/grocy
+
--- a/changelog/3_0.3.0_2017-04-17.md
+++ b/changelog/3_0.3.0_2017-04-17.md
@@ -0,0 +1 @@
+- Form validation and barcode input handling improvements
--- a/changelog/40_1.23.1_2018-11-27.md
+++ b/changelog/40_1.23.1_2018-11-27.md
@@ -0,0 +1,2 @@
+- Added a skip button when adding all shopping list items in "Shopping list to stock workflow"
+- Fixed some minor UI related bugs
--- a/changelog/41_1.24.0_2018-12-30.md
+++ b/changelog/41_1.24.0_2018-12-30.md
@@ -0,0 +1 @@
+- All `config.php` settings can now also be set via environment variables (for [grocy-docker](https://github.com/grocy/grocy-docker))
--- a/changelog/42_1.24.1_2019-01-10.md
+++ b/changelog/42_1.24.1_2019-01-10.md
@@ -0,0 +1,5 @@
+- Fixed a SQL error during database migration when using SQLite >= 3.25.2
+- Improved data tables loading time
+- Location edit form did not work (master data)
+- Quantity unit "purchase to stock factor" was not respected when putting a recipe on the shopping list or when comparing the already on the shopping list amount
+- Better API response for POST routes when there is no or invalid JSON request body content
--- a/changelog/43_2.0.0_2019-03-06.md
+++ b/changelog/43_2.0.0_2019-03-06.md
@@ -0,0 +1,23 @@
+- 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
+- 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")
+- Recipe improvements
+  - Recipes are now scalable - define per recipe for how much servings it is, change the desired servings on the fly when the recipe is displayed, ingredient amounts are scaled accordingly
+  - The cost of a recipe is now displayed based on the last purchase price per ingredient (recipe scaling also applies)
+  - When putting all missing recipe ingredients on the shopping list, it is now possible to ignore certain ingredients (in the popup when clicking the "Put missing items on shopping list" button)
+  - 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)
+- 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)
+- 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`)
+  - Added a "Apple Touch Icon" and a "Web App Manifest" which should improve grocy on mobile devices and also enables "Add to Home screen" on major mobile browsers
+  - A lot of other minor small and bigger UI improvements
--- a/changelog/44_2.1.0_2019-03-09.md
+++ b/changelog/44_2.1.0_2019-03-09.md
@@ -0,0 +1,10 @@
+- Some small UI fixes & improvements
+  - Recipe ingredient notes were not displayed
+  - Edit/delete buttons on the equipment page had no icons
+  - Improved the overview pages "action buttons column" (e. g. hide more rarely used actions behind a context/dropdown menu)
+  - The "purchase to stock conversion factor" is now displayed on the purchase page when QU units are different (above the amount field)
+  - Some JS files were not loaded correctly on case sensitive file systems
+  - The changelog is now included as markdown files (in `/changelog` directory, one file per release with a filename in format `<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)
--- a/changelog/45_2.2.0_2019-03-10.md
+++ b/changelog/45_2.2.0_2019-03-10.md
@@ -0,0 +1,5 @@
+- New API method to get a product by its barcode (`/stock/products/by-barcode/{barcode}`, thanks @matejdro)
+- The best before date on the purchase and inventory page can now also be today or earlier, but when so, a short hint is displayed
+- Fixed some UI bugs
+  - When consuming a product with "Allow partial units in stock" enabled from the stock overview page, the displayed amount after the stock booking was wrong
+  - The inventory form was not validated with certain click paths
--- a/changelog/4_0.4.0_2017-04-18.md
+++ b/changelog/4_0.4.0_2017-04-18.md
@@ -0,0 +1 @@
+- Add possibility to have multiple barcodes per product
--- a/changelog/5_1.0.0_2017-04-20.md
+++ b/changelog/5_1.0.0_2017-04-20.md
@@ -0,0 +1 @@
+- Ready to ERP your fridge!
--- a/changelog/6_1.0.1_2017-04-20.md
+++ b/changelog/6_1.0.1_2017-04-20.md
@@ -0,0 +1 @@
+- Added flow to directly add products and barcodes from purchase and inventory view
--- a/changelog/7_1.1.0_2017-04-21.md
+++ b/changelog/7_1.1.0_2017-04-21.md
@@ -0,0 +1,2 @@
+* New feature: Shopping list (which is also automatically filled based on defined min. stock amount)
+* Small UI changes for better productivity
--- a/changelog/8_1.2.0_2017-04-21.md
+++ b/changelog/8_1.2.0_2017-04-21.md
@@ -0,0 +1 @@
+- Added a flow to add a new product with prefilled barcode
--- a/changelog/9_1.3.0_2017-04-22.md
+++ b/changelog/9_1.3.0_2017-04-22.md
@@ -0,0 +1 @@
+- Added a favicon and more productivity improvements
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,9 @@
 		"slim/slim": "^3.8",
 		"morris/lessql": "^0.3.4",
 		"rubellum/slim-blade-view": "^0.1.1",
-		"tuupola/cors-middleware": "^0.7.0"
+		"tuupola/cors-middleware": "^0.7.0",
+		"eluceo/ical": "^0.15.0",
+		"erusev/parsedown": "^1.7.1"
 	},
 	"autoload": {
 		"psr-4": {
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
 {
    "_readme": [
        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "c1bc4c17739e9d0ee8b33628f6d4b9a4",
+    "content-hash": "d11fedeb82f88d3996984cca43395a08",
    "packages": [
        {
            "name": "container-interop/container-interop",
@@ -104,6 +104,103 @@
            ],
            "time": "2018-01-09T20:05:19+00:00"
        },
+        {
+            "name": "eluceo/ical",
+            "version": "0.15.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/markuspoerschke/iCal.git",
+                "reference": "add0ca99aa1f77f134a2e8b071f2ebc22b115139"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/markuspoerschke/iCal/zipball/add0ca99aa1f77f134a2e8b071f2ebc22b115139",
+                "reference": "add0ca99aa1f77f134a2e8b071f2ebc22b115139",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "suggest": {
+                "ext-mbstring": "Massive performance enhancement of line folding"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Eluceo\\iCal\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Markus Poerschke",
+                    "email": "markus@eluceo.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "The eluceo/iCal package offers a abstraction layer for creating iCalendars. You can easily create iCal files by using PHP object instead of typing your *.ics file by hand. The output will follow RFC 5545 as best as possible.",
+            "homepage": "https://github.com/markuspoerschke/iCal",
+            "keywords": [
+                "calendar",
+                "iCalendar",
+                "ical",
+                "ics",
+                "php calendar"
+            ],
+            "time": "2019-01-13T22:00:58+00:00"
+        },
+        {
+            "name": "erusev/parsedown",
+            "version": "1.7.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/erusev/parsedown.git",
+                "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
+                "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Parsedown": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Emanuil Rusev",
+                    "email": "hello@erusev.com",
+                    "homepage": "http://erusev.com"
+                }
+            ],
+            "description": "Parser for Markdown.",
+            "homepage": "http://parsedown.org",
+            "keywords": [
+                "markdown",
+                "parser"
+            ],
+            "time": "2018-03-08T01:11:30+00:00"
+        },
        {
            "name": "http-interop/http-factory",
            "version": "0.3.0",
@@ -159,28 +256,28 @@
        },
        {
            "name": "illuminate/container",
-            "version": "v5.7.11",
+            "version": "v5.8.3",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/container.git",
-                "reference": "4c90c3d3ba88e52da152e885d24c9f891a2ec545"
+                "reference": "b984960d2634c6be97b0dd368a8953e8c4e06ec7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/container/zipball/4c90c3d3ba88e52da152e885d24c9f891a2ec545",
-                "reference": "4c90c3d3ba88e52da152e885d24c9f891a2ec545",
+                "url": "https://api.github.com/repos/illuminate/container/zipball/b984960d2634c6be97b0dd368a8953e8c4e06ec7",
+                "reference": "b984960d2634c6be97b0dd368a8953e8c4e06ec7",
                "shasum": ""
            },
            "require": {
-                "illuminate/contracts": "5.7.*",
-                "illuminate/support": "5.7.*",
+                "illuminate/contracts": "5.8.*",
+                "illuminate/support": "5.8.*",
                "php": "^7.1.3",
                "psr/container": "^1.0"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "5.7-dev"
+                    "dev-master": "5.8-dev"
                }
            },
            "autoload": {
@@ -200,20 +297,20 @@
            ],
            "description": "The Illuminate Container package.",
            "homepage": "https://laravel.com",
-            "time": "2018-10-18T03:39:45+00:00"
+            "time": "2019-03-03T15:13:35+00:00"
        },
        {
            "name": "illuminate/contracts",
-            "version": "v5.7.11",
+            "version": "v5.8.3",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/contracts.git",
-                "reference": "64df81d3382d876f1c1d3d5481d89c93b61b8279"
+                "reference": "3e3a9a654adbf798e05491a5dbf90112df1effde"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/contracts/zipball/64df81d3382d876f1c1d3d5481d89c93b61b8279",
-                "reference": "64df81d3382d876f1c1d3d5481d89c93b61b8279",
+                "url": "https://api.github.com/repos/illuminate/contracts/zipball/3e3a9a654adbf798e05491a5dbf90112df1effde",
+                "reference": "3e3a9a654adbf798e05491a5dbf90112df1effde",
                "shasum": ""
            },
            "require": {
@@ -224,7 +321,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "5.7-dev"
+                    "dev-master": "5.8-dev"
                }
            },
            "autoload": {
@@ -244,32 +341,32 @@
            ],
            "description": "The Illuminate Contracts package.",
            "homepage": "https://laravel.com",
-            "time": "2018-10-08T13:34:14+00:00"
+            "time": "2019-02-18T18:37:54+00:00"
        },
        {
            "name": "illuminate/events",
-            "version": "v5.7.11",
+            "version": "v5.8.3",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/events.git",
-                "reference": "a8e5e3d601ad7f3571428176a578ddf03ce649d8"
+                "reference": "a85d7c273bc4e3357000c5fc4812374598515de3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/events/zipball/a8e5e3d601ad7f3571428176a578ddf03ce649d8",
-                "reference": "a8e5e3d601ad7f3571428176a578ddf03ce649d8",
+                "url": "https://api.github.com/repos/illuminate/events/zipball/a85d7c273bc4e3357000c5fc4812374598515de3",
+                "reference": "a85d7c273bc4e3357000c5fc4812374598515de3",
                "shasum": ""
            },
            "require": {
-                "illuminate/container": "5.7.*",
-                "illuminate/contracts": "5.7.*",
-                "illuminate/support": "5.7.*",
+                "illuminate/container": "5.8.*",
+                "illuminate/contracts": "5.8.*",
+                "illuminate/support": "5.8.*",
                "php": "^7.1.3"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "5.7-dev"
+                    "dev-master": "5.8-dev"
                }
            },
            "autoload": {
@@ -289,27 +386,27 @@
            ],
            "description": "The Illuminate Events package.",
            "homepage": "https://laravel.com",
-            "time": "2018-10-06T18:48:42+00:00"
+            "time": "2019-02-18T18:37:54+00:00"
        },
        {
            "name": "illuminate/filesystem",
-            "version": "v5.7.11",
+            "version": "v5.8.3",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/filesystem.git",
-                "reference": "cbb5650be36d7370f7ae5f039d2143952fa58f51"
+                "reference": "8aef3ed5028eea80fa20287b776d6ec8e7eafbba"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/cbb5650be36d7370f7ae5f039d2143952fa58f51",
-                "reference": "cbb5650be36d7370f7ae5f039d2143952fa58f51",
+                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/8aef3ed5028eea80fa20287b776d6ec8e7eafbba",
+                "reference": "8aef3ed5028eea80fa20287b776d6ec8e7eafbba",
                "shasum": ""
            },
            "require": {
-                "illuminate/contracts": "5.7.*",
-                "illuminate/support": "5.7.*",
+                "illuminate/contracts": "5.8.*",
+                "illuminate/support": "5.8.*",
                "php": "^7.1.3",
-                "symfony/finder": "^4.1"
+                "symfony/finder": "^4.2"
            },
            "suggest": {
                "league/flysystem": "Required to use the Flysystem local and FTP drivers (^1.0).",
@@ -321,7 +418,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "5.7-dev"
+                    "dev-master": "5.8-dev"
                }
            },
            "autoload": {
@@ -341,43 +438,45 @@
            ],
            "description": "The Illuminate Filesystem package.",
            "homepage": "https://laravel.com",
-            "time": "2018-10-24T12:49:16+00:00"
+            "time": "2019-02-18T18:37:54+00:00"
        },
        {
            "name": "illuminate/support",
-            "version": "v5.7.11",
+            "version": "v5.8.3",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/support.git",
-                "reference": "45bfc0cd080c51946f61c04e324c2b4c6df58a9d"
+                "reference": "0f0291d1bc2f036af3fceb8e46900b58812533c4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/45bfc0cd080c51946f61c04e324c2b4c6df58a9d",
-                "reference": "45bfc0cd080c51946f61c04e324c2b4c6df58a9d",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/0f0291d1bc2f036af3fceb8e46900b58812533c4",
+                "reference": "0f0291d1bc2f036af3fceb8e46900b58812533c4",
                "shasum": ""
            },
            "require": {
                "doctrine/inflector": "^1.1",
+                "ext-json": "*",
                "ext-mbstring": "*",
-                "illuminate/contracts": "5.7.*",
-                "nesbot/carbon": "^1.26.3",
+                "illuminate/contracts": "5.8.*",
+                "nesbot/carbon": "^1.26.3 || ^2.0",
                "php": "^7.1.3"
            },
            "conflict": {
                "tightenco/collect": "<5.5.33"
            },
            "suggest": {
-                "illuminate/filesystem": "Required to use the composer class (5.7.*).",
+                "illuminate/filesystem": "Required to use the composer class (5.8.*).",
                "moontoast/math": "Required to use ordered UUIDs (^1.1).",
                "ramsey/uuid": "Required to use Str::uuid() (^3.7).",
-                "symfony/process": "Required to use the composer class (^4.1).",
-                "symfony/var-dumper": "Required to use the dd function (^4.1)."
+                "symfony/process": "Required to use the composer class (^4.2).",
+                "symfony/var-dumper": "Required to use the dd function (^4.2).",
+                "vlucas/phpdotenv": "Required to use the env helper (^3.3)."
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "5.7-dev"
+                    "dev-master": "5.8-dev"
                }
            },
            "autoload": {
@@ -400,35 +499,36 @@
            ],
            "description": "The Illuminate Support package.",
            "homepage": "https://laravel.com",
-            "time": "2018-10-22T17:36:06+00:00"
+            "time": "2019-03-05T13:38:58+00:00"
        },
        {
            "name": "illuminate/view",
-            "version": "v5.7.11",
+            "version": "v5.8.3",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/view.git",
-                "reference": "97dbb6910aa5df5a7414877da89b7520f4260a58"
+                "reference": "33818dc7b783f3afbeea9b0b09455c8cc89aa899"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/view/zipball/97dbb6910aa5df5a7414877da89b7520f4260a58",
-                "reference": "97dbb6910aa5df5a7414877da89b7520f4260a58",
+                "url": "https://api.github.com/repos/illuminate/view/zipball/33818dc7b783f3afbeea9b0b09455c8cc89aa899",
+                "reference": "33818dc7b783f3afbeea9b0b09455c8cc89aa899",
                "shasum": ""
            },
            "require": {
-                "illuminate/container": "5.7.*",
-                "illuminate/contracts": "5.7.*",
-                "illuminate/events": "5.7.*",
-                "illuminate/filesystem": "5.7.*",
-                "illuminate/support": "5.7.*",
+                "ext-json": "*",
+                "illuminate/container": "5.8.*",
+                "illuminate/contracts": "5.8.*",
+                "illuminate/events": "5.8.*",
+                "illuminate/filesystem": "5.8.*",
+                "illuminate/support": "5.8.*",
                "php": "^7.1.3",
-                "symfony/debug": "^4.1"
+                "symfony/debug": "^4.2"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "5.7-dev"
+                    "dev-master": "5.8-dev"
                }
            },
            "autoload": {
@@ -448,7 +548,7 @@
            ],
            "description": "The Illuminate View package.",
            "homepage": "https://laravel.com",
-            "time": "2018-10-11T15:32:19+00:00"
+            "time": "2019-02-27T12:03:43+00:00"
        },
        {
            "name": "morris/lessql",
@@ -555,28 +655,30 @@
        },
        {
            "name": "nesbot/carbon",
-            "version": "1.36.1",
+            "version": "2.14.2",
            "source": {
                "type": "git",
                "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "63da8cdf89d7a5efe43aabc794365f6e7b7b8983"
+                "reference": "a1f4f9abcde8241ce33bf5090896e9c16d0b4232"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/63da8cdf89d7a5efe43aabc794365f6e7b7b8983",
-                "reference": "63da8cdf89d7a5efe43aabc794365f6e7b7b8983",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/a1f4f9abcde8241ce33bf5090896e9c16d0b4232",
+                "reference": "a1f4f9abcde8241ce33bf5090896e9c16d0b4232",
                "shasum": ""
            },
            "require": {
-                "php": ">=5.3.9",
-                "symfony/translation": "~2.6 || ~3.0 || ~4.0"
+                "ext-json": "*",
+                "php": "^7.1.8 || ^8.0",
+                "symfony/translation": "^3.4 || ^4.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7"
-            },
-            "suggest": {
-                "friendsofphp/php-cs-fixer": "Needed for the `composer phpcs` command. Allow to automatically fix code style.",
-                "phpstan/phpstan": "Needed for the `composer phpstan` command. Allow to detect potential errors."
+                "friendsofphp/php-cs-fixer": "^2.14 || ^3.0",
+                "kylekatarnls/multi-tester": "^0.1",
+                "phpmd/phpmd": "^2.6",
+                "phpstan/phpstan": "^0.10.8",
+                "phpunit/phpunit": "^7.5 || ^8.0",
+                "squizlabs/php_codesniffer": "^3.4"
            },
            "type": "library",
            "extra": {
@@ -588,7 +690,7 @@
            },
            "autoload": {
                "psr-4": {
-                    "": "src/"
+                    "Carbon\\": "src/Carbon/"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
@@ -609,7 +711,7 @@
                "datetime",
                "time"
            ],
-            "time": "2018-11-22T18:23:02+00:00"
+            "time": "2019-02-28T09:07:12+00:00"
        },
        {
            "name": "nikic/fast-route",
@@ -902,16 +1004,16 @@
        },
        {
            "name": "psr/http-server-middleware",
-            "version": "1.0.0",
+            "version": "1.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/php-fig/http-server-middleware.git",
-                "reference": "ea17eb1fb2c8df6db919cc578451a8013c6a0ae5"
+                "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/ea17eb1fb2c8df6db919cc578451a8013c6a0ae5",
-                "reference": "ea17eb1fb2c8df6db919cc578451a8013c6a0ae5",
+                "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/2296f45510945530b9dceb8bcedb5cb84d40c5f5",
+                "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5",
                "shasum": ""
            },
            "require": {
@@ -951,7 +1053,7 @@
                "request",
                "response"
            ],
-            "time": "2018-01-22T17:08:31+00:00"
+            "time": "2018-10-30T17:12:04+00:00"
        },
        {
            "name": "psr/log",
@@ -1100,16 +1202,16 @@
        },
        {
            "name": "slim/slim",
-            "version": "3.11.0",
+            "version": "3.12.0",
            "source": {
                "type": "git",
                "url": "https://github.com/slimphp/Slim.git",
-                "reference": "d378e70431e78ee92ee32ddde61ecc72edf5dc0a"
+                "reference": "f4947cc900b6e51cbfda58b9f1247bca2f76f9f0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/slimphp/Slim/zipball/d378e70431e78ee92ee32ddde61ecc72edf5dc0a",
-                "reference": "d378e70431e78ee92ee32ddde61ecc72edf5dc0a",
+                "url": "https://api.github.com/repos/slimphp/Slim/zipball/f4947cc900b6e51cbfda58b9f1247bca2f76f9f0",
+                "reference": "f4947cc900b6e51cbfda58b9f1247bca2f76f9f0",
                "shasum": ""
            },
            "require": {
@@ -1167,20 +1269,88 @@
                "micro",
                "router"
            ],
-            "time": "2018-09-16T10:54:21+00:00"
+            "time": "2019-01-15T13:21:25+00:00"
        },
        {
-            "name": "symfony/debug",
-            "version": "v4.1.7",
+            "name": "symfony/contracts",
+            "version": "v1.0.2",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/debug.git",
-                "reference": "19090917b848a799cbae4800abf740fe4eb71c1d"
+                "url": "https://github.com/symfony/contracts.git",
+                "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/19090917b848a799cbae4800abf740fe4eb71c1d",
-                "reference": "19090917b848a799cbae4800abf740fe4eb71c1d",
+                "url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf",
+                "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3"
+            },
+            "require-dev": {
+                "psr/cache": "^1.0",
+                "psr/container": "^1.0"
+            },
+            "suggest": {
+                "psr/cache": "When using the Cache contracts",
+                "psr/container": "When using the Service contracts",
+                "symfony/cache-contracts-implementation": "",
+                "symfony/service-contracts-implementation": "",
+                "symfony/translation-contracts-implementation": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\": ""
+                },
+                "exclude-from-classmap": [
+                    "**/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A set of abstractions extracted out of the Symfony components",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "time": "2018-12-05T08:06:11+00:00"
+        },
+        {
+            "name": "symfony/debug",
+            "version": "v4.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/debug.git",
+                "reference": "de73f48977b8eaf7ce22814d66e43a1662cc864f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/de73f48977b8eaf7ce22814d66e43a1662cc864f",
+                "reference": "de73f48977b8eaf7ce22814d66e43a1662cc864f",
                "shasum": ""
            },
            "require": {
@@ -1196,7 +1366,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "4.1-dev"
+                    "dev-master": "4.2-dev"
                }
            },
            "autoload": {
@@ -1223,20 +1393,20 @@
            ],
            "description": "Symfony Debug Component",
            "homepage": "https://symfony.com",
-            "time": "2018-10-31T09:09:42+00:00"
+            "time": "2019-03-03T18:11:24+00:00"
        },
        {
            "name": "symfony/finder",
-            "version": "v4.1.7",
+            "version": "v4.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/finder.git",
-                "reference": "1f17195b44543017a9c9b2d437c670627e96ad06"
+                "reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/1f17195b44543017a9c9b2d437c670627e96ad06",
-                "reference": "1f17195b44543017a9c9b2d437c670627e96ad06",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/267b7002c1b70ea80db0833c3afe05f0fbde580a",
+                "reference": "267b7002c1b70ea80db0833c3afe05f0fbde580a",
                "shasum": ""
            },
            "require": {
@@ -1245,7 +1415,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "4.1-dev"
+                    "dev-master": "4.2-dev"
                }
            },
            "autoload": {
@@ -1272,7 +1442,7 @@
            ],
            "description": "Symfony Finder Component",
            "homepage": "https://symfony.com",
-            "time": "2018-10-03T08:47:56+00:00"
+            "time": "2019-02-23T15:42:05+00:00"
        },
        {
            "name": "symfony/polyfill-mbstring",
@@ -1335,20 +1505,21 @@
        },
        {
            "name": "symfony/translation",
-            "version": "v4.1.7",
+            "version": "v4.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation.git",
-                "reference": "aa04dc1c75b7d3da7bd7003104cd0cfc5dff635c"
+                "reference": "748464177a77011f8f4cdd076773862ce4915f8f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/aa04dc1c75b7d3da7bd7003104cd0cfc5dff635c",
-                "reference": "aa04dc1c75b7d3da7bd7003104cd0cfc5dff635c",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/748464177a77011f8f4cdd076773862ce4915f8f",
+                "reference": "748464177a77011f8f4cdd076773862ce4915f8f",
                "shasum": ""
            },
            "require": {
                "php": "^7.1.3",
+                "symfony/contracts": "^1.0.2",
                "symfony/polyfill-mbstring": "~1.0"
            },
            "conflict": {
@@ -1356,6 +1527,9 @@
                "symfony/dependency-injection": "<3.4",
                "symfony/yaml": "<3.4"
            },
+            "provide": {
+                "symfony/translation-contracts-implementation": "1.0"
+            },
            "require-dev": {
                "psr/log": "~1.0",
                "symfony/config": "~3.4|~4.0",
@@ -1373,7 +1547,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "4.1-dev"
+                    "dev-master": "4.2-dev"
                }
            },
            "autoload": {
@@ -1400,7 +1574,7 @@
            ],
            "description": "Symfony Translation Component",
            "homepage": "https://symfony.com",
-            "time": "2018-10-28T18:38:52+00:00"
+            "time": "2019-02-27T03:31:50+00:00"
        },
        {
            "name": "tuupola/callable-handler",
--- a/config-dist.php
+++ b/config-dist.php
@@ -23,12 +23,13 @@ Setting('CULTURE', 'en');

 # To keep it simple: grocy does not handle any currency conversions,
 # this here is used to format all money values,
-# so can be anything (e. g. "USD" OR "$", doesn't matter...)
-Setting('CURRENCY', '$');
+# so doesn't matter really matter, but should be the
+# ISO 4217 code of the currency ("USD", "EUR", "GBP", etc.)
+Setting('CURRENCY', 'USD');

 # The base url of your installation,
 # should be just "/" when running directly under the root of a (sub)domain
-# or for example "https:/example.com/grocy" when using a subdirectory
+# or for example "https://example.com/grocy" when using a subdirectory
 Setting('BASE_URL', '/');

 # The plugin to use for external barcode lookups,
@@ -41,6 +42,8 @@ Setting('STOCK_BARCODE_LOOKUP_PLUGIN', 'DemoBarcodeLookupPlugin');
 Setting('DISABLE_URL_REWRITING', false);


+
+
 # Default user settings
 # These settings can be changed per user, here the defaults
 # are defined which are used when the user has not changed the setting so far
@@ -67,3 +70,19 @@ DefaultUserSetting('show_clock_in_header', false);
 # 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
 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_SHOPPINGLIST', true);
+Setting('FEATURE_FLAG_RECIPES', true);
+Setting('FEATURE_FLAG_CHORES', true);
+Setting('FEATURE_FLAG_TASKS', true);
+Setting('FEATURE_FLAG_BATTERIES', true);
+Setting('FEATURE_FLAG_EQUIPMENT', true);
+Setting('FEATURE_FLAG_CALENDAR', true);
--- a/controllers/BaseApiController.php
+++ b/controllers/BaseApiController.php
@@ -18,10 +18,14 @@ class BaseApiController extends BaseController
 		return json_encode($data);
 	}

-	protected function VoidApiActionResponse($response, $success = true, $status = 200, $errorMessage = '')
+	protected function EmptyApiResponse($response, $status = 204)
+	{
+		return $response->withStatus($status);
+	}
+
+	protected function GenericErrorResponse($response, $errorMessage, $status = 400)
 	{
 		return $response->withStatus($status)->withJson(array(
-			'success' => $success,
 			'error_message' => $errorMessage
 		));
 	}
--- a/controllers/BaseController.php
+++ b/controllers/BaseController.php
@@ -49,6 +49,16 @@ class BaseController
 		}
 		$container->view->set('embedded', $embedded);

+		$constants = get_defined_constants();
+		foreach ($constants as $constant => $value)
+		{
+			if (substr($constant, 0, 19) !== 'GROCY_FEATURE_FLAG_')
+			{
+				unset($constants[$constant]);
+			}
+		}
+		$container->view->set('featureFlags', $constants);
+
 		try
 		{
 			$usersService = new UsersService();
--- a/controllers/BatteriesApiController.php
+++ b/controllers/BatteriesApiController.php
@@ -16,20 +16,22 @@ class BatteriesApiController extends BaseApiController

 	public function TrackChargeCycle(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$trackedTime = date('Y-m-d H:i:s');
-		if (isset($request->getQueryParams()['tracked_time']) && !empty($request->getQueryParams()['tracked_time']) && IsIsoDateTime($request->getQueryParams()['tracked_time']))
-		{
-			$trackedTime = $request->getQueryParams()['tracked_time'];
-		}
+		$requestBody = $request->getParsedBody();

 		try
 		{
+			$trackedTime = date('Y-m-d H:i:s');
+			if (array_key_exists('tracked_time', $requestBody) && IsIsoDateTime($requestBody['tracked_time']))
+			{
+				$trackedTime = $requestBody['tracked_time'];
+			}
+
 			$chargeCycleId = $this->BatteriesService->TrackChargeCycle($args['batteryId'], $trackedTime);
-			return $this->ApiResponse(array('charge_cycle_id' => $chargeCycleId));
+			return $this->ApiResponse($this->Database->battery_charge_cycles($chargeCycleId));
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

@@ -41,7 +43,7 @@ class BatteriesApiController extends BaseApiController
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

@@ -55,11 +57,11 @@ class BatteriesApiController extends BaseApiController
 		try
 		{
 			$this->ApiResponse($this->BatteriesService->UndoChargeCycle($args['chargeCycleId']));
-			return $this->ApiResponse(array('success' => true));
+			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 }
--- a/controllers/CalendarApiController.php
+++ b/controllers/CalendarApiController.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\CalendarService;
+use \Grocy\Services\ApiKeyService;
+
+class CalendarApiController extends BaseApiController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->CalendarService = new CalendarService();
+		$this->ApiKeyService = new ApiKeyService();
+	}
+
+	protected $CalendarService;
+	protected $ApiKeyService;
+
+	public function Ical(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$vCalendar = new \Eluceo\iCal\Component\Calendar('grocy');
+
+			$events = $this->CalendarService->GetEvents();
+			foreach($events as $event)
+			{
+				$vEvent = new \Eluceo\iCal\Component\Event();
+				$vEvent->setDtStart(new \DateTime($event['start']))
+					->setDtEnd(new \DateTime($event['start']))
+					->setSummary($event['title'])
+					->setNoTime($event['date_format'] === 'date')
+					->setUseUtc(false);
+				
+				$vCalendar->addComponent($vEvent);
+			}
+
+			$response->write($vCalendar->render());
+			$response = $response->withHeader('Content-Type', 'text/calendar; charset=utf-8');
+			return $response->withHeader('Content-Disposition', 'attachment; filename="grocy.ics"');
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function IcalSharingLink(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			return $this->ApiResponse(array(
+				'url' => $this->AppContainer->UrlManager->ConstructUrl('/api/calendar/ical?secret=' . $this->ApiKeyService->GetOrCreateApiKey(ApiKeyService::API_KEY_TYPE_SPECIAL_PURPOSE_CALENDAR_ICAL))
+			));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+}
--- a/controllers/CalendarController.php
+++ b/controllers/CalendarController.php
@@ -2,80 +2,22 @@

 namespace Grocy\Controllers;

-use \Grocy\Services\StockService;
-use \Grocy\Services\TasksService;
-use \Grocy\Services\ChoresService;
-use \Grocy\Services\BatteriesService;
+use \Grocy\Services\CalendarService;

 class CalendarController extends BaseController
 {
 	public function __construct(\Slim\Container $container)
 	{
 		parent::__construct($container);
-		$this->StockService = new StockService();
-		$this->TasksService = new TasksService();
-		$this->ChoresService = new ChoresService();
-		$this->BatteriesService = new BatteriesService();
+		$this->CalendarService = new CalendarService();
 	}

-	protected $StockService;
-	protected $TasksService;
-	protected $ChoresService;
-	protected $BatteriesService;
+	protected $CalendarService;

 	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$products = $this->Database->products();
-		$titlePrefix = $this->LocalizationService->Localize('Product expires') . ': ';
-		$stockEvents = array();
-		foreach($this->StockService->GetCurrentStock() as $currentStockEntry)
-		{
-			$stockEvents[] = array(
-				'title' => $titlePrefix . FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name,
-				'start' => $currentStockEntry->best_before_date
-			);
-		}
-
-		$titlePrefix = $this->LocalizationService->Localize('Task due') . ': ';
-		$taskEvents = array();
-		foreach($this->TasksService->GetCurrent() as $currentTaskEntry)
-		{
-			$taskEvents[] = array(
-				'title' => $titlePrefix . $currentTaskEntry->name,
-				'start' => $currentTaskEntry->due_date
-			);
-		}
-
-		$chores = $this->Database->chores();
-		$titlePrefix = $this->LocalizationService->Localize('Chore due') . ': ';
-		$choreEvents = array();
-		foreach($this->ChoresService->GetCurrent() as $currentChoreEntry)
-		{
-			$choreEvents[] = array(
-				'title' => $titlePrefix . FindObjectInArrayByPropertyValue($chores, 'id', $currentChoreEntry->chore_id)->name,
-				'start' => $currentChoreEntry->next_estimated_execution_time
-			);
-		}
-
-		$batteries = $this->Database->batteries();
-		$titlePrefix = $this->LocalizationService->Localize('Battery charge cycle due') . ': ';
-		$batteryEvents = array();
-		foreach($this->BatteriesService->GetCurrent() as $currentBatteryEntry)
-		{
-			$batteryEvents[] = array(
-				'title' => $titlePrefix . FindObjectInArrayByPropertyValue($batteries, 'id', $currentBatteryEntry->battery_id)->name,
-				'start' => $currentBatteryEntry->next_estimated_charge_time
-			);
-		}
-
-		$fullcalendarEventSources = array();
-		$fullcalendarEventSources[] = $stockEvents;
-		$fullcalendarEventSources[] = $taskEvents;
-		$fullcalendarEventSources[] = $choreEvents;
-		$fullcalendarEventSources[] = $batteryEvents;
-
 		return $this->AppContainer->view->render($response, 'calendar', [
-			'fullcalendarEventSources' => $fullcalendarEventSources
+			'fullcalendarEventSources' => $this->CalendarService->GetEvents()
 		]);
 	}
 }
--- a/controllers/ChoresApiController.php
+++ b/controllers/ChoresApiController.php
@@ -16,26 +16,28 @@ class ChoresApiController extends BaseApiController

 	public function TrackChoreExecution(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$trackedTime = date('Y-m-d H:i:s');
-		if (isset($request->getQueryParams()['tracked_time']) && !empty($request->getQueryParams()['tracked_time']) && IsIsoDateTime($request->getQueryParams()['tracked_time']))
-		{
-			$trackedTime = $request->getQueryParams()['tracked_time'];
-		}
-
-		$doneBy = GROCY_USER_ID;
-		if (isset($request->getQueryParams()['done_by']) && !empty($request->getQueryParams()['done_by']))
-		{
-			$doneBy = $request->getQueryParams()['done_by'];
-		}
+		$requestBody = $request->getParsedBody();

 		try
 		{
+			$trackedTime = date('Y-m-d H:i:s');
+			if (array_key_exists('tracked_time', $requestBody) && IsIsoDateTime($requestBody['tracked_time']))
+			{
+				$trackedTime = $requestBody['tracked_time'];
+			}
+
+			$doneBy = GROCY_USER_ID;
+			if (array_key_exists('done_by', $requestBody) && !empty($requestBody['done_by']))
+			{
+				$doneBy = $requestBody['done_by'];
+			}
+
 			$choreExecutionId = $this->ChoresService->TrackChore($args['choreId'], $trackedTime, $doneBy);
-			return $this->ApiResponse(array('chore_execution_id' => $choreExecutionId));
+			return $this->ApiResponse($this->Database->chores_log($choreExecutionId));
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

@@ -47,7 +49,7 @@ class ChoresApiController extends BaseApiController
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

@@ -61,11 +63,11 @@ class ChoresApiController extends BaseApiController
 		try
 		{
 			$this->ApiResponse($this->ChoresService->UndoChoreExecution($args['executionId']));
-			return $this->ApiResponse(array('success' => true));
+			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 }
--- a/controllers/FilesApiController.php
+++ b/controllers/FilesApiController.php
@@ -18,23 +18,23 @@ class FilesApiController extends BaseApiController
 	{
 		try
 		{
-			if (isset($request->getQueryParams()['file_name']) && !empty($request->getQueryParams()['file_name']) && IsValidFileName($request->getQueryParams()['file_name']))
+			if (IsValidFileName(base64_decode($args['fileName'])))
 			{
-				$fileName = $request->getQueryParams()['file_name'];
+				$fileName = base64_decode($args['fileName']);
 			}
 			else
 			{
-				throw new \Exception('file_name query parameter missing or contains an invalid filename');
+				throw new \Exception('Invalid filename');
 			}

 			$data = $request->getBody()->getContents();
 			file_put_contents($this->FilesService->GetFilePath($args['group'], $fileName), $data);

-			return $this->ApiResponse(array('success' => true));
+			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

@@ -42,13 +42,13 @@ class FilesApiController extends BaseApiController
 	{
 		try
 		{
-			if (isset($request->getQueryParams()['file_name']) && !empty($request->getQueryParams()['file_name']) && IsValidFileName($request->getQueryParams()['file_name']))
+			if (IsValidFileName(base64_decode($args['fileName'])))
 			{
-				$fileName = $request->getQueryParams()['file_name'];
+				$fileName = base64_decode($args['fileName']);
 			}
 			else
 			{
-				throw new \Exception('file_name query parameter missing or contains an invalid filename');
+				throw new \Exception('Invalid filename');
 			}

 			$filePath = $this->FilesService->GetFilePath($args['group'], $fileName);
@@ -61,12 +61,12 @@ class FilesApiController extends BaseApiController
 			}
 			else
 			{
-				return $this->VoidApiActionResponse($response, false, 404, 'File not found');
+				return $this->GenericErrorResponse($response, 'File not found', 404);
 			}
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

@@ -74,13 +74,13 @@ class FilesApiController extends BaseApiController
 	{
 		try
 		{
-			if (isset($request->getQueryParams()['file_name']) && !empty($request->getQueryParams()['file_name']) && IsValidFileName($request->getQueryParams()['file_name']))
+			if (IsValidFileName(base64_decode($args['fileName'])))
 			{
-				$fileName = $request->getQueryParams()['file_name'];
+				$fileName = base64_decode($args['fileName']);
 			}
 			else
 			{
-				throw new \Exception('file_name query parameter missing or contains an invalid filename');
+				throw new \Exception('Invalid filename');
 			}

 			$filePath = $this->FilesService->GetFilePath($args['group'], $fileName);
@@ -89,11 +89,11 @@ class FilesApiController extends BaseApiController
 				unlink($filePath);
 			}

-			return $this->ApiResponse(array('success' => true));
+			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 }
--- a/controllers/GenericEntityApiController.php
+++ b/controllers/GenericEntityApiController.php
@@ -12,7 +12,7 @@ class GenericEntityApiController extends BaseApiController
 		}
 		else
 		{
-			return $this->VoidApiActionResponse($response, false, 400, 'Entity does not exist or is not exposed');
+			return $this->GenericErrorResponse($response, 'Entity does not exist or is not exposed');
 		}
 	}

@@ -24,7 +24,7 @@ class GenericEntityApiController extends BaseApiController
 		}
 		else
 		{
-			return $this->VoidApiActionResponse($response, false, 400, 'Entity does not exist or is not exposed');
+			return $this->GenericErrorResponse($response, 'Entity does not exist or is not exposed');
 		}
 	}

@@ -32,14 +32,28 @@ class GenericEntityApiController extends BaseApiController
 	{
 		if ($this->IsValidEntity($args['entity']))
 		{
-			$newRow = $this->Database->{$args['entity']}()->createRow($request->getParsedBody());
+			$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)');
+				}
+
+				$newRow = $this->Database->{$args['entity']}()->createRow($requestBody);
 				$newRow->save();
 				$success = $newRow->isClean();
-			return $this->ApiResponse(array('success' => $success));
+				return $this->EmptyApiResponse($response);
+			}
+			catch (\Exception $ex)
+			{
+				return $this->GenericErrorResponse($response, $ex->getMessage());
+			}
 		}
 		else
 		{
-			return $this->VoidApiActionResponse($response, false, 400, 'Entity does not exist or is not exposed');
+			return $this->GenericErrorResponse($response, 'Entity does not exist or is not exposed');
 		}
 	}

@@ -47,14 +61,28 @@ class GenericEntityApiController extends BaseApiController
 	{
 		if ($this->IsValidEntity($args['entity']))
 		{
+			$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)');
+				}
+
 				$row = $this->Database->{$args['entity']}($args['objectId']);
-			$row->update($request->getParsedBody());
+				$row->update($requestBody);
 				$success = $row->isClean();
-			return $this->ApiResponse(array('success' => $success));
+				return $this->EmptyApiResponse($response);
+			}
+			catch (\Exception $ex)
+			{
+				return $this->GenericErrorResponse($response, $ex->getMessage());
+			}
 		}
 		else
 		{
-			return $this->VoidApiActionResponse($response, false, 400, 'Entity does not exist or is not exposed');
+			return $this->GenericErrorResponse($response, 'Entity does not exist or is not exposed');
 		}
 	}

@@ -65,11 +93,11 @@ class GenericEntityApiController extends BaseApiController
 			$row = $this->Database->{$args['entity']}($args['objectId']);
 			$row->delete();
 			$success = $row->isClean();
-			return $this->ApiResponse(array('success' => $success));
+			return $this->EmptyApiResponse($response);
 		}
 		else
 		{
-			return $this->VoidApiActionResponse($response, false, 400, 'Entity does not exist or is not exposed');
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

--- a/controllers/LoginController.php
+++ b/controllers/LoginController.php
@@ -63,21 +63,6 @@ class LoginController extends BaseController
 		return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/'));
 	}

-	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)
-		{
-			$demoDataGeneratorService = new DemoDataGeneratorService();
-			$demoDataGeneratorService->PopulateDemoData();
-		}
-
-		return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/stockoverview'));
-	}
-
 	public function GetSessionCookieName()
 	{
 		return $this->SessionCookieName;
--- a/controllers/RecipesApiController.php
+++ b/controllers/RecipesApiController.php
@@ -16,8 +16,16 @@ class RecipesApiController extends BaseApiController

 	public function AddNotFulfilledProductsToShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$this->RecipesService->AddNotFulfilledProductsToShoppingList($args['recipeId']);
-		return $this->VoidApiActionResponse($response);
+		$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)
@@ -25,11 +33,11 @@ class RecipesApiController extends BaseApiController
 		try
 		{
 			$this->RecipesService->ConsumeRecipe($args['recipeId']);
-			return $this->VoidApiActionResponse($response);
+			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 }
--- a/controllers/RecipesController.php
+++ b/controllers/RecipesController.php
@@ -17,37 +17,47 @@ class RecipesController extends BaseController
 	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		$recipes = $this->Database->recipes()->orderBy('name');
+		$recipesResolved = $this->RecipesService->GetRecipesResolved();

 		$selectedRecipe = null;
-		$selectedRecipePositions = null;
+		$selectedRecipePositionsResolved = null;
 		if (isset($request->getQueryParams()['recipe']))
 		{
 			$selectedRecipe = $this->Database->recipes($request->getQueryParams()['recipe']);
-			$selectedRecipePositions = $this->Database->recipes_pos()->where('recipe_id', $request->getQueryParams()['recipe'])->orderBy('ingredient_group');
+			$selectedRecipePositionsResolved = $this->Database->recipes_pos_resolved()->where('recipe_id', $request->getQueryParams()['recipe'])->orderBy('ingredient_group');
 		}
 		else
 		{
 			foreach ($recipes as $recipe)
 			{
 				$selectedRecipe = $recipe;
-				$selectedRecipePositions = $this->Database->recipes_pos()->where('recipe_id', $recipe->id)->orderBy('ingredient_group');
+				$selectedRecipePositionsResolved = $this->Database->recipes_pos_resolved()->where('recipe_id', $recipe->id)->orderBy('ingredient_group');
 				break;
 			}
 		}

 		$selectedRecipeSubRecipes = $this->Database->recipes()->where('id IN (SELECT includes_recipe_id FROM recipes_nestings_resolved WHERE recipe_id = :1 AND includes_recipe_id != :1)', $selectedRecipe->id)->orderBy('name')->fetchAll();
-		$selectedRecipeSubRecipesPositions = $this->Database->recipes_pos()->where('recipe_id IN (SELECT includes_recipe_id FROM recipes_nestings_resolved WHERE recipe_id = :1 AND includes_recipe_id != :1)', $selectedRecipe->id)->orderBy('ingredient_group')->fetchAll();
+		$selectedRecipeSubRecipesPositions = $this->Database->recipes_pos_resolved()->where('recipe_id = :1', $selectedRecipe->id)->orderBy('ingredient_group')->fetchAll();
+
+		$includedRecipeIdsAbsolute = array();
+		$includedRecipeIdsAbsolute[] = $selectedRecipe->id;
+		foreach($selectedRecipeSubRecipes as $subRecipe)
+		{
+			$includedRecipeIdsAbsolute[] = $subRecipe->id;
+		}

 		return $this->AppContainer->view->render($response, 'recipes', [
 			'recipes' => $recipes,
-			'recipesFulfillment' => $this->RecipesService->GetRecipesFulfillment(),
-			'recipesSumFulfillment' => $this->RecipesService->GetRecipesSumFulfillment(),
+			'recipesResolved' => $recipesResolved,
+			'recipePositionsResolved' => $this->Database->recipes_pos_resolved(),
 			'selectedRecipe' => $selectedRecipe,
-			'selectedRecipePositions' => $selectedRecipePositions,
+			'selectedRecipePositionsResolved' => $selectedRecipePositionsResolved,
 			'products' => $this->Database->products(),
 			'quantityunits' => $this->Database->quantity_units(),
 			'selectedRecipeSubRecipes' => $selectedRecipeSubRecipes,
-			'selectedRecipeSubRecipesPositions' => $selectedRecipeSubRecipesPositions
+			'selectedRecipeSubRecipesPositions' => $selectedRecipeSubRecipesPositions,
+			'includedRecipeIdsAbsolute' => $includedRecipeIdsAbsolute,
+			'selectedRecipeTotalCosts' => FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $selectedRecipe->id)->costs
 		]);
 	}

@@ -70,8 +80,8 @@ class RecipesController extends BaseController
 			'mode' => 'edit',
 			'products' => $this->Database->products(),
 			'quantityunits' => $this->Database->quantity_units(),
-			'recipesFulfillment' => $this->RecipesService->GetRecipesFulfillment(),
-			'recipesSumFulfillment' => $this->RecipesService->GetRecipesSumFulfillment(),
+			'recipePositionsResolved' => $this->RecipesService->GetRecipesPosResolved(),
+			'recipesResolved' => $this->RecipesService->GetRecipesResolved(),
 			'recipes' =>  $this->Database->recipes()->orderBy('name'),
 			'recipeNestings' =>  $this->Database->recipes_nestings()->where('recipe_id', $recipeId)
 		]);
--- a/controllers/StockApiController.php
+++ b/controllers/StockApiController.php
@@ -22,7 +22,20 @@ class StockApiController extends BaseApiController
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
+		}
+	}
+
+	public function ProductDetailsByBarcode(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$productId = $this->StockService->GetProductIdFromBarcode($args['barcode']);
+			return $this->ApiResponse($this->StockService->GetProductDetails($productId));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

@@ -34,107 +47,167 @@ class StockApiController extends BaseApiController
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

 	public function AddProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$bestBeforeDate = date('Y-m-d');
-		if (isset($request->getQueryParams()['bestbeforedate']) && !empty($request->getQueryParams()['bestbeforedate']) && IsIsoDate($request->getQueryParams()['bestbeforedate']))
-		{
-			$bestBeforeDate = $request->getQueryParams()['bestbeforedate'];
-		}
-
-		$price = null;
-		if (isset($request->getQueryParams()['price']) && !empty($request->getQueryParams()['price']) && is_numeric($request->getQueryParams()['price']))
-		{
-			$price = $request->getQueryParams()['price'];
-		}
-
-		$transactionType = StockService::TRANSACTION_TYPE_PURCHASE;
-		if (isset($request->getQueryParams()['transactiontype']) && !empty($request->getQueryParams()['transactiontype']))
-		{
-			$transactionType = $request->getQueryParams()['transactiontype'];
-		}
+		$requestBody = $request->getParsedBody();

 		try
 		{
-			$bookingId = $this->StockService->AddProduct($args['productId'], $args['amount'], $bestBeforeDate, $transactionType, date('Y-m-d'), $price);
-			return $this->ApiResponse(array('booking_id' => $bookingId));
+			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 = date('Y-m-d');
+			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'];
+			}
+
+			$transactionType = StockService::TRANSACTION_TYPE_PURCHASE;
+			if (array_key_exists('transaction_type', $requestBody)  && !empty($requestBody['transactiontype']))
+			{
+				$transactionType = $requestBody['transactiontype'];
+			}
+
+			$bookingId = $this->StockService->AddProduct($args['productId'], $requestBody['amount'], $bestBeforeDate, $transactionType, date('Y-m-d'), $price, $locationId);
+			return $this->ApiResponse($this->Database->stock_log($bookingId));
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

 	public function ConsumeProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$spoiled = false;
-		if (isset($request->getQueryParams()['spoiled']) && !empty($request->getQueryParams()['spoiled']) && $request->getQueryParams()['spoiled'] == '1')
-		{
-			$spoiled = true;
-		}
-
-		$transactionType = StockService::TRANSACTION_TYPE_CONSUME;
-		if (isset($request->getQueryParams()['transactiontype']) && !empty($request->getQueryParams()['transactiontype']))
-		{
-			$transactionType = $request->getQueryParams()['transactiontype'];
-		}
-
-		$specificStockEntryId = "default";
-		if (isset($request->getQueryParams()['stock_entry_id']) && !empty($request->getQueryParams()['stock_entry_id']))
-		{
-			$specificStockEntryId = $request->getQueryParams()['stock_entry_id'];
-		}
+		$requestBody = $request->getParsedBody();

 		try
 		{
-			$bookingId = $this->StockService->ConsumeProduct($args['productId'], $args['amount'], $spoiled, $transactionType, $specificStockEntryId);
-			return $this->ApiResponse(array('booking_id' => $bookingId));
+			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');
+			}
+
+			$spoiled = false;
+			if (array_key_exists('spoiled', $requestBody))
+			{
+				$spoiled = $requestBody['spoiled'];
+			}
+
+			$transactionType = StockService::TRANSACTION_TYPE_CONSUME;
+			if (array_key_exists('transaction_type', $requestBody)  && !empty($requestBody['transactiontype']))
+			{
+				$transactionType = $requestBody['transactiontype'];
+			}
+
+			$specificStockEntryId = 'default';
+			if (array_key_exists('stock_entry_id', $requestBody) && !empty($requestBody['stock_entry_id']))
+			{
+				$specificStockEntryId = $requestBody['stock_entry_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);
+			return $this->ApiResponse($this->Database->stock_log($bookingId));
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

 	public function InventoryProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$bestBeforeDate = date('Y-m-d');
-		if (isset($request->getQueryParams()['bestbeforedate']) && !empty($request->getQueryParams()['bestbeforedate']) && IsIsoDate($request->getQueryParams()['bestbeforedate']))
-		{
-			$bestBeforeDate = $request->getQueryParams()['bestbeforedate'];
-		}
+		$requestBody = $request->getParsedBody();

 		try
 		{
-			$bookingId = $this->StockService->InventoryProduct($args['productId'], $args['newAmount'], $bestBeforeDate);
-			return $this->ApiResponse(array('booking_id' => $bookingId));
+			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('new_amount', $requestBody))
+			{
+				throw new \Exception('An new amount is required');
+			}
+
+			$bestBeforeDate = date('Y-m-d');
+			if (array_key_exists('best_before_date', $requestBody) && IsIsoDate($requestBody['best_before_date']))
+			{
+				$bestBeforeDate = $requestBody['best_before_date'];
+			}
+
+			$bookingId = $this->StockService->InventoryProduct($args['productId'], $requestBody['new_amount'], $bestBeforeDate);
+			return $this->ApiResponse($this->Database->stock_log($bookingId));
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

 	public function OpenProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$specificStockEntryId = "default";
-		if (isset($request->getQueryParams()['stock_entry_id']) && !empty($request->getQueryParams()['stock_entry_id']))
-		{
-			$specificStockEntryId = $request->getQueryParams()['stock_entry_id'];
-		}
+		$requestBody = $request->getParsedBody();

 		try
 		{
-			$bookingId = $this->StockService->OpenProduct($args['productId'], $args['amount'], $specificStockEntryId);
-			return $this->ApiResponse(array('booking_id' => $bookingId));
+			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');
+			}
+
+			$specificStockEntryId = 'default';
+			if (array_key_exists('stock_entry_id', $requestBody) && !empty($requestBody['stock_entry_id']))
+			{
+				$specificStockEntryId = $requestBody['stock_entry_id'];
+			}
+
+			$bookingId = $this->StockService->OpenProduct($args['productId'], $requestBody['amount'], $specificStockEntryId);
+			return $this->ApiResponse($this->Database->stock_log($bookingId));
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

@@ -164,13 +237,13 @@ class StockApiController extends BaseApiController
 	public function AddMissingProductsToShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		$this->StockService->AddMissingProductsToShoppingList();
-		return $this->VoidApiActionResponse($response);
+		return $this->EmptyApiResponse($response);
 	}

 	public function ClearShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		$this->StockService->ClearShoppingList();
-		return $this->VoidApiActionResponse($response);
+		return $this->EmptyApiResponse($response);
 	}

 	public function ExternalBarcodeLookup(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
@@ -187,7 +260,7 @@ class StockApiController extends BaseApiController
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

@@ -196,11 +269,11 @@ class StockApiController extends BaseApiController
 		try
 		{
 			$this->ApiResponse($this->StockService->UndoBooking($args['bookingId']));
-			return $this->ApiResponse(array('success' => true));
+			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

--- a/controllers/StockController.php
+++ b/controllers/StockController.php
@@ -22,6 +22,7 @@ class StockController extends BaseController
 			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
 			'locations' => $this->Database->locations()->orderBy('name'),
 			'currentStock' => $this->StockService->GetCurrentStock(),
+			'currentStockLocations' => $this->StockService->GetCurrentStockLocations(),
 			'missingProducts' => $this->StockService->GetMissingProducts(),
 			'nextXDays' => 5,
 			'productGroups' => $this->Database->product_groups()->orderBy('name')
@@ -31,14 +32,16 @@ class StockController extends BaseController
 	public function Purchase(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'purchase', [
-			'products' => $this->Database->products()->orderBy('name')
+			'products' => $this->Database->products()->orderBy('name'),
+			'locations' => $this->Database->locations()->orderBy('name')
 		]);
 	}

 	public function Consume(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'consume', [
-			'products' => $this->Database->products()->orderBy('name')
+			'products' => $this->Database->products()->orderBy('name'),
+			'recipes' => $this->Database->recipes()->orderBy('name')
 		]);
 	}

--- a/controllers/SystemApiController.php
+++ b/controllers/SystemApiController.php
@@ -3,6 +3,7 @@
 namespace Grocy\Controllers;

 use \Grocy\Services\DatabaseService;
+use \Grocy\Services\ApplicationService;

 class SystemApiController extends BaseApiController
 {
@@ -10,9 +11,11 @@ class SystemApiController extends BaseApiController
 	{
 		parent::__construct($container);
 		$this->DatabaseService = new DatabaseService();
+		$this->ApplicationService = new ApplicationService();
 	}

 	protected $DatabaseService;
+	protected $ApplicationService;

 	public function GetDbChangedTime(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
@@ -30,12 +33,17 @@ class SystemApiController extends BaseApiController
 				$requestBody = $request->getParsedBody();

 				$this->LocalizationService->LogMissingLocalization(GROCY_CULTURE, $requestBody['text']);
-				return $this->ApiResponse(array('success' => true));
+				return $this->EmptyApiResponse($response);
 			}
 			catch (\Exception $ex)
 			{
-				return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+				return $this->GenericErrorResponse($response, $ex->getMessage());
 			}
 		}	
 	}
+
+	public function GetSystemInfo(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->ApiResponse($this->ApplicationService->GetSystemInfo());
+	}
 }
--- a/controllers/SystemController.php
+++ b/controllers/SystemController.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\ApplicationService;
+use \Grocy\Services\DatabaseMigrationService;
+use \Grocy\Services\DemoDataGeneratorService;
+
+class SystemController extends BaseController
+{
+	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)
+		{
+			$demoDataGeneratorService = new DemoDataGeneratorService();
+			$demoDataGeneratorService->PopulateDemoData();
+		}
+
+		return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/stockoverview'));
+	}
+
+	public function About(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'about', [
+			'system_info' => $this->ApplicationService->GetSystemInfo(),
+			'changelog' => $this->ApplicationService->GetChangelog()
+		]);
+	}
+}
--- a/controllers/TasksApiController.php
+++ b/controllers/TasksApiController.php
@@ -21,20 +21,22 @@ class TasksApiController extends BaseApiController

 	public function MarkTaskAsCompleted(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$doneTime = date('Y-m-d H:i:s');
-		if (isset($request->getQueryParams()['done_time']) && !empty($request->getQueryParams()['done_time']) && IsIsoDateTime($request->getQueryParams()['done_time']))
-		{
-			$doneTime = $request->getQueryParams()['done_time'];
-		}
+		$requestBody = $request->getParsedBody();

 		try
 		{
+			$doneTime = date('Y-m-d H:i:s');
+			if (array_key_exists('done_time', $requestBody) && IsIsoDateTime($requestBody['done_time']))
+			{
+				$doneTime = $requestBody['done_time'];
+			}
+
 			$this->TasksService->MarkTaskAsCompleted($args['taskId'], $doneTime);
-			return $this->VoidApiActionResponse($response);
+			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 }
--- a/controllers/UsersApiController.php
+++ b/controllers/UsersApiController.php
@@ -22,7 +22,7 @@ class UsersApiController extends BaseApiController
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

@@ -32,12 +32,17 @@ class UsersApiController extends BaseApiController

 		try
 		{
+			if ($requestBody === null)
+			{
+				throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
+			}
+
 			$this->UsersService->CreateUser($requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password']);
-			return $this->ApiResponse(array('success' => true));
+			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

@@ -46,11 +51,11 @@ class UsersApiController extends BaseApiController
 		try
 		{
 			$this->UsersService->DeleteUser($args['userId']);
-			return $this->ApiResponse(array('success' => true));
+			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

@@ -61,11 +66,11 @@ class UsersApiController extends BaseApiController
 		try
 		{
 			$this->UsersService->EditUser($args['userId'], $requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password']);
-			return $this->ApiResponse(array('success' => true));
+			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

@@ -78,7 +83,7 @@ class UsersApiController extends BaseApiController
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}

@@ -89,11 +94,11 @@ class UsersApiController extends BaseApiController
 			$requestBody = $request->getParsedBody();

 			$value = $this->UsersService->SetUserSetting(GROCY_USER_ID, $args['settingKey'], $requestBody['value']);
-			return $this->ApiResponse(array('success' => true));
+			return $this->EmptyApiResponse($response);
 		}
 		catch (\Exception $ex)
 		{
-			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
 	}
 }
--- a/grocy.openapi.json
+++ b/grocy.openapi.json
--- a/localization/da/chore_types.php
+++ b/localization/da/chore_types.php
@@ -0,0 +1,6 @@
+<?php
+
+return array(
+	'manually' => 'Manuelt',
+	'dynamic-regular' => 'Dynamic regular'
+);
--- a/localization/da/component_translations.php
+++ b/localization/da/component_translations.php
@@ -0,0 +1,10 @@
+<?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'
+);
--- a/localization/da/demo_data.php
+++ b/localization/da/demo_data.php
@@ -0,0 +1,90 @@
+<?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'
+);
--- a/localization/da/stock_transaction_types.php
+++ b/localization/da/stock_transaction_types.php
@@ -0,0 +1,8 @@
+<?php
+
+return array(
+	'purchase' => 'Køb',
+	'consume' => 'Brug',
+	'inventory-correction' => 'Beholdningsrettelse',
+	'product-opened' => 'Produkt åbnet'
+);
--- a/localization/da/strings.php
+++ b/localization/da/strings.php
@@ -0,0 +1,348 @@
+<?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'
+);
--- a/localization/de/demo_data.php
+++ b/localization/de/demo_data.php
@@ -83,5 +83,8 @@ return array(
 	'Milliliter' => 'Milliliter',
 	'Bottom' => 'Boden',
 	'Topping' => 'Belag',
-	'French' => 'Französisch'
+	'French' => 'Französisch',
+	'Turkish' => 'Türkisch',
+	'Spanish' => 'Spanisch',
+	'Russian' => 'Russisch'
 );
--- a/localization/de/strings.php
+++ b/localization/de/strings.php
@@ -47,7 +47,6 @@ return array(
 	'Charge cycles count' => 'Ladezyklen',
 	'Create shopping list item' => 'Einkaufszettel Eintrag erstellen',
 	'Edit shopping list item' => 'Einkaufszettel Eintrag bearbeiten',
-	'#1 units were automatically added and will apply in addition to the amount entered here' => '#1 Einheiten wurden automatisch hinzugefügt und gelten zusätzlich der hier eingegebenen Menge',
 	'Save' => 'Speichern',
 	'Add' => 'Hinzufügen',
 	'Name' => 'Name',
@@ -140,7 +139,7 @@ return array(
 	'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 and must be later than today' => 'Ein Mindesthaltbarkeitsdatum ist erforderlich und muss später als heute sein',
+	'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',
@@ -260,7 +259,6 @@ return array(
 	'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',
-	'Current picture' => 'Aktuelles Bild',
 	'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',
@@ -274,7 +272,6 @@ return array(
 	'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',
-	'Current instruction manual' => 'Aktuelle Bedienungsanleitung',
 	'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',
@@ -326,5 +323,37 @@ return array(
 	'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'
+	'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?'
 );
--- a/localization/en/demo_data.php
+++ b/localization/en/demo_data.php
@@ -83,5 +83,8 @@ return array(
 	'Milliliter' => 'Milliliter',
 	'Bottom' => 'Bottom',
 	'Topping' => 'Topping',
-	'French' => 'French'
+	'French' => 'French',
+	'Turkish' => 'Turkish',
+	'Spanish' => 'Spanish',
+	'Russian' => 'Russian'
 );
--- a/localization/en/strings.php
+++ b/localization/en/strings.php
@@ -47,7 +47,6 @@ return array(
 	'Charge cycles count' => 'Charge cycles count',
 	'Create shopping list item' => 'Create shopping list item',
 	'Edit shopping list item' => 'Edit shopping list item',
-	'#1 units were automatically added and will apply in addition to the amount entered here' => '#1 units were automatically added and will apply in addition to the amount entered here',
 	'Save' => 'Save',
 	'Add' => 'Add',
 	'Name' => 'Name',
@@ -140,7 +139,7 @@ return array(
 	'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 and must be later than today' => 'A best before date is required and must be later than today',
+	'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',
@@ -260,7 +259,6 @@ return array(
 	'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',
-	'Current picture' => 'Current picture',
 	'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',
@@ -274,7 +272,6 @@ return array(
 	'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',
-	'Current instruction manual' => 'Current instruction manual',
 	'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',
@@ -326,5 +323,37 @@ return array(
 	'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'
+	'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?'
 );
--- a/localization/es/chore_types.php
+++ b/localization/es/chore_types.php
@@ -0,0 +1,6 @@
+<?php
+
+return array(
+	'manually' => 'Manualmente',
+	'dynamic-regular' => 'Dinámico regular'
+);
--- a/localization/es/component_translations.php
+++ b/localization/es/component_translations.php
@@ -0,0 +1,10 @@
+<?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'
+);
--- a/localization/es/demo_data.php
+++ b/localization/es/demo_data.php
@@ -0,0 +1,90 @@
+<?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'
+);
--- a/localization/es/stock_transaction_types.php
+++ b/localization/es/stock_transaction_types.php
@@ -0,0 +1,8 @@
+<?php
+
+return array(
+	'purchase' => 'Compra',
+	'consume' => 'Consumo',
+	'inventory-correction' => 'Corrección de inventario',
+	'product-opened' => 'Producto abierto'
+);
--- a/localization/es/strings.php
+++ b/localization/es/strings.php
@@ -0,0 +1,359 @@
+<?php
+
+return array(
+	'Stock overview' => 'Resumen de stock',
+	'#1 products expiring within the next #2 days' => '#1 productos caducan en los próximos #2 días',
+	'#1 products are already expired' => '#1 productos ya han caducado',
+	'#1 products are below defined min. stock amount' => '#1 productos están por debajo del mínimo de stock definido',
+	'Product' => 'Producto',
+	'Amount' => 'Cantidad',
+	'Next best before date' => 'Siguiente fecha de caducidad',
+	'Logout' => 'Cerrar sesión',
+	'Chores overview' => 'Resumen de tareas del hogar',
+	'Batteries overview' => 'Resumen de pilas',
+	'Purchase' => 'Compra',
+	'Consume' => 'Consumo',
+	'Inventory' => 'Inventario',
+	'Shopping list' => 'Lista de la compra',
+	'Chore tracking' => 'Seguimiento de tareas del hogar',
+	'Battery tracking' => 'Seguimiento de pilas',
+	'Products' => 'Productos',
+	'Locations' => 'Lugares',
+	'Quantity units' => 'Unidades',
+	'Chores' => 'Tareas del hogar',
+	'Batteries' => 'Pilas',
+	'Chore' => 'Tarea del hogar',
+	'Next estimated tracking' => 'Siguiente seguimiento estimado',
+	'Last tracked' => 'Último seguimiento',
+	'Battery' => 'Pila',
+	'Last charged' => 'Última carga',
+	'Next planned charge cycle' => 'Siguiente ciclo de carga planificado',
+	'Best before' => 'Preferentemente antes de',
+	'OK' => 'OK',
+	'Product overview' => 'Resumen de producto',
+	'Stock quantity unit' => 'Unidad de stock',
+	'Stock amount' => 'Cantidad de stock',
+	'Last purchased' => 'Última compra',
+	'Last used' => 'Último uso',
+	'Spoiled' => 'Desperdiciado',
+	'Barcode lookup is disabled' => 'El buscador de códigos de barras está deshabilitado',
+	'will be added to the list of barcodes for the selected product on submit' => 'será añadido a la lista de códigos de barras para el producto seleccionado al enviar',
+	'New amount' => 'Nueva cantidad',
+	'Note' => 'Nota',
+	'Tracked time' => 'Tiempo seguido',
+	'Chore overview' => 'Resumen de tarea del hogar',
+	'Tracked count' => 'Cuenta seguida',
+	'Battery overview' => 'Resumen de pila',
+	'Charge cycles count' => 'Cuenta de ciclos de carga',
+	'Create shopping list item' => 'Crear elemento de la lista de la compra',
+	'Edit shopping list item' => 'Editar elemento de la lista de la compra',
+	'Save' => 'Grabar',
+	'Add' => 'Añadir',
+	'Name' => 'Nombre',
+	'Location' => 'Lugar',
+	'Min. stock amount' => 'Min. cantidad de stock',
+	'QU purchase' => 'Cantidad de compra',
+	'QU stock' => 'Cantidad de stock',
+	'QU factor' => 'Factor de cantidad',
+	'Description' => 'Descripción',
+	'Create product' => 'Crear producto',
+	'Barcode(s)' => 'Código(s) de barras',
+	'Minimum stock amount' => 'Mínima cantidad de stock',
+	'Default best before days' => 'Días de caducidad por defecto',
+	'Quantity unit purchase' => 'Unidad de compra',
+	'Quantity unit stock' => 'Unidad de stock',
+	'Factor purchase to stock quantity unit' => 'Factor de unidad entre compra y stock',
+	'Create location' => 'Crear lugar',
+	'Create quantity unit' => 'Crear unidad',
+	'Period type' => 'Tipo de periodo',
+	'Period days' => 'Días del periodo',
+	'Create chore' => 'Crear tarea del hogar',
+	'Used in' => 'Usado en',
+	'Create battery' => 'Crear pila',
+	'Edit battery' => 'Editar pila',
+	'Edit chore' => 'Editar tarea del hogar',
+	'Edit quantity unit' => 'Editar unidad',
+	'Edit product' => 'Editar producto',
+	'Edit location' => 'Editar lugar',
+	'Record data' => 'Grabar datos',
+	'Manage master data' => 'Administrar datos maestros',
+	'This will apply to added products' => 'Esto se aplicará a los productos añadidos',
+	'never' => 'nunca',
+	'Add products that are below defined min. stock amount' => 'Añadir productos que están por debajo del mínimo de stock definido',
+	'For purchases this amount of days will be added to today for the best before date suggestion' => 'Para nuevas compras, esta cantidad de días se añadirán desde hoy como sugerencia de fecha de caducidad',
+	'This means 1 #1 purchased will be converted into #2 #3 in stock' => 'Quiere decir que 1 #1 comprada se convertirá en #2 #3 en el stock',
+	'Login' => 'Iniciar sesión',
+	'Username' => 'Nombre usuario',
+	'Password' => 'Contraseña',
+	'Invalid credentials, please try again' => 'Credenciales inválidas, prueba de nuevo',
+	'Are you sure to delete battery "#1"?' => '¿Estás seguro de querer borrar la pila "#1"?',
+	'Yes' => 'Sí',
+	'No' => 'No',
+	'Are you sure to delete chore "#1"?' => '¿Estás seguro de querer borrar la tarea del hogar "#1"?',
+	'"#1" could not be resolved to a product, how do you want to proceed?' => '"#1" no puede resolverse a un producto, ¿cómo quieres proceder?',
+	'Create or assign product' => 'Crear o asignar un producto',
+	'Cancel' => 'Cancelar',
+	'Add as new product' => 'Añadir como un nuevo producto',
+	'Add as barcode to existing product' => 'Añadir como código de barras de un producto existente',
+	'Add as new product and prefill barcode' => 'Añadir un nuevo producto y rellenar código de barras',
+	'Are you sure to delete quantity unit "#1"?' => '¿Estás seguro de querer borrar la unidad "#1"?',
+	'Are you sure to delete product "#1"?' => '¿Estás seguro de querer borrar el producto "#1"?',
+	'Are you sure to delete location "#1"?' => '¿Estás seguro de querer borrar el lugar "#1"?',
+	'Manage API keys' => 'Administrar las claves de API',
+	'REST API & data model documentation' => 'Documentación de la API REST y modelo de datos',
+	'API keys' => 'Claves de API',
+	'Create new API key' => 'Crear nueva clave de API',
+	'API key' => 'Clave de API',
+	'Expires' => 'Caduca',
+	'Created' => 'Creado',
+	'This product is not in stock' => 'Este producto no está en stock',
+	'This means #1 will be added to stock' => 'Quiere decir que #1 será añadido al stock',
+	'This means #1 will be removed from stock' => 'Quiere decir que #1 será eliminado del stock',
+	'This means it is estimated that a new execution of this chore is tracked #1 days after the last was tracked' => 'Quiere decir que una nueva ocurrencia de esta tarea del hogar se seguirá #1 días después de la última vez',
+	'Removed #1 #2 of #3 from stock' => 'Eliminado #1 #2 de #3 del stock',
+	'About grocy' => 'Sobre grocy',
+	'Close' => 'Cerrar',
+	'#1 batteries are due to be charged within the next #2 days' => '#1 pilas están pendientes de carga en los siguientes #2 días',
+	'#1 batteries are overdue to be charged' => '#1 pilas han pasado su fecha de carga prevista',
+	'#1 chores are due to be done within the next #2 days' => '#1 tareas del hogar están pendientes de suceder en los siguientes #2 días',
+	'#1 chores are overdue to be done' => '#1 tareas del hogar están vencidas',
+	'Released on' => 'Publicado el',
+	'Consume #3 #1 of #2' => 'Consumir #3 #1 de #2',
+	'Added #1 #2 of #3 to stock' => 'Añadido #1 #2 de #3 al stock',
+	'Stock amount of #1 is now #2 #3' => 'La cantidad de stock de #1 es ahora #2 #3',
+	'Tracked execution of chore #1 on #2' => 'Registrada ejecución de tarea del hogar #1 en #2',
+	'Tracked charge cycle of battery #1 on #2' => 'Registrado ciclo de carga de la pila #1 en #2',
+	'Consume all #1 which are currently in stock' => 'Consumir todo #1 que está en stock',
+	'All' => 'Todo',
+	'Track charge cycle of battery #1' => 'Registrar ciclo de carga de la pila #1',
+	'Track execution of chore #1' => 'Registrar ejecución de tarea del hogar #1',
+	'Filter by location' => 'Filtrar por lugar',
+	'Search' => 'Buscar',
+	'Not logged in' => 'Sesión no iniciada',
+	'You have to select a product' => 'Has de seleccionar un producto',
+	'You have to select a chore' => 'Has de seleccionar una tarea del hogar',
+	'You have to select a battery' => 'Has de seleccionar una pila',
+	'A name is required' => 'Es necesario un nombre',
+	'A location is required' => 'Es necesario un lugar',
+	'The amount cannot be lower than #1' => 'La cantidad no puede ser menor a #1',
+	'This cannot be negative' => 'Esto no puede ser negativo',
+	'A quantity unit is required' => 'Es necesaria una unidad',
+	'A period type is required' => 'Es necesario un tipo de periodo',
+	'A best before date is required' => 'A best before date is required',
+	'Settings' => 'Configuración',
+	'This can only be before now' => 'Sólo puede ser antes que ahora',
+	'Calendar' => 'Calendario',
+	'Recipes' => 'Recetas',
+	'Edit recipe' => 'Editar receta',
+	'New recipe' => 'Nueva receta',
+	'Ingredients list' => 'Lista de ingredientes',
+	'Add recipe ingredient' => 'Añadir ingrediente',
+	'Edit recipe ingredient' => 'Editar ingrediente',
+	'Are you sure to delete recipe "#1"?' => '¿Estás seguro de querer borrar la receta "#1"?',
+	'Are you sure to delete recipe ingredient "#1"?' => '¿Estás seguro de querer borrar el ingrediente "#1" de la receta?',
+	'Are you sure to empty the shopping list?' => '¿Estás seguro de querer borrar la lista de la compra?',
+	'Clear list' => 'Borrar lista',
+	'Requirements fulfilled' => 'Requerimientos completos',
+	'Put missing products on shopping list' => 'Añadir productos faltantes a la lista de la compra',
+	'Not enough in stock, #1 ingredients missing' => 'No hay suficiente stock, faltan #1 ingredientes',
+	'Enough in stock' => 'Suficiente stock',
+	'Not enough in stock, #1 ingredients missing but already on the shopping list' => 'No hay suficiente stock, faltan #1 ingredientes, pero están en la lista de la compra',
+	'Expand to fullscreen' => 'Pantalla completa',
+	'Ingredients' => 'Ingredientes',
+	'Preparation' => 'Preparación',
+	'Recipe' => 'Receta',
+	'Not enough in stock, #1 missing, #2 already on shopping list' => 'No hay suficiente stock, faltan #1, pero #2 están en la lista de la compra',
+	'Show notes' => 'Mostrar notas',
+	'Put missing amount on shopping list' => 'Añadir cantidades faltantes en la lista de la compra',
+	'Are you sure to put all missing ingredients for recipe "#1" on the shopping list?' => '¿Estás seguro de poner todos los ingredientes faltantes para la recepta "#1" en la lista de la compra?',
+	'Added for recipe #1' => 'Añadido para la receta #1',
+	'Manage users' => 'Administrar usuarios',
+	'User' => 'Usuario',
+	'Users' => 'Usuarios',
+	'Are you sure to delete user "#1"?' => '¿Estás seguro de borrar el usuario "#1"?',
+	'Create user' => 'Crear usuario',
+	'Edit user' => 'Editar usuario',
+	'First name' => 'Nombre',
+	'Last name' => 'Apellidos',
+	'A username is required' => 'Es necesario un nombre de usuario',
+	'Confirm password' => 'Confirma la contraseña',
+	'Passwords do not match' => 'Las contraseñas no coinciden',
+	'Change password' => 'Cambiar contraseña',
+	'Done by' => 'Hecho el',
+	'Last done by' => 'Último hecho el',
+	'Unknown' => 'Desconocido',
+	'Filter by chore' => 'Filtrar por tarea del hogar',
+	'Chores journal' => 'Diario de tareas del hogar',
+	'0 means suggestions for the next charge cycle are disabled' => '0 significa que las sugerencias para el siguiente ciclo de carga estarán deshabilitadas',
+	'Charge cycle interval (days)' => 'Intervalo de ciclo de carga (días)',
+	'Last price' => 'Último precio',
+	'Price history' => 'Histórico de precios',
+	'No price history available' => 'No hay histórico de precios disponible',
+	'Price' => 'Precio',
+	'in #1 per purchase quantity unit' => 'en #1 por unidad de compra',
+	'The price cannot be lower than #1' => 'El precio no puede ser menor que #1',
+	'#1 product expires within the next #2 days' => '#1 producto caduca en los próximos #2 días',
+	'#1 product is already expired' => '#1 producto está ya caducado',
+	'#1 product is below defined min. stock amount' => '#1 producto está por debajo de la min. cantidad de stock',
+	'Unit' => 'Unidad',
+	'Units' => 'Unidades',
+	'#1 chore is due to be done within the next #2 days' => '#1 tarea del hogar vence en los próximos #2 días',
+	'#1 chore is overdue to be done' => '#1 tarea del hogar está vencida',
+	'#1 battery is due to be charged within the next #2 days' => '#1 pila debe ser cargada en los próximos #2 días',
+	'#1 battery is overdue to be charged' => '#1 pila ha vencido para ser cargada',
+	'#1 unit was automatically added and will apply in addition to the amount entered here' => '#1 unidad se ha añadido automáticamente y se aplicará además de la cantidad indicada aquí',
+	'in singular form' => 'en singular',
+	'in plural form' => 'en plural',
+	'Never expires' => 'Nunca caduca',
+	'This cannot be lower than #1' => 'No puede ser menor que #1',
+	'-1 means that this product never expires' => '-1 significa que este producto nunca caduca',
+	'Quantity unit' => 'Unidad',
+	'Only check if a single unit is in stock (a different quantity can then be used above)' => 'Solo comprobar si una unidad está en stock (una cantidad diferente puede usarse arriba)',
+	'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)?' => '¿Estás seguro de consumir todos los ingredientes necesarios de la receta "#1" (los ingredientes marcados como "solo comprobar si una unidad está en stock" se ignorarán)?',
+	'Removed all ingredients of recipe "#1" from stock' => 'Eliminar todos los ingredientes de la recepta "#1" del stock',
+	'Consume all ingredients needed by this recipe' => 'Consumir todos los ingredientes necesarios para esta receta',
+	'Click to show technical details' => 'Haz click para mostrar detalles técnicos',
+	'Error while saving, probably this item already exists' => 'Error al gabar, probablemente este elemento ya existe',
+	'Error details' => 'Detalles del error',
+	'Tasks' => 'Tareas',
+	'Show done tasks' => 'Mostrar tareas completadas',
+	'Task' => 'Tarea',
+	'Due' => 'Vence',
+	'Assigned to' => 'Asignado a',
+	'Mark task "#1" as completed' => 'Marcar la tarea "#1" como completada',
+	'Uncategorized' => 'Sin categorizar',
+	'Task categories' => 'Categoría de tareas',
+	'Create task' => 'Crear tarea',
+	'A due date is required' => 'Es necesaria una fecha de vencimiento',
+	'Category' => 'Categoría',
+	'Edit task' => 'Editar tarea',
+	'Are you sure to delete task "#1"?' => '¿Estás seguro de borrar la tarea "#1"?',
+	'#1 task is due to be done within the next #2 days' => '#1 tarea vence en los próximos #2 días',
+	'#1 tasks are due to be done within the next #2 days' => '#1 tareas vencen en los próximos #2 días',
+	'#1 task is overdue to be done' => '#1 tarea está vencida',
+	'#1 tasks are overdue to be done' => '#1 tareas están vencidas',
+	'Edit task category' => 'Editar categoría de tarea',
+	'Create task category' => 'Crear categoría de tarea',
+	'Product groups' => 'Grupos de producto',
+	'Ungrouped' => 'Sin agrupar',
+	'Create product group' => 'Crear grupo de productos',
+	'Edit product group' => 'Editar grupos de producto',
+	'Product group' => 'Grupo de producto',
+	'Are you sure to delete product group "#1"?' => '¿Estás seguro de querer borrar el grupo de productos "#1"?',
+	'Stay logged in permanently' => 'Permanecer con la sesión iniciada',
+	'When not set, you will get logged out at latest after 30 days' => 'Si no está marcado, se cerrará la sesión como máximo en 30 días',
+	'Filter by status' => 'Filtrar por estado',
+	'Below min. stock amount' => 'Por debajo de la min. cantidad de stock',
+	'Expiring soon' => 'Caduca pronto',
+	'Already expired' => 'Ya caducado',
+	'Due soon' => 'Vence pronto',
+	'Overdue' => 'Vencido',
+	'View settings' => 'Ver configuración',
+	'Auto reload on external changes' => 'Autorecarga en cambios externos',
+	'Enable night mode' => 'Habilitar modo noche',
+	'Auto enable in time range' => 'Autohabilitar en una franja de tiempo',
+	'From' => 'Desde',
+	'in format' => 'en formato',
+	'To' => 'A',
+	'Time range goes over midnight' => 'La franja del tiempo atraviesa la media noche',
+	'Product picture' => 'Foto del producto',
+	'No file selected' => 'No hay fichero seleccionado',
+	'If you don\'t select a file, the current picture will not be altered' => 'Si no seleccionas un fichero, la imagen actual no cambiará',
+	'Delete' => 'Borrar',
+	'The current picture will be deleted when you save the product' => 'Se borrará la imagen actual si grabas el producto',
+	'Select file' => 'Seleccionar fichero',
+	'Image of product #1' => 'Imagen del producto #1',
+	'This product cannot be deleted because it is in stock, please remove the stock amount first.' => 'Este producto no se puede borrar porque está en stock, por favor, elimina el stock antes.',
+	'Delete not possible' => 'No es posible eliminar',
+	'Equipment' => 'Equipamiento',
+	'Instruction manual' => 'Manual de instrucciones',
+	'The selected equipment has no instruction manual' => 'El equipamiento seleccionado no tiene manual de instrucciones',
+	'Notes' => 'Notas',
+	'Edit equipment' => 'Editar equipamiento',
+	'Create equipment' => 'Crear equipamiento',
+	'If you don\'t select a file, the current instruction manual will not be altered' => 'Si no seleccionas un fichero, el manual de instrucciones actual no cambiará',
+	'No instruction manual available' => 'No hay manual de instrucciones disponible',
+	'The current instruction manual will be deleted when you save the equipment' => 'Se borrará el manual de instrucciones si grabas el equipamiento',
+	'No picture available' => 'No hay imagen disponible',
+	'Filter by product group' => 'Filtrar por grupo de producto',
+	'Presets for new products' => 'Configuraciones para nuevos productos',
+	'Included recipes' => 'Recetas incluidas',
+	'A recipe is required' => 'Es necesaria una receta',
+	'Add included recipe' => 'Añadir receta incluida',
+	'Edit included recipe' => 'Editar receta incluida',
+	'Group' => 'Grupo',
+	'This will be used as a headline to group ingredients together' => 'Esto se usará como titular del grupo de ingredientes',
+	'Journal' => 'Diario',
+	'Stock journal' => 'Diario de stock',
+	'Filter by product' => 'Filtrar por producto',
+	'Booking time' => 'Momento de reserva',
+	'Booking type' => 'Tipo de reserva',
+	'Undo booking' => 'Deshacer reserva',
+	'Undone on' => 'Deshecho el',
+	'Batteries journal' => 'Diario de pilas',
+	'Filter by battery' => 'Filtrar por pila',
+	'Undo charge cycle' => 'Deshacer el ciclo de carga',
+	'Undo chore execution' => 'Deshacer ejecución de tarea del hogar',
+	'Chore execution successfully undone' => 'Ejecución de tarea del hogar deshecha',
+	'Undo' => 'Deshacer',
+	'Booking successfully undone' => 'Reserva deshecha',
+	'Charge cycle successfully undone' => 'Ciclo de carga deshecho',
+	'This cannot be negative and must be an integral number' => 'No puede ser negativo y ha de ser un número entero',
+	'Disable stock fulfillment checking for this ingredient' => 'Deshabilitar comprobación de stock para este ingrediente',
+	'Add all list items to stock' => 'Añadir todos los elementos de la lista al stock',
+	'Add #3 #1 of #2 to stock' => 'Añadir #3 #1 de #2 al stock',
+	'Adding shopping list item #1 of #2' => 'Añadiendo elemento de la lista de la compra #1 a #2',
+	'Use a specific stock item' => 'Usar un elemento específico del stock',
+	'The first item in this list would be picked by the default rule which is "First expiring first, then first in first out"' => 'El primer elemento de esta lista sería elegido por la regla "primero lo primero a caducar, luego primero en llegar, primero en salir"',
+	'Mark #3 #1 of #2 as open' => 'Marcar #3 #1 de #2 como abierto',
+	'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)' => 'Cuando un producto es marcado como abierto, la fecha de caducidad se cambiará por hoy más esta cantidad de días (un valor de 0 deshabilita esto)',
+	'Default best before days after opened' => 'Días de consumo después de abierto por defecto',
+	'Marked #1 #2 of #3 as opened' => 'Marcado #1 #2 de #3 como abierto',
+	'Mark as opened' => 'Marcar como abierto',
+	'Expires on #1; Bought on #2' => 'Caduca el #1; comprado el #2',
+	'Not opened' => 'Sin abrir',
+	'Opened' => 'Abierto',
+	'Mark #3 #1 of #2 as open' => 'Marcar #3 #1 de #2 como abierto',
+	'#1 opened' => '#1 abierto',
+	'Product expires' => 'El producto caduca',
+	'Task due' => 'Vencimiento de tarea',
+	'Chore due' => 'Vencimiento de tarea del hogar',
+	'Battery charge cycle due' => 'Vencimiento de ciclo de carga',
+	'Show clock in header' => 'Mostrar reloj en la cabecera',
+	'Stock settings' => 'Configuración de stock',
+	'Shopping list to stock workflow' => 'Flujo de lista de la compra a stock',
+	'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' => 'Hacer automáticamente la reserva utilizando el último precio y cantidad del elemento de la lista de la compra, si el producto tiene valor en "días de consumo por defecto"',
+	'Skip' => 'Pasar',
+	'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?'
+);
--- a/localization/fr/demo_data.php
+++ b/localization/fr/demo_data.php
@@ -83,5 +83,8 @@ return array(
 	'Milliliter' => 'Millilitre',
 	'Bottom' => 'Dessous',
 	'Topping' => 'Garniture',
-	'French' => 'Français'
+	'French' => 'Français',
+	'Turkish' => 'Turkish',
+	'Spanish' => 'Spanish',
+	'Russian' => 'Russian'
 );
--- a/localization/fr/strings.php
+++ b/localization/fr/strings.php
@@ -47,7 +47,6 @@ return array(
 	'Charge cycles count' => 'Nombre de charges',
 	'Create shopping list item' => 'Créer une liste de courses',
 	'Edit shopping list item' => 'Modifier une liste de courses',
-	'#1 units were automatically added and will apply in addition to the amount entered here' => '#1 unités seront automatiquement ajoutées en plus de la quantité renseignée ici',
 	'Save' => 'Sauvegarder',
 	'Add' => 'Ajouter',
 	'Name' => 'Nom',
@@ -140,7 +139,7 @@ return array(
 	'This cannot be negative' => 'Ne peut être négatif',
 	'A quantity unit is required' => 'Un format est requis',
 	'A period type is required' => 'Un type de période est requis',
-	'A best before date is required and must be later than today' => 'Une date de péremption est requise et doit être supérieure à la date du jour',
+	'A best before date is required' => 'A best before date is required',
 	'Settings' => 'Paramètres',
 	'This can only be before now' => 'Ne peut être qu\'antérieur à maintenant',
 	'Calendar' => 'Calendrier',
@@ -260,7 +259,6 @@ return array(
 	'Product picture' => 'Photo du produit',
 	'No file selected' => 'Aucun fichier sélectionné',
 	'If you don\'t select a file, the current picture will not be altered' => 'Si vous ne sélectionnez pas de photo, l\'actuelle sera conservée',
-	'Current picture' => 'Photo actuelle',
 	'Delete' => 'Supprimer',
 	'The current picture will be deleted when you save the product' => 'La photo actuelle va être supprimée lors de la sauvegarde du produit',
 	'Select file' => 'Sélectionner un fichier',
@@ -274,7 +272,6 @@ return array(
 	'Edit equipment' => 'Modifier un équipement',
 	'Create equipment' => 'Créer un équipement',
 	'If you don\'t select a file, the current instruction manual will not be altered' => 'Si vous ne sélectionnez pas de fichier, le manuel actuel ne sera pas modifié',
-	'Current instruction manual' => 'Manuel d\'utilisation actuel',
 	'No instruction manual available' => 'Aucun manuel d\'utilisation disponible',
 	'The current instruction manual will be deleted when you save the equipment' => 'Le manuel d\'utilisation actuel sera supprimé lors de la sauvegarde de cet équipement',
 	'No picture available' => 'Aucune photo disponible',
@@ -326,5 +323,37 @@ return array(
 	'Stock settings' => 'Paramètres du stock',
 	'Shopping list to stock workflow' => 'Transition de la liste de courses vers le stock',
 	'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' => 'Réaliser automatiquement les achats en utilisant le dernier prix connu et la quantité indiquée dans la liste, si le premier a une date de péremption par défaut renseignée',
-	'Skip' => 'Passer'
+	'Skip' => 'Passer',
+	'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?'
 );
--- a/localization/it/demo_data.php
+++ b/localization/it/demo_data.php
@@ -39,41 +39,41 @@ return array(
 	'Alarm clock' => 'Sveglia',
 	'Heat remote control' => 'Termostato',
 	'Lawn mowed in the garden' => 'Prato falciato nel giardino',
-	'Some good snacks' => 'Some good snacks',
-	'Pizza dough' => 'Pizza dough',
-	'Sieved tomatoes' => 'Sieved tomatoes',
-	'Salami' => 'Salami',
+	'Some good snacks' => 'Alcuni buoni spuntini',
+	'Pizza dough' => 'Impasto per pizza',
+	'Sieved tomatoes' => 'Pomodori setacciati',
+	'Salami' => 'Salame',
 	'Toast' => 'Toast',
-	'Minced meat' => 'Minced meat',
+	'Minced meat' => 'Carne macinata',
 	'Pizza' => 'Pizza',
-	'Spaghetti bolognese' => 'Spaghetti bolognese',
+	'Spaghetti bolognese' => 'Spaghetti alla 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',
+	'English' => 'Inglese',
+	'German' => 'Tedesco',
+	'Italian' => 'Italiano',
+	'Demo in different language' => 'Demo in lingue diverse',
+	'This is the note content of the recipe ingredient' => 'Questo è il contenuto della nota dell\'ingrediente della ricetta',
+	'Demo User' => 'Utente Demo',
+	'Gram' => 'Grammo',
+	'Grams' => 'Grammi',
+	'Flour' => 'Farina',
 	'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',
+	'Sugar' => 'Zucchero',
+	'Home' => 'Casa',
+	'Life' => 'Vita',
+	'Projects' => 'Progetti',
+	'Repair the garage door' => 'Riparare la porta del garage',
+	'Fork and improve grocy' => 'Forka e migliora grocy',
+	'Find a solution for what to do when I forget the door keys' => 'Trova una soluzione per cosa fare quando dimentico le chiavi della porta',
+	'Sweets' => 'Dolci',
+	'Bakery products' => 'Prodotti da forno',
+	'Tinned food' => 'Cibo in scatola',
+	'Butchery products' => 'Prodotti della macelleria',
+	'Vegetables/Fruits' => 'Verdura/Frutta',
+	'Refrigerated products' => 'Prodotti refrigerati',
+	'Coffee machine' => 'Macchina per il caffè',
+	'Dishwasher' => 'Lavastoviglie',
+	'Liter' => 'Litro',
 	'Liters' => 'Litri',
 	'Bottle' => 'Bottiglia',
 	'Bottles' => 'Bottiglie',
@@ -82,6 +82,9 @@ return array(
 	'Milliliters' => 'Millilitri',
 	'Milliliter' => 'Millilitro',
 	'Bottom' => 'Parte inferiore',
-	'Topping' => 'Topping',
-	'French' => 'French'
+	'Topping' => 'Guarnizione',
+	'French' => 'Francese',
+	'Turkish' => 'Turkish',
+	'Spanish' => 'Spanish',
+	'Russian' => 'Russian'
 );
--- a/localization/it/stock_transaction_types.php
+++ b/localization/it/stock_transaction_types.php
@@ -1,8 +1,8 @@
 <?php

 return array(
-	'purchase' => 'Purchase',
-	'consume' => 'Consume',
-	'inventory-correction' => 'Inventory correction',
-	'product-opened' => 'Product opened'
+	'purchase' => 'Acquista',
+	'consume' => 'Consumare',
+	'inventory-correction' => 'Correzione dell\'inventario',
+	'product-opened' => 'Prodotto aperto'
 );
--- a/localization/it/strings.php
+++ b/localization/it/strings.php
@@ -47,7 +47,6 @@ return array(
 	'Charge cycles count' => 'Numero di ricariche',
 	'Create shopping list item' => 'Aggiungi un prodotto alla lista della spesa',
 	'Edit shopping list item' => 'Modifica un\'entrata della lista della spesa',
-	'#1 units were automatically added and will apply in addition to the amount entered here' => '#1 sono state aggiunte automaticamente',
 	'Save' => 'Salva',
 	'Add' => 'Aggiungi',
 	'Name' => 'Nome',
@@ -140,27 +139,27 @@ return array(
 	'This cannot be negative' => 'Il numero non può essere negativo',
 	'A quantity unit is required' => 'Inserisci un\'unità di misura',
 	'A period type is required' => 'Seleziona un tipo di ripetizione',
-	'A best before date is required and must be later than today' => 'A best before date is required and must be later than today',
-	'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',
+	'A best before date is required and must be later than today' => 'È necessaria una data di scadenza anticipata e deve essere successiva a quella di oggi',
+	'Settings' => 'Impostazioni',
+	'This can only be before now' => 'Questo può essere solo prima d\'ora',
+	'Calendar' => 'Calendario',
+	'Recipes' => 'Ricette',
+	'Edit recipe' => 'Modifica Ricetta',
+	'New recipe' => 'Nuova Ricetta',
+	'Ingredients list' => 'Lista Ingredienti',
+	'Add recipe ingredient' => 'Aggiungi l\'ingrediente della ricetta',
+	'Edit recipe ingredient' => 'Modifica l\'ingrediente della ricetta',
+	'Are you sure to delete recipe "#1"?' => 'Sei sicuro di voler eliminare la ricetta "# 1"?',
+	'Are you sure to delete recipe ingredient "#1"?' => 'Sei sicuro di voler eliminare l\'ingrediente della ricetta "# 1"?',
+	'Are you sure to empty the shopping list?' => 'Sei sicuro di svuotare la lista della spesa?',
+	'Clear list' => 'Pulisci lista',
+	'Requirements fulfilled' => 'Requisiti soddisfatti',
+	'Put missing products on shopping list' => 'Metti i prodotti mancanti nella lista della spesa',
+	'Not enough in stock, #1 ingredients missing' => 'Non abbastanza in magazzino, mancano gli ingredienti # 1',
+	'Enough in stock' => 'Abbastanza in magazzino',
+	'Not enough in stock, #1 ingredients missing but already on the shopping list' => 'Non abbastanza in magazzino, mancano gli ingredienti # 1 ma sono già nella lista della spesa',
+	'Expand to fullscreen' => 'Espandi a schermo intero',
+	'Ingredients' => 'Ingredienti',
 	'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',
@@ -260,7 +259,6 @@ return array(
 	'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',
-	'Current picture' => 'Current picture',
 	'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',
@@ -274,7 +272,6 @@ return array(
 	'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',
-	'Current instruction manual' => 'Current instruction manual',
 	'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',
@@ -326,5 +323,26 @@ return array(
 	'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'
+	'Skip' => 'Salta',
+	'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'
 );
--- a/localization/nl/chore_types.php
+++ b/localization/nl/chore_types.php
@@ -0,0 +1,6 @@
+<?php
+
+return array(
+	'manually' => 'Handmatig',
+	'dynamic-regular' => 'Dynamisch regelmatig'
+);
--- a/localization/nl/component_translations.php
+++ b/localization/nl/component_translations.php
@@ -0,0 +1,10 @@
+<?php
+
+return array(
+	'timeago_locale' => 'nl',
+	'timeago_nan' => 'NaN jaar',
+	'moment_locale' => 'nl',
+	'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' => 'nl-NL',
+	'fullcalendar_locale' => 'nl'
+);
--- a/localization/nl/demo_data.php
+++ b/localization/nl/demo_data.php
@@ -0,0 +1,89 @@
+<?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'
+);
--- a/localization/nl/stock_transaction_types.php
+++ b/localization/nl/stock_transaction_types.php
@@ -0,0 +1,8 @@
+<?php
+
+return array(
+	'purchase' => 'Aankoop',
+	'consume' => 'Consumeren',
+	'inventory-correction' => 'Voorraadcorrectie',
+	'product-opened' => 'Product geopend'
+);
--- a/localization/nl/strings.php
+++ b/localization/nl/strings.php
@@ -0,0 +1,348 @@
+<?php
+
+return array(
+	'Stock overview' => 'Voorraadoverzicht',
+	'#1 products expiring within the next #2 days' => '#1 producten vervallen binnen de volgende #2 dagen',
+	'#1 products are already expired' => '#1 producten zijn al verlopen',
+	'#1 products are below defined min. stock amount' => '#1 producten zijn onder gedefinieerde min. voorraad aantal',
+	'Product' => 'Product',
+	'Amount' => 'Aantal',
+	'Next best before date' => 'De eerstvolgende houdbaarheidsdatum',
+	'Logout' => 'Uitloggen',
+	'Chores overview' => 'Overzicht klusjes',
+	'Batteries overview' => 'Batterijen overzicht',
+	'Purchase' => 'Aankoop',
+	'Consume' => 'Consumeren',
+	'Inventory' => 'Voorraad',
+	'Shopping list' => 'Boodschappenlijst',
+	'Chore tracking' => 'Klusjes volgen',
+	'Battery tracking' => 'Batterij volgen',
+	'Products' => 'Producten',
+	'Locations' => 'Locaties',
+	'Quantity units' => 'Aantal eenheden',
+	'Chores' => 'Klusjes',
+	'Batteries' => 'Batterijen',
+	'Chore' => 'Klus',
+	'Next estimated tracking' => 'Next estimated tracking',
+	'Last tracked' => 'Laatst gevolgd',
+	'Battery' => 'Batterij',
+	'Last charged' => 'Laatst opgeladen',
+	'Next planned charge cycle' => 'Volgende geplande laadcyclus',
+	'Best before' => 'Houdbaar tot',
+	'OK' => 'OK',
+	'Product overview' => 'Productoverzicht',
+	'Stock quantity unit' => 'Voorraadhoeveelheidseenheid',
+	'Stock amount' => 'Voorraadhoeveelheid',
+	'Last purchased' => 'Laatst gekocht',
+	'Last used' => 'Laatst gebruikt',
+	'Spoiled' => 'Verspild',
+	'Barcode lookup is disabled' => 'Opzoeken op streepjescode is uitgeschakeld',
+	'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' => 'Nieuwe aantal',
+	'Note' => 'Notitie',
+	'Tracked time' => 'Bijgehouden tijd',
+	'Chore overview' => 'Overzicht klus',
+	'Tracked count' => 'Bijgehouden aantal',
+	'Battery overview' => 'Batterijoverzicht',
+	'Charge cycles count' => 'Aantal laadcycli',
+	'Create shopping list item' => 'Maak een item in de boodschappenlijst',
+	'Edit shopping list item' => 'Bewerk item in de boodschappenlijst',
+	'Save' => 'Opslaan',
+	'Add' => 'Toevoegen',
+	'Name' => 'Naam',
+	'Location' => 'Locatie',
+	'Min. stock amount' => 'Min. voorraadhoeveelheid',
+	'QU purchase' => 'QU purchase',
+	'QU stock' => 'QU stock',
+	'QU factor' => 'QU factor',
+	'Description' => 'Omschrijving',
+	'Create product' => 'Maak een product',
+	'Barcode(s)' => 'Barcode(s)',
+	'Minimum stock amount' => 'Minimale voorraadhoeveelheid',
+	'Default best before days' => 'Standaard houdbaarheidsdatum',
+	'Quantity unit purchase' => 'Aankoop aantal eenheden ',
+	'Quantity unit stock' => 'Voorraad aantal eenheden',
+	'Factor purchase to stock quantity unit' => 'Factor purchase to stock quantity unit',
+	'Create location' => 'Maak een locatie',
+	'Create quantity unit' => 'Maak eenheidseenheid',
+	'Period type' => 'Periode type',
+	'Period days' => 'Periode dagen',
+	'Create chore' => 'Create chore',
+	'Used in' => 'Gebruikt in',
+	'Create battery' => 'Maak een batterij',
+	'Edit battery' => 'Edit battery',
+	'Edit chore' => 'Edit chore',
+	'Edit quantity unit' => 'Edit quantity unit',
+	'Edit product' => 'Edit product',
+	'Edit location' => 'Wijzig locatie',
+	'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"?' => 'Weet u zeker dat u locatie "#1" wilt verwijderen?',
+	'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' => 'Filteren op locatie',
+	'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' => 'Een locatie is verplicht',
+	'The amount cannot be lower than #1' => 'The amount cannot be lower than #1',
+	'This cannot be negative' => 'Dit kan niet negatief zijn',
+	'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 and must be later than today' => 'A best before date is required and must be later than today',
+	'Settings' => 'Instellingen',
+	'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' => 'Beheer gebruikers',
+	'User' => 'Gebruiker',
+	'Users' => 'Gebruikers',
+	'Are you sure to delete user "#1"?' => 'Are you sure to delete user "#1"?',
+	'Create user' => 'Create user',
+	'Edit user' => 'Bewerk gebruiker',
+	'First name' => 'Voornaam',
+	'Last name' => 'Achternaam',
+	'A username is required' => 'een gebruikersnaam is verplicht',
+	'Confirm password' => 'Bevestig wachtwoord',
+	'Passwords do not match' => 'Wachtwoorden komen niet overeen',
+	'Change password' => 'Wachtwoord wijzigen',
+	'Done by' => 'Gedaan door',
+	'Last done by' => 'Laatst gedaan door',
+	'Unknown' => 'Onbekend',
+	'Filter by chore' => 'Filter op klus',
+	'Chores journal' => 'Klusjesjournaal',
+	'0 means suggestions for the next charge cycle are disabled' => '0 betekent dat suggesties voor de volgende laadcyclus zijn uitgeschakeld',
+	'Charge cycle interval (days)' => 'Laadcyclusinterval (dagen)',
+	'Last price' => 'Laatste prijs',
+	'Price history' => 'Prijs geschiedenis',
+	'No price history available' => 'Geen prijsgeschiedenis beschikbaar',
+	'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' => 'Groep',
+	'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' => 'Geopend',
+	'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' => 'Toon klok in koptekst',
+	'Stock settings' => 'Voorraadinstellingen',
+	'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' => 'Overslaan',
+	'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'
+);
--- a/localization/no/demo_data.php
+++ b/localization/no/demo_data.php
@@ -83,5 +83,8 @@ return array(
 	'Milliliter' => 'Milliliter',
 	'Bottom' => 'Bunn',
 	'Topping' => 'Topping',
-	'French' => 'Fransk'
+	'French' => 'Fransk',
+	'Turkish' => 'Turkish',
+	'Spanish' => 'Spanish',
+	'Russian' => 'Russian'
 );
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bernd Bestel	a9c0539305	Updated version.json	2019-03-10 16:29:02 +01:00
Bernd Bestel	5b304c5e97	Added new changelog and update translations	2019-03-10 16:27:34 +01:00
Bernd Bestel	1b26a6277b	Make demo product locations a little bit more realistic	2019-03-10 16:18:24 +01:00
Bernd Bestel	353a65d41c	Tried to fix inventory form validation again (closes #167 )	2019-03-10 16:08:15 +01:00
Bernd Bestel	bfcd05473a	Allow best before date on purchase/inventory to be today or in the past, but display a hint when so (closes #172 )	2019-03-10 16:02:13 +01:00
Bernd Bestel	3d485d4850	Fixed datetimepicker had no validation message displayed (references #172 )	2019-03-10 15:40:19 +01:00
Bernd Bestel	9d02fbc13c	Again some changes for the new product-by-barcode API method (references #171 )	2019-03-10 14:53:06 +01:00
Bernd Bestel	27ba2bfd55	Fixed display errors when consuming partial amounts from stock overview page (fixes #170 )	2019-03-10 14:10:25 +01:00
Bernd Bestel	61f582554f	Return a proper API response when booking amount for consume/open is > current stock amount (references #170 )	2019-03-10 13:50:28 +01:00
Bernd Bestel	75241fc61f	Just some changes for the new product-by-barcode API method (references #171 )	2019-03-10 13:43:58 +01:00
Bernd Bestel	91289588b5	Merge pull request #171 from matejdro/barcode_fetch Add fetch by barcode API method	2019-03-10 13:28:36 +01:00
Matej Drobnič	3f4a5cc0d6	Add fetch by barcode API method	2019-03-10 12:20:31 +01:00
Bernd Bestel	e693460894	Finalized next version	2019-03-09 17:19:02 +01:00
Bernd Bestel	47a6260d27	Show the plural form of stock QU unit when showing purchase to stock conversion factor on purchase page when QU units are different (references #169 )	2019-03-09 17:04:34 +01:00
Bernd Bestel	bfd29def8d	Show purchase to stock conversion factor on purchase page when QU units are different (closes #169 )	2019-03-09 17:00:57 +01:00
Bernd Bestel	cd0ca4a67c	Prepared next release	2019-03-09 16:42:46 +01:00
Bernd Bestel	659d60b235	Make it possible to show the changelog directly via /about?tab=changelog	2019-03-09 16:25:23 +01:00
Bernd Bestel	8efcb79ed7	Updated screenshots	2019-03-09 16:18:20 +01:00
Bernd Bestel	5ba55823c9	Clarify that the CURRENCY setting should be the ISO 4217 code of the currency (to work with the JS toLocaleString function)	2019-03-09 16:04:03 +01:00
Bernd Bestel	6de4b120b3	Include changelog as markdown files and show it in the about dialog	2019-03-09 15:54:16 +01:00
Bernd Bestel	8fec262184	Added missing translation strings	2019-03-09 13:14:36 +01:00
Bernd Bestel	bd483ec8b0	Added a context menu to all stock overview page items	2019-03-09 13:11:50 +01:00
Bernd Bestel	4d215edbd0	Clear displayed quantity unit after purchase/consume/inventory bookings	2019-03-09 12:31:45 +01:00
Bernd Bestel	a3d4fd834f	Added a small right border to separate button columns in all tables better	2019-03-09 10:49:26 +01:00
Bernd Bestel	2d0c0bf34f	Fixed cancel button color in unknown product resolve dialog	2019-03-09 10:41:03 +01:00
Bernd Bestel	0f03420808	Removed unnecessary table column heading for button columns	2019-03-09 10:40:38 +01:00
Bernd Bestel	ba319dc6f1	Fixed equipment page edit/delete button icons were not visible	2019-03-08 22:22:05 +01:00
Bernd Bestel	c10890205c	Don't load not existing / not need localization JS files (this now closes #165 )	2019-03-08 22:18:42 +01:00
Bernd Bestel	643f6272e4	Fixed file name case sensitivity issue with tagmanager jQuery Plugin (references 165)	2019-03-08 22:13:47 +01:00
Bernd Bestel	cad5e9ef79	Tried to fix inventory form validation (references #167 )	2019-03-08 22:03:59 +01:00
Bernd Bestel	01fdfe1a0c	Fixed recipe ingredient notes were not displayed on the recipes page	2019-03-07 22:20:08 +01:00
Bernd Bestel	acd1e7337c	Prepared next release	2019-03-06 19:38:22 +01:00
Bernd Bestel	3586bf77c3	Added info about Feature Flags	2019-03-06 19:37:55 +01:00
Bernd Bestel	ff886fea61	Fixed termination after first command	2019-03-06 19:29:17 +01:00
Bernd Bestel	5bd00d8be7	Only download at least 90 percent completed translation files from Transifex	2019-03-06 19:25:35 +01:00
Bernd Bestel	9f36a599a4	Changed the about dialog slightly	2019-03-06 19:23:53 +01:00
Bernd Bestel	ff15e81abe	Fixed a rounding regarding stock amount comparison when a (scaled) recipe needs a decimal amount (closes #164 )	2019-03-06 19:05:32 +01:00
Bernd Bestel	e8b471f572	Fixed termination after first command	2019-03-06 18:42:51 +01:00
Bernd Bestel	2d8ad24887	Implemented that included recipes can have a serving amount (closes #163 and references #127 )	2019-03-05 23:45:04 +01:00
Bernd Bestel	45db9ff90c	Added scripts for Transifex upload/download & updated translations	2019-03-05 21:22:54 +01:00
Bernd Bestel	c813a6500d	Removed embedded binary tools - not needed to be in the repo here	2019-03-05 21:11:15 +01:00
Bernd Bestel	1077149784	Hide the form validation feedback icons introduced in Bootstrap 4.2.0 - a colored border is enough	2019-03-05 20:15:29 +01:00
Bernd Bestel	e08dfb408c	Reorganized dev scripts and tools	2019-03-05 19:54:38 +01:00
Bernd Bestel	fcdeda91d9	Show the iCal sharing link instead of directly open it (references #141 )	2019-03-05 19:36:14 +01:00
Bernd Bestel	4932b9c6d2	Improved recipe header display on small screens	2019-03-05 19:22:16 +01:00
Bernd Bestel	7f2942d414	Also filter gallery items when searching for recipes (references #147 )	2019-03-05 19:17:10 +01:00
Bernd Bestel	3a1c5efcfd	Fix gallery tab was not selected by query parameter (references #147 )	2019-03-05 18:04:16 +01:00
Bernd Bestel	816eb03147	Added a "recipe gallery" view (closes #147 )	2019-03-05 17:59:33 +01:00
Bernd Bestel	8504429f5f	Implemented tare weight handling (closes #132 )	2019-03-05 17:51:50 +01:00
Bernd Bestel	90291fdbca	Added possibility to export the calendar in iCal format (closes #141 )	2019-03-04 17:44:48 +01:00
Bernd Bestel	77b0bc675c	Varios small UI changes / improve UI consistency	2019-03-04 17:43:12 +01:00
Bernd Bestel	8020f92d6b	Track on consume for which recipe it was (closes #64 and references #64 )	2019-03-03 18:20:06 +01:00
Bernd Bestel	38825c70da	Added missing translations strings & pulled translations from Transifex	2019-03-03 17:01:35 +01:00
Bernd Bestel	bb5daa5f8b	Display total cost of recipes based on last purchase prices (closes #128 )	2019-03-03 16:33:48 +01:00
Bernd Bestel	8c11d0f15d	Add an option per recipe to not check against the shopping list when adding missing recipe ingredients, only against stock (closes #154 )	2019-03-03 15:23:39 +01:00
Bernd Bestel	5b544f76a5	Merge pull request #160 from d-Rickyy-b/patch-1 FIX: Typo in config-dist.php	2019-03-03 15:00:29 +01:00
Bernd Bestel	6f93da9b5f	Only list missing products in the "recipe put everything on the shopping list"-dialog (references #125 )	2019-03-03 14:57:36 +01:00
Bernd Bestel	e9ef7ea6d8	Allow recipe ingredients to be ignored when putting them on the shopping list (closes #125 )	2019-03-03 14:49:46 +01:00
Rico	54a23019b8	FIX: Typo in config-dist.php	2019-03-03 14:47:38 +01:00
Bernd Bestel	89ad25c904	Implemented scalable recipes (closes #127 )	2019-03-03 13:27:10 +01:00
Bernd Bestel	ee38d626aa	Added all application icon variants (closes #159 )	2019-03-02 08:56:53 +01:00
Bernd Bestel	40b60bed85	Added apple-touch-icon tag (references #159 )	2019-03-01 22:37:15 +01:00
Bernd Bestel	b89643ddb1	Allow different locations per product in stock (closes #124 ) Kind of basic for now, a different location can be set on purchase, the filters on the stock overview page handles different locations	2019-03-01 20:25:01 +01:00
Bernd Bestel	32e878afc9	Added feature flags to disable/hide parts not needed (closes #157 ) grocy was initally about stock management, so this is always enabled, the rest can be disabled	2019-03-01 19:33:33 +01:00
Bernd Bestel	9974305ad4	Hide relative date when clearing the datetimepicker (this now closes #143 )	2019-02-09 14:48:13 +01:00
Bernd Bestel	a3b2d03d68	Fixed datetimepicker only worked once when not selecting a date References #143 Using a self-patched version of tempusdominus/bootstrap-4 for now, see `2cf725fed9` and tempusdominus/bootstrap-4#34	2019-02-09 14:44:37 +01:00
Bernd Bestel	01e9e3f5ce	Move about dialog into separate view and add API endpoint for system info	2019-02-09 13:41:40 +01:00
Bernd Bestel	b5ac319a90	Pull translations from Transifex	2019-02-03 17:02:40 +01:00
Bernd Bestel	ad09630dbe	Make it possible to add pictures to recipes (closes #136 )	2019-01-26 20:06:01 +01:00
Bernd Bestel	03720940d4	Resize embedded iframes to content height (this should fix #130 )	2019-01-26 19:31:41 +01:00
Bernd Bestel	dfc05e0bec	Allow optional partial units of products in stock (closes #123 )	2019-01-26 14:17:02 +01:00
Bernd Bestel	9e139e2b73	Remove missing translation and improve database migration for #149	2019-01-26 14:12:18 +01:00
Bernd Bestel	5c622b9512	Fix product form was not validated when changing location (fixes #144 )	2019-01-26 13:13:38 +01:00
Bernd Bestel	eec3515b6d	Don't use a second hidden amount field for shopping list entries which were added by "Add missing products to shopping list" (fixes #149 )	2019-01-26 13:09:01 +01:00
Bernd Bestel	276bc94cc6	More improvements on the REST API (references #139 )	2019-01-21 22:13:42 +01:00
Bernd Bestel	bfa59dd29c	Rework API to be more RESTful (references #139 )	2019-01-19 14:51:51 +01:00
Chris Forkner	0ce8d706a6	API - A bit more RESTful (#140 ) * Restful routes * Change public/viewjs to match API routes * Move the GET and POST together. Fixed Typos. PUT for object/user edits. * Verb-less Generic Entity Interactions * Create Grocy.Api.Put * Create Grocy.Api.Delete * Fix Volatile Slim Error order in routes and adjust to english noun	2019-01-19 08:37:21 +01:00
Bernd Bestel	98d95f80df	Prepared next release	2019-01-10 21:02:11 +01:00
Bernd Bestel	a72afa7174	Forgot to save before pushing last commit...	2019-01-05 21:14:23 +01:00
Bernd Bestel	0d145bbf1e	Respect QU purchase factor when adding or comparing recipe ingredients to shopping list entries (fixes #131 )	2019-01-05 21:11:36 +01:00
Bernd Bestel	f6cf26009d	Better API response when request body is not valid JSON (references #126 )	2019-01-05 20:39:22 +01:00
Bernd Bestel	c042657dd8	Fix location edit form (edit did not work)	2019-01-05 20:38:27 +01:00
Bernd Bestel	43c9ab7734	Fixed a problem with newer SQLite versions (references and fixes #133 )	2019-01-05 20:28:21 +01:00
Bernd Bestel	f6649d51bd	Finalize loading speed improvements for all data tables (this now closes #120 ) This is a workaround for now. The tables are still DOM sourced because of too big dependencies between server side rendering and frontend JS code. The tables are initially load while tbody is hidden, this results in a speedup by around 65 %.	2019-01-05 20:06:35 +01:00
Bernd Bestel	2e265ac70a	Again some changes for stock overview table loading speed workaround (references #120 )	2019-01-05 16:27:26 +01:00
Bernd Bestel	30e54997b2	Workaround to improve stock overview table loading time (references #120 )	2019-01-05 14:27:40 +01:00
				`@@ -0,0 +1 @@`
				`- Added a login screen and switched to cookie/session based authentication instead of HTTP-basic-auth`
				`@@ -0,0 +1 @@`
				`- grocy is now fully localizable and ships by default with English and German translations`
				`@@ -0,0 +1 @@`
				`- Fixed login form didn't respect the configured BASE_URL`
				`@@ -0,0 +1 @@`
				`- Documented the REST API and data model, see the integrated instance of Swagger UI at [/api](https://demo-en.grocy.info/api)`
				`@@ -0,0 +1 @@`
				`- Added validation of all API requests and improved Swagger/OpenAPI description`
				`@@ -0,0 +1 @@`
				`- Basic features, mainly about a interface to record grocery purchases and consumptions`
				`@@ -0,0 +1 @@`
				`- Added a plugin system for looking up products against external services by barcode, see #6 for reference`
				`@@ -0,0 +1 @@`
				`- Added an option to not use URL rewriting (for webservers which, however, don't support URL rewriting)`
				`@@ -0,0 +1 @@`
				`- Bug fix for location filtering on stock overview page did not work in all browsers`