mirror of
https://github.com/grocy/grocy.git
synced 2026-03-28 07:39:25 +01:00
Merge branch 'master' into battriesoverview-1
This commit is contained in:
Manuel Worschech
commit
88a090f83a
|
|
@ -1,19 +1,5 @@
|
|||
> ⚠️ xxxBREAKING CHANGESxxx
|
||||
|
||||
> ❗ xxxImportant upgrade informationXXX
|
||||
|
||||
> 💡 xxxMinor upgrade informationXXX
|
||||
|
||||
### New feature: xxxx
|
||||
|
||||
- xxx
|
||||
|
||||
### Stock
|
||||
|
||||
- Added a new product picker workflow "External barcode lookup (via plugin)"
|
||||
- This executes the configured barcode lookup plugin with the given barcode
|
||||
- If the lookup was successful, the product edit page of the created product is displayed, where the product setup can be completed (if required)
|
||||
- After that, the transaction is continued with that product
|
||||
- When using/scanning a stock entry Grocycode on the transfer page, the "Use specific stock item" dropdown (and "From location") is now also prefilled accordingly
|
||||
- Fixed that for the product's last price stock transactions with an empty or `0` price weren't ignored
|
||||
- Fixed that when copying a product, the field "Move on open" wasn't copied along
|
||||
|
|
@ -26,42 +12,15 @@
|
|||
|
||||
- Optimized that when creating a recipe, the desired serving amount is now initially prefilled by the recipe's base serving amount
|
||||
|
||||
### Meal plan
|
||||
|
||||
- xxx
|
||||
|
||||
### Chores
|
||||
|
||||
- xxx
|
||||
|
||||
### Calendar
|
||||
|
||||
- xxx
|
||||
|
||||
### Tasks
|
||||
|
||||
- xxx
|
||||
|
||||
### Batteries
|
||||
|
||||
- It's now possible to track any addtional info on a battery charge cycle by using Userfields (thanks @TheDodger)
|
||||
- => Configure the desired Userfields for the entity `battery_charge_cycles`
|
||||
- => The on a battery charge cycle tracking entered information is then visible on the corresponding battery charge cycle journal entry
|
||||
|
||||
### Equipment
|
||||
|
||||
- xxx
|
||||
|
||||
### Userfields
|
||||
|
||||
- xxx
|
||||
|
||||
### General
|
||||
|
||||
- Optimized that file uploads are not completely buffered in memory before writing them to disk (thanks @bbx0)
|
||||
- Optimized that file uploads are no longer completely buffered in memory before writing them to disk (thanks @bbx0)
|
||||
- Optimized top right corner menus icon spacing (thanks @TheDodger for the initial work on this)
|
||||
- Fixed again that some dialogs were not properly (too small) displayed (this time mostly affecting Chrome/Edge)
|
||||
|
||||
### API
|
||||
|
||||
- xxx
|
||||
- Fixed that table states (visible columns, sorting, column order and so on) could be reset to default after not accessing/using the corresponding page for a certain amount of time
|
||||
60
changelog/76_UNRELEASED_xxxx-xx-xx.md
Normal file
60
changelog/76_UNRELEASED_xxxx-xx-xx.md
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
> ⚠️ xxxBREAKING CHANGESxxx
|
||||
|
||||
> ❗ xxxImportant upgrade informationXXX
|
||||
|
||||
> 💡 xxxMinor upgrade informationXXX
|
||||
|
||||
### New feature: xxxx
|
||||
|
||||
- xxx
|
||||
|
||||
### Stock
|
||||
|
||||
- Added a new product picker workflow "External barcode lookup (via plugin)"
|
||||
- This executes the configured barcode lookup plugin with the given barcode
|
||||
- If the lookup was successful, the product edit page of the created product is displayed, where the product setup can be completed (if required)
|
||||
- After that, the transaction is continued with that product
|
||||
|
||||
### Shopping list
|
||||
|
||||
- xxx
|
||||
|
||||
### Recipes
|
||||
|
||||
- When self producing a product ("Produces product" recipe option) the name of the recipe is now added to the note field of the created stock entry
|
||||
|
||||
### Meal plan
|
||||
|
||||
- xxx
|
||||
|
||||
### Chores
|
||||
|
||||
- xxx
|
||||
|
||||
### Calendar
|
||||
|
||||
- xxx
|
||||
|
||||
### Tasks
|
||||
|
||||
- xxx
|
||||
|
||||
### Batteries
|
||||
|
||||
- xxx
|
||||
|
||||
### Equipment
|
||||
|
||||
- xxx
|
||||
|
||||
### Userfields
|
||||
|
||||
- xxx
|
||||
|
||||
### General
|
||||
|
||||
- xxx
|
||||
|
||||
### API
|
||||
|
||||
- xxx
|
||||
130
composer.lock
generated
130
composer.lock
generated
|
|
@ -120,16 +120,16 @@
|
|||
},
|
||||
{
|
||||
"name": "carbonphp/carbon-doctrine-types",
|
||||
"version": "3.1.0",
|
||||
"version": "3.2.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/CarbonPHP/carbon-doctrine-types.git",
|
||||
"reference": "a31d3358a2a5d6ae947df1691d1f321418a5f3d5"
|
||||
"reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/a31d3358a2a5d6ae947df1691d1f321418a5f3d5",
|
||||
"reference": "a31d3358a2a5d6ae947df1691d1f321418a5f3d5",
|
||||
"url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/18ba5ddfec8976260ead6e866180bd5d2f71aa1d",
|
||||
"reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -169,7 +169,7 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues",
|
||||
"source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/3.1.0"
|
||||
"source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/3.2.0"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -185,20 +185,20 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2023-12-10T15:33:53+00:00"
|
||||
"time": "2024-02-09T16:56:22+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/inflector",
|
||||
"version": "2.0.9",
|
||||
"version": "2.0.10",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/inflector.git",
|
||||
"reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65"
|
||||
"reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/inflector/zipball/2930cd5ef353871c821d5c43ed030d39ac8cfe65",
|
||||
"reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65",
|
||||
"url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc",
|
||||
"reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -260,7 +260,7 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/doctrine/inflector/issues",
|
||||
"source": "https://github.com/doctrine/inflector/tree/2.0.9"
|
||||
"source": "https://github.com/doctrine/inflector/tree/2.0.10"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -276,7 +276,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-01-15T18:05:13+00:00"
|
||||
"time": "2024-02-18T20:23:39+00:00"
|
||||
},
|
||||
{
|
||||
"name": "eluceo/ical",
|
||||
|
|
@ -1050,16 +1050,16 @@
|
|||
},
|
||||
{
|
||||
"name": "illuminate/bus",
|
||||
"version": "v10.43.0",
|
||||
"version": "v10.48.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/bus.git",
|
||||
"reference": "a183e52039cc4f54d712ea8639d99544fcd0d593"
|
||||
"reference": "33993b8f54e91b03fb5000e55693e146e7370763"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/bus/zipball/a183e52039cc4f54d712ea8639d99544fcd0d593",
|
||||
"reference": "a183e52039cc4f54d712ea8639d99544fcd0d593",
|
||||
"url": "https://api.github.com/repos/illuminate/bus/zipball/33993b8f54e91b03fb5000e55693e146e7370763",
|
||||
"reference": "33993b8f54e91b03fb5000e55693e146e7370763",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1099,20 +1099,20 @@
|
|||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2024-01-11T20:33:23+00:00"
|
||||
"time": "2024-02-23T15:38:25+00:00"
|
||||
},
|
||||
{
|
||||
"name": "illuminate/collections",
|
||||
"version": "v10.43.0",
|
||||
"version": "v10.48.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/collections.git",
|
||||
"reference": "221c1ee944cb20ed807a8a5e8668552d6ca736ff"
|
||||
"reference": "36651526fa6bb5445ffc6d51899d80291f8e0486"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/collections/zipball/221c1ee944cb20ed807a8a5e8668552d6ca736ff",
|
||||
"reference": "221c1ee944cb20ed807a8a5e8668552d6ca736ff",
|
||||
"url": "https://api.github.com/repos/illuminate/collections/zipball/36651526fa6bb5445ffc6d51899d80291f8e0486",
|
||||
"reference": "36651526fa6bb5445ffc6d51899d80291f8e0486",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1154,11 +1154,11 @@
|
|||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2024-01-22T13:55:20+00:00"
|
||||
"time": "2024-03-10T15:34:39+00:00"
|
||||
},
|
||||
{
|
||||
"name": "illuminate/conditionable",
|
||||
"version": "v10.43.0",
|
||||
"version": "v10.48.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/conditionable.git",
|
||||
|
|
@ -1204,7 +1204,7 @@
|
|||
},
|
||||
{
|
||||
"name": "illuminate/container",
|
||||
"version": "v10.43.0",
|
||||
"version": "v10.48.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/container.git",
|
||||
|
|
@ -1255,7 +1255,7 @@
|
|||
},
|
||||
{
|
||||
"name": "illuminate/contracts",
|
||||
"version": "v10.43.0",
|
||||
"version": "v10.48.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/contracts.git",
|
||||
|
|
@ -1303,16 +1303,16 @@
|
|||
},
|
||||
{
|
||||
"name": "illuminate/events",
|
||||
"version": "v10.43.0",
|
||||
"version": "v10.48.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/events.git",
|
||||
"reference": "8d84d6220a6b3446a0bf3e4138e2eb0e10792bb1"
|
||||
"reference": "a931bfa88edc6ac52c9abbfd7b769343d321d3eb"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/events/zipball/8d84d6220a6b3446a0bf3e4138e2eb0e10792bb1",
|
||||
"reference": "8d84d6220a6b3446a0bf3e4138e2eb0e10792bb1",
|
||||
"url": "https://api.github.com/repos/illuminate/events/zipball/a931bfa88edc6ac52c9abbfd7b769343d321d3eb",
|
||||
"reference": "a931bfa88edc6ac52c9abbfd7b769343d321d3eb",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1354,20 +1354,20 @@
|
|||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2023-10-30T00:59:35+00:00"
|
||||
"time": "2024-03-04T14:41:04+00:00"
|
||||
},
|
||||
{
|
||||
"name": "illuminate/filesystem",
|
||||
"version": "v10.43.0",
|
||||
"version": "v10.48.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/filesystem.git",
|
||||
"reference": "43cd2a29c96f447bad57332a66dac645f026b917"
|
||||
"reference": "592fb581a52fba43bf78c2e4b22db540c9f9f149"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/filesystem/zipball/43cd2a29c96f447bad57332a66dac645f026b917",
|
||||
"reference": "43cd2a29c96f447bad57332a66dac645f026b917",
|
||||
"url": "https://api.github.com/repos/illuminate/filesystem/zipball/592fb581a52fba43bf78c2e4b22db540c9f9f149",
|
||||
"reference": "592fb581a52fba43bf78c2e4b22db540c9f9f149",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1421,11 +1421,11 @@
|
|||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2024-01-30T03:11:34+00:00"
|
||||
"time": "2024-03-11T21:45:53+00:00"
|
||||
},
|
||||
{
|
||||
"name": "illuminate/macroable",
|
||||
"version": "v10.43.0",
|
||||
"version": "v10.48.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/macroable.git",
|
||||
|
|
@ -1471,7 +1471,7 @@
|
|||
},
|
||||
{
|
||||
"name": "illuminate/pipeline",
|
||||
"version": "v10.43.0",
|
||||
"version": "v10.48.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/pipeline.git",
|
||||
|
|
@ -1519,16 +1519,16 @@
|
|||
},
|
||||
{
|
||||
"name": "illuminate/support",
|
||||
"version": "v10.43.0",
|
||||
"version": "v10.48.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/support.git",
|
||||
"reference": "6edb9350a0d13be5cea52718280e0025d3957895"
|
||||
"reference": "980d80017e859c8b1720892d952516e8c0b6708f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/support/zipball/6edb9350a0d13be5cea52718280e0025d3957895",
|
||||
"reference": "6edb9350a0d13be5cea52718280e0025d3957895",
|
||||
"url": "https://api.github.com/repos/illuminate/support/zipball/980d80017e859c8b1720892d952516e8c0b6708f",
|
||||
"reference": "980d80017e859c8b1720892d952516e8c0b6708f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1586,20 +1586,20 @@
|
|||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2024-01-29T14:56:21+00:00"
|
||||
"time": "2024-03-11T21:46:45+00:00"
|
||||
},
|
||||
{
|
||||
"name": "illuminate/view",
|
||||
"version": "v10.43.0",
|
||||
"version": "v10.48.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/illuminate/view.git",
|
||||
"reference": "0e7f86ec6043bd161feb2ddfaa6427b57fefc81b"
|
||||
"reference": "504d55e0f2d90c75588627e6a77a4d1228cf1a02"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/illuminate/view/zipball/0e7f86ec6043bd161feb2ddfaa6427b57fefc81b",
|
||||
"reference": "0e7f86ec6043bd161feb2ddfaa6427b57fefc81b",
|
||||
"url": "https://api.github.com/repos/illuminate/view/zipball/504d55e0f2d90c75588627e6a77a4d1228cf1a02",
|
||||
"reference": "504d55e0f2d90c75588627e6a77a4d1228cf1a02",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1640,7 +1640,7 @@
|
|||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2024-01-09T19:24:03+00:00"
|
||||
"time": "2024-03-12T16:33:42+00:00"
|
||||
},
|
||||
{
|
||||
"name": "interficieis/php-barcode",
|
||||
|
|
@ -3063,16 +3063,16 @@
|
|||
},
|
||||
{
|
||||
"name": "slim/slim",
|
||||
"version": "4.12.0",
|
||||
"version": "4.13.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/slimphp/Slim.git",
|
||||
"reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18"
|
||||
"reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/slimphp/Slim/zipball/e9e99c2b24398b967841c6c4c3048622cc7e2b18",
|
||||
"reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18",
|
||||
"url": "https://api.github.com/repos/slimphp/Slim/zipball/038fd5713d5a41636fdff0e8dcceedecdd17fc17",
|
||||
"reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -3081,7 +3081,7 @@
|
|||
"php": "^7.4 || ^8.0",
|
||||
"psr/container": "^1.0 || ^2.0",
|
||||
"psr/http-factory": "^1.0",
|
||||
"psr/http-message": "^1.1",
|
||||
"psr/http-message": "^1.1 || ^2.0",
|
||||
"psr/http-server-handler": "^1.0",
|
||||
"psr/http-server-middleware": "^1.0",
|
||||
"psr/log": "^1.1 || ^2.0 || ^3.0"
|
||||
|
|
@ -3089,19 +3089,19 @@
|
|||
"require-dev": {
|
||||
"adriansuter/php-autoload-override": "^1.4",
|
||||
"ext-simplexml": "*",
|
||||
"guzzlehttp/psr7": "^2.5",
|
||||
"guzzlehttp/psr7": "^2.6",
|
||||
"httpsoft/http-message": "^1.1",
|
||||
"httpsoft/http-server-request": "^1.1",
|
||||
"laminas/laminas-diactoros": "^2.17",
|
||||
"laminas/laminas-diactoros": "^2.17 || ^3",
|
||||
"nyholm/psr7": "^1.8",
|
||||
"nyholm/psr7-server": "^1.0",
|
||||
"phpspec/prophecy": "^1.17",
|
||||
"phpspec/prophecy-phpunit": "^2.0",
|
||||
"nyholm/psr7-server": "^1.1",
|
||||
"phpspec/prophecy": "^1.19",
|
||||
"phpspec/prophecy-phpunit": "^2.1",
|
||||
"phpstan/phpstan": "^1.10",
|
||||
"phpunit/phpunit": "^9.6",
|
||||
"slim/http": "^1.3",
|
||||
"slim/psr7": "^1.6",
|
||||
"squizlabs/php_codesniffer": "^3.7"
|
||||
"squizlabs/php_codesniffer": "^3.9"
|
||||
},
|
||||
"suggest": {
|
||||
"ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
|
||||
|
|
@ -3174,7 +3174,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2023-07-23T04:54:29+00:00"
|
||||
"time": "2024-03-03T21:25:30+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/deprecation-contracts",
|
||||
|
|
@ -3469,16 +3469,16 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/translation",
|
||||
"version": "v6.4.3",
|
||||
"version": "v6.4.4",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/translation.git",
|
||||
"reference": "637c51191b6b184184bbf98937702bcf554f7d04"
|
||||
"reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/translation/zipball/637c51191b6b184184bbf98937702bcf554f7d04",
|
||||
"reference": "637c51191b6b184184bbf98937702bcf554f7d04",
|
||||
"url": "https://api.github.com/repos/symfony/translation/zipball/bce6a5a78e94566641b2594d17e48b0da3184a8e",
|
||||
"reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -3544,7 +3544,7 @@
|
|||
"description": "Provides tools to internationalize your application",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/translation/tree/v6.4.3"
|
||||
"source": "https://github.com/symfony/translation/tree/v6.4.4"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -3560,7 +3560,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-01-29T13:11:52+00:00"
|
||||
"time": "2024-02-20T13:16:58+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/translation-contracts",
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Luca RHK <luca@rhk-in.de>, 2020
|
||||
# Tobias Wolter <mumpfpuffel@gmail.com>, 2020
|
||||
# @RubenKelevra <ruben@freifunk-nrw.de>, 2021
|
||||
# Bernd Bestel <bernd@berrnd.de>, 2023
|
||||
# Bernd Bestel <bernd@berrnd.de>, 2024
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
|
|
@ -11,7 +11,7 @@ msgstr ""
|
|||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
|
||||
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
|
||||
"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2023\n"
|
||||
"Last-Translator: Bernd Bestel <bernd@berrnd.de>, 2024\n"
|
||||
"Language-Team: German (https://app.transifex.com/grocy/teams/93189/de/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
|
@ -851,7 +851,7 @@ msgid "Add this item to stock"
|
|||
msgstr "Diesen Eintrag zum Bestand hinzufügen"
|
||||
|
||||
msgid "Adding shopping list item %1$s of %2$s"
|
||||
msgstr "Bearbeite Einkausfzetteleintrag %1$s von %2$s"
|
||||
msgstr "Bearbeite Einkaufszetteleintrag %1$s von %2$s"
|
||||
|
||||
msgid "Use a specific stock item"
|
||||
msgstr "Einen bestimmten Bestandseintrag verwenden"
|
||||
|
|
@ -946,7 +946,7 @@ msgid "You have to select a recipe"
|
|||
msgstr "Ein Rezept muss ausgewählt werden"
|
||||
|
||||
msgid "Key type"
|
||||
msgstr "Schlusseltyp"
|
||||
msgstr "Schlüsseltyp"
|
||||
|
||||
msgid "Share/Integrate calendar (iCal)"
|
||||
msgstr "Kalender teilen/integrieren (iCal)"
|
||||
|
|
@ -1493,7 +1493,7 @@ msgid "Add to shopping list"
|
|||
msgstr "Zum Einkaufszettel hinzufügen"
|
||||
|
||||
msgid "Added %1$s of %2$s to the shopping list \"%3$s\""
|
||||
msgstr "%1$s %2$s dem Einkauszettel \"%3$s\" hinzugefügt"
|
||||
msgstr "%1$s %2$s dem Einkaufszettel \"%3$s\" hinzugefügt"
|
||||
|
||||
msgid "Output"
|
||||
msgstr "Ausgabe"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ msgstr ""
|
|||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: he_IL\n"
|
||||
"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
|
||||
"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;\n"
|
||||
"X-Domain: grocy/chore_assignment_types\n"
|
||||
|
||||
msgid "no-assignment"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ msgstr ""
|
|||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: he_IL\n"
|
||||
"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
|
||||
"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;\n"
|
||||
"X-Domain: grocy/chore_types\n"
|
||||
|
||||
msgid "manually"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ msgstr ""
|
|||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: he_IL\n"
|
||||
"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
|
||||
"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;\n"
|
||||
"X-Domain: grocy/component_translations\n"
|
||||
|
||||
msgid "moment_locale"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Translators:
|
||||
# Adi Zarko <kapkapon@gmail.com>, 2020
|
||||
# Netanel Lazarovich <natylaza89@gmail.com>, 2020
|
||||
# Yaron Shahrabani <sh.yaron@gmail.com>, 2023
|
||||
# Yaron Shahrabani <sh.yaron@gmail.com>, 2024
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
|
|
@ -10,13 +10,13 @@ msgstr ""
|
|||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
|
||||
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
|
||||
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>, 2023\n"
|
||||
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>, 2024\n"
|
||||
"Language-Team: Hebrew (Israel) (https://app.transifex.com/grocy/teams/93189/he_IL/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: he_IL\n"
|
||||
"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
|
||||
"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;\n"
|
||||
"X-Domain: grocy/demo_data\n"
|
||||
|
||||
msgid "Cookies"
|
||||
|
|
@ -186,7 +186,6 @@ msgid_plural "Grams"
|
|||
msgstr[0] "גרם"
|
||||
msgstr[1] "גרמים"
|
||||
msgstr[2] "גרמים"
|
||||
msgstr[3] "גרמים"
|
||||
|
||||
msgid "Flour"
|
||||
msgstr "קמח"
|
||||
|
|
@ -289,7 +288,6 @@ msgid_plural "Slices"
|
|||
msgstr[0] "פרוסה"
|
||||
msgstr[1] "פרוסות"
|
||||
msgstr[2] "פרוסות"
|
||||
msgstr[3] "פרוסות"
|
||||
|
||||
msgid "Example userentity"
|
||||
msgstr "יישות משתמש לדוגמה"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ msgstr ""
|
|||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: he_IL\n"
|
||||
"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
|
||||
"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;\n"
|
||||
"X-Domain: grocy/locales\n"
|
||||
|
||||
# Czech
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ msgstr ""
|
|||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: he_IL\n"
|
||||
"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
|
||||
"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;\n"
|
||||
"X-Domain: grocy/permissions\n"
|
||||
|
||||
# All permissions
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ msgstr ""
|
|||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: he_IL\n"
|
||||
"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
|
||||
"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;\n"
|
||||
"X-Domain: grocy/stock_transaction_types\n"
|
||||
|
||||
msgid "purchase"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Translators:
|
||||
# Yaron Shahrabani <sh.yaron@gmail.com>, 2023
|
||||
# Yaron Shahrabani <sh.yaron@gmail.com>, 2024
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
|
||||
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
|
||||
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>, 2023\n"
|
||||
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>, 2024\n"
|
||||
"Language-Team: Hebrew (Israel) (https://app.transifex.com/grocy/teams/93189/he_IL/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: he_IL\n"
|
||||
"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
|
||||
"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;\n"
|
||||
"X-Domain: grocy/strings\n"
|
||||
|
||||
msgid "Stock overview"
|
||||
|
|
@ -25,7 +25,6 @@ msgid_plural "%s products expiring"
|
|||
msgstr[0] "תוקפו של מוצר יפוג"
|
||||
msgstr[1] "תוקפם של %s מוצרים יפוג"
|
||||
msgstr[2] "תוקפם של %s מוצרים יפוג"
|
||||
msgstr[3] "תוקפם של %s מוצרים יפוג"
|
||||
|
||||
msgid "within the next day"
|
||||
msgid_plural "within the next %s days"
|
||||
|
|
@ -46,14 +45,12 @@ msgid_plural "%s products are overdue"
|
|||
msgstr[0] "התוקף של אחד המוצרים פג"
|
||||
msgstr[1] "התוקף של %s מוצרים פג"
|
||||
msgstr[2] "התוקף של %s מוצרים פג"
|
||||
msgstr[3] "התוקף של %s מוצרים פג"
|
||||
|
||||
msgid "%s product is below defined min. stock amount"
|
||||
msgid_plural "%s products are below defined min. stock amount"
|
||||
msgstr[0] "מוצר אחד אזל מתחת לכמות המלאי המזערית"
|
||||
msgstr[1] "%s מוצרים אזלו מעבר לכמות המלאי המזערית"
|
||||
msgstr[2] "%s מוצרים אזלו מעבר לכמות המלאי המזערית"
|
||||
msgstr[3] "%s מוצרים אזלו מעבר לכמות המלאי המזערית"
|
||||
|
||||
msgid "Product"
|
||||
msgstr "מוצר"
|
||||
|
|
@ -63,7 +60,6 @@ msgid_plural "%s Products"
|
|||
msgstr[0] "מוצר אחד"
|
||||
msgstr[1] "%s מוצרים"
|
||||
msgstr[2] "%s מוצרים"
|
||||
msgstr[3] "%s מוצרים"
|
||||
|
||||
msgid "Amount"
|
||||
msgstr "כמות"
|
||||
|
|
@ -472,7 +468,6 @@ msgid_plural ""
|
|||
msgstr[0] "אין מספיק במלאי, רכיב אחד חסר אבל כבר ברשימת הקניות"
|
||||
msgstr[1] "אין מספיק במלאי, %s רכיבים חסרים אבל כבר ברשימת הקניות"
|
||||
msgstr[2] "אין מספיק במלאי, %s רכיבים חסרים אבל כבר ברשימת הקניות"
|
||||
msgstr[3] "אין מספיק במלאי, %s רכיבים חסרים אבל כבר ברשימת הקניות"
|
||||
|
||||
msgid "Expand to fullscreen"
|
||||
msgstr "הרחבה למסך מלא"
|
||||
|
|
@ -577,35 +572,30 @@ msgid_plural "%s Units"
|
|||
msgstr[0] "יחידה אחת"
|
||||
msgstr[1] "%s יחידות"
|
||||
msgstr[2] "%s יחידות"
|
||||
msgstr[3] "%s יחידות"
|
||||
|
||||
msgid "%s chore is due to be done"
|
||||
msgid_plural "%s chores are due to be done"
|
||||
msgstr[0] "מטלה אחת אמורה להסתיים"
|
||||
msgstr[1] "%s מטלות אמורות להסתיים"
|
||||
msgstr[2] "%s מטלות אמורות להסתיים"
|
||||
msgstr[3] "%s מטלות אמורות להסתיים"
|
||||
|
||||
msgid "%s chore is overdue to be done"
|
||||
msgid_plural "%s chores are overdue to be done"
|
||||
msgstr[0] "מטלה אחת חרגה ממועד הסיום"
|
||||
msgstr[1] "%s מטלות חרגו ממועד הסיום"
|
||||
msgstr[2] "%s מטלות חרגו ממועד הסיום"
|
||||
msgstr[3] "%s מטלות חרגו ממועד הסיום"
|
||||
|
||||
msgid "%s battery is due to be charged"
|
||||
msgid_plural "%s batteries are due to be charged"
|
||||
msgstr[0] "סוללה אחת שיש לטעון בקרוב"
|
||||
msgstr[1] "%s סוללות שיש לטעון בקרוב"
|
||||
msgstr[2] "%s סוללות שיש לטעון בקרוב"
|
||||
msgstr[3] "%s סוללות שיש לטעון בקרוב"
|
||||
|
||||
msgid "%s battery is overdue to be charged"
|
||||
msgid_plural "%s batteries are overdue to be charged"
|
||||
msgstr[0] "סוללה אחת כבר אמורה הייתה להיטען"
|
||||
msgstr[1] "%s סוללות כבר היו אמורות להיטען"
|
||||
msgstr[2] "%s סוללות כבר היו אמורות להיטען"
|
||||
msgstr[3] "%s סוללות כבר היו אמורות להיטען"
|
||||
|
||||
msgid "in singular form"
|
||||
msgstr "בצורת יחיד"
|
||||
|
|
@ -1145,7 +1135,6 @@ msgid_plural "Not enough in stock, %s ingredients missing"
|
|||
msgstr[0] "אין מספיק במלאי, רכיב אחד חסר"
|
||||
msgstr[1] "אין מספיק במלאי, %s רכיבים חסרים"
|
||||
msgstr[2] "אין מספיק במלאי, %s רכיבים חסרים"
|
||||
msgstr[3] "אין מספיק במלאי, %s רכיבים חסרים"
|
||||
|
||||
msgid "Not enough in stock, but already on the shopping list"
|
||||
msgstr "אין מספיק במלאי, אבל כבר מופיע ברשימת הקניות"
|
||||
|
|
@ -1189,7 +1178,6 @@ msgid_plural "%s servings"
|
|||
msgstr[0] "מנה אחת"
|
||||
msgstr[1] "%s מנות"
|
||||
msgstr[2] "%s מנות"
|
||||
msgstr[3] "%s מנות"
|
||||
|
||||
msgid "Week costs"
|
||||
msgstr "עלויות שבועיות"
|
||||
|
|
@ -1380,8 +1368,6 @@ msgstr[1] ""
|
|||
"משמעות הדבר היא שהוצאת המשימה הבאה לפועל מתוזמנת ליום הנבחר כל חודשיים"
|
||||
msgstr[2] ""
|
||||
"משמעות הדבר היא שהוצאת המשימה הבאה לפועל מתוזמנת ליום הנבחר כל %s חודשים"
|
||||
msgstr[3] ""
|
||||
"משמעות הדבר היא שהוצאת המשימה הבאה לפועל מתוזמנת ליום הנבחר כל %s חודשים"
|
||||
|
||||
msgid "This means the next execution of this chore is not scheduled"
|
||||
msgstr "משמעות הדבר היא שההוצאה לפועל של המטלה הזאת לא תתוזמן"
|
||||
|
|
@ -1417,7 +1403,6 @@ msgid_plural "%s chores are assigned to me"
|
|||
msgstr[0] "מטלה אחת מוקצית אלי"
|
||||
msgstr[1] "%s מטלות מוקצות אלי"
|
||||
msgstr[2] "%s מטלות מוקצות אלי"
|
||||
msgstr[3] "%s מטלות מוקצות אלי"
|
||||
|
||||
msgid "Assigned to me"
|
||||
msgstr "מוקצה אלי"
|
||||
|
|
@ -1580,9 +1565,6 @@ msgstr[1] ""
|
|||
msgstr[2] ""
|
||||
"משמעות הדבר היא שהוצאת המשימה הבאה לפועל מתוזמנת כל %s שנים באותו היום (לפי "
|
||||
"תאריך ההתחלה)"
|
||||
msgstr[3] ""
|
||||
"משמעות הדבר היא שהוצאת המשימה הבאה לפועל מתוזמנת כל %s שנים באותו היום (לפי "
|
||||
"תאריך ההתחלה)"
|
||||
|
||||
msgid "Transfer"
|
||||
msgstr "העברה"
|
||||
|
|
@ -2077,7 +2059,6 @@ msgid_plural "%s products are due"
|
|||
msgstr[0] "תוקפו של מוצר אחד יפוג"
|
||||
msgstr[1] "תוקפם של %s מוצרים יפוג"
|
||||
msgstr[2] "תוקפם של %s מוצרים יפוג"
|
||||
msgstr[3] "תוקפם של %s מוצרים יפוג"
|
||||
|
||||
msgid "Due date"
|
||||
msgstr "תאריך סיום התוקף"
|
||||
|
|
@ -2090,7 +2071,6 @@ msgid_plural "%s products are expired"
|
|||
msgstr[0] "פג תוקפו של אחד המוצרים"
|
||||
msgstr[1] "תוקפם של %s מוצרים פג"
|
||||
msgstr[2] "תוקפם של %s מוצרים פג"
|
||||
msgstr[3] "תוקפם של %s מוצרים פג"
|
||||
|
||||
msgid "Expired"
|
||||
msgstr "התוקף פג"
|
||||
|
|
@ -2406,7 +2386,6 @@ msgid_plural "%s years"
|
|||
msgstr[0] "שנה"
|
||||
msgstr[1] "שנתיים"
|
||||
msgstr[2] "%s שנים"
|
||||
msgstr[3] "%s שנים"
|
||||
|
||||
msgid "Display product"
|
||||
msgstr "הצגת מוצר"
|
||||
|
|
@ -2492,14 +2471,12 @@ msgid_plural "%s chores are due to be done today"
|
|||
msgstr[0] "מטלה אמורה להסתיים היום"
|
||||
msgstr[1] "%s מטלות אמורות להסתיים היום"
|
||||
msgstr[2] "%s מטלות אמורות להסתיים היום"
|
||||
msgstr[3] "%s מטלות אמורות להסתיים היום"
|
||||
|
||||
msgid "%s battery is due to be charged today"
|
||||
msgid_plural "%s batteries are due to be charged today"
|
||||
msgstr[0] "סוללה אמורה להיטען היום"
|
||||
msgstr[1] "%s סוללות אמורות להיטען היום"
|
||||
msgstr[2] "%s סוללות אמורות להיטען היום"
|
||||
msgstr[3] "%s סוללות אמורות להיטען היום"
|
||||
|
||||
msgid "Set to 0 to hide due soon filters/highlighting"
|
||||
msgstr "0 מסתיר את סינון/הדגשת סיום קרב"
|
||||
|
|
@ -2729,7 +2706,6 @@ msgid_plural "Last %1$s days"
|
|||
msgstr[0] "היום האחרון"
|
||||
msgstr[1] "היומיים האחרונים"
|
||||
msgstr[2] "%1$s הימים האחרונים"
|
||||
msgstr[3] "%1$s הימים האחרונים"
|
||||
|
||||
msgid "This month"
|
||||
msgstr "החודש"
|
||||
|
|
@ -2768,7 +2744,6 @@ msgid_plural "This means %1$s labels will be printed"
|
|||
msgstr[0] "משמעות הדבר היא שתודפס תווית אחת"
|
||||
msgstr[1] "משמעות הדבר היא שתודפסנה %1$s תוויות"
|
||||
msgstr[2] "משמעות הדבר היא שתודפסנה %1$s תוויות"
|
||||
msgstr[3] "משמעות הדבר היא שתודפסנה %1$s תוויות"
|
||||
|
||||
msgid "External barcode lookup (via plugin)"
|
||||
msgstr "חיפוש ברקוד חיצוני (דרך תוסף)"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ msgstr ""
|
|||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: he_IL\n"
|
||||
"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
|
||||
"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;\n"
|
||||
"X-Domain: grocy/userfield_types\n"
|
||||
|
||||
# Text (single line)
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
# Pieter Vantorre, 2022
|
||||
# Luc Donderwinkel, 2022
|
||||
# vanhoof.tech, 2023
|
||||
# Matthijs <matthijs@spamkip.com>, 2023
|
||||
# Matthijs <matthijs@spamkip.com>, 2024
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
|
|
@ -40,7 +40,7 @@ msgstr ""
|
|||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-05-01T17:59:17+00:00\n"
|
||||
"PO-Revision-Date: 2019-05-01 17:42+0000\n"
|
||||
"Last-Translator: Matthijs <matthijs@spamkip.com>, 2023\n"
|
||||
"Last-Translator: Matthijs <matthijs@spamkip.com>, 2024\n"
|
||||
"Language-Team: Dutch (https://app.transifex.com/grocy/teams/93189/nl/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
|
@ -889,7 +889,7 @@ msgid "Mark %1$s of %2$s as open"
|
|||
msgstr "Markeer %1$s %2$s als geopend"
|
||||
|
||||
msgid "Marked %1$s of %2$s as opened"
|
||||
msgstr "%1$s %2$sgemarkeerd als geopend"
|
||||
msgstr "%1$s %2$s gemarkeerd als geopend"
|
||||
|
||||
msgid "Mark as opened"
|
||||
msgstr "Markeer als geopend"
|
||||
|
|
|
|||
|
|
@ -562,7 +562,7 @@ $(window).on('resize', function()
|
|||
|
||||
if (GetUriParam("embedded"))
|
||||
{
|
||||
window.parent.iFrameResize({ "checkOrigin": false, "warningTimeout": 0 }, "iframe.embed-responsive");
|
||||
window.parent.iFrameResize({ "checkOrigin": false, "warningTimeout": 0, "minHeight": 700 }, "iframe.embed-responsive");
|
||||
}
|
||||
|
||||
function WindowMessageBag(message, payload = null)
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ $.extend(true, $.fn.dataTable.defaults, {
|
|||
'scrollX': true,
|
||||
'colReorder': true,
|
||||
'stateSave': true,
|
||||
'stateDuration': 0,
|
||||
'stateSaveParams': function(settings, data)
|
||||
{
|
||||
data.search.search = "";
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ class RecipesService extends BaseService
|
|||
{
|
||||
$product = $this->getDatabase()->products()->where('id = :1', $productId)->fetch();
|
||||
$recipeResolvedRow = $this->getDatabase()->recipes_resolved()->where('recipe_id = :1', $recipeId)->fetch();
|
||||
$this->getStockService()->AddProduct($productId, $amount, null, StockService::TRANSACTION_TYPE_SELF_PRODUCTION, date('Y-m-d'), $recipeResolvedRow->costs_per_serving, null, null, $dummyTransactionId, $product->default_stock_label_type, true);
|
||||
$this->getStockService()->AddProduct($productId, $amount, null, StockService::TRANSACTION_TYPE_SELF_PRODUCTION, date('Y-m-d'), $recipeResolvedRow->costs_per_serving, null, null, $dummyTransactionId, $product->default_stock_label_type, true, $recipe->name);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"Version": "4.1.0",
|
||||
"ReleaseDate": "2024-02-09"
|
||||
"Version": "4.2.0",
|
||||
"ReleaseDate": "2024-03-15"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -747,9 +747,8 @@
|
|||
@endif
|
||||
@if($embedded)
|
||||
<script src="{{ $U('/packages/iframe-resizer/js/iframeResizer.contentWindow.js?v=', true) }}{{ $version}}"></script>
|
||||
@else
|
||||
<script src="{{ $U('/packages/iframe-resizer/js/iframeResizer.js?v=', true) }}{{ $version}}"></script>
|
||||
@endif
|
||||
<script src="{{ $U('/packages/iframe-resizer/js/iframeResizer.js?v=', true) }}{{ $version}}"></script>
|
||||
|
||||
<script src="{{ $U('/js/extensions.js?v=', true) }}{{ $version }}"></script>
|
||||
<script src="{{ $U('/js/grocy_menu_layout.js?v=', true) }}{{ $version }}"></script>
|
||||
|
|
|
|||
107
yarn.lock
107
yarn.lock
|
|
@ -29,9 +29,9 @@
|
|||
fsevents "2.3.3"
|
||||
|
||||
"@fontsource/open-sans@^5.0.0":
|
||||
version "5.0.22"
|
||||
resolved "https://registry.yarnpkg.com/@fontsource/open-sans/-/open-sans-5.0.22.tgz#ff5d4de6301e58a1da79acfc838eca71a631f663"
|
||||
integrity sha512-lN3A4prlcVPgLjlgwY+oMPalpyXPM/6DwaLr6LjqkjytjGIZTLBbInL+zTfcemSyMtTQklreETepGjjmtzlRHA==
|
||||
version "5.0.27"
|
||||
resolved "https://registry.yarnpkg.com/@fontsource/open-sans/-/open-sans-5.0.27.tgz#d9c18de6d1bc95e263df92ef77432ac3638c9a0b"
|
||||
integrity sha512-tFTqx2TE9srmM3pMEHldw0lTglqhKwFX6PVDEL0OF9xNT0x5W9brsezFHhV/U36pQV9So7S0vo4yVpnLzBBQew==
|
||||
|
||||
"@fortawesome/fontawesome-free@^6.1.1":
|
||||
version "6.5.1"
|
||||
|
|
@ -215,29 +215,37 @@ data-uri-to-buffer@0.0.3:
|
|||
resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz#18ae979a6a0ca994b0625853916d2662bbae0b1a"
|
||||
integrity sha512-Cp+jOa8QJef5nXS5hU7M1DWzXPEIoVR3kbV0dQuVGwROZg8bGf1DcCnkmajBTnvghTtSNMUdRrPjgaT6ZQucbw==
|
||||
|
||||
datatables.net-bs4@>=1.13.4, datatables.net-bs4@^1.10.22:
|
||||
version "1.13.8"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-1.13.8.tgz#7a28023437bd86c85070f373f96c87cf54e7012c"
|
||||
integrity sha512-9LQ4UMb28balB2xK9MhxbsDjUzAUjc0bNjxvtkysdMbb9FhNOTDkmt1I4ZzfiJiDMN8CH1vzZsgCh835LkX7SQ==
|
||||
datatables.net-bs4@>=1.11.0:
|
||||
version "2.0.2"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-2.0.2.tgz#d282637ac2bedd09ae9b56c4a44e1d718e6b6f36"
|
||||
integrity sha512-n1P/vkfLaGW7v+Nme1NnrwCSp/zl7Y5lHlK7KRBxfoPvUS/42ZChDUCA4v3yDPiH5DQmx8dJhCPI16O20DHZEg==
|
||||
dependencies:
|
||||
datatables.net "1.13.8"
|
||||
datatables.net "2.0.2"
|
||||
jquery ">=1.7"
|
||||
|
||||
datatables.net-bs4@^1.10.22, datatables.net-bs4@^1.13.0:
|
||||
version "1.13.11"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-1.13.11.tgz#b31b9006f1901746e6c835925523608bd0a29025"
|
||||
integrity sha512-1LnxzQDFKpwvBETc8wtUtQ+pUXhs6NJomNST5pRzzHAccckkj9rZeOp3mevKDnDJKuNhBM1Y0rIeZGylJnqh9A==
|
||||
dependencies:
|
||||
datatables.net "1.13.11"
|
||||
jquery "1.8 - 4"
|
||||
|
||||
datatables.net-colreorder-bs4@^1.5.2:
|
||||
version "1.7.0"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-colreorder-bs4/-/datatables.net-colreorder-bs4-1.7.0.tgz#55e4e53dd70126eec4bd15cc739dbc845233a0ba"
|
||||
integrity sha512-gKC9VHnLLvcRM2oVWvpAqfwGB6TPFTz7C7vozl51BvEvcV5N2GDVEt4rPYyVFuBFRF/wV3MMbfT3DRaJWRyatQ==
|
||||
version "1.7.2"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-colreorder-bs4/-/datatables.net-colreorder-bs4-1.7.2.tgz#53ea3150c3a34bf67e01f159f640f8fc2c9dc201"
|
||||
integrity sha512-iVlvHwD82ZCDuaDaAXsD6OukNjgWNe44+f0yu43a1bOwK1ncXYiBSohlEuIhynHnESexN2vg4saj4a0rEMNx+w==
|
||||
dependencies:
|
||||
datatables.net-bs4 ">=1.13.4"
|
||||
datatables.net-colreorder ">=1.6.2"
|
||||
datatables.net-bs4 "^1.13.0"
|
||||
datatables.net-colreorder "1.7.2"
|
||||
jquery ">=1.7"
|
||||
|
||||
datatables.net-colreorder@>=1.6.2, datatables.net-colreorder@^1.5.2:
|
||||
version "1.7.0"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-colreorder/-/datatables.net-colreorder-1.7.0.tgz#140bdd1b9fad902edaf89b0ba1b0bcd424c524f3"
|
||||
integrity sha512-Vyysfxe2kfjeuPJJMGRQ2jHVOfoadyBYKzizbOHzR2bhTVsIYjrbEhUA1H24TISE17SdR77X0RmcUvS/h/Bifw==
|
||||
datatables.net-colreorder@1.7.2, datatables.net-colreorder@^1.5.2:
|
||||
version "1.7.2"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-colreorder/-/datatables.net-colreorder-1.7.2.tgz#9806f165048daecb2fe93a482c744efc6e649c06"
|
||||
integrity sha512-F8TYMFXtWLtsjciwS7hkP/Fbp3XS6WHuHLc+iMFtQqiQmbMo/59GK7YSxKuxSoqTTJU/opaPXQYjODnIuNEc/g==
|
||||
dependencies:
|
||||
datatables.net ">=1.13.4"
|
||||
datatables.net "^1.13.0"
|
||||
jquery ">=1.7"
|
||||
|
||||
datatables.net-plugins@^1.10.20:
|
||||
|
|
@ -249,43 +257,50 @@ datatables.net-plugins@^1.10.20:
|
|||
datatables.net "^1.13.2"
|
||||
|
||||
datatables.net-rowgroup-bs4@^1.1.2:
|
||||
version "1.4.1"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-rowgroup-bs4/-/datatables.net-rowgroup-bs4-1.4.1.tgz#218e7bfdd864d3d72416e3b48c3bf36332c7e687"
|
||||
integrity sha512-T60aE7ehpkDyLW0OBudrC4g/hC265ilvgF+b4AmcwvEglxlSFhAabhRz9ZvfYrvFTCvh1hBtcLHBeN/D5KZHFA==
|
||||
version "1.5.0"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-rowgroup-bs4/-/datatables.net-rowgroup-bs4-1.5.0.tgz#31e5ad371f187c079df8dc4275ef8b441bf4cab2"
|
||||
integrity sha512-1CTXF2BsYwWYg3tjUw6cayRYsbt61DD3ms/8Evuz3/qrlKO6txdbp8OsmBNQJwT6qgEjPWx6tuGi8xdHGOey3A==
|
||||
dependencies:
|
||||
datatables.net-bs4 ">=1.13.4"
|
||||
datatables.net-rowgroup ">=1.3.1"
|
||||
datatables.net-bs4 ">=1.11.0"
|
||||
datatables.net-rowgroup "1.5.0"
|
||||
jquery ">=1.7"
|
||||
|
||||
datatables.net-rowgroup@>=1.3.1, datatables.net-rowgroup@^1.1.2:
|
||||
version "1.4.1"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-rowgroup/-/datatables.net-rowgroup-1.4.1.tgz#1ec81be4a0dbbad4f64964e228762072cd522ce0"
|
||||
integrity sha512-nwcQbh1IttKyEedmObOKnskvriis3DBKsBRpiSoZO3EvRlZ69wnW9WQhw9/WxPnOUjATO3gJ/n7DMrLoGsKdDA==
|
||||
datatables.net-rowgroup@1.5.0, datatables.net-rowgroup@^1.1.2:
|
||||
version "1.5.0"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-rowgroup/-/datatables.net-rowgroup-1.5.0.tgz#644b5fd7f7fc6fdb1bc4e42dfa0a9203740f31ca"
|
||||
integrity sha512-V/CLJu7rMjxwfhZAv59emZOPw58cwnYmd8NXTTJSnqBDgOZsaC9mtVo0ejBpdqvNw5WmMPy3AJceH+ay6JQ3hA==
|
||||
dependencies:
|
||||
datatables.net ">=1.13.4"
|
||||
datatables.net ">=1.11.0"
|
||||
jquery ">=1.7"
|
||||
|
||||
datatables.net-select-bs4@^1.3.1:
|
||||
version "1.7.0"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-select-bs4/-/datatables.net-select-bs4-1.7.0.tgz#002999dada54f115dd1de2c7e6707be0e45e3af2"
|
||||
integrity sha512-PAOAPVaIVxZ0FEk0BamIF4a3YVkln2swIM+be+w09OWRlUo8QXFY5LbImjZ9SdUInT7pCZfueBQh5oKSKesylg==
|
||||
version "1.7.1"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-select-bs4/-/datatables.net-select-bs4-1.7.1.tgz#3ddd63bd69426e3fd1bc20dfd7c019305d24ccb1"
|
||||
integrity sha512-iHG4C8RdJIpsGIGDCXofUflHN1fa2N0E83MZPuqQXh1ZBkeJzd700rnru2mJXbvFc+wM9vf0Xxr6C5YsYFprgA==
|
||||
dependencies:
|
||||
datatables.net-bs4 ">=1.13.4"
|
||||
datatables.net-select ">=1.6.2"
|
||||
datatables.net-bs4 "^1.13.0"
|
||||
datatables.net-select "1.7.1"
|
||||
jquery ">=1.7"
|
||||
|
||||
datatables.net-select@>=1.6.2, datatables.net-select@^1.3.1:
|
||||
version "1.7.0"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-select/-/datatables.net-select-1.7.0.tgz#a108752ee6109a49392d19fec7406c953be11665"
|
||||
integrity sha512-ps8eL8S2gUV7EdzMraw8mfQlHXpfuc8TC2onBxdk0snP8eizPe85VhpI3r4ULvPRTTI7vcViz8E7JV8aayA2lw==
|
||||
datatables.net-select@1.7.1, datatables.net-select@^1.3.1:
|
||||
version "1.7.1"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-select/-/datatables.net-select-1.7.1.tgz#1b309b1ff92c25e5ce4b9d5af19186bdf9b34597"
|
||||
integrity sha512-yC+GoBDVsnbaFTYKmZ2v5Bftc66zSZCYHbPYZb/ccdvxytEEudjc9R3wn6fgkOrVx3C2X/8keQc4a7EJvdOErg==
|
||||
dependencies:
|
||||
datatables.net ">=1.13.4"
|
||||
datatables.net "^1.13.0"
|
||||
jquery ">=1.7"
|
||||
|
||||
datatables.net@1.13.8, datatables.net@>=1.13.4, datatables.net@^1.10.22, datatables.net@^1.13.2:
|
||||
version "1.13.8"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.13.8.tgz#05a2fb5a036b0b65b66d1bb1eae0ba018aaea8a3"
|
||||
integrity sha512-2pDamr+GUwPTby2OgriVB9dR9ftFKD2AQyiuCXzZIiG4d9KkKFQ7gqPfNmG7uj9Tc5kDf+rGj86do4LAb/V71g==
|
||||
datatables.net@1.13.11, datatables.net@^1.10.22, datatables.net@^1.13.0, datatables.net@^1.13.2:
|
||||
version "1.13.11"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.13.11.tgz#e2a4c8b50553512f241ebfcbc078d74d551183b2"
|
||||
integrity sha512-AE6RkMXziRaqzPcu/pl3SJXeRa6fmXQG/fVjuRESujvkzqDCYEeKTTpPMuVJSGYJpPi32WGSphVNNY1G4nSN/g==
|
||||
dependencies:
|
||||
jquery "1.8 - 4"
|
||||
|
||||
datatables.net@2.0.2, datatables.net@>=1.11.0:
|
||||
version "2.0.2"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-2.0.2.tgz#50e5e8a392d9c0cf6c96c4e4228e4f50ced58128"
|
||||
integrity sha512-uQM+s1oXhpTajUw5DCxarpfAtQJMh0MKFCLZMCc+UWLWPg8ipe6L2zgDMbRC8n9UCwGVpHOwUYlQu2JU1/PhSg==
|
||||
dependencies:
|
||||
jquery ">=1.7"
|
||||
|
||||
|
|
@ -450,7 +465,7 @@ jquery-serializejson@^2.9.0:
|
|||
resolved "https://registry.yarnpkg.com/jquery-serializejson/-/jquery-serializejson-2.9.0.tgz#03e3764e3a4b42c1c5aae9f93d7f19320c5f35a6"
|
||||
integrity sha512-xR7rjl0tRKIVioV5lOkOSv7K8BHMvGzYzC7Ech1iAYuZiYf0ksEpLC8OqjA5VApXf/qn/49O9hTmW70+/EA0vA==
|
||||
|
||||
jquery@>=1.10, jquery@>=1.12.0, jquery@>=1.7, jquery@^3.6.0:
|
||||
"jquery@1.8 - 4", jquery@>=1.10, jquery@>=1.12.0, jquery@>=1.7, jquery@^3.6.0:
|
||||
version "3.7.1"
|
||||
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
|
||||
integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
|
||||
|
|
@ -659,9 +674,9 @@ summernote@^0.8.18:
|
|||
integrity sha512-W9RhjQjsn+b1s9xiJQgJbCiYGJaDAc9CdEqXo+D13WuStG8lCdtKaO5AiNiSSMJsQJN2EfGSwbBQt+SFE2B8Kw==
|
||||
|
||||
swagger-ui-dist@^5.2.0:
|
||||
version "5.11.3"
|
||||
resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.11.3.tgz#64c96e90b6a352e7b20a55b73b91fc0e0bed4f0a"
|
||||
integrity sha512-vQ+Pe73xt7vMVbX40L6nHu4sDmNCM6A+eMVJPGvKrifHQ4LO3smH0jCiiefKzsVl7OlOcVEnrZ9IFzYwElfMkA==
|
||||
version "5.12.0"
|
||||
resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.12.0.tgz#cc983711d38963aad1de8693fb19f9d8f7a74f80"
|
||||
integrity sha512-Rt1xUpbHulJVGbiQjq9yy9/r/0Pg6TmpcG+fXTaMePDc8z5WUw4LfaWts5qcNv/8ewPvBIbY7DKq7qReIKNCCQ==
|
||||
|
||||
tempusdominus-bootstrap-4@^5.39.2:
|
||||
version "5.39.2"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user