From 2f8b479fdd6f1bdf8d829dfa91e979311ce2a517 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 00:28:30 +0000 Subject: [PATCH 01/77] Bump @vue/cli-plugin-pwa from 5.0.4 to 5.0.8 in /vue Bumps [@vue/cli-plugin-pwa](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-pwa) from 5.0.4 to 5.0.8. - [Release notes](https://github.com/vuejs/vue-cli/releases) - [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-cli/commits/v5.0.8/packages/@vue/cli-plugin-pwa) --- updated-dependencies: - dependency-name: "@vue/cli-plugin-pwa" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vue/package.json | 2 +- vue/yarn.lock | 29 +++++++++++++++++++---------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/vue/package.json b/vue/package.json index e51a30fdc9..e7b5793fd2 100644 --- a/vue/package.json +++ b/vue/package.json @@ -48,7 +48,7 @@ "@typescript-eslint/parser": "^4.32.0", "@vue/cli-plugin-babel": "^5.0.4", "@vue/cli-plugin-eslint": "~5.0.4", - "@vue/cli-plugin-pwa": "^5.0.4", + "@vue/cli-plugin-pwa": "^5.0.8", "@vue/cli-plugin-typescript": "^5.0.4", "@vue/cli-service": "^5.0.4", "@vue/compiler-sfc": "^3.2.29", diff --git a/vue/yarn.lock b/vue/yarn.lock index 8d83a24415..f24b2e2213 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -11,6 +11,15 @@ event-pubsub "4.3.0" js-message "1.0.7" +"@achrinza/node-ipc@^9.2.5": + version "9.2.5" + resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz#29788e608ff41121f0543491da723b243266ac28" + integrity sha512-kBX7Ay911iXZ3VZ1pYltj3Rfu7Ow9H7sK4H4RSfWIfWR2JKNB40K808wppoRIEzE2j2hXLU+r6TJgCAliCGhyQ== + dependencies: + "@node-ipc/js-queue" "2.0.3" + event-pubsub "4.3.0" + js-message "1.0.7" + "@akryum/winattr@^3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@akryum/winattr/-/winattr-3.0.0.tgz#c345d49f8415583897e345729c12b3503927dd11" @@ -2077,12 +2086,12 @@ webpack "^5.54.0" yorkie "^2.0.0" -"@vue/cli-plugin-pwa@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-pwa/-/cli-plugin-pwa-5.0.4.tgz#e4a7cb79bf05e1156a2ebcfe7ef3f134a28864c4" - integrity sha512-Pim6hx2Lf9kqslhveQ65K+iZhSzDy+IvGidJnpYiwcE9bSgQKG9vPSBgH4qww4u57prXVC8WRbdwupZPEpNhEw== +"@vue/cli-plugin-pwa@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-pwa/-/cli-plugin-pwa-5.0.8.tgz#b4c55873d96ce6effa08e5b578fe1a5ec6c7fd10" + integrity sha512-MnD9Y6I3nX7c/NawpsJtbXaGFjI9LT5Az7IQjpshS65+yvuOcxV2j/tCjPTrja+zd1VmB4DZUhrfUU2exSBfGg== dependencies: - "@vue/cli-shared-utils" "^5.0.4" + "@vue/cli-shared-utils" "^5.0.8" html-webpack-plugin "^5.1.0" webpack "^5.54.0" workbox-webpack-plugin "^6.1.0" @@ -2176,12 +2185,12 @@ webpack-virtual-modules "^0.4.2" whatwg-fetch "^3.6.2" -"@vue/cli-shared-utils@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-5.0.4.tgz#e3f42575cb6b70e021272ef2c8bb52ca544ecf27" - integrity sha512-nfAsj8Nopu5sVHMBIaut/YL7NaJFVmTBSTJD7LM17jc5uytrM9JwiRtzCiv3JWRBG78Xdb/s2Xb/1YR4fkdmkQ== +"@vue/cli-shared-utils@^5.0.4", "@vue/cli-shared-utils@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-5.0.8.tgz#75fc96528eba2b1c7e33cb7e989a984ddef99c8a" + integrity sha512-uK2YB7bBVuQhjOJF+O52P9yFMXeJVj7ozqJkwYE9PlMHL1LMHjtCYm4cSdOebuPzyP+/9p0BimM/OqxsevIopQ== dependencies: - "@achrinza/node-ipc" "9.2.2" + "@achrinza/node-ipc" "^9.2.5" chalk "^4.1.2" execa "^1.0.0" joi "^17.4.0" From cf24e1014a778e57a3f8cbb7bf476fafad9ff90e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arne=20H=C3=BCffmeier?= Date: Thu, 1 Sep 2022 13:38:47 +0200 Subject: [PATCH 02/77] add two infos --- docs/install/manual.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/install/manual.md b/docs/install/manual.md index a98ceb3dec..e5772a3bf7 100644 --- a/docs/install/manual.md +++ b/docs/install/manual.md @@ -210,9 +210,12 @@ cd /var/www/recipes git pull # load envirtonment variables export $(cat /var/www/recipes/.env |grep "^[^#]" | xargs) +#install project requirements +/var/www/recipes/bin/pip3 install -r requirements.txt # migrate database bin/python3 manage.py migrate # collect static files +# To prevent later errors, it is advisable to perform these steps more frequently until the output "0 static files copied" appears. bin/python3 manage.py collectstatic --no-input bin/python3 manage.py collectstatic_js_reverse # change to frontend directory From 12ad6af8c3c449d35a356c679080b5b9ffeae787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arne=20H=C3=BCffmeier?= Date: Thu, 1 Sep 2022 13:45:49 +0200 Subject: [PATCH 03/77] fix path --- docs/install/manual.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/install/manual.md b/docs/install/manual.md index e5772a3bf7..5e058eb6db 100644 --- a/docs/install/manual.md +++ b/docs/install/manual.md @@ -211,7 +211,7 @@ git pull # load envirtonment variables export $(cat /var/www/recipes/.env |grep "^[^#]" | xargs) #install project requirements -/var/www/recipes/bin/pip3 install -r requirements.txt +bin/pip3 install -r requirements.txt # migrate database bin/python3 manage.py migrate # collect static files From 54acfe3e391d8305308529a08a48742adc5fa365 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Sep 2022 16:06:53 +0000 Subject: [PATCH 04/77] Bump workbox-routing from 6.5.3 to 6.5.4 in /vue Bumps [workbox-routing](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/googlechrome/workbox/releases) - [Commits](https://github.com/googlechrome/workbox/compare/v6.5.3...v6.5.4) --- updated-dependencies: - dependency-name: workbox-routing dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vue/package.json | 6 +++--- vue/yarn.lock | 35 +++++++++++++++++++++-------------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/vue/package.json b/vue/package.json index e51a30fdc9..a25fa450a3 100644 --- a/vue/package.json +++ b/vue/package.json @@ -18,7 +18,7 @@ "babel-core": "^6.26.3", "babel-loader": "^8.2.5", "bootstrap-vue": "^2.21.2", - "core-js": "^3.20.3", + "core-js": "^3.25.0", "html2pdf.js": "^0.10.1", "lodash": "^4.17.21", "mavon-editor": "^2.10.4", @@ -56,13 +56,13 @@ "babel-eslint": "^10.1.0", "eslint": "^7.28.0", "eslint-plugin-vue": "^8.7.1", - "typescript": "~4.7.2", + "typescript": "~4.8.2", "vue-cli-plugin-i18n": "^2.3.1", "webpack-bundle-tracker": "1.5.0", "workbox-expiration": "^6.3.0", "workbox-navigation-preload": "^6.0.2", "workbox-precaching": "^6.5.3", - "workbox-routing": "^6.5.0", + "workbox-routing": "^6.5.4", "workbox-strategies": "^6.2.4" }, "eslintConfig": { diff --git a/vue/yarn.lock b/vue/yarn.lock index 8d83a24415..4ed2876f3b 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -4349,15 +4349,10 @@ core-js@^2.4.0, core-js@^2.5.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== -core-js@^3.20.3, core-js@^3.6.0, core-js@^3.8.3: - version "3.22.7" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.7.tgz#8d6c37f630f6139b8732d10f2c114c3f1d00024f" - integrity sha512-Jt8SReuDKVNZnZEzyEQT5eK6T2RRCXkfTq7Lo09kpm+fHjgGewSbNjV+Wt4yZMhPDdzz2x1ulI5z/w4nxpBseg== - -core-js@^3.7.0: - version "3.23.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.0.tgz#9e33448c8fd3b02ad023d85bd6e85da6335b5cc4" - integrity sha512-v2/hZoRcRrvQiBoGsHwmRdr+S4oICKcjA6xb2qjVurin6TpcDC1X2CIDa8rdu/d5n8RT/Sdoos2IlnpQ1rXs5A== +core-js@^3.25.0, core-js@^3.6.0, core-js@^3.7.0, core-js@^3.8.3: + version "3.25.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.0.tgz#be71d9e0dd648ffd70c44a7ec2319d039357eceb" + integrity sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA== core-util-is@~1.0.0: version "1.0.3" @@ -10822,10 +10817,10 @@ typescript@~4.5.5: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3" integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA== -typescript@~4.7.2: - version "4.7.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.2.tgz#1f9aa2ceb9af87cca227813b4310fff0b51593c4" - integrity sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A== +typescript@~4.8.2: + version "4.8.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790" + integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw== unbox-primitive@^1.0.2: version "1.0.2" @@ -11678,6 +11673,11 @@ workbox-core@6.5.3: resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.3.tgz#bca038a9ef0d7a634a6db2a60f45313ed22ac249" integrity sha512-Bb9ey5n/M9x+l3fBTlLpHt9ASTzgSGj6vxni7pY72ilB/Pb3XtN+cZ9yueboVhD5+9cNQrC9n/E1fSrqWsUz7Q== +workbox-core@6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.4.tgz#df48bf44cd58bb1d1726c49b883fb1dffa24c9ba" + integrity sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q== + workbox-core@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-5.1.4.tgz#8bbfb2362ecdff30e25d123c82c79ac65d9264f4" @@ -11774,7 +11774,7 @@ workbox-recipes@6.5.3: workbox-routing "6.5.3" workbox-strategies "6.5.3" -workbox-routing@6.5.3, workbox-routing@^6.5.0: +workbox-routing@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.3.tgz#a0a699d8cc90b5692bd3df24679acbbda3913777" integrity sha512-DFjxcuRAJjjt4T34RbMm3MCn+xnd36UT/2RfPRfa8VWJGItGJIn7tG+GwVTdHmvE54i/QmVTJepyAGWtoLPTmg== @@ -11788,6 +11788,13 @@ workbox-routing@^5.1.4: dependencies: workbox-core "^5.1.4" +workbox-routing@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da" + integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg== + dependencies: + workbox-core "6.5.4" + workbox-strategies@6.5.3, workbox-strategies@^6.2.4: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.3.tgz#4bea9a48fee16cf43766e0d8138296773c8a9783" From cfd24de72a9e3e004428e9fd21684226c8791d37 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Sep 2022 16:07:08 +0000 Subject: [PATCH 05/77] Bump workbox-navigation-preload from 6.5.3 to 6.5.4 in /vue Bumps [workbox-navigation-preload](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/googlechrome/workbox/releases) - [Commits](https://github.com/googlechrome/workbox/compare/v6.5.3...v6.5.4) --- updated-dependencies: - dependency-name: workbox-navigation-preload dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vue/package.json | 6 +++--- vue/yarn.lock | 35 +++++++++++++++++++++-------------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/vue/package.json b/vue/package.json index e51a30fdc9..ae15744b1e 100644 --- a/vue/package.json +++ b/vue/package.json @@ -18,7 +18,7 @@ "babel-core": "^6.26.3", "babel-loader": "^8.2.5", "bootstrap-vue": "^2.21.2", - "core-js": "^3.20.3", + "core-js": "^3.25.0", "html2pdf.js": "^0.10.1", "lodash": "^4.17.21", "mavon-editor": "^2.10.4", @@ -56,11 +56,11 @@ "babel-eslint": "^10.1.0", "eslint": "^7.28.0", "eslint-plugin-vue": "^8.7.1", - "typescript": "~4.7.2", + "typescript": "~4.8.2", "vue-cli-plugin-i18n": "^2.3.1", "webpack-bundle-tracker": "1.5.0", "workbox-expiration": "^6.3.0", - "workbox-navigation-preload": "^6.0.2", + "workbox-navigation-preload": "^6.5.4", "workbox-precaching": "^6.5.3", "workbox-routing": "^6.5.0", "workbox-strategies": "^6.2.4" diff --git a/vue/yarn.lock b/vue/yarn.lock index 8d83a24415..75a148173f 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -4349,15 +4349,10 @@ core-js@^2.4.0, core-js@^2.5.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== -core-js@^3.20.3, core-js@^3.6.0, core-js@^3.8.3: - version "3.22.7" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.7.tgz#8d6c37f630f6139b8732d10f2c114c3f1d00024f" - integrity sha512-Jt8SReuDKVNZnZEzyEQT5eK6T2RRCXkfTq7Lo09kpm+fHjgGewSbNjV+Wt4yZMhPDdzz2x1ulI5z/w4nxpBseg== - -core-js@^3.7.0: - version "3.23.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.0.tgz#9e33448c8fd3b02ad023d85bd6e85da6335b5cc4" - integrity sha512-v2/hZoRcRrvQiBoGsHwmRdr+S4oICKcjA6xb2qjVurin6TpcDC1X2CIDa8rdu/d5n8RT/Sdoos2IlnpQ1rXs5A== +core-js@^3.25.0, core-js@^3.6.0, core-js@^3.7.0, core-js@^3.8.3: + version "3.25.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.0.tgz#be71d9e0dd648ffd70c44a7ec2319d039357eceb" + integrity sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA== core-util-is@~1.0.0: version "1.0.3" @@ -10822,10 +10817,10 @@ typescript@~4.5.5: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3" integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA== -typescript@~4.7.2: - version "4.7.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.2.tgz#1f9aa2ceb9af87cca227813b4310fff0b51593c4" - integrity sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A== +typescript@~4.8.2: + version "4.8.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790" + integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw== unbox-primitive@^1.0.2: version "1.0.2" @@ -11678,6 +11673,11 @@ workbox-core@6.5.3: resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.3.tgz#bca038a9ef0d7a634a6db2a60f45313ed22ac249" integrity sha512-Bb9ey5n/M9x+l3fBTlLpHt9ASTzgSGj6vxni7pY72ilB/Pb3XtN+cZ9yueboVhD5+9cNQrC9n/E1fSrqWsUz7Q== +workbox-core@6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.4.tgz#df48bf44cd58bb1d1726c49b883fb1dffa24c9ba" + integrity sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q== + workbox-core@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-5.1.4.tgz#8bbfb2362ecdff30e25d123c82c79ac65d9264f4" @@ -11718,7 +11718,7 @@ workbox-google-analytics@^5.1.4: workbox-routing "^5.1.4" workbox-strategies "^5.1.4" -workbox-navigation-preload@6.5.3, workbox-navigation-preload@^6.0.2: +workbox-navigation-preload@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.3.tgz#81b74f598b11aa07e2cf1c21af7a826a4f0f70b3" integrity sha512-bK1gDFTc5iu6lH3UQ07QVo+0ovErhRNGvJJO/1ngknT0UQ702nmOUhoN9qE5mhuQSrnK+cqu7O7xeaJ+Rd9Tmg== @@ -11732,6 +11732,13 @@ workbox-navigation-preload@^5.1.4: dependencies: workbox-core "^5.1.4" +workbox-navigation-preload@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.4.tgz#ede56dd5f6fc9e860a7e45b2c1a8f87c1c793212" + integrity sha512-IIwf80eO3cr8h6XSQJF+Hxj26rg2RPFVUmJLUlM0+A2GzB4HFbQyKkrgD5y2d84g2IbJzP4B4j5dPBRzamHrng== + dependencies: + workbox-core "6.5.4" + workbox-precaching@6.5.3, workbox-precaching@^6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.3.tgz#c870312b2ef901d790ab9e48da084e776c62af47" From d0cb7a79f9c1a4223ab7ee32d3b47f4dccdad1d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Sep 2022 16:09:30 +0000 Subject: [PATCH 06/77] Bump webpack-bundle-tracker from 1.5.0 to 1.6.0 in /vue Bumps [webpack-bundle-tracker](https://github.com/django-webpack/webpack-bundle-tracker) from 1.5.0 to 1.6.0. - [Release notes](https://github.com/django-webpack/webpack-bundle-tracker/releases) - [Commits](https://github.com/django-webpack/webpack-bundle-tracker/compare/1.5.0...1.6.0) --- updated-dependencies: - dependency-name: webpack-bundle-tracker dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- vue/package.json | 2 +- vue/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vue/package.json b/vue/package.json index 324ca55bb9..2315b46713 100644 --- a/vue/package.json +++ b/vue/package.json @@ -58,7 +58,7 @@ "eslint-plugin-vue": "^8.7.1", "typescript": "~4.8.2", "vue-cli-plugin-i18n": "^2.3.1", - "webpack-bundle-tracker": "1.5.0", + "webpack-bundle-tracker": "1.6.0", "workbox-expiration": "^6.3.0", "workbox-navigation-preload": "^6.0.2", "workbox-precaching": "^6.5.3", diff --git a/vue/yarn.lock b/vue/yarn.lock index eb69c5114c..273cc643b7 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -11308,10 +11308,10 @@ webpack-bundle-analyzer@^4.4.0: sirv "^1.0.7" ws "^7.3.1" -webpack-bundle-tracker@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/webpack-bundle-tracker/-/webpack-bundle-tracker-1.5.0.tgz#61f04ecd3c746fe6e5775d12341ef13a35de3959" - integrity sha512-p7Oil+O5XzzwaoWi/FKfgn6HXGRpLnKuppWRficzTSHx9LdgmooVll+uYvU6DZPvKQkwJl0AyFpsBB/WTbEMMQ== +webpack-bundle-tracker@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/webpack-bundle-tracker/-/webpack-bundle-tracker-1.6.0.tgz#738e450f13ab2ab5de0c81a2cd671f78537cf861" + integrity sha512-aDb5WpHyo/U23UsAFHadUJavOAcpcEDrdSOb2ExlSrsoYBnJlECC37wekDRQ9UwRKvNjVdjZWJ/NI8/dVaVp8w== dependencies: lodash.assign "^4.2.0" lodash.defaults "^4.2.0" From 70e65856695fc9c9934a168c2cf18aca4a1a8662 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Sep 2022 18:00:05 +0000 Subject: [PATCH 07/77] Bump django-webpack-loader from 1.5.0 to 1.6.0 Bumps [django-webpack-loader](https://github.com/django-webpack/django-webpack-loader) from 1.5.0 to 1.6.0. - [Release notes](https://github.com/django-webpack/django-webpack-loader/releases) - [Changelog](https://github.com/django-webpack/django-webpack-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/django-webpack/django-webpack-loader/compare/1.5.0...1.6.0) --- updated-dependencies: - dependency-name: django-webpack-loader dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9ac465839b..e2ec90bd7b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -27,7 +27,7 @@ uritemplate==4.1.1 beautifulsoup4==4.11.1 microdata==0.8.0 Jinja2==3.1.2 -django-webpack-loader==1.5.0 +django-webpack-loader==1.6.0 git+https://github.com/ierror/django-js-reverse@7cab78c4531780ab4b32033d5104ccd5be1a246a django-allauth==0.51.0 recipe-scrapers==14.14.0 From ca9c96647e60b6fb6f5371aa641ed4f7f2ec4206 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 05:14:20 +0000 Subject: [PATCH 08/77] Bump cryptography from 37.0.2 to 38.0.1 Bumps [cryptography](https://github.com/pyca/cryptography) from 37.0.2 to 38.0.1. - [Release notes](https://github.com/pyca/cryptography/releases) - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pyca/cryptography/compare/37.0.2...38.0.1) --- updated-dependencies: - dependency-name: cryptography dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ffb77edc2c..ea3d2a91c6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ Django==4.0.7 -cryptography==37.0.2 +cryptography==38.0.1 django-annoying==0.10.6 django-autocomplete-light==3.9.4 django-cleanup==6.0.0 From 9dab21f972bc3947e2dee5a33c29295d01da8aaf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 00:03:45 +0000 Subject: [PATCH 09/77] Bump pytest from 7.1.2 to 7.1.3 Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.1.2 to 7.1.3. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/7.1.2...7.1.3) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ffb77edc2c..42a6ac0af3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -32,7 +32,7 @@ git+https://github.com/ierror/django-js-reverse@7cab78c4531780ab4b32033d5104ccd5 django-allauth==0.51.0 recipe-scrapers==14.14.0 django-scopes==1.2.0.post1 -pytest==7.1.2 +pytest==7.1.3 pytest-django==4.5.2 django-treebeard==4.5.1 django-cors-headers==3.13.0 From da1b22c14870790b55b999625351b6553df5cceb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 00:03:55 +0000 Subject: [PATCH 10/77] Bump boto3 from 1.24.21 to 1.24.84 Bumps [boto3](https://github.com/boto/boto3) from 1.24.21 to 1.24.84. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.24.21...1.24.84) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ffb77edc2c..d95a4b68e4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -37,7 +37,7 @@ pytest-django==4.5.2 django-treebeard==4.5.1 django-cors-headers==3.13.0 django-storages==1.12.3 -boto3==1.24.21 +boto3==1.24.84 django-prometheus==2.2.0 django-hCaptcha==0.2.0 python-ldap==3.4.2 From f49b39b2162c92a089b9b78ceac3b5586bd14477 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 08:37:02 +0000 Subject: [PATCH 11/77] Bump django-storages from 1.12.3 to 1.13.1 Bumps [django-storages](https://github.com/jschneier/django-storages) from 1.12.3 to 1.13.1. - [Release notes](https://github.com/jschneier/django-storages/releases) - [Changelog](https://github.com/jschneier/django-storages/blob/master/CHANGELOG.rst) - [Commits](https://github.com/jschneier/django-storages/compare/1.12.3...1.13.1) --- updated-dependencies: - dependency-name: django-storages dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 45c812f258..674041e2a9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -36,7 +36,7 @@ pytest==7.1.3 pytest-django==4.5.2 django-treebeard==4.5.1 django-cors-headers==3.13.0 -django-storages==1.12.3 +django-storages==1.13.1 boto3==1.24.84 django-prometheus==2.2.0 django-hCaptcha==0.2.0 From cdf77c8796c5f47ab40069684defca705a45ed28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 08:37:36 +0000 Subject: [PATCH 12/77] Bump recipe-scrapers from 14.14.0 to 14.14.1 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 14.14.0 to 14.14.1. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/14.14.0...14.14.1) --- updated-dependencies: - dependency-name: recipe-scrapers dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7c2f4ec6d2..73d9232b1c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -30,7 +30,7 @@ Jinja2==3.1.2 django-webpack-loader==1.6.0 git+https://github.com/ierror/django-js-reverse@7cab78c4531780ab4b32033d5104ccd5be1a246a django-allauth==0.51.0 -recipe-scrapers==14.14.0 +recipe-scrapers==14.14.1 django-scopes==1.2.0.post1 pytest==7.1.3 pytest-django==4.5.2 From 4807a16a0fecf4fae6457463ac4f2a17f1ff5b8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 08:38:05 +0000 Subject: [PATCH 13/77] Bump djangorestframework from 3.13.1 to 3.14.0 Bumps [djangorestframework](https://github.com/encode/django-rest-framework) from 3.13.1 to 3.14.0. - [Release notes](https://github.com/encode/django-rest-framework/releases) - [Commits](https://github.com/encode/django-rest-framework/compare/3.13.1...3.14.0) --- updated-dependencies: - dependency-name: djangorestframework dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 73d9232b1c..952a28891b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ django-autocomplete-light==3.9.4 django-cleanup==6.0.0 django-crispy-forms==1.14.0 django-tables2==2.4.1 -djangorestframework==3.13.1 +djangorestframework==3.14.0 drf-writable-nested==0.7.0 django-oauth-toolkit==2.1.0 django-debug-toolbar==3.6.0 From 50743264716aeb3dfd32efe485242ec4935ced44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 08:38:06 +0000 Subject: [PATCH 14/77] Bump python-ldap from 3.4.2 to 3.4.3 Bumps [python-ldap](https://github.com/python-ldap/python-ldap) from 3.4.2 to 3.4.3. - [Release notes](https://github.com/python-ldap/python-ldap/releases) - [Commits](https://github.com/python-ldap/python-ldap/compare/python-ldap-3.4.2...python-ldap-3.4.3) --- updated-dependencies: - dependency-name: python-ldap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 73d9232b1c..a079ecdfa6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -40,7 +40,7 @@ django-storages==1.13.1 boto3==1.24.84 django-prometheus==2.2.0 django-hCaptcha==0.2.0 -python-ldap==3.4.2 +python-ldap==3.4.3 django-auth-ldap==4.1.0 pytest-factoryboy==2.5.0 pyppeteer==1.0.2 From 465af8c1a4f78ef66871baa345abf0aec8479817 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 08:39:06 +0000 Subject: [PATCH 15/77] Bump @vue/cli from 5.0.4 to 5.0.8 in /vue Bumps [@vue/cli](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli) from 5.0.4 to 5.0.8. - [Release notes](https://github.com/vuejs/vue-cli/releases) - [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-cli/commits/v5.0.8/packages/@vue/cli) --- updated-dependencies: - dependency-name: "@vue/cli" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vue/package.json | 4 +- vue/yarn.lock | 711 +++++++++++++++++++---------------------------- 2 files changed, 286 insertions(+), 429 deletions(-) diff --git a/vue/package.json b/vue/package.json index 324ca55bb9..097b417c37 100644 --- a/vue/package.json +++ b/vue/package.json @@ -12,7 +12,7 @@ "@kevinfaguiar/vue-twemoji-picker": "^5.7.4", "@popperjs/core": "^2.11.2", "@riophae/vue-treeselect": "^0.4.0", - "@vue/cli": "^5.0.4", + "@vue/cli": "^5.0.8", "axios": "^0.27.2", "babel": "^6.23.0", "babel-core": "^6.26.3", @@ -62,7 +62,7 @@ "workbox-expiration": "^6.3.0", "workbox-navigation-preload": "^6.0.2", "workbox-precaching": "^6.5.3", - "workbox-routing": "^6.5.0", + "workbox-routing": "^6.5.4", "workbox-strategies": "^6.2.4" }, "eslintConfig": { diff --git a/vue/yarn.lock b/vue/yarn.lock index eb69c5114c..45e92c28b3 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@achrinza/node-ipc@9.2.2": - version "9.2.2" - resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.2.tgz#ae1b5d3d6a9362034eea60c8d946b93893c2e4ec" - integrity sha512-b90U39dx0cU6emsOvy5hxU4ApNXnE3+Tuo8XQZfiKTGelDwpMwBVgBP7QX6dGTcJgu/miyJuNJ/2naFBliNWEw== +"@achrinza/node-ipc@^9.2.5": + version "9.2.5" + resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz#29788e608ff41121f0543491da723b243266ac28" + integrity sha512-kBX7Ay911iXZ3VZ1pYltj3Rfu7Ow9H7sK4H4RSfWIfWR2JKNB40K808wppoRIEzE2j2hXLU+r6TJgCAliCGhyQ== dependencies: "@node-ipc/js-queue" "2.0.3" event-pubsub "4.3.0" @@ -35,10 +35,10 @@ jsonpointer "^5.0.0" leven "^3.1.0" -"@apollo/protobufjs@1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.2.tgz#4bd92cd7701ccaef6d517cdb75af2755f049f87c" - integrity sha512-vF+zxhPiLtkwxONs6YanSt1EpwpGilThpneExUN5K3tCymuxNnVq2yojTvnpRjv2QfsEIt/n7ozPIIzBLwGIDQ== +"@apollo/protobufjs@1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.4.tgz#d913e7627210ec5efd758ceeb751c776c68ba133" + integrity sha512-npVJ9NVU/pynj+SCU+fambvTneJDyCnif738DnZ7pCxdDtzeEz7WkpSIq5wNUmWm5Td55N+S2xfqZ+WP4hDLng== dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" @@ -54,31 +54,70 @@ "@types/node" "^10.1.0" long "^4.0.0" -"@apollographql/apollo-tools@^0.5.0": +"@apollo/utils.dropunuseddefinitions@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.dropunuseddefinitions/-/utils.dropunuseddefinitions-1.1.0.tgz#02b04006442eaf037f4c4624146b12775d70d929" + integrity sha512-jU1XjMr6ec9pPoL+BFWzEPW7VHHulVdGKMkPAMiCigpVIT11VmCbnij0bWob8uS3ODJ65tZLYKAh/55vLw2rbg== + +"@apollo/utils.keyvaluecache@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-1.0.1.tgz#46f310f859067efe9fa126156c6954f8381080d2" + integrity sha512-nLgYLomqjVimEzQ4cdvVQkcryi970NDvcRVPfd0OPeXhBfda38WjBq+WhQFk+czSHrmrSp34YHBxpat0EtiowA== + dependencies: + "@apollo/utils.logger" "^1.0.0" + lru-cache "^7.10.1" + +"@apollo/utils.logger@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.logger/-/utils.logger-1.0.0.tgz#6e3460a2250c2ef7c2c3b0be6b5e148a1596f12b" + integrity sha512-dx9XrjyisD2pOa+KsB5RcDbWIAdgC91gJfeyLCgy0ctJMjQe7yZK5kdWaWlaOoCeX0z6YI9iYlg7vMPyMpQF3Q== + +"@apollo/utils.printwithreducedwhitespace@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.printwithreducedwhitespace/-/utils.printwithreducedwhitespace-1.1.0.tgz#c466299a4766eef8577a2a64c8f27712e8bd7e30" + integrity sha512-GfFSkAv3n1toDZ4V6u2d7L4xMwLA+lv+6hqXicMN9KELSJ9yy9RzuEXaX73c/Ry+GzRsBy/fdSUGayGqdHfT2Q== + +"@apollo/utils.removealiases@1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.removealiases/-/utils.removealiases-1.0.0.tgz#75f6d83098af1fcae2d3beb4f515ad4a8452a8c1" + integrity sha512-6cM8sEOJW2LaGjL/0vHV0GtRaSekrPQR4DiywaApQlL9EdROASZU5PsQibe2MWeZCOhNrPRuHh4wDMwPsWTn8A== + +"@apollo/utils.sortast@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.sortast/-/utils.sortast-1.1.0.tgz#93218c7008daf3e2a0725196085a33f5aab5ad07" + integrity sha512-VPlTsmUnOwzPK5yGZENN069y6uUHgeiSlpEhRnLFYwYNoJHsuJq2vXVwIaSmts015WTPa2fpz1inkLYByeuRQA== + dependencies: + lodash.sortby "^4.7.0" + +"@apollo/utils.stripsensitiveliterals@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.stripsensitiveliterals/-/utils.stripsensitiveliterals-1.2.0.tgz#4920651f36beee8e260e12031a0c5863ad0c7b28" + integrity sha512-E41rDUzkz/cdikM5147d8nfCFVKovXxKBcjvLEQ7bjZm/cg9zEcXvS6vFY8ugTubI3fn6zoqo0CyU8zT+BGP9w== + +"@apollo/utils.usagereporting@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.usagereporting/-/utils.usagereporting-1.0.0.tgz#b81df180f4ca78b91a22cb49105174a7f070db1e" + integrity sha512-5PL7hJMkTPmdo3oxPtigRrIyPxDk/ddrUryHPDaezL1lSFExpNzsDd2f1j0XJoHOg350GRd3LyD64caLA2PU1w== + dependencies: + "@apollo/utils.dropunuseddefinitions" "^1.1.0" + "@apollo/utils.printwithreducedwhitespace" "^1.1.0" + "@apollo/utils.removealiases" "1.0.0" + "@apollo/utils.sortast" "^1.1.0" + "@apollo/utils.stripsensitiveliterals" "^1.2.0" + apollo-reporting-protobuf "^3.3.1" + +"@apollographql/apollo-tools@^0.5.3": version "0.5.4" resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.5.4.tgz#cb3998c6cf12e494b90c733f44dd9935e2d8196c" integrity sha512-shM3q7rUbNyXVVRkQJQseXv6bnYM3BUma/eZhwXR4xsuM+bqWnJKvW7SAfRjP7LuSCocrexa5AXhjjawNHrIlw== -"@apollographql/graphql-playground-html@1.6.27": - version "1.6.27" - resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.27.tgz#bc9ab60e9445aa2a8813b4e94f152fa72b756335" - integrity sha512-tea2LweZvn6y6xFV11K0KC8ETjmm52mQrW+ezgB2O/aTQf8JGyFmMcRPFgUaQZeHbWdm8iisDC6EjOKsXu0nfw== +"@apollographql/graphql-playground-html@1.6.29": + version "1.6.29" + resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.29.tgz#a7a646614a255f62e10dcf64a7f68ead41dec453" + integrity sha512-xCcXpoz52rI4ksJSdOCxeOCn2DLocxwHf9dVT/Q90Pte1LX+LY+91SFtJF3KXVHH8kEin+g1KKCQPKBjZJfWNA== dependencies: xss "^1.0.8" -"@apollographql/graphql-upload-8-fork@^8.1.3": - version "8.1.3" - resolved "https://registry.yarnpkg.com/@apollographql/graphql-upload-8-fork/-/graphql-upload-8-fork-8.1.3.tgz#a0d4e0d5cec8e126d78bd915c264d6b90f5784bc" - integrity sha512-ssOPUT7euLqDXcdVv3Qs4LoL4BPtfermW1IOouaqEmj36TpHYDmYDIbKoSQxikd9vtMumFnP87OybH7sC9fJ6g== - dependencies: - "@types/express" "*" - "@types/fs-capacitor" "*" - "@types/koa" "*" - busboy "^0.3.1" - fs-capacitor "^2.0.4" - http-errors "^1.7.3" - object-path "^0.11.4" - "@babel/code-frame@7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" @@ -1094,6 +1133,66 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@graphql-tools/merge@8.3.1": + version "8.3.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.3.1.tgz#06121942ad28982a14635dbc87b5d488a041d722" + integrity sha512-BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg== + dependencies: + "@graphql-tools/utils" "8.9.0" + tslib "^2.4.0" + +"@graphql-tools/merge@8.3.6": + version "8.3.6" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.3.6.tgz#97a936d4c8e8f935e58a514bb516c476437b5b2c" + integrity sha512-uUBokxXi89bj08P+iCvQk3Vew4vcfL5ZM6NTylWi8PIpoq4r5nJ625bRuN8h2uubEdRiH8ntN9M4xkd/j7AybQ== + dependencies: + "@graphql-tools/utils" "8.12.0" + tslib "^2.4.0" + +"@graphql-tools/mock@^8.1.2": + version "8.7.6" + resolved "https://registry.yarnpkg.com/@graphql-tools/mock/-/mock-8.7.6.tgz#701d898f7fe6c22e40d6d80e25874e464359ce11" + integrity sha512-cQGPyY6dF4x28552zjAg9En2WWVury62u1/xzipCNUSCdKRVOsAupTNBcAGdMjsKPLcGzzk1cPA8dP0DUfNqzg== + dependencies: + "@graphql-tools/schema" "9.0.4" + "@graphql-tools/utils" "8.12.0" + fast-json-stable-stringify "^2.1.0" + tslib "^2.4.0" + +"@graphql-tools/schema@9.0.4": + version "9.0.4" + resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-9.0.4.tgz#1a74608b57abf90fae6fd929d25e5482c57bc05d" + integrity sha512-B/b8ukjs18fq+/s7p97P8L1VMrwapYc3N2KvdG/uNThSazRRn8GsBK0Nr+FH+mVKiUfb4Dno79e3SumZVoHuOQ== + dependencies: + "@graphql-tools/merge" "8.3.6" + "@graphql-tools/utils" "8.12.0" + tslib "^2.4.0" + value-or-promise "1.0.11" + +"@graphql-tools/schema@^8.0.0", "@graphql-tools/schema@^8.5.0": + version "8.5.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.5.1.tgz#c2f2ff1448380919a330312399c9471db2580b58" + integrity sha512-0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg== + dependencies: + "@graphql-tools/merge" "8.3.1" + "@graphql-tools/utils" "8.9.0" + tslib "^2.4.0" + value-or-promise "1.0.11" + +"@graphql-tools/utils@8.12.0": + version "8.12.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.12.0.tgz#243bc4f5fc2edbc9e8fd1038189e57d837cbe31f" + integrity sha512-TeO+MJWGXjUTS52qfK4R8HiPoF/R7X+qmgtOYd8DTH0l6b+5Y/tlg5aGeUJefqImRq7nvi93Ms40k/Uz4D5CWw== + dependencies: + tslib "^2.4.0" + +"@graphql-tools/utils@8.9.0": + version "8.9.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.9.0.tgz#c6aa5f651c9c99e1aca55510af21b56ec296cdb7" + integrity sha512-pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg== + dependencies: + tslib "^2.4.0" + "@hapi/address@2.x.x": version "2.1.4" resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5" @@ -1451,14 +1550,14 @@ resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== -"@types/accepts@*", "@types/accepts@^1.3.5": +"@types/accepts@^1.3.5": version "1.3.5" resolved "https://registry.yarnpkg.com/@types/accepts/-/accepts-1.3.5.tgz#c34bec115cfc746e04fe5a059df4ce7e7b391575" integrity sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ== dependencies: "@types/node" "*" -"@types/body-parser@*": +"@types/body-parser@*", "@types/body-parser@1.19.2": version "1.19.2" resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== @@ -1466,14 +1565,6 @@ "@types/connect" "*" "@types/node" "*" -"@types/body-parser@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f" - integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ== - dependencies: - "@types/connect" "*" - "@types/node" "*" - "@types/bonjour@^3.5.9": version "3.5.10" resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275" @@ -1496,25 +1587,10 @@ dependencies: "@types/node" "*" -"@types/content-disposition@*": - version "0.5.5" - resolved "https://registry.yarnpkg.com/@types/content-disposition/-/content-disposition-0.5.5.tgz#650820e95de346e1f84e30667d168c8fd25aa6e3" - integrity sha512-v6LCdKfK6BwcqMo+wYW05rLS12S0ZO0Fl4w1h4aaZMD7bqT3gVUns6FvLJKGZHQmYn3SX55JWGpziwJRwVgutA== - -"@types/cookies@*": - version "0.7.7" - resolved "https://registry.yarnpkg.com/@types/cookies/-/cookies-0.7.7.tgz#7a92453d1d16389c05a5301eef566f34946cfd81" - integrity sha512-h7BcvPUogWbKCzBR2lY4oqaZbO3jXZksexYJVFvkrFeLgbZjQkU4x8pRq6eg2MHXQhY0McQdqmmsxRWlVAHooA== - dependencies: - "@types/connect" "*" - "@types/express" "*" - "@types/keygrip" "*" - "@types/node" "*" - -"@types/cors@2.8.10": - version "2.8.10" - resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.10.tgz#61cc8469849e5bcdd0c7044122265c39cec10cf4" - integrity sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ== +"@types/cors@2.8.12": + version "2.8.12" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080" + integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw== "@types/ejs@^3.0.6": version "3.1.1" @@ -1555,7 +1631,7 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== -"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18", "@types/express-serve-static-core@^4.17.21": +"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": version "4.17.28" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8" integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig== @@ -1564,7 +1640,16 @@ "@types/qs" "*" "@types/range-parser" "*" -"@types/express@*", "@types/express@^4.17.12", "@types/express@^4.17.13": +"@types/express-serve-static-core@4.17.30": + version "4.17.30" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz#0f2f99617fa8f9696170c46152ccf7500b34ac04" + integrity sha512-gstzbTWro2/nFed1WXtf+TtrpwxH7Ggs4RLYTLbeVgIkUQOI3WG/JKjgeOU1zXDvezllupjrf8OPIdvTbIaVOQ== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + +"@types/express@*", "@types/express@4.17.13", "@types/express@^4.17.13": version "4.17.13" resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== @@ -1574,28 +1659,11 @@ "@types/qs" "*" "@types/serve-static" "*" -"@types/fs-capacitor@*": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@types/fs-capacitor/-/fs-capacitor-2.0.0.tgz#17113e25817f584f58100fb7a08eed288b81956e" - integrity sha512-FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ== - dependencies: - "@types/node" "*" - "@types/html-minifier-terser@^6.0.0": version "6.1.0" resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35" integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg== -"@types/http-assert@*": - version "1.5.3" - resolved "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.3.tgz#ef8e3d1a8d46c387f04ab0f2e8ab8cb0c5078661" - integrity sha512-FyAOrDuQmBi8/or3ns4rwPno7/9tJTijVW6aQQjK02+kOQ8zmoNg2XJtAuQhvQcy1ASJq38wirX5//9J1EqoUA== - -"@types/http-errors@*": - version "1.8.2" - resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-1.8.2.tgz#7315b4c4c54f82d13fa61c228ec5c2ea5cc9e0e1" - integrity sha512-EqX+YQxINb+MeXaIqYDASb6U6FCHbWjkj4a1CKDBks3d/QiB2+PqBLyO72vLDgAO1wUI4O+9gweRcQK11bTL/w== - "@types/http-proxy@^1.17.8": version "1.17.9" resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz#7f0e7931343761efde1e2bf48c40f02f3f75705a" @@ -1624,32 +1692,6 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== -"@types/keygrip@*": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@types/keygrip/-/keygrip-1.0.2.tgz#513abfd256d7ad0bf1ee1873606317b33b1b2a72" - integrity sha512-GJhpTepz2udxGexqos8wgaBx4I/zWIDPh/KOGEwAqtuGDkOUJu5eFvwmdBX4AmB8Odsr+9pHCQqiAqDL/yKMKw== - -"@types/koa-compose@*": - version "3.2.5" - resolved "https://registry.yarnpkg.com/@types/koa-compose/-/koa-compose-3.2.5.tgz#85eb2e80ac50be95f37ccf8c407c09bbe3468e9d" - integrity sha512-B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ== - dependencies: - "@types/koa" "*" - -"@types/koa@*": - version "2.13.4" - resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.13.4.tgz#10620b3f24a8027ef5cbae88b393d1b31205726b" - integrity sha512-dfHYMfU+z/vKtQB7NUrthdAEiSvnLebvBjwHtfFmpZmB7em2N3WVQdHgnFq+xvyVgxW5jKDmjWfLD3lw4g4uTw== - dependencies: - "@types/accepts" "*" - "@types/content-disposition" "*" - "@types/cookies" "*" - "@types/http-assert" "*" - "@types/http-errors" "*" - "@types/keygrip" "*" - "@types/koa-compose" "*" - "@types/node" "*" - "@types/long@^4.0.0": version "4.0.2" resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a" @@ -1763,13 +1805,6 @@ resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.17.0.tgz#f99ce359f1bfd87da90cc4a57cab0a18f34a48d0" integrity sha512-eHSaNYEyxRA5IAG0Ym/yCyf86niZUIF/TpWKofQI/CVfh5HsMEUyfE2kwFxha4ow0s5g0LfISQxpDKjbRDrizw== -"@types/ws@^7.0.0": - version "7.4.7" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.7.tgz#f7c390a36f7a0679aa69de2d501319f4f8d9b702" - integrity sha512-JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww== - dependencies: - "@types/node" "*" - "@types/ws@^8.5.1": version "8.5.3" resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d" @@ -2176,12 +2211,12 @@ webpack-virtual-modules "^0.4.2" whatwg-fetch "^3.6.2" -"@vue/cli-shared-utils@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-5.0.4.tgz#e3f42575cb6b70e021272ef2c8bb52ca544ecf27" - integrity sha512-nfAsj8Nopu5sVHMBIaut/YL7NaJFVmTBSTJD7LM17jc5uytrM9JwiRtzCiv3JWRBG78Xdb/s2Xb/1YR4fkdmkQ== +"@vue/cli-shared-utils@^5.0.4", "@vue/cli-shared-utils@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-5.0.8.tgz#75fc96528eba2b1c7e33cb7e989a984ddef99c8a" + integrity sha512-uK2YB7bBVuQhjOJF+O52P9yFMXeJVj7ozqJkwYE9PlMHL1LMHjtCYm4cSdOebuPzyP+/9p0BimM/OqxsevIopQ== dependencies: - "@achrinza/node-ipc" "9.2.2" + "@achrinza/node-ipc" "^9.2.5" chalk "^4.1.2" execa "^1.0.0" joi "^17.4.0" @@ -2194,25 +2229,26 @@ semver "^7.3.4" strip-ansi "^6.0.0" -"@vue/cli-ui-addon-webpack@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-5.0.4.tgz#8cf00453f64aad1d6968e52b05bef531b762d530" - integrity sha512-QVF5rG9qOVizdq4iZ4NhqwLEigOH+Ulhx9IZpaoLh0VlLqbqrwuHs4QOKNFsuvdGM4LHXCp8XH6EKFScPbJ9Mg== +"@vue/cli-ui-addon-webpack@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-5.0.8.tgz#84314374f3fbf03a6e565c362ce01c0270a18e84" + integrity sha512-sg+3a9vHGzpFRrv7MVZRQ9oDztFN9Mvx0MleidKyPIAWMSOskSQT8zTngy8bEyXjXwNv6mCn2jvUR/tgbldyow== -"@vue/cli-ui-addon-widgets@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-5.0.4.tgz#3343795da7259ebbdde4a207d6ec13b4b14caeca" - integrity sha512-KmJUazIEZWhy0UaFHV5Uy8AXpTqJgCPizEHhtxs3f8mIkUnwWjcQFG7FGfsAW7RgsN8hwcSZ5ZFjmXhllVwrkw== +"@vue/cli-ui-addon-widgets@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-5.0.8.tgz#6f073f2bc975162468e5a6b93f074e25f8f64460" + integrity sha512-jNYQ+3z7HDZ3IR3Z3Dlo3yOPbHexpygkn2IJ7sjA62oGolnNWeF7kvpLwni18l8N5InhS66m9w31an1Fs5pCZA== -"@vue/cli-ui@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/cli-ui/-/cli-ui-5.0.4.tgz#1d763f0272f60c2f02d12725da5a180ec2281f3f" - integrity sha512-6RkvN5XphYHfBUhKS7wG2ChrEhdLx05v6ppq53wy0/3N126j/5UM+fl48vbnMzCeRgpTn75IRI89ysPqiDyX3A== +"@vue/cli-ui@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-ui/-/cli-ui-5.0.8.tgz#f6e817d54186f648807a906cd0898eecdaaf3ca9" + integrity sha512-1eyL1h1T3LVejYplDqERO8TK03sjR3QTOTHa01ABreCdqFTZItiUVud34uEcuoZ6Gi69xdl+LSx6Hvo4t9tfrA== dependencies: - "@achrinza/node-ipc" "9.2.2" + "@achrinza/node-ipc" "^9.2.5" "@akryum/winattr" "^3.0.0" - "@vue/cli-shared-utils" "^5.0.4" - apollo-server-express "^2.21.0" + "@graphql-tools/schema" "^8.5.0" + "@vue/cli-shared-utils" "^5.0.8" + apollo-server-express "^3.9.0" clone "^2.1.1" deepmerge "^4.2.2" express "^4.17.1" @@ -2235,19 +2271,20 @@ prismjs "^1.23.0" rss-parser "^3.11.0" shortid "^2.2.15" + subscriptions-transport-ws "^0.11.0" typescript "~4.5.5" -"@vue/cli@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/cli/-/cli-5.0.4.tgz#bebd12eb92c27cd170d5f4e993688a1877bb98f6" - integrity sha512-v9fHBQ3MCTAo92+uA/J8C/PYxGrZJCSM/myPEGzX4zrlbT4bBLfuP0pFRJZO9wQGE3NHp95coIdOghXdMm/atw== +"@vue/cli@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli/-/cli-5.0.8.tgz#97b2bad9cb331dcffdd4fbe8532bdeacd2441166" + integrity sha512-c/QKPdC09bYkW22m/boXkLaiz10z0Z2WHZO7zEeNdfSduqyWINZhKc6hVQU3Vk0NXW7BJAd7zWmcUrC8L9TuAA== dependencies: "@types/ejs" "^3.0.6" "@types/inquirer" "^8.1.3" - "@vue/cli-shared-utils" "^5.0.4" - "@vue/cli-ui" "^5.0.4" - "@vue/cli-ui-addon-webpack" "^5.0.4" - "@vue/cli-ui-addon-widgets" "^5.0.4" + "@vue/cli-shared-utils" "^5.0.8" + "@vue/cli-ui" "^5.0.8" + "@vue/cli-ui-addon-webpack" "^5.0.8" + "@vue/cli-ui-addon-widgets" "^5.0.8" boxen "^5.0.0" commander "^7.1.0" debug "^4.1.0" @@ -2643,13 +2680,6 @@ "@webassemblyjs/wast-parser" "1.9.0" "@xtuc/long" "4.2.2" -"@wry/equality@^0.1.2": - version "0.1.11" - resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.11.tgz#35cb156e4a96695aa81a9ecc4d03787bc17f1790" - integrity sha512-mwEVBDUVODlsQQ5dfuLUS5/Tf7jqUKyhKYHmVi4fPB6bDMOfWvUPJmKgS1Z7Za/sOI3vzWt4+O7yCiL/70MogA== - dependencies: - tslib "^1.9.3" - "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -2844,155 +2874,94 @@ anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -apollo-cache-control@^0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.14.0.tgz#95f20c3e03e7994e0d1bd48c59aeaeb575ed0ce7" - integrity sha512-qN4BCq90egQrgNnTRMUHikLZZAprf3gbm8rC5Vwmc6ZdLolQ7bFsa769Hqi6Tq/lS31KLsXBLTOsRbfPHph12w== - dependencies: - apollo-server-env "^3.1.0" - apollo-server-plugin-base "^0.13.0" - -apollo-datasource@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.9.0.tgz#b0b2913257a6103a5f4c03cb56d78a30e9d850db" - integrity sha512-y8H99NExU1Sk4TvcaUxTdzfq2SZo6uSj5dyh75XSQvbpH6gdAXIW9MaBcvlNC7n0cVPsidHmOcHOWxJ/pTXGjA== - dependencies: - apollo-server-caching "^0.7.0" - apollo-server-env "^3.1.0" - -apollo-graphql@^0.9.0: - version "0.9.7" - resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.9.7.tgz#33185093b497a578f2df61ab8ecc6447d700ae64" - integrity sha512-bezL9ItUWUGHTm1bI/XzIgiiZbhXpsC7uxk4UxFPmcVJwJsDc3ayZ99oXxAaK+3Rbg/IoqrHckA6CwmkCsbaSA== - dependencies: - core-js-pure "^3.10.2" - lodash.sortby "^4.7.0" - sha.js "^2.4.11" - -apollo-link@^1.2.14: - version "1.2.14" - resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.14.tgz#3feda4b47f9ebba7f4160bef8b977ba725b684d9" - integrity sha512-p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg== - dependencies: - apollo-utilities "^1.3.0" - ts-invariant "^0.4.0" - tslib "^1.9.3" - zen-observable-ts "^0.8.21" - -apollo-reporting-protobuf@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.8.0.tgz#ae9d967934d3d8ed816fc85a0d8068ef45c371b9" - integrity sha512-B3XmnkH6Y458iV6OsA7AhfwvTgeZnFq9nPVjbxmLKnvfkEl8hYADtz724uPa0WeBiD7DSFcnLtqg9yGmCkBohg== - dependencies: - "@apollo/protobufjs" "1.2.2" - -apollo-server-caching@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.7.0.tgz#e6d1e68e3bb571cba63a61f60b434fb771c6ff39" - integrity sha512-MsVCuf/2FxuTFVhGLK13B+TZH9tBd2qkyoXKKILIiGcZ5CDUEBO14vIV63aNkMkS1xxvK2U4wBcuuNj/VH2Mkw== +apollo-datasource@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-3.3.2.tgz#5711f8b38d4b7b53fb788cb4dbd4a6a526ea74c8" + integrity sha512-L5TiS8E2Hn/Yz7SSnWIVbZw0ZfEIXZCa5VUiVxD9P53JvSrf4aStvsFDlGWPvpIdCR+aly2CfoB79B9/JjKFqg== dependencies: - lru-cache "^6.0.0" + "@apollo/utils.keyvaluecache" "^1.0.1" + apollo-server-env "^4.2.1" -apollo-server-core@^2.25.4: - version "2.25.4" - resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.25.4.tgz#a564376496016713c7dceaac3d9e652c7a433260" - integrity sha512-1u3BnFKbCt6F9SPM7ZoWmtHK6ubme56H8hV5Mjv3KbfSairU76SU79IhO05BEJE57S6N+ddb1rm3Uk93X6YeGw== - dependencies: - "@apollographql/apollo-tools" "^0.5.0" - "@apollographql/graphql-playground-html" "1.6.27" - "@apollographql/graphql-upload-8-fork" "^8.1.3" +apollo-reporting-protobuf@^3.3.1, apollo-reporting-protobuf@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.3.2.tgz#2078c53d3140bc6221c6040c5326623e0c21c8d4" + integrity sha512-j1tx9tmkVdsLt1UPzBrvz90PdjAeKW157WxGn+aXlnnGfVjZLIRXX3x5t1NWtXvB7rVaAsLLILLtDHW382TSoQ== + dependencies: + "@apollo/protobufjs" "1.2.4" + +apollo-server-core@^3.10.2: + version "3.10.2" + resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-3.10.2.tgz#04c5c3fc96b6c7d7f84fdc7356cf9830de4db561" + integrity sha512-/1o9KPoAMgcjJJ9Y0IH1665wf9d02L/m/mcfBOHiFmRgeGkNgrhTy59BxQTBK241USAWMhwMpp171cv/hM5Dng== + dependencies: + "@apollo/utils.keyvaluecache" "^1.0.1" + "@apollo/utils.logger" "^1.0.0" + "@apollo/utils.usagereporting" "^1.0.0" + "@apollographql/apollo-tools" "^0.5.3" + "@apollographql/graphql-playground-html" "1.6.29" + "@graphql-tools/mock" "^8.1.2" + "@graphql-tools/schema" "^8.0.0" "@josephg/resolvable" "^1.0.0" - "@types/ws" "^7.0.0" - apollo-cache-control "^0.14.0" - apollo-datasource "^0.9.0" - apollo-graphql "^0.9.0" - apollo-reporting-protobuf "^0.8.0" - apollo-server-caching "^0.7.0" - apollo-server-env "^3.1.0" - apollo-server-errors "^2.5.0" - apollo-server-plugin-base "^0.13.0" - apollo-server-types "^0.9.0" - apollo-tracing "^0.15.0" + apollo-datasource "^3.3.2" + apollo-reporting-protobuf "^3.3.2" + apollo-server-env "^4.2.1" + apollo-server-errors "^3.3.1" + apollo-server-plugin-base "^3.6.2" + apollo-server-types "^3.6.2" async-retry "^1.2.1" - fast-json-stable-stringify "^2.0.0" - graphql-extensions "^0.15.0" + fast-json-stable-stringify "^2.1.0" graphql-tag "^2.11.0" - graphql-tools "^4.0.8" - loglevel "^1.6.7" + loglevel "^1.6.8" lru-cache "^6.0.0" sha.js "^2.4.11" - subscriptions-transport-ws "^0.9.19" uuid "^8.0.0" + whatwg-mimetype "^3.0.0" -apollo-server-env@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-3.1.0.tgz#0733c2ef50aea596cc90cf40a53f6ea2ad402cd0" - integrity sha512-iGdZgEOAuVop3vb0F2J3+kaBVi4caMoxefHosxmgzAbbSpvWehB8Y1QiSyyMeouYC38XNVk5wnZl+jdGSsWsIQ== +apollo-server-env@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-4.2.1.tgz#ea5b1944accdbdba311f179e4dfaeca482c20185" + integrity sha512-vm/7c7ld+zFMxibzqZ7SSa5tBENc4B0uye9LTfjJwGoQFY5xsUPH5FpO5j0bMUDZ8YYNbrF9SNtzc5Cngcr90g== dependencies: - node-fetch "^2.6.1" - util.promisify "^1.0.0" + node-fetch "^2.6.7" -apollo-server-errors@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.5.0.tgz#5d1024117c7496a2979e3e34908b5685fe112b68" - integrity sha512-lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA== +apollo-server-errors@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-3.3.1.tgz#ba5c00cdaa33d4cbd09779f8cb6f47475d1cd655" + integrity sha512-xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA== -apollo-server-express@^2.21.0: - version "2.25.4" - resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.25.4.tgz#bd371e95d8fde0516e867f067281b7a1c3d8260c" - integrity sha512-1Yd9DscLlCP5BhfAkNxg+aGcaTKnL36FyezdL7Iqc+KelON5PAyX8qpAChKL8Z3L2YHJzIk/Haf4dFJLKUjx9w== +apollo-server-express@^3.9.0: + version "3.10.2" + resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-3.10.2.tgz#df7cb81eab10d84db55297a2820cf3bd8814eb80" + integrity sha512-TUpnh23qAP3NqMp3/2TxcCpOxhvT64H6teOM5W+t5ncdHZ85aEMDrbfIhNwqkdsya+UyMn9IoBmn25h5TW93ZQ== dependencies: - "@apollographql/graphql-playground-html" "1.6.27" "@types/accepts" "^1.3.5" - "@types/body-parser" "1.19.0" - "@types/cors" "2.8.10" - "@types/express" "^4.17.12" - "@types/express-serve-static-core" "^4.17.21" + "@types/body-parser" "1.19.2" + "@types/cors" "2.8.12" + "@types/express" "4.17.13" + "@types/express-serve-static-core" "4.17.30" accepts "^1.3.5" - apollo-server-core "^2.25.4" - apollo-server-types "^0.9.0" - body-parser "^1.18.3" + apollo-server-core "^3.10.2" + apollo-server-types "^3.6.2" + body-parser "^1.19.0" cors "^2.8.5" - express "^4.17.1" - graphql-subscriptions "^1.0.0" - graphql-tools "^4.0.8" - parseurl "^1.3.2" - subscriptions-transport-ws "^0.9.19" - type-is "^1.6.16" - -apollo-server-plugin-base@^0.13.0: - version "0.13.0" - resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.13.0.tgz#3f85751a420d3c4625355b6cb3fbdd2acbe71f13" - integrity sha512-L3TMmq2YE6BU6I4Tmgygmd0W55L+6XfD9137k+cWEBFu50vRY4Re+d+fL5WuPkk5xSPKd/PIaqzidu5V/zz8Kg== - dependencies: - apollo-server-types "^0.9.0" + parseurl "^1.3.3" -apollo-server-types@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.9.0.tgz#ccf550b33b07c48c72f104fbe2876232b404848b" - integrity sha512-qk9tg4Imwpk732JJHBkhW0jzfG0nFsLqK2DY6UhvJf7jLnRePYsPxWfPiNkxni27pLE2tiNlCwoDFSeWqpZyBg== +apollo-server-plugin-base@^3.6.2: + version "3.6.2" + resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-3.6.2.tgz#f256e1f274c8fee0d7267b6944f402da71788fb3" + integrity sha512-erWXjLOO1u7fxQkbxJ2cwSO7p0tYzNied91I1SJ9tikXZ/2eZUyDyvrpI+4g70kOdEi+AmJ5Fo8ahEXKJ75zdg== dependencies: - apollo-reporting-protobuf "^0.8.0" - apollo-server-caching "^0.7.0" - apollo-server-env "^3.1.0" + apollo-server-types "^3.6.2" -apollo-tracing@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.15.0.tgz#237fbbbf669aee4370b7e9081b685eabaa8ce84a" - integrity sha512-UP0fztFvaZPHDhIB/J+qGuy6hWO4If069MGC98qVs0I8FICIGu4/8ykpX3X3K6RtaQ56EDAWKykCxFv4ScxMeA== +apollo-server-types@^3.6.2: + version "3.6.2" + resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-3.6.2.tgz#34bb0c335fcce3057cbdf72b3b63da182de6fc84" + integrity sha512-9Z54S7NB+qW1VV+kmiqwU2Q6jxWfX89HlSGCGOo3zrkrperh85LrzABgN9S92+qyeHYd72noMDg2aI039sF3dg== dependencies: - apollo-server-env "^3.1.0" - apollo-server-plugin-base "^0.13.0" - -apollo-utilities@^1.0.1, apollo-utilities@^1.3.0: - version "1.3.4" - resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.4.tgz#6129e438e8be201b6c55b0f13ce49d2c7175c9cf" - integrity sha512-pk2hiWrCXMAy2fRPwEyhvka+mqwzeP60Jr1tRYi5xru+3ko94HI9o6lK0CT33/w4RDlxWchmdhDCrvdr+pHCig== - dependencies: - "@wry/equality" "^0.1.2" - fast-json-stable-stringify "^2.0.0" - ts-invariant "^0.4.0" - tslib "^1.10.0" + "@apollo/utils.keyvaluecache" "^1.0.1" + "@apollo/utils.logger" "^1.0.0" + apollo-reporting-protobuf "^3.3.2" + apollo-server-env "^4.2.1" aproba@^1.1.1: version "1.2.0" @@ -3058,17 +3027,6 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== -array.prototype.reduce@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz#8167e80089f78bff70a99e20bd4201d4663b0a6f" - integrity sha512-WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.2" - es-array-method-boxes-properly "^1.0.0" - is-string "^1.0.7" - arrify@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa" @@ -3478,7 +3436,7 @@ bn.js@^5.0.0, bn.js@^5.1.1: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70" integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ== -body-parser@1.20.0, body-parser@^1.18.3: +body-parser@1.20.0, body-parser@^1.19.0: version "1.20.0" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5" integrity sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg== @@ -3726,13 +3684,6 @@ builtins@^1.0.3: resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88" integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ== -busboy@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.3.1.tgz#170899274c5bf38aae27d5c62b71268cd585fd1b" - integrity sha512-y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw== - dependencies: - dicer "0.3.0" - bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" @@ -4339,11 +4290,6 @@ core-js-compat@^3.21.0, core-js-compat@^3.22.1, core-js-compat@^3.8.3: browserslist "^4.20.3" semver "7.0.0" -core-js-pure@^3.10.2: - version "3.22.7" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.7.tgz#f58489d9b309fa7b26486a0f70d4ec19a418084e" - integrity sha512-wTriFxiZI+C8msGeh7fJcbC/a0V8fdInN1oS2eK79DMBGs8iIJiXhtFJCiT3rBa8w6zroHWW3p8ArlujZ/Mz+w== - core-js@^2.4.0, core-js@^2.5.0: version "2.6.12" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" @@ -4789,11 +4735,6 @@ depd@~1.1.2: resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== -deprecated-decorator@^0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/deprecated-decorator/-/deprecated-decorator-0.1.6.tgz#00966317b7a12fe92f3cc831f7583af329b86c37" - integrity sha512-MHidOOnCHGlZDKsI21+mbIIhf4Fff+hhCTB7gtVg4uoIqjcrTZc5v6M+GS2zVI0sV7PqK415rb8XaOSQsQkHOw== - des.js@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843" @@ -4819,13 +4760,6 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -dicer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.3.0.tgz#eacd98b3bfbf92e8ab5c2fdb71aaac44bb06b872" - integrity sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA== - dependencies: - streamsearch "0.1.2" - diffie-hellman@^5.0.0: version "5.0.3" resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" @@ -5113,7 +5047,7 @@ error-stack-parser@^2.0.6: dependencies: stackframe "^1.1.1" -es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5, es-abstract@^1.20.1: +es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.5: version "1.20.1" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814" integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA== @@ -5142,11 +5076,6 @@ es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19 string.prototype.trimstart "^1.0.5" unbox-primitive "^1.0.2" -es-array-method-boxes-properly@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e" - integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== - es-module-lexer@^0.9.0: version "0.9.3" resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" @@ -5827,13 +5756,6 @@ follow-redirects@^1.0.0, follow-redirects@^1.14.9: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== -for-each@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" - integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== - dependencies: - is-callable "^1.1.3" - for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -5897,11 +5819,6 @@ from2@^2.1.0, from2@^2.1.1: inherits "^2.0.1" readable-stream "^2.0.0" -fs-capacitor@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/fs-capacitor/-/fs-capacitor-2.0.4.tgz#5a22e72d40ae5078b4fe64fe4d08c0d3fc88ad3c" - integrity sha512-8S4f4WsCryNw2mJJchi46YgB6CR5Ze+4L1h8ewl9tEpL4SJ3ZO+c/bS4BWhB8bK+O3TMqhuZarTitd0S0eh2pA== - fs-constants@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" @@ -6190,16 +6107,7 @@ graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1. resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -graphql-extensions@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.15.0.tgz#3f291f9274876b0c289fa4061909a12678bd9817" - integrity sha512-bVddVO8YFJPwuACn+3pgmrEg6I8iBuYLuwvxiE+lcQQ7POotVZxm2rgGw0PvVYmWWf3DT7nTVDZ5ROh/ALp8mA== - dependencies: - "@apollographql/apollo-tools" "^0.5.0" - apollo-server-env "^3.1.0" - apollo-server-types "^0.9.0" - -graphql-subscriptions@^1.0.0, graphql-subscriptions@^1.2.0: +graphql-subscriptions@^1.2.0: version "1.2.1" resolved "https://registry.yarnpkg.com/graphql-subscriptions/-/graphql-subscriptions-1.2.1.tgz#2142b2d729661ddf967b7388f7cf1dd4cf2e061d" integrity sha512-95yD/tKi24q8xYa7Q9rhQN16AYj5wPbrb8tmHGM3WRc9EBmWrG/0kkMl+tQG8wcEuE9ibR4zyOM31p5Sdr2v4g== @@ -6213,17 +6121,6 @@ graphql-tag@^2.10.3, graphql-tag@^2.11.0: dependencies: tslib "^2.1.0" -graphql-tools@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-4.0.8.tgz#e7fb9f0d43408fb0878ba66b522ce871bafe9d30" - integrity sha512-MW+ioleBrwhRjalKjYaLQbr+920pHBgy9vM/n47sswtns8+96sRn5M/G+J1eu7IMeKWiN/9p6tmwCHU7552VJg== - dependencies: - apollo-link "^1.2.14" - apollo-utilities "^1.0.1" - deprecated-decorator "^0.1.6" - iterall "^1.1.3" - uuid "^3.1.0" - graphql-type-json@^0.3.1: version "0.3.2" resolved "https://registry.yarnpkg.com/graphql-type-json/-/graphql-type-json-0.3.2.tgz#f53a851dbfe07bd1c8157d24150064baab41e115" @@ -6498,17 +6395,6 @@ http-errors@2.0.0: statuses "2.0.1" toidentifier "1.0.1" -http-errors@^1.7.3: - version "1.8.1" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" - integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.2.0" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.1" - http-errors@~1.6.2: version "1.6.3" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" @@ -6786,7 +6672,7 @@ is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.4: +is-callable@^1.1.4, is-callable@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== @@ -7096,7 +6982,7 @@ isurl@^1.0.0-alpha5: has-to-string-tag-x "^1.2.0" is-object "^1.0.1" -iterall@^1.1.3, iterall@^1.2.1, iterall@^1.3.0: +iterall@^1.2.1, iterall@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea" integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg== @@ -7561,7 +7447,7 @@ log-update@^2.3.0: cli-cursor "^2.0.0" wrap-ansi "^3.0.1" -loglevel@^1.6.7: +loglevel@^1.6.8: version "1.8.0" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.0.tgz#e7ec73a57e1e7b419cb6c6ac06bf050b67356114" integrity sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA== @@ -7628,6 +7514,11 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +lru-cache@^7.10.1: + version "7.14.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.0.tgz#21be64954a4680e303a09e9468f880b98a0b3c7f" + integrity sha512-EIRtP1GrSJny0dqb50QXRUNBxHJhcpxHC++M5tD7RYbvLLn5KVWKsbyswSSqDuU15UFi3bgTQIY8nhDMeF6aDQ== + magic-string@^0.25.0, magic-string@^0.25.7: version "0.25.9" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c" @@ -8022,7 +7913,7 @@ node-dir@^0.1.17: dependencies: minimatch "^3.0.2" -node-fetch@^2.6.1, node-fetch@^2.6.7: +node-fetch@^2.6.7: version "2.6.7" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== @@ -8179,11 +8070,6 @@ object-keys@^1.1.1: resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -object-path@^0.11.4: - version "0.11.8" - resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.8.tgz#ed002c02bbdd0070b78a27455e8ae01fc14d4742" - integrity sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA== - object-visit@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" @@ -8201,16 +8087,6 @@ object.assign@^4.1.0, object.assign@^4.1.2: has-symbols "^1.0.1" object-keys "^1.1.1" -object.getownpropertydescriptors@^2.1.1: - version "2.1.4" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz#7965e6437a57278b587383831a9b829455a4bc37" - integrity sha512-sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ== - dependencies: - array.prototype.reduce "^1.0.4" - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.1" - object.pick@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" @@ -8474,7 +8350,7 @@ parse5@^6.0.1: resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== -parseurl@^1.3.2, parseurl@~1.3.2, parseurl@~1.3.3: +parseurl@^1.3.3, parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== @@ -10103,7 +9979,7 @@ statuses@2.0.1: resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== -"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2": +"statuses@>= 1.4.0 < 2": version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= @@ -10147,11 +10023,6 @@ stream-shift@^1.0.0: resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== -streamsearch@0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a" - integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo= - strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" @@ -10321,10 +10192,10 @@ stylehacks@^5.1.0: browserslist "^4.16.6" postcss-selector-parser "^6.0.4" -subscriptions-transport-ws@^0.9.19: - version "0.9.19" - resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.19.tgz#10ca32f7e291d5ee8eb728b9c02e43c52606cdcf" - integrity sha512-dxdemxFFB0ppCLg10FTtRqH/31FNRL1y1BQv8209MK5I4CwALb7iihQg+7p65lFcIl8MHatINWBLOqpgU4Kyyw== +subscriptions-transport-ws@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.11.0.tgz#baf88f050cba51d52afe781de5e81b3c31f89883" + integrity sha512-8D4C6DIH5tGiAIpp5I0wD/xRlNiZAPGHygzCe7VzyzUoxHtawzjNAY9SUTXU05/EY2NMY9/9GF0ycizkXr1CWQ== dependencies: backo2 "^1.0.2" eventemitter3 "^3.1.0" @@ -10686,13 +10557,6 @@ trim-right@^1.0.1: resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= -ts-invariant@^0.4.0: - version "0.4.4" - resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.4.tgz#97a523518688f93aafad01b0e80eb803eb2abd86" - integrity sha512-uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA== - dependencies: - tslib "^1.9.3" - ts-loader@^9.2.5: version "9.3.0" resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.3.0.tgz#980f4dbfb60e517179e15e10ed98e454b132159f" @@ -10703,12 +10567,12 @@ ts-loader@^9.2.5: micromatch "^4.0.0" semver "^7.3.4" -tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: +tslib@^1.8.1, tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0: +tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== @@ -10799,7 +10663,7 @@ type-fest@^0.8.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== -type-is@^1.6.16, type-is@~1.6.18: +type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== @@ -10971,17 +10835,6 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= -util.promisify@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.1.tgz#77832f57ced2c9478174149cae9b96e9918cd54b" - integrity sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - for-each "^0.3.3" - has-symbols "^1.0.1" - object.getownpropertydescriptors "^2.1.1" - util@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" @@ -11013,11 +10866,6 @@ utrie@^1.0.2: dependencies: base64-arraybuffer "^1.0.2" -uuid@^3.1.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" - integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== - uuid@^8.0.0, uuid@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" @@ -11043,6 +10891,11 @@ validate-npm-package-name@^3.0.0: dependencies: builtins "^1.0.3" +value-or-promise@1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.11.tgz#3e90299af31dd014fe843fe309cefa7c1d94b140" + integrity sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg== + vary@^1, vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" @@ -11476,6 +11329,11 @@ whatwg-fetch@^3.6.2: resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c" integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA== +whatwg-mimetype@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" + integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== + whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" @@ -11673,6 +11531,11 @@ workbox-core@6.5.3: resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.3.tgz#bca038a9ef0d7a634a6db2a60f45313ed22ac249" integrity sha512-Bb9ey5n/M9x+l3fBTlLpHt9ASTzgSGj6vxni7pY72ilB/Pb3XtN+cZ9yueboVhD5+9cNQrC9n/E1fSrqWsUz7Q== +workbox-core@6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.4.tgz#df48bf44cd58bb1d1726c49b883fb1dffa24c9ba" + integrity sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q== + workbox-core@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-5.1.4.tgz#8bbfb2362ecdff30e25d123c82c79ac65d9264f4" @@ -11769,7 +11632,7 @@ workbox-recipes@6.5.3: workbox-routing "6.5.3" workbox-strategies "6.5.3" -workbox-routing@6.5.3, workbox-routing@^6.5.0: +workbox-routing@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.3.tgz#a0a699d8cc90b5692bd3df24679acbbda3913777" integrity sha512-DFjxcuRAJjjt4T34RbMm3MCn+xnd36UT/2RfPRfa8VWJGItGJIn7tG+GwVTdHmvE54i/QmVTJepyAGWtoLPTmg== @@ -11783,6 +11646,13 @@ workbox-routing@^5.1.4: dependencies: workbox-core "^5.1.4" +workbox-routing@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da" + integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg== + dependencies: + workbox-core "6.5.4" + workbox-strategies@6.5.3, workbox-strategies@^6.2.4: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.3.tgz#4bea9a48fee16cf43766e0d8138296773c8a9783" @@ -12047,16 +11917,3 @@ yorkie@^2.0.0: is-ci "^1.0.10" normalize-path "^1.0.0" strip-indent "^2.0.0" - -zen-observable-ts@^0.8.21: - version "0.8.21" - resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz#85d0031fbbde1eba3cd07d3ba90da241215f421d" - integrity sha512-Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg== - dependencies: - tslib "^1.9.3" - zen-observable "^0.8.0" - -zen-observable@^0.8.0: - version "0.8.15" - resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15" - integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ== From 31d3f9abee76f04fa7c544c5011d56dbe9423e16 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 08:39:30 +0000 Subject: [PATCH 16/77] Bump @babel/eslint-parser from 7.18.2 to 7.19.1 in /vue Bumps [@babel/eslint-parser](https://github.com/babel/babel/tree/HEAD/eslint/babel-eslint-parser) from 7.18.2 to 7.19.1. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.19.1/eslint/babel-eslint-parser) --- updated-dependencies: - dependency-name: "@babel/eslint-parser" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- vue/package.json | 4 ++-- vue/yarn.lock | 31 +++++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/vue/package.json b/vue/package.json index 324ca55bb9..fce1efd459 100644 --- a/vue/package.json +++ b/vue/package.json @@ -8,7 +8,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { - "@babel/eslint-parser": "^7.16.0", + "@babel/eslint-parser": "^7.19.1", "@kevinfaguiar/vue-twemoji-picker": "^5.7.4", "@popperjs/core": "^2.11.2", "@riophae/vue-treeselect": "^0.4.0", @@ -62,7 +62,7 @@ "workbox-expiration": "^6.3.0", "workbox-navigation-preload": "^6.0.2", "workbox-precaching": "^6.5.3", - "workbox-routing": "^6.5.0", + "workbox-routing": "^6.5.4", "workbox-strategies": "^6.2.4" }, "eslintConfig": { diff --git a/vue/yarn.lock b/vue/yarn.lock index eb69c5114c..0754a45abe 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -119,12 +119,12 @@ json5 "^2.2.1" semver "^6.3.0" -"@babel/eslint-parser@^7.16.0": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.18.2.tgz#e14dee36c010edfb0153cf900c2b0815e82e3245" - integrity sha512-oFQYkE8SuH14+uR51JVAmdqwKYXGRjEXx7s+WiagVjqQ+HPE+nnwyF2qlVG8evUsUHmPcA+6YXMEDbIhEyQc5A== +"@babel/eslint-parser@^7.19.1": + version "7.19.1" + resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz#4f68f6b0825489e00a24b41b6a1ae35414ecd2f4" + integrity sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ== dependencies: - eslint-scope "^5.1.1" + "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1" eslint-visitor-keys "^2.1.0" semver "^6.3.0" @@ -1229,6 +1229,13 @@ resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== +"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1": + version "5.1.1-v1" + resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129" + integrity sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg== + dependencies: + eslint-scope "5.1.1" + "@node-ipc/js-queue@2.0.3": version "2.0.3" resolved "https://registry.yarnpkg.com/@node-ipc/js-queue/-/js-queue-2.0.3.tgz#ac7fe33d766fa53e233ef8fedaf3443a01c5a4cd" @@ -11673,6 +11680,11 @@ workbox-core@6.5.3: resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.3.tgz#bca038a9ef0d7a634a6db2a60f45313ed22ac249" integrity sha512-Bb9ey5n/M9x+l3fBTlLpHt9ASTzgSGj6vxni7pY72ilB/Pb3XtN+cZ9yueboVhD5+9cNQrC9n/E1fSrqWsUz7Q== +workbox-core@6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.4.tgz#df48bf44cd58bb1d1726c49b883fb1dffa24c9ba" + integrity sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q== + workbox-core@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-5.1.4.tgz#8bbfb2362ecdff30e25d123c82c79ac65d9264f4" @@ -11769,7 +11781,7 @@ workbox-recipes@6.5.3: workbox-routing "6.5.3" workbox-strategies "6.5.3" -workbox-routing@6.5.3, workbox-routing@^6.5.0: +workbox-routing@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.3.tgz#a0a699d8cc90b5692bd3df24679acbbda3913777" integrity sha512-DFjxcuRAJjjt4T34RbMm3MCn+xnd36UT/2RfPRfa8VWJGItGJIn7tG+GwVTdHmvE54i/QmVTJepyAGWtoLPTmg== @@ -11783,6 +11795,13 @@ workbox-routing@^5.1.4: dependencies: workbox-core "^5.1.4" +workbox-routing@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da" + integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg== + dependencies: + workbox-core "6.5.4" + workbox-strategies@6.5.3, workbox-strategies@^6.2.4: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.3.tgz#4bea9a48fee16cf43766e0d8138296773c8a9783" From cc417f1499deda4efd4c511fc82d08144fed92a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 08:40:08 +0000 Subject: [PATCH 17/77] Bump core-js from 3.25.0 to 3.25.3 in /vue Bumps [core-js](https://github.com/zloirock/core-js) from 3.25.0 to 3.25.3. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/zloirock/core-js/compare/v3.25.0...v3.25.3) --- updated-dependencies: - dependency-name: core-js dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vue/package.json | 4 ++-- vue/yarn.lock | 22 +++++++++++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/vue/package.json b/vue/package.json index 324ca55bb9..c55733c701 100644 --- a/vue/package.json +++ b/vue/package.json @@ -18,7 +18,7 @@ "babel-core": "^6.26.3", "babel-loader": "^8.2.5", "bootstrap-vue": "^2.21.2", - "core-js": "^3.25.0", + "core-js": "^3.25.3", "html2pdf.js": "^0.10.1", "lodash": "^4.17.21", "mavon-editor": "^2.10.4", @@ -62,7 +62,7 @@ "workbox-expiration": "^6.3.0", "workbox-navigation-preload": "^6.0.2", "workbox-precaching": "^6.5.3", - "workbox-routing": "^6.5.0", + "workbox-routing": "^6.5.4", "workbox-strategies": "^6.2.4" }, "eslintConfig": { diff --git a/vue/yarn.lock b/vue/yarn.lock index eb69c5114c..4e2d6218f0 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -4349,10 +4349,10 @@ core-js@^2.4.0, core-js@^2.5.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== -core-js@^3.25.0, core-js@^3.6.0, core-js@^3.7.0, core-js@^3.8.3: - version "3.25.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.0.tgz#be71d9e0dd648ffd70c44a7ec2319d039357eceb" - integrity sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA== +core-js@^3.25.3, core-js@^3.6.0, core-js@^3.7.0, core-js@^3.8.3: + version "3.25.3" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.3.tgz#cbc2be50b5ddfa7981837bd8c41639f27b166593" + integrity sha512-y1hvKXmPHvm5B7w4ln1S4uc9eV/O5+iFExSRUimnvIph11uaizFR8LFMdONN8hG3P2pipUfX4Y/fR8rAEtcHcQ== core-util-is@~1.0.0: version "1.0.3" @@ -11673,6 +11673,11 @@ workbox-core@6.5.3: resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.3.tgz#bca038a9ef0d7a634a6db2a60f45313ed22ac249" integrity sha512-Bb9ey5n/M9x+l3fBTlLpHt9ASTzgSGj6vxni7pY72ilB/Pb3XtN+cZ9yueboVhD5+9cNQrC9n/E1fSrqWsUz7Q== +workbox-core@6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.4.tgz#df48bf44cd58bb1d1726c49b883fb1dffa24c9ba" + integrity sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q== + workbox-core@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-5.1.4.tgz#8bbfb2362ecdff30e25d123c82c79ac65d9264f4" @@ -11769,7 +11774,7 @@ workbox-recipes@6.5.3: workbox-routing "6.5.3" workbox-strategies "6.5.3" -workbox-routing@6.5.3, workbox-routing@^6.5.0: +workbox-routing@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.3.tgz#a0a699d8cc90b5692bd3df24679acbbda3913777" integrity sha512-DFjxcuRAJjjt4T34RbMm3MCn+xnd36UT/2RfPRfa8VWJGItGJIn7tG+GwVTdHmvE54i/QmVTJepyAGWtoLPTmg== @@ -11783,6 +11788,13 @@ workbox-routing@^5.1.4: dependencies: workbox-core "^5.1.4" +workbox-routing@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da" + integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg== + dependencies: + workbox-core "6.5.4" + workbox-strategies@6.5.3, workbox-strategies@^6.2.4: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.3.tgz#4bea9a48fee16cf43766e0d8138296773c8a9783" From a852f581ba8d87103f05531b6431dcb5acc8b18f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 08:40:32 +0000 Subject: [PATCH 18/77] Bump @popperjs/core from 2.11.5 to 2.11.6 in /vue Bumps [@popperjs/core](https://github.com/popperjs/popper-core) from 2.11.5 to 2.11.6. - [Release notes](https://github.com/popperjs/popper-core/releases) - [Commits](https://github.com/popperjs/popper-core/compare/v2.11.5...v2.11.6) --- updated-dependencies: - dependency-name: "@popperjs/core" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vue/package.json | 4 ++-- vue/yarn.lock | 22 +++++++++++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/vue/package.json b/vue/package.json index 324ca55bb9..08f33780f4 100644 --- a/vue/package.json +++ b/vue/package.json @@ -10,7 +10,7 @@ "dependencies": { "@babel/eslint-parser": "^7.16.0", "@kevinfaguiar/vue-twemoji-picker": "^5.7.4", - "@popperjs/core": "^2.11.2", + "@popperjs/core": "^2.11.6", "@riophae/vue-treeselect": "^0.4.0", "@vue/cli": "^5.0.4", "axios": "^0.27.2", @@ -62,7 +62,7 @@ "workbox-expiration": "^6.3.0", "workbox-navigation-preload": "^6.0.2", "workbox-precaching": "^6.5.3", - "workbox-routing": "^6.5.0", + "workbox-routing": "^6.5.4", "workbox-strategies": "^6.2.4" }, "eslintConfig": { diff --git a/vue/yarn.lock b/vue/yarn.lock index eb69c5114c..8b5eee1e8e 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -1271,10 +1271,10 @@ resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== -"@popperjs/core@^2.11.2", "@popperjs/core@^2.4.0": - version "2.11.5" - resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.5.tgz#db5a11bf66bdab39569719555b0f76e138d7bd64" - integrity sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw== +"@popperjs/core@^2.11.6", "@popperjs/core@^2.4.0": + version "2.11.6" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45" + integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw== "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" @@ -11673,6 +11673,11 @@ workbox-core@6.5.3: resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.3.tgz#bca038a9ef0d7a634a6db2a60f45313ed22ac249" integrity sha512-Bb9ey5n/M9x+l3fBTlLpHt9ASTzgSGj6vxni7pY72ilB/Pb3XtN+cZ9yueboVhD5+9cNQrC9n/E1fSrqWsUz7Q== +workbox-core@6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.4.tgz#df48bf44cd58bb1d1726c49b883fb1dffa24c9ba" + integrity sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q== + workbox-core@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-5.1.4.tgz#8bbfb2362ecdff30e25d123c82c79ac65d9264f4" @@ -11769,7 +11774,7 @@ workbox-recipes@6.5.3: workbox-routing "6.5.3" workbox-strategies "6.5.3" -workbox-routing@6.5.3, workbox-routing@^6.5.0: +workbox-routing@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.3.tgz#a0a699d8cc90b5692bd3df24679acbbda3913777" integrity sha512-DFjxcuRAJjjt4T34RbMm3MCn+xnd36UT/2RfPRfa8VWJGItGJIn7tG+GwVTdHmvE54i/QmVTJepyAGWtoLPTmg== @@ -11783,6 +11788,13 @@ workbox-routing@^5.1.4: dependencies: workbox-core "^5.1.4" +workbox-routing@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da" + integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg== + dependencies: + workbox-core "6.5.4" + workbox-strategies@6.5.3, workbox-strategies@^6.2.4: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.3.tgz#4bea9a48fee16cf43766e0d8138296773c8a9783" From fb683bf230470c7f7ead7c988d98e1cb05292ec9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 08:40:45 +0000 Subject: [PATCH 19/77] Bump vue-template-compiler from 2.6.14 to 2.7.10 in /vue Bumps [vue-template-compiler](https://github.com/vuejs/vue) from 2.6.14 to 2.7.10. - [Release notes](https://github.com/vuejs/vue/releases) - [Changelog](https://github.com/vuejs/vue/blob/main/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue/compare/v2.6.14...v2.7.10) --- updated-dependencies: - dependency-name: vue-template-compiler dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- vue/package.json | 4 ++-- vue/yarn.lock | 26 +++++++++++++++++++------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/vue/package.json b/vue/package.json index 324ca55bb9..ba9b471391 100644 --- a/vue/package.json +++ b/vue/package.json @@ -36,7 +36,7 @@ "vue-property-decorator": "^9.1.2", "vue-sanitize": "^0.2.2", "vue-simple-calendar": "^5.0.0", - "vue-template-compiler": "^2.6.14", + "vue-template-compiler": "^2.7.10", "vue2-touch-events": "^3.2.2", "vuedraggable": "^2.24.3", "vuex": "^3.6.0", @@ -62,7 +62,7 @@ "workbox-expiration": "^6.3.0", "workbox-navigation-preload": "^6.0.2", "workbox-precaching": "^6.5.3", - "workbox-routing": "^6.5.0", + "workbox-routing": "^6.5.4", "workbox-strategies": "^6.2.4" }, "eslintConfig": { diff --git a/vue/yarn.lock b/vue/yarn.lock index eb69c5114c..8c1c9e2d4a 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -6369,7 +6369,7 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.1" -he@^1.1.0, he@^1.2.0: +he@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== @@ -11203,13 +11203,13 @@ vue-style-loader@^4.1.0, vue-style-loader@^4.1.3: hash-sum "^1.0.2" loader-utils "^1.0.2" -vue-template-compiler@^2.6.14: - version "2.6.14" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz#a2f0e7d985670d42c9c9ee0d044fed7690f4f763" - integrity sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g== +vue-template-compiler@^2.7.10: + version "2.7.10" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz#9e20f35b2fdccacacf732dd7dedb49bf65f4556b" + integrity sha512-QO+8R9YRq1Gudm8ZMdo/lImZLJVUIAM8c07Vp84ojdDAf8HmPJc7XB556PcXV218k2AkKznsRz6xB5uOjAC4EQ== dependencies: de-indent "^1.0.2" - he "^1.1.0" + he "^1.2.0" vue-template-es2015-compiler@^1.9.0: version "1.9.1" @@ -11673,6 +11673,11 @@ workbox-core@6.5.3: resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.3.tgz#bca038a9ef0d7a634a6db2a60f45313ed22ac249" integrity sha512-Bb9ey5n/M9x+l3fBTlLpHt9ASTzgSGj6vxni7pY72ilB/Pb3XtN+cZ9yueboVhD5+9cNQrC9n/E1fSrqWsUz7Q== +workbox-core@6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.4.tgz#df48bf44cd58bb1d1726c49b883fb1dffa24c9ba" + integrity sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q== + workbox-core@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-5.1.4.tgz#8bbfb2362ecdff30e25d123c82c79ac65d9264f4" @@ -11769,7 +11774,7 @@ workbox-recipes@6.5.3: workbox-routing "6.5.3" workbox-strategies "6.5.3" -workbox-routing@6.5.3, workbox-routing@^6.5.0: +workbox-routing@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.3.tgz#a0a699d8cc90b5692bd3df24679acbbda3913777" integrity sha512-DFjxcuRAJjjt4T34RbMm3MCn+xnd36UT/2RfPRfa8VWJGItGJIn7tG+GwVTdHmvE54i/QmVTJepyAGWtoLPTmg== @@ -11783,6 +11788,13 @@ workbox-routing@^5.1.4: dependencies: workbox-core "^5.1.4" +workbox-routing@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da" + integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg== + dependencies: + workbox-core "6.5.4" + workbox-strategies@6.5.3, workbox-strategies@^6.2.4: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.3.tgz#4bea9a48fee16cf43766e0d8138296773c8a9783" From fc72efac047da0eeb3326ba85e060a443ad9e687 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 08:41:18 +0000 Subject: [PATCH 20/77] Bump vue-i18n from 8.27.1 to 8.27.2 in /vue Bumps [vue-i18n](https://github.com/intlify/vue-i18n-next/tree/HEAD/packages/vue-i18n) from 8.27.1 to 8.27.2. - [Release notes](https://github.com/intlify/vue-i18n-next/releases) - [Changelog](https://github.com/intlify/vue-i18n-next/blob/master/CHANGELOG.md) - [Commits](https://github.com/intlify/vue-i18n-next/commits/HEAD/packages/vue-i18n) --- updated-dependencies: - dependency-name: vue-i18n dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vue/package.json | 4 ++-- vue/yarn.lock | 22 +++++++++++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/vue/package.json b/vue/package.json index 324ca55bb9..eb9e632649 100644 --- a/vue/package.json +++ b/vue/package.json @@ -30,7 +30,7 @@ "vue-clickaway": "^2.2.2", "vue-clipboard2": "^0.3.3", "vue-cookies": "^1.8.1", - "vue-i18n": "^8.26.8", + "vue-i18n": "^8.27.2", "vue-infinite-loading": "^2.4.5", "vue-multiselect": "^2.1.6", "vue-property-decorator": "^9.1.2", @@ -62,7 +62,7 @@ "workbox-expiration": "^6.3.0", "workbox-navigation-preload": "^6.0.2", "workbox-precaching": "^6.5.3", - "workbox-routing": "^6.5.0", + "workbox-routing": "^6.5.4", "workbox-strategies": "^6.2.4" }, "eslintConfig": { diff --git a/vue/yarn.lock b/vue/yarn.lock index eb69c5114c..8af20fc417 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -11150,10 +11150,10 @@ vue-i18n-extract@1.0.2: is-valid-glob "^1.0.0" yargs "^13.2.2" -vue-i18n@^8.17.0, vue-i18n@^8.26.8: - version "8.27.1" - resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.27.1.tgz#fe660f6c14793ae404d6a715875d772594a3324f" - integrity sha512-lWrGm4F25qReJ7XxSnFVb2h3PfW54ldnM4C+YLBGGJ75+Myt/kj4hHSTKqsyDLamvNYpvINMicSOdW+7yuqgIQ== +vue-i18n@^8.17.0, vue-i18n@^8.27.2: + version "8.27.2" + resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.27.2.tgz#b649a65ff42b7d1a482679b732902f889965a068" + integrity sha512-QVzn7u2WVH8F7eSKIM00lujC7x1mnuGPaTnDTmB01Hd709jDtB9kYtBqM+MWmp5AJRx3gnqAdZbee9MelqwFBg== vue-infinite-loading@^2.4.5: version "2.4.5" @@ -11673,6 +11673,11 @@ workbox-core@6.5.3: resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.3.tgz#bca038a9ef0d7a634a6db2a60f45313ed22ac249" integrity sha512-Bb9ey5n/M9x+l3fBTlLpHt9ASTzgSGj6vxni7pY72ilB/Pb3XtN+cZ9yueboVhD5+9cNQrC9n/E1fSrqWsUz7Q== +workbox-core@6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.4.tgz#df48bf44cd58bb1d1726c49b883fb1dffa24c9ba" + integrity sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q== + workbox-core@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-5.1.4.tgz#8bbfb2362ecdff30e25d123c82c79ac65d9264f4" @@ -11769,7 +11774,7 @@ workbox-recipes@6.5.3: workbox-routing "6.5.3" workbox-strategies "6.5.3" -workbox-routing@6.5.3, workbox-routing@^6.5.0: +workbox-routing@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.3.tgz#a0a699d8cc90b5692bd3df24679acbbda3913777" integrity sha512-DFjxcuRAJjjt4T34RbMm3MCn+xnd36UT/2RfPRfa8VWJGItGJIn7tG+GwVTdHmvE54i/QmVTJepyAGWtoLPTmg== @@ -11783,6 +11788,13 @@ workbox-routing@^5.1.4: dependencies: workbox-core "^5.1.4" +workbox-routing@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da" + integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg== + dependencies: + workbox-core "6.5.4" + workbox-strategies@6.5.3, workbox-strategies@^6.2.4: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.3.tgz#4bea9a48fee16cf43766e0d8138296773c8a9783" From 8f9a489c7e9baee5d6d3c5df06887d80ecc36034 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 08:41:31 +0000 Subject: [PATCH 21/77] Bump @vue/compiler-sfc from 3.2.36 to 3.2.40 in /vue Bumps [@vue/compiler-sfc](https://github.com/vuejs/core/tree/HEAD/packages/compiler-sfc) from 3.2.36 to 3.2.40. - [Release notes](https://github.com/vuejs/core/releases) - [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md) - [Commits](https://github.com/vuejs/core/commits/v3.2.40/packages/compiler-sfc) --- updated-dependencies: - dependency-name: "@vue/compiler-sfc" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vue/package.json | 4 +-- vue/yarn.lock | 86 +++++++++++++++++++++++++++--------------------- 2 files changed, 51 insertions(+), 39 deletions(-) diff --git a/vue/package.json b/vue/package.json index 324ca55bb9..00f0020ee9 100644 --- a/vue/package.json +++ b/vue/package.json @@ -51,7 +51,7 @@ "@vue/cli-plugin-pwa": "^5.0.4", "@vue/cli-plugin-typescript": "^5.0.4", "@vue/cli-service": "^5.0.4", - "@vue/compiler-sfc": "^3.2.29", + "@vue/compiler-sfc": "^3.2.40", "@vue/eslint-config-typescript": "^10.0.0", "babel-eslint": "^10.1.0", "eslint": "^7.28.0", @@ -62,7 +62,7 @@ "workbox-expiration": "^6.3.0", "workbox-navigation-preload": "^6.0.2", "workbox-precaching": "^6.5.3", - "workbox-routing": "^6.5.0", + "workbox-routing": "^6.5.4", "workbox-strategies": "^6.2.4" }, "eslintConfig": { diff --git a/vue/yarn.lock b/vue/yarn.lock index eb69c5114c..4b3e0f91e7 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -2278,47 +2278,47 @@ vue-codemod "^0.0.5" yaml-front-matter "^4.1.0" -"@vue/compiler-core@3.2.36", "@vue/compiler-core@^3.0.5": - version "3.2.36" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.36.tgz#2fa44595308c95610602df54dcb69063ba2c8383" - integrity sha512-bbyZM5hvBicv0PW3KUfVi+x3ylHnfKG7DOn5wM+f2OztTzTjLEyBb/5yrarIYpmnGitVGbjZqDbODyW4iK8hqw== +"@vue/compiler-core@3.2.40", "@vue/compiler-core@^3.0.5": + version "3.2.40" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.40.tgz#c785501f09536748121e937fb87605bbb1ada8e5" + integrity sha512-2Dc3Stk0J/VyQ4OUr2yEC53kU28614lZS+bnrCbFSAIftBJ40g/2yQzf4mPBiFuqguMB7hyHaujdgZAQ67kZYA== dependencies: "@babel/parser" "^7.16.4" - "@vue/shared" "3.2.36" + "@vue/shared" "3.2.40" estree-walker "^2.0.2" source-map "^0.6.1" -"@vue/compiler-dom@3.2.36", "@vue/compiler-dom@^3.0.5": - version "3.2.36" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.36.tgz#16d911ff163ed5fc8087a01645bf14bb7f325401" - integrity sha512-tcOTAOiW4s24QLnq+ON6J+GRONXJ+A/mqKCORi0LSlIh8XQlNnlm24y8xIL8la+ZDgkdbjarQ9ZqYSvEja6gVA== +"@vue/compiler-dom@3.2.40", "@vue/compiler-dom@^3.0.5": + version "3.2.40" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.40.tgz#c225418773774db536174d30d3f25ba42a33e7e4" + integrity sha512-OZCNyYVC2LQJy4H7h0o28rtk+4v+HMQygRTpmibGoG9wZyomQiS5otU7qo3Wlq5UfHDw2RFwxb9BJgKjVpjrQw== dependencies: - "@vue/compiler-core" "3.2.36" - "@vue/shared" "3.2.36" + "@vue/compiler-core" "3.2.40" + "@vue/shared" "3.2.40" -"@vue/compiler-sfc@^3.2.29": - version "3.2.36" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.36.tgz#e5065e7c0e5170ffa750e3c3dd93a29db109d0f2" - integrity sha512-AvGb4bTj4W8uQ4BqaSxo7UwTEqX5utdRSMyHy58OragWlt8nEACQ9mIeQh3K4di4/SX+41+pJrLIY01lHAOFOA== +"@vue/compiler-sfc@^3.2.40": + version "3.2.40" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.40.tgz#61823283efc84d25d9d2989458f305d32a2ed141" + integrity sha512-tzqwniIN1fu1PDHC3CpqY/dPCfN/RN1thpBC+g69kJcrl7mbGiHKNwbA6kJ3XKKy8R6JLKqcpVugqN4HkeBFFg== dependencies: "@babel/parser" "^7.16.4" - "@vue/compiler-core" "3.2.36" - "@vue/compiler-dom" "3.2.36" - "@vue/compiler-ssr" "3.2.36" - "@vue/reactivity-transform" "3.2.36" - "@vue/shared" "3.2.36" + "@vue/compiler-core" "3.2.40" + "@vue/compiler-dom" "3.2.40" + "@vue/compiler-ssr" "3.2.40" + "@vue/reactivity-transform" "3.2.40" + "@vue/shared" "3.2.40" estree-walker "^2.0.2" magic-string "^0.25.7" postcss "^8.1.10" source-map "^0.6.1" -"@vue/compiler-ssr@3.2.36": - version "3.2.36" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.36.tgz#314f3a9424db58142c3608f48cbda7aa05fc66cb" - integrity sha512-+KugInUFRvOxEdLkZwE+W43BqHyhBh0jpYXhmqw1xGq2dmE6J9eZ8UUSOKNhdHtQ/iNLWWeK/wPZkVLUf3YGaw== +"@vue/compiler-ssr@3.2.40": + version "3.2.40" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.40.tgz#67df95a096c63e9ec4b50b84cc6f05816793629c" + integrity sha512-80cQcgasKjrPPuKcxwuCx7feq+wC6oFl5YaKSee9pV3DNq+6fmCVwEEC3vvkf/E2aI76rIJSOYHsWSEIxK74oQ== dependencies: - "@vue/compiler-dom" "3.2.36" - "@vue/shared" "3.2.36" + "@vue/compiler-dom" "3.2.40" + "@vue/shared" "3.2.40" "@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.3.0": version "3.3.0" @@ -2345,21 +2345,21 @@ "@typescript-eslint/parser" "^5.0.0" vue-eslint-parser "^8.0.0" -"@vue/reactivity-transform@3.2.36": - version "3.2.36" - resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.36.tgz#8426a941b0b09d1b94fc162d4642758183b5d133" - integrity sha512-Jk5o2BhpODC9XTA7o4EL8hSJ4JyrFWErLtClG3NH8wDS7ri9jBDWxI7/549T7JY9uilKsaNM+4pJASLj5dtRwA== +"@vue/reactivity-transform@3.2.40": + version "3.2.40" + resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.40.tgz#dc24b9074b26f0d9dd2034c6349f5bb2a51c86ac" + integrity sha512-HQUCVwEaacq6fGEsg2NUuGKIhUveMCjOk8jGHqLXPI2w6zFoPrlQhwWEaINTv5kkZDXKEnCijAp+4gNEHG03yw== dependencies: "@babel/parser" "^7.16.4" - "@vue/compiler-core" "3.2.36" - "@vue/shared" "3.2.36" + "@vue/compiler-core" "3.2.40" + "@vue/shared" "3.2.40" estree-walker "^2.0.2" magic-string "^0.25.7" -"@vue/shared@3.2.36": - version "3.2.36" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.36.tgz#35e11200542cf29068ba787dad57da9bdb82f644" - integrity sha512-JtB41wXl7Au3+Nl3gD16Cfpj7k/6aCroZ6BbOiCMFCMvrOpkg/qQUXTso2XowaNqBbnkuGHurLAqkLBxNGc1hQ== +"@vue/shared@3.2.40": + version "3.2.40" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.40.tgz#e57799da2a930b975321981fcee3d1e90ed257ae" + integrity sha512-0PLQ6RUtZM0vO3teRfzGi4ltLUO5aO+kLgwh4Um3THSR03rpQWLTuRCkuO5A41ITzwdWeKdPHtSARuPkoo5pCQ== "@vue/vue-loader-v15@npm:vue-loader@^15.9.7": version "15.9.8" @@ -11673,6 +11673,11 @@ workbox-core@6.5.3: resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.3.tgz#bca038a9ef0d7a634a6db2a60f45313ed22ac249" integrity sha512-Bb9ey5n/M9x+l3fBTlLpHt9ASTzgSGj6vxni7pY72ilB/Pb3XtN+cZ9yueboVhD5+9cNQrC9n/E1fSrqWsUz7Q== +workbox-core@6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.4.tgz#df48bf44cd58bb1d1726c49b883fb1dffa24c9ba" + integrity sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q== + workbox-core@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-5.1.4.tgz#8bbfb2362ecdff30e25d123c82c79ac65d9264f4" @@ -11769,7 +11774,7 @@ workbox-recipes@6.5.3: workbox-routing "6.5.3" workbox-strategies "6.5.3" -workbox-routing@6.5.3, workbox-routing@^6.5.0: +workbox-routing@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.3.tgz#a0a699d8cc90b5692bd3df24679acbbda3913777" integrity sha512-DFjxcuRAJjjt4T34RbMm3MCn+xnd36UT/2RfPRfa8VWJGItGJIn7tG+GwVTdHmvE54i/QmVTJepyAGWtoLPTmg== @@ -11783,6 +11788,13 @@ workbox-routing@^5.1.4: dependencies: workbox-core "^5.1.4" +workbox-routing@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da" + integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg== + dependencies: + workbox-core "6.5.4" + workbox-strategies@6.5.3, workbox-strategies@^6.2.4: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.3.tgz#4bea9a48fee16cf43766e0d8138296773c8a9783" From 5174f9939cbfb9c784d4c5340c2295ceb66b83c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 08:43:38 +0000 Subject: [PATCH 22/77] Bump @vue/cli-plugin-typescript from 5.0.4 to 5.0.8 in /vue Bumps [@vue/cli-plugin-typescript](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-typescript) from 5.0.4 to 5.0.8. - [Release notes](https://github.com/vuejs/vue-cli/releases) - [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-cli/commits/v5.0.8/packages/@vue/cli-plugin-typescript) --- updated-dependencies: - dependency-name: "@vue/cli-plugin-typescript" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vue/package.json | 2 +- vue/yarn.lock | 20 +++++--------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/vue/package.json b/vue/package.json index 6fdf0cbdd3..3f321b3415 100644 --- a/vue/package.json +++ b/vue/package.json @@ -49,7 +49,7 @@ "@vue/cli-plugin-babel": "^5.0.4", "@vue/cli-plugin-eslint": "~5.0.4", "@vue/cli-plugin-pwa": "^5.0.8", - "@vue/cli-plugin-typescript": "^5.0.4", + "@vue/cli-plugin-typescript": "^5.0.8", "@vue/cli-service": "^5.0.4", "@vue/compiler-sfc": "^3.2.29", "@vue/eslint-config-typescript": "^10.0.0", diff --git a/vue/yarn.lock b/vue/yarn.lock index 008f7ac0ef..3831879f85 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -2,15 +2,6 @@ # yarn lockfile v1 -"@achrinza/node-ipc@^9.2.5": - version "9.2.5" - resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz#29788e608ff41121f0543491da723b243266ac28" - integrity sha512-kBX7Ay911iXZ3VZ1pYltj3Rfu7Ow9H7sK4H4RSfWIfWR2JKNB40K808wppoRIEzE2j2hXLU+r6TJgCAliCGhyQ== - dependencies: - "@node-ipc/js-queue" "2.0.3" - event-pubsub "4.3.0" - js-message "1.0.7" - "@achrinza/node-ipc@^9.2.5": version "9.2.5" resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz#29788e608ff41121f0543491da723b243266ac28" @@ -2145,21 +2136,20 @@ dependencies: "@vue/cli-shared-utils" "^5.0.4" -"@vue/cli-plugin-typescript@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-typescript/-/cli-plugin-typescript-5.0.4.tgz#205956e062a7567f6eb009b6889eb53a1f9db556" - integrity sha512-ITIt9hDc94gI4UCdsoAKYtFp2LAXF9fNYQqXminTnctd0UuTSXGvQcLmCnMYgKfKPVVcAWfG3vCMiB5bsd+Kyg== +"@vue/cli-plugin-typescript@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-typescript/-/cli-plugin-typescript-5.0.8.tgz#dd3d2b3a58f3f93359319958dc0f58a4861a33a7" + integrity sha512-JKJOwzJshBqsmp4yLBexwVMebOZ4VGJgbnYvmHVxasJOStF2RxwyW28ZF+zIvASGdat4sAUuo/3mAQyVhm7JHg== dependencies: "@babel/core" "^7.12.16" "@types/webpack-env" "^1.15.2" - "@vue/cli-shared-utils" "^5.0.4" + "@vue/cli-shared-utils" "^5.0.8" babel-loader "^8.2.2" fork-ts-checker-webpack-plugin "^6.4.0" globby "^11.0.2" thread-loader "^3.0.0" ts-loader "^9.2.5" webpack "^5.54.0" - yorkie "^2.0.0" "@vue/cli-plugin-vuex@^5.0.4": version "5.0.4" From fc0b5bd73824e35821825ea9dd99abb0804efe46 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 08:44:05 +0000 Subject: [PATCH 23/77] Bump @vue/cli-plugin-eslint from 5.0.4 to 5.0.8 in /vue Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint) from 5.0.4 to 5.0.8. - [Release notes](https://github.com/vuejs/vue-cli/releases) - [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-cli/commits/v5.0.8/packages/@vue/cli-plugin-eslint) --- updated-dependencies: - dependency-name: "@vue/cli-plugin-eslint" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vue/package.json | 2 +- vue/yarn.lock | 19 +++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/vue/package.json b/vue/package.json index 6fdf0cbdd3..97752c503c 100644 --- a/vue/package.json +++ b/vue/package.json @@ -47,7 +47,7 @@ "@typescript-eslint/eslint-plugin": "^4.33.0", "@typescript-eslint/parser": "^4.32.0", "@vue/cli-plugin-babel": "^5.0.4", - "@vue/cli-plugin-eslint": "~5.0.4", + "@vue/cli-plugin-eslint": "~5.0.8", "@vue/cli-plugin-pwa": "^5.0.8", "@vue/cli-plugin-typescript": "^5.0.4", "@vue/cli-service": "^5.0.4", diff --git a/vue/yarn.lock b/vue/yarn.lock index 008f7ac0ef..bb447e1eea 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -2,15 +2,6 @@ # yarn lockfile v1 -"@achrinza/node-ipc@^9.2.5": - version "9.2.5" - resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz#29788e608ff41121f0543491da723b243266ac28" - integrity sha512-kBX7Ay911iXZ3VZ1pYltj3Rfu7Ow9H7sK4H4RSfWIfWR2JKNB40K808wppoRIEzE2j2hXLU+r6TJgCAliCGhyQ== - dependencies: - "@node-ipc/js-queue" "2.0.3" - event-pubsub "4.3.0" - js-message "1.0.7" - "@achrinza/node-ipc@^9.2.5": version "9.2.5" resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz#29788e608ff41121f0543491da723b243266ac28" @@ -2117,12 +2108,12 @@ thread-loader "^3.0.0" webpack "^5.54.0" -"@vue/cli-plugin-eslint@~5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-5.0.4.tgz#33ee3e971d8ee1664d55ffd15b2af548af66fef8" - integrity sha512-NLBEKFTFJhYHMzQ3z+sb6xlkcNaN/RcbZ3hiCY72aJe4YOO8jEAp0XkPzlHd4xYkMW7jrmOwwLOPw+3BJ4b77Q== +"@vue/cli-plugin-eslint@~5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-5.0.8.tgz#754939265c2c5b746fa36c7d7705a89138e193bf" + integrity sha512-d11+I5ONYaAPW1KyZj9GlrV/E6HZePq5L5eAF5GgoVdu6sxr6bDgEoxzhcS1Pk2eh8rn1MxG/FyyR+eCBj/CNg== dependencies: - "@vue/cli-shared-utils" "^5.0.4" + "@vue/cli-shared-utils" "^5.0.8" eslint-webpack-plugin "^3.1.0" globby "^11.0.2" webpack "^5.54.0" From 02a12cf724f30cf8cdd751a069650a8188b698b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 15:08:51 +0000 Subject: [PATCH 24/77] Bump @vue/cli-plugin-babel from 5.0.4 to 5.0.8 in /vue Bumps [@vue/cli-plugin-babel](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-babel) from 5.0.4 to 5.0.8. - [Release notes](https://github.com/vuejs/vue-cli/releases) - [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-cli/commits/v5.0.8/packages/@vue/cli-plugin-babel) --- updated-dependencies: - dependency-name: "@vue/cli-plugin-babel" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vue/package.json | 2 +- vue/yarn.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/vue/package.json b/vue/package.json index 9ce20b1263..54ef39e6f0 100644 --- a/vue/package.json +++ b/vue/package.json @@ -46,7 +46,7 @@ "@kazupon/vue-i18n-loader": "^0.5.0", "@typescript-eslint/eslint-plugin": "^4.33.0", "@typescript-eslint/parser": "^4.32.0", - "@vue/cli-plugin-babel": "^5.0.4", + "@vue/cli-plugin-babel": "^5.0.8", "@vue/cli-plugin-eslint": "~5.0.8", "@vue/cli-plugin-pwa": "^5.0.8", "@vue/cli-plugin-typescript": "^5.0.8", diff --git a/vue/yarn.lock b/vue/yarn.lock index d9f7abdd05..275469353b 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -2006,10 +2006,10 @@ lodash.kebabcase "^4.1.1" svg-tags "^1.0.0" -"@vue/babel-preset-app@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-5.0.4.tgz#0f1ba2893be266a3cb78e3429d199238a5aa0043" - integrity sha512-vf4KqrmuOSnoEYGUiHPeMoxhh6wpiucLWXISn7xYFU80pK1lqcuhbl6tpurAanUIyRO/ENDUQBH7RAdbLNq1bA== +"@vue/babel-preset-app@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-5.0.8.tgz#ce38f76314f5265d62a89756ef264c21f1d351a1" + integrity sha512-yl+5qhpjd8e1G4cMXfORkkBlvtPCIgmRf3IYCWYDKIQ7m+PPa5iTm4feiNmCMD6yGqQWMhhK/7M3oWGL9boKwg== dependencies: "@babel/core" "^7.12.16" "@babel/helper-compilation-targets" "^7.12.16" @@ -2096,14 +2096,14 @@ resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-5.0.4.tgz#5dae235fd84ecb0f94ed08a475db191fff893a7b" integrity sha512-ZTLAAydILjvx0XHUGSNu/cQDpmvLTMYUutDf2vf6XGkSWYqncQ6RwkeMSQhvQNlgpa/ovwIgrlGxLoojFRwdVg== -"@vue/cli-plugin-babel@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-5.0.4.tgz#5aa7001e36f5db5e4ed60b4a36bfc71a7257599c" - integrity sha512-413ZwOWLtgw5vWJoMbrv36crW3qTas4Iru8sU7cRb0IqEZbS28R9X4PVtO8Pek2NYFbrs2XKRYOB7GblB6hVqg== +"@vue/cli-plugin-babel@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-5.0.8.tgz#54f9a07900f29baff54803dcfa916c602894feb7" + integrity sha512-a4qqkml3FAJ3auqB2kN2EMPocb/iu0ykeELwed+9B1c1nQ1HKgslKMHMPavYx3Cd/QAx2mBD4hwKBqZXEI/CsQ== dependencies: "@babel/core" "^7.12.16" - "@vue/babel-preset-app" "^5.0.4" - "@vue/cli-shared-utils" "^5.0.4" + "@vue/babel-preset-app" "^5.0.8" + "@vue/cli-shared-utils" "^5.0.8" babel-loader "^8.2.2" thread-loader "^3.0.0" webpack "^5.54.0" From c118ab9a3c66f8e29ed70fb3437729cc578587e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 15:09:01 +0000 Subject: [PATCH 25/77] Bump workbox-precaching from 6.5.3 to 6.5.4 in /vue Bumps [workbox-precaching](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/googlechrome/workbox/releases) - [Commits](https://github.com/googlechrome/workbox/compare/v6.5.3...v6.5.4) --- updated-dependencies: - dependency-name: workbox-precaching dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vue/package.json | 6 +++--- vue/yarn.lock | 53 +++++++++++++++++++++++++++++++----------------- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/vue/package.json b/vue/package.json index 5d50d8c61e..58905f3fb3 100644 --- a/vue/package.json +++ b/vue/package.json @@ -30,7 +30,7 @@ "vue-clickaway": "^2.2.2", "vue-clipboard2": "^0.3.3", "vue-cookies": "^1.8.1", - "vue-i18n": "^8.26.8", + "vue-i18n": "^8.27.2", "vue-infinite-loading": "^2.4.5", "vue-multiselect": "^2.1.6", "vue-property-decorator": "^9.1.2", @@ -49,7 +49,7 @@ "@vue/cli-plugin-babel": "^5.0.4", "@vue/cli-plugin-eslint": "~5.0.8", "@vue/cli-plugin-pwa": "^5.0.8", - "@vue/cli-plugin-typescript": "^5.0.4", + "@vue/cli-plugin-typescript": "^5.0.8", "@vue/cli-service": "^5.0.4", "@vue/compiler-sfc": "^3.2.40", "@vue/eslint-config-typescript": "^10.0.0", @@ -61,7 +61,7 @@ "webpack-bundle-tracker": "1.6.0", "workbox-expiration": "^6.3.0", "workbox-navigation-preload": "^6.5.4", - "workbox-precaching": "^6.5.3", + "workbox-precaching": "^6.5.4", "workbox-routing": "^6.5.4", "workbox-strategies": "^6.2.4" }, diff --git a/vue/yarn.lock b/vue/yarn.lock index dd6af68687..2698c77504 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -2136,21 +2136,20 @@ dependencies: "@vue/cli-shared-utils" "^5.0.4" -"@vue/cli-plugin-typescript@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-typescript/-/cli-plugin-typescript-5.0.4.tgz#205956e062a7567f6eb009b6889eb53a1f9db556" - integrity sha512-ITIt9hDc94gI4UCdsoAKYtFp2LAXF9fNYQqXminTnctd0UuTSXGvQcLmCnMYgKfKPVVcAWfG3vCMiB5bsd+Kyg== +"@vue/cli-plugin-typescript@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-typescript/-/cli-plugin-typescript-5.0.8.tgz#dd3d2b3a58f3f93359319958dc0f58a4861a33a7" + integrity sha512-JKJOwzJshBqsmp4yLBexwVMebOZ4VGJgbnYvmHVxasJOStF2RxwyW28ZF+zIvASGdat4sAUuo/3mAQyVhm7JHg== dependencies: "@babel/core" "^7.12.16" "@types/webpack-env" "^1.15.2" - "@vue/cli-shared-utils" "^5.0.4" + "@vue/cli-shared-utils" "^5.0.8" babel-loader "^8.2.2" fork-ts-checker-webpack-plugin "^6.4.0" globby "^11.0.2" thread-loader "^3.0.0" ts-loader "^9.2.5" webpack "^5.54.0" - yorkie "^2.0.0" "@vue/cli-plugin-vuex@^5.0.4": version "5.0.4" @@ -11010,10 +11009,10 @@ vue-i18n-extract@1.0.2: is-valid-glob "^1.0.0" yargs "^13.2.2" -vue-i18n@^8.17.0, vue-i18n@^8.26.8: - version "8.27.1" - resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.27.1.tgz#fe660f6c14793ae404d6a715875d772594a3324f" - integrity sha512-lWrGm4F25qReJ7XxSnFVb2h3PfW54ldnM4C+YLBGGJ75+Myt/kj4hHSTKqsyDLamvNYpvINMicSOdW+7yuqgIQ== +vue-i18n@^8.17.0, vue-i18n@^8.27.2: + version "8.27.2" + resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.27.2.tgz#b649a65ff42b7d1a482679b732902f889965a068" + integrity sha512-QVzn7u2WVH8F7eSKIM00lujC7x1mnuGPaTnDTmB01Hd709jDtB9kYtBqM+MWmp5AJRx3gnqAdZbee9MelqwFBg== vue-infinite-loading@^2.4.5: version "2.4.5" @@ -11604,7 +11603,7 @@ workbox-navigation-preload@^6.5.4: dependencies: workbox-core "6.5.4" -workbox-precaching@6.5.3, workbox-precaching@^6.5.3: +workbox-precaching@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.3.tgz#c870312b2ef901d790ab9e48da084e776c62af47" integrity sha512-sjNfgNLSsRX5zcc63H/ar/hCf+T19fRtTqvWh795gdpghWb5xsfEkecXEvZ8biEi1QD7X/ljtHphdaPvXDygMQ== @@ -11620,6 +11619,15 @@ workbox-precaching@^5.1.4: dependencies: workbox-core "^5.1.4" +workbox-precaching@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.4.tgz#740e3561df92c6726ab5f7471e6aac89582cab72" + integrity sha512-hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg== + dependencies: + workbox-core "6.5.4" + workbox-routing "6.5.4" + workbox-strategies "6.5.4" + workbox-range-requests@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.3.tgz#e624ac82ff266a5e4f236d055797def07949d941" @@ -11653,6 +11661,13 @@ workbox-routing@6.5.3: dependencies: workbox-core "6.5.3" +workbox-routing@6.5.4, workbox-routing@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da" + integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg== + dependencies: + workbox-core "6.5.4" + workbox-routing@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-5.1.4.tgz#3e8cd86bd3b6573488d1a2ce7385e547b547e970" @@ -11660,20 +11675,20 @@ workbox-routing@^5.1.4: dependencies: workbox-core "^5.1.4" -workbox-routing@^6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da" - integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg== - dependencies: - workbox-core "6.5.4" - -workbox-strategies@6.5.3, workbox-strategies@^6.2.4: +workbox-strategies@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.3.tgz#4bea9a48fee16cf43766e0d8138296773c8a9783" integrity sha512-MgmGRrDVXs7rtSCcetZgkSZyMpRGw8HqL2aguszOc3nUmzGZsT238z/NN9ZouCxSzDu3PQ3ZSKmovAacaIhu1w== dependencies: workbox-core "6.5.3" +workbox-strategies@6.5.4, workbox-strategies@^6.2.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.4.tgz#4edda035b3c010fc7f6152918370699334cd204d" + integrity sha512-DEtsxhx0LIYWkJBTQolRxG4EI0setTJkqR4m7r4YpBdxtWJH1Mbg01Cj8ZjNOO8etqfA3IZaOPHUxCs8cBsKLw== + dependencies: + workbox-core "6.5.4" + workbox-strategies@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-5.1.4.tgz#96b1418ccdfde5354612914964074d466c52d08c" From 0421a1aa6c81cf2b60817c25b93f5193ec00e07f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 15:09:02 +0000 Subject: [PATCH 26/77] Bump prismjs from 1.28.0 to 1.29.0 in /vue Bumps [prismjs](https://github.com/PrismJS/prism) from 1.28.0 to 1.29.0. - [Release notes](https://github.com/PrismJS/prism/releases) - [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md) - [Commits](https://github.com/PrismJS/prism/compare/v1.28.0...v1.29.0) --- updated-dependencies: - dependency-name: prismjs dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- vue/package.json | 2 +- vue/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vue/package.json b/vue/package.json index 9ce20b1263..b107203e61 100644 --- a/vue/package.json +++ b/vue/package.json @@ -23,7 +23,7 @@ "lodash": "^4.17.21", "mavon-editor": "^2.10.4", "moment": "^2.29.4", - "prismjs": "^1.27.0", + "prismjs": "^1.29.0", "vue": "^2.6.14", "vue-class-component": "^7.2.3", "vue-click-outside": "^1.1.0", diff --git a/vue/yarn.lock b/vue/yarn.lock index d9f7abdd05..aaceaaa6d6 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -8836,10 +8836,10 @@ pretty-error@^4.0.0: lodash "^4.17.20" renderkid "^3.0.0" -prismjs@^1.23.0, prismjs@^1.27.0: - version "1.28.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.28.0.tgz#0d8f561fa0f7cf6ebca901747828b149147044b6" - integrity sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw== +prismjs@^1.23.0, prismjs@^1.29.0: + version "1.29.0" + resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.29.0.tgz#f113555a8fa9b57c35e637bba27509dcf802dd12" + integrity sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q== private@^0.1.8, private@~0.1.5: version "0.1.8" From 7ebccf564df131a6fd99ea42c85118a8682ec840 Mon Sep 17 00:00:00 2001 From: wella Date: Sat, 1 Oct 2022 15:44:11 +0000 Subject: [PATCH 27/77] Added translation using Weblate (Indonesian) --- vue/src/locales/id.json | 462 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 462 insertions(+) create mode 100644 vue/src/locales/id.json diff --git a/vue/src/locales/id.json b/vue/src/locales/id.json new file mode 100644 index 0000000000..364fd30d88 --- /dev/null +++ b/vue/src/locales/id.json @@ -0,0 +1,462 @@ +{ + "warning_feature_beta": "", + "err_fetching_resource": "", + "err_creating_resource": "", + "err_updating_resource": "", + "err_deleting_resource": "", + "err_deleting_protected_resource": "", + "err_moving_resource": "", + "err_merging_resource": "", + "success_fetching_resource": "", + "success_creating_resource": "", + "success_updating_resource": "", + "success_deleting_resource": "", + "success_moving_resource": "", + "success_merging_resource": "", + "file_upload_disabled": "", + "warning_space_delete": "", + "food_inherit_info": "", + "facet_count_info": "", + "step_time_minutes": "", + "confirm_delete": "", + "import_running": "", + "all_fields_optional": "", + "convert_internal": "", + "show_only_internal": "", + "show_split_screen": "", + "Log_Recipe_Cooking": "", + "External_Recipe_Image": "", + "Add_to_Shopping": "", + "Add_to_Plan": "", + "Step_start_time": "", + "Sort_by_new": "", + "Table_of_Contents": "", + "Recipes_per_page": "", + "Show_as_header": "", + "Hide_as_header": "", + "Add_nutrition_recipe": "", + "Remove_nutrition_recipe": "", + "Copy_template_reference": "", + "Save_and_View": "", + "Manage_Books": "", + "Meal_Plan": "", + "Select_Book": "", + "Select_File": "", + "Recipe_Image": "", + "Import_finished": "", + "View_Recipes": "", + "Log_Cooking": "", + "New_Recipe": "", + "Url_Import": "", + "Reset_Search": "", + "Recently_Viewed": "", + "Load_More": "", + "New_Keyword": "", + "Delete_Keyword": "", + "Edit_Keyword": "", + "Edit_Recipe": "", + "Move_Keyword": "", + "Merge_Keyword": "", + "Hide_Keywords": "", + "Hide_Recipes": "", + "Move_Up": "", + "Move_Down": "", + "Step_Name": "", + "Step_Type": "", + "Make_Header": "", + "Make_Ingredient": "", + "Enable_Amount": "", + "Disable_Amount": "", + "Ingredient Editor": "", + "Private_Recipe": "", + "Private_Recipe_Help": "", + "reusable_help_text": "", + "Add_Step": "", + "Keywords": "", + "Books": "", + "Proteins": "", + "Fats": "", + "Carbohydrates": "", + "Calories": "", + "Energy": "", + "Nutrition": "", + "Date": "", + "Share": "", + "Automation": "", + "Parameter": "", + "Export": "", + "Copy": "", + "Rating": "", + "Close": "", + "Cancel": "", + "Link": "", + "Add": "", + "New": "", + "Note": "", + "Success": "", + "Failure": "", + "Protected": "", + "Ingredients": "", + "Supermarket": "", + "Categories": "", + "Category": "", + "Selected": "", + "min": "", + "Servings": "", + "Waiting": "", + "Preparation": "", + "External": "", + "Size": "", + "Files": "", + "File": "", + "Edit": "", + "Image": "", + "Delete": "", + "Open": "", + "Ok": "", + "Save": "", + "Step": "", + "Search": "", + "Import": "", + "Print": "", + "Settings": "", + "or": "", + "and": "", + "Information": "", + "Download": "", + "Create": "", + "Search Settings": "", + "View": "", + "Recipes": "", + "Move": "", + "Merge": "", + "Parent": "", + "Copy Link": "", + "Copy Token": "", + "delete_confirmation": "", + "move_confirmation": "", + "merge_confirmation": "", + "create_rule": "", + "move_selection": "", + "merge_selection": "", + "Root": "", + "Ignore_Shopping": "", + "Shopping_Category": "", + "Shopping_Categories": "", + "Edit_Food": "", + "Move_Food": "", + "New_Food": "", + "Hide_Food": "", + "Food_Alias": "", + "Unit_Alias": "", + "Keyword_Alias": "", + "Delete_Food": "", + "No_ID": "", + "Meal_Plan_Days": "", + "merge_title": "", + "move_title": "", + "Food": "", + "Recipe_Book": "", + "del_confirmation_tree": "", + "delete_title": "", + "create_title": "", + "edit_title": "", + "Name": "", + "Type": "", + "Description": "", + "Recipe": "", + "tree_root": "", + "Icon": "", + "Unit": "", + "Decimals": "", + "Default_Unit": "", + "No_Results": "", + "New_Unit": "", + "Create_New_Shopping Category": "", + "Create_New_Food": "", + "Create_New_Keyword": "", + "Create_New_Unit": "", + "Create_New_Meal_Type": "", + "Create_New_Shopping_Category": "", + "and_up": "", + "and_down": "", + "Instructions": "", + "Unrated": "", + "Automate": "", + "Empty": "", + "Key_Ctrl": "", + "Key_Shift": "", + "Time": "", + "Text": "", + "Shopping_list": "", + "Added_by": "", + "Added_on": "", + "AddToShopping": "", + "IngredientInShopping": "", + "NotInShopping": "", + "OnHand": "", + "FoodOnHand": "", + "FoodNotOnHand": "", + "Undefined": "", + "Create_Meal_Plan_Entry": "", + "Edit_Meal_Plan_Entry": "", + "Title": "", + "Week": "", + "Month": "", + "Year": "", + "Planner": "", + "Planner_Settings": "", + "Period": "", + "Plan_Period_To_Show": "", + "Periods": "", + "Plan_Show_How_Many_Periods": "", + "Starting_Day": "", + "Meal_Types": "", + "Meal_Type": "", + "New_Entry": "", + "Clone": "", + "Drag_Here_To_Delete": "", + "Meal_Type_Required": "", + "Title_or_Recipe_Required": "", + "Color": "", + "New_Meal_Type": "", + "Use_Fractions": "", + "Use_Fractions_Help": "", + "AddFoodToShopping": "", + "RemoveFoodFromShopping": "", + "DeleteShoppingConfirm": "", + "IgnoredFood": "", + "Add_Servings_to_Shopping": "", + "Week_Numbers": "", + "Show_Week_Numbers": "", + "Export_As_ICal": "", + "Export_To_ICal": "", + "Cannot_Add_Notes_To_Shopping": "", + "Added_To_Shopping_List": "", + "Shopping_List_Empty": "", + "Next_Period": "", + "Previous_Period": "", + "Current_Period": "", + "Next_Day": "", + "Previous_Day": "", + "Inherit": "", + "InheritFields": "", + "FoodInherit": "", + "ShowUncategorizedFood": "", + "GroupBy": "", + "Language": "", + "Theme": "", + "SupermarketCategoriesOnly": "", + "MoveCategory": "", + "CountMore": "", + "IgnoreThis": "", + "DelayFor": "", + "Warning": "", + "NoCategory": "", + "InheritWarning": "", + "ShowDelayed": "", + "Completed": "", + "OfflineAlert": "", + "shopping_share": "", + "shopping_auto_sync": "", + "one_url_per_line": "", + "mealplan_autoadd_shopping": "", + "mealplan_autoexclude_onhand": "", + "mealplan_autoinclude_related": "", + "default_delay": "", + "plan_share_desc": "", + "shopping_share_desc": "", + "shopping_auto_sync_desc": "", + "mealplan_autoadd_shopping_desc": "", + "mealplan_autoexclude_onhand_desc": "", + "mealplan_autoinclude_related_desc": "", + "default_delay_desc": "", + "filter_to_supermarket": "", + "Coming_Soon": "", + "Auto_Planner": "", + "New_Cookbook": "", + "Hide_Keyword": "", + "Hour": "", + "Hours": "", + "Day": "", + "Days": "", + "Second": "", + "Seconds": "", + "Clear": "", + "Users": "", + "Invites": "", + "err_move_self": "", + "nothing": "", + "err_merge_self": "", + "show_sql": "", + "filter_to_supermarket_desc": "", + "CategoryName": "", + "SupermarketName": "", + "CategoryInstruction": "", + "shopping_recent_days_desc": "", + "shopping_recent_days": "", + "download_pdf": "", + "download_csv": "", + "csv_delim_help": "", + "csv_delim_label": "", + "SuccessClipboard": "", + "copy_to_clipboard": "", + "csv_prefix_help": "", + "csv_prefix_label": "", + "copy_markdown_table": "", + "in_shopping": "", + "DelayUntil": "", + "Pin": "", + "mark_complete": "", + "QuickEntry": "", + "shopping_add_onhand_desc": "", + "shopping_add_onhand": "", + "related_recipes": "", + "today_recipes": "", + "sql_debug": "", + "remember_search": "", + "remember_hours": "", + "tree_select": "", + "OnHand_help": "", + "ignore_shopping_help": "", + "shopping_category_help": "", + "food_recipe_help": "", + "Foods": "", + "Account": "", + "Cosmetic": "", + "API": "", + "enable_expert": "", + "expert_mode": "", + "simple_mode": "", + "advanced": "", + "fields": "", + "show_keywords": "", + "show_foods": "", + "show_books": "", + "show_rating": "", + "show_units": "", + "show_filters": "", + "not": "", + "save_filter": "", + "filter_name": "", + "left_handed": "", + "left_handed_help": "", + "Custom Filter": "", + "shared_with": "", + "sort_by": "", + "asc": "", + "desc": "", + "date_viewed": "", + "last_cooked": "", + "times_cooked": "", + "date_created": "", + "show_sortby": "", + "search_rank": "", + "make_now": "", + "recipe_filter": "", + "book_filter_help": "", + "review_shopping": "", + "view_recipe": "", + "copy_to_new": "", + "recipe_name": "", + "paste_ingredients_placeholder": "", + "paste_ingredients": "", + "ingredient_list": "", + "explain": "", + "filter": "", + "Website": "", + "App": "", + "Message": "", + "Bookmarklet": "", + "Sticky_Nav": "", + "Sticky_Nav_Help": "", + "Nav_Color": "", + "Nav_Color_Help": "", + "Use_Kj": "", + "Comments_setting": "", + "click_image_import": "", + "no_more_images_found": "", + "import_duplicates": "", + "paste_json": "", + "Click_To_Edit": "", + "search_no_recipes": "", + "search_import_help_text": "", + "search_create_help_text": "", + "warning_duplicate_filter": "", + "reset_children": "", + "reset_children_help": "", + "reset_food_inheritance": "", + "reset_food_inheritance_info": "", + "substitute_help": "", + "substitute_siblings_help": "", + "substitute_children_help": "", + "substitute_siblings": "", + "substitute_children": "", + "SubstituteOnHand": "", + "ChildInheritFields": "", + "ChildInheritFields_help": "", + "InheritFields_help": "", + "show_ingredient_overview": "", + "Ingredient Overview": "", + "last_viewed": "", + "created_on": "", + "updatedon": "", + "Imported_From": "", + "advanced_search_settings": "", + "nothing_planned_today": "", + "no_pinned_recipes": "", + "Planned": "", + "Pinned": "", + "Imported": "", + "Quick actions": "", + "Ratings": "", + "Internal": "", + "Units": "", + "Manage_Emails": "", + "Change_Password": "", + "Social_Authentication": "", + "Random Recipes": "", + "parameter_count": "", + "select_keyword": "", + "add_keyword": "", + "select_file": "", + "select_recipe": "", + "select_unit": "", + "select_food": "", + "remove_selection": "", + "empty_list": "", + "Select": "", + "Supermarkets": "", + "User": "", + "Username": "", + "First_name": "", + "Last_name": "", + "Keyword": "", + "Advanced": "", + "Page": "", + "Single": "", + "Multiple": "", + "Reset": "", + "Disabled": "", + "Disable": "", + "Options": "", + "Create Food": "", + "create_food_desc": "", + "additional_options": "", + "Importer_Help": "", + "Documentation": "", + "Select_App_To_Import": "", + "Import_Supported": "", + "Export_Supported": "", + "Import_Not_Yet_Supported": "", + "Export_Not_Yet_Supported": "", + "Import_Result_Info": "", + "Recipes_In_Import": "", + "Toggle": "", + "Import_Error": "", + "Warning_Delete_Supermarket_Category": "", + "New_Supermarket": "", + "New_Supermarket_Category": "", + "Are_You_Sure": "", + "Valid Until": "" +} From 6d7b3b8bfa6c8aa54e9875de576a22d9b37e7652 Mon Sep 17 00:00:00 2001 From: wella Date: Sat, 1 Oct 2022 15:44:54 +0000 Subject: [PATCH 28/77] Translated using Weblate (Indonesian) Currently translated at 5.0% (23 of 460 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/id/ --- vue/src/locales/id.json | 46 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/vue/src/locales/id.json b/vue/src/locales/id.json index 364fd30d88..ce9721a184 100644 --- a/vue/src/locales/id.json +++ b/vue/src/locales/id.json @@ -1,27 +1,27 @@ { - "warning_feature_beta": "", - "err_fetching_resource": "", - "err_creating_resource": "", - "err_updating_resource": "", - "err_deleting_resource": "", - "err_deleting_protected_resource": "", - "err_moving_resource": "", - "err_merging_resource": "", - "success_fetching_resource": "", - "success_creating_resource": "", - "success_updating_resource": "", - "success_deleting_resource": "", - "success_moving_resource": "", - "success_merging_resource": "", - "file_upload_disabled": "", - "warning_space_delete": "", - "food_inherit_info": "", - "facet_count_info": "", - "step_time_minutes": "", - "confirm_delete": "", - "import_running": "", - "all_fields_optional": "", - "convert_internal": "", + "warning_feature_beta": "Fitur ini saat ini dalam status BETA (pengujian). Harap perkirakan bug dan kemungkinan kerusakan perubahan di masa mendatang (mungkin kehilangan data terkait fitur) saat menggunakan fitur ini.", + "err_fetching_resource": "Terjadi kesalahan saat mengambil sumber daya!", + "err_creating_resource": "Terjadi kesalahan saat membuat sumber daya!", + "err_updating_resource": "Terjadi kesalahan saat mengupdate sumber daya!", + "err_deleting_resource": "Terjadi kesalahan saat menghapus sumber daya!", + "err_deleting_protected_resource": "Objek yang Anda coba hapus masih digunakan dan tidak dapat dihapus.", + "err_moving_resource": "Terjadi kesalahan saat memindahkan sumber daya!", + "err_merging_resource": "Terjadi kesalahan saat menggabungkan sumber daya!", + "success_fetching_resource": "Berhasil mengambil sumber daya!", + "success_creating_resource": "Berhasil membuat sumber daya!", + "success_updating_resource": "Berhasil memperbarui sumber daya!", + "success_deleting_resource": "Berhasil menghapus sumber daya!", + "success_moving_resource": "Berhasil memindahkan sumber daya!", + "success_merging_resource": "Berhasil menggabungkan sumber daya!", + "file_upload_disabled": "Unggahan file tidak diaktifkan untuk ruang Anda.", + "warning_space_delete": "Anda dapat menghapus ruang Anda termasuk semua resep, daftar belanja, rencana makan, dan apa pun yang telah Anda buat. Ini tidak dapat dibatalkan! Apakah Anda yakin ingin melakukan ini?", + "food_inherit_info": "Bidang pada makanan yang harus diwarisi secara default.", + "facet_count_info": "Tampilkan jumlah resep pada filter pencarian.", + "step_time_minutes": "Langkah waktu dalam menit", + "confirm_delete": "Anda yakin ingin menghapus {object} ini?", + "import_running": "Impor berjalan, harap tunggu!", + "all_fields_optional": "Semua bidang adalah opsional dan dapat dibiarkan kosong.", + "convert_internal": "Ubah ke resep internal", "show_only_internal": "", "show_split_screen": "", "Log_Recipe_Cooking": "", From adb4071fdbf43448f8a4f329b2be15b35c7575b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 16:03:22 +0000 Subject: [PATCH 29/77] Bump @vue/cli-service from 5.0.4 to 5.0.8 in /vue Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service) from 5.0.4 to 5.0.8. - [Release notes](https://github.com/vuejs/vue-cli/releases) - [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-cli/commits/v5.0.8/packages/@vue/cli-service) --- updated-dependencies: - dependency-name: "@vue/cli-service" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vue/package.json | 8 ++-- vue/yarn.lock | 106 +++++++++++++++++++++++++++-------------------- 2 files changed, 65 insertions(+), 49 deletions(-) diff --git a/vue/package.json b/vue/package.json index 9ce20b1263..2e344bca38 100644 --- a/vue/package.json +++ b/vue/package.json @@ -23,7 +23,7 @@ "lodash": "^4.17.21", "mavon-editor": "^2.10.4", "moment": "^2.29.4", - "prismjs": "^1.27.0", + "prismjs": "^1.29.0", "vue": "^2.6.14", "vue-class-component": "^7.2.3", "vue-click-outside": "^1.1.0", @@ -46,11 +46,11 @@ "@kazupon/vue-i18n-loader": "^0.5.0", "@typescript-eslint/eslint-plugin": "^4.33.0", "@typescript-eslint/parser": "^4.32.0", - "@vue/cli-plugin-babel": "^5.0.4", + "@vue/cli-plugin-babel": "^5.0.8", "@vue/cli-plugin-eslint": "~5.0.8", "@vue/cli-plugin-pwa": "^5.0.8", "@vue/cli-plugin-typescript": "^5.0.8", - "@vue/cli-service": "^5.0.4", + "@vue/cli-service": "^5.0.8", "@vue/compiler-sfc": "^3.2.40", "@vue/eslint-config-typescript": "^10.0.0", "babel-eslint": "^10.1.0", @@ -61,7 +61,7 @@ "webpack-bundle-tracker": "1.6.0", "workbox-expiration": "^6.3.0", "workbox-navigation-preload": "^6.5.4", - "workbox-precaching": "^6.5.3", + "workbox-precaching": "^6.5.4", "workbox-routing": "^6.5.4", "workbox-strategies": "^6.2.4" }, diff --git a/vue/yarn.lock b/vue/yarn.lock index d9f7abdd05..f11a583732 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -2006,10 +2006,10 @@ lodash.kebabcase "^4.1.1" svg-tags "^1.0.0" -"@vue/babel-preset-app@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-5.0.4.tgz#0f1ba2893be266a3cb78e3429d199238a5aa0043" - integrity sha512-vf4KqrmuOSnoEYGUiHPeMoxhh6wpiucLWXISn7xYFU80pK1lqcuhbl6tpurAanUIyRO/ENDUQBH7RAdbLNq1bA== +"@vue/babel-preset-app@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-5.0.8.tgz#ce38f76314f5265d62a89756ef264c21f1d351a1" + integrity sha512-yl+5qhpjd8e1G4cMXfORkkBlvtPCIgmRf3IYCWYDKIQ7m+PPa5iTm4feiNmCMD6yGqQWMhhK/7M3oWGL9boKwg== dependencies: "@babel/core" "^7.12.16" "@babel/helper-compilation-targets" "^7.12.16" @@ -2091,19 +2091,19 @@ "@vue/babel-plugin-transform-vue-jsx" "^1.2.1" camelcase "^5.0.0" -"@vue/cli-overlay@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-5.0.4.tgz#5dae235fd84ecb0f94ed08a475db191fff893a7b" - integrity sha512-ZTLAAydILjvx0XHUGSNu/cQDpmvLTMYUutDf2vf6XGkSWYqncQ6RwkeMSQhvQNlgpa/ovwIgrlGxLoojFRwdVg== +"@vue/cli-overlay@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-5.0.8.tgz#b61477acdc43bbd42fce6326d228471201ecdcdd" + integrity sha512-KmtievE/B4kcXp6SuM2gzsnSd8WebkQpg3XaB6GmFh1BJGRqa1UiW9up7L/Q67uOdTigHxr5Ar2lZms4RcDjwQ== -"@vue/cli-plugin-babel@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-5.0.4.tgz#5aa7001e36f5db5e4ed60b4a36bfc71a7257599c" - integrity sha512-413ZwOWLtgw5vWJoMbrv36crW3qTas4Iru8sU7cRb0IqEZbS28R9X4PVtO8Pek2NYFbrs2XKRYOB7GblB6hVqg== +"@vue/cli-plugin-babel@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-5.0.8.tgz#54f9a07900f29baff54803dcfa916c602894feb7" + integrity sha512-a4qqkml3FAJ3auqB2kN2EMPocb/iu0ykeELwed+9B1c1nQ1HKgslKMHMPavYx3Cd/QAx2mBD4hwKBqZXEI/CsQ== dependencies: "@babel/core" "^7.12.16" - "@vue/babel-preset-app" "^5.0.4" - "@vue/cli-shared-utils" "^5.0.4" + "@vue/babel-preset-app" "^5.0.8" + "@vue/cli-shared-utils" "^5.0.8" babel-loader "^8.2.2" thread-loader "^3.0.0" webpack "^5.54.0" @@ -2129,12 +2129,12 @@ webpack "^5.54.0" workbox-webpack-plugin "^6.1.0" -"@vue/cli-plugin-router@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-router/-/cli-plugin-router-5.0.4.tgz#d30b20125408d39c7ad19a7f8a4a82aee9e033a9" - integrity sha512-lylzCuH3Br0BcTz5IxxSffpyoF9dQ2k4jTdK8QlWrnRanWGw7P9C0kYMr9rohHaXpvAlu6bio392gbNIWpEepg== +"@vue/cli-plugin-router@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-router/-/cli-plugin-router-5.0.8.tgz#a113ec626f3d4216d20496c42d35533bce9e889f" + integrity sha512-Gmv4dsGdAsWPqVijz3Ux2OS2HkMrWi1ENj2cYL75nUeL+Xj5HEstSqdtfZ0b1q9NCce+BFB6QnHfTBXc/fCvMg== dependencies: - "@vue/cli-shared-utils" "^5.0.4" + "@vue/cli-shared-utils" "^5.0.8" "@vue/cli-plugin-typescript@^5.0.8": version "5.0.8" @@ -2151,24 +2151,24 @@ ts-loader "^9.2.5" webpack "^5.54.0" -"@vue/cli-plugin-vuex@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.4.tgz#80853992ac4f423e8e3e8d05a120c46a94a81b5e" - integrity sha512-dBwiD6mT9+V2HTHcwaWE8qFNgTk5I/NUvxYVeUN3Mmmpo4y/1RxXnr7BlKGnaQsTypb2RFk3KowqIJtg7s+E3Q== +"@vue/cli-plugin-vuex@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.8.tgz#0d4cb3020f9102bea9288d750729dde176c66ccd" + integrity sha512-HSYWPqrunRE5ZZs8kVwiY6oWcn95qf/OQabwLfprhdpFWAGtLStShjsGED2aDpSSeGAskQETrtR/5h7VqgIlBA== -"@vue/cli-service@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-5.0.4.tgz#d73300ef00395cf7705310336d3b8828e9dec92b" - integrity sha512-xRiLNTFYmMCT9edZpyYXHijW5xot3gbZpcWDOXUOhKPHN4qs4XqWALnZlU97JYjZOr3XIr/ZvyciyEfrlUVqSA== +"@vue/cli-service@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-5.0.8.tgz#cf3f6f1b7bf0fba9cdab86b6bec4f9897f982dac" + integrity sha512-nV7tYQLe7YsTtzFrfOMIHc5N2hp5lHG2rpYr0aNja9rNljdgcPZLyQRb2YRivTHqTv7lI962UXFURcpStHgyFw== dependencies: "@babel/helper-compilation-targets" "^7.12.16" "@soda/friendly-errors-webpack-plugin" "^1.8.0" "@soda/get-current-script" "^1.0.2" "@types/minimist" "^1.2.0" - "@vue/cli-overlay" "^5.0.4" - "@vue/cli-plugin-router" "^5.0.4" - "@vue/cli-plugin-vuex" "^5.0.4" - "@vue/cli-shared-utils" "^5.0.4" + "@vue/cli-overlay" "^5.0.8" + "@vue/cli-plugin-router" "^5.0.8" + "@vue/cli-plugin-vuex" "^5.0.8" + "@vue/cli-shared-utils" "^5.0.8" "@vue/component-compiler-utils" "^3.3.0" "@vue/vue-loader-v15" "npm:vue-loader@^15.9.7" "@vue/web-component-wrapper" "^1.3.0" @@ -2217,7 +2217,7 @@ webpack-virtual-modules "^0.4.2" whatwg-fetch "^3.6.2" -"@vue/cli-shared-utils@^5.0.4", "@vue/cli-shared-utils@^5.0.8": +"@vue/cli-shared-utils@^5.0.8": version "5.0.8" resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-5.0.8.tgz#75fc96528eba2b1c7e33cb7e989a984ddef99c8a" integrity sha512-uK2YB7bBVuQhjOJF+O52P9yFMXeJVj7ozqJkwYE9PlMHL1LMHjtCYm4cSdOebuPzyP+/9p0BimM/OqxsevIopQ== @@ -8836,10 +8836,10 @@ pretty-error@^4.0.0: lodash "^4.17.20" renderkid "^3.0.0" -prismjs@^1.23.0, prismjs@^1.27.0: - version "1.28.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.28.0.tgz#0d8f561fa0f7cf6ebca901747828b149147044b6" - integrity sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw== +prismjs@^1.23.0, prismjs@^1.29.0: + version "1.29.0" + resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.29.0.tgz#f113555a8fa9b57c35e637bba27509dcf802dd12" + integrity sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q== private@^0.1.8, private@~0.1.5: version "0.1.8" @@ -11603,7 +11603,7 @@ workbox-navigation-preload@^6.5.4: dependencies: workbox-core "6.5.4" -workbox-precaching@6.5.3, workbox-precaching@^6.5.3: +workbox-precaching@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.3.tgz#c870312b2ef901d790ab9e48da084e776c62af47" integrity sha512-sjNfgNLSsRX5zcc63H/ar/hCf+T19fRtTqvWh795gdpghWb5xsfEkecXEvZ8biEi1QD7X/ljtHphdaPvXDygMQ== @@ -11619,6 +11619,15 @@ workbox-precaching@^5.1.4: dependencies: workbox-core "^5.1.4" +workbox-precaching@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.4.tgz#740e3561df92c6726ab5f7471e6aac89582cab72" + integrity sha512-hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg== + dependencies: + workbox-core "6.5.4" + workbox-routing "6.5.4" + workbox-strategies "6.5.4" + workbox-range-requests@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.3.tgz#e624ac82ff266a5e4f236d055797def07949d941" @@ -11652,6 +11661,13 @@ workbox-routing@6.5.3: dependencies: workbox-core "6.5.3" +workbox-routing@6.5.4, workbox-routing@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da" + integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg== + dependencies: + workbox-core "6.5.4" + workbox-routing@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-5.1.4.tgz#3e8cd86bd3b6573488d1a2ce7385e547b547e970" @@ -11659,20 +11675,20 @@ workbox-routing@^5.1.4: dependencies: workbox-core "^5.1.4" -workbox-routing@^6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da" - integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg== - dependencies: - workbox-core "6.5.4" - -workbox-strategies@6.5.3, workbox-strategies@^6.2.4: +workbox-strategies@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.3.tgz#4bea9a48fee16cf43766e0d8138296773c8a9783" integrity sha512-MgmGRrDVXs7rtSCcetZgkSZyMpRGw8HqL2aguszOc3nUmzGZsT238z/NN9ZouCxSzDu3PQ3ZSKmovAacaIhu1w== dependencies: workbox-core "6.5.3" +workbox-strategies@6.5.4, workbox-strategies@^6.2.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.4.tgz#4edda035b3c010fc7f6152918370699334cd204d" + integrity sha512-DEtsxhx0LIYWkJBTQolRxG4EI0setTJkqR4m7r4YpBdxtWJH1Mbg01Cj8ZjNOO8etqfA3IZaOPHUxCs8cBsKLw== + dependencies: + workbox-core "6.5.4" + workbox-strategies@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-5.1.4.tgz#96b1418ccdfde5354612914964074d466c52d08c" From 87cf3b2289c7e2469a7c754fe8cb0544bf165a51 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 16:03:36 +0000 Subject: [PATCH 30/77] Bump workbox-expiration from 6.5.3 to 6.5.4 in /vue Bumps [workbox-expiration](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/googlechrome/workbox/releases) - [Commits](https://github.com/googlechrome/workbox/compare/v6.5.3...v6.5.4) --- updated-dependencies: - dependency-name: workbox-expiration dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vue/package.json | 8 ++--- vue/yarn.lock | 77 +++++++++++++++++++++++++++++++++--------------- 2 files changed, 57 insertions(+), 28 deletions(-) diff --git a/vue/package.json b/vue/package.json index 9ce20b1263..cec76ce4e0 100644 --- a/vue/package.json +++ b/vue/package.json @@ -23,7 +23,7 @@ "lodash": "^4.17.21", "mavon-editor": "^2.10.4", "moment": "^2.29.4", - "prismjs": "^1.27.0", + "prismjs": "^1.29.0", "vue": "^2.6.14", "vue-class-component": "^7.2.3", "vue-click-outside": "^1.1.0", @@ -46,7 +46,7 @@ "@kazupon/vue-i18n-loader": "^0.5.0", "@typescript-eslint/eslint-plugin": "^4.33.0", "@typescript-eslint/parser": "^4.32.0", - "@vue/cli-plugin-babel": "^5.0.4", + "@vue/cli-plugin-babel": "^5.0.8", "@vue/cli-plugin-eslint": "~5.0.8", "@vue/cli-plugin-pwa": "^5.0.8", "@vue/cli-plugin-typescript": "^5.0.8", @@ -59,9 +59,9 @@ "typescript": "~4.8.2", "vue-cli-plugin-i18n": "^2.3.1", "webpack-bundle-tracker": "1.6.0", - "workbox-expiration": "^6.3.0", + "workbox-expiration": "^6.5.4", "workbox-navigation-preload": "^6.5.4", - "workbox-precaching": "^6.5.3", + "workbox-precaching": "^6.5.4", "workbox-routing": "^6.5.4", "workbox-strategies": "^6.2.4" }, diff --git a/vue/yarn.lock b/vue/yarn.lock index d9f7abdd05..e213004e7d 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -2006,10 +2006,10 @@ lodash.kebabcase "^4.1.1" svg-tags "^1.0.0" -"@vue/babel-preset-app@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-5.0.4.tgz#0f1ba2893be266a3cb78e3429d199238a5aa0043" - integrity sha512-vf4KqrmuOSnoEYGUiHPeMoxhh6wpiucLWXISn7xYFU80pK1lqcuhbl6tpurAanUIyRO/ENDUQBH7RAdbLNq1bA== +"@vue/babel-preset-app@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-5.0.8.tgz#ce38f76314f5265d62a89756ef264c21f1d351a1" + integrity sha512-yl+5qhpjd8e1G4cMXfORkkBlvtPCIgmRf3IYCWYDKIQ7m+PPa5iTm4feiNmCMD6yGqQWMhhK/7M3oWGL9boKwg== dependencies: "@babel/core" "^7.12.16" "@babel/helper-compilation-targets" "^7.12.16" @@ -2096,14 +2096,14 @@ resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-5.0.4.tgz#5dae235fd84ecb0f94ed08a475db191fff893a7b" integrity sha512-ZTLAAydILjvx0XHUGSNu/cQDpmvLTMYUutDf2vf6XGkSWYqncQ6RwkeMSQhvQNlgpa/ovwIgrlGxLoojFRwdVg== -"@vue/cli-plugin-babel@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-5.0.4.tgz#5aa7001e36f5db5e4ed60b4a36bfc71a7257599c" - integrity sha512-413ZwOWLtgw5vWJoMbrv36crW3qTas4Iru8sU7cRb0IqEZbS28R9X4PVtO8Pek2NYFbrs2XKRYOB7GblB6hVqg== +"@vue/cli-plugin-babel@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-5.0.8.tgz#54f9a07900f29baff54803dcfa916c602894feb7" + integrity sha512-a4qqkml3FAJ3auqB2kN2EMPocb/iu0ykeELwed+9B1c1nQ1HKgslKMHMPavYx3Cd/QAx2mBD4hwKBqZXEI/CsQ== dependencies: "@babel/core" "^7.12.16" - "@vue/babel-preset-app" "^5.0.4" - "@vue/cli-shared-utils" "^5.0.4" + "@vue/babel-preset-app" "^5.0.8" + "@vue/cli-shared-utils" "^5.0.8" babel-loader "^8.2.2" thread-loader "^3.0.0" webpack "^5.54.0" @@ -6468,6 +6468,11 @@ idb@^6.1.4: resolved "https://registry.yarnpkg.com/idb/-/idb-6.1.5.tgz#dbc53e7adf1ac7c59f9b2bf56e00b4ea4fce8c7b" integrity sha512-IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw== +idb@^7.0.1: + version "7.1.0" + resolved "https://registry.yarnpkg.com/idb/-/idb-7.1.0.tgz#2cc886be57738419e57f9aab58f647e5e2160270" + integrity sha512-Wsk07aAxDsntgYJY4h0knZJuTxM73eQ4reRAO+Z1liOh8eMCJ/MoDS8fCui1vGT9mnjtl1sOu3I2i/W1swPYZg== + ieee754@^1.1.13, ieee754@^1.1.4: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" @@ -8836,10 +8841,10 @@ pretty-error@^4.0.0: lodash "^4.17.20" renderkid "^3.0.0" -prismjs@^1.23.0, prismjs@^1.27.0: - version "1.28.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.28.0.tgz#0d8f561fa0f7cf6ebca901747828b149147044b6" - integrity sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw== +prismjs@^1.23.0, prismjs@^1.29.0: + version "1.29.0" + resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.29.0.tgz#f113555a8fa9b57c35e637bba27509dcf802dd12" + integrity sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q== private@^0.1.8, private@~0.1.5: version "0.1.8" @@ -11547,7 +11552,7 @@ workbox-core@^5.1.4: resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-5.1.4.tgz#8bbfb2362ecdff30e25d123c82c79ac65d9264f4" integrity sha512-+4iRQan/1D8I81nR2L5vcbaaFskZC2CL17TLbvWVzQ4qiF/ytOGF6XeV54pVxAvKUtkLANhk8TyIUMtiMw2oDg== -workbox-expiration@6.5.3, workbox-expiration@^6.3.0: +workbox-expiration@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.3.tgz#efc0811f371a2ede1052b9de1c4f072b71d50503" integrity sha512-jzYopYR1zD04ZMdlbn/R2Ik6ixiXbi15c9iX5H8CTi6RPDz7uhvMLZPKEndZTpfgmUk8mdmT9Vx/AhbuCl5Sqw== @@ -11562,6 +11567,14 @@ workbox-expiration@^5.1.4: dependencies: workbox-core "^5.1.4" +workbox-expiration@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.4.tgz#501056f81e87e1d296c76570bb483ce5e29b4539" + integrity sha512-jUP5qPOpH1nXtjGGh1fRBa1wJL2QlIb5mGpct3NzepjGG2uFFBn4iiEBiI9GUmfAFR2ApuRhDydjcRmYXddiEQ== + dependencies: + idb "^7.0.1" + workbox-core "6.5.4" + workbox-google-analytics@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.5.3.tgz#cc8c3a61f449131660a4ed2f5362d9a3599b18fe" @@ -11603,7 +11616,7 @@ workbox-navigation-preload@^6.5.4: dependencies: workbox-core "6.5.4" -workbox-precaching@6.5.3, workbox-precaching@^6.5.3: +workbox-precaching@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.3.tgz#c870312b2ef901d790ab9e48da084e776c62af47" integrity sha512-sjNfgNLSsRX5zcc63H/ar/hCf+T19fRtTqvWh795gdpghWb5xsfEkecXEvZ8biEi1QD7X/ljtHphdaPvXDygMQ== @@ -11619,6 +11632,15 @@ workbox-precaching@^5.1.4: dependencies: workbox-core "^5.1.4" +workbox-precaching@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.4.tgz#740e3561df92c6726ab5f7471e6aac89582cab72" + integrity sha512-hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg== + dependencies: + workbox-core "6.5.4" + workbox-routing "6.5.4" + workbox-strategies "6.5.4" + workbox-range-requests@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.3.tgz#e624ac82ff266a5e4f236d055797def07949d941" @@ -11652,6 +11674,13 @@ workbox-routing@6.5.3: dependencies: workbox-core "6.5.3" +workbox-routing@6.5.4, workbox-routing@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da" + integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg== + dependencies: + workbox-core "6.5.4" + workbox-routing@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-5.1.4.tgz#3e8cd86bd3b6573488d1a2ce7385e547b547e970" @@ -11659,20 +11688,20 @@ workbox-routing@^5.1.4: dependencies: workbox-core "^5.1.4" -workbox-routing@^6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da" - integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg== - dependencies: - workbox-core "6.5.4" - -workbox-strategies@6.5.3, workbox-strategies@^6.2.4: +workbox-strategies@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.3.tgz#4bea9a48fee16cf43766e0d8138296773c8a9783" integrity sha512-MgmGRrDVXs7rtSCcetZgkSZyMpRGw8HqL2aguszOc3nUmzGZsT238z/NN9ZouCxSzDu3PQ3ZSKmovAacaIhu1w== dependencies: workbox-core "6.5.3" +workbox-strategies@6.5.4, workbox-strategies@^6.2.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.4.tgz#4edda035b3c010fc7f6152918370699334cd204d" + integrity sha512-DEtsxhx0LIYWkJBTQolRxG4EI0setTJkqR4m7r4YpBdxtWJH1Mbg01Cj8ZjNOO8etqfA3IZaOPHUxCs8cBsKLw== + dependencies: + workbox-core "6.5.4" + workbox-strategies@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-5.1.4.tgz#96b1418ccdfde5354612914964074d466c52d08c" From 36fdc8cd9e8e09204cff22872ea9a8a518288756 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 16:04:36 +0000 Subject: [PATCH 31/77] Bump typescript from 4.8.2 to 4.8.4 in /vue Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.8.2 to 4.8.4. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v4.8.2...v4.8.4) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vue/package.json | 8 +++--- vue/yarn.lock | 70 +++++++++++++++++++++++++++++------------------- 2 files changed, 47 insertions(+), 31 deletions(-) diff --git a/vue/package.json b/vue/package.json index 9ce20b1263..7c99916899 100644 --- a/vue/package.json +++ b/vue/package.json @@ -23,7 +23,7 @@ "lodash": "^4.17.21", "mavon-editor": "^2.10.4", "moment": "^2.29.4", - "prismjs": "^1.27.0", + "prismjs": "^1.29.0", "vue": "^2.6.14", "vue-class-component": "^7.2.3", "vue-click-outside": "^1.1.0", @@ -46,7 +46,7 @@ "@kazupon/vue-i18n-loader": "^0.5.0", "@typescript-eslint/eslint-plugin": "^4.33.0", "@typescript-eslint/parser": "^4.32.0", - "@vue/cli-plugin-babel": "^5.0.4", + "@vue/cli-plugin-babel": "^5.0.8", "@vue/cli-plugin-eslint": "~5.0.8", "@vue/cli-plugin-pwa": "^5.0.8", "@vue/cli-plugin-typescript": "^5.0.8", @@ -56,12 +56,12 @@ "babel-eslint": "^10.1.0", "eslint": "^7.28.0", "eslint-plugin-vue": "^8.7.1", - "typescript": "~4.8.2", + "typescript": "~4.8.4", "vue-cli-plugin-i18n": "^2.3.1", "webpack-bundle-tracker": "1.6.0", "workbox-expiration": "^6.3.0", "workbox-navigation-preload": "^6.5.4", - "workbox-precaching": "^6.5.3", + "workbox-precaching": "^6.5.4", "workbox-routing": "^6.5.4", "workbox-strategies": "^6.2.4" }, diff --git a/vue/yarn.lock b/vue/yarn.lock index d9f7abdd05..82f71f3994 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -2006,10 +2006,10 @@ lodash.kebabcase "^4.1.1" svg-tags "^1.0.0" -"@vue/babel-preset-app@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-5.0.4.tgz#0f1ba2893be266a3cb78e3429d199238a5aa0043" - integrity sha512-vf4KqrmuOSnoEYGUiHPeMoxhh6wpiucLWXISn7xYFU80pK1lqcuhbl6tpurAanUIyRO/ENDUQBH7RAdbLNq1bA== +"@vue/babel-preset-app@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-5.0.8.tgz#ce38f76314f5265d62a89756ef264c21f1d351a1" + integrity sha512-yl+5qhpjd8e1G4cMXfORkkBlvtPCIgmRf3IYCWYDKIQ7m+PPa5iTm4feiNmCMD6yGqQWMhhK/7M3oWGL9boKwg== dependencies: "@babel/core" "^7.12.16" "@babel/helper-compilation-targets" "^7.12.16" @@ -2096,14 +2096,14 @@ resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-5.0.4.tgz#5dae235fd84ecb0f94ed08a475db191fff893a7b" integrity sha512-ZTLAAydILjvx0XHUGSNu/cQDpmvLTMYUutDf2vf6XGkSWYqncQ6RwkeMSQhvQNlgpa/ovwIgrlGxLoojFRwdVg== -"@vue/cli-plugin-babel@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-5.0.4.tgz#5aa7001e36f5db5e4ed60b4a36bfc71a7257599c" - integrity sha512-413ZwOWLtgw5vWJoMbrv36crW3qTas4Iru8sU7cRb0IqEZbS28R9X4PVtO8Pek2NYFbrs2XKRYOB7GblB6hVqg== +"@vue/cli-plugin-babel@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-5.0.8.tgz#54f9a07900f29baff54803dcfa916c602894feb7" + integrity sha512-a4qqkml3FAJ3auqB2kN2EMPocb/iu0ykeELwed+9B1c1nQ1HKgslKMHMPavYx3Cd/QAx2mBD4hwKBqZXEI/CsQ== dependencies: "@babel/core" "^7.12.16" - "@vue/babel-preset-app" "^5.0.4" - "@vue/cli-shared-utils" "^5.0.4" + "@vue/babel-preset-app" "^5.0.8" + "@vue/cli-shared-utils" "^5.0.8" babel-loader "^8.2.2" thread-loader "^3.0.0" webpack "^5.54.0" @@ -8836,10 +8836,10 @@ pretty-error@^4.0.0: lodash "^4.17.20" renderkid "^3.0.0" -prismjs@^1.23.0, prismjs@^1.27.0: - version "1.28.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.28.0.tgz#0d8f561fa0f7cf6ebca901747828b149147044b6" - integrity sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw== +prismjs@^1.23.0, prismjs@^1.29.0: + version "1.29.0" + resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.29.0.tgz#f113555a8fa9b57c35e637bba27509dcf802dd12" + integrity sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q== private@^0.1.8, private@~0.1.5: version "0.1.8" @@ -10687,10 +10687,10 @@ typescript@~4.5.5: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3" integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA== -typescript@~4.8.2: - version "4.8.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790" - integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw== +typescript@~4.8.4: + version "4.8.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6" + integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== unbox-primitive@^1.0.2: version "1.0.2" @@ -11603,7 +11603,7 @@ workbox-navigation-preload@^6.5.4: dependencies: workbox-core "6.5.4" -workbox-precaching@6.5.3, workbox-precaching@^6.5.3: +workbox-precaching@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.3.tgz#c870312b2ef901d790ab9e48da084e776c62af47" integrity sha512-sjNfgNLSsRX5zcc63H/ar/hCf+T19fRtTqvWh795gdpghWb5xsfEkecXEvZ8biEi1QD7X/ljtHphdaPvXDygMQ== @@ -11619,6 +11619,15 @@ workbox-precaching@^5.1.4: dependencies: workbox-core "^5.1.4" +workbox-precaching@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.4.tgz#740e3561df92c6726ab5f7471e6aac89582cab72" + integrity sha512-hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg== + dependencies: + workbox-core "6.5.4" + workbox-routing "6.5.4" + workbox-strategies "6.5.4" + workbox-range-requests@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.3.tgz#e624ac82ff266a5e4f236d055797def07949d941" @@ -11652,6 +11661,13 @@ workbox-routing@6.5.3: dependencies: workbox-core "6.5.3" +workbox-routing@6.5.4, workbox-routing@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da" + integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg== + dependencies: + workbox-core "6.5.4" + workbox-routing@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-5.1.4.tgz#3e8cd86bd3b6573488d1a2ce7385e547b547e970" @@ -11659,20 +11675,20 @@ workbox-routing@^5.1.4: dependencies: workbox-core "^5.1.4" -workbox-routing@^6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da" - integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg== - dependencies: - workbox-core "6.5.4" - -workbox-strategies@6.5.3, workbox-strategies@^6.2.4: +workbox-strategies@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.3.tgz#4bea9a48fee16cf43766e0d8138296773c8a9783" integrity sha512-MgmGRrDVXs7rtSCcetZgkSZyMpRGw8HqL2aguszOc3nUmzGZsT238z/NN9ZouCxSzDu3PQ3ZSKmovAacaIhu1w== dependencies: workbox-core "6.5.3" +workbox-strategies@6.5.4, workbox-strategies@^6.2.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.4.tgz#4edda035b3c010fc7f6152918370699334cd204d" + integrity sha512-DEtsxhx0LIYWkJBTQolRxG4EI0setTJkqR4m7r4YpBdxtWJH1Mbg01Cj8ZjNOO8etqfA3IZaOPHUxCs8cBsKLw== + dependencies: + workbox-core "6.5.4" + workbox-strategies@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-5.1.4.tgz#96b1418ccdfde5354612914964074d466c52d08c" From 409b438776c6164febbc5f6bc4aa1fb1133993a1 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Sat, 1 Oct 2022 18:18:00 +0200 Subject: [PATCH 32/77] fixed vue template compiler version and removed debug print from permission helper --- cookbook/helper/permission_helper.py | 1 - node_modules/.yarn-integrity | 12 ++++++++++++ vue/package.json | 2 +- vue/yarn.lock | 12 ++++++------ yarn.lock | 4 ++++ 5 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 node_modules/.yarn-integrity create mode 100644 yarn.lock diff --git a/cookbook/helper/permission_helper.py b/cookbook/helper/permission_helper.py index 062028ee28..2e6df0bb4b 100644 --- a/cookbook/helper/permission_helper.py +++ b/cookbook/helper/permission_helper.py @@ -52,7 +52,6 @@ def has_group_permission(user, groups, no_cache=False): return cached_result result = False - print('running check', user, groups_allowed) if user.is_authenticated: if user_space := user.userspace_set.filter(active=True): if len(user_space) != 1: diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity new file mode 100644 index 0000000000..df729edea9 --- /dev/null +++ b/node_modules/.yarn-integrity @@ -0,0 +1,12 @@ +{ + "systemParams": "win32-x64-93", + "modulesFolders": [ + "node_modules" + ], + "flags": [], + "linkedModules": [], + "topLevelPatterns": [], + "lockfileEntries": {}, + "files": [], + "artifacts": {} +} \ No newline at end of file diff --git a/vue/package.json b/vue/package.json index d7d3685266..7395234fb1 100644 --- a/vue/package.json +++ b/vue/package.json @@ -36,10 +36,10 @@ "vue-property-decorator": "^9.1.2", "vue-sanitize": "^0.2.2", "vue-simple-calendar": "^5.0.0", - "vue-template-compiler": "^2.7.10", "vue2-touch-events": "^3.2.2", "vuedraggable": "^2.24.3", "vuex": "^3.6.0", + "vue-template-compiler": "2.6.14", "workbox-webpack-plugin": "^6.3.0" }, "devDependencies": { diff --git a/vue/yarn.lock b/vue/yarn.lock index 3bf0445860..c1d0e742bc 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -6272,7 +6272,7 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.1" -he@^1.2.0: +he@^1.1.0, he@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== @@ -11067,13 +11067,13 @@ vue-style-loader@^4.1.0, vue-style-loader@^4.1.3: hash-sum "^1.0.2" loader-utils "^1.0.2" -vue-template-compiler@^2.7.10: - version "2.7.10" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz#9e20f35b2fdccacacf732dd7dedb49bf65f4556b" - integrity sha512-QO+8R9YRq1Gudm8ZMdo/lImZLJVUIAM8c07Vp84ojdDAf8HmPJc7XB556PcXV218k2AkKznsRz6xB5uOjAC4EQ== +vue-template-compiler@2.6.14: + version "2.6.14" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz#a2f0e7d985670d42c9c9ee0d044fed7690f4f763" + integrity sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g== dependencies: de-indent "^1.0.2" - he "^1.2.0" + he "^1.1.0" vue-template-es2015-compiler@^1.9.0: version "1.9.1" diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 0000000000..fb57ccd13a --- /dev/null +++ b/yarn.lock @@ -0,0 +1,4 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + From 580591a69eed581d20494f9b7a75e98ada0c6006 Mon Sep 17 00:00:00 2001 From: wella Date: Sat, 1 Oct 2022 16:32:22 +0000 Subject: [PATCH 33/77] Added translation using Weblate (Indonesian) --- cookbook/locale/id/LC_MESSAGES/django.po | 2607 ++++++++++++++++++++++ 1 file changed, 2607 insertions(+) create mode 100644 cookbook/locale/id/LC_MESSAGES/django.po diff --git a/cookbook/locale/id/LC_MESSAGES/django.po b/cookbook/locale/id/LC_MESSAGES/django.po new file mode 100644 index 0000000000..e1d4698c27 --- /dev/null +++ b/cookbook/locale/id/LC_MESSAGES/django.po @@ -0,0 +1,2607 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-07-12 19:20+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: id\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: .\cookbook\filters.py:23 .\cookbook\templates\forms\ingredients.html:34 +#: .\cookbook\templates\stats.html:28 +msgid "Ingredients" +msgstr "" + +#: .\cookbook\forms.py:53 +msgid "Default unit" +msgstr "" + +#: .\cookbook\forms.py:54 +msgid "Use fractions" +msgstr "" + +#: .\cookbook\forms.py:55 +msgid "Use KJ" +msgstr "" + +#: .\cookbook\forms.py:56 +msgid "Theme" +msgstr "" + +#: .\cookbook\forms.py:57 +msgid "Navbar color" +msgstr "" + +#: .\cookbook\forms.py:58 +msgid "Sticky navbar" +msgstr "" + +#: .\cookbook\forms.py:59 +msgid "Default page" +msgstr "" + +#: .\cookbook\forms.py:60 +msgid "Show recent recipes" +msgstr "" + +#: .\cookbook\forms.py:61 +msgid "Search style" +msgstr "" + +#: .\cookbook\forms.py:62 +msgid "Plan sharing" +msgstr "" + +#: .\cookbook\forms.py:63 +msgid "Ingredient decimal places" +msgstr "" + +#: .\cookbook\forms.py:64 +msgid "Shopping list auto sync period" +msgstr "" + +#: .\cookbook\forms.py:65 .\cookbook\templates\recipe_view.html:21 +#: .\cookbook\templates\stats.html:47 +msgid "Comments" +msgstr "" + +#: .\cookbook\forms.py:66 +msgid "Left-handed mode" +msgstr "" + +#: .\cookbook\forms.py:70 +msgid "" +"Color of the top navigation bar. Not all colors work with all themes, just " +"try them out!" +msgstr "" + +#: .\cookbook\forms.py:72 +msgid "Default Unit to be used when inserting a new ingredient into a recipe." +msgstr "" + +#: .\cookbook\forms.py:74 +msgid "" +"Enables support for fractions in ingredient amounts (e.g. convert decimals " +"to fractions automatically)" +msgstr "" + +#: .\cookbook\forms.py:76 +msgid "Display nutritional energy amounts in joules instead of calories" +msgstr "" + +#: .\cookbook\forms.py:77 +msgid "Users with whom newly created meal plans should be shared by default." +msgstr "" + +#: .\cookbook\forms.py:78 +msgid "Users with whom to share shopping lists." +msgstr "" + +#: .\cookbook\forms.py:80 +msgid "Show recently viewed recipes on search page." +msgstr "" + +#: .\cookbook\forms.py:81 +msgid "Number of decimals to round ingredients." +msgstr "" + +#: .\cookbook\forms.py:82 +msgid "If you want to be able to create and see comments underneath recipes." +msgstr "" + +#: .\cookbook\forms.py:84 .\cookbook\forms.py:496 +msgid "" +"Setting to 0 will disable auto sync. When viewing a shopping list the list " +"is updated every set seconds to sync changes someone else might have made. " +"Useful when shopping with multiple people but might use a little bit of " +"mobile data. If lower than instance limit it is reset when saving." +msgstr "" + +#: .\cookbook\forms.py:87 +msgid "Makes the navbar stick to the top of the page." +msgstr "" + +#: .\cookbook\forms.py:88 .\cookbook\forms.py:499 +msgid "Automatically add meal plan ingredients to shopping list." +msgstr "" + +#: .\cookbook\forms.py:89 +msgid "Exclude ingredients that are on hand." +msgstr "" + +#: .\cookbook\forms.py:90 +msgid "Will optimize the UI for use with your left hand." +msgstr "" + +#: .\cookbook\forms.py:107 +msgid "" +"Both fields are optional. If none are given the username will be displayed " +"instead" +msgstr "" + +#: .\cookbook\forms.py:128 .\cookbook\forms.py:301 +msgid "Name" +msgstr "" + +#: .\cookbook\forms.py:129 .\cookbook\forms.py:302 +#: .\cookbook\templates\stats.html:24 .\cookbook\views\lists.py:88 +msgid "Keywords" +msgstr "" + +#: .\cookbook\forms.py:130 +msgid "Preparation time in minutes" +msgstr "" + +#: .\cookbook\forms.py:131 +msgid "Waiting time (cooking/baking) in minutes" +msgstr "" + +#: .\cookbook\forms.py:132 .\cookbook\forms.py:270 .\cookbook\forms.py:303 +msgid "Path" +msgstr "" + +#: .\cookbook\forms.py:133 +msgid "Storage UID" +msgstr "" + +#: .\cookbook\forms.py:165 +msgid "Default" +msgstr "" + +#: .\cookbook\forms.py:177 +msgid "" +"To prevent duplicates recipes with the same name as existing ones are " +"ignored. Check this box to import everything." +msgstr "" + +#: .\cookbook\forms.py:200 +msgid "Add your comment: " +msgstr "" + +#: .\cookbook\forms.py:215 +msgid "Leave empty for dropbox and enter app password for nextcloud." +msgstr "" + +#: .\cookbook\forms.py:222 +msgid "Leave empty for nextcloud and enter api token for dropbox." +msgstr "" + +#: .\cookbook\forms.py:231 +msgid "" +"Leave empty for dropbox and enter only base url for nextcloud (/remote." +"php/webdav/ is added automatically)" +msgstr "" + +#: .\cookbook\forms.py:269 .\cookbook\views\edit.py:157 +msgid "Storage" +msgstr "" + +#: .\cookbook\forms.py:271 +msgid "Active" +msgstr "" + +#: .\cookbook\forms.py:277 +msgid "Search String" +msgstr "" + +#: .\cookbook\forms.py:304 +msgid "File ID" +msgstr "" + +#: .\cookbook\forms.py:326 +msgid "You must provide at least a recipe or a title." +msgstr "" + +#: .\cookbook\forms.py:339 +msgid "You can list default users to share recipes with in the settings." +msgstr "" + +#: .\cookbook\forms.py:340 +msgid "" +"You can use markdown to format this field. See the docs here" +msgstr "" + +#: .\cookbook\forms.py:366 +msgid "Maximum number of users for this space reached." +msgstr "" + +#: .\cookbook\forms.py:372 +msgid "Email address already taken!" +msgstr "" + +#: .\cookbook\forms.py:380 +msgid "" +"An email address is not required but if present the invite link will be sent " +"to the user." +msgstr "" + +#: .\cookbook\forms.py:395 +msgid "Name already taken." +msgstr "" + +#: .\cookbook\forms.py:406 +msgid "Accept Terms and Privacy" +msgstr "" + +#: .\cookbook\forms.py:438 +msgid "" +"Determines how fuzzy a search is if it uses trigram similarity matching (e." +"g. low values mean more typos are ignored)." +msgstr "" + +#: .\cookbook\forms.py:448 +msgid "" +"Select type method of search. Click here for " +"full description of choices." +msgstr "" + +#: .\cookbook\forms.py:449 +msgid "" +"Use fuzzy matching on units, keywords and ingredients when editing and " +"importing recipes." +msgstr "" + +#: .\cookbook\forms.py:451 +msgid "" +"Fields to search ignoring accents. Selecting this option can improve or " +"degrade search quality depending on language" +msgstr "" + +#: .\cookbook\forms.py:453 +msgid "" +"Fields to search for partial matches. (e.g. searching for 'Pie' will return " +"'pie' and 'piece' and 'soapie')" +msgstr "" + +#: .\cookbook\forms.py:455 +msgid "" +"Fields to search for beginning of word matches. (e.g. searching for 'sa' " +"will return 'salad' and 'sandwich')" +msgstr "" + +#: .\cookbook\forms.py:457 +msgid "" +"Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.) " +"Note: this option will conflict with 'web' and 'raw' methods of search." +msgstr "" + +#: .\cookbook\forms.py:459 +msgid "" +"Fields to full text search. Note: 'web', 'phrase', and 'raw' search methods " +"only function with fulltext fields." +msgstr "" + +#: .\cookbook\forms.py:463 +msgid "Search Method" +msgstr "" + +#: .\cookbook\forms.py:464 +msgid "Fuzzy Lookups" +msgstr "" + +#: .\cookbook\forms.py:465 +msgid "Ignore Accent" +msgstr "" + +#: .\cookbook\forms.py:466 +msgid "Partial Match" +msgstr "" + +#: .\cookbook\forms.py:467 +msgid "Starts With" +msgstr "" + +#: .\cookbook\forms.py:468 +msgid "Fuzzy Search" +msgstr "" + +#: .\cookbook\forms.py:469 +msgid "Full Text" +msgstr "" + +#: .\cookbook\forms.py:494 +msgid "" +"Users will see all items you add to your shopping list. They must add you " +"to see items on their list." +msgstr "" + +#: .\cookbook\forms.py:500 +msgid "" +"When adding a meal plan to the shopping list (manually or automatically), " +"include all related recipes." +msgstr "" + +#: .\cookbook\forms.py:501 +msgid "" +"When adding a meal plan to the shopping list (manually or automatically), " +"exclude ingredients that are on hand." +msgstr "" + +#: .\cookbook\forms.py:502 +msgid "Default number of hours to delay a shopping list entry." +msgstr "" + +#: .\cookbook\forms.py:503 +msgid "Filter shopping list to only include supermarket categories." +msgstr "" + +#: .\cookbook\forms.py:504 +msgid "Days of recent shopping list entries to display." +msgstr "" + +#: .\cookbook\forms.py:505 +msgid "Mark food 'On Hand' when checked off shopping list." +msgstr "" + +#: .\cookbook\forms.py:506 +msgid "Delimiter to use for CSV exports." +msgstr "" + +#: .\cookbook\forms.py:507 +msgid "Prefix to add when copying list to the clipboard." +msgstr "" + +#: .\cookbook\forms.py:511 +msgid "Share Shopping List" +msgstr "" + +#: .\cookbook\forms.py:512 +msgid "Autosync" +msgstr "" + +#: .\cookbook\forms.py:513 +msgid "Auto Add Meal Plan" +msgstr "" + +#: .\cookbook\forms.py:514 +msgid "Exclude On Hand" +msgstr "" + +#: .\cookbook\forms.py:515 +msgid "Include Related" +msgstr "" + +#: .\cookbook\forms.py:516 +msgid "Default Delay Hours" +msgstr "" + +#: .\cookbook\forms.py:517 +msgid "Filter to Supermarket" +msgstr "" + +#: .\cookbook\forms.py:518 +msgid "Recent Days" +msgstr "" + +#: .\cookbook\forms.py:519 +msgid "CSV Delimiter" +msgstr "" + +#: .\cookbook\forms.py:520 +msgid "List Prefix" +msgstr "" + +#: .\cookbook\forms.py:521 +msgid "Auto On Hand" +msgstr "" + +#: .\cookbook\forms.py:531 +msgid "Reset Food Inheritance" +msgstr "" + +#: .\cookbook\forms.py:532 +msgid "Reset all food to inherit the fields configured." +msgstr "" + +#: .\cookbook\forms.py:544 +msgid "Fields on food that should be inherited by default." +msgstr "" + +#: .\cookbook\forms.py:545 +msgid "Show recipe counts on search filters" +msgstr "" + +#: .\cookbook\helper\AllAuthCustomAdapter.py:36 +msgid "" +"In order to prevent spam, the requested email was not send. Please wait a " +"few minutes and try again." +msgstr "" + +#: .\cookbook\helper\permission_helper.py:149 +#: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\views.py:152 +msgid "You are not logged in and therefore cannot view this page!" +msgstr "" + +#: .\cookbook\helper\permission_helper.py:153 +#: .\cookbook\helper\permission_helper.py:159 +#: .\cookbook\helper\permission_helper.py:184 +#: .\cookbook\helper\permission_helper.py:254 +#: .\cookbook\helper\permission_helper.py:268 +#: .\cookbook\helper\permission_helper.py:279 +#: .\cookbook\helper\permission_helper.py:290 .\cookbook\views\data.py:33 +#: .\cookbook\views\views.py:163 .\cookbook\views\views.py:170 +#: .\cookbook\views\views.py:249 +msgid "You do not have the required permissions to view this page!" +msgstr "" + +#: .\cookbook\helper\permission_helper.py:177 +#: .\cookbook\helper\permission_helper.py:200 +#: .\cookbook\helper\permission_helper.py:222 +#: .\cookbook\helper\permission_helper.py:237 +msgid "You cannot interact with this object as it is not owned by you!" +msgstr "" + +#: .\cookbook\helper\permission_helper.py:321 +msgid "You have reached the maximum number of recipes for your space." +msgstr "" + +#: .\cookbook\helper\permission_helper.py:333 +msgid "You have more users than allowed in your space." +msgstr "" + +#: .\cookbook\helper\recipe_search.py:565 +msgid "One of queryset or hash_key must be provided" +msgstr "" + +#: .\cookbook\helper\shopping_helper.py:152 +msgid "You must supply a servings size" +msgstr "" + +#: .\cookbook\helper\template_helper.py:64 +#: .\cookbook\helper\template_helper.py:66 +msgid "Could not parse template code." +msgstr "" + +#: .\cookbook\integration\copymethat.py:41 +#: .\cookbook\integration\melarecipes.py:37 +msgid "Favorite" +msgstr "" + +#: .\cookbook\integration\copymethat.py:70 +#: .\cookbook\integration\recettetek.py:54 +#: .\cookbook\integration\recipekeeper.py:63 +msgid "Imported from" +msgstr "" + +#: .\cookbook\integration\integration.py:223 +msgid "" +"Importer expected a .zip file. Did you choose the correct importer type for " +"your data ?" +msgstr "" + +#: .\cookbook\integration\integration.py:226 +msgid "" +"An unexpected error occurred during the import. Please make sure you have " +"uploaded a valid file." +msgstr "" + +#: .\cookbook\integration\integration.py:231 +msgid "The following recipes were ignored because they already existed:" +msgstr "" + +#: .\cookbook\integration\integration.py:235 +#, python-format +msgid "Imported %s recipes." +msgstr "" + +#: .\cookbook\integration\paprika.py:46 +msgid "Notes" +msgstr "" + +#: .\cookbook\integration\paprika.py:49 +msgid "Nutritional Information" +msgstr "" + +#: .\cookbook\integration\paprika.py:53 +msgid "Source" +msgstr "" + +#: .\cookbook\integration\saffron.py:23 +msgid "Servings" +msgstr "" + +#: .\cookbook\integration\saffron.py:25 +msgid "Waiting time" +msgstr "" + +#: .\cookbook\integration\saffron.py:27 +msgid "Preparation Time" +msgstr "" + +#: .\cookbook\integration\saffron.py:29 +#: .\cookbook\templates\forms\ingredients.html:7 +#: .\cookbook\templates\index.html:7 +msgid "Cookbook" +msgstr "" + +#: .\cookbook\integration\saffron.py:31 +msgid "Section" +msgstr "" + +#: .\cookbook\management\commands\rebuildindex.py:14 +msgid "Rebuilds full text search index on Recipe" +msgstr "" + +#: .\cookbook\management\commands\rebuildindex.py:18 +msgid "Only Postgresql databases use full text search, no index to rebuild" +msgstr "" + +#: .\cookbook\management\commands\rebuildindex.py:29 +msgid "Recipe index rebuild complete." +msgstr "" + +#: .\cookbook\management\commands\rebuildindex.py:31 +msgid "Recipe index rebuild failed." +msgstr "" + +#: .\cookbook\migrations\0047_auto_20200602_1133.py:14 +msgid "Breakfast" +msgstr "" + +#: .\cookbook\migrations\0047_auto_20200602_1133.py:19 +msgid "Lunch" +msgstr "" + +#: .\cookbook\migrations\0047_auto_20200602_1133.py:24 +msgid "Dinner" +msgstr "" + +#: .\cookbook\migrations\0047_auto_20200602_1133.py:29 +msgid "Other" +msgstr "" + +#: .\cookbook\models.py:251 +msgid "" +"Maximum file storage for space in MB. 0 for unlimited, -1 to disable file " +"upload." +msgstr "" + +#: .\cookbook\models.py:353 .\cookbook\templates\search.html:7 +#: .\cookbook\templates\space_manage.html:7 +msgid "Search" +msgstr "" + +#: .\cookbook\models.py:354 .\cookbook\templates\base.html:107 +#: .\cookbook\templates\meal_plan.html:7 .\cookbook\views\delete.py:178 +#: .\cookbook\views\edit.py:211 .\cookbook\views\new.py:179 +msgid "Meal-Plan" +msgstr "" + +#: .\cookbook\models.py:355 .\cookbook\templates\base.html:115 +msgid "Books" +msgstr "" + +#: .\cookbook\models.py:363 +msgid "Small" +msgstr "" + +#: .\cookbook\models.py:363 +msgid "Large" +msgstr "" + +#: .\cookbook\models.py:363 .\cookbook\templates\generic\new_template.html:6 +#: .\cookbook\templates\generic\new_template.html:14 +msgid "New" +msgstr "" + +#: .\cookbook\models.py:584 +msgid " is part of a recipe step and cannot be deleted" +msgstr "" + +#: .\cookbook\models.py:1162 .\cookbook\templates\search_info.html:28 +msgid "Simple" +msgstr "" + +#: .\cookbook\models.py:1163 .\cookbook\templates\search_info.html:33 +msgid "Phrase" +msgstr "" + +#: .\cookbook\models.py:1164 .\cookbook\templates\search_info.html:38 +msgid "Web" +msgstr "" + +#: .\cookbook\models.py:1165 .\cookbook\templates\search_info.html:47 +msgid "Raw" +msgstr "" + +#: .\cookbook\models.py:1203 +msgid "Food Alias" +msgstr "" + +#: .\cookbook\models.py:1203 +msgid "Unit Alias" +msgstr "" + +#: .\cookbook\models.py:1203 +msgid "Keyword Alias" +msgstr "" + +#: .\cookbook\models.py:1227 +#: .\cookbook\templates\include\recipe_open_modal.html:7 +#: .\cookbook\views\delete.py:36 .\cookbook\views\edit.py:251 +#: .\cookbook\views\new.py:48 +msgid "Recipe" +msgstr "" + +#: .\cookbook\models.py:1228 +msgid "Food" +msgstr "" + +#: .\cookbook\models.py:1229 .\cookbook\templates\base.html:138 +msgid "Keyword" +msgstr "" + +#: .\cookbook\serializer.py:207 +msgid "Cannot modify Space owner permission." +msgstr "" + +#: .\cookbook\serializer.py:290 +msgid "File uploads are not enabled for this Space." +msgstr "" + +#: .\cookbook\serializer.py:301 +msgid "You have reached your file upload limit." +msgstr "" + +#: .\cookbook\serializer.py:1081 +msgid "Hello" +msgstr "" + +#: .\cookbook\serializer.py:1081 +msgid "You have been invited by " +msgstr "" + +#: .\cookbook\serializer.py:1082 +msgid " to join their Tandoor Recipes space " +msgstr "" + +#: .\cookbook\serializer.py:1083 +msgid "Click the following link to activate your account: " +msgstr "" + +#: .\cookbook\serializer.py:1084 +msgid "" +"If the link does not work use the following code to manually join the space: " +msgstr "" + +#: .\cookbook\serializer.py:1085 +msgid "The invitation is valid until " +msgstr "" + +#: .\cookbook\serializer.py:1086 +msgid "" +"Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub " +msgstr "" + +#: .\cookbook\serializer.py:1089 +msgid "Tandoor Recipes Invite" +msgstr "" + +#: .\cookbook\serializer.py:1209 +msgid "Existing shopping list to update" +msgstr "" + +#: .\cookbook\serializer.py:1211 +msgid "" +"List of ingredient IDs from the recipe to add, if not provided all " +"ingredients will be added." +msgstr "" + +#: .\cookbook\serializer.py:1213 +msgid "" +"Providing a list_recipe ID and servings of 0 will delete that shopping list." +msgstr "" + +#: .\cookbook\serializer.py:1222 +msgid "Amount of food to add to the shopping list" +msgstr "" + +#: .\cookbook\serializer.py:1224 +msgid "ID of unit to use for the shopping list" +msgstr "" + +#: .\cookbook\serializer.py:1226 +msgid "When set to true will delete all food from active shopping lists." +msgstr "" + +#: .\cookbook\tables.py:36 .\cookbook\templates\generic\edit_template.html:6 +#: .\cookbook\templates\generic\edit_template.html:14 +#: .\cookbook\templates\recipes_table.html:82 +msgid "Edit" +msgstr "" + +#: .\cookbook\tables.py:116 .\cookbook\tables.py:131 +#: .\cookbook\templates\generic\delete_template.html:7 +#: .\cookbook\templates\generic\delete_template.html:15 +#: .\cookbook\templates\generic\edit_template.html:28 +#: .\cookbook\templates\recipes_table.html:90 +msgid "Delete" +msgstr "" + +#: .\cookbook\templates\404.html:5 +msgid "404 Error" +msgstr "" + +#: .\cookbook\templates\404.html:18 +msgid "The page you are looking for could not be found." +msgstr "" + +#: .\cookbook\templates\404.html:33 +msgid "Take me Home" +msgstr "" + +#: .\cookbook\templates\404.html:35 +msgid "Report a Bug" +msgstr "" + +#: .\cookbook\templates\account\email.html:6 +#: .\cookbook\templates\account\email.html:17 +msgid "E-mail Addresses" +msgstr "" + +#: .\cookbook\templates\account\email.html:12 +#: .\cookbook\templates\account\password_change.html:11 +#: .\cookbook\templates\account\password_set.html:11 +#: .\cookbook\templates\base.html:293 .\cookbook\templates\settings.html:6 +#: .\cookbook\templates\settings.html:17 +#: .\cookbook\templates\socialaccount\connections.html:10 +msgid "Settings" +msgstr "" + +#: .\cookbook\templates\account\email.html:13 +msgid "Email" +msgstr "" + +#: .\cookbook\templates\account\email.html:19 +msgid "The following e-mail addresses are associated with your account:" +msgstr "" + +#: .\cookbook\templates\account\email.html:36 +msgid "Verified" +msgstr "" + +#: .\cookbook\templates\account\email.html:38 +msgid "Unverified" +msgstr "" + +#: .\cookbook\templates\account\email.html:40 +msgid "Primary" +msgstr "" + +#: .\cookbook\templates\account\email.html:47 +msgid "Make Primary" +msgstr "" + +#: .\cookbook\templates\account\email.html:49 +msgid "Re-send Verification" +msgstr "" + +#: .\cookbook\templates\account\email.html:50 +#: .\cookbook\templates\generic\delete_template.html:57 +#: .\cookbook\templates\socialaccount\connections.html:44 +msgid "Remove" +msgstr "" + +#: .\cookbook\templates\account\email.html:58 +msgid "Warning:" +msgstr "" + +#: .\cookbook\templates\account\email.html:58 +msgid "" +"You currently do not have any e-mail address set up. You should really add " +"an e-mail address so you can receive notifications, reset your password, etc." +msgstr "" + +#: .\cookbook\templates\account\email.html:64 +msgid "Add E-mail Address" +msgstr "" + +#: .\cookbook\templates\account\email.html:69 +msgid "Add E-mail" +msgstr "" + +#: .\cookbook\templates\account\email.html:79 +msgid "Do you really want to remove the selected e-mail address?" +msgstr "" + +#: .\cookbook\templates\account\email_confirm.html:6 +#: .\cookbook\templates\account\email_confirm.html:10 +msgid "Confirm E-mail Address" +msgstr "" + +#: .\cookbook\templates\account\email_confirm.html:16 +#, python-format +msgid "" +"Please confirm that\n" +" %(email)s is an e-mail address " +"for user %(user_display)s\n" +" ." +msgstr "" + +#: .\cookbook\templates\account\email_confirm.html:22 +#: .\cookbook\templates\generic\delete_template.html:72 +msgid "Confirm" +msgstr "" + +#: .\cookbook\templates\account\email_confirm.html:29 +#, python-format +msgid "" +"This e-mail confirmation link expired or is invalid. Please\n" +" issue a new e-mail confirmation " +"request." +msgstr "" + +#: .\cookbook\templates\account\login.html:8 +#: .\cookbook\templates\base.html:340 .\cookbook\templates\openid\login.html:8 +msgid "Login" +msgstr "" + +#: .\cookbook\templates\account\login.html:15 +#: .\cookbook\templates\account\login.html:31 +#: .\cookbook\templates\account\signup.html:69 +#: .\cookbook\templates\account\signup_closed.html:15 +#: .\cookbook\templates\openid\login.html:15 +#: .\cookbook\templates\openid\login.html:26 +#: .\cookbook\templates\socialaccount\authentication_error.html:15 +msgid "Sign In" +msgstr "" + +#: .\cookbook\templates\account\login.html:34 +#: .\cookbook\templates\socialaccount\signup.html:8 +#: .\cookbook\templates\socialaccount\signup.html:57 +msgid "Sign Up" +msgstr "" + +#: .\cookbook\templates\account\login.html:39 +#: .\cookbook\templates\account\login.html:41 +#: .\cookbook\templates\account\password_reset.html:29 +msgid "Reset My Password" +msgstr "" + +#: .\cookbook\templates\account\login.html:40 +msgid "Lost your password?" +msgstr "" + +#: .\cookbook\templates\account\login.html:52 +msgid "Social Login" +msgstr "" + +#: .\cookbook\templates\account\login.html:53 +msgid "You can use any of the following providers to sign in." +msgstr "" + +#: .\cookbook\templates\account\logout.html:5 +#: .\cookbook\templates\account\logout.html:9 +#: .\cookbook\templates\account\logout.html:18 +msgid "Sign Out" +msgstr "" + +#: .\cookbook\templates\account\logout.html:11 +msgid "Are you sure you want to sign out?" +msgstr "" + +#: .\cookbook\templates\account\password_change.html:6 +#: .\cookbook\templates\account\password_change.html:16 +#: .\cookbook\templates\account\password_change.html:21 +#: .\cookbook\templates\account\password_reset_from_key.html:7 +#: .\cookbook\templates\account\password_reset_from_key.html:13 +#: .\cookbook\templates\account\password_reset_from_key_done.html:7 +#: .\cookbook\templates\account\password_reset_from_key_done.html:13 +msgid "Change Password" +msgstr "" + +#: .\cookbook\templates\account\password_change.html:12 +#: .\cookbook\templates\account\password_set.html:12 +#: .\cookbook\templates\settings.html:76 +msgid "Password" +msgstr "" + +#: .\cookbook\templates\account\password_change.html:22 +msgid "Forgot Password?" +msgstr "" + +#: .\cookbook\templates\account\password_reset.html:7 +#: .\cookbook\templates\account\password_reset.html:13 +#: .\cookbook\templates\account\password_reset_done.html:7 +#: .\cookbook\templates\account\password_reset_done.html:10 +msgid "Password Reset" +msgstr "" + +#: .\cookbook\templates\account\password_reset.html:24 +msgid "" +"Forgotten your password? Enter your e-mail address below, and we'll send you " +"an e-mail allowing you to reset it." +msgstr "" + +#: .\cookbook\templates\account\password_reset.html:32 +msgid "Password reset is disabled on this instance." +msgstr "" + +#: .\cookbook\templates\account\password_reset_done.html:16 +msgid "" +"We have sent you an e-mail. Please contact us if you do not receive it " +"within a few minutes." +msgstr "" + +#: .\cookbook\templates\account\password_reset_from_key.html:13 +msgid "Bad Token" +msgstr "" + +#: .\cookbook\templates\account\password_reset_from_key.html:25 +#, python-format +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used.\n" +" Please request a new " +"password reset." +msgstr "" + +#: .\cookbook\templates\account\password_reset_from_key.html:33 +msgid "change password" +msgstr "" + +#: .\cookbook\templates\account\password_reset_from_key.html:36 +#: .\cookbook\templates\account\password_reset_from_key_done.html:19 +msgid "Your password is now changed." +msgstr "" + +#: .\cookbook\templates\account\password_set.html:6 +#: .\cookbook\templates\account\password_set.html:16 +#: .\cookbook\templates\account\password_set.html:21 +msgid "Set Password" +msgstr "" + +#: .\cookbook\templates\account\signup.html:6 +msgid "Register" +msgstr "" + +#: .\cookbook\templates\account\signup.html:12 +msgid "Create an Account" +msgstr "" + +#: .\cookbook\templates\account\signup.html:42 +#: .\cookbook\templates\socialaccount\signup.html:33 +msgid "I accept the follwoing" +msgstr "" + +#: .\cookbook\templates\account\signup.html:45 +#: .\cookbook\templates\socialaccount\signup.html:36 +msgid "Terms and Conditions" +msgstr "" + +#: .\cookbook\templates\account\signup.html:48 +#: .\cookbook\templates\socialaccount\signup.html:39 +msgid "and" +msgstr "" + +#: .\cookbook\templates\account\signup.html:52 +#: .\cookbook\templates\socialaccount\signup.html:43 +msgid "Privacy Policy" +msgstr "" + +#: .\cookbook\templates\account\signup.html:65 +msgid "Create User" +msgstr "" + +#: .\cookbook\templates\account\signup.html:69 +msgid "Already have an account?" +msgstr "" + +#: .\cookbook\templates\account\signup_closed.html:5 +#: .\cookbook\templates\account\signup_closed.html:11 +msgid "Sign Up Closed" +msgstr "" + +#: .\cookbook\templates\account\signup_closed.html:13 +msgid "We are sorry, but the sign up is currently closed." +msgstr "" + +#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:330 +#: .\cookbook\templates\rest_framework\api.html:11 +msgid "API Documentation" +msgstr "" + +#: .\cookbook\templates\base.html:103 .\cookbook\templates\index.html:87 +#: .\cookbook\templates\stats.html:22 +msgid "Recipes" +msgstr "" + +#: .\cookbook\templates\base.html:111 +msgid "Shopping" +msgstr "" + +#: .\cookbook\templates\base.html:150 .\cookbook\views\lists.py:105 +msgid "Foods" +msgstr "" + +#: .\cookbook\templates\base.html:162 +#: .\cookbook\templates\forms\ingredients.html:24 +#: .\cookbook\templates\stats.html:26 .\cookbook\views\lists.py:122 +msgid "Units" +msgstr "" + +#: .\cookbook\templates\base.html:176 .\cookbook\templates\supermarket.html:7 +msgid "Supermarket" +msgstr "" + +#: .\cookbook\templates\base.html:188 +msgid "Supermarket Category" +msgstr "" + +#: .\cookbook\templates\base.html:200 .\cookbook\views\lists.py:171 +msgid "Automations" +msgstr "" + +#: .\cookbook\templates\base.html:214 .\cookbook\views\lists.py:207 +msgid "Files" +msgstr "" + +#: .\cookbook\templates\base.html:226 +msgid "Batch Edit" +msgstr "" + +#: .\cookbook\templates\base.html:238 .\cookbook\templates\history.html:6 +#: .\cookbook\templates\history.html:14 +msgid "History" +msgstr "" + +#: .\cookbook\templates\base.html:252 +#: .\cookbook\templates\ingredient_editor.html:7 +#: .\cookbook\templates\ingredient_editor.html:13 +msgid "Ingredient Editor" +msgstr "" + +#: .\cookbook\templates\base.html:264 +#: .\cookbook\templates\export_response.html:7 +#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20 +msgid "Export" +msgstr "" + +#: .\cookbook\templates\base.html:280 .\cookbook\templates\index.html:47 +msgid "Import Recipe" +msgstr "" + +#: .\cookbook\templates\base.html:282 +msgid "Create" +msgstr "" + +#: .\cookbook\templates\base.html:295 +#: .\cookbook\templates\generic\list_template.html:14 +#: .\cookbook\templates\stats.html:43 +msgid "External Recipes" +msgstr "" + +#: .\cookbook\templates\base.html:298 +#: .\cookbook\templates\space_manage.html:15 +msgid "Space Settings" +msgstr "" + +#: .\cookbook\templates\base.html:303 .\cookbook\templates\system.html:13 +msgid "System" +msgstr "" + +#: .\cookbook\templates\base.html:305 +msgid "Admin" +msgstr "" + +#: .\cookbook\templates\base.html:309 +#: .\cookbook\templates\space_overview.html:25 +msgid "Your Spaces" +msgstr "" + +#: .\cookbook\templates\base.html:320 +#: .\cookbook\templates\space_overview.html:6 +msgid "Overview" +msgstr "" + +#: .\cookbook\templates\base.html:324 +msgid "Markdown Guide" +msgstr "" + +#: .\cookbook\templates\base.html:326 +msgid "GitHub" +msgstr "" + +#: .\cookbook\templates\base.html:328 +msgid "Translate Tandoor" +msgstr "" + +#: .\cookbook\templates\base.html:332 +msgid "API Browser" +msgstr "" + +#: .\cookbook\templates\base.html:335 +msgid "Log out" +msgstr "" + +#: .\cookbook\templates\base.html:357 +msgid "You are using the free version of Tandor" +msgstr "" + +#: .\cookbook\templates\base.html:358 +msgid "Upgrade Now" +msgstr "" + +#: .\cookbook\templates\batch\edit.html:6 +msgid "Batch edit Category" +msgstr "" + +#: .\cookbook\templates\batch\edit.html:15 +msgid "Batch edit Recipes" +msgstr "" + +#: .\cookbook\templates\batch\edit.html:20 +msgid "Add the specified keywords to all recipes containing a word" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:73 +msgid "Sync" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:10 +msgid "Manage watched Folders" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:14 +msgid "" +"On this Page you can manage all storage folder locations that should be " +"monitored and synced." +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:16 +msgid "The path must be in the following format" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:20 +#: .\cookbook\templates\forms\edit_import_recipe.html:14 +#: .\cookbook\templates\generic\edit_template.html:23 +#: .\cookbook\templates\generic\new_template.html:23 +#: .\cookbook\templates\settings.html:70 +#: .\cookbook\templates\settings.html:112 +#: .\cookbook\templates\settings.html:130 +#: .\cookbook\templates\settings.html:202 +#: .\cookbook\templates\settings.html:213 +msgid "Save" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:21 +msgid "Manage External Storage" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:28 +msgid "Sync Now!" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:29 +msgid "Show Recipes" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:30 +msgid "Show Log" +msgstr "" + +#: .\cookbook\templates\batch\waiting.html:4 +#: .\cookbook\templates\batch\waiting.html:10 +msgid "Importing Recipes" +msgstr "" + +#: .\cookbook\templates\batch\waiting.html:28 +msgid "" +"This can take a few minutes, depending on the number of recipes in sync, " +"please wait." +msgstr "" + +#: .\cookbook\templates\books.html:7 +msgid "Recipe Books" +msgstr "" + +#: .\cookbook\templates\export.html:8 .\cookbook\templates\test2.html:6 +msgid "Export Recipes" +msgstr "" + +#: .\cookbook\templates\forms\edit_import_recipe.html:5 +#: .\cookbook\templates\forms\edit_import_recipe.html:9 +msgid "Import new Recipe" +msgstr "" + +#: .\cookbook\templates\forms\edit_internal_recipe.html:7 +msgid "Edit Recipe" +msgstr "" + +#: .\cookbook\templates\forms\ingredients.html:15 +msgid "Edit Ingredients" +msgstr "" + +#: .\cookbook\templates\forms\ingredients.html:16 +msgid "" +"\n" +" The following form can be used if, accidentally, two (or more) units " +"or ingredients where created that should be\n" +" the same.\n" +" It merges two units or ingredients and updates all recipes using " +"them.\n" +" " +msgstr "" + +#: .\cookbook\templates\forms\ingredients.html:26 +msgid "Are you sure that you want to merge these two units?" +msgstr "" + +#: .\cookbook\templates\forms\ingredients.html:31 +#: .\cookbook\templates\forms\ingredients.html:40 +msgid "Merge" +msgstr "" + +#: .\cookbook\templates\forms\ingredients.html:36 +msgid "Are you sure that you want to merge these two ingredients?" +msgstr "" + +#: .\cookbook\templates\generic\delete_template.html:21 +#, python-format +msgid "Are you sure you want to delete the %(title)s: %(object)s " +msgstr "" + +#: .\cookbook\templates\generic\delete_template.html:22 +msgid "This cannot be undone!" +msgstr "" + +#: .\cookbook\templates\generic\delete_template.html:27 +msgid "Protected" +msgstr "" + +#: .\cookbook\templates\generic\delete_template.html:42 +msgid "Cascade" +msgstr "" + +#: .\cookbook\templates\generic\delete_template.html:73 +msgid "Cancel" +msgstr "" + +#: .\cookbook\templates\generic\edit_template.html:32 +msgid "View" +msgstr "" + +#: .\cookbook\templates\generic\edit_template.html:36 +msgid "Delete original file" +msgstr "" + +#: .\cookbook\templates\generic\list_template.html:6 +#: .\cookbook\templates\generic\list_template.html:22 +msgid "List" +msgstr "" + +#: .\cookbook\templates\generic\list_template.html:36 +msgid "Filter" +msgstr "" + +#: .\cookbook\templates\generic\list_template.html:41 +msgid "Import all" +msgstr "" + +#: .\cookbook\templates\generic\table_template.html:76 +#: .\cookbook\templates\recipes_table.html:121 +msgid "previous" +msgstr "" + +#: .\cookbook\templates\generic\table_template.html:98 +#: .\cookbook\templates\recipes_table.html:143 +msgid "next" +msgstr "" + +#: .\cookbook\templates\history.html:20 +msgid "View Log" +msgstr "" + +#: .\cookbook\templates\history.html:24 +msgid "Cook Log" +msgstr "" + +#: .\cookbook\templates\import.html:6 +msgid "Import Recipes" +msgstr "" + +#: .\cookbook\templates\import.html:14 .\cookbook\templates\import.html:20 +#: .\cookbook\templates\import_response.html:7 .\cookbook\views\delete.py:86 +#: .\cookbook\views\edit.py:191 +msgid "Import" +msgstr "" + +#: .\cookbook\templates\include\recipe_open_modal.html:18 +msgid "Close" +msgstr "" + +#: .\cookbook\templates\include\recipe_open_modal.html:32 +msgid "Open Recipe" +msgstr "" + +#: .\cookbook\templates\include\storage_backend_warning.html:4 +msgid "Security Warning" +msgstr "" + +#: .\cookbook\templates\include\storage_backend_warning.html:5 +msgid "" +"\n" +" The Password and Token field are stored as plain text " +"inside the database.\n" +" This is necessary because they are needed to make API requests, but " +"it also increases the risk of\n" +" someone stealing it.
\n" +" To limit the possible damage tokens or accounts with limited access " +"can be used.\n" +" " +msgstr "" + +#: .\cookbook\templates\index.html:29 +msgid "Search recipe ..." +msgstr "" + +#: .\cookbook\templates\index.html:44 +msgid "New Recipe" +msgstr "" + +#: .\cookbook\templates\index.html:53 +msgid "Advanced Search" +msgstr "" + +#: .\cookbook\templates\index.html:57 +msgid "Reset Search" +msgstr "" + +#: .\cookbook\templates\index.html:85 +msgid "Last viewed" +msgstr "" + +#: .\cookbook\templates\index.html:94 +msgid "Log in to view recipes" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:5 +#: .\cookbook\templates\markdown_info.html:13 +msgid "Markdown Info" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:14 +msgid "" +"\n" +" Markdown is lightweight markup language that can be used to format " +"plain text easily.\n" +" This site uses the Python Markdown library to\n" +" convert your text into nice looking HTML. Its full markdown " +"documentation can be found\n" +" here.\n" +" An incomplete but most likely sufficient documentation can be found " +"below.\n" +" " +msgstr "" + +#: .\cookbook\templates\markdown_info.html:25 +msgid "Headers" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:54 +msgid "Formatting" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:56 +#: .\cookbook\templates\markdown_info.html:72 +msgid "Line breaks are inserted by adding two spaces after the end of a line" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:57 +#: .\cookbook\templates\markdown_info.html:73 +msgid "or by leaving a blank line in between." +msgstr "" + +#: .\cookbook\templates\markdown_info.html:59 +#: .\cookbook\templates\markdown_info.html:74 +msgid "This text is bold" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:60 +#: .\cookbook\templates\markdown_info.html:75 +msgid "This text is italic" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:61 +#: .\cookbook\templates\markdown_info.html:77 +msgid "Blockquotes are also possible" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:84 +msgid "Lists" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:85 +msgid "" +"Lists can ordered or unordered. It is important to leave a blank line " +"before the list!" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:87 +#: .\cookbook\templates\markdown_info.html:108 +msgid "Ordered List" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:89 +#: .\cookbook\templates\markdown_info.html:90 +#: .\cookbook\templates\markdown_info.html:91 +#: .\cookbook\templates\markdown_info.html:110 +#: .\cookbook\templates\markdown_info.html:111 +#: .\cookbook\templates\markdown_info.html:112 +msgid "unordered list item" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:93 +#: .\cookbook\templates\markdown_info.html:114 +msgid "Unordered List" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:95 +#: .\cookbook\templates\markdown_info.html:96 +#: .\cookbook\templates\markdown_info.html:97 +#: .\cookbook\templates\markdown_info.html:116 +#: .\cookbook\templates\markdown_info.html:117 +#: .\cookbook\templates\markdown_info.html:118 +msgid "ordered list item" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:125 +msgid "Images & Links" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:126 +msgid "" +"Links can be formatted with Markdown. This application also allows to paste " +"links directly into markdown fields without any formatting." +msgstr "" + +#: .\cookbook\templates\markdown_info.html:132 +#: .\cookbook\templates\markdown_info.html:145 +msgid "This will become an image" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:152 +msgid "Tables" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:153 +msgid "" +"Markdown tables are hard to create by hand. It is recommended to use a table " +"editor like this one." +msgstr "" + +#: .\cookbook\templates\markdown_info.html:155 +#: .\cookbook\templates\markdown_info.html:157 +#: .\cookbook\templates\markdown_info.html:171 +#: .\cookbook\templates\markdown_info.html:177 +msgid "Table" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:155 +#: .\cookbook\templates\markdown_info.html:172 +msgid "Header" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:157 +#: .\cookbook\templates\markdown_info.html:178 +msgid "Cell" +msgstr "" + +#: .\cookbook\templates\meal_plan_entry.html:6 +msgid "Meal Plan View" +msgstr "" + +#: .\cookbook\templates\meal_plan_entry.html:18 +msgid "Created by" +msgstr "" + +#: .\cookbook\templates\meal_plan_entry.html:20 +msgid "Shared with" +msgstr "" + +#: .\cookbook\templates\meal_plan_entry.html:48 +#: .\cookbook\templates\recipes_table.html:64 +msgid "Last cooked" +msgstr "" + +#: .\cookbook\templates\meal_plan_entry.html:50 +msgid "Never cooked before." +msgstr "" + +#: .\cookbook\templates\meal_plan_entry.html:76 +msgid "Other meals on this day" +msgstr "" + +#: .\cookbook\templates\no_groups_info.html:5 +#: .\cookbook\templates\no_groups_info.html:12 +msgid "No Permissions" +msgstr "" + +#: .\cookbook\templates\no_groups_info.html:17 +msgid "You do not have any groups and therefor cannot use this application." +msgstr "" + +#: .\cookbook\templates\no_groups_info.html:18 +#: .\cookbook\templates\no_perm_info.html:15 +msgid "Please contact your administrator." +msgstr "" + +#: .\cookbook\templates\no_perm_info.html:5 +#: .\cookbook\templates\no_perm_info.html:12 +msgid "No Permission" +msgstr "" + +#: .\cookbook\templates\no_perm_info.html:15 +msgid "" +"You do not have the required permissions to view this page or perform this " +"action." +msgstr "" + +#: .\cookbook\templates\offline.html:6 +msgid "Offline" +msgstr "" + +#: .\cookbook\templates\offline.html:19 +msgid "You are currently offline!" +msgstr "" + +#: .\cookbook\templates\offline.html:20 +msgid "" +"The recipes listed below are available for offline viewing because you have " +"recently viewed them. Keep in mind that data might be outdated." +msgstr "" + +#: .\cookbook\templates\openid\login.html:27 +#: .\cookbook\templates\socialaccount\authentication_error.html:27 +msgid "Back" +msgstr "" + +#: .\cookbook\templates\recipe_view.html:26 +msgid "by" +msgstr "" + +#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:144 +#: .\cookbook\views\edit.py:171 +msgid "Comment" +msgstr "" + +#: .\cookbook\templates\recipes_table.html:19 +#: .\cookbook\templates\recipes_table.html:23 +msgid "Recipe Image" +msgstr "" + +#: .\cookbook\templates\recipes_table.html:51 +msgid "Preparation time ca." +msgstr "" + +#: .\cookbook\templates\recipes_table.html:57 +msgid "Waiting time ca." +msgstr "" + +#: .\cookbook\templates\recipes_table.html:60 +msgid "External" +msgstr "" + +#: .\cookbook\templates\recipes_table.html:86 +msgid "Log Cooking" +msgstr "" + +#: .\cookbook\templates\rest_framework\api.html:5 +msgid "Recipe Home" +msgstr "" + +#: .\cookbook\templates\search_info.html:5 +#: .\cookbook\templates\search_info.html:9 +#: .\cookbook\templates\settings.html:172 +msgid "Search Settings" +msgstr "" + +#: .\cookbook\templates\search_info.html:10 +msgid "" +"\n" +" Creating the best search experience is complicated and weighs " +"heavily on your personal configuration. \n" +" Changing any of the search settings can have significant impact on " +"the speed and quality of the results.\n" +" Search Methods, Trigrams and Full Text Search configurations are " +"only available if you are using Postgres for your database.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:19 +msgid "Search Methods" +msgstr "" + +#: .\cookbook\templates\search_info.html:23 +msgid "" +" \n" +" Full text searches attempt to normalize the words provided to " +"match common variants. For example: 'forked', 'forking', 'forks' will all " +"normalize to 'fork'.\n" +" There are several methods available, described below, that will " +"control how the search behavior should react when multiple words are " +"searched.\n" +" Full technical details on how these operate can be viewed on Postgresql's website.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:29 +msgid "" +" \n" +" Simple searches ignore punctuation and common words such as " +"'the', 'a', 'and'. And will treat separate words as required.\n" +" Searching for 'apple or flour' will return any recipe that " +"includes both 'apple' and 'flour' anywhere in the fields that have been " +"selected for a full text search.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:34 +msgid "" +" \n" +" Phrase searches ignore punctuation, but will search for all of " +"the words in the exact order provided.\n" +" Searching for 'apple or flour' will only return a recipe that " +"includes the exact phrase 'apple or flour' in any of the fields that have " +"been selected for a full text search.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:39 +msgid "" +" \n" +" Web searches simulate functionality found on many web search " +"sites supporting special syntax.\n" +" Placing quotes around several words will convert those words " +"into a phrase.\n" +" 'or' is recognized as searching for the word (or phrase) " +"immediately before 'or' OR the word (or phrase) directly after.\n" +" '-' is recognized as searching for recipes that do not include " +"the word (or phrase) that comes immediately after. \n" +" For example searching for 'apple pie' or cherry -butter will " +"return any recipe that includes the phrase 'apple pie' or the word " +"'cherry' \n" +" in any field included in the full text search but exclude any " +"recipe that has the word 'butter' in any field included.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:48 +msgid "" +" \n" +" Raw search is similar to Web except will take puncuation " +"operators such as '|', '&' and '()'\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:59 +msgid "" +" \n" +" Another approach to searching that also requires Postgresql is " +"fuzzy search or trigram similarity. A trigram is a group of three " +"consecutive characters.\n" +" For example searching for 'apple' will create x trigrams 'app', " +"'ppl', 'ple' and will create a score of how closely words match the " +"generated trigrams.\n" +" One benefit of searching trigams is that a search for 'sandwich' " +"will find misspelled words such as 'sandwhich' that would be missed by other " +"methods.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:69 +msgid "Search Fields" +msgstr "" + +#: .\cookbook\templates\search_info.html:73 +msgid "" +" \n" +" Unaccent is a special case in that it enables searching a field " +"'unaccented' for each search style attempting to ignore accented values. \n" +" For example when you enable unaccent for 'Name' any search " +"(starts with, contains, trigram) will attempt the search ignoring accented " +"characters.\n" +" \n" +" For the other options, you can enable search on any or all " +"fields and they will be combined together with an assumed 'OR'.\n" +" For example enabling 'Name' for Starts With, 'Name' and " +"'Description' for Partial Match and 'Ingredients' and 'Keywords' for Full " +"Search\n" +" and searching for 'apple' will generate a search that will " +"return recipes that have:\n" +" - A recipe name that starts with 'apple'\n" +" - OR a recipe name that contains 'apple'\n" +" - OR a recipe description that contains 'apple'\n" +" - OR a recipe that will have a full text search match ('apple' " +"or 'apples') in ingredients\n" +" - OR a recipe that will have a full text search match in " +"Keywords\n" +"\n" +" Combining too many fields in too many types of search can have a " +"negative impact on performance, create duplicate results or return " +"unexpected results.\n" +" For example, enabling fuzzy search or partial matches will " +"interfere with web search methods. \n" +" Searching for 'apple -pie' with fuzzy search and full text " +"search will return the recipe Apple Pie. Though it is not included in the " +"full text results, it does match the trigram results.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:95 +msgid "Search Index" +msgstr "" + +#: .\cookbook\templates\search_info.html:99 +msgid "" +" \n" +" Trigram search and Full Text Search both rely on database " +"indexes to perform effectively. \n" +" You can rebuild the indexes on all fields in the Admin page for " +"Recipes and selecting all recipes and running 'rebuild index for selected " +"recipes'\n" +" You can also rebuild indexes at the command line by executing " +"the management command 'python manage.py rebuildindex'\n" +" " +msgstr "" + +#: .\cookbook\templates\settings.html:28 +msgid "Account" +msgstr "" + +#: .\cookbook\templates\settings.html:35 +msgid "Preferences" +msgstr "" + +#: .\cookbook\templates\settings.html:42 +msgid "API-Settings" +msgstr "" + +#: .\cookbook\templates\settings.html:49 +msgid "Search-Settings" +msgstr "" + +#: .\cookbook\templates\settings.html:56 +msgid "Shopping-Settings" +msgstr "" + +#: .\cookbook\templates\settings.html:65 +msgid "Name Settings" +msgstr "" + +#: .\cookbook\templates\settings.html:73 +msgid "Account Settings" +msgstr "" + +#: .\cookbook\templates\settings.html:75 +msgid "Emails" +msgstr "" + +#: .\cookbook\templates\settings.html:78 +#: .\cookbook\templates\socialaccount\connections.html:11 +msgid "Social" +msgstr "" + +#: .\cookbook\templates\settings.html:91 +msgid "Language" +msgstr "" + +#: .\cookbook\templates\settings.html:121 +msgid "Style" +msgstr "" + +#: .\cookbook\templates\settings.html:142 +msgid "API Token" +msgstr "" + +#: .\cookbook\templates\settings.html:143 +msgid "" +"You can use both basic authentication and token based authentication to " +"access the REST API." +msgstr "" + +#: .\cookbook\templates\settings.html:160 +msgid "" +"Use the token as an Authorization header prefixed by the word token as shown " +"in the following examples:" +msgstr "" + +#: .\cookbook\templates\settings.html:162 +msgid "or" +msgstr "" + +#: .\cookbook\templates\settings.html:173 +msgid "" +"There are many options to configure the search depending on your personal " +"preferences." +msgstr "" + +#: .\cookbook\templates\settings.html:174 +msgid "" +"Usually you do not need to configure any of them and can just stick " +"with either the default or one of the following presets." +msgstr "" + +#: .\cookbook\templates\settings.html:175 +msgid "" +"If you do want to configure the search you can read about the different " +"options here." +msgstr "" + +#: .\cookbook\templates\settings.html:180 +msgid "Fuzzy" +msgstr "" + +#: .\cookbook\templates\settings.html:181 +msgid "" +"Find what you need even if your search or the recipe contains typos. Might " +"return more results than needed to make sure you find what you are looking " +"for." +msgstr "" + +#: .\cookbook\templates\settings.html:182 +msgid "This is the default behavior" +msgstr "" + +#: .\cookbook\templates\settings.html:183 +#: .\cookbook\templates\settings.html:191 +msgid "Apply" +msgstr "" + +#: .\cookbook\templates\settings.html:188 +msgid "Precise" +msgstr "" + +#: .\cookbook\templates\settings.html:189 +msgid "" +"Allows fine control over search results but might not return results if too " +"many spelling mistakes are made." +msgstr "" + +#: .\cookbook\templates\settings.html:190 +msgid "Perfect for large Databases" +msgstr "" + +#: .\cookbook\templates\settings.html:207 +msgid "Shopping Settings" +msgstr "" + +#: .\cookbook\templates\setup.html:6 .\cookbook\templates\system.html:5 +msgid "Cookbook Setup" +msgstr "" + +#: .\cookbook\templates\setup.html:14 +msgid "Setup" +msgstr "" + +#: .\cookbook\templates\setup.html:15 +msgid "" +"To start using this application you must first create a superuser account." +msgstr "" + +#: .\cookbook\templates\setup.html:20 +msgid "Create Superuser account" +msgstr "" + +#: .\cookbook\templates\socialaccount\authentication_error.html:7 +#: .\cookbook\templates\socialaccount\authentication_error.html:23 +msgid "Social Network Login Failure" +msgstr "" + +#: .\cookbook\templates\socialaccount\authentication_error.html:25 +msgid "" +"An error occurred while attempting to login via your social network account." +msgstr "" + +#: .\cookbook\templates\socialaccount\connections.html:4 +#: .\cookbook\templates\socialaccount\connections.html:15 +msgid "Account Connections" +msgstr "" + +#: .\cookbook\templates\socialaccount\connections.html:18 +msgid "" +"You can sign in to your account using any of the following third party\n" +" accounts:" +msgstr "" + +#: .\cookbook\templates\socialaccount\connections.html:52 +msgid "" +"You currently have no social network accounts connected to this account." +msgstr "" + +#: .\cookbook\templates\socialaccount\connections.html:55 +msgid "Add a 3rd Party Account" +msgstr "" + +#: .\cookbook\templates\socialaccount\login.html:5 +#: .\cookbook\templates\socialaccount\signup.html:5 +msgid "Signup" +msgstr "" + +#: .\cookbook\templates\socialaccount\login.html:9 +#, python-format +msgid "Connect %(provider)s" +msgstr "" + +#: .\cookbook\templates\socialaccount\login.html:11 +#, python-format +msgid "You are about to connect a new third party account from %(provider)s." +msgstr "" + +#: .\cookbook\templates\socialaccount\login.html:13 +#, python-format +msgid "Sign In Via %(provider)s" +msgstr "" + +#: .\cookbook\templates\socialaccount\login.html:15 +#, python-format +msgid "You are about to sign in using a third party account from %(provider)s." +msgstr "" + +#: .\cookbook\templates\socialaccount\login.html:20 +msgid "Continue" +msgstr "" + +#: .\cookbook\templates\socialaccount\signup.html:10 +#, python-format +msgid "" +"You are about to use your\n" +" %(provider_name)s account to login to\n" +" %(site_name)s. As a final step, please complete the following form:" +msgstr "" + +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:23 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:31 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:39 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:47 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:55 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:63 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:71 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:79 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:87 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:95 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:103 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:111 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:119 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:127 +msgid "Sign in using" +msgstr "" + +#: .\cookbook\templates\space_manage.html:26 +msgid "Space:" +msgstr "" + +#: .\cookbook\templates\space_manage.html:27 +msgid "Manage Subscription" +msgstr "" + +#: .\cookbook\templates\space_overview.html:13 .\cookbook\views\delete.py:216 +msgid "Space" +msgstr "" + +#: .\cookbook\templates\space_overview.html:17 +msgid "" +"Recipes, foods, shopping lists and more are organized in spaces of one or " +"more people." +msgstr "" + +#: .\cookbook\templates\space_overview.html:18 +msgid "" +"You can either be invited into an existing space or create your own one." +msgstr "" + +#: .\cookbook\templates\space_overview.html:45 +msgid "Owner" +msgstr "" + +#: .\cookbook\templates\space_overview.html:49 +msgid "Leave Space" +msgstr "" + +#: .\cookbook\templates\space_overview.html:70 +#: .\cookbook\templates\space_overview.html:80 +msgid "Join Space" +msgstr "" + +#: .\cookbook\templates\space_overview.html:73 +msgid "Join an existing space." +msgstr "" + +#: .\cookbook\templates\space_overview.html:75 +msgid "" +"To join an existing space either enter your invite token or click on the " +"invite link the space owner send you." +msgstr "" + +#: .\cookbook\templates\space_overview.html:88 +#: .\cookbook\templates\space_overview.html:97 +msgid "Create Space" +msgstr "" + +#: .\cookbook\templates\space_overview.html:91 +msgid "Create your own recipe space." +msgstr "" + +#: .\cookbook\templates\space_overview.html:93 +msgid "Start your own recipe space and invite other users to it." +msgstr "" + +#: .\cookbook\templates\stats.html:4 +msgid "Stats" +msgstr "" + +#: .\cookbook\templates\stats.html:10 +msgid "Statistics" +msgstr "" + +#: .\cookbook\templates\stats.html:19 +msgid "Number of objects" +msgstr "" + +#: .\cookbook\templates\stats.html:30 +msgid "Recipe Imports" +msgstr "" + +#: .\cookbook\templates\stats.html:38 +msgid "Objects stats" +msgstr "" + +#: .\cookbook\templates\stats.html:41 +msgid "Recipes without Keywords" +msgstr "" + +#: .\cookbook\templates\stats.html:45 +msgid "Internal Recipes" +msgstr "" + +#: .\cookbook\templates\system.html:20 +msgid "System Information" +msgstr "" + +#: .\cookbook\templates\system.html:22 +msgid "" +"\n" +" Django Recipes is an open source free software application. It can " +"be found on\n" +" GitHub.\n" +" Changelogs can be found here.\n" +" " +msgstr "" + +#: .\cookbook\templates\system.html:36 +msgid "Media Serving" +msgstr "" + +#: .\cookbook\templates\system.html:37 .\cookbook\templates\system.html:52 +#: .\cookbook\templates\system.html:68 +msgid "Warning" +msgstr "" + +#: .\cookbook\templates\system.html:37 .\cookbook\templates\system.html:52 +#: .\cookbook\templates\system.html:68 .\cookbook\templates\system.html:83 +msgid "Ok" +msgstr "" + +#: .\cookbook\templates\system.html:39 +msgid "" +"Serving media files directly using gunicorn/python is not recommend!\n" +" Please follow the steps described\n" +" here to update\n" +" your installation.\n" +" " +msgstr "" + +#: .\cookbook\templates\system.html:45 .\cookbook\templates\system.html:61 +#: .\cookbook\templates\system.html:76 .\cookbook\templates\system.html:90 +msgid "Everything is fine!" +msgstr "" + +#: .\cookbook\templates\system.html:50 +msgid "Secret Key" +msgstr "" + +#: .\cookbook\templates\system.html:54 +msgid "" +"\n" +" You do not have a SECRET_KEY configured in your " +".env file. Django defaulted to the\n" +" standard key\n" +" provided with the installation which is publicly know and " +"insecure! Please set\n" +" SECRET_KEY int the .env configuration " +"file.\n" +" " +msgstr "" + +#: .\cookbook\templates\system.html:66 +msgid "Debug Mode" +msgstr "" + +#: .\cookbook\templates\system.html:70 +msgid "" +"\n" +" This application is still running in debug mode. This is most " +"likely not needed. Turn of debug mode by\n" +" setting\n" +" DEBUG=0 int the .env configuration " +"file.\n" +" " +msgstr "" + +#: .\cookbook\templates\system.html:81 +msgid "Database" +msgstr "" + +#: .\cookbook\templates\system.html:83 +msgid "Info" +msgstr "" + +#: .\cookbook\templates\system.html:85 +msgid "" +"\n" +" This application is not running with a Postgres database " +"backend. This is ok but not recommended as some\n" +" features only work with postgres databases.\n" +" " +msgstr "" + +#: .\cookbook\templates\url_import.html:8 +msgid "URL Import" +msgstr "" + +#: .\cookbook\views\api.py:105 .\cookbook\views\api.py:197 +msgid "Parameter updated_at incorrectly formatted" +msgstr "" + +#: .\cookbook\views\api.py:217 .\cookbook\views\api.py:320 +msgid "No {self.basename} with id {pk} exists" +msgstr "" + +#: .\cookbook\views\api.py:221 +msgid "Cannot merge with the same object!" +msgstr "" + +#: .\cookbook\views\api.py:228 +msgid "No {self.basename} with id {target} exists" +msgstr "" + +#: .\cookbook\views\api.py:233 +msgid "Cannot merge with child object!" +msgstr "" + +#: .\cookbook\views\api.py:266 +msgid "{source.name} was merged successfully with {target.name}" +msgstr "" + +#: .\cookbook\views\api.py:271 +msgid "An error occurred attempting to merge {source.name} with {target.name}" +msgstr "" + +#: .\cookbook\views\api.py:329 +msgid "{child.name} was moved successfully to the root." +msgstr "" + +#: .\cookbook\views\api.py:332 .\cookbook\views\api.py:350 +msgid "An error occurred attempting to move " +msgstr "" + +#: .\cookbook\views\api.py:335 +msgid "Cannot move an object to itself!" +msgstr "" + +#: .\cookbook\views\api.py:341 +msgid "No {self.basename} with id {parent} exists" +msgstr "" + +#: .\cookbook\views\api.py:347 +msgid "{child.name} was moved successfully to parent {parent.name}" +msgstr "" + +#: .\cookbook\views\api.py:542 +msgid "{obj.name} was removed from the shopping list." +msgstr "" + +#: .\cookbook\views\api.py:547 .\cookbook\views\api.py:879 +#: .\cookbook\views\api.py:892 +msgid "{obj.name} was added to the shopping list." +msgstr "" + +#: .\cookbook\views\api.py:674 +msgid "ID of recipe a step is part of. For multiple repeat parameter." +msgstr "" + +#: .\cookbook\views\api.py:676 +msgid "Query string matched (fuzzy) against object name." +msgstr "" + +#: .\cookbook\views\api.py:720 +msgid "" +"Query string matched (fuzzy) against recipe name. In the future also " +"fulltext search." +msgstr "" + +#: .\cookbook\views\api.py:722 +msgid "" +"ID of keyword a recipe should have. For multiple repeat parameter. " +"Equivalent to keywords_or" +msgstr "" + +#: .\cookbook\views\api.py:725 +msgid "" +"Keyword IDs, repeat for multiple. Return recipes with any of the keywords" +msgstr "" + +#: .\cookbook\views\api.py:728 +msgid "" +"Keyword IDs, repeat for multiple. Return recipes with all of the keywords." +msgstr "" + +#: .\cookbook\views\api.py:731 +msgid "" +"Keyword IDs, repeat for multiple. Exclude recipes with any of the keywords." +msgstr "" + +#: .\cookbook\views\api.py:734 +msgid "" +"Keyword IDs, repeat for multiple. Exclude recipes with all of the keywords." +msgstr "" + +#: .\cookbook\views\api.py:736 +msgid "ID of food a recipe should have. For multiple repeat parameter." +msgstr "" + +#: .\cookbook\views\api.py:739 +msgid "Food IDs, repeat for multiple. Return recipes with any of the foods" +msgstr "" + +#: .\cookbook\views\api.py:741 +msgid "Food IDs, repeat for multiple. Return recipes with all of the foods." +msgstr "" + +#: .\cookbook\views\api.py:743 +msgid "Food IDs, repeat for multiple. Exclude recipes with any of the foods." +msgstr "" + +#: .\cookbook\views\api.py:745 +msgid "Food IDs, repeat for multiple. Exclude recipes with all of the foods." +msgstr "" + +#: .\cookbook\views\api.py:746 +msgid "ID of unit a recipe should have." +msgstr "" + +#: .\cookbook\views\api.py:748 +msgid "" +"Rating a recipe should have or greater. [0 - 5] Negative value filters " +"rating less than." +msgstr "" + +#: .\cookbook\views\api.py:749 +msgid "ID of book a recipe should be in. For multiple repeat parameter." +msgstr "" + +#: .\cookbook\views\api.py:751 +msgid "Book IDs, repeat for multiple. Return recipes with any of the books" +msgstr "" + +#: .\cookbook\views\api.py:753 +msgid "Book IDs, repeat for multiple. Return recipes with all of the books." +msgstr "" + +#: .\cookbook\views\api.py:755 +msgid "Book IDs, repeat for multiple. Exclude recipes with any of the books." +msgstr "" + +#: .\cookbook\views\api.py:757 +msgid "Book IDs, repeat for multiple. Exclude recipes with all of the books." +msgstr "" + +#: .\cookbook\views\api.py:759 +msgid "If only internal recipes should be returned. [true/false]" +msgstr "" + +#: .\cookbook\views\api.py:761 +msgid "Returns the results in randomized order. [true/false]" +msgstr "" + +#: .\cookbook\views\api.py:763 +msgid "Returns new results first in search results. [true/false]" +msgstr "" + +#: .\cookbook\views\api.py:765 +msgid "" +"Filter recipes cooked X times or more. Negative values returns cooked less " +"than X times" +msgstr "" + +#: .\cookbook\views\api.py:767 +msgid "" +"Filter recipes last cooked on or after YYYY-MM-DD. Prepending - filters on " +"or before date." +msgstr "" + +#: .\cookbook\views\api.py:769 +msgid "" +"Filter recipes created on or after YYYY-MM-DD. Prepending - filters on or " +"before date." +msgstr "" + +#: .\cookbook\views\api.py:771 +msgid "" +"Filter recipes updated on or after YYYY-MM-DD. Prepending - filters on or " +"before date." +msgstr "" + +#: .\cookbook\views\api.py:773 +msgid "" +"Filter recipes lasts viewed on or after YYYY-MM-DD. Prepending - filters on " +"or before date." +msgstr "" + +#: .\cookbook\views\api.py:775 +msgid "Filter recipes that can be made with OnHand food. [true/false]" +msgstr "" + +#: .\cookbook\views\api.py:937 +msgid "" +"Returns the shopping list entry with a primary key of id. Multiple values " +"allowed." +msgstr "" + +#: .\cookbook\views\api.py:942 +msgid "" +"Filter shopping list entries on checked. [true, false, both, recent]" +"
- recent includes unchecked items and recently completed items." +msgstr "" + +#: .\cookbook\views\api.py:945 +msgid "Returns the shopping list entries sorted by supermarket category order." +msgstr "" + +#: .\cookbook\views\api.py:1140 +msgid "Nothing to do." +msgstr "" + +#: .\cookbook\views\api.py:1160 +msgid "Invalid Url" +msgstr "" + +#: .\cookbook\views\api.py:1167 +msgid "Connection Refused." +msgstr "" + +#: .\cookbook\views\api.py:1172 +msgid "Bad URL Schema." +msgstr "" + +#: .\cookbook\views\api.py:1195 +msgid "No usable data could be found." +msgstr "" + +#: .\cookbook\views\api.py:1303 .\cookbook\views\data.py:28 +#: .\cookbook\views\edit.py:120 .\cookbook\views\new.py:90 +msgid "This feature is not yet available in the hosted version of tandoor!" +msgstr "" + +#: .\cookbook\views\api.py:1325 +msgid "Sync successful!" +msgstr "" + +#: .\cookbook\views\api.py:1330 +msgid "Error synchronizing with Storage" +msgstr "" + +#: .\cookbook\views\data.py:97 +#, python-format +msgid "Batch edit done. %(count)d recipe was updated." +msgid_plural "Batch edit done. %(count)d Recipes where updated." +msgstr[0] "" + +#: .\cookbook\views\delete.py:98 +msgid "Monitor" +msgstr "" + +#: .\cookbook\views\delete.py:122 .\cookbook\views\lists.py:62 +#: .\cookbook\views\new.py:96 +msgid "Storage Backend" +msgstr "" + +#: .\cookbook\views\delete.py:132 +msgid "" +"Could not delete this storage backend as it is used in at least one monitor." +msgstr "" + +#: .\cookbook\views\delete.py:155 +msgid "Recipe Book" +msgstr "" + +#: .\cookbook\views\delete.py:167 +msgid "Bookmarks" +msgstr "" + +#: .\cookbook\views\delete.py:189 +msgid "Invite Link" +msgstr "" + +#: .\cookbook\views\delete.py:200 +msgid "Space Membership" +msgstr "" + +#: .\cookbook\views\edit.py:116 +msgid "You cannot edit this storage!" +msgstr "" + +#: .\cookbook\views\edit.py:140 +msgid "Storage saved!" +msgstr "" + +#: .\cookbook\views\edit.py:146 +msgid "There was an error updating this storage backend!" +msgstr "" + +#: .\cookbook\views\edit.py:239 +msgid "Changes saved!" +msgstr "" + +#: .\cookbook\views\edit.py:243 +msgid "Error saving changes!" +msgstr "" + +#: .\cookbook\views\import_export.py:111 .\cookbook\views\import_export.py:150 +msgid "Importing is not implemented for this provider" +msgstr "" + +#: .\cookbook\views\import_export.py:137 +msgid "" +"The PDF Exporter is not enabled on this instance as it is still in an " +"experimental state." +msgstr "" + +#: .\cookbook\views\lists.py:24 +msgid "Import Log" +msgstr "" + +#: .\cookbook\views\lists.py:37 +msgid "Discovery" +msgstr "" + +#: .\cookbook\views\lists.py:47 +msgid "Shopping List" +msgstr "" + +#: .\cookbook\views\lists.py:76 +msgid "Invite Links" +msgstr "" + +#: .\cookbook\views\lists.py:139 +msgid "Supermarkets" +msgstr "" + +#: .\cookbook\views\lists.py:155 +msgid "Shopping Categories" +msgstr "" + +#: .\cookbook\views\lists.py:187 +msgid "Custom Filters" +msgstr "" + +#: .\cookbook\views\lists.py:224 +msgid "Steps" +msgstr "" + +#: .\cookbook\views\new.py:121 +msgid "Imported new recipe!" +msgstr "" + +#: .\cookbook\views\new.py:124 +msgid "There was an error importing this recipe!" +msgstr "" + +#: .\cookbook\views\views.py:124 +msgid "" +"You have successfully created your own recipe space. Start by adding some " +"recipes or invite other people to join you." +msgstr "" + +#: .\cookbook\views\views.py:178 +msgid "You do not have the required permissions to perform this action!" +msgstr "" + +#: .\cookbook\views\views.py:189 +msgid "Comment saved!" +msgstr "" + +#: .\cookbook\views\views.py:264 +msgid "This feature is not available in the demo version!" +msgstr "" + +#: .\cookbook\views\views.py:324 +msgid "You must select at least one field to search!" +msgstr "" + +#: .\cookbook\views\views.py:329 +msgid "" +"To use this search method you must select at least one full text search " +"field!" +msgstr "" + +#: .\cookbook\views\views.py:333 +msgid "Fuzzy search is not compatible with this search method!" +msgstr "" + +#: .\cookbook\views\views.py:463 +msgid "" +"The setup page can only be used to create the first user! If you have " +"forgotten your superuser credentials please consult the django documentation " +"on how to reset passwords." +msgstr "" + +#: .\cookbook\views\views.py:470 +msgid "Passwords dont match!" +msgstr "" + +#: .\cookbook\views\views.py:478 +msgid "User has been created, please login!" +msgstr "" + +#: .\cookbook\views\views.py:494 +msgid "Malformed Invite Link supplied!" +msgstr "" + +#: .\cookbook\views\views.py:510 +msgid "Successfully joined space." +msgstr "" + +#: .\cookbook\views\views.py:516 +msgid "Invite Link not valid or already used!" +msgstr "" + +#: .\cookbook\views\views.py:530 +msgid "" +"Reporting share links is not enabled for this instance. Please notify the " +"page administrator to report problems." +msgstr "" + +#: .\cookbook\views\views.py:536 +msgid "" +"Recipe sharing link has been disabled! For additional information please " +"contact the page administrator." +msgstr "" From d2a148ae7d71e844a26f08854f6e6ab5dbdb1adb Mon Sep 17 00:00:00 2001 From: wella Date: Sat, 1 Oct 2022 16:20:21 +0000 Subject: [PATCH 34/77] Translated using Weblate (Indonesian) Currently translated at 22.8% (105 of 460 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/id/ --- vue/src/locales/id.json | 164 ++++++++++++++++++++-------------------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/vue/src/locales/id.json b/vue/src/locales/id.json index ce9721a184..e135edcd55 100644 --- a/vue/src/locales/id.json +++ b/vue/src/locales/id.json @@ -22,88 +22,88 @@ "import_running": "Impor berjalan, harap tunggu!", "all_fields_optional": "Semua bidang adalah opsional dan dapat dibiarkan kosong.", "convert_internal": "Ubah ke resep internal", - "show_only_internal": "", - "show_split_screen": "", - "Log_Recipe_Cooking": "", - "External_Recipe_Image": "", - "Add_to_Shopping": "", - "Add_to_Plan": "", - "Step_start_time": "", - "Sort_by_new": "", - "Table_of_Contents": "", - "Recipes_per_page": "", - "Show_as_header": "", - "Hide_as_header": "", - "Add_nutrition_recipe": "", - "Remove_nutrition_recipe": "", - "Copy_template_reference": "", - "Save_and_View": "", - "Manage_Books": "", - "Meal_Plan": "", - "Select_Book": "", - "Select_File": "", - "Recipe_Image": "", - "Import_finished": "", - "View_Recipes": "", - "Log_Cooking": "", - "New_Recipe": "", - "Url_Import": "", - "Reset_Search": "", - "Recently_Viewed": "", - "Load_More": "", - "New_Keyword": "", - "Delete_Keyword": "", - "Edit_Keyword": "", - "Edit_Recipe": "", - "Move_Keyword": "", - "Merge_Keyword": "", - "Hide_Keywords": "", - "Hide_Recipes": "", - "Move_Up": "", - "Move_Down": "", - "Step_Name": "", - "Step_Type": "", - "Make_Header": "", - "Make_Ingredient": "", - "Enable_Amount": "", - "Disable_Amount": "", - "Ingredient Editor": "", - "Private_Recipe": "", - "Private_Recipe_Help": "", - "reusable_help_text": "", - "Add_Step": "", - "Keywords": "", - "Books": "", - "Proteins": "", - "Fats": "", - "Carbohydrates": "", - "Calories": "", - "Energy": "", - "Nutrition": "", - "Date": "", - "Share": "", - "Automation": "", - "Parameter": "", - "Export": "", - "Copy": "", - "Rating": "", - "Close": "", - "Cancel": "", - "Link": "", - "Add": "", - "New": "", - "Note": "", - "Success": "", - "Failure": "", - "Protected": "", - "Ingredients": "", - "Supermarket": "", - "Categories": "", - "Category": "", - "Selected": "", - "min": "", - "Servings": "", - "Waiting": "", + "show_only_internal": "Hanya tampilkan resep internal", + "show_split_screen": "Tampilan Terpisah", + "Log_Recipe_Cooking": "Log Resep Memasak", + "External_Recipe_Image": "Gambar Resep Eksternal", + "Add_to_Shopping": "Tambahkan ke Belanja", + "Add_to_Plan": "Tambahkan ke Rencana", + "Step_start_time": "Langkah waktu mulai", + "Sort_by_new": "Urutkan berdasarkan baru", + "Table_of_Contents": "Daftar isi", + "Recipes_per_page": "Resep per Halaman", + "Show_as_header": "Tampilkan sebagai tajuk", + "Hide_as_header": "Sembunyikan sebagai tajuk", + "Add_nutrition_recipe": "Tambahkan nutrisi ke resep", + "Remove_nutrition_recipe": "Hapus nutrisi dari resep", + "Copy_template_reference": "Salin referensi template", + "Save_and_View": "Simpan & Lihat", + "Manage_Books": "Kelola Buku", + "Meal_Plan": "rencana makan", + "Select_Book": "Pilih Buku", + "Select_File": "Pilih Buku", + "Recipe_Image": "Gambar Resep", + "Import_finished": "Impor selesai", + "View_Recipes": "Lihat Resep", + "Log_Cooking": "Log Memasak", + "New_Recipe": "Resep Baru", + "Url_Import": "Impor Url", + "Reset_Search": "Setel Ulang Pencarian", + "Recently_Viewed": "baru saja dilihat", + "Load_More": "Muat lebih banyak", + "New_Keyword": "Kata Kunci Baru", + "Delete_Keyword": "Hapus Kata Kunci", + "Edit_Keyword": "Rubah Kata Kunci", + "Edit_Recipe": "Rubah Resep", + "Move_Keyword": "Pindahkan Kata Kunci", + "Merge_Keyword": "Gabungkan Kata Kunci", + "Hide_Keywords": "Sembunyikan Kata Kunci", + "Hide_Recipes": "Sembunyikan Resep", + "Move_Up": "Pindahkan keatas", + "Move_Down": "Pindahkan kebawah", + "Step_Name": "Nama Langkah", + "Step_Type": "Tipe Langkah", + "Make_Header": "Buat Header", + "Make_Ingredient": "Buat bahan", + "Enable_Amount": "Aktifkan Jumlah", + "Disable_Amount": "Nonaktifkan Jumlah", + "Ingredient Editor": "Editor Bahan", + "Private_Recipe": "Resep Pribadi", + "Private_Recipe_Help": "Resep hanya diperlihatkan kepada Anda dan orang-orang yang dibagikan resep tersebut.", + "reusable_help_text": "Haruskah tautan undangan dapat digunakan untuk lebih dari satu pengguna.", + "Add_Step": "Tambahkan Langkah", + "Keywords": "Kata Kunci", + "Books": "Buku", + "Proteins": "Protein", + "Fats": "Lemak", + "Carbohydrates": "Karbohidrat", + "Calories": "Kalori", + "Energy": "Energi", + "Nutrition": "Nutrisi", + "Date": "Tanggal", + "Share": "Bagikan", + "Automation": "Automatis", + "Parameter": "Parameter", + "Export": "Ekspor", + "Copy": "Salin", + "Rating": "Peringkat", + "Close": "Tutup", + "Cancel": "Batal", + "Link": "Link", + "Add": "Tambahkan", + "New": "Baru", + "Note": "Catatan", + "Success": "Sukses", + "Failure": "Kegagalan", + "Protected": "Terlindung", + "Ingredients": "bahan-bahan", + "Supermarket": "Supermarket", + "Categories": "Kategori", + "Category": "Kategori", + "Selected": "Terpilih", + "min": "min", + "Servings": "Porsi", + "Waiting": "Menunggu", "Preparation": "", "External": "", "Size": "", From 545e4f7af443e34e8d45b086bd9371de8a5f5e39 Mon Sep 17 00:00:00 2001 From: wella Date: Sat, 1 Oct 2022 16:32:46 +0000 Subject: [PATCH 35/77] Translated using Weblate (Indonesian) Currently translated at 5.3% (28 of 524 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/id/ --- cookbook/locale/id/LC_MESSAGES/django.po | 66 ++++++++++++++---------- 1 file changed, 40 insertions(+), 26 deletions(-) diff --git a/cookbook/locale/id/LC_MESSAGES/django.po b/cookbook/locale/id/LC_MESSAGES/django.po index e1d4698c27..ed9bfb4209 100644 --- a/cookbook/locale/id/LC_MESSAGES/django.po +++ b/cookbook/locale/id/LC_MESSAGES/django.po @@ -8,116 +8,125 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-07-12 19:20+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"PO-Revision-Date: 2022-10-01 16:38+0000\n" +"Last-Translator: wella \n" +"Language-Team: Indonesian \n" "Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Weblate 4.10.1\n" #: .\cookbook\filters.py:23 .\cookbook\templates\forms\ingredients.html:34 #: .\cookbook\templates\stats.html:28 msgid "Ingredients" -msgstr "" +msgstr "bahan-bahan" #: .\cookbook\forms.py:53 msgid "Default unit" -msgstr "" +msgstr "Unit bawaan" #: .\cookbook\forms.py:54 msgid "Use fractions" -msgstr "" +msgstr "Gunakan pecahan" #: .\cookbook\forms.py:55 msgid "Use KJ" -msgstr "" +msgstr "Gunakan KJ" #: .\cookbook\forms.py:56 msgid "Theme" -msgstr "" +msgstr "Tema" #: .\cookbook\forms.py:57 msgid "Navbar color" -msgstr "" +msgstr "Warna Navigasi" #: .\cookbook\forms.py:58 msgid "Sticky navbar" -msgstr "" +msgstr "Sticky navbar" #: .\cookbook\forms.py:59 msgid "Default page" -msgstr "" +msgstr "Halaman default" #: .\cookbook\forms.py:60 msgid "Show recent recipes" -msgstr "" +msgstr "Tampilkan resep terbaru" #: .\cookbook\forms.py:61 msgid "Search style" -msgstr "" +msgstr "Cari style" #: .\cookbook\forms.py:62 msgid "Plan sharing" -msgstr "" +msgstr "Berbagi rencana" #: .\cookbook\forms.py:63 msgid "Ingredient decimal places" -msgstr "" +msgstr "Tempat desimal bahan" #: .\cookbook\forms.py:64 msgid "Shopping list auto sync period" -msgstr "" +msgstr "Periode sinkronisasi otomatis daftar belanja" #: .\cookbook\forms.py:65 .\cookbook\templates\recipe_view.html:21 #: .\cookbook\templates\stats.html:47 msgid "Comments" -msgstr "" +msgstr "Komen" #: .\cookbook\forms.py:66 msgid "Left-handed mode" -msgstr "" +msgstr "Mode tangan kiri" #: .\cookbook\forms.py:70 msgid "" "Color of the top navigation bar. Not all colors work with all themes, just " "try them out!" msgstr "" +"Warna bilah navigasi atas. Tidak semua warna bekerja dengan semua tema, coba " +"saja!" #: .\cookbook\forms.py:72 msgid "Default Unit to be used when inserting a new ingredient into a recipe." msgstr "" +"Default Unit yang akan digunakan saat memasukkan bahan baru ke dalam resep." #: .\cookbook\forms.py:74 msgid "" "Enables support for fractions in ingredient amounts (e.g. convert decimals " "to fractions automatically)" msgstr "" +"Mengaktifkan dukungan untuk pecahan dalam jumlah bahan (misalnya, mengubah " +"desimal menjadi pecahan secara otomatis)" #: .\cookbook\forms.py:76 msgid "Display nutritional energy amounts in joules instead of calories" -msgstr "" +msgstr "Tampilkan jumlah energi nutrisi dalam joule, bukan kalori" #: .\cookbook\forms.py:77 msgid "Users with whom newly created meal plans should be shared by default." msgstr "" +"Pengguna dengan siapa rencana makan yang baru dibuat harus dibagikan secara " +"default." #: .\cookbook\forms.py:78 msgid "Users with whom to share shopping lists." -msgstr "" +msgstr "Pengguna yang ingin berbagi daftar belanja." #: .\cookbook\forms.py:80 msgid "Show recently viewed recipes on search page." -msgstr "" +msgstr "Tampilkan resep yang baru dilihat di halaman pencarian." #: .\cookbook\forms.py:81 msgid "Number of decimals to round ingredients." -msgstr "" +msgstr "Jumlah desimal untuk bahan." #: .\cookbook\forms.py:82 msgid "If you want to be able to create and see comments underneath recipes." -msgstr "" +msgstr "Jika Anda ingin dapat membuat dan melihat komentar di bawah resep." #: .\cookbook\forms.py:84 .\cookbook\forms.py:496 msgid "" @@ -126,18 +135,23 @@ msgid "" "Useful when shopping with multiple people but might use a little bit of " "mobile data. If lower than instance limit it is reset when saving." msgstr "" +"Menyetel ke 0 akan menonaktifkan sinkronisasi otomatis. Saat melihat daftar " +"belanja, daftar diperbarui setiap detik untuk menyinkronkan perubahan yang " +"mungkin dibuat orang lain. Berguna saat berbelanja dengan banyak orang " +"tetapi mungkin menggunakan sedikit data seluler. Jika lebih rendah dari " +"batas instance, reset saat menyimpan." #: .\cookbook\forms.py:87 msgid "Makes the navbar stick to the top of the page." -msgstr "" +msgstr "Membuat navbar menempel di bagian atas halaman." #: .\cookbook\forms.py:88 .\cookbook\forms.py:499 msgid "Automatically add meal plan ingredients to shopping list." -msgstr "" +msgstr "Secara otomatis menambahkan bahan rencana makan ke daftar belanja." #: .\cookbook\forms.py:89 msgid "Exclude ingredients that are on hand." -msgstr "" +msgstr "Kecualikan bahan-bahan yang ada." #: .\cookbook\forms.py:90 msgid "Will optimize the UI for use with your left hand." From c56710ae0c24e5a51fab115a133d656cc1d6ab4c Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Sat, 1 Oct 2022 18:42:03 +0200 Subject: [PATCH 36/77] fixed nc importer nutritions --- cookbook/integration/nextcloud_cookbook.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/cookbook/integration/nextcloud_cookbook.py b/cookbook/integration/nextcloud_cookbook.py index c302aff50b..6db53f7012 100644 --- a/cookbook/integration/nextcloud_cookbook.py +++ b/cookbook/integration/nextcloud_cookbook.py @@ -7,7 +7,7 @@ from cookbook.helper.ingredient_parser import IngredientParser from cookbook.helper.recipe_url_import import iso_duration_to_minutes from cookbook.integration.integration import Integration -from cookbook.models import Ingredient, Keyword, Recipe, Step +from cookbook.models import Ingredient, Keyword, Recipe, Step, NutritionInformation class NextcloudCookbook(Integration): @@ -70,12 +70,21 @@ def get_recipe_from_file(self, file): recipe.steps.add(step) if 'nutrition' in recipe_json: + nutrition = {} try: - recipe.nutrition.calories = recipe_json['nutrition']['calories'].replace(' kcal', '').replace(' ', '') - recipe.nutrition.proteins = recipe_json['nutrition']['calories'].replace(' g', '').replace(',', '.').replace(' ', '') - recipe.nutrition.fats = recipe_json['nutrition']['calories'].replace(' g', '').replace(',', '.').replace(' ', '') - recipe.nutrition.carbohydrates = recipe_json['nutrition']['calories'].replace(' g', '').replace(',', '.').replace(' ', '') - except Exception: + if 'calories' in recipe_json['nutrition']: + nutrition['calories'] = int(re.search(r'\d+', recipe_json['nutrition']['calories']).group()) + if 'proteinContent' in recipe_json['nutrition']: + nutrition['proteins'] = int(re.search(r'\d+', recipe_json['nutrition']['proteinContent']).group()) + if 'fatContent' in recipe_json['nutrition']: + nutrition['fats'] = int(re.search(r'\d+', recipe_json['nutrition']['fatContent']).group()) + if 'carbohydrateContent' in recipe_json['nutrition']: + nutrition['carbohydrates'] = int(re.search(r'\d+', recipe_json['nutrition']['carbohydrateContent']).group()) + + if nutrition != {}: + recipe.nutrition = NutritionInformation.objects.create(**nutrition, space=self.request.space) + recipe.save() + except Exception as e: pass for f in self.files: From 4bb23070077eb5fe65e989c74f952d47bd72d2d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Oct 2022 16:45:04 +0000 Subject: [PATCH 37/77] Bump workbox-webpack-plugin from 6.5.3 to 6.5.4 in /vue Bumps [workbox-webpack-plugin](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/googlechrome/workbox/releases) - [Commits](https://github.com/googlechrome/workbox/compare/v6.5.3...v6.5.4) --- updated-dependencies: - dependency-name: workbox-webpack-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vue/package.json | 2 +- vue/yarn.lock | 228 +++++++++++++++++++---------------------------- 2 files changed, 91 insertions(+), 139 deletions(-) diff --git a/vue/package.json b/vue/package.json index 7395234fb1..979a4cc40d 100644 --- a/vue/package.json +++ b/vue/package.json @@ -40,7 +40,7 @@ "vuedraggable": "^2.24.3", "vuex": "^3.6.0", "vue-template-compiler": "2.6.14", - "workbox-webpack-plugin": "^6.3.0" + "workbox-webpack-plugin": "^6.5.4" }, "devDependencies": { "@kazupon/vue-i18n-loader": "^0.5.0", diff --git a/vue/yarn.lock b/vue/yarn.lock index c1d0e742bc..a09d782a67 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -6463,11 +6463,6 @@ icss-utils@^5.0.0, icss-utils@^5.1.0: resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== -idb@^6.1.4: - version "6.1.5" - resolved "https://registry.yarnpkg.com/idb/-/idb-6.1.5.tgz#dbc53e7adf1ac7c59f9b2bf56e00b4ea4fce8c7b" - integrity sha512-IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw== - idb@^7.0.1: version "7.1.0" resolved "https://registry.yarnpkg.com/idb/-/idb-7.1.0.tgz#2cc886be57738419e57f9aab58f647e5e2160270" @@ -11409,13 +11404,13 @@ word-wrap@^1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -workbox-background-sync@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.5.3.tgz#7c66c1836aeca6f3762dc48d17a1852a33b3168c" - integrity sha512-0DD/V05FAcek6tWv9XYj2w5T/plxhDSpclIcAGjA/b7t/6PdaRkQ7ZgtAX6Q/L7kV7wZ8uYRJUoH11VjNipMZw== +workbox-background-sync@6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.5.4.tgz#3141afba3cc8aa2ae14c24d0f6811374ba8ff6a9" + integrity sha512-0r4INQZMyPky/lj4Ou98qxcThrETucOde+7mRGJl13MPJugQNKeZQOdIJe/1AchOP23cTqHcN/YVpD6r8E6I8g== dependencies: - idb "^6.1.4" - workbox-core "6.5.3" + idb "^7.0.1" + workbox-core "6.5.4" workbox-background-sync@^5.1.4: version "5.1.4" @@ -11424,12 +11419,12 @@ workbox-background-sync@^5.1.4: dependencies: workbox-core "^5.1.4" -workbox-broadcast-update@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.5.3.tgz#fc2ad79cf507e22950cda9baf1e9a0ccc43f31bc" - integrity sha512-4AwCIA5DiDrYhlN+Miv/fp5T3/whNmSL+KqhTwRBTZIL6pvTgE4lVuRzAt1JltmqyMcQ3SEfCdfxczuI4kwFQg== +workbox-broadcast-update@6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.5.4.tgz#8441cff5417cd41f384ba7633ca960a7ffe40f66" + integrity sha512-I/lBERoH1u3zyBosnpPEtcAVe5lwykx9Yg1k6f8/BGEPGaMMgZrwVrqL1uA9QZ1NGGFoyE6t9i7lBjOlDhFEEw== dependencies: - workbox-core "6.5.3" + workbox-core "6.5.4" workbox-broadcast-update@^5.1.4: version "5.1.4" @@ -11438,10 +11433,10 @@ workbox-broadcast-update@^5.1.4: dependencies: workbox-core "^5.1.4" -workbox-build@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.5.3.tgz#38e3f286d63d2745bff4d1478bb3a6ab5c8b1170" - integrity sha512-8JNHHS7u13nhwIYCDea9MNXBNPHXCs5KDZPKI/ZNTr3f4sMGoD7hgFGecbyjX1gw4z6e9bMpMsOEJNyH5htA/w== +workbox-build@6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.5.4.tgz#7d06d31eb28a878817e1c991c05c5b93409f0389" + integrity sha512-kgRevLXEYvUW9WS4XoziYqZ8Q9j/2ziJYEtTrjdz5/L/cTUa2XfyMP2i7c3p34lgqJ03+mTiz13SdFef2POwbA== dependencies: "@apideck/better-ajv-errors" "^0.3.1" "@babel/core" "^7.11.1" @@ -11465,21 +11460,21 @@ workbox-build@6.5.3: strip-comments "^2.0.1" tempy "^0.6.0" upath "^1.2.0" - workbox-background-sync "6.5.3" - workbox-broadcast-update "6.5.3" - workbox-cacheable-response "6.5.3" - workbox-core "6.5.3" - workbox-expiration "6.5.3" - workbox-google-analytics "6.5.3" - workbox-navigation-preload "6.5.3" - workbox-precaching "6.5.3" - workbox-range-requests "6.5.3" - workbox-recipes "6.5.3" - workbox-routing "6.5.3" - workbox-strategies "6.5.3" - workbox-streams "6.5.3" - workbox-sw "6.5.3" - workbox-window "6.5.3" + workbox-background-sync "6.5.4" + workbox-broadcast-update "6.5.4" + workbox-cacheable-response "6.5.4" + workbox-core "6.5.4" + workbox-expiration "6.5.4" + workbox-google-analytics "6.5.4" + workbox-navigation-preload "6.5.4" + workbox-precaching "6.5.4" + workbox-range-requests "6.5.4" + workbox-recipes "6.5.4" + workbox-routing "6.5.4" + workbox-strategies "6.5.4" + workbox-streams "6.5.4" + workbox-sw "6.5.4" + workbox-window "6.5.4" workbox-build@^5.1.4: version "5.1.4" @@ -11523,12 +11518,12 @@ workbox-build@^5.1.4: workbox-sw "^5.1.4" workbox-window "^5.1.4" -workbox-cacheable-response@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.5.3.tgz#b1f8c2bc599a7be8f7e3c262535629c558738e47" - integrity sha512-6JE/Zm05hNasHzzAGKDkqqgYtZZL2H06ic2GxuRLStA4S/rHUfm2mnLFFXuHAaGR1XuuYyVCEey1M6H3PdZ7SQ== +workbox-cacheable-response@6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.5.4.tgz#a5c6ec0c6e2b6f037379198d4ef07d098f7cf137" + integrity sha512-DCR9uD0Fqj8oB2TSWQEm1hbFs/85hXXoayVwFKLVuIuxwJaihBsLsp4y7J9bvZbqtPJ1KlCkmYVGQKrBU4KAug== dependencies: - workbox-core "6.5.3" + workbox-core "6.5.4" workbox-cacheable-response@^5.1.4: version "5.1.4" @@ -11537,11 +11532,6 @@ workbox-cacheable-response@^5.1.4: dependencies: workbox-core "^5.1.4" -workbox-core@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.3.tgz#bca038a9ef0d7a634a6db2a60f45313ed22ac249" - integrity sha512-Bb9ey5n/M9x+l3fBTlLpHt9ASTzgSGj6vxni7pY72ilB/Pb3XtN+cZ9yueboVhD5+9cNQrC9n/E1fSrqWsUz7Q== - workbox-core@6.5.4: version "6.5.4" resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.4.tgz#df48bf44cd58bb1d1726c49b883fb1dffa24c9ba" @@ -11552,13 +11542,13 @@ workbox-core@^5.1.4: resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-5.1.4.tgz#8bbfb2362ecdff30e25d123c82c79ac65d9264f4" integrity sha512-+4iRQan/1D8I81nR2L5vcbaaFskZC2CL17TLbvWVzQ4qiF/ytOGF6XeV54pVxAvKUtkLANhk8TyIUMtiMw2oDg== -workbox-expiration@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.3.tgz#efc0811f371a2ede1052b9de1c4f072b71d50503" - integrity sha512-jzYopYR1zD04ZMdlbn/R2Ik6ixiXbi15c9iX5H8CTi6RPDz7uhvMLZPKEndZTpfgmUk8mdmT9Vx/AhbuCl5Sqw== +workbox-expiration@6.5.4, workbox-expiration@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.4.tgz#501056f81e87e1d296c76570bb483ce5e29b4539" + integrity sha512-jUP5qPOpH1nXtjGGh1fRBa1wJL2QlIb5mGpct3NzepjGG2uFFBn4iiEBiI9GUmfAFR2ApuRhDydjcRmYXddiEQ== dependencies: - idb "^6.1.4" - workbox-core "6.5.3" + idb "^7.0.1" + workbox-core "6.5.4" workbox-expiration@^5.1.4: version "5.1.4" @@ -11567,23 +11557,15 @@ workbox-expiration@^5.1.4: dependencies: workbox-core "^5.1.4" -workbox-expiration@^6.5.4: +workbox-google-analytics@6.5.4: version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.4.tgz#501056f81e87e1d296c76570bb483ce5e29b4539" - integrity sha512-jUP5qPOpH1nXtjGGh1fRBa1wJL2QlIb5mGpct3NzepjGG2uFFBn4iiEBiI9GUmfAFR2ApuRhDydjcRmYXddiEQ== + resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.5.4.tgz#c74327f80dfa4c1954cbba93cd7ea640fe7ece7d" + integrity sha512-8AU1WuaXsD49249Wq0B2zn4a/vvFfHkpcFfqAFHNHwln3jK9QUYmzdkKXGIZl9wyKNP+RRX30vcgcyWMcZ9VAg== dependencies: - idb "^7.0.1" + workbox-background-sync "6.5.4" workbox-core "6.5.4" - -workbox-google-analytics@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.5.3.tgz#cc8c3a61f449131660a4ed2f5362d9a3599b18fe" - integrity sha512-3GLCHotz5umoRSb4aNQeTbILETcrTVEozSfLhHSBaegHs1PnqCmN0zbIy2TjTpph2AGXiNwDrWGF0AN+UgDNTw== - dependencies: - workbox-background-sync "6.5.3" - workbox-core "6.5.3" - workbox-routing "6.5.3" - workbox-strategies "6.5.3" + workbox-routing "6.5.4" + workbox-strategies "6.5.4" workbox-google-analytics@^5.1.4: version "5.1.4" @@ -11595,12 +11577,12 @@ workbox-google-analytics@^5.1.4: workbox-routing "^5.1.4" workbox-strategies "^5.1.4" -workbox-navigation-preload@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.3.tgz#81b74f598b11aa07e2cf1c21af7a826a4f0f70b3" - integrity sha512-bK1gDFTc5iu6lH3UQ07QVo+0ovErhRNGvJJO/1ngknT0UQ702nmOUhoN9qE5mhuQSrnK+cqu7O7xeaJ+Rd9Tmg== +workbox-navigation-preload@6.5.4, workbox-navigation-preload@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.4.tgz#ede56dd5f6fc9e860a7e45b2c1a8f87c1c793212" + integrity sha512-IIwf80eO3cr8h6XSQJF+Hxj26rg2RPFVUmJLUlM0+A2GzB4HFbQyKkrgD5y2d84g2IbJzP4B4j5dPBRzamHrng== dependencies: - workbox-core "6.5.3" + workbox-core "6.5.4" workbox-navigation-preload@^5.1.4: version "5.1.4" @@ -11609,21 +11591,14 @@ workbox-navigation-preload@^5.1.4: dependencies: workbox-core "^5.1.4" -workbox-navigation-preload@^6.5.4: +workbox-precaching@6.5.4, workbox-precaching@^6.5.4: version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.4.tgz#ede56dd5f6fc9e860a7e45b2c1a8f87c1c793212" - integrity sha512-IIwf80eO3cr8h6XSQJF+Hxj26rg2RPFVUmJLUlM0+A2GzB4HFbQyKkrgD5y2d84g2IbJzP4B4j5dPBRzamHrng== + resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.4.tgz#740e3561df92c6726ab5f7471e6aac89582cab72" + integrity sha512-hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg== dependencies: workbox-core "6.5.4" - -workbox-precaching@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.3.tgz#c870312b2ef901d790ab9e48da084e776c62af47" - integrity sha512-sjNfgNLSsRX5zcc63H/ar/hCf+T19fRtTqvWh795gdpghWb5xsfEkecXEvZ8biEi1QD7X/ljtHphdaPvXDygMQ== - dependencies: - workbox-core "6.5.3" - workbox-routing "6.5.3" - workbox-strategies "6.5.3" + workbox-routing "6.5.4" + workbox-strategies "6.5.4" workbox-precaching@^5.1.4: version "5.1.4" @@ -11632,21 +11607,12 @@ workbox-precaching@^5.1.4: dependencies: workbox-core "^5.1.4" -workbox-precaching@^6.5.4: +workbox-range-requests@6.5.4: version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.4.tgz#740e3561df92c6726ab5f7471e6aac89582cab72" - integrity sha512-hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg== + resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.4.tgz#86b3d482e090433dab38d36ae031b2bb0bd74399" + integrity sha512-Je2qR1NXCFC8xVJ/Lux6saH6IrQGhMpDrPXWZWWS8n/RD+WZfKa6dSZwU+/QksfEadJEr/NfY+aP/CXFFK5JFg== dependencies: workbox-core "6.5.4" - workbox-routing "6.5.4" - workbox-strategies "6.5.4" - -workbox-range-requests@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.3.tgz#e624ac82ff266a5e4f236d055797def07949d941" - integrity sha512-pGCP80Bpn/0Q0MQsfETSfmtXsQcu3M2QCJwSFuJ6cDp8s2XmbUXkzbuQhCUzKR86ZH2Vex/VUjb2UaZBGamijA== - dependencies: - workbox-core "6.5.3" workbox-range-requests@^5.1.4: version "5.1.4" @@ -11655,24 +11621,17 @@ workbox-range-requests@^5.1.4: dependencies: workbox-core "^5.1.4" -workbox-recipes@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.5.3.tgz#15beac9d8ae7a3a1c100218094a824b4dd3fd59a" - integrity sha512-IcgiKYmbGiDvvf3PMSEtmwqxwfQ5zwI7OZPio3GWu4PfehA8jI8JHI3KZj+PCfRiUPZhjQHJ3v1HbNs+SiSkig== - dependencies: - workbox-cacheable-response "6.5.3" - workbox-core "6.5.3" - workbox-expiration "6.5.3" - workbox-precaching "6.5.3" - workbox-routing "6.5.3" - workbox-strategies "6.5.3" - -workbox-routing@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.3.tgz#a0a699d8cc90b5692bd3df24679acbbda3913777" - integrity sha512-DFjxcuRAJjjt4T34RbMm3MCn+xnd36UT/2RfPRfa8VWJGItGJIn7tG+GwVTdHmvE54i/QmVTJepyAGWtoLPTmg== +workbox-recipes@6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.5.4.tgz#cca809ee63b98b158b2702dcfb741b5cc3e24acb" + integrity sha512-QZNO8Ez708NNwzLNEXTG4QYSKQ1ochzEtRLGaq+mr2PyoEIC1xFW7MrWxrONUxBFOByksds9Z4//lKAX8tHyUA== dependencies: - workbox-core "6.5.3" + workbox-cacheable-response "6.5.4" + workbox-core "6.5.4" + workbox-expiration "6.5.4" + workbox-precaching "6.5.4" + workbox-routing "6.5.4" + workbox-strategies "6.5.4" workbox-routing@6.5.4, workbox-routing@^6.5.4: version "6.5.4" @@ -11688,13 +11647,6 @@ workbox-routing@^5.1.4: dependencies: workbox-core "^5.1.4" -workbox-strategies@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.3.tgz#4bea9a48fee16cf43766e0d8138296773c8a9783" - integrity sha512-MgmGRrDVXs7rtSCcetZgkSZyMpRGw8HqL2aguszOc3nUmzGZsT238z/NN9ZouCxSzDu3PQ3ZSKmovAacaIhu1w== - dependencies: - workbox-core "6.5.3" - workbox-strategies@6.5.4, workbox-strategies@^6.2.4: version "6.5.4" resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.4.tgz#4edda035b3c010fc7f6152918370699334cd204d" @@ -11710,13 +11662,13 @@ workbox-strategies@^5.1.4: workbox-core "^5.1.4" workbox-routing "^5.1.4" -workbox-streams@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.5.3.tgz#b6860290031caa7d0e46ad7142315c94359c780b" - integrity sha512-vN4Qi8o+b7zj1FDVNZ+PlmAcy1sBoV7SC956uhqYvZ9Sg1fViSbOpydULOssVJ4tOyKRifH/eoi6h99d+sJ33w== +workbox-streams@6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.5.4.tgz#1cb3c168a6101df7b5269d0353c19e36668d7d69" + integrity sha512-FXKVh87d2RFXkliAIheBojBELIPnWbQdyDvsH3t74Cwhg0fDheL1T8BqSM86hZvC0ZESLsznSYWw+Va+KVbUzg== dependencies: - workbox-core "6.5.3" - workbox-routing "6.5.3" + workbox-core "6.5.4" + workbox-routing "6.5.4" workbox-streams@^5.1.4: version "5.1.4" @@ -11726,10 +11678,10 @@ workbox-streams@^5.1.4: workbox-core "^5.1.4" workbox-routing "^5.1.4" -workbox-sw@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.5.3.tgz#cd2f0c086f4496acd25774ed02c48504189bebdd" - integrity sha512-BQBzm092w+NqdIEF2yhl32dERt9j9MDGUTa2Eaa+o3YKL4Qqw55W9yQC6f44FdAHdAJrJvp0t+HVrfh8AiGj8A== +workbox-sw@6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.5.4.tgz#d93e9c67924dd153a61367a4656ff4d2ae2ed736" + integrity sha512-vo2RQo7DILVRoH5LjGqw3nphavEjK4Qk+FenXeUsknKn14eCNedHOXWbmnvP4ipKhlE35pvJ4yl4YYf6YsJArA== workbox-sw@^5.1.4: version "5.1.4" @@ -11748,24 +11700,24 @@ workbox-webpack-plugin@^5.1.3, workbox-webpack-plugin@^6.1.0: webpack-sources "^1.3.0" workbox-build "^5.1.4" -workbox-webpack-plugin@^6.3.0: - version "6.5.3" - resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.3.tgz#c37bb323be4952311565c07db51054fe59c87d73" - integrity sha512-Es8Xr02Gi6Kc3zaUwR691ZLy61hz3vhhs5GztcklQ7kl5k2qAusPh0s6LF3wEtlpfs9ZDErnmy5SErwoll7jBA== +workbox-webpack-plugin@^6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.4.tgz#baf2d3f4b8f435f3469887cf4fba2b7fac3d0fd7" + integrity sha512-LmWm/zoaahe0EGmMTrSLUi+BjyR3cdGEfU3fS6PN1zKFYbqAKuQ+Oy/27e4VSXsyIwAw8+QDfk1XHNGtZu9nQg== dependencies: fast-json-stable-stringify "^2.1.0" pretty-bytes "^5.4.1" upath "^1.2.0" webpack-sources "^1.4.3" - workbox-build "6.5.3" + workbox-build "6.5.4" -workbox-window@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.5.3.tgz#4ade70056cb73477ef1cd8fea7cfd0ecbd825c7f" - integrity sha512-GnJbx1kcKXDtoJBVZs/P7ddP0Yt52NNy4nocjBpYPiRhMqTpJCNrSL+fGHZ/i/oP6p/vhE8II0sA6AZGKGnssw== +workbox-window@6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.5.4.tgz#d991bc0a94dff3c2dbb6b84558cff155ca878e91" + integrity sha512-HnLZJDwYBE+hpG25AQBO8RUWBJRaCsI9ksQJEp3aCOFCaG5kqaToAYXFRAHxzRluM2cQbGzdQF5rjKPWPA1fug== dependencies: "@types/trusted-types" "^2.0.2" - workbox-core "6.5.3" + workbox-core "6.5.4" workbox-window@^5.1.4: version "5.1.4" From 5ae149a1b6e3b124bd5d8c50206412dc1ac2a7df Mon Sep 17 00:00:00 2001 From: KangAlleW Date: Sat, 1 Oct 2022 23:55:37 +0700 Subject: [PATCH 38/77] add indonesian language --- cookbook/locale/tr/id/LC_MESSAGES/django.po | 2621 +++++++++++++++++++ 1 file changed, 2621 insertions(+) create mode 100644 cookbook/locale/tr/id/LC_MESSAGES/django.po diff --git a/cookbook/locale/tr/id/LC_MESSAGES/django.po b/cookbook/locale/tr/id/LC_MESSAGES/django.po new file mode 100644 index 0000000000..ed9bfb4209 --- /dev/null +++ b/cookbook/locale/tr/id/LC_MESSAGES/django.po @@ -0,0 +1,2621 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-07-12 19:20+0200\n" +"PO-Revision-Date: 2022-10-01 16:38+0000\n" +"Last-Translator: wella \n" +"Language-Team: Indonesian \n" +"Language: id\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Weblate 4.10.1\n" + +#: .\cookbook\filters.py:23 .\cookbook\templates\forms\ingredients.html:34 +#: .\cookbook\templates\stats.html:28 +msgid "Ingredients" +msgstr "bahan-bahan" + +#: .\cookbook\forms.py:53 +msgid "Default unit" +msgstr "Unit bawaan" + +#: .\cookbook\forms.py:54 +msgid "Use fractions" +msgstr "Gunakan pecahan" + +#: .\cookbook\forms.py:55 +msgid "Use KJ" +msgstr "Gunakan KJ" + +#: .\cookbook\forms.py:56 +msgid "Theme" +msgstr "Tema" + +#: .\cookbook\forms.py:57 +msgid "Navbar color" +msgstr "Warna Navigasi" + +#: .\cookbook\forms.py:58 +msgid "Sticky navbar" +msgstr "Sticky navbar" + +#: .\cookbook\forms.py:59 +msgid "Default page" +msgstr "Halaman default" + +#: .\cookbook\forms.py:60 +msgid "Show recent recipes" +msgstr "Tampilkan resep terbaru" + +#: .\cookbook\forms.py:61 +msgid "Search style" +msgstr "Cari style" + +#: .\cookbook\forms.py:62 +msgid "Plan sharing" +msgstr "Berbagi rencana" + +#: .\cookbook\forms.py:63 +msgid "Ingredient decimal places" +msgstr "Tempat desimal bahan" + +#: .\cookbook\forms.py:64 +msgid "Shopping list auto sync period" +msgstr "Periode sinkronisasi otomatis daftar belanja" + +#: .\cookbook\forms.py:65 .\cookbook\templates\recipe_view.html:21 +#: .\cookbook\templates\stats.html:47 +msgid "Comments" +msgstr "Komen" + +#: .\cookbook\forms.py:66 +msgid "Left-handed mode" +msgstr "Mode tangan kiri" + +#: .\cookbook\forms.py:70 +msgid "" +"Color of the top navigation bar. Not all colors work with all themes, just " +"try them out!" +msgstr "" +"Warna bilah navigasi atas. Tidak semua warna bekerja dengan semua tema, coba " +"saja!" + +#: .\cookbook\forms.py:72 +msgid "Default Unit to be used when inserting a new ingredient into a recipe." +msgstr "" +"Default Unit yang akan digunakan saat memasukkan bahan baru ke dalam resep." + +#: .\cookbook\forms.py:74 +msgid "" +"Enables support for fractions in ingredient amounts (e.g. convert decimals " +"to fractions automatically)" +msgstr "" +"Mengaktifkan dukungan untuk pecahan dalam jumlah bahan (misalnya, mengubah " +"desimal menjadi pecahan secara otomatis)" + +#: .\cookbook\forms.py:76 +msgid "Display nutritional energy amounts in joules instead of calories" +msgstr "Tampilkan jumlah energi nutrisi dalam joule, bukan kalori" + +#: .\cookbook\forms.py:77 +msgid "Users with whom newly created meal plans should be shared by default." +msgstr "" +"Pengguna dengan siapa rencana makan yang baru dibuat harus dibagikan secara " +"default." + +#: .\cookbook\forms.py:78 +msgid "Users with whom to share shopping lists." +msgstr "Pengguna yang ingin berbagi daftar belanja." + +#: .\cookbook\forms.py:80 +msgid "Show recently viewed recipes on search page." +msgstr "Tampilkan resep yang baru dilihat di halaman pencarian." + +#: .\cookbook\forms.py:81 +msgid "Number of decimals to round ingredients." +msgstr "Jumlah desimal untuk bahan." + +#: .\cookbook\forms.py:82 +msgid "If you want to be able to create and see comments underneath recipes." +msgstr "Jika Anda ingin dapat membuat dan melihat komentar di bawah resep." + +#: .\cookbook\forms.py:84 .\cookbook\forms.py:496 +msgid "" +"Setting to 0 will disable auto sync. When viewing a shopping list the list " +"is updated every set seconds to sync changes someone else might have made. " +"Useful when shopping with multiple people but might use a little bit of " +"mobile data. If lower than instance limit it is reset when saving." +msgstr "" +"Menyetel ke 0 akan menonaktifkan sinkronisasi otomatis. Saat melihat daftar " +"belanja, daftar diperbarui setiap detik untuk menyinkronkan perubahan yang " +"mungkin dibuat orang lain. Berguna saat berbelanja dengan banyak orang " +"tetapi mungkin menggunakan sedikit data seluler. Jika lebih rendah dari " +"batas instance, reset saat menyimpan." + +#: .\cookbook\forms.py:87 +msgid "Makes the navbar stick to the top of the page." +msgstr "Membuat navbar menempel di bagian atas halaman." + +#: .\cookbook\forms.py:88 .\cookbook\forms.py:499 +msgid "Automatically add meal plan ingredients to shopping list." +msgstr "Secara otomatis menambahkan bahan rencana makan ke daftar belanja." + +#: .\cookbook\forms.py:89 +msgid "Exclude ingredients that are on hand." +msgstr "Kecualikan bahan-bahan yang ada." + +#: .\cookbook\forms.py:90 +msgid "Will optimize the UI for use with your left hand." +msgstr "" + +#: .\cookbook\forms.py:107 +msgid "" +"Both fields are optional. If none are given the username will be displayed " +"instead" +msgstr "" + +#: .\cookbook\forms.py:128 .\cookbook\forms.py:301 +msgid "Name" +msgstr "" + +#: .\cookbook\forms.py:129 .\cookbook\forms.py:302 +#: .\cookbook\templates\stats.html:24 .\cookbook\views\lists.py:88 +msgid "Keywords" +msgstr "" + +#: .\cookbook\forms.py:130 +msgid "Preparation time in minutes" +msgstr "" + +#: .\cookbook\forms.py:131 +msgid "Waiting time (cooking/baking) in minutes" +msgstr "" + +#: .\cookbook\forms.py:132 .\cookbook\forms.py:270 .\cookbook\forms.py:303 +msgid "Path" +msgstr "" + +#: .\cookbook\forms.py:133 +msgid "Storage UID" +msgstr "" + +#: .\cookbook\forms.py:165 +msgid "Default" +msgstr "" + +#: .\cookbook\forms.py:177 +msgid "" +"To prevent duplicates recipes with the same name as existing ones are " +"ignored. Check this box to import everything." +msgstr "" + +#: .\cookbook\forms.py:200 +msgid "Add your comment: " +msgstr "" + +#: .\cookbook\forms.py:215 +msgid "Leave empty for dropbox and enter app password for nextcloud." +msgstr "" + +#: .\cookbook\forms.py:222 +msgid "Leave empty for nextcloud and enter api token for dropbox." +msgstr "" + +#: .\cookbook\forms.py:231 +msgid "" +"Leave empty for dropbox and enter only base url for nextcloud (/remote." +"php/webdav/ is added automatically)" +msgstr "" + +#: .\cookbook\forms.py:269 .\cookbook\views\edit.py:157 +msgid "Storage" +msgstr "" + +#: .\cookbook\forms.py:271 +msgid "Active" +msgstr "" + +#: .\cookbook\forms.py:277 +msgid "Search String" +msgstr "" + +#: .\cookbook\forms.py:304 +msgid "File ID" +msgstr "" + +#: .\cookbook\forms.py:326 +msgid "You must provide at least a recipe or a title." +msgstr "" + +#: .\cookbook\forms.py:339 +msgid "You can list default users to share recipes with in the settings." +msgstr "" + +#: .\cookbook\forms.py:340 +msgid "" +"You can use markdown to format this field. See the docs here" +msgstr "" + +#: .\cookbook\forms.py:366 +msgid "Maximum number of users for this space reached." +msgstr "" + +#: .\cookbook\forms.py:372 +msgid "Email address already taken!" +msgstr "" + +#: .\cookbook\forms.py:380 +msgid "" +"An email address is not required but if present the invite link will be sent " +"to the user." +msgstr "" + +#: .\cookbook\forms.py:395 +msgid "Name already taken." +msgstr "" + +#: .\cookbook\forms.py:406 +msgid "Accept Terms and Privacy" +msgstr "" + +#: .\cookbook\forms.py:438 +msgid "" +"Determines how fuzzy a search is if it uses trigram similarity matching (e." +"g. low values mean more typos are ignored)." +msgstr "" + +#: .\cookbook\forms.py:448 +msgid "" +"Select type method of search. Click here for " +"full description of choices." +msgstr "" + +#: .\cookbook\forms.py:449 +msgid "" +"Use fuzzy matching on units, keywords and ingredients when editing and " +"importing recipes." +msgstr "" + +#: .\cookbook\forms.py:451 +msgid "" +"Fields to search ignoring accents. Selecting this option can improve or " +"degrade search quality depending on language" +msgstr "" + +#: .\cookbook\forms.py:453 +msgid "" +"Fields to search for partial matches. (e.g. searching for 'Pie' will return " +"'pie' and 'piece' and 'soapie')" +msgstr "" + +#: .\cookbook\forms.py:455 +msgid "" +"Fields to search for beginning of word matches. (e.g. searching for 'sa' " +"will return 'salad' and 'sandwich')" +msgstr "" + +#: .\cookbook\forms.py:457 +msgid "" +"Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.) " +"Note: this option will conflict with 'web' and 'raw' methods of search." +msgstr "" + +#: .\cookbook\forms.py:459 +msgid "" +"Fields to full text search. Note: 'web', 'phrase', and 'raw' search methods " +"only function with fulltext fields." +msgstr "" + +#: .\cookbook\forms.py:463 +msgid "Search Method" +msgstr "" + +#: .\cookbook\forms.py:464 +msgid "Fuzzy Lookups" +msgstr "" + +#: .\cookbook\forms.py:465 +msgid "Ignore Accent" +msgstr "" + +#: .\cookbook\forms.py:466 +msgid "Partial Match" +msgstr "" + +#: .\cookbook\forms.py:467 +msgid "Starts With" +msgstr "" + +#: .\cookbook\forms.py:468 +msgid "Fuzzy Search" +msgstr "" + +#: .\cookbook\forms.py:469 +msgid "Full Text" +msgstr "" + +#: .\cookbook\forms.py:494 +msgid "" +"Users will see all items you add to your shopping list. They must add you " +"to see items on their list." +msgstr "" + +#: .\cookbook\forms.py:500 +msgid "" +"When adding a meal plan to the shopping list (manually or automatically), " +"include all related recipes." +msgstr "" + +#: .\cookbook\forms.py:501 +msgid "" +"When adding a meal plan to the shopping list (manually or automatically), " +"exclude ingredients that are on hand." +msgstr "" + +#: .\cookbook\forms.py:502 +msgid "Default number of hours to delay a shopping list entry." +msgstr "" + +#: .\cookbook\forms.py:503 +msgid "Filter shopping list to only include supermarket categories." +msgstr "" + +#: .\cookbook\forms.py:504 +msgid "Days of recent shopping list entries to display." +msgstr "" + +#: .\cookbook\forms.py:505 +msgid "Mark food 'On Hand' when checked off shopping list." +msgstr "" + +#: .\cookbook\forms.py:506 +msgid "Delimiter to use for CSV exports." +msgstr "" + +#: .\cookbook\forms.py:507 +msgid "Prefix to add when copying list to the clipboard." +msgstr "" + +#: .\cookbook\forms.py:511 +msgid "Share Shopping List" +msgstr "" + +#: .\cookbook\forms.py:512 +msgid "Autosync" +msgstr "" + +#: .\cookbook\forms.py:513 +msgid "Auto Add Meal Plan" +msgstr "" + +#: .\cookbook\forms.py:514 +msgid "Exclude On Hand" +msgstr "" + +#: .\cookbook\forms.py:515 +msgid "Include Related" +msgstr "" + +#: .\cookbook\forms.py:516 +msgid "Default Delay Hours" +msgstr "" + +#: .\cookbook\forms.py:517 +msgid "Filter to Supermarket" +msgstr "" + +#: .\cookbook\forms.py:518 +msgid "Recent Days" +msgstr "" + +#: .\cookbook\forms.py:519 +msgid "CSV Delimiter" +msgstr "" + +#: .\cookbook\forms.py:520 +msgid "List Prefix" +msgstr "" + +#: .\cookbook\forms.py:521 +msgid "Auto On Hand" +msgstr "" + +#: .\cookbook\forms.py:531 +msgid "Reset Food Inheritance" +msgstr "" + +#: .\cookbook\forms.py:532 +msgid "Reset all food to inherit the fields configured." +msgstr "" + +#: .\cookbook\forms.py:544 +msgid "Fields on food that should be inherited by default." +msgstr "" + +#: .\cookbook\forms.py:545 +msgid "Show recipe counts on search filters" +msgstr "" + +#: .\cookbook\helper\AllAuthCustomAdapter.py:36 +msgid "" +"In order to prevent spam, the requested email was not send. Please wait a " +"few minutes and try again." +msgstr "" + +#: .\cookbook\helper\permission_helper.py:149 +#: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\views.py:152 +msgid "You are not logged in and therefore cannot view this page!" +msgstr "" + +#: .\cookbook\helper\permission_helper.py:153 +#: .\cookbook\helper\permission_helper.py:159 +#: .\cookbook\helper\permission_helper.py:184 +#: .\cookbook\helper\permission_helper.py:254 +#: .\cookbook\helper\permission_helper.py:268 +#: .\cookbook\helper\permission_helper.py:279 +#: .\cookbook\helper\permission_helper.py:290 .\cookbook\views\data.py:33 +#: .\cookbook\views\views.py:163 .\cookbook\views\views.py:170 +#: .\cookbook\views\views.py:249 +msgid "You do not have the required permissions to view this page!" +msgstr "" + +#: .\cookbook\helper\permission_helper.py:177 +#: .\cookbook\helper\permission_helper.py:200 +#: .\cookbook\helper\permission_helper.py:222 +#: .\cookbook\helper\permission_helper.py:237 +msgid "You cannot interact with this object as it is not owned by you!" +msgstr "" + +#: .\cookbook\helper\permission_helper.py:321 +msgid "You have reached the maximum number of recipes for your space." +msgstr "" + +#: .\cookbook\helper\permission_helper.py:333 +msgid "You have more users than allowed in your space." +msgstr "" + +#: .\cookbook\helper\recipe_search.py:565 +msgid "One of queryset or hash_key must be provided" +msgstr "" + +#: .\cookbook\helper\shopping_helper.py:152 +msgid "You must supply a servings size" +msgstr "" + +#: .\cookbook\helper\template_helper.py:64 +#: .\cookbook\helper\template_helper.py:66 +msgid "Could not parse template code." +msgstr "" + +#: .\cookbook\integration\copymethat.py:41 +#: .\cookbook\integration\melarecipes.py:37 +msgid "Favorite" +msgstr "" + +#: .\cookbook\integration\copymethat.py:70 +#: .\cookbook\integration\recettetek.py:54 +#: .\cookbook\integration\recipekeeper.py:63 +msgid "Imported from" +msgstr "" + +#: .\cookbook\integration\integration.py:223 +msgid "" +"Importer expected a .zip file. Did you choose the correct importer type for " +"your data ?" +msgstr "" + +#: .\cookbook\integration\integration.py:226 +msgid "" +"An unexpected error occurred during the import. Please make sure you have " +"uploaded a valid file." +msgstr "" + +#: .\cookbook\integration\integration.py:231 +msgid "The following recipes were ignored because they already existed:" +msgstr "" + +#: .\cookbook\integration\integration.py:235 +#, python-format +msgid "Imported %s recipes." +msgstr "" + +#: .\cookbook\integration\paprika.py:46 +msgid "Notes" +msgstr "" + +#: .\cookbook\integration\paprika.py:49 +msgid "Nutritional Information" +msgstr "" + +#: .\cookbook\integration\paprika.py:53 +msgid "Source" +msgstr "" + +#: .\cookbook\integration\saffron.py:23 +msgid "Servings" +msgstr "" + +#: .\cookbook\integration\saffron.py:25 +msgid "Waiting time" +msgstr "" + +#: .\cookbook\integration\saffron.py:27 +msgid "Preparation Time" +msgstr "" + +#: .\cookbook\integration\saffron.py:29 +#: .\cookbook\templates\forms\ingredients.html:7 +#: .\cookbook\templates\index.html:7 +msgid "Cookbook" +msgstr "" + +#: .\cookbook\integration\saffron.py:31 +msgid "Section" +msgstr "" + +#: .\cookbook\management\commands\rebuildindex.py:14 +msgid "Rebuilds full text search index on Recipe" +msgstr "" + +#: .\cookbook\management\commands\rebuildindex.py:18 +msgid "Only Postgresql databases use full text search, no index to rebuild" +msgstr "" + +#: .\cookbook\management\commands\rebuildindex.py:29 +msgid "Recipe index rebuild complete." +msgstr "" + +#: .\cookbook\management\commands\rebuildindex.py:31 +msgid "Recipe index rebuild failed." +msgstr "" + +#: .\cookbook\migrations\0047_auto_20200602_1133.py:14 +msgid "Breakfast" +msgstr "" + +#: .\cookbook\migrations\0047_auto_20200602_1133.py:19 +msgid "Lunch" +msgstr "" + +#: .\cookbook\migrations\0047_auto_20200602_1133.py:24 +msgid "Dinner" +msgstr "" + +#: .\cookbook\migrations\0047_auto_20200602_1133.py:29 +msgid "Other" +msgstr "" + +#: .\cookbook\models.py:251 +msgid "" +"Maximum file storage for space in MB. 0 for unlimited, -1 to disable file " +"upload." +msgstr "" + +#: .\cookbook\models.py:353 .\cookbook\templates\search.html:7 +#: .\cookbook\templates\space_manage.html:7 +msgid "Search" +msgstr "" + +#: .\cookbook\models.py:354 .\cookbook\templates\base.html:107 +#: .\cookbook\templates\meal_plan.html:7 .\cookbook\views\delete.py:178 +#: .\cookbook\views\edit.py:211 .\cookbook\views\new.py:179 +msgid "Meal-Plan" +msgstr "" + +#: .\cookbook\models.py:355 .\cookbook\templates\base.html:115 +msgid "Books" +msgstr "" + +#: .\cookbook\models.py:363 +msgid "Small" +msgstr "" + +#: .\cookbook\models.py:363 +msgid "Large" +msgstr "" + +#: .\cookbook\models.py:363 .\cookbook\templates\generic\new_template.html:6 +#: .\cookbook\templates\generic\new_template.html:14 +msgid "New" +msgstr "" + +#: .\cookbook\models.py:584 +msgid " is part of a recipe step and cannot be deleted" +msgstr "" + +#: .\cookbook\models.py:1162 .\cookbook\templates\search_info.html:28 +msgid "Simple" +msgstr "" + +#: .\cookbook\models.py:1163 .\cookbook\templates\search_info.html:33 +msgid "Phrase" +msgstr "" + +#: .\cookbook\models.py:1164 .\cookbook\templates\search_info.html:38 +msgid "Web" +msgstr "" + +#: .\cookbook\models.py:1165 .\cookbook\templates\search_info.html:47 +msgid "Raw" +msgstr "" + +#: .\cookbook\models.py:1203 +msgid "Food Alias" +msgstr "" + +#: .\cookbook\models.py:1203 +msgid "Unit Alias" +msgstr "" + +#: .\cookbook\models.py:1203 +msgid "Keyword Alias" +msgstr "" + +#: .\cookbook\models.py:1227 +#: .\cookbook\templates\include\recipe_open_modal.html:7 +#: .\cookbook\views\delete.py:36 .\cookbook\views\edit.py:251 +#: .\cookbook\views\new.py:48 +msgid "Recipe" +msgstr "" + +#: .\cookbook\models.py:1228 +msgid "Food" +msgstr "" + +#: .\cookbook\models.py:1229 .\cookbook\templates\base.html:138 +msgid "Keyword" +msgstr "" + +#: .\cookbook\serializer.py:207 +msgid "Cannot modify Space owner permission." +msgstr "" + +#: .\cookbook\serializer.py:290 +msgid "File uploads are not enabled for this Space." +msgstr "" + +#: .\cookbook\serializer.py:301 +msgid "You have reached your file upload limit." +msgstr "" + +#: .\cookbook\serializer.py:1081 +msgid "Hello" +msgstr "" + +#: .\cookbook\serializer.py:1081 +msgid "You have been invited by " +msgstr "" + +#: .\cookbook\serializer.py:1082 +msgid " to join their Tandoor Recipes space " +msgstr "" + +#: .\cookbook\serializer.py:1083 +msgid "Click the following link to activate your account: " +msgstr "" + +#: .\cookbook\serializer.py:1084 +msgid "" +"If the link does not work use the following code to manually join the space: " +msgstr "" + +#: .\cookbook\serializer.py:1085 +msgid "The invitation is valid until " +msgstr "" + +#: .\cookbook\serializer.py:1086 +msgid "" +"Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub " +msgstr "" + +#: .\cookbook\serializer.py:1089 +msgid "Tandoor Recipes Invite" +msgstr "" + +#: .\cookbook\serializer.py:1209 +msgid "Existing shopping list to update" +msgstr "" + +#: .\cookbook\serializer.py:1211 +msgid "" +"List of ingredient IDs from the recipe to add, if not provided all " +"ingredients will be added." +msgstr "" + +#: .\cookbook\serializer.py:1213 +msgid "" +"Providing a list_recipe ID and servings of 0 will delete that shopping list." +msgstr "" + +#: .\cookbook\serializer.py:1222 +msgid "Amount of food to add to the shopping list" +msgstr "" + +#: .\cookbook\serializer.py:1224 +msgid "ID of unit to use for the shopping list" +msgstr "" + +#: .\cookbook\serializer.py:1226 +msgid "When set to true will delete all food from active shopping lists." +msgstr "" + +#: .\cookbook\tables.py:36 .\cookbook\templates\generic\edit_template.html:6 +#: .\cookbook\templates\generic\edit_template.html:14 +#: .\cookbook\templates\recipes_table.html:82 +msgid "Edit" +msgstr "" + +#: .\cookbook\tables.py:116 .\cookbook\tables.py:131 +#: .\cookbook\templates\generic\delete_template.html:7 +#: .\cookbook\templates\generic\delete_template.html:15 +#: .\cookbook\templates\generic\edit_template.html:28 +#: .\cookbook\templates\recipes_table.html:90 +msgid "Delete" +msgstr "" + +#: .\cookbook\templates\404.html:5 +msgid "404 Error" +msgstr "" + +#: .\cookbook\templates\404.html:18 +msgid "The page you are looking for could not be found." +msgstr "" + +#: .\cookbook\templates\404.html:33 +msgid "Take me Home" +msgstr "" + +#: .\cookbook\templates\404.html:35 +msgid "Report a Bug" +msgstr "" + +#: .\cookbook\templates\account\email.html:6 +#: .\cookbook\templates\account\email.html:17 +msgid "E-mail Addresses" +msgstr "" + +#: .\cookbook\templates\account\email.html:12 +#: .\cookbook\templates\account\password_change.html:11 +#: .\cookbook\templates\account\password_set.html:11 +#: .\cookbook\templates\base.html:293 .\cookbook\templates\settings.html:6 +#: .\cookbook\templates\settings.html:17 +#: .\cookbook\templates\socialaccount\connections.html:10 +msgid "Settings" +msgstr "" + +#: .\cookbook\templates\account\email.html:13 +msgid "Email" +msgstr "" + +#: .\cookbook\templates\account\email.html:19 +msgid "The following e-mail addresses are associated with your account:" +msgstr "" + +#: .\cookbook\templates\account\email.html:36 +msgid "Verified" +msgstr "" + +#: .\cookbook\templates\account\email.html:38 +msgid "Unverified" +msgstr "" + +#: .\cookbook\templates\account\email.html:40 +msgid "Primary" +msgstr "" + +#: .\cookbook\templates\account\email.html:47 +msgid "Make Primary" +msgstr "" + +#: .\cookbook\templates\account\email.html:49 +msgid "Re-send Verification" +msgstr "" + +#: .\cookbook\templates\account\email.html:50 +#: .\cookbook\templates\generic\delete_template.html:57 +#: .\cookbook\templates\socialaccount\connections.html:44 +msgid "Remove" +msgstr "" + +#: .\cookbook\templates\account\email.html:58 +msgid "Warning:" +msgstr "" + +#: .\cookbook\templates\account\email.html:58 +msgid "" +"You currently do not have any e-mail address set up. You should really add " +"an e-mail address so you can receive notifications, reset your password, etc." +msgstr "" + +#: .\cookbook\templates\account\email.html:64 +msgid "Add E-mail Address" +msgstr "" + +#: .\cookbook\templates\account\email.html:69 +msgid "Add E-mail" +msgstr "" + +#: .\cookbook\templates\account\email.html:79 +msgid "Do you really want to remove the selected e-mail address?" +msgstr "" + +#: .\cookbook\templates\account\email_confirm.html:6 +#: .\cookbook\templates\account\email_confirm.html:10 +msgid "Confirm E-mail Address" +msgstr "" + +#: .\cookbook\templates\account\email_confirm.html:16 +#, python-format +msgid "" +"Please confirm that\n" +" %(email)s is an e-mail address " +"for user %(user_display)s\n" +" ." +msgstr "" + +#: .\cookbook\templates\account\email_confirm.html:22 +#: .\cookbook\templates\generic\delete_template.html:72 +msgid "Confirm" +msgstr "" + +#: .\cookbook\templates\account\email_confirm.html:29 +#, python-format +msgid "" +"This e-mail confirmation link expired or is invalid. Please\n" +" issue a new e-mail confirmation " +"request." +msgstr "" + +#: .\cookbook\templates\account\login.html:8 +#: .\cookbook\templates\base.html:340 .\cookbook\templates\openid\login.html:8 +msgid "Login" +msgstr "" + +#: .\cookbook\templates\account\login.html:15 +#: .\cookbook\templates\account\login.html:31 +#: .\cookbook\templates\account\signup.html:69 +#: .\cookbook\templates\account\signup_closed.html:15 +#: .\cookbook\templates\openid\login.html:15 +#: .\cookbook\templates\openid\login.html:26 +#: .\cookbook\templates\socialaccount\authentication_error.html:15 +msgid "Sign In" +msgstr "" + +#: .\cookbook\templates\account\login.html:34 +#: .\cookbook\templates\socialaccount\signup.html:8 +#: .\cookbook\templates\socialaccount\signup.html:57 +msgid "Sign Up" +msgstr "" + +#: .\cookbook\templates\account\login.html:39 +#: .\cookbook\templates\account\login.html:41 +#: .\cookbook\templates\account\password_reset.html:29 +msgid "Reset My Password" +msgstr "" + +#: .\cookbook\templates\account\login.html:40 +msgid "Lost your password?" +msgstr "" + +#: .\cookbook\templates\account\login.html:52 +msgid "Social Login" +msgstr "" + +#: .\cookbook\templates\account\login.html:53 +msgid "You can use any of the following providers to sign in." +msgstr "" + +#: .\cookbook\templates\account\logout.html:5 +#: .\cookbook\templates\account\logout.html:9 +#: .\cookbook\templates\account\logout.html:18 +msgid "Sign Out" +msgstr "" + +#: .\cookbook\templates\account\logout.html:11 +msgid "Are you sure you want to sign out?" +msgstr "" + +#: .\cookbook\templates\account\password_change.html:6 +#: .\cookbook\templates\account\password_change.html:16 +#: .\cookbook\templates\account\password_change.html:21 +#: .\cookbook\templates\account\password_reset_from_key.html:7 +#: .\cookbook\templates\account\password_reset_from_key.html:13 +#: .\cookbook\templates\account\password_reset_from_key_done.html:7 +#: .\cookbook\templates\account\password_reset_from_key_done.html:13 +msgid "Change Password" +msgstr "" + +#: .\cookbook\templates\account\password_change.html:12 +#: .\cookbook\templates\account\password_set.html:12 +#: .\cookbook\templates\settings.html:76 +msgid "Password" +msgstr "" + +#: .\cookbook\templates\account\password_change.html:22 +msgid "Forgot Password?" +msgstr "" + +#: .\cookbook\templates\account\password_reset.html:7 +#: .\cookbook\templates\account\password_reset.html:13 +#: .\cookbook\templates\account\password_reset_done.html:7 +#: .\cookbook\templates\account\password_reset_done.html:10 +msgid "Password Reset" +msgstr "" + +#: .\cookbook\templates\account\password_reset.html:24 +msgid "" +"Forgotten your password? Enter your e-mail address below, and we'll send you " +"an e-mail allowing you to reset it." +msgstr "" + +#: .\cookbook\templates\account\password_reset.html:32 +msgid "Password reset is disabled on this instance." +msgstr "" + +#: .\cookbook\templates\account\password_reset_done.html:16 +msgid "" +"We have sent you an e-mail. Please contact us if you do not receive it " +"within a few minutes." +msgstr "" + +#: .\cookbook\templates\account\password_reset_from_key.html:13 +msgid "Bad Token" +msgstr "" + +#: .\cookbook\templates\account\password_reset_from_key.html:25 +#, python-format +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used.\n" +" Please request a new " +"password reset." +msgstr "" + +#: .\cookbook\templates\account\password_reset_from_key.html:33 +msgid "change password" +msgstr "" + +#: .\cookbook\templates\account\password_reset_from_key.html:36 +#: .\cookbook\templates\account\password_reset_from_key_done.html:19 +msgid "Your password is now changed." +msgstr "" + +#: .\cookbook\templates\account\password_set.html:6 +#: .\cookbook\templates\account\password_set.html:16 +#: .\cookbook\templates\account\password_set.html:21 +msgid "Set Password" +msgstr "" + +#: .\cookbook\templates\account\signup.html:6 +msgid "Register" +msgstr "" + +#: .\cookbook\templates\account\signup.html:12 +msgid "Create an Account" +msgstr "" + +#: .\cookbook\templates\account\signup.html:42 +#: .\cookbook\templates\socialaccount\signup.html:33 +msgid "I accept the follwoing" +msgstr "" + +#: .\cookbook\templates\account\signup.html:45 +#: .\cookbook\templates\socialaccount\signup.html:36 +msgid "Terms and Conditions" +msgstr "" + +#: .\cookbook\templates\account\signup.html:48 +#: .\cookbook\templates\socialaccount\signup.html:39 +msgid "and" +msgstr "" + +#: .\cookbook\templates\account\signup.html:52 +#: .\cookbook\templates\socialaccount\signup.html:43 +msgid "Privacy Policy" +msgstr "" + +#: .\cookbook\templates\account\signup.html:65 +msgid "Create User" +msgstr "" + +#: .\cookbook\templates\account\signup.html:69 +msgid "Already have an account?" +msgstr "" + +#: .\cookbook\templates\account\signup_closed.html:5 +#: .\cookbook\templates\account\signup_closed.html:11 +msgid "Sign Up Closed" +msgstr "" + +#: .\cookbook\templates\account\signup_closed.html:13 +msgid "We are sorry, but the sign up is currently closed." +msgstr "" + +#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:330 +#: .\cookbook\templates\rest_framework\api.html:11 +msgid "API Documentation" +msgstr "" + +#: .\cookbook\templates\base.html:103 .\cookbook\templates\index.html:87 +#: .\cookbook\templates\stats.html:22 +msgid "Recipes" +msgstr "" + +#: .\cookbook\templates\base.html:111 +msgid "Shopping" +msgstr "" + +#: .\cookbook\templates\base.html:150 .\cookbook\views\lists.py:105 +msgid "Foods" +msgstr "" + +#: .\cookbook\templates\base.html:162 +#: .\cookbook\templates\forms\ingredients.html:24 +#: .\cookbook\templates\stats.html:26 .\cookbook\views\lists.py:122 +msgid "Units" +msgstr "" + +#: .\cookbook\templates\base.html:176 .\cookbook\templates\supermarket.html:7 +msgid "Supermarket" +msgstr "" + +#: .\cookbook\templates\base.html:188 +msgid "Supermarket Category" +msgstr "" + +#: .\cookbook\templates\base.html:200 .\cookbook\views\lists.py:171 +msgid "Automations" +msgstr "" + +#: .\cookbook\templates\base.html:214 .\cookbook\views\lists.py:207 +msgid "Files" +msgstr "" + +#: .\cookbook\templates\base.html:226 +msgid "Batch Edit" +msgstr "" + +#: .\cookbook\templates\base.html:238 .\cookbook\templates\history.html:6 +#: .\cookbook\templates\history.html:14 +msgid "History" +msgstr "" + +#: .\cookbook\templates\base.html:252 +#: .\cookbook\templates\ingredient_editor.html:7 +#: .\cookbook\templates\ingredient_editor.html:13 +msgid "Ingredient Editor" +msgstr "" + +#: .\cookbook\templates\base.html:264 +#: .\cookbook\templates\export_response.html:7 +#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20 +msgid "Export" +msgstr "" + +#: .\cookbook\templates\base.html:280 .\cookbook\templates\index.html:47 +msgid "Import Recipe" +msgstr "" + +#: .\cookbook\templates\base.html:282 +msgid "Create" +msgstr "" + +#: .\cookbook\templates\base.html:295 +#: .\cookbook\templates\generic\list_template.html:14 +#: .\cookbook\templates\stats.html:43 +msgid "External Recipes" +msgstr "" + +#: .\cookbook\templates\base.html:298 +#: .\cookbook\templates\space_manage.html:15 +msgid "Space Settings" +msgstr "" + +#: .\cookbook\templates\base.html:303 .\cookbook\templates\system.html:13 +msgid "System" +msgstr "" + +#: .\cookbook\templates\base.html:305 +msgid "Admin" +msgstr "" + +#: .\cookbook\templates\base.html:309 +#: .\cookbook\templates\space_overview.html:25 +msgid "Your Spaces" +msgstr "" + +#: .\cookbook\templates\base.html:320 +#: .\cookbook\templates\space_overview.html:6 +msgid "Overview" +msgstr "" + +#: .\cookbook\templates\base.html:324 +msgid "Markdown Guide" +msgstr "" + +#: .\cookbook\templates\base.html:326 +msgid "GitHub" +msgstr "" + +#: .\cookbook\templates\base.html:328 +msgid "Translate Tandoor" +msgstr "" + +#: .\cookbook\templates\base.html:332 +msgid "API Browser" +msgstr "" + +#: .\cookbook\templates\base.html:335 +msgid "Log out" +msgstr "" + +#: .\cookbook\templates\base.html:357 +msgid "You are using the free version of Tandor" +msgstr "" + +#: .\cookbook\templates\base.html:358 +msgid "Upgrade Now" +msgstr "" + +#: .\cookbook\templates\batch\edit.html:6 +msgid "Batch edit Category" +msgstr "" + +#: .\cookbook\templates\batch\edit.html:15 +msgid "Batch edit Recipes" +msgstr "" + +#: .\cookbook\templates\batch\edit.html:20 +msgid "Add the specified keywords to all recipes containing a word" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:73 +msgid "Sync" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:10 +msgid "Manage watched Folders" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:14 +msgid "" +"On this Page you can manage all storage folder locations that should be " +"monitored and synced." +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:16 +msgid "The path must be in the following format" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:20 +#: .\cookbook\templates\forms\edit_import_recipe.html:14 +#: .\cookbook\templates\generic\edit_template.html:23 +#: .\cookbook\templates\generic\new_template.html:23 +#: .\cookbook\templates\settings.html:70 +#: .\cookbook\templates\settings.html:112 +#: .\cookbook\templates\settings.html:130 +#: .\cookbook\templates\settings.html:202 +#: .\cookbook\templates\settings.html:213 +msgid "Save" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:21 +msgid "Manage External Storage" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:28 +msgid "Sync Now!" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:29 +msgid "Show Recipes" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:30 +msgid "Show Log" +msgstr "" + +#: .\cookbook\templates\batch\waiting.html:4 +#: .\cookbook\templates\batch\waiting.html:10 +msgid "Importing Recipes" +msgstr "" + +#: .\cookbook\templates\batch\waiting.html:28 +msgid "" +"This can take a few minutes, depending on the number of recipes in sync, " +"please wait." +msgstr "" + +#: .\cookbook\templates\books.html:7 +msgid "Recipe Books" +msgstr "" + +#: .\cookbook\templates\export.html:8 .\cookbook\templates\test2.html:6 +msgid "Export Recipes" +msgstr "" + +#: .\cookbook\templates\forms\edit_import_recipe.html:5 +#: .\cookbook\templates\forms\edit_import_recipe.html:9 +msgid "Import new Recipe" +msgstr "" + +#: .\cookbook\templates\forms\edit_internal_recipe.html:7 +msgid "Edit Recipe" +msgstr "" + +#: .\cookbook\templates\forms\ingredients.html:15 +msgid "Edit Ingredients" +msgstr "" + +#: .\cookbook\templates\forms\ingredients.html:16 +msgid "" +"\n" +" The following form can be used if, accidentally, two (or more) units " +"or ingredients where created that should be\n" +" the same.\n" +" It merges two units or ingredients and updates all recipes using " +"them.\n" +" " +msgstr "" + +#: .\cookbook\templates\forms\ingredients.html:26 +msgid "Are you sure that you want to merge these two units?" +msgstr "" + +#: .\cookbook\templates\forms\ingredients.html:31 +#: .\cookbook\templates\forms\ingredients.html:40 +msgid "Merge" +msgstr "" + +#: .\cookbook\templates\forms\ingredients.html:36 +msgid "Are you sure that you want to merge these two ingredients?" +msgstr "" + +#: .\cookbook\templates\generic\delete_template.html:21 +#, python-format +msgid "Are you sure you want to delete the %(title)s: %(object)s " +msgstr "" + +#: .\cookbook\templates\generic\delete_template.html:22 +msgid "This cannot be undone!" +msgstr "" + +#: .\cookbook\templates\generic\delete_template.html:27 +msgid "Protected" +msgstr "" + +#: .\cookbook\templates\generic\delete_template.html:42 +msgid "Cascade" +msgstr "" + +#: .\cookbook\templates\generic\delete_template.html:73 +msgid "Cancel" +msgstr "" + +#: .\cookbook\templates\generic\edit_template.html:32 +msgid "View" +msgstr "" + +#: .\cookbook\templates\generic\edit_template.html:36 +msgid "Delete original file" +msgstr "" + +#: .\cookbook\templates\generic\list_template.html:6 +#: .\cookbook\templates\generic\list_template.html:22 +msgid "List" +msgstr "" + +#: .\cookbook\templates\generic\list_template.html:36 +msgid "Filter" +msgstr "" + +#: .\cookbook\templates\generic\list_template.html:41 +msgid "Import all" +msgstr "" + +#: .\cookbook\templates\generic\table_template.html:76 +#: .\cookbook\templates\recipes_table.html:121 +msgid "previous" +msgstr "" + +#: .\cookbook\templates\generic\table_template.html:98 +#: .\cookbook\templates\recipes_table.html:143 +msgid "next" +msgstr "" + +#: .\cookbook\templates\history.html:20 +msgid "View Log" +msgstr "" + +#: .\cookbook\templates\history.html:24 +msgid "Cook Log" +msgstr "" + +#: .\cookbook\templates\import.html:6 +msgid "Import Recipes" +msgstr "" + +#: .\cookbook\templates\import.html:14 .\cookbook\templates\import.html:20 +#: .\cookbook\templates\import_response.html:7 .\cookbook\views\delete.py:86 +#: .\cookbook\views\edit.py:191 +msgid "Import" +msgstr "" + +#: .\cookbook\templates\include\recipe_open_modal.html:18 +msgid "Close" +msgstr "" + +#: .\cookbook\templates\include\recipe_open_modal.html:32 +msgid "Open Recipe" +msgstr "" + +#: .\cookbook\templates\include\storage_backend_warning.html:4 +msgid "Security Warning" +msgstr "" + +#: .\cookbook\templates\include\storage_backend_warning.html:5 +msgid "" +"\n" +" The Password and Token field are stored as plain text " +"inside the database.\n" +" This is necessary because they are needed to make API requests, but " +"it also increases the risk of\n" +" someone stealing it.
\n" +" To limit the possible damage tokens or accounts with limited access " +"can be used.\n" +" " +msgstr "" + +#: .\cookbook\templates\index.html:29 +msgid "Search recipe ..." +msgstr "" + +#: .\cookbook\templates\index.html:44 +msgid "New Recipe" +msgstr "" + +#: .\cookbook\templates\index.html:53 +msgid "Advanced Search" +msgstr "" + +#: .\cookbook\templates\index.html:57 +msgid "Reset Search" +msgstr "" + +#: .\cookbook\templates\index.html:85 +msgid "Last viewed" +msgstr "" + +#: .\cookbook\templates\index.html:94 +msgid "Log in to view recipes" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:5 +#: .\cookbook\templates\markdown_info.html:13 +msgid "Markdown Info" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:14 +msgid "" +"\n" +" Markdown is lightweight markup language that can be used to format " +"plain text easily.\n" +" This site uses the Python Markdown library to\n" +" convert your text into nice looking HTML. Its full markdown " +"documentation can be found\n" +" here.\n" +" An incomplete but most likely sufficient documentation can be found " +"below.\n" +" " +msgstr "" + +#: .\cookbook\templates\markdown_info.html:25 +msgid "Headers" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:54 +msgid "Formatting" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:56 +#: .\cookbook\templates\markdown_info.html:72 +msgid "Line breaks are inserted by adding two spaces after the end of a line" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:57 +#: .\cookbook\templates\markdown_info.html:73 +msgid "or by leaving a blank line in between." +msgstr "" + +#: .\cookbook\templates\markdown_info.html:59 +#: .\cookbook\templates\markdown_info.html:74 +msgid "This text is bold" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:60 +#: .\cookbook\templates\markdown_info.html:75 +msgid "This text is italic" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:61 +#: .\cookbook\templates\markdown_info.html:77 +msgid "Blockquotes are also possible" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:84 +msgid "Lists" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:85 +msgid "" +"Lists can ordered or unordered. It is important to leave a blank line " +"before the list!" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:87 +#: .\cookbook\templates\markdown_info.html:108 +msgid "Ordered List" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:89 +#: .\cookbook\templates\markdown_info.html:90 +#: .\cookbook\templates\markdown_info.html:91 +#: .\cookbook\templates\markdown_info.html:110 +#: .\cookbook\templates\markdown_info.html:111 +#: .\cookbook\templates\markdown_info.html:112 +msgid "unordered list item" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:93 +#: .\cookbook\templates\markdown_info.html:114 +msgid "Unordered List" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:95 +#: .\cookbook\templates\markdown_info.html:96 +#: .\cookbook\templates\markdown_info.html:97 +#: .\cookbook\templates\markdown_info.html:116 +#: .\cookbook\templates\markdown_info.html:117 +#: .\cookbook\templates\markdown_info.html:118 +msgid "ordered list item" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:125 +msgid "Images & Links" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:126 +msgid "" +"Links can be formatted with Markdown. This application also allows to paste " +"links directly into markdown fields without any formatting." +msgstr "" + +#: .\cookbook\templates\markdown_info.html:132 +#: .\cookbook\templates\markdown_info.html:145 +msgid "This will become an image" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:152 +msgid "Tables" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:153 +msgid "" +"Markdown tables are hard to create by hand. It is recommended to use a table " +"editor like this one." +msgstr "" + +#: .\cookbook\templates\markdown_info.html:155 +#: .\cookbook\templates\markdown_info.html:157 +#: .\cookbook\templates\markdown_info.html:171 +#: .\cookbook\templates\markdown_info.html:177 +msgid "Table" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:155 +#: .\cookbook\templates\markdown_info.html:172 +msgid "Header" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:157 +#: .\cookbook\templates\markdown_info.html:178 +msgid "Cell" +msgstr "" + +#: .\cookbook\templates\meal_plan_entry.html:6 +msgid "Meal Plan View" +msgstr "" + +#: .\cookbook\templates\meal_plan_entry.html:18 +msgid "Created by" +msgstr "" + +#: .\cookbook\templates\meal_plan_entry.html:20 +msgid "Shared with" +msgstr "" + +#: .\cookbook\templates\meal_plan_entry.html:48 +#: .\cookbook\templates\recipes_table.html:64 +msgid "Last cooked" +msgstr "" + +#: .\cookbook\templates\meal_plan_entry.html:50 +msgid "Never cooked before." +msgstr "" + +#: .\cookbook\templates\meal_plan_entry.html:76 +msgid "Other meals on this day" +msgstr "" + +#: .\cookbook\templates\no_groups_info.html:5 +#: .\cookbook\templates\no_groups_info.html:12 +msgid "No Permissions" +msgstr "" + +#: .\cookbook\templates\no_groups_info.html:17 +msgid "You do not have any groups and therefor cannot use this application." +msgstr "" + +#: .\cookbook\templates\no_groups_info.html:18 +#: .\cookbook\templates\no_perm_info.html:15 +msgid "Please contact your administrator." +msgstr "" + +#: .\cookbook\templates\no_perm_info.html:5 +#: .\cookbook\templates\no_perm_info.html:12 +msgid "No Permission" +msgstr "" + +#: .\cookbook\templates\no_perm_info.html:15 +msgid "" +"You do not have the required permissions to view this page or perform this " +"action." +msgstr "" + +#: .\cookbook\templates\offline.html:6 +msgid "Offline" +msgstr "" + +#: .\cookbook\templates\offline.html:19 +msgid "You are currently offline!" +msgstr "" + +#: .\cookbook\templates\offline.html:20 +msgid "" +"The recipes listed below are available for offline viewing because you have " +"recently viewed them. Keep in mind that data might be outdated." +msgstr "" + +#: .\cookbook\templates\openid\login.html:27 +#: .\cookbook\templates\socialaccount\authentication_error.html:27 +msgid "Back" +msgstr "" + +#: .\cookbook\templates\recipe_view.html:26 +msgid "by" +msgstr "" + +#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:144 +#: .\cookbook\views\edit.py:171 +msgid "Comment" +msgstr "" + +#: .\cookbook\templates\recipes_table.html:19 +#: .\cookbook\templates\recipes_table.html:23 +msgid "Recipe Image" +msgstr "" + +#: .\cookbook\templates\recipes_table.html:51 +msgid "Preparation time ca." +msgstr "" + +#: .\cookbook\templates\recipes_table.html:57 +msgid "Waiting time ca." +msgstr "" + +#: .\cookbook\templates\recipes_table.html:60 +msgid "External" +msgstr "" + +#: .\cookbook\templates\recipes_table.html:86 +msgid "Log Cooking" +msgstr "" + +#: .\cookbook\templates\rest_framework\api.html:5 +msgid "Recipe Home" +msgstr "" + +#: .\cookbook\templates\search_info.html:5 +#: .\cookbook\templates\search_info.html:9 +#: .\cookbook\templates\settings.html:172 +msgid "Search Settings" +msgstr "" + +#: .\cookbook\templates\search_info.html:10 +msgid "" +"\n" +" Creating the best search experience is complicated and weighs " +"heavily on your personal configuration. \n" +" Changing any of the search settings can have significant impact on " +"the speed and quality of the results.\n" +" Search Methods, Trigrams and Full Text Search configurations are " +"only available if you are using Postgres for your database.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:19 +msgid "Search Methods" +msgstr "" + +#: .\cookbook\templates\search_info.html:23 +msgid "" +" \n" +" Full text searches attempt to normalize the words provided to " +"match common variants. For example: 'forked', 'forking', 'forks' will all " +"normalize to 'fork'.\n" +" There are several methods available, described below, that will " +"control how the search behavior should react when multiple words are " +"searched.\n" +" Full technical details on how these operate can be viewed on Postgresql's website.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:29 +msgid "" +" \n" +" Simple searches ignore punctuation and common words such as " +"'the', 'a', 'and'. And will treat separate words as required.\n" +" Searching for 'apple or flour' will return any recipe that " +"includes both 'apple' and 'flour' anywhere in the fields that have been " +"selected for a full text search.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:34 +msgid "" +" \n" +" Phrase searches ignore punctuation, but will search for all of " +"the words in the exact order provided.\n" +" Searching for 'apple or flour' will only return a recipe that " +"includes the exact phrase 'apple or flour' in any of the fields that have " +"been selected for a full text search.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:39 +msgid "" +" \n" +" Web searches simulate functionality found on many web search " +"sites supporting special syntax.\n" +" Placing quotes around several words will convert those words " +"into a phrase.\n" +" 'or' is recognized as searching for the word (or phrase) " +"immediately before 'or' OR the word (or phrase) directly after.\n" +" '-' is recognized as searching for recipes that do not include " +"the word (or phrase) that comes immediately after. \n" +" For example searching for 'apple pie' or cherry -butter will " +"return any recipe that includes the phrase 'apple pie' or the word " +"'cherry' \n" +" in any field included in the full text search but exclude any " +"recipe that has the word 'butter' in any field included.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:48 +msgid "" +" \n" +" Raw search is similar to Web except will take puncuation " +"operators such as '|', '&' and '()'\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:59 +msgid "" +" \n" +" Another approach to searching that also requires Postgresql is " +"fuzzy search or trigram similarity. A trigram is a group of three " +"consecutive characters.\n" +" For example searching for 'apple' will create x trigrams 'app', " +"'ppl', 'ple' and will create a score of how closely words match the " +"generated trigrams.\n" +" One benefit of searching trigams is that a search for 'sandwich' " +"will find misspelled words such as 'sandwhich' that would be missed by other " +"methods.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:69 +msgid "Search Fields" +msgstr "" + +#: .\cookbook\templates\search_info.html:73 +msgid "" +" \n" +" Unaccent is a special case in that it enables searching a field " +"'unaccented' for each search style attempting to ignore accented values. \n" +" For example when you enable unaccent for 'Name' any search " +"(starts with, contains, trigram) will attempt the search ignoring accented " +"characters.\n" +" \n" +" For the other options, you can enable search on any or all " +"fields and they will be combined together with an assumed 'OR'.\n" +" For example enabling 'Name' for Starts With, 'Name' and " +"'Description' for Partial Match and 'Ingredients' and 'Keywords' for Full " +"Search\n" +" and searching for 'apple' will generate a search that will " +"return recipes that have:\n" +" - A recipe name that starts with 'apple'\n" +" - OR a recipe name that contains 'apple'\n" +" - OR a recipe description that contains 'apple'\n" +" - OR a recipe that will have a full text search match ('apple' " +"or 'apples') in ingredients\n" +" - OR a recipe that will have a full text search match in " +"Keywords\n" +"\n" +" Combining too many fields in too many types of search can have a " +"negative impact on performance, create duplicate results or return " +"unexpected results.\n" +" For example, enabling fuzzy search or partial matches will " +"interfere with web search methods. \n" +" Searching for 'apple -pie' with fuzzy search and full text " +"search will return the recipe Apple Pie. Though it is not included in the " +"full text results, it does match the trigram results.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:95 +msgid "Search Index" +msgstr "" + +#: .\cookbook\templates\search_info.html:99 +msgid "" +" \n" +" Trigram search and Full Text Search both rely on database " +"indexes to perform effectively. \n" +" You can rebuild the indexes on all fields in the Admin page for " +"Recipes and selecting all recipes and running 'rebuild index for selected " +"recipes'\n" +" You can also rebuild indexes at the command line by executing " +"the management command 'python manage.py rebuildindex'\n" +" " +msgstr "" + +#: .\cookbook\templates\settings.html:28 +msgid "Account" +msgstr "" + +#: .\cookbook\templates\settings.html:35 +msgid "Preferences" +msgstr "" + +#: .\cookbook\templates\settings.html:42 +msgid "API-Settings" +msgstr "" + +#: .\cookbook\templates\settings.html:49 +msgid "Search-Settings" +msgstr "" + +#: .\cookbook\templates\settings.html:56 +msgid "Shopping-Settings" +msgstr "" + +#: .\cookbook\templates\settings.html:65 +msgid "Name Settings" +msgstr "" + +#: .\cookbook\templates\settings.html:73 +msgid "Account Settings" +msgstr "" + +#: .\cookbook\templates\settings.html:75 +msgid "Emails" +msgstr "" + +#: .\cookbook\templates\settings.html:78 +#: .\cookbook\templates\socialaccount\connections.html:11 +msgid "Social" +msgstr "" + +#: .\cookbook\templates\settings.html:91 +msgid "Language" +msgstr "" + +#: .\cookbook\templates\settings.html:121 +msgid "Style" +msgstr "" + +#: .\cookbook\templates\settings.html:142 +msgid "API Token" +msgstr "" + +#: .\cookbook\templates\settings.html:143 +msgid "" +"You can use both basic authentication and token based authentication to " +"access the REST API." +msgstr "" + +#: .\cookbook\templates\settings.html:160 +msgid "" +"Use the token as an Authorization header prefixed by the word token as shown " +"in the following examples:" +msgstr "" + +#: .\cookbook\templates\settings.html:162 +msgid "or" +msgstr "" + +#: .\cookbook\templates\settings.html:173 +msgid "" +"There are many options to configure the search depending on your personal " +"preferences." +msgstr "" + +#: .\cookbook\templates\settings.html:174 +msgid "" +"Usually you do not need to configure any of them and can just stick " +"with either the default or one of the following presets." +msgstr "" + +#: .\cookbook\templates\settings.html:175 +msgid "" +"If you do want to configure the search you can read about the different " +"options here." +msgstr "" + +#: .\cookbook\templates\settings.html:180 +msgid "Fuzzy" +msgstr "" + +#: .\cookbook\templates\settings.html:181 +msgid "" +"Find what you need even if your search or the recipe contains typos. Might " +"return more results than needed to make sure you find what you are looking " +"for." +msgstr "" + +#: .\cookbook\templates\settings.html:182 +msgid "This is the default behavior" +msgstr "" + +#: .\cookbook\templates\settings.html:183 +#: .\cookbook\templates\settings.html:191 +msgid "Apply" +msgstr "" + +#: .\cookbook\templates\settings.html:188 +msgid "Precise" +msgstr "" + +#: .\cookbook\templates\settings.html:189 +msgid "" +"Allows fine control over search results but might not return results if too " +"many spelling mistakes are made." +msgstr "" + +#: .\cookbook\templates\settings.html:190 +msgid "Perfect for large Databases" +msgstr "" + +#: .\cookbook\templates\settings.html:207 +msgid "Shopping Settings" +msgstr "" + +#: .\cookbook\templates\setup.html:6 .\cookbook\templates\system.html:5 +msgid "Cookbook Setup" +msgstr "" + +#: .\cookbook\templates\setup.html:14 +msgid "Setup" +msgstr "" + +#: .\cookbook\templates\setup.html:15 +msgid "" +"To start using this application you must first create a superuser account." +msgstr "" + +#: .\cookbook\templates\setup.html:20 +msgid "Create Superuser account" +msgstr "" + +#: .\cookbook\templates\socialaccount\authentication_error.html:7 +#: .\cookbook\templates\socialaccount\authentication_error.html:23 +msgid "Social Network Login Failure" +msgstr "" + +#: .\cookbook\templates\socialaccount\authentication_error.html:25 +msgid "" +"An error occurred while attempting to login via your social network account." +msgstr "" + +#: .\cookbook\templates\socialaccount\connections.html:4 +#: .\cookbook\templates\socialaccount\connections.html:15 +msgid "Account Connections" +msgstr "" + +#: .\cookbook\templates\socialaccount\connections.html:18 +msgid "" +"You can sign in to your account using any of the following third party\n" +" accounts:" +msgstr "" + +#: .\cookbook\templates\socialaccount\connections.html:52 +msgid "" +"You currently have no social network accounts connected to this account." +msgstr "" + +#: .\cookbook\templates\socialaccount\connections.html:55 +msgid "Add a 3rd Party Account" +msgstr "" + +#: .\cookbook\templates\socialaccount\login.html:5 +#: .\cookbook\templates\socialaccount\signup.html:5 +msgid "Signup" +msgstr "" + +#: .\cookbook\templates\socialaccount\login.html:9 +#, python-format +msgid "Connect %(provider)s" +msgstr "" + +#: .\cookbook\templates\socialaccount\login.html:11 +#, python-format +msgid "You are about to connect a new third party account from %(provider)s." +msgstr "" + +#: .\cookbook\templates\socialaccount\login.html:13 +#, python-format +msgid "Sign In Via %(provider)s" +msgstr "" + +#: .\cookbook\templates\socialaccount\login.html:15 +#, python-format +msgid "You are about to sign in using a third party account from %(provider)s." +msgstr "" + +#: .\cookbook\templates\socialaccount\login.html:20 +msgid "Continue" +msgstr "" + +#: .\cookbook\templates\socialaccount\signup.html:10 +#, python-format +msgid "" +"You are about to use your\n" +" %(provider_name)s account to login to\n" +" %(site_name)s. As a final step, please complete the following form:" +msgstr "" + +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:23 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:31 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:39 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:47 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:55 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:63 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:71 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:79 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:87 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:95 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:103 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:111 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:119 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:127 +msgid "Sign in using" +msgstr "" + +#: .\cookbook\templates\space_manage.html:26 +msgid "Space:" +msgstr "" + +#: .\cookbook\templates\space_manage.html:27 +msgid "Manage Subscription" +msgstr "" + +#: .\cookbook\templates\space_overview.html:13 .\cookbook\views\delete.py:216 +msgid "Space" +msgstr "" + +#: .\cookbook\templates\space_overview.html:17 +msgid "" +"Recipes, foods, shopping lists and more are organized in spaces of one or " +"more people." +msgstr "" + +#: .\cookbook\templates\space_overview.html:18 +msgid "" +"You can either be invited into an existing space or create your own one." +msgstr "" + +#: .\cookbook\templates\space_overview.html:45 +msgid "Owner" +msgstr "" + +#: .\cookbook\templates\space_overview.html:49 +msgid "Leave Space" +msgstr "" + +#: .\cookbook\templates\space_overview.html:70 +#: .\cookbook\templates\space_overview.html:80 +msgid "Join Space" +msgstr "" + +#: .\cookbook\templates\space_overview.html:73 +msgid "Join an existing space." +msgstr "" + +#: .\cookbook\templates\space_overview.html:75 +msgid "" +"To join an existing space either enter your invite token or click on the " +"invite link the space owner send you." +msgstr "" + +#: .\cookbook\templates\space_overview.html:88 +#: .\cookbook\templates\space_overview.html:97 +msgid "Create Space" +msgstr "" + +#: .\cookbook\templates\space_overview.html:91 +msgid "Create your own recipe space." +msgstr "" + +#: .\cookbook\templates\space_overview.html:93 +msgid "Start your own recipe space and invite other users to it." +msgstr "" + +#: .\cookbook\templates\stats.html:4 +msgid "Stats" +msgstr "" + +#: .\cookbook\templates\stats.html:10 +msgid "Statistics" +msgstr "" + +#: .\cookbook\templates\stats.html:19 +msgid "Number of objects" +msgstr "" + +#: .\cookbook\templates\stats.html:30 +msgid "Recipe Imports" +msgstr "" + +#: .\cookbook\templates\stats.html:38 +msgid "Objects stats" +msgstr "" + +#: .\cookbook\templates\stats.html:41 +msgid "Recipes without Keywords" +msgstr "" + +#: .\cookbook\templates\stats.html:45 +msgid "Internal Recipes" +msgstr "" + +#: .\cookbook\templates\system.html:20 +msgid "System Information" +msgstr "" + +#: .\cookbook\templates\system.html:22 +msgid "" +"\n" +" Django Recipes is an open source free software application. It can " +"be found on\n" +" GitHub.\n" +" Changelogs can be found here.\n" +" " +msgstr "" + +#: .\cookbook\templates\system.html:36 +msgid "Media Serving" +msgstr "" + +#: .\cookbook\templates\system.html:37 .\cookbook\templates\system.html:52 +#: .\cookbook\templates\system.html:68 +msgid "Warning" +msgstr "" + +#: .\cookbook\templates\system.html:37 .\cookbook\templates\system.html:52 +#: .\cookbook\templates\system.html:68 .\cookbook\templates\system.html:83 +msgid "Ok" +msgstr "" + +#: .\cookbook\templates\system.html:39 +msgid "" +"Serving media files directly using gunicorn/python is not recommend!\n" +" Please follow the steps described\n" +" here to update\n" +" your installation.\n" +" " +msgstr "" + +#: .\cookbook\templates\system.html:45 .\cookbook\templates\system.html:61 +#: .\cookbook\templates\system.html:76 .\cookbook\templates\system.html:90 +msgid "Everything is fine!" +msgstr "" + +#: .\cookbook\templates\system.html:50 +msgid "Secret Key" +msgstr "" + +#: .\cookbook\templates\system.html:54 +msgid "" +"\n" +" You do not have a SECRET_KEY configured in your " +".env file. Django defaulted to the\n" +" standard key\n" +" provided with the installation which is publicly know and " +"insecure! Please set\n" +" SECRET_KEY int the .env configuration " +"file.\n" +" " +msgstr "" + +#: .\cookbook\templates\system.html:66 +msgid "Debug Mode" +msgstr "" + +#: .\cookbook\templates\system.html:70 +msgid "" +"\n" +" This application is still running in debug mode. This is most " +"likely not needed. Turn of debug mode by\n" +" setting\n" +" DEBUG=0 int the .env configuration " +"file.\n" +" " +msgstr "" + +#: .\cookbook\templates\system.html:81 +msgid "Database" +msgstr "" + +#: .\cookbook\templates\system.html:83 +msgid "Info" +msgstr "" + +#: .\cookbook\templates\system.html:85 +msgid "" +"\n" +" This application is not running with a Postgres database " +"backend. This is ok but not recommended as some\n" +" features only work with postgres databases.\n" +" " +msgstr "" + +#: .\cookbook\templates\url_import.html:8 +msgid "URL Import" +msgstr "" + +#: .\cookbook\views\api.py:105 .\cookbook\views\api.py:197 +msgid "Parameter updated_at incorrectly formatted" +msgstr "" + +#: .\cookbook\views\api.py:217 .\cookbook\views\api.py:320 +msgid "No {self.basename} with id {pk} exists" +msgstr "" + +#: .\cookbook\views\api.py:221 +msgid "Cannot merge with the same object!" +msgstr "" + +#: .\cookbook\views\api.py:228 +msgid "No {self.basename} with id {target} exists" +msgstr "" + +#: .\cookbook\views\api.py:233 +msgid "Cannot merge with child object!" +msgstr "" + +#: .\cookbook\views\api.py:266 +msgid "{source.name} was merged successfully with {target.name}" +msgstr "" + +#: .\cookbook\views\api.py:271 +msgid "An error occurred attempting to merge {source.name} with {target.name}" +msgstr "" + +#: .\cookbook\views\api.py:329 +msgid "{child.name} was moved successfully to the root." +msgstr "" + +#: .\cookbook\views\api.py:332 .\cookbook\views\api.py:350 +msgid "An error occurred attempting to move " +msgstr "" + +#: .\cookbook\views\api.py:335 +msgid "Cannot move an object to itself!" +msgstr "" + +#: .\cookbook\views\api.py:341 +msgid "No {self.basename} with id {parent} exists" +msgstr "" + +#: .\cookbook\views\api.py:347 +msgid "{child.name} was moved successfully to parent {parent.name}" +msgstr "" + +#: .\cookbook\views\api.py:542 +msgid "{obj.name} was removed from the shopping list." +msgstr "" + +#: .\cookbook\views\api.py:547 .\cookbook\views\api.py:879 +#: .\cookbook\views\api.py:892 +msgid "{obj.name} was added to the shopping list." +msgstr "" + +#: .\cookbook\views\api.py:674 +msgid "ID of recipe a step is part of. For multiple repeat parameter." +msgstr "" + +#: .\cookbook\views\api.py:676 +msgid "Query string matched (fuzzy) against object name." +msgstr "" + +#: .\cookbook\views\api.py:720 +msgid "" +"Query string matched (fuzzy) against recipe name. In the future also " +"fulltext search." +msgstr "" + +#: .\cookbook\views\api.py:722 +msgid "" +"ID of keyword a recipe should have. For multiple repeat parameter. " +"Equivalent to keywords_or" +msgstr "" + +#: .\cookbook\views\api.py:725 +msgid "" +"Keyword IDs, repeat for multiple. Return recipes with any of the keywords" +msgstr "" + +#: .\cookbook\views\api.py:728 +msgid "" +"Keyword IDs, repeat for multiple. Return recipes with all of the keywords." +msgstr "" + +#: .\cookbook\views\api.py:731 +msgid "" +"Keyword IDs, repeat for multiple. Exclude recipes with any of the keywords." +msgstr "" + +#: .\cookbook\views\api.py:734 +msgid "" +"Keyword IDs, repeat for multiple. Exclude recipes with all of the keywords." +msgstr "" + +#: .\cookbook\views\api.py:736 +msgid "ID of food a recipe should have. For multiple repeat parameter." +msgstr "" + +#: .\cookbook\views\api.py:739 +msgid "Food IDs, repeat for multiple. Return recipes with any of the foods" +msgstr "" + +#: .\cookbook\views\api.py:741 +msgid "Food IDs, repeat for multiple. Return recipes with all of the foods." +msgstr "" + +#: .\cookbook\views\api.py:743 +msgid "Food IDs, repeat for multiple. Exclude recipes with any of the foods." +msgstr "" + +#: .\cookbook\views\api.py:745 +msgid "Food IDs, repeat for multiple. Exclude recipes with all of the foods." +msgstr "" + +#: .\cookbook\views\api.py:746 +msgid "ID of unit a recipe should have." +msgstr "" + +#: .\cookbook\views\api.py:748 +msgid "" +"Rating a recipe should have or greater. [0 - 5] Negative value filters " +"rating less than." +msgstr "" + +#: .\cookbook\views\api.py:749 +msgid "ID of book a recipe should be in. For multiple repeat parameter." +msgstr "" + +#: .\cookbook\views\api.py:751 +msgid "Book IDs, repeat for multiple. Return recipes with any of the books" +msgstr "" + +#: .\cookbook\views\api.py:753 +msgid "Book IDs, repeat for multiple. Return recipes with all of the books." +msgstr "" + +#: .\cookbook\views\api.py:755 +msgid "Book IDs, repeat for multiple. Exclude recipes with any of the books." +msgstr "" + +#: .\cookbook\views\api.py:757 +msgid "Book IDs, repeat for multiple. Exclude recipes with all of the books." +msgstr "" + +#: .\cookbook\views\api.py:759 +msgid "If only internal recipes should be returned. [true/false]" +msgstr "" + +#: .\cookbook\views\api.py:761 +msgid "Returns the results in randomized order. [true/false]" +msgstr "" + +#: .\cookbook\views\api.py:763 +msgid "Returns new results first in search results. [true/false]" +msgstr "" + +#: .\cookbook\views\api.py:765 +msgid "" +"Filter recipes cooked X times or more. Negative values returns cooked less " +"than X times" +msgstr "" + +#: .\cookbook\views\api.py:767 +msgid "" +"Filter recipes last cooked on or after YYYY-MM-DD. Prepending - filters on " +"or before date." +msgstr "" + +#: .\cookbook\views\api.py:769 +msgid "" +"Filter recipes created on or after YYYY-MM-DD. Prepending - filters on or " +"before date." +msgstr "" + +#: .\cookbook\views\api.py:771 +msgid "" +"Filter recipes updated on or after YYYY-MM-DD. Prepending - filters on or " +"before date." +msgstr "" + +#: .\cookbook\views\api.py:773 +msgid "" +"Filter recipes lasts viewed on or after YYYY-MM-DD. Prepending - filters on " +"or before date." +msgstr "" + +#: .\cookbook\views\api.py:775 +msgid "Filter recipes that can be made with OnHand food. [true/false]" +msgstr "" + +#: .\cookbook\views\api.py:937 +msgid "" +"Returns the shopping list entry with a primary key of id. Multiple values " +"allowed." +msgstr "" + +#: .\cookbook\views\api.py:942 +msgid "" +"Filter shopping list entries on checked. [true, false, both, recent]" +"
- recent includes unchecked items and recently completed items." +msgstr "" + +#: .\cookbook\views\api.py:945 +msgid "Returns the shopping list entries sorted by supermarket category order." +msgstr "" + +#: .\cookbook\views\api.py:1140 +msgid "Nothing to do." +msgstr "" + +#: .\cookbook\views\api.py:1160 +msgid "Invalid Url" +msgstr "" + +#: .\cookbook\views\api.py:1167 +msgid "Connection Refused." +msgstr "" + +#: .\cookbook\views\api.py:1172 +msgid "Bad URL Schema." +msgstr "" + +#: .\cookbook\views\api.py:1195 +msgid "No usable data could be found." +msgstr "" + +#: .\cookbook\views\api.py:1303 .\cookbook\views\data.py:28 +#: .\cookbook\views\edit.py:120 .\cookbook\views\new.py:90 +msgid "This feature is not yet available in the hosted version of tandoor!" +msgstr "" + +#: .\cookbook\views\api.py:1325 +msgid "Sync successful!" +msgstr "" + +#: .\cookbook\views\api.py:1330 +msgid "Error synchronizing with Storage" +msgstr "" + +#: .\cookbook\views\data.py:97 +#, python-format +msgid "Batch edit done. %(count)d recipe was updated." +msgid_plural "Batch edit done. %(count)d Recipes where updated." +msgstr[0] "" + +#: .\cookbook\views\delete.py:98 +msgid "Monitor" +msgstr "" + +#: .\cookbook\views\delete.py:122 .\cookbook\views\lists.py:62 +#: .\cookbook\views\new.py:96 +msgid "Storage Backend" +msgstr "" + +#: .\cookbook\views\delete.py:132 +msgid "" +"Could not delete this storage backend as it is used in at least one monitor." +msgstr "" + +#: .\cookbook\views\delete.py:155 +msgid "Recipe Book" +msgstr "" + +#: .\cookbook\views\delete.py:167 +msgid "Bookmarks" +msgstr "" + +#: .\cookbook\views\delete.py:189 +msgid "Invite Link" +msgstr "" + +#: .\cookbook\views\delete.py:200 +msgid "Space Membership" +msgstr "" + +#: .\cookbook\views\edit.py:116 +msgid "You cannot edit this storage!" +msgstr "" + +#: .\cookbook\views\edit.py:140 +msgid "Storage saved!" +msgstr "" + +#: .\cookbook\views\edit.py:146 +msgid "There was an error updating this storage backend!" +msgstr "" + +#: .\cookbook\views\edit.py:239 +msgid "Changes saved!" +msgstr "" + +#: .\cookbook\views\edit.py:243 +msgid "Error saving changes!" +msgstr "" + +#: .\cookbook\views\import_export.py:111 .\cookbook\views\import_export.py:150 +msgid "Importing is not implemented for this provider" +msgstr "" + +#: .\cookbook\views\import_export.py:137 +msgid "" +"The PDF Exporter is not enabled on this instance as it is still in an " +"experimental state." +msgstr "" + +#: .\cookbook\views\lists.py:24 +msgid "Import Log" +msgstr "" + +#: .\cookbook\views\lists.py:37 +msgid "Discovery" +msgstr "" + +#: .\cookbook\views\lists.py:47 +msgid "Shopping List" +msgstr "" + +#: .\cookbook\views\lists.py:76 +msgid "Invite Links" +msgstr "" + +#: .\cookbook\views\lists.py:139 +msgid "Supermarkets" +msgstr "" + +#: .\cookbook\views\lists.py:155 +msgid "Shopping Categories" +msgstr "" + +#: .\cookbook\views\lists.py:187 +msgid "Custom Filters" +msgstr "" + +#: .\cookbook\views\lists.py:224 +msgid "Steps" +msgstr "" + +#: .\cookbook\views\new.py:121 +msgid "Imported new recipe!" +msgstr "" + +#: .\cookbook\views\new.py:124 +msgid "There was an error importing this recipe!" +msgstr "" + +#: .\cookbook\views\views.py:124 +msgid "" +"You have successfully created your own recipe space. Start by adding some " +"recipes or invite other people to join you." +msgstr "" + +#: .\cookbook\views\views.py:178 +msgid "You do not have the required permissions to perform this action!" +msgstr "" + +#: .\cookbook\views\views.py:189 +msgid "Comment saved!" +msgstr "" + +#: .\cookbook\views\views.py:264 +msgid "This feature is not available in the demo version!" +msgstr "" + +#: .\cookbook\views\views.py:324 +msgid "You must select at least one field to search!" +msgstr "" + +#: .\cookbook\views\views.py:329 +msgid "" +"To use this search method you must select at least one full text search " +"field!" +msgstr "" + +#: .\cookbook\views\views.py:333 +msgid "Fuzzy search is not compatible with this search method!" +msgstr "" + +#: .\cookbook\views\views.py:463 +msgid "" +"The setup page can only be used to create the first user! If you have " +"forgotten your superuser credentials please consult the django documentation " +"on how to reset passwords." +msgstr "" + +#: .\cookbook\views\views.py:470 +msgid "Passwords dont match!" +msgstr "" + +#: .\cookbook\views\views.py:478 +msgid "User has been created, please login!" +msgstr "" + +#: .\cookbook\views\views.py:494 +msgid "Malformed Invite Link supplied!" +msgstr "" + +#: .\cookbook\views\views.py:510 +msgid "Successfully joined space." +msgstr "" + +#: .\cookbook\views\views.py:516 +msgid "Invite Link not valid or already used!" +msgstr "" + +#: .\cookbook\views\views.py:530 +msgid "" +"Reporting share links is not enabled for this instance. Please notify the " +"page administrator to report problems." +msgstr "" + +#: .\cookbook\views\views.py:536 +msgid "" +"Recipe sharing link has been disabled! For additional information please " +"contact the page administrator." +msgstr "" From 15f65cd7114eb6bee7239b2e55a558fe34538b6f Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Sat, 1 Oct 2022 19:10:58 +0200 Subject: [PATCH 39/77] format step time --- vue/src/components/StepComponent.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vue/src/components/StepComponent.vue b/vue/src/components/StepComponent.vue index fe1acf90af..453fec1dcc 100644 --- a/vue/src/components/StepComponent.vue +++ b/vue/src/components/StepComponent.vue @@ -8,7 +8,7 @@ {{ step.time }} {{ $t("min") }} + class="fas fa-user-clock"> {{ step_time }} {{ moment(start_time).add(step.time_offset, "minutes").format("HH:mm") }} @@ -131,7 +131,7 @@ import CompileComponent from "@/components/CompileComponent" import IngredientsCard from "@/components/IngredientsCard" import Vue from "vue" import moment from "moment" -import {ResolveUrlMixin} from "@/utils/utils" +import {ResolveUrlMixin, calculateHourMinuteSplit} from "@/utils/utils" Vue.prototype.moment = moment @@ -150,6 +150,10 @@ export default { default: false, }, }, + computed: { + step_time: function() { + return calculateHourMinuteSplit(this.step.time)}, + }, data() { return { details_visible: true, From 7e6b1d3638544c03e9202ddc7ab868a1927c0a68 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Sat, 1 Oct 2022 19:25:18 +0200 Subject: [PATCH 40/77] added move and copy buttons to ingredient --- .../apps/RecipeEditView/RecipeEditView.vue | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/vue/src/apps/RecipeEditView/RecipeEditView.vue b/vue/src/apps/RecipeEditView/RecipeEditView.vue index 6313710f14..389d923769 100644 --- a/vue/src/apps/RecipeEditView/RecipeEditView.vue +++ b/vue/src/apps/RecipeEditView/RecipeEditView.vue @@ -576,6 +576,21 @@ {{ $t("Copy_template_reference") }} + + + @@ -648,7 +663,8 @@ v-if="recipe !== undefined">
+ class="d-block d-md-none btn btn-block btn-danger shadow-none btn-sm"> {{ $t("Delete") }}
@@ -1039,6 +1055,12 @@ export default { this.recipe.steps.splice(new_index < 0 ? 0 : new_index, 0, step) this.sortSteps() }, + moveIngredient: function (step, ingredient, new_index) { + step.ingredients.splice(step.ingredients.indexOf(ingredient), 1) + step.ingredients.splice(new_index < 0 ? 0 : new_index, 0, ingredient) + this.sortIngredients(step) + }, + addFoodType: function (tag, index) { let [tmp, step, id] = index.split("_") @@ -1212,6 +1234,10 @@ export default { } }) }, + duplicateIngredient: function (step, ingredient) { + delete ingredient.id + step.ingredients.push(ingredient) + } }, } From 730344e326c33f03390c0fa01407aa43a1a526f9 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Sat, 1 Oct 2022 19:27:09 +0200 Subject: [PATCH 41/77] duplicate ingredient to correct location --- vue/src/apps/RecipeEditView/RecipeEditView.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vue/src/apps/RecipeEditView/RecipeEditView.vue b/vue/src/apps/RecipeEditView/RecipeEditView.vue index 389d923769..ad5bf5d2c3 100644 --- a/vue/src/apps/RecipeEditView/RecipeEditView.vue +++ b/vue/src/apps/RecipeEditView/RecipeEditView.vue @@ -577,7 +577,7 @@ {{ $t("Copy_template_reference") }} @@ -1234,9 +1234,9 @@ export default { } }) }, - duplicateIngredient: function (step, ingredient) { + duplicateIngredient: function (step, ingredient, new_index) { delete ingredient.id - step.ingredients.push(ingredient) + step.ingredients.splice(new_index < 0 ? 0 : new_index, 0, ingredient) } }, } From 57f5343c77b847bd52a2ef462b533d45cf634b03 Mon Sep 17 00:00:00 2001 From: Andrea Date: Sun, 2 Oct 2022 14:31:27 +0000 Subject: [PATCH 42/77] Translated using Weblate (Spanish) Currently translated at 75.2% (346 of 460 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/es/ --- vue/src/locales/es.json | 82 ++++++++++++++++++++++++----------------- 1 file changed, 48 insertions(+), 34 deletions(-) diff --git a/vue/src/locales/es.json b/vue/src/locales/es.json index 80c25ac8e9..cedf900223 100644 --- a/vue/src/locales/es.json +++ b/vue/src/locales/es.json @@ -1,19 +1,19 @@ { - "warning_feature_beta": "Esta función está en fase BETA de pruebas. Podrían aparecer fallos y cambios importantes en un futuro(pudiendo perder la información) cuando uses esta función.", - "err_fetching_resource": "¡Ha habido un error al obtener el recurso!", - "err_creating_resource": "¡Ha habido un error al crear el recurso!", - "err_updating_resource": "¡Ha habido un error al actualizar el recurso!", - "err_deleting_resource": "¡Ha habido un error al eliminar el recurso!", + "warning_feature_beta": "Esta función está en fase BETA de pruebas. Podrían aparecer fallos y cambios importantes en un futuro (pudiendo perder la información) cuando uses esta función.", + "err_fetching_resource": "¡Hubo un error al obtener el recurso!", + "err_creating_resource": "¡Hubo un error al crear el recurso!", + "err_updating_resource": "¡Hubo un error al actualizar el recurso!", + "err_deleting_resource": "¡Hubo un error al eliminar el recurso!", "err_deleting_protected_resource": "El objeto a eliminar sigue en uso y no puede ser eliminado.", - "err_moving_resource": "¡Ha habido un error moviendo el recurso!", - "err_merging_resource": "¡Ha habido un error uniendo el recurso!", - "success_fetching_resource": "¡Se ha obtenido con éxito un recurso!", - "success_creating_resource": "¡Se ha creado con éxito un recurso!", - "success_updating_resource": "¡Se ha actualizado con éxito un recurso!", - "success_deleting_resource": "¡Se ha eliminado con éxito un recurso!", - "success_moving_resource": "¡Se ha movido con éxito un recurso!", - "success_merging_resource": "¡Se ha unido con éxito un recurso!", - "file_upload_disabled": "La subida de archivos no está habilitada para tu espacio.", + "err_moving_resource": "¡Hubo un error moviendo el recurso!", + "err_merging_resource": "¡Hubo un error al fusionar un recurso!", + "success_fetching_resource": "¡Se ha obtenido un recurso con éxito!", + "success_creating_resource": "¡Se ha creado un recurso con éxito!", + "success_updating_resource": "¡Se ha actualizado un recurso con éxito !", + "success_deleting_resource": "¡Se ha eliminado un recurso con éxito!", + "success_moving_resource": "¡Se ha movido un recurso con éxito!", + "success_merging_resource": "¡Se ha fusionado con éxito un recurso!", + "file_upload_disabled": "La carga de archivos no está habilitada para su espacio.", "step_time_minutes": "Tiempo del paso en minutos", "confirm_delete": "¿Estás seguro de eliminar este {object}?", "import_running": "Importación realizándose, ¡Espere!", @@ -259,7 +259,7 @@ "Coming_Soon": "Próximamente", "Auto_Planner": "Planificador Automático", "New_Cookbook": "Nuevo libro de recetas", - "Hide_Keyword": "Ocultar etiquetas", + "Hide_Keyword": "Esconder Palabras Clave", "Clear": "Limpiar", "err_move_self": "No puedes mover un elemento a sí mismo", "nothing": "Nada que hacer", @@ -298,27 +298,27 @@ "shopping_category_help": "", "food_recipe_help": "", "Foods": "Comida", - "enable_expert": "", - "expert_mode": "", - "simple_mode": "", - "advanced": "", - "fields": "", - "show_keywords": "", + "enable_expert": "Habilitar Modo Experto", + "expert_mode": "Modo Experto", + "simple_mode": "Modo Simple", + "advanced": "Avanzado", + "fields": "Campos", + "show_keywords": "Mostrar palabras clave", "show_foods": "", - "show_books": "", + "show_books": "Mostrar Libros", "show_rating": "", - "show_units": "", - "show_filters": "", + "show_units": "Mostrar Unidades", + "show_filters": "Mostrar Filtros", "not": "", - "save_filter": "", - "filter_name": "", - "left_handed": "", - "left_handed_help": "", + "save_filter": "Guardar Filtros", + "filter_name": "Nombre de Filtro", + "left_handed": "Modo Zurdo", + "left_handed_help": "Optimizará la interfaz de usuario para su uso con la mano izquierda.", "Custom Filter": "", - "shared_with": "", - "sort_by": "", + "shared_with": "Compartido con", + "sort_by": "Ordenar por", "asc": "ascendente", - "desc": "", + "desc": "Descendiente", "date_viewed": "", "last_cooked": "", "times_cooked": "", @@ -336,7 +336,7 @@ "paste_ingredients": "", "ingredient_list": "", "explain": "", - "filter": "", + "filter": "Filtro", "Website": "", "App": "", "Bookmarklet": "", @@ -412,7 +412,7 @@ "New_Supermarket": "Crear nuevo supermercado", "New_Supermarket_Category": "", "Are_You_Sure": "", - "warning_space_delete": "Puedes borrar tu espacio incluyendo todas las recetas, listas de la compra, regímenes de comidas y cualquier otra cosa creada. ¡Esto no puede deshacerse! ¿Estás seguro de que quieres hacerlo?", + "warning_space_delete": "Puedes eliminar tu espacio, incluyendo todas las recetas, listas de la compra, regímenes de comidas y cualquier otra cosa creada. ¡Esto no se puede deshacer! ¿Estás seguro de que quieres hacerlo?", "Private_Recipe": "Receta Privada", "Private_Recipe_Help": "La receta solo podrás verla tu y la gente con la que esta compartida.", "reusable_help_text": "El link de invitación podrá ser usado por mas de un usuario", @@ -422,5 +422,19 @@ "facet_count_info": "Mostrar contadores de receta en los filtros de búsqueda.", "Copy Link": "Copiar Enlace", "Copy Token": "Copiar Token", - "Create_New_Shopping_Category": "Añadir nueva Categoría de Compras" + "Create_New_Shopping_Category": "Añadir nueva Categoría de Compras", + "Use_Fractions": "Use fracciones", + "Theme": "Tema", + "Hours": "Horas", + "Day": "Día", + "Days": "Días", + "Second": "Segundo", + "Seconds": "Segundos", + "Account": "Cuenta", + "API": "API", + "Decimals": "Decimales", + "Default_Unit": "Unidad Predeterminada", + "Language": "Lenguaje", + "Hour": "Hora", + "Username": "Nombre de Usuario" } From 2279bba8387b0c42075762cd32fffc1bafcb7281 Mon Sep 17 00:00:00 2001 From: wella Date: Sat, 1 Oct 2022 17:18:10 +0000 Subject: [PATCH 43/77] Translated using Weblate (Indonesian) Currently translated at 31.5% (145 of 460 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/id/ --- vue/src/locales/id.json | 80 ++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/vue/src/locales/id.json b/vue/src/locales/id.json index e135edcd55..9364956c8c 100644 --- a/vue/src/locales/id.json +++ b/vue/src/locales/id.json @@ -104,46 +104,46 @@ "min": "min", "Servings": "Porsi", "Waiting": "Menunggu", - "Preparation": "", - "External": "", - "Size": "", - "Files": "", - "File": "", - "Edit": "", - "Image": "", - "Delete": "", - "Open": "", - "Ok": "", - "Save": "", - "Step": "", - "Search": "", - "Import": "", - "Print": "", - "Settings": "", - "or": "", - "and": "", - "Information": "", - "Download": "", - "Create": "", - "Search Settings": "", - "View": "", - "Recipes": "", - "Move": "", - "Merge": "", - "Parent": "", - "Copy Link": "", - "Copy Token": "", - "delete_confirmation": "", - "move_confirmation": "", - "merge_confirmation": "", - "create_rule": "", - "move_selection": "", - "merge_selection": "", - "Root": "", - "Ignore_Shopping": "", - "Shopping_Category": "", - "Shopping_Categories": "", - "Edit_Food": "", + "Preparation": "Persiapan", + "External": "Luar", + "Size": "Ukuran", + "Files": "File", + "File": "Berkas", + "Edit": "Sunting", + "Image": "Gambar", + "Delete": "Menghapus", + "Open": "Membuka", + "Ok": "Membuka", + "Save": "Menyimpan", + "Step": "Melangkah", + "Search": "Mencari", + "Import": "Impor", + "Print": "Mencetak", + "Settings": "Pengaturan", + "or": "atau", + "and": "dan", + "Information": "Informasi", + "Download": "Unduh", + "Create": "Membuat", + "Search Settings": "Pengaturan Pencarian", + "View": "Melihat", + "Recipes": "Resep", + "Move": "Bergerak", + "Merge": "Menggabungkan", + "Parent": "Induk", + "Copy Link": "Salin Tautan", + "Copy Token": "Salin Token", + "delete_confirmation": "Yakin ingin menghapus {source}?", + "move_confirmation": "Pindahkan {child} ke induk{parent}", + "merge_confirmation": "Ganti {source} dengan {target}", + "create_rule": "dan buat otomatisasi", + "move_selection": "Pilih {type} induk untuk memindahkan {source}.", + "merge_selection": "Ganti semua kemunculan {source} dengan {type} yang dipilih.", + "Root": "Akar", + "Ignore_Shopping": "Abaikan Belanja", + "Shopping_Category": "Kategori Belanja", + "Shopping_Categories": "Kategori Belanja", + "Edit_Food": "Sunting Makanan", "Move_Food": "", "New_Food": "", "Hide_Food": "", From 00ed9b07b698dee795ab5d3efc43fd0217f2ad8a Mon Sep 17 00:00:00 2001 From: wella Date: Sat, 1 Oct 2022 16:56:32 +0000 Subject: [PATCH 44/77] Translated using Weblate (Indonesian) Currently translated at 8.3% (44 of 524 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/id/ --- cookbook/locale/id/LC_MESSAGES/django.po | 34 +++++++++++++++--------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/cookbook/locale/id/LC_MESSAGES/django.po b/cookbook/locale/id/LC_MESSAGES/django.po index ed9bfb4209..477f0fe1fc 100644 --- a/cookbook/locale/id/LC_MESSAGES/django.po +++ b/cookbook/locale/id/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-07-12 19:20+0200\n" -"PO-Revision-Date: 2022-10-01 16:38+0000\n" +"PO-Revision-Date: 2022-10-02 17:33+0000\n" "Last-Translator: wella \n" "Language-Team: Indonesian \n" @@ -155,74 +155,82 @@ msgstr "Kecualikan bahan-bahan yang ada." #: .\cookbook\forms.py:90 msgid "Will optimize the UI for use with your left hand." -msgstr "" +msgstr "Akan mengoptimalkan UI untuk digunakan dengan tangan kiri Anda." #: .\cookbook\forms.py:107 msgid "" "Both fields are optional. If none are given the username will be displayed " "instead" msgstr "" +"Kedua bidang ini opsional. Jika tidak ada yang diberikan nama pengguna akan " +"ditampilkan sebagai gantinya" #: .\cookbook\forms.py:128 .\cookbook\forms.py:301 msgid "Name" -msgstr "" +msgstr "Nama" #: .\cookbook\forms.py:129 .\cookbook\forms.py:302 #: .\cookbook\templates\stats.html:24 .\cookbook\views\lists.py:88 msgid "Keywords" -msgstr "" +msgstr "Kata Kunci" #: .\cookbook\forms.py:130 msgid "Preparation time in minutes" -msgstr "" +msgstr "Waktu persiapan dalam hitungan menit" #: .\cookbook\forms.py:131 msgid "Waiting time (cooking/baking) in minutes" -msgstr "" +msgstr "Waktu tunggu (memasak/memanggang) dalam hitungan menit" #: .\cookbook\forms.py:132 .\cookbook\forms.py:270 .\cookbook\forms.py:303 msgid "Path" -msgstr "" +msgstr "Jalur" #: .\cookbook\forms.py:133 msgid "Storage UID" -msgstr "" +msgstr "UID penyimpanan" #: .\cookbook\forms.py:165 msgid "Default" -msgstr "" +msgstr "Bawaan" #: .\cookbook\forms.py:177 msgid "" "To prevent duplicates recipes with the same name as existing ones are " "ignored. Check this box to import everything." msgstr "" +"Untuk mencegah duplikat resep dengan nama yang sama dengan yang sudah ada " +"diabaikan. Centang kotak ini untuk mengimpor semuanya." #: .\cookbook\forms.py:200 msgid "Add your comment: " -msgstr "" +msgstr "Tambahkan komentar Anda: " #: .\cookbook\forms.py:215 msgid "Leave empty for dropbox and enter app password for nextcloud." msgstr "" +"Biarkan kosong untuk dropbox dan masukkan kata sandi aplikasi untuk " +"nextcloud." #: .\cookbook\forms.py:222 msgid "Leave empty for nextcloud and enter api token for dropbox." -msgstr "" +msgstr "Biarkan kosong untuk nextcloud dan masukkan token api untuk dropbox." #: .\cookbook\forms.py:231 msgid "" "Leave empty for dropbox and enter only base url for nextcloud (/remote." "php/webdav/ is added automatically)" msgstr "" +"Biarkan kosong untuk dropbox dan masukkan hanya url dasar untuk cloud " +"berikutnya (/remote.php/webdav/ ditambahkan secara otomatis)" #: .\cookbook\forms.py:269 .\cookbook\views\edit.py:157 msgid "Storage" -msgstr "" +msgstr "Penyimpanan" #: .\cookbook\forms.py:271 msgid "Active" -msgstr "" +msgstr "Aktif" #: .\cookbook\forms.py:277 msgid "Search String" From bee5d6b7eb01c6d337487ffbfaa88c7ceb812aa8 Mon Sep 17 00:00:00 2001 From: Mikhail Epifanov Date: Mon, 3 Oct 2022 12:37:09 +0200 Subject: [PATCH 45/77] Allow 1/16th to be a fraction (small salt amounts) --- vue/src/utils/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue/src/utils/utils.js b/vue/src/utils/utils.js index 83e4633030..a8898438e4 100644 --- a/vue/src/utils/utils.js +++ b/vue/src/utils/utils.js @@ -280,7 +280,7 @@ export function getUserPreference(pref = undefined) { export function calculateAmount(amount, factor) { if (getUserPreference("use_fractions")) { let return_string = "" - let fraction = frac(amount * factor, 10, true) + let fraction = frac(amount * factor, 16, true) if (fraction[0] === 0 && fraction[1] === 0 && fraction[2] === 1) { return roundDecimals(amount * factor) From 3bee5ed35a8536fbef77a917caacd2a12c6e26e7 Mon Sep 17 00:00:00 2001 From: Chiara Date: Wed, 5 Oct 2022 12:25:29 +0200 Subject: [PATCH 46/77] Remove yellow button to unify GUI of reset password in mobile/web viewports #2102 --- cookbook/templates/account/login.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cookbook/templates/account/login.html b/cookbook/templates/account/login.html index 3905f68d0d..281708dadc 100644 --- a/cookbook/templates/account/login.html +++ b/cookbook/templates/account/login.html @@ -35,9 +35,7 @@

{% trans "Sign In" %}

{% endif %} {% if EMAIL_ENABLED %} - {% trans "Reset My Password" %} -

{% trans 'Lost your password?' %} {% trans 'Lost your password?' %} {% trans "Reset My Password" %}

{% endif %} From 4de9a7ff8979f6c520606c73dd786d84619fb449 Mon Sep 17 00:00:00 2001 From: swnf <50806201+swnf@users.noreply.github.com> Date: Thu, 6 Oct 2022 17:44:33 +0200 Subject: [PATCH 47/77] Fix share permission check --- cookbook/views/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/views/api.py b/cookbook/views/api.py index 91ef3ee7a2..10fb855901 100644 --- a/cookbook/views/api.py +++ b/cookbook/views/api.py @@ -1382,7 +1382,7 @@ def sync_all(request): def share_link(request, pk): - if request.space.allow_sharing and has_group_permission(request.user, 'user'): + if request.space.allow_sharing and has_group_permission(request.user, ('user',)): recipe = get_object_or_404(Recipe, pk=pk, space=request.space) link = ShareLink.objects.create(recipe=recipe, created_by=request.user, space=request.space) return JsonResponse({'pk': pk, 'share': link.uuid, From 9e44944b1ddd18ef33e44631ecfe713518f5887d Mon Sep 17 00:00:00 2001 From: Raj Motwani <91799854+raj3000k@users.noreply.github.com> Date: Sat, 8 Oct 2022 13:38:52 +0530 Subject: [PATCH 48/77] Update SECURITY.md --- SECURITY.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index e555834865..27d6181a89 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -6,5 +6,4 @@ Since this software is still considered beta/WIP support is always only given fo ## Reporting a Vulnerability -Please open a normal public issue if you have any security related concerns. If you feel like the issue should not be discussed in -public just open a generic issue and we will discuss further communication there (since GitHub does not allow everyone to create a security advisory :/). +Please open a normal public issue if you have any security related concerns. If you feel like the issue should not be discussed in public just open a generic issue and we will discuss further communication there (since GitHub does not allow everyone to create a security advisory :/). From d9662f7fa5088f1fdfb1bb3461cdef369ce799cb Mon Sep 17 00:00:00 2001 From: Raj Motwani <91799854+raj3000k@users.noreply.github.com> Date: Sat, 8 Oct 2022 13:47:02 +0530 Subject: [PATCH 49/77] Update import_export.md Fixed some typos and spellings. --- docs/features/import_export.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/features/import_export.md b/docs/features/import_export.md index a7b4487944..a645888674 100644 --- a/docs/features/import_export.md +++ b/docs/features/import_export.md @@ -1,7 +1,7 @@ This application features a very versatile import and export feature in order to offer the best experience possible and allow you to freely choose where your data goes. -!!! warning "WIP" +!!! WARNING "WIP" The Module is relatively new. There is a known issue with [Timeouts](https://github.com/vabene1111/recipes/issues/417) on large exports. A fix is being developed and will likely be released with the next version. @@ -13,7 +13,7 @@ if your favorite one is missing. !!! info "Export" I strongly believe in everyone's right to use their data as they please and therefore want to give you - the most possible flexibility with your recipes. + the best possible flexibility with your recipes. That said for most of the people getting this application running with their recipes is the biggest priority. Because of this importing as many formats as possible is prioritized over exporting. Exporter for the different formats will follow over time. @@ -75,7 +75,7 @@ Follow these steps to import your recipes You will get a `Recipes.zip` file. Simply upload the file and choose the Nextcloud Cookbook type. -!!! warning "Folder Structure" +!!! WARNING "Folder Structure" Importing only works if the folder structure is correct. If you do not use the standard path or create the zip file in any other way make sure the structure is as follows ``` @@ -94,9 +94,9 @@ Mealie provides structured data similar to nextcloud. To migrate your recipes -1. Go to your Mealie settings and create a new Backup -2. Download the backup by clicking on it and pressing download (this wasn't working for me, so I had to manually pull it from the server) -3. Upload the entire `.zip` file to the importer page and import everything +1. Go to your Mealie settings and create a new Backup. +2. Download the backup by clicking on it and pressing download (this wasn't working for me, so I had to manually pull it from the server). +3. Upload the entire `.zip` file to the importer page and import everything. ## Chowdown Chowdown stores all your recipes in plain text markdown files in a directory called `_recipes`. @@ -158,7 +158,7 @@ As ChefTap cannot import these files anyway there won't be an exporter implement Meal master can be imported by uploading one or more meal master files. The files should either be `.txt`, `.MMF` or `.MM` files. -The MealMaster spec allow for many variations. Currently, only the one column format for ingredients is supported. +The MealMaster spec allows for many variations. Currently, only the one column format for ingredients is supported. Second line notes to ingredients are currently also not imported as a note but simply put into the instructions. If you have MealMaster recipes that cannot be imported feel free to raise an issue. @@ -248,4 +248,4 @@ For that to work it downloads a chromium binary of about 140 MB to your server a Since that is something some server administrators might not want there the PDF exporter is disabled by default and can be enabled with `ENABLE_PDF_EXPORT=1` in `.env`. See [this issue](https://github.com/TandoorRecipes/recipes/pull/1211) for more discussion on this and -[this issue](https://github.com/TandoorRecipes/recipes/issues/781) for the future plans to support server side rendering. \ No newline at end of file +[this issue](https://github.com/TandoorRecipes/recipes/issues/781) for the future plans to support server side rendering. From bfbfb1d2a8bdbf5e412da10b4f5a0e26c471798c Mon Sep 17 00:00:00 2001 From: Oliver Cervera Date: Sun, 9 Oct 2022 17:00:49 +0000 Subject: [PATCH 50/77] Translated using Weblate (Italian) Currently translated at 83.3% (437 of 524 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/ --- cookbook/locale/it/LC_MESSAGES/django.po | 26 +++++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/cookbook/locale/it/LC_MESSAGES/django.po b/cookbook/locale/it/LC_MESSAGES/django.po index ca6a0da1a6..eda0f03aeb 100644 --- a/cookbook/locale/it/LC_MESSAGES/django.po +++ b/cookbook/locale/it/LC_MESSAGES/django.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-07-12 19:20+0200\n" -"PO-Revision-Date: 2022-09-25 12:33+0000\n" +"PO-Revision-Date: 2022-10-10 17:33+0000\n" "Last-Translator: Oliver Cervera \n" "Language-Team: Italian \n" @@ -350,6 +350,9 @@ msgid "" "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.) " "Note: this option will conflict with 'web' and 'raw' methods of search." msgstr "" +"Campi in cui usare la ricerca 'vaga'. (ad esempio cercando per 'riceta' " +"verrà mostrato 'ricetta'). Nota: questa opzione non è compatibile con la " +"ricerca 'web' o 'raw'." #: .\cookbook\forms.py:459 msgid "" @@ -1750,7 +1753,7 @@ msgstr "" #: .\cookbook\templates\openid\login.html:27 #: .\cookbook\templates\socialaccount\authentication_error.html:27 msgid "Back" -msgstr "" +msgstr "Indietro" #: .\cookbook\templates\recipe_view.html:26 msgid "by" @@ -2151,26 +2154,27 @@ msgstr "Iscriviti" #: .\cookbook\templates\socialaccount\login.html:9 #, python-format msgid "Connect %(provider)s" -msgstr "" +msgstr "Collega %(provider)s" #: .\cookbook\templates\socialaccount\login.html:11 #, python-format msgid "You are about to connect a new third party account from %(provider)s." -msgstr "" +msgstr "Stai per collegare un nuovo account di terze parti da %(provider)s." #: .\cookbook\templates\socialaccount\login.html:13 #, python-format msgid "Sign In Via %(provider)s" -msgstr "" +msgstr "Accedi tramite %(provider)s" #: .\cookbook\templates\socialaccount\login.html:15 #, python-format msgid "You are about to sign in using a third party account from %(provider)s." msgstr "" +"Stai per fare l'accesso usando un account di terze parti da %(provider)s." #: .\cookbook\templates\socialaccount\login.html:20 msgid "Continue" -msgstr "" +msgstr "Continua" #: .\cookbook\templates\socialaccount\signup.html:10 #, python-format @@ -2227,7 +2231,7 @@ msgstr "Puoi essere invitato in una istanza già esistente o crearne una nuova." #: .\cookbook\templates\space_overview.html:45 msgid "Owner" -msgstr "" +msgstr "Proprietario" #: .\cookbook\templates\space_overview.html:49 #, fuzzy @@ -2475,20 +2479,22 @@ msgstr "{child.name} è stato spostato con successo al primario {parent.name}" #: .\cookbook\views\api.py:542 msgid "{obj.name} was removed from the shopping list." -msgstr "" +msgstr "{obj.name} è stato rimosso dalla lista della spesa." #: .\cookbook\views\api.py:547 .\cookbook\views\api.py:879 #: .\cookbook\views\api.py:892 msgid "{obj.name} was added to the shopping list." -msgstr "" +msgstr "{obj.name} è stato aggiunto alla lista della spesa." #: .\cookbook\views\api.py:674 msgid "ID of recipe a step is part of. For multiple repeat parameter." msgstr "" +"ID di una ricetta di cui uno step ne fa parte. Usato per parametri di " +"ripetizione multipla." #: .\cookbook\views\api.py:676 msgid "Query string matched (fuzzy) against object name." -msgstr "" +msgstr "Stringa di ricerca abbinata (vaga) al nome dell'oggetto." #: .\cookbook\views\api.py:720 msgid "" From 611787dbb6c0342b5f8d21ea9272022c92f5450d Mon Sep 17 00:00:00 2001 From: Oliver Cervera Date: Sun, 9 Oct 2022 21:26:03 +0000 Subject: [PATCH 51/77] Translated using Weblate (Italian) Currently translated at 75.2% (346 of 460 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/ --- vue/src/locales/it.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vue/src/locales/it.json b/vue/src/locales/it.json index 1563985469..295b5435de 100644 --- a/vue/src/locales/it.json +++ b/vue/src/locales/it.json @@ -304,7 +304,7 @@ "tree_select": "Usa selezione ad albero", "sql_debug": "Debug SQL", "remember_search": "Ricorda ricerca", - "facet_count_info": "Mostra il conteggio delle ricette nei filtri di ricerca", + "facet_count_info": "Mostra il conteggio delle ricette nei filtri di ricerca.", "warning_space_delete": "Stai per eliminare la tua istanza che include tutte le ricette, liste della spesa, piani alimentari e tutto ciò che hai creato. Questa azione non può essere annullata! Sei sicuro di voler procedere?", "food_inherit_info": "Campi di alimenti che devono essere ereditati per impostazione predefinita.", "enable_expert": "Abilita modalità esperto", @@ -345,5 +345,6 @@ "shopping_recent_days_desc": "Giorni di visualizzazione delle voci recenti della lista della spesa.", "csv_delim_help": "Delimitatore usato per le esportazioni CSV.", "csv_prefix_label": "Prefisso lista", - "not": "not" + "not": "not", + "Keyword": "Parola chiave" } From e9dac25ff4252b6a9279f30322501d1496ee4c2d Mon Sep 17 00:00:00 2001 From: wella Date: Tue, 11 Oct 2022 07:44:08 +0000 Subject: [PATCH 52/77] Translated using Weblate (Indonesian) Currently translated at 11.4% (60 of 524 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/id/ --- cookbook/locale/id/LC_MESSAGES/django.po | 34 ++++++++++++++++++------ 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/cookbook/locale/id/LC_MESSAGES/django.po b/cookbook/locale/id/LC_MESSAGES/django.po index 477f0fe1fc..0d2f7e7a24 100644 --- a/cookbook/locale/id/LC_MESSAGES/django.po +++ b/cookbook/locale/id/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-07-12 19:20+0200\n" -"PO-Revision-Date: 2022-10-02 17:33+0000\n" +"PO-Revision-Date: 2022-10-12 08:33+0000\n" "Last-Translator: wella \n" "Language-Team: Indonesian \n" @@ -234,83 +234,101 @@ msgstr "Aktif" #: .\cookbook\forms.py:277 msgid "Search String" -msgstr "" +msgstr "Cari String" #: .\cookbook\forms.py:304 msgid "File ID" -msgstr "" +msgstr "ID Berkas" #: .\cookbook\forms.py:326 msgid "You must provide at least a recipe or a title." -msgstr "" +msgstr "Anda harus memberikan setidaknya resep atau judul." #: .\cookbook\forms.py:339 msgid "You can list default users to share recipes with in the settings." msgstr "" +"Anda dapat membuat daftar pengguna default untuk berbagi resep di pengaturan." #: .\cookbook\forms.py:340 msgid "" "You can use markdown to format this field. See the docs here" msgstr "" +"Anda dapat menggunakan penurunan harga untuk memformat bidang ini. Lihat dokumen di sini" #: .\cookbook\forms.py:366 msgid "Maximum number of users for this space reached." -msgstr "" +msgstr "Jumlah maksimum pengguna untuk ruang ini tercapai." #: .\cookbook\forms.py:372 msgid "Email address already taken!" -msgstr "" +msgstr "Alamat email sudah terpakai!" #: .\cookbook\forms.py:380 msgid "" "An email address is not required but if present the invite link will be sent " "to the user." msgstr "" +"Alamat email tidak diperlukan tetapi jika ada, tautan undangan akan dikirim " +"ke pengguna." #: .\cookbook\forms.py:395 msgid "Name already taken." -msgstr "" +msgstr "Nama sudah terpakai." #: .\cookbook\forms.py:406 msgid "Accept Terms and Privacy" -msgstr "" +msgstr "Terima Persyaratan dan Privasi" #: .\cookbook\forms.py:438 msgid "" "Determines how fuzzy a search is if it uses trigram similarity matching (e." "g. low values mean more typos are ignored)." msgstr "" +"Menentukan seberapa kabur pencarian jika menggunakan pencocokan kesamaan " +"trigram (misalnya nilai rendah berarti lebih banyak kesalahan ketik yang " +"diabaikan)." #: .\cookbook\forms.py:448 msgid "" "Select type method of search. Click here for " "full description of choices." msgstr "" +"Pilih jenis metode pencarian. Klik di sini " +"untuk deskripsi lengkap pilihan." #: .\cookbook\forms.py:449 msgid "" "Use fuzzy matching on units, keywords and ingredients when editing and " "importing recipes." msgstr "" +"Gunakan fuzzy pencocokan pada unit, kata kunci, dan bahan saat mengedit dan " +"mengimpor resep." #: .\cookbook\forms.py:451 msgid "" "Fields to search ignoring accents. Selecting this option can improve or " "degrade search quality depending on language" msgstr "" +"Bidang untuk mencari mengabaikan aksen. Memilih opsi ini dapat meningkatkan " +"atau menurunkan kualitas pencarian tergantung pada bahasa" #: .\cookbook\forms.py:453 msgid "" "Fields to search for partial matches. (e.g. searching for 'Pie' will return " "'pie' and 'piece' and 'soapie')" msgstr "" +"Bidang untuk mencari kecocokan sebagian. (mis. mencari 'Pie' akan " +"mengembalikan 'pie' dan 'piece' dan 'soapie')" #: .\cookbook\forms.py:455 msgid "" "Fields to search for beginning of word matches. (e.g. searching for 'sa' " "will return 'salad' and 'sandwich')" msgstr "" +"Bidang untuk mencari awal kata yang cocok. (misalnya mencari 'sa' akan " +"mengembalikan 'salad' dan 'sandwich')" #: .\cookbook\forms.py:457 msgid "" From 1fa001aad39ab011ab3531496d9be858ba19892a Mon Sep 17 00:00:00 2001 From: Shaxine Date: Thu, 13 Oct 2022 18:59:37 +0000 Subject: [PATCH 53/77] Translated using Weblate (Portuguese) Currently translated at 28.4% (149 of 524 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/pt/ --- cookbook/locale/pt/LC_MESSAGES/django.po | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/cookbook/locale/pt/LC_MESSAGES/django.po b/cookbook/locale/pt/LC_MESSAGES/django.po index 4537dcd0bc..8e6152b289 100644 --- a/cookbook/locale/pt/LC_MESSAGES/django.po +++ b/cookbook/locale/pt/LC_MESSAGES/django.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-07-12 19:20+0200\n" -"PO-Revision-Date: 2021-11-12 20:06+0000\n" -"Last-Translator: Henrique Silva \n" +"PO-Revision-Date: 2022-10-14 17:19+0000\n" +"Last-Translator: Shaxine \n" "Language-Team: Portuguese \n" "Language: pt\n" @@ -21,7 +21,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 4.8\n" +"X-Generator: Weblate 4.10.1\n" #: .\cookbook\filters.py:23 .\cookbook\templates\forms\ingredients.html:34 #: .\cookbook\templates\stats.html:28 @@ -83,7 +83,7 @@ msgstr "Comentários" #: .\cookbook\forms.py:66 msgid "Left-handed mode" -msgstr "" +msgstr "Modo canhoto" #: .\cookbook\forms.py:70 msgid "" @@ -109,18 +109,14 @@ msgstr "" "Mostrar quantidades de energia nutricional em joules em vez de calorias" #: .\cookbook\forms.py:77 -#, fuzzy -#| msgid "" -#| "Users with whom newly created meal plan/shopping list entries should be " -#| "shared by default." msgid "Users with whom newly created meal plans should be shared by default." msgstr "" -"Utilizadores com os quais novos planos de refeições/listas de compras devem " -"ser partilhados por defeito." +"Utilizadores com os quais novos planos de refeições devem ser partilhados " +"por defeito." #: .\cookbook\forms.py:78 msgid "Users with whom to share shopping lists." -msgstr "" +msgstr "Utilizadores com os quais novas listas de compras serão partilhadas." #: .\cookbook\forms.py:80 msgid "Show recently viewed recipes on search page." From 6fc4151de5bde1558a37355c0c201c27831a851a Mon Sep 17 00:00:00 2001 From: Sokratis Potamias Date: Sun, 16 Oct 2022 11:01:56 +0000 Subject: [PATCH 54/77] Added translation using Weblate (Greek) --- cookbook/locale/el/LC_MESSAGES/django.po | 2608 ++++++++++++++++++++++ 1 file changed, 2608 insertions(+) create mode 100644 cookbook/locale/el/LC_MESSAGES/django.po diff --git a/cookbook/locale/el/LC_MESSAGES/django.po b/cookbook/locale/el/LC_MESSAGES/django.po new file mode 100644 index 0000000000..243d2189e6 --- /dev/null +++ b/cookbook/locale/el/LC_MESSAGES/django.po @@ -0,0 +1,2608 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-07-12 19:20+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: el\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#: .\cookbook\filters.py:23 .\cookbook\templates\forms\ingredients.html:34 +#: .\cookbook\templates\stats.html:28 +msgid "Ingredients" +msgstr "" + +#: .\cookbook\forms.py:53 +msgid "Default unit" +msgstr "" + +#: .\cookbook\forms.py:54 +msgid "Use fractions" +msgstr "" + +#: .\cookbook\forms.py:55 +msgid "Use KJ" +msgstr "" + +#: .\cookbook\forms.py:56 +msgid "Theme" +msgstr "" + +#: .\cookbook\forms.py:57 +msgid "Navbar color" +msgstr "" + +#: .\cookbook\forms.py:58 +msgid "Sticky navbar" +msgstr "" + +#: .\cookbook\forms.py:59 +msgid "Default page" +msgstr "" + +#: .\cookbook\forms.py:60 +msgid "Show recent recipes" +msgstr "" + +#: .\cookbook\forms.py:61 +msgid "Search style" +msgstr "" + +#: .\cookbook\forms.py:62 +msgid "Plan sharing" +msgstr "" + +#: .\cookbook\forms.py:63 +msgid "Ingredient decimal places" +msgstr "" + +#: .\cookbook\forms.py:64 +msgid "Shopping list auto sync period" +msgstr "" + +#: .\cookbook\forms.py:65 .\cookbook\templates\recipe_view.html:21 +#: .\cookbook\templates\stats.html:47 +msgid "Comments" +msgstr "" + +#: .\cookbook\forms.py:66 +msgid "Left-handed mode" +msgstr "" + +#: .\cookbook\forms.py:70 +msgid "" +"Color of the top navigation bar. Not all colors work with all themes, just " +"try them out!" +msgstr "" + +#: .\cookbook\forms.py:72 +msgid "Default Unit to be used when inserting a new ingredient into a recipe." +msgstr "" + +#: .\cookbook\forms.py:74 +msgid "" +"Enables support for fractions in ingredient amounts (e.g. convert decimals " +"to fractions automatically)" +msgstr "" + +#: .\cookbook\forms.py:76 +msgid "Display nutritional energy amounts in joules instead of calories" +msgstr "" + +#: .\cookbook\forms.py:77 +msgid "Users with whom newly created meal plans should be shared by default." +msgstr "" + +#: .\cookbook\forms.py:78 +msgid "Users with whom to share shopping lists." +msgstr "" + +#: .\cookbook\forms.py:80 +msgid "Show recently viewed recipes on search page." +msgstr "" + +#: .\cookbook\forms.py:81 +msgid "Number of decimals to round ingredients." +msgstr "" + +#: .\cookbook\forms.py:82 +msgid "If you want to be able to create and see comments underneath recipes." +msgstr "" + +#: .\cookbook\forms.py:84 .\cookbook\forms.py:496 +msgid "" +"Setting to 0 will disable auto sync. When viewing a shopping list the list " +"is updated every set seconds to sync changes someone else might have made. " +"Useful when shopping with multiple people but might use a little bit of " +"mobile data. If lower than instance limit it is reset when saving." +msgstr "" + +#: .\cookbook\forms.py:87 +msgid "Makes the navbar stick to the top of the page." +msgstr "" + +#: .\cookbook\forms.py:88 .\cookbook\forms.py:499 +msgid "Automatically add meal plan ingredients to shopping list." +msgstr "" + +#: .\cookbook\forms.py:89 +msgid "Exclude ingredients that are on hand." +msgstr "" + +#: .\cookbook\forms.py:90 +msgid "Will optimize the UI for use with your left hand." +msgstr "" + +#: .\cookbook\forms.py:107 +msgid "" +"Both fields are optional. If none are given the username will be displayed " +"instead" +msgstr "" + +#: .\cookbook\forms.py:128 .\cookbook\forms.py:301 +msgid "Name" +msgstr "" + +#: .\cookbook\forms.py:129 .\cookbook\forms.py:302 +#: .\cookbook\templates\stats.html:24 .\cookbook\views\lists.py:88 +msgid "Keywords" +msgstr "" + +#: .\cookbook\forms.py:130 +msgid "Preparation time in minutes" +msgstr "" + +#: .\cookbook\forms.py:131 +msgid "Waiting time (cooking/baking) in minutes" +msgstr "" + +#: .\cookbook\forms.py:132 .\cookbook\forms.py:270 .\cookbook\forms.py:303 +msgid "Path" +msgstr "" + +#: .\cookbook\forms.py:133 +msgid "Storage UID" +msgstr "" + +#: .\cookbook\forms.py:165 +msgid "Default" +msgstr "" + +#: .\cookbook\forms.py:177 +msgid "" +"To prevent duplicates recipes with the same name as existing ones are " +"ignored. Check this box to import everything." +msgstr "" + +#: .\cookbook\forms.py:200 +msgid "Add your comment: " +msgstr "" + +#: .\cookbook\forms.py:215 +msgid "Leave empty for dropbox and enter app password for nextcloud." +msgstr "" + +#: .\cookbook\forms.py:222 +msgid "Leave empty for nextcloud and enter api token for dropbox." +msgstr "" + +#: .\cookbook\forms.py:231 +msgid "" +"Leave empty for dropbox and enter only base url for nextcloud (/remote." +"php/webdav/ is added automatically)" +msgstr "" + +#: .\cookbook\forms.py:269 .\cookbook\views\edit.py:157 +msgid "Storage" +msgstr "" + +#: .\cookbook\forms.py:271 +msgid "Active" +msgstr "" + +#: .\cookbook\forms.py:277 +msgid "Search String" +msgstr "" + +#: .\cookbook\forms.py:304 +msgid "File ID" +msgstr "" + +#: .\cookbook\forms.py:326 +msgid "You must provide at least a recipe or a title." +msgstr "" + +#: .\cookbook\forms.py:339 +msgid "You can list default users to share recipes with in the settings." +msgstr "" + +#: .\cookbook\forms.py:340 +msgid "" +"You can use markdown to format this field. See the docs here" +msgstr "" + +#: .\cookbook\forms.py:366 +msgid "Maximum number of users for this space reached." +msgstr "" + +#: .\cookbook\forms.py:372 +msgid "Email address already taken!" +msgstr "" + +#: .\cookbook\forms.py:380 +msgid "" +"An email address is not required but if present the invite link will be sent " +"to the user." +msgstr "" + +#: .\cookbook\forms.py:395 +msgid "Name already taken." +msgstr "" + +#: .\cookbook\forms.py:406 +msgid "Accept Terms and Privacy" +msgstr "" + +#: .\cookbook\forms.py:438 +msgid "" +"Determines how fuzzy a search is if it uses trigram similarity matching (e." +"g. low values mean more typos are ignored)." +msgstr "" + +#: .\cookbook\forms.py:448 +msgid "" +"Select type method of search. Click here for " +"full description of choices." +msgstr "" + +#: .\cookbook\forms.py:449 +msgid "" +"Use fuzzy matching on units, keywords and ingredients when editing and " +"importing recipes." +msgstr "" + +#: .\cookbook\forms.py:451 +msgid "" +"Fields to search ignoring accents. Selecting this option can improve or " +"degrade search quality depending on language" +msgstr "" + +#: .\cookbook\forms.py:453 +msgid "" +"Fields to search for partial matches. (e.g. searching for 'Pie' will return " +"'pie' and 'piece' and 'soapie')" +msgstr "" + +#: .\cookbook\forms.py:455 +msgid "" +"Fields to search for beginning of word matches. (e.g. searching for 'sa' " +"will return 'salad' and 'sandwich')" +msgstr "" + +#: .\cookbook\forms.py:457 +msgid "" +"Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.) " +"Note: this option will conflict with 'web' and 'raw' methods of search." +msgstr "" + +#: .\cookbook\forms.py:459 +msgid "" +"Fields to full text search. Note: 'web', 'phrase', and 'raw' search methods " +"only function with fulltext fields." +msgstr "" + +#: .\cookbook\forms.py:463 +msgid "Search Method" +msgstr "" + +#: .\cookbook\forms.py:464 +msgid "Fuzzy Lookups" +msgstr "" + +#: .\cookbook\forms.py:465 +msgid "Ignore Accent" +msgstr "" + +#: .\cookbook\forms.py:466 +msgid "Partial Match" +msgstr "" + +#: .\cookbook\forms.py:467 +msgid "Starts With" +msgstr "" + +#: .\cookbook\forms.py:468 +msgid "Fuzzy Search" +msgstr "" + +#: .\cookbook\forms.py:469 +msgid "Full Text" +msgstr "" + +#: .\cookbook\forms.py:494 +msgid "" +"Users will see all items you add to your shopping list. They must add you " +"to see items on their list." +msgstr "" + +#: .\cookbook\forms.py:500 +msgid "" +"When adding a meal plan to the shopping list (manually or automatically), " +"include all related recipes." +msgstr "" + +#: .\cookbook\forms.py:501 +msgid "" +"When adding a meal plan to the shopping list (manually or automatically), " +"exclude ingredients that are on hand." +msgstr "" + +#: .\cookbook\forms.py:502 +msgid "Default number of hours to delay a shopping list entry." +msgstr "" + +#: .\cookbook\forms.py:503 +msgid "Filter shopping list to only include supermarket categories." +msgstr "" + +#: .\cookbook\forms.py:504 +msgid "Days of recent shopping list entries to display." +msgstr "" + +#: .\cookbook\forms.py:505 +msgid "Mark food 'On Hand' when checked off shopping list." +msgstr "" + +#: .\cookbook\forms.py:506 +msgid "Delimiter to use for CSV exports." +msgstr "" + +#: .\cookbook\forms.py:507 +msgid "Prefix to add when copying list to the clipboard." +msgstr "" + +#: .\cookbook\forms.py:511 +msgid "Share Shopping List" +msgstr "" + +#: .\cookbook\forms.py:512 +msgid "Autosync" +msgstr "" + +#: .\cookbook\forms.py:513 +msgid "Auto Add Meal Plan" +msgstr "" + +#: .\cookbook\forms.py:514 +msgid "Exclude On Hand" +msgstr "" + +#: .\cookbook\forms.py:515 +msgid "Include Related" +msgstr "" + +#: .\cookbook\forms.py:516 +msgid "Default Delay Hours" +msgstr "" + +#: .\cookbook\forms.py:517 +msgid "Filter to Supermarket" +msgstr "" + +#: .\cookbook\forms.py:518 +msgid "Recent Days" +msgstr "" + +#: .\cookbook\forms.py:519 +msgid "CSV Delimiter" +msgstr "" + +#: .\cookbook\forms.py:520 +msgid "List Prefix" +msgstr "" + +#: .\cookbook\forms.py:521 +msgid "Auto On Hand" +msgstr "" + +#: .\cookbook\forms.py:531 +msgid "Reset Food Inheritance" +msgstr "" + +#: .\cookbook\forms.py:532 +msgid "Reset all food to inherit the fields configured." +msgstr "" + +#: .\cookbook\forms.py:544 +msgid "Fields on food that should be inherited by default." +msgstr "" + +#: .\cookbook\forms.py:545 +msgid "Show recipe counts on search filters" +msgstr "" + +#: .\cookbook\helper\AllAuthCustomAdapter.py:36 +msgid "" +"In order to prevent spam, the requested email was not send. Please wait a " +"few minutes and try again." +msgstr "" + +#: .\cookbook\helper\permission_helper.py:149 +#: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\views.py:152 +msgid "You are not logged in and therefore cannot view this page!" +msgstr "" + +#: .\cookbook\helper\permission_helper.py:153 +#: .\cookbook\helper\permission_helper.py:159 +#: .\cookbook\helper\permission_helper.py:184 +#: .\cookbook\helper\permission_helper.py:254 +#: .\cookbook\helper\permission_helper.py:268 +#: .\cookbook\helper\permission_helper.py:279 +#: .\cookbook\helper\permission_helper.py:290 .\cookbook\views\data.py:33 +#: .\cookbook\views\views.py:163 .\cookbook\views\views.py:170 +#: .\cookbook\views\views.py:249 +msgid "You do not have the required permissions to view this page!" +msgstr "" + +#: .\cookbook\helper\permission_helper.py:177 +#: .\cookbook\helper\permission_helper.py:200 +#: .\cookbook\helper\permission_helper.py:222 +#: .\cookbook\helper\permission_helper.py:237 +msgid "You cannot interact with this object as it is not owned by you!" +msgstr "" + +#: .\cookbook\helper\permission_helper.py:321 +msgid "You have reached the maximum number of recipes for your space." +msgstr "" + +#: .\cookbook\helper\permission_helper.py:333 +msgid "You have more users than allowed in your space." +msgstr "" + +#: .\cookbook\helper\recipe_search.py:565 +msgid "One of queryset or hash_key must be provided" +msgstr "" + +#: .\cookbook\helper\shopping_helper.py:152 +msgid "You must supply a servings size" +msgstr "" + +#: .\cookbook\helper\template_helper.py:64 +#: .\cookbook\helper\template_helper.py:66 +msgid "Could not parse template code." +msgstr "" + +#: .\cookbook\integration\copymethat.py:41 +#: .\cookbook\integration\melarecipes.py:37 +msgid "Favorite" +msgstr "" + +#: .\cookbook\integration\copymethat.py:70 +#: .\cookbook\integration\recettetek.py:54 +#: .\cookbook\integration\recipekeeper.py:63 +msgid "Imported from" +msgstr "" + +#: .\cookbook\integration\integration.py:223 +msgid "" +"Importer expected a .zip file. Did you choose the correct importer type for " +"your data ?" +msgstr "" + +#: .\cookbook\integration\integration.py:226 +msgid "" +"An unexpected error occurred during the import. Please make sure you have " +"uploaded a valid file." +msgstr "" + +#: .\cookbook\integration\integration.py:231 +msgid "The following recipes were ignored because they already existed:" +msgstr "" + +#: .\cookbook\integration\integration.py:235 +#, python-format +msgid "Imported %s recipes." +msgstr "" + +#: .\cookbook\integration\paprika.py:46 +msgid "Notes" +msgstr "" + +#: .\cookbook\integration\paprika.py:49 +msgid "Nutritional Information" +msgstr "" + +#: .\cookbook\integration\paprika.py:53 +msgid "Source" +msgstr "" + +#: .\cookbook\integration\saffron.py:23 +msgid "Servings" +msgstr "" + +#: .\cookbook\integration\saffron.py:25 +msgid "Waiting time" +msgstr "" + +#: .\cookbook\integration\saffron.py:27 +msgid "Preparation Time" +msgstr "" + +#: .\cookbook\integration\saffron.py:29 +#: .\cookbook\templates\forms\ingredients.html:7 +#: .\cookbook\templates\index.html:7 +msgid "Cookbook" +msgstr "" + +#: .\cookbook\integration\saffron.py:31 +msgid "Section" +msgstr "" + +#: .\cookbook\management\commands\rebuildindex.py:14 +msgid "Rebuilds full text search index on Recipe" +msgstr "" + +#: .\cookbook\management\commands\rebuildindex.py:18 +msgid "Only Postgresql databases use full text search, no index to rebuild" +msgstr "" + +#: .\cookbook\management\commands\rebuildindex.py:29 +msgid "Recipe index rebuild complete." +msgstr "" + +#: .\cookbook\management\commands\rebuildindex.py:31 +msgid "Recipe index rebuild failed." +msgstr "" + +#: .\cookbook\migrations\0047_auto_20200602_1133.py:14 +msgid "Breakfast" +msgstr "" + +#: .\cookbook\migrations\0047_auto_20200602_1133.py:19 +msgid "Lunch" +msgstr "" + +#: .\cookbook\migrations\0047_auto_20200602_1133.py:24 +msgid "Dinner" +msgstr "" + +#: .\cookbook\migrations\0047_auto_20200602_1133.py:29 +msgid "Other" +msgstr "" + +#: .\cookbook\models.py:251 +msgid "" +"Maximum file storage for space in MB. 0 for unlimited, -1 to disable file " +"upload." +msgstr "" + +#: .\cookbook\models.py:353 .\cookbook\templates\search.html:7 +#: .\cookbook\templates\space_manage.html:7 +msgid "Search" +msgstr "" + +#: .\cookbook\models.py:354 .\cookbook\templates\base.html:107 +#: .\cookbook\templates\meal_plan.html:7 .\cookbook\views\delete.py:178 +#: .\cookbook\views\edit.py:211 .\cookbook\views\new.py:179 +msgid "Meal-Plan" +msgstr "" + +#: .\cookbook\models.py:355 .\cookbook\templates\base.html:115 +msgid "Books" +msgstr "" + +#: .\cookbook\models.py:363 +msgid "Small" +msgstr "" + +#: .\cookbook\models.py:363 +msgid "Large" +msgstr "" + +#: .\cookbook\models.py:363 .\cookbook\templates\generic\new_template.html:6 +#: .\cookbook\templates\generic\new_template.html:14 +msgid "New" +msgstr "" + +#: .\cookbook\models.py:584 +msgid " is part of a recipe step and cannot be deleted" +msgstr "" + +#: .\cookbook\models.py:1162 .\cookbook\templates\search_info.html:28 +msgid "Simple" +msgstr "" + +#: .\cookbook\models.py:1163 .\cookbook\templates\search_info.html:33 +msgid "Phrase" +msgstr "" + +#: .\cookbook\models.py:1164 .\cookbook\templates\search_info.html:38 +msgid "Web" +msgstr "" + +#: .\cookbook\models.py:1165 .\cookbook\templates\search_info.html:47 +msgid "Raw" +msgstr "" + +#: .\cookbook\models.py:1203 +msgid "Food Alias" +msgstr "" + +#: .\cookbook\models.py:1203 +msgid "Unit Alias" +msgstr "" + +#: .\cookbook\models.py:1203 +msgid "Keyword Alias" +msgstr "" + +#: .\cookbook\models.py:1227 +#: .\cookbook\templates\include\recipe_open_modal.html:7 +#: .\cookbook\views\delete.py:36 .\cookbook\views\edit.py:251 +#: .\cookbook\views\new.py:48 +msgid "Recipe" +msgstr "" + +#: .\cookbook\models.py:1228 +msgid "Food" +msgstr "" + +#: .\cookbook\models.py:1229 .\cookbook\templates\base.html:138 +msgid "Keyword" +msgstr "" + +#: .\cookbook\serializer.py:207 +msgid "Cannot modify Space owner permission." +msgstr "" + +#: .\cookbook\serializer.py:290 +msgid "File uploads are not enabled for this Space." +msgstr "" + +#: .\cookbook\serializer.py:301 +msgid "You have reached your file upload limit." +msgstr "" + +#: .\cookbook\serializer.py:1081 +msgid "Hello" +msgstr "" + +#: .\cookbook\serializer.py:1081 +msgid "You have been invited by " +msgstr "" + +#: .\cookbook\serializer.py:1082 +msgid " to join their Tandoor Recipes space " +msgstr "" + +#: .\cookbook\serializer.py:1083 +msgid "Click the following link to activate your account: " +msgstr "" + +#: .\cookbook\serializer.py:1084 +msgid "" +"If the link does not work use the following code to manually join the space: " +msgstr "" + +#: .\cookbook\serializer.py:1085 +msgid "The invitation is valid until " +msgstr "" + +#: .\cookbook\serializer.py:1086 +msgid "" +"Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub " +msgstr "" + +#: .\cookbook\serializer.py:1089 +msgid "Tandoor Recipes Invite" +msgstr "" + +#: .\cookbook\serializer.py:1209 +msgid "Existing shopping list to update" +msgstr "" + +#: .\cookbook\serializer.py:1211 +msgid "" +"List of ingredient IDs from the recipe to add, if not provided all " +"ingredients will be added." +msgstr "" + +#: .\cookbook\serializer.py:1213 +msgid "" +"Providing a list_recipe ID and servings of 0 will delete that shopping list." +msgstr "" + +#: .\cookbook\serializer.py:1222 +msgid "Amount of food to add to the shopping list" +msgstr "" + +#: .\cookbook\serializer.py:1224 +msgid "ID of unit to use for the shopping list" +msgstr "" + +#: .\cookbook\serializer.py:1226 +msgid "When set to true will delete all food from active shopping lists." +msgstr "" + +#: .\cookbook\tables.py:36 .\cookbook\templates\generic\edit_template.html:6 +#: .\cookbook\templates\generic\edit_template.html:14 +#: .\cookbook\templates\recipes_table.html:82 +msgid "Edit" +msgstr "" + +#: .\cookbook\tables.py:116 .\cookbook\tables.py:131 +#: .\cookbook\templates\generic\delete_template.html:7 +#: .\cookbook\templates\generic\delete_template.html:15 +#: .\cookbook\templates\generic\edit_template.html:28 +#: .\cookbook\templates\recipes_table.html:90 +msgid "Delete" +msgstr "" + +#: .\cookbook\templates\404.html:5 +msgid "404 Error" +msgstr "" + +#: .\cookbook\templates\404.html:18 +msgid "The page you are looking for could not be found." +msgstr "" + +#: .\cookbook\templates\404.html:33 +msgid "Take me Home" +msgstr "" + +#: .\cookbook\templates\404.html:35 +msgid "Report a Bug" +msgstr "" + +#: .\cookbook\templates\account\email.html:6 +#: .\cookbook\templates\account\email.html:17 +msgid "E-mail Addresses" +msgstr "" + +#: .\cookbook\templates\account\email.html:12 +#: .\cookbook\templates\account\password_change.html:11 +#: .\cookbook\templates\account\password_set.html:11 +#: .\cookbook\templates\base.html:293 .\cookbook\templates\settings.html:6 +#: .\cookbook\templates\settings.html:17 +#: .\cookbook\templates\socialaccount\connections.html:10 +msgid "Settings" +msgstr "" + +#: .\cookbook\templates\account\email.html:13 +msgid "Email" +msgstr "" + +#: .\cookbook\templates\account\email.html:19 +msgid "The following e-mail addresses are associated with your account:" +msgstr "" + +#: .\cookbook\templates\account\email.html:36 +msgid "Verified" +msgstr "" + +#: .\cookbook\templates\account\email.html:38 +msgid "Unverified" +msgstr "" + +#: .\cookbook\templates\account\email.html:40 +msgid "Primary" +msgstr "" + +#: .\cookbook\templates\account\email.html:47 +msgid "Make Primary" +msgstr "" + +#: .\cookbook\templates\account\email.html:49 +msgid "Re-send Verification" +msgstr "" + +#: .\cookbook\templates\account\email.html:50 +#: .\cookbook\templates\generic\delete_template.html:57 +#: .\cookbook\templates\socialaccount\connections.html:44 +msgid "Remove" +msgstr "" + +#: .\cookbook\templates\account\email.html:58 +msgid "Warning:" +msgstr "" + +#: .\cookbook\templates\account\email.html:58 +msgid "" +"You currently do not have any e-mail address set up. You should really add " +"an e-mail address so you can receive notifications, reset your password, etc." +msgstr "" + +#: .\cookbook\templates\account\email.html:64 +msgid "Add E-mail Address" +msgstr "" + +#: .\cookbook\templates\account\email.html:69 +msgid "Add E-mail" +msgstr "" + +#: .\cookbook\templates\account\email.html:79 +msgid "Do you really want to remove the selected e-mail address?" +msgstr "" + +#: .\cookbook\templates\account\email_confirm.html:6 +#: .\cookbook\templates\account\email_confirm.html:10 +msgid "Confirm E-mail Address" +msgstr "" + +#: .\cookbook\templates\account\email_confirm.html:16 +#, python-format +msgid "" +"Please confirm that\n" +" %(email)s is an e-mail address " +"for user %(user_display)s\n" +" ." +msgstr "" + +#: .\cookbook\templates\account\email_confirm.html:22 +#: .\cookbook\templates\generic\delete_template.html:72 +msgid "Confirm" +msgstr "" + +#: .\cookbook\templates\account\email_confirm.html:29 +#, python-format +msgid "" +"This e-mail confirmation link expired or is invalid. Please\n" +" issue a new e-mail confirmation " +"request." +msgstr "" + +#: .\cookbook\templates\account\login.html:8 +#: .\cookbook\templates\base.html:340 .\cookbook\templates\openid\login.html:8 +msgid "Login" +msgstr "" + +#: .\cookbook\templates\account\login.html:15 +#: .\cookbook\templates\account\login.html:31 +#: .\cookbook\templates\account\signup.html:69 +#: .\cookbook\templates\account\signup_closed.html:15 +#: .\cookbook\templates\openid\login.html:15 +#: .\cookbook\templates\openid\login.html:26 +#: .\cookbook\templates\socialaccount\authentication_error.html:15 +msgid "Sign In" +msgstr "" + +#: .\cookbook\templates\account\login.html:34 +#: .\cookbook\templates\socialaccount\signup.html:8 +#: .\cookbook\templates\socialaccount\signup.html:57 +msgid "Sign Up" +msgstr "" + +#: .\cookbook\templates\account\login.html:39 +#: .\cookbook\templates\account\login.html:41 +#: .\cookbook\templates\account\password_reset.html:29 +msgid "Reset My Password" +msgstr "" + +#: .\cookbook\templates\account\login.html:40 +msgid "Lost your password?" +msgstr "" + +#: .\cookbook\templates\account\login.html:52 +msgid "Social Login" +msgstr "" + +#: .\cookbook\templates\account\login.html:53 +msgid "You can use any of the following providers to sign in." +msgstr "" + +#: .\cookbook\templates\account\logout.html:5 +#: .\cookbook\templates\account\logout.html:9 +#: .\cookbook\templates\account\logout.html:18 +msgid "Sign Out" +msgstr "" + +#: .\cookbook\templates\account\logout.html:11 +msgid "Are you sure you want to sign out?" +msgstr "" + +#: .\cookbook\templates\account\password_change.html:6 +#: .\cookbook\templates\account\password_change.html:16 +#: .\cookbook\templates\account\password_change.html:21 +#: .\cookbook\templates\account\password_reset_from_key.html:7 +#: .\cookbook\templates\account\password_reset_from_key.html:13 +#: .\cookbook\templates\account\password_reset_from_key_done.html:7 +#: .\cookbook\templates\account\password_reset_from_key_done.html:13 +msgid "Change Password" +msgstr "" + +#: .\cookbook\templates\account\password_change.html:12 +#: .\cookbook\templates\account\password_set.html:12 +#: .\cookbook\templates\settings.html:76 +msgid "Password" +msgstr "" + +#: .\cookbook\templates\account\password_change.html:22 +msgid "Forgot Password?" +msgstr "" + +#: .\cookbook\templates\account\password_reset.html:7 +#: .\cookbook\templates\account\password_reset.html:13 +#: .\cookbook\templates\account\password_reset_done.html:7 +#: .\cookbook\templates\account\password_reset_done.html:10 +msgid "Password Reset" +msgstr "" + +#: .\cookbook\templates\account\password_reset.html:24 +msgid "" +"Forgotten your password? Enter your e-mail address below, and we'll send you " +"an e-mail allowing you to reset it." +msgstr "" + +#: .\cookbook\templates\account\password_reset.html:32 +msgid "Password reset is disabled on this instance." +msgstr "" + +#: .\cookbook\templates\account\password_reset_done.html:16 +msgid "" +"We have sent you an e-mail. Please contact us if you do not receive it " +"within a few minutes." +msgstr "" + +#: .\cookbook\templates\account\password_reset_from_key.html:13 +msgid "Bad Token" +msgstr "" + +#: .\cookbook\templates\account\password_reset_from_key.html:25 +#, python-format +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used.\n" +" Please request a new " +"password reset." +msgstr "" + +#: .\cookbook\templates\account\password_reset_from_key.html:33 +msgid "change password" +msgstr "" + +#: .\cookbook\templates\account\password_reset_from_key.html:36 +#: .\cookbook\templates\account\password_reset_from_key_done.html:19 +msgid "Your password is now changed." +msgstr "" + +#: .\cookbook\templates\account\password_set.html:6 +#: .\cookbook\templates\account\password_set.html:16 +#: .\cookbook\templates\account\password_set.html:21 +msgid "Set Password" +msgstr "" + +#: .\cookbook\templates\account\signup.html:6 +msgid "Register" +msgstr "" + +#: .\cookbook\templates\account\signup.html:12 +msgid "Create an Account" +msgstr "" + +#: .\cookbook\templates\account\signup.html:42 +#: .\cookbook\templates\socialaccount\signup.html:33 +msgid "I accept the follwoing" +msgstr "" + +#: .\cookbook\templates\account\signup.html:45 +#: .\cookbook\templates\socialaccount\signup.html:36 +msgid "Terms and Conditions" +msgstr "" + +#: .\cookbook\templates\account\signup.html:48 +#: .\cookbook\templates\socialaccount\signup.html:39 +msgid "and" +msgstr "" + +#: .\cookbook\templates\account\signup.html:52 +#: .\cookbook\templates\socialaccount\signup.html:43 +msgid "Privacy Policy" +msgstr "" + +#: .\cookbook\templates\account\signup.html:65 +msgid "Create User" +msgstr "" + +#: .\cookbook\templates\account\signup.html:69 +msgid "Already have an account?" +msgstr "" + +#: .\cookbook\templates\account\signup_closed.html:5 +#: .\cookbook\templates\account\signup_closed.html:11 +msgid "Sign Up Closed" +msgstr "" + +#: .\cookbook\templates\account\signup_closed.html:13 +msgid "We are sorry, but the sign up is currently closed." +msgstr "" + +#: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:330 +#: .\cookbook\templates\rest_framework\api.html:11 +msgid "API Documentation" +msgstr "" + +#: .\cookbook\templates\base.html:103 .\cookbook\templates\index.html:87 +#: .\cookbook\templates\stats.html:22 +msgid "Recipes" +msgstr "" + +#: .\cookbook\templates\base.html:111 +msgid "Shopping" +msgstr "" + +#: .\cookbook\templates\base.html:150 .\cookbook\views\lists.py:105 +msgid "Foods" +msgstr "" + +#: .\cookbook\templates\base.html:162 +#: .\cookbook\templates\forms\ingredients.html:24 +#: .\cookbook\templates\stats.html:26 .\cookbook\views\lists.py:122 +msgid "Units" +msgstr "" + +#: .\cookbook\templates\base.html:176 .\cookbook\templates\supermarket.html:7 +msgid "Supermarket" +msgstr "" + +#: .\cookbook\templates\base.html:188 +msgid "Supermarket Category" +msgstr "" + +#: .\cookbook\templates\base.html:200 .\cookbook\views\lists.py:171 +msgid "Automations" +msgstr "" + +#: .\cookbook\templates\base.html:214 .\cookbook\views\lists.py:207 +msgid "Files" +msgstr "" + +#: .\cookbook\templates\base.html:226 +msgid "Batch Edit" +msgstr "" + +#: .\cookbook\templates\base.html:238 .\cookbook\templates\history.html:6 +#: .\cookbook\templates\history.html:14 +msgid "History" +msgstr "" + +#: .\cookbook\templates\base.html:252 +#: .\cookbook\templates\ingredient_editor.html:7 +#: .\cookbook\templates\ingredient_editor.html:13 +msgid "Ingredient Editor" +msgstr "" + +#: .\cookbook\templates\base.html:264 +#: .\cookbook\templates\export_response.html:7 +#: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20 +msgid "Export" +msgstr "" + +#: .\cookbook\templates\base.html:280 .\cookbook\templates\index.html:47 +msgid "Import Recipe" +msgstr "" + +#: .\cookbook\templates\base.html:282 +msgid "Create" +msgstr "" + +#: .\cookbook\templates\base.html:295 +#: .\cookbook\templates\generic\list_template.html:14 +#: .\cookbook\templates\stats.html:43 +msgid "External Recipes" +msgstr "" + +#: .\cookbook\templates\base.html:298 +#: .\cookbook\templates\space_manage.html:15 +msgid "Space Settings" +msgstr "" + +#: .\cookbook\templates\base.html:303 .\cookbook\templates\system.html:13 +msgid "System" +msgstr "" + +#: .\cookbook\templates\base.html:305 +msgid "Admin" +msgstr "" + +#: .\cookbook\templates\base.html:309 +#: .\cookbook\templates\space_overview.html:25 +msgid "Your Spaces" +msgstr "" + +#: .\cookbook\templates\base.html:320 +#: .\cookbook\templates\space_overview.html:6 +msgid "Overview" +msgstr "" + +#: .\cookbook\templates\base.html:324 +msgid "Markdown Guide" +msgstr "" + +#: .\cookbook\templates\base.html:326 +msgid "GitHub" +msgstr "" + +#: .\cookbook\templates\base.html:328 +msgid "Translate Tandoor" +msgstr "" + +#: .\cookbook\templates\base.html:332 +msgid "API Browser" +msgstr "" + +#: .\cookbook\templates\base.html:335 +msgid "Log out" +msgstr "" + +#: .\cookbook\templates\base.html:357 +msgid "You are using the free version of Tandor" +msgstr "" + +#: .\cookbook\templates\base.html:358 +msgid "Upgrade Now" +msgstr "" + +#: .\cookbook\templates\batch\edit.html:6 +msgid "Batch edit Category" +msgstr "" + +#: .\cookbook\templates\batch\edit.html:15 +msgid "Batch edit Recipes" +msgstr "" + +#: .\cookbook\templates\batch\edit.html:20 +msgid "Add the specified keywords to all recipes containing a word" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:73 +msgid "Sync" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:10 +msgid "Manage watched Folders" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:14 +msgid "" +"On this Page you can manage all storage folder locations that should be " +"monitored and synced." +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:16 +msgid "The path must be in the following format" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:20 +#: .\cookbook\templates\forms\edit_import_recipe.html:14 +#: .\cookbook\templates\generic\edit_template.html:23 +#: .\cookbook\templates\generic\new_template.html:23 +#: .\cookbook\templates\settings.html:70 +#: .\cookbook\templates\settings.html:112 +#: .\cookbook\templates\settings.html:130 +#: .\cookbook\templates\settings.html:202 +#: .\cookbook\templates\settings.html:213 +msgid "Save" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:21 +msgid "Manage External Storage" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:28 +msgid "Sync Now!" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:29 +msgid "Show Recipes" +msgstr "" + +#: .\cookbook\templates\batch\monitor.html:30 +msgid "Show Log" +msgstr "" + +#: .\cookbook\templates\batch\waiting.html:4 +#: .\cookbook\templates\batch\waiting.html:10 +msgid "Importing Recipes" +msgstr "" + +#: .\cookbook\templates\batch\waiting.html:28 +msgid "" +"This can take a few minutes, depending on the number of recipes in sync, " +"please wait." +msgstr "" + +#: .\cookbook\templates\books.html:7 +msgid "Recipe Books" +msgstr "" + +#: .\cookbook\templates\export.html:8 .\cookbook\templates\test2.html:6 +msgid "Export Recipes" +msgstr "" + +#: .\cookbook\templates\forms\edit_import_recipe.html:5 +#: .\cookbook\templates\forms\edit_import_recipe.html:9 +msgid "Import new Recipe" +msgstr "" + +#: .\cookbook\templates\forms\edit_internal_recipe.html:7 +msgid "Edit Recipe" +msgstr "" + +#: .\cookbook\templates\forms\ingredients.html:15 +msgid "Edit Ingredients" +msgstr "" + +#: .\cookbook\templates\forms\ingredients.html:16 +msgid "" +"\n" +" The following form can be used if, accidentally, two (or more) units " +"or ingredients where created that should be\n" +" the same.\n" +" It merges two units or ingredients and updates all recipes using " +"them.\n" +" " +msgstr "" + +#: .\cookbook\templates\forms\ingredients.html:26 +msgid "Are you sure that you want to merge these two units?" +msgstr "" + +#: .\cookbook\templates\forms\ingredients.html:31 +#: .\cookbook\templates\forms\ingredients.html:40 +msgid "Merge" +msgstr "" + +#: .\cookbook\templates\forms\ingredients.html:36 +msgid "Are you sure that you want to merge these two ingredients?" +msgstr "" + +#: .\cookbook\templates\generic\delete_template.html:21 +#, python-format +msgid "Are you sure you want to delete the %(title)s: %(object)s " +msgstr "" + +#: .\cookbook\templates\generic\delete_template.html:22 +msgid "This cannot be undone!" +msgstr "" + +#: .\cookbook\templates\generic\delete_template.html:27 +msgid "Protected" +msgstr "" + +#: .\cookbook\templates\generic\delete_template.html:42 +msgid "Cascade" +msgstr "" + +#: .\cookbook\templates\generic\delete_template.html:73 +msgid "Cancel" +msgstr "" + +#: .\cookbook\templates\generic\edit_template.html:32 +msgid "View" +msgstr "" + +#: .\cookbook\templates\generic\edit_template.html:36 +msgid "Delete original file" +msgstr "" + +#: .\cookbook\templates\generic\list_template.html:6 +#: .\cookbook\templates\generic\list_template.html:22 +msgid "List" +msgstr "" + +#: .\cookbook\templates\generic\list_template.html:36 +msgid "Filter" +msgstr "" + +#: .\cookbook\templates\generic\list_template.html:41 +msgid "Import all" +msgstr "" + +#: .\cookbook\templates\generic\table_template.html:76 +#: .\cookbook\templates\recipes_table.html:121 +msgid "previous" +msgstr "" + +#: .\cookbook\templates\generic\table_template.html:98 +#: .\cookbook\templates\recipes_table.html:143 +msgid "next" +msgstr "" + +#: .\cookbook\templates\history.html:20 +msgid "View Log" +msgstr "" + +#: .\cookbook\templates\history.html:24 +msgid "Cook Log" +msgstr "" + +#: .\cookbook\templates\import.html:6 +msgid "Import Recipes" +msgstr "" + +#: .\cookbook\templates\import.html:14 .\cookbook\templates\import.html:20 +#: .\cookbook\templates\import_response.html:7 .\cookbook\views\delete.py:86 +#: .\cookbook\views\edit.py:191 +msgid "Import" +msgstr "" + +#: .\cookbook\templates\include\recipe_open_modal.html:18 +msgid "Close" +msgstr "" + +#: .\cookbook\templates\include\recipe_open_modal.html:32 +msgid "Open Recipe" +msgstr "" + +#: .\cookbook\templates\include\storage_backend_warning.html:4 +msgid "Security Warning" +msgstr "" + +#: .\cookbook\templates\include\storage_backend_warning.html:5 +msgid "" +"\n" +" The Password and Token field are stored as plain text " +"inside the database.\n" +" This is necessary because they are needed to make API requests, but " +"it also increases the risk of\n" +" someone stealing it.
\n" +" To limit the possible damage tokens or accounts with limited access " +"can be used.\n" +" " +msgstr "" + +#: .\cookbook\templates\index.html:29 +msgid "Search recipe ..." +msgstr "" + +#: .\cookbook\templates\index.html:44 +msgid "New Recipe" +msgstr "" + +#: .\cookbook\templates\index.html:53 +msgid "Advanced Search" +msgstr "" + +#: .\cookbook\templates\index.html:57 +msgid "Reset Search" +msgstr "" + +#: .\cookbook\templates\index.html:85 +msgid "Last viewed" +msgstr "" + +#: .\cookbook\templates\index.html:94 +msgid "Log in to view recipes" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:5 +#: .\cookbook\templates\markdown_info.html:13 +msgid "Markdown Info" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:14 +msgid "" +"\n" +" Markdown is lightweight markup language that can be used to format " +"plain text easily.\n" +" This site uses the Python Markdown library to\n" +" convert your text into nice looking HTML. Its full markdown " +"documentation can be found\n" +" here.\n" +" An incomplete but most likely sufficient documentation can be found " +"below.\n" +" " +msgstr "" + +#: .\cookbook\templates\markdown_info.html:25 +msgid "Headers" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:54 +msgid "Formatting" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:56 +#: .\cookbook\templates\markdown_info.html:72 +msgid "Line breaks are inserted by adding two spaces after the end of a line" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:57 +#: .\cookbook\templates\markdown_info.html:73 +msgid "or by leaving a blank line in between." +msgstr "" + +#: .\cookbook\templates\markdown_info.html:59 +#: .\cookbook\templates\markdown_info.html:74 +msgid "This text is bold" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:60 +#: .\cookbook\templates\markdown_info.html:75 +msgid "This text is italic" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:61 +#: .\cookbook\templates\markdown_info.html:77 +msgid "Blockquotes are also possible" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:84 +msgid "Lists" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:85 +msgid "" +"Lists can ordered or unordered. It is important to leave a blank line " +"before the list!" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:87 +#: .\cookbook\templates\markdown_info.html:108 +msgid "Ordered List" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:89 +#: .\cookbook\templates\markdown_info.html:90 +#: .\cookbook\templates\markdown_info.html:91 +#: .\cookbook\templates\markdown_info.html:110 +#: .\cookbook\templates\markdown_info.html:111 +#: .\cookbook\templates\markdown_info.html:112 +msgid "unordered list item" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:93 +#: .\cookbook\templates\markdown_info.html:114 +msgid "Unordered List" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:95 +#: .\cookbook\templates\markdown_info.html:96 +#: .\cookbook\templates\markdown_info.html:97 +#: .\cookbook\templates\markdown_info.html:116 +#: .\cookbook\templates\markdown_info.html:117 +#: .\cookbook\templates\markdown_info.html:118 +msgid "ordered list item" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:125 +msgid "Images & Links" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:126 +msgid "" +"Links can be formatted with Markdown. This application also allows to paste " +"links directly into markdown fields without any formatting." +msgstr "" + +#: .\cookbook\templates\markdown_info.html:132 +#: .\cookbook\templates\markdown_info.html:145 +msgid "This will become an image" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:152 +msgid "Tables" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:153 +msgid "" +"Markdown tables are hard to create by hand. It is recommended to use a table " +"editor like this one." +msgstr "" + +#: .\cookbook\templates\markdown_info.html:155 +#: .\cookbook\templates\markdown_info.html:157 +#: .\cookbook\templates\markdown_info.html:171 +#: .\cookbook\templates\markdown_info.html:177 +msgid "Table" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:155 +#: .\cookbook\templates\markdown_info.html:172 +msgid "Header" +msgstr "" + +#: .\cookbook\templates\markdown_info.html:157 +#: .\cookbook\templates\markdown_info.html:178 +msgid "Cell" +msgstr "" + +#: .\cookbook\templates\meal_plan_entry.html:6 +msgid "Meal Plan View" +msgstr "" + +#: .\cookbook\templates\meal_plan_entry.html:18 +msgid "Created by" +msgstr "" + +#: .\cookbook\templates\meal_plan_entry.html:20 +msgid "Shared with" +msgstr "" + +#: .\cookbook\templates\meal_plan_entry.html:48 +#: .\cookbook\templates\recipes_table.html:64 +msgid "Last cooked" +msgstr "" + +#: .\cookbook\templates\meal_plan_entry.html:50 +msgid "Never cooked before." +msgstr "" + +#: .\cookbook\templates\meal_plan_entry.html:76 +msgid "Other meals on this day" +msgstr "" + +#: .\cookbook\templates\no_groups_info.html:5 +#: .\cookbook\templates\no_groups_info.html:12 +msgid "No Permissions" +msgstr "" + +#: .\cookbook\templates\no_groups_info.html:17 +msgid "You do not have any groups and therefor cannot use this application." +msgstr "" + +#: .\cookbook\templates\no_groups_info.html:18 +#: .\cookbook\templates\no_perm_info.html:15 +msgid "Please contact your administrator." +msgstr "" + +#: .\cookbook\templates\no_perm_info.html:5 +#: .\cookbook\templates\no_perm_info.html:12 +msgid "No Permission" +msgstr "" + +#: .\cookbook\templates\no_perm_info.html:15 +msgid "" +"You do not have the required permissions to view this page or perform this " +"action." +msgstr "" + +#: .\cookbook\templates\offline.html:6 +msgid "Offline" +msgstr "" + +#: .\cookbook\templates\offline.html:19 +msgid "You are currently offline!" +msgstr "" + +#: .\cookbook\templates\offline.html:20 +msgid "" +"The recipes listed below are available for offline viewing because you have " +"recently viewed them. Keep in mind that data might be outdated." +msgstr "" + +#: .\cookbook\templates\openid\login.html:27 +#: .\cookbook\templates\socialaccount\authentication_error.html:27 +msgid "Back" +msgstr "" + +#: .\cookbook\templates\recipe_view.html:26 +msgid "by" +msgstr "" + +#: .\cookbook\templates\recipe_view.html:44 .\cookbook\views\delete.py:144 +#: .\cookbook\views\edit.py:171 +msgid "Comment" +msgstr "" + +#: .\cookbook\templates\recipes_table.html:19 +#: .\cookbook\templates\recipes_table.html:23 +msgid "Recipe Image" +msgstr "" + +#: .\cookbook\templates\recipes_table.html:51 +msgid "Preparation time ca." +msgstr "" + +#: .\cookbook\templates\recipes_table.html:57 +msgid "Waiting time ca." +msgstr "" + +#: .\cookbook\templates\recipes_table.html:60 +msgid "External" +msgstr "" + +#: .\cookbook\templates\recipes_table.html:86 +msgid "Log Cooking" +msgstr "" + +#: .\cookbook\templates\rest_framework\api.html:5 +msgid "Recipe Home" +msgstr "" + +#: .\cookbook\templates\search_info.html:5 +#: .\cookbook\templates\search_info.html:9 +#: .\cookbook\templates\settings.html:172 +msgid "Search Settings" +msgstr "" + +#: .\cookbook\templates\search_info.html:10 +msgid "" +"\n" +" Creating the best search experience is complicated and weighs " +"heavily on your personal configuration. \n" +" Changing any of the search settings can have significant impact on " +"the speed and quality of the results.\n" +" Search Methods, Trigrams and Full Text Search configurations are " +"only available if you are using Postgres for your database.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:19 +msgid "Search Methods" +msgstr "" + +#: .\cookbook\templates\search_info.html:23 +msgid "" +" \n" +" Full text searches attempt to normalize the words provided to " +"match common variants. For example: 'forked', 'forking', 'forks' will all " +"normalize to 'fork'.\n" +" There are several methods available, described below, that will " +"control how the search behavior should react when multiple words are " +"searched.\n" +" Full technical details on how these operate can be viewed on Postgresql's website.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:29 +msgid "" +" \n" +" Simple searches ignore punctuation and common words such as " +"'the', 'a', 'and'. And will treat separate words as required.\n" +" Searching for 'apple or flour' will return any recipe that " +"includes both 'apple' and 'flour' anywhere in the fields that have been " +"selected for a full text search.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:34 +msgid "" +" \n" +" Phrase searches ignore punctuation, but will search for all of " +"the words in the exact order provided.\n" +" Searching for 'apple or flour' will only return a recipe that " +"includes the exact phrase 'apple or flour' in any of the fields that have " +"been selected for a full text search.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:39 +msgid "" +" \n" +" Web searches simulate functionality found on many web search " +"sites supporting special syntax.\n" +" Placing quotes around several words will convert those words " +"into a phrase.\n" +" 'or' is recognized as searching for the word (or phrase) " +"immediately before 'or' OR the word (or phrase) directly after.\n" +" '-' is recognized as searching for recipes that do not include " +"the word (or phrase) that comes immediately after. \n" +" For example searching for 'apple pie' or cherry -butter will " +"return any recipe that includes the phrase 'apple pie' or the word " +"'cherry' \n" +" in any field included in the full text search but exclude any " +"recipe that has the word 'butter' in any field included.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:48 +msgid "" +" \n" +" Raw search is similar to Web except will take puncuation " +"operators such as '|', '&' and '()'\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:59 +msgid "" +" \n" +" Another approach to searching that also requires Postgresql is " +"fuzzy search or trigram similarity. A trigram is a group of three " +"consecutive characters.\n" +" For example searching for 'apple' will create x trigrams 'app', " +"'ppl', 'ple' and will create a score of how closely words match the " +"generated trigrams.\n" +" One benefit of searching trigams is that a search for 'sandwich' " +"will find misspelled words such as 'sandwhich' that would be missed by other " +"methods.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:69 +msgid "Search Fields" +msgstr "" + +#: .\cookbook\templates\search_info.html:73 +msgid "" +" \n" +" Unaccent is a special case in that it enables searching a field " +"'unaccented' for each search style attempting to ignore accented values. \n" +" For example when you enable unaccent for 'Name' any search " +"(starts with, contains, trigram) will attempt the search ignoring accented " +"characters.\n" +" \n" +" For the other options, you can enable search on any or all " +"fields and they will be combined together with an assumed 'OR'.\n" +" For example enabling 'Name' for Starts With, 'Name' and " +"'Description' for Partial Match and 'Ingredients' and 'Keywords' for Full " +"Search\n" +" and searching for 'apple' will generate a search that will " +"return recipes that have:\n" +" - A recipe name that starts with 'apple'\n" +" - OR a recipe name that contains 'apple'\n" +" - OR a recipe description that contains 'apple'\n" +" - OR a recipe that will have a full text search match ('apple' " +"or 'apples') in ingredients\n" +" - OR a recipe that will have a full text search match in " +"Keywords\n" +"\n" +" Combining too many fields in too many types of search can have a " +"negative impact on performance, create duplicate results or return " +"unexpected results.\n" +" For example, enabling fuzzy search or partial matches will " +"interfere with web search methods. \n" +" Searching for 'apple -pie' with fuzzy search and full text " +"search will return the recipe Apple Pie. Though it is not included in the " +"full text results, it does match the trigram results.\n" +" " +msgstr "" + +#: .\cookbook\templates\search_info.html:95 +msgid "Search Index" +msgstr "" + +#: .\cookbook\templates\search_info.html:99 +msgid "" +" \n" +" Trigram search and Full Text Search both rely on database " +"indexes to perform effectively. \n" +" You can rebuild the indexes on all fields in the Admin page for " +"Recipes and selecting all recipes and running 'rebuild index for selected " +"recipes'\n" +" You can also rebuild indexes at the command line by executing " +"the management command 'python manage.py rebuildindex'\n" +" " +msgstr "" + +#: .\cookbook\templates\settings.html:28 +msgid "Account" +msgstr "" + +#: .\cookbook\templates\settings.html:35 +msgid "Preferences" +msgstr "" + +#: .\cookbook\templates\settings.html:42 +msgid "API-Settings" +msgstr "" + +#: .\cookbook\templates\settings.html:49 +msgid "Search-Settings" +msgstr "" + +#: .\cookbook\templates\settings.html:56 +msgid "Shopping-Settings" +msgstr "" + +#: .\cookbook\templates\settings.html:65 +msgid "Name Settings" +msgstr "" + +#: .\cookbook\templates\settings.html:73 +msgid "Account Settings" +msgstr "" + +#: .\cookbook\templates\settings.html:75 +msgid "Emails" +msgstr "" + +#: .\cookbook\templates\settings.html:78 +#: .\cookbook\templates\socialaccount\connections.html:11 +msgid "Social" +msgstr "" + +#: .\cookbook\templates\settings.html:91 +msgid "Language" +msgstr "" + +#: .\cookbook\templates\settings.html:121 +msgid "Style" +msgstr "" + +#: .\cookbook\templates\settings.html:142 +msgid "API Token" +msgstr "" + +#: .\cookbook\templates\settings.html:143 +msgid "" +"You can use both basic authentication and token based authentication to " +"access the REST API." +msgstr "" + +#: .\cookbook\templates\settings.html:160 +msgid "" +"Use the token as an Authorization header prefixed by the word token as shown " +"in the following examples:" +msgstr "" + +#: .\cookbook\templates\settings.html:162 +msgid "or" +msgstr "" + +#: .\cookbook\templates\settings.html:173 +msgid "" +"There are many options to configure the search depending on your personal " +"preferences." +msgstr "" + +#: .\cookbook\templates\settings.html:174 +msgid "" +"Usually you do not need to configure any of them and can just stick " +"with either the default or one of the following presets." +msgstr "" + +#: .\cookbook\templates\settings.html:175 +msgid "" +"If you do want to configure the search you can read about the different " +"options here." +msgstr "" + +#: .\cookbook\templates\settings.html:180 +msgid "Fuzzy" +msgstr "" + +#: .\cookbook\templates\settings.html:181 +msgid "" +"Find what you need even if your search or the recipe contains typos. Might " +"return more results than needed to make sure you find what you are looking " +"for." +msgstr "" + +#: .\cookbook\templates\settings.html:182 +msgid "This is the default behavior" +msgstr "" + +#: .\cookbook\templates\settings.html:183 +#: .\cookbook\templates\settings.html:191 +msgid "Apply" +msgstr "" + +#: .\cookbook\templates\settings.html:188 +msgid "Precise" +msgstr "" + +#: .\cookbook\templates\settings.html:189 +msgid "" +"Allows fine control over search results but might not return results if too " +"many spelling mistakes are made." +msgstr "" + +#: .\cookbook\templates\settings.html:190 +msgid "Perfect for large Databases" +msgstr "" + +#: .\cookbook\templates\settings.html:207 +msgid "Shopping Settings" +msgstr "" + +#: .\cookbook\templates\setup.html:6 .\cookbook\templates\system.html:5 +msgid "Cookbook Setup" +msgstr "" + +#: .\cookbook\templates\setup.html:14 +msgid "Setup" +msgstr "" + +#: .\cookbook\templates\setup.html:15 +msgid "" +"To start using this application you must first create a superuser account." +msgstr "" + +#: .\cookbook\templates\setup.html:20 +msgid "Create Superuser account" +msgstr "" + +#: .\cookbook\templates\socialaccount\authentication_error.html:7 +#: .\cookbook\templates\socialaccount\authentication_error.html:23 +msgid "Social Network Login Failure" +msgstr "" + +#: .\cookbook\templates\socialaccount\authentication_error.html:25 +msgid "" +"An error occurred while attempting to login via your social network account." +msgstr "" + +#: .\cookbook\templates\socialaccount\connections.html:4 +#: .\cookbook\templates\socialaccount\connections.html:15 +msgid "Account Connections" +msgstr "" + +#: .\cookbook\templates\socialaccount\connections.html:18 +msgid "" +"You can sign in to your account using any of the following third party\n" +" accounts:" +msgstr "" + +#: .\cookbook\templates\socialaccount\connections.html:52 +msgid "" +"You currently have no social network accounts connected to this account." +msgstr "" + +#: .\cookbook\templates\socialaccount\connections.html:55 +msgid "Add a 3rd Party Account" +msgstr "" + +#: .\cookbook\templates\socialaccount\login.html:5 +#: .\cookbook\templates\socialaccount\signup.html:5 +msgid "Signup" +msgstr "" + +#: .\cookbook\templates\socialaccount\login.html:9 +#, python-format +msgid "Connect %(provider)s" +msgstr "" + +#: .\cookbook\templates\socialaccount\login.html:11 +#, python-format +msgid "You are about to connect a new third party account from %(provider)s." +msgstr "" + +#: .\cookbook\templates\socialaccount\login.html:13 +#, python-format +msgid "Sign In Via %(provider)s" +msgstr "" + +#: .\cookbook\templates\socialaccount\login.html:15 +#, python-format +msgid "You are about to sign in using a third party account from %(provider)s." +msgstr "" + +#: .\cookbook\templates\socialaccount\login.html:20 +msgid "Continue" +msgstr "" + +#: .\cookbook\templates\socialaccount\signup.html:10 +#, python-format +msgid "" +"You are about to use your\n" +" %(provider_name)s account to login to\n" +" %(site_name)s. As a final step, please complete the following form:" +msgstr "" + +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:23 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:31 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:39 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:47 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:55 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:63 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:71 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:79 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:87 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:95 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:103 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:111 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:119 +#: .\cookbook\templates\socialaccount\snippets\provider_list.html:127 +msgid "Sign in using" +msgstr "" + +#: .\cookbook\templates\space_manage.html:26 +msgid "Space:" +msgstr "" + +#: .\cookbook\templates\space_manage.html:27 +msgid "Manage Subscription" +msgstr "" + +#: .\cookbook\templates\space_overview.html:13 .\cookbook\views\delete.py:216 +msgid "Space" +msgstr "" + +#: .\cookbook\templates\space_overview.html:17 +msgid "" +"Recipes, foods, shopping lists and more are organized in spaces of one or " +"more people." +msgstr "" + +#: .\cookbook\templates\space_overview.html:18 +msgid "" +"You can either be invited into an existing space or create your own one." +msgstr "" + +#: .\cookbook\templates\space_overview.html:45 +msgid "Owner" +msgstr "" + +#: .\cookbook\templates\space_overview.html:49 +msgid "Leave Space" +msgstr "" + +#: .\cookbook\templates\space_overview.html:70 +#: .\cookbook\templates\space_overview.html:80 +msgid "Join Space" +msgstr "" + +#: .\cookbook\templates\space_overview.html:73 +msgid "Join an existing space." +msgstr "" + +#: .\cookbook\templates\space_overview.html:75 +msgid "" +"To join an existing space either enter your invite token or click on the " +"invite link the space owner send you." +msgstr "" + +#: .\cookbook\templates\space_overview.html:88 +#: .\cookbook\templates\space_overview.html:97 +msgid "Create Space" +msgstr "" + +#: .\cookbook\templates\space_overview.html:91 +msgid "Create your own recipe space." +msgstr "" + +#: .\cookbook\templates\space_overview.html:93 +msgid "Start your own recipe space and invite other users to it." +msgstr "" + +#: .\cookbook\templates\stats.html:4 +msgid "Stats" +msgstr "" + +#: .\cookbook\templates\stats.html:10 +msgid "Statistics" +msgstr "" + +#: .\cookbook\templates\stats.html:19 +msgid "Number of objects" +msgstr "" + +#: .\cookbook\templates\stats.html:30 +msgid "Recipe Imports" +msgstr "" + +#: .\cookbook\templates\stats.html:38 +msgid "Objects stats" +msgstr "" + +#: .\cookbook\templates\stats.html:41 +msgid "Recipes without Keywords" +msgstr "" + +#: .\cookbook\templates\stats.html:45 +msgid "Internal Recipes" +msgstr "" + +#: .\cookbook\templates\system.html:20 +msgid "System Information" +msgstr "" + +#: .\cookbook\templates\system.html:22 +msgid "" +"\n" +" Django Recipes is an open source free software application. It can " +"be found on\n" +" GitHub.\n" +" Changelogs can be found here.\n" +" " +msgstr "" + +#: .\cookbook\templates\system.html:36 +msgid "Media Serving" +msgstr "" + +#: .\cookbook\templates\system.html:37 .\cookbook\templates\system.html:52 +#: .\cookbook\templates\system.html:68 +msgid "Warning" +msgstr "" + +#: .\cookbook\templates\system.html:37 .\cookbook\templates\system.html:52 +#: .\cookbook\templates\system.html:68 .\cookbook\templates\system.html:83 +msgid "Ok" +msgstr "" + +#: .\cookbook\templates\system.html:39 +msgid "" +"Serving media files directly using gunicorn/python is not recommend!\n" +" Please follow the steps described\n" +" here to update\n" +" your installation.\n" +" " +msgstr "" + +#: .\cookbook\templates\system.html:45 .\cookbook\templates\system.html:61 +#: .\cookbook\templates\system.html:76 .\cookbook\templates\system.html:90 +msgid "Everything is fine!" +msgstr "" + +#: .\cookbook\templates\system.html:50 +msgid "Secret Key" +msgstr "" + +#: .\cookbook\templates\system.html:54 +msgid "" +"\n" +" You do not have a SECRET_KEY configured in your " +".env file. Django defaulted to the\n" +" standard key\n" +" provided with the installation which is publicly know and " +"insecure! Please set\n" +" SECRET_KEY int the .env configuration " +"file.\n" +" " +msgstr "" + +#: .\cookbook\templates\system.html:66 +msgid "Debug Mode" +msgstr "" + +#: .\cookbook\templates\system.html:70 +msgid "" +"\n" +" This application is still running in debug mode. This is most " +"likely not needed. Turn of debug mode by\n" +" setting\n" +" DEBUG=0 int the .env configuration " +"file.\n" +" " +msgstr "" + +#: .\cookbook\templates\system.html:81 +msgid "Database" +msgstr "" + +#: .\cookbook\templates\system.html:83 +msgid "Info" +msgstr "" + +#: .\cookbook\templates\system.html:85 +msgid "" +"\n" +" This application is not running with a Postgres database " +"backend. This is ok but not recommended as some\n" +" features only work with postgres databases.\n" +" " +msgstr "" + +#: .\cookbook\templates\url_import.html:8 +msgid "URL Import" +msgstr "" + +#: .\cookbook\views\api.py:105 .\cookbook\views\api.py:197 +msgid "Parameter updated_at incorrectly formatted" +msgstr "" + +#: .\cookbook\views\api.py:217 .\cookbook\views\api.py:320 +msgid "No {self.basename} with id {pk} exists" +msgstr "" + +#: .\cookbook\views\api.py:221 +msgid "Cannot merge with the same object!" +msgstr "" + +#: .\cookbook\views\api.py:228 +msgid "No {self.basename} with id {target} exists" +msgstr "" + +#: .\cookbook\views\api.py:233 +msgid "Cannot merge with child object!" +msgstr "" + +#: .\cookbook\views\api.py:266 +msgid "{source.name} was merged successfully with {target.name}" +msgstr "" + +#: .\cookbook\views\api.py:271 +msgid "An error occurred attempting to merge {source.name} with {target.name}" +msgstr "" + +#: .\cookbook\views\api.py:329 +msgid "{child.name} was moved successfully to the root." +msgstr "" + +#: .\cookbook\views\api.py:332 .\cookbook\views\api.py:350 +msgid "An error occurred attempting to move " +msgstr "" + +#: .\cookbook\views\api.py:335 +msgid "Cannot move an object to itself!" +msgstr "" + +#: .\cookbook\views\api.py:341 +msgid "No {self.basename} with id {parent} exists" +msgstr "" + +#: .\cookbook\views\api.py:347 +msgid "{child.name} was moved successfully to parent {parent.name}" +msgstr "" + +#: .\cookbook\views\api.py:542 +msgid "{obj.name} was removed from the shopping list." +msgstr "" + +#: .\cookbook\views\api.py:547 .\cookbook\views\api.py:879 +#: .\cookbook\views\api.py:892 +msgid "{obj.name} was added to the shopping list." +msgstr "" + +#: .\cookbook\views\api.py:674 +msgid "ID of recipe a step is part of. For multiple repeat parameter." +msgstr "" + +#: .\cookbook\views\api.py:676 +msgid "Query string matched (fuzzy) against object name." +msgstr "" + +#: .\cookbook\views\api.py:720 +msgid "" +"Query string matched (fuzzy) against recipe name. In the future also " +"fulltext search." +msgstr "" + +#: .\cookbook\views\api.py:722 +msgid "" +"ID of keyword a recipe should have. For multiple repeat parameter. " +"Equivalent to keywords_or" +msgstr "" + +#: .\cookbook\views\api.py:725 +msgid "" +"Keyword IDs, repeat for multiple. Return recipes with any of the keywords" +msgstr "" + +#: .\cookbook\views\api.py:728 +msgid "" +"Keyword IDs, repeat for multiple. Return recipes with all of the keywords." +msgstr "" + +#: .\cookbook\views\api.py:731 +msgid "" +"Keyword IDs, repeat for multiple. Exclude recipes with any of the keywords." +msgstr "" + +#: .\cookbook\views\api.py:734 +msgid "" +"Keyword IDs, repeat for multiple. Exclude recipes with all of the keywords." +msgstr "" + +#: .\cookbook\views\api.py:736 +msgid "ID of food a recipe should have. For multiple repeat parameter." +msgstr "" + +#: .\cookbook\views\api.py:739 +msgid "Food IDs, repeat for multiple. Return recipes with any of the foods" +msgstr "" + +#: .\cookbook\views\api.py:741 +msgid "Food IDs, repeat for multiple. Return recipes with all of the foods." +msgstr "" + +#: .\cookbook\views\api.py:743 +msgid "Food IDs, repeat for multiple. Exclude recipes with any of the foods." +msgstr "" + +#: .\cookbook\views\api.py:745 +msgid "Food IDs, repeat for multiple. Exclude recipes with all of the foods." +msgstr "" + +#: .\cookbook\views\api.py:746 +msgid "ID of unit a recipe should have." +msgstr "" + +#: .\cookbook\views\api.py:748 +msgid "" +"Rating a recipe should have or greater. [0 - 5] Negative value filters " +"rating less than." +msgstr "" + +#: .\cookbook\views\api.py:749 +msgid "ID of book a recipe should be in. For multiple repeat parameter." +msgstr "" + +#: .\cookbook\views\api.py:751 +msgid "Book IDs, repeat for multiple. Return recipes with any of the books" +msgstr "" + +#: .\cookbook\views\api.py:753 +msgid "Book IDs, repeat for multiple. Return recipes with all of the books." +msgstr "" + +#: .\cookbook\views\api.py:755 +msgid "Book IDs, repeat for multiple. Exclude recipes with any of the books." +msgstr "" + +#: .\cookbook\views\api.py:757 +msgid "Book IDs, repeat for multiple. Exclude recipes with all of the books." +msgstr "" + +#: .\cookbook\views\api.py:759 +msgid "If only internal recipes should be returned. [true/false]" +msgstr "" + +#: .\cookbook\views\api.py:761 +msgid "Returns the results in randomized order. [true/false]" +msgstr "" + +#: .\cookbook\views\api.py:763 +msgid "Returns new results first in search results. [true/false]" +msgstr "" + +#: .\cookbook\views\api.py:765 +msgid "" +"Filter recipes cooked X times or more. Negative values returns cooked less " +"than X times" +msgstr "" + +#: .\cookbook\views\api.py:767 +msgid "" +"Filter recipes last cooked on or after YYYY-MM-DD. Prepending - filters on " +"or before date." +msgstr "" + +#: .\cookbook\views\api.py:769 +msgid "" +"Filter recipes created on or after YYYY-MM-DD. Prepending - filters on or " +"before date." +msgstr "" + +#: .\cookbook\views\api.py:771 +msgid "" +"Filter recipes updated on or after YYYY-MM-DD. Prepending - filters on or " +"before date." +msgstr "" + +#: .\cookbook\views\api.py:773 +msgid "" +"Filter recipes lasts viewed on or after YYYY-MM-DD. Prepending - filters on " +"or before date." +msgstr "" + +#: .\cookbook\views\api.py:775 +msgid "Filter recipes that can be made with OnHand food. [true/false]" +msgstr "" + +#: .\cookbook\views\api.py:937 +msgid "" +"Returns the shopping list entry with a primary key of id. Multiple values " +"allowed." +msgstr "" + +#: .\cookbook\views\api.py:942 +msgid "" +"Filter shopping list entries on checked. [true, false, both, recent]" +"
- recent includes unchecked items and recently completed items." +msgstr "" + +#: .\cookbook\views\api.py:945 +msgid "Returns the shopping list entries sorted by supermarket category order." +msgstr "" + +#: .\cookbook\views\api.py:1140 +msgid "Nothing to do." +msgstr "" + +#: .\cookbook\views\api.py:1160 +msgid "Invalid Url" +msgstr "" + +#: .\cookbook\views\api.py:1167 +msgid "Connection Refused." +msgstr "" + +#: .\cookbook\views\api.py:1172 +msgid "Bad URL Schema." +msgstr "" + +#: .\cookbook\views\api.py:1195 +msgid "No usable data could be found." +msgstr "" + +#: .\cookbook\views\api.py:1303 .\cookbook\views\data.py:28 +#: .\cookbook\views\edit.py:120 .\cookbook\views\new.py:90 +msgid "This feature is not yet available in the hosted version of tandoor!" +msgstr "" + +#: .\cookbook\views\api.py:1325 +msgid "Sync successful!" +msgstr "" + +#: .\cookbook\views\api.py:1330 +msgid "Error synchronizing with Storage" +msgstr "" + +#: .\cookbook\views\data.py:97 +#, python-format +msgid "Batch edit done. %(count)d recipe was updated." +msgid_plural "Batch edit done. %(count)d Recipes where updated." +msgstr[0] "" +msgstr[1] "" + +#: .\cookbook\views\delete.py:98 +msgid "Monitor" +msgstr "" + +#: .\cookbook\views\delete.py:122 .\cookbook\views\lists.py:62 +#: .\cookbook\views\new.py:96 +msgid "Storage Backend" +msgstr "" + +#: .\cookbook\views\delete.py:132 +msgid "" +"Could not delete this storage backend as it is used in at least one monitor." +msgstr "" + +#: .\cookbook\views\delete.py:155 +msgid "Recipe Book" +msgstr "" + +#: .\cookbook\views\delete.py:167 +msgid "Bookmarks" +msgstr "" + +#: .\cookbook\views\delete.py:189 +msgid "Invite Link" +msgstr "" + +#: .\cookbook\views\delete.py:200 +msgid "Space Membership" +msgstr "" + +#: .\cookbook\views\edit.py:116 +msgid "You cannot edit this storage!" +msgstr "" + +#: .\cookbook\views\edit.py:140 +msgid "Storage saved!" +msgstr "" + +#: .\cookbook\views\edit.py:146 +msgid "There was an error updating this storage backend!" +msgstr "" + +#: .\cookbook\views\edit.py:239 +msgid "Changes saved!" +msgstr "" + +#: .\cookbook\views\edit.py:243 +msgid "Error saving changes!" +msgstr "" + +#: .\cookbook\views\import_export.py:111 .\cookbook\views\import_export.py:150 +msgid "Importing is not implemented for this provider" +msgstr "" + +#: .\cookbook\views\import_export.py:137 +msgid "" +"The PDF Exporter is not enabled on this instance as it is still in an " +"experimental state." +msgstr "" + +#: .\cookbook\views\lists.py:24 +msgid "Import Log" +msgstr "" + +#: .\cookbook\views\lists.py:37 +msgid "Discovery" +msgstr "" + +#: .\cookbook\views\lists.py:47 +msgid "Shopping List" +msgstr "" + +#: .\cookbook\views\lists.py:76 +msgid "Invite Links" +msgstr "" + +#: .\cookbook\views\lists.py:139 +msgid "Supermarkets" +msgstr "" + +#: .\cookbook\views\lists.py:155 +msgid "Shopping Categories" +msgstr "" + +#: .\cookbook\views\lists.py:187 +msgid "Custom Filters" +msgstr "" + +#: .\cookbook\views\lists.py:224 +msgid "Steps" +msgstr "" + +#: .\cookbook\views\new.py:121 +msgid "Imported new recipe!" +msgstr "" + +#: .\cookbook\views\new.py:124 +msgid "There was an error importing this recipe!" +msgstr "" + +#: .\cookbook\views\views.py:124 +msgid "" +"You have successfully created your own recipe space. Start by adding some " +"recipes or invite other people to join you." +msgstr "" + +#: .\cookbook\views\views.py:178 +msgid "You do not have the required permissions to perform this action!" +msgstr "" + +#: .\cookbook\views\views.py:189 +msgid "Comment saved!" +msgstr "" + +#: .\cookbook\views\views.py:264 +msgid "This feature is not available in the demo version!" +msgstr "" + +#: .\cookbook\views\views.py:324 +msgid "You must select at least one field to search!" +msgstr "" + +#: .\cookbook\views\views.py:329 +msgid "" +"To use this search method you must select at least one full text search " +"field!" +msgstr "" + +#: .\cookbook\views\views.py:333 +msgid "Fuzzy search is not compatible with this search method!" +msgstr "" + +#: .\cookbook\views\views.py:463 +msgid "" +"The setup page can only be used to create the first user! If you have " +"forgotten your superuser credentials please consult the django documentation " +"on how to reset passwords." +msgstr "" + +#: .\cookbook\views\views.py:470 +msgid "Passwords dont match!" +msgstr "" + +#: .\cookbook\views\views.py:478 +msgid "User has been created, please login!" +msgstr "" + +#: .\cookbook\views\views.py:494 +msgid "Malformed Invite Link supplied!" +msgstr "" + +#: .\cookbook\views\views.py:510 +msgid "Successfully joined space." +msgstr "" + +#: .\cookbook\views\views.py:516 +msgid "Invite Link not valid or already used!" +msgstr "" + +#: .\cookbook\views\views.py:530 +msgid "" +"Reporting share links is not enabled for this instance. Please notify the " +"page administrator to report problems." +msgstr "" + +#: .\cookbook\views\views.py:536 +msgid "" +"Recipe sharing link has been disabled! For additional information please " +"contact the page administrator." +msgstr "" From f70377c59b974669898bae850a2c5ed4a2240b68 Mon Sep 17 00:00:00 2001 From: Sokratis Potamias Date: Sun, 16 Oct 2022 11:08:34 +0000 Subject: [PATCH 55/77] Translated using Weblate (Greek) Currently translated at 0.5% (3 of 524 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/el/ --- cookbook/locale/el/LC_MESSAGES/django.po | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/cookbook/locale/el/LC_MESSAGES/django.po b/cookbook/locale/el/LC_MESSAGES/django.po index 243d2189e6..1208f55ecf 100644 --- a/cookbook/locale/el/LC_MESSAGES/django.po +++ b/cookbook/locale/el/LC_MESSAGES/django.po @@ -8,19 +8,21 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-07-12 19:20+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"PO-Revision-Date: 2022-10-17 11:33+0000\n" +"Last-Translator: Sokratis Potamias \n" +"Language-Team: Greek \n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.10.1\n" #: .\cookbook\filters.py:23 .\cookbook\templates\forms\ingredients.html:34 #: .\cookbook\templates\stats.html:28 msgid "Ingredients" -msgstr "" +msgstr "Συστατικά" #: .\cookbook\forms.py:53 msgid "Default unit" @@ -36,7 +38,7 @@ msgstr "" #: .\cookbook\forms.py:56 msgid "Theme" -msgstr "" +msgstr "Θέμα" #: .\cookbook\forms.py:57 msgid "Navbar color" @@ -73,7 +75,7 @@ msgstr "" #: .\cookbook\forms.py:65 .\cookbook\templates\recipe_view.html:21 #: .\cookbook\templates\stats.html:47 msgid "Comments" -msgstr "" +msgstr "Σχόλια" #: .\cookbook\forms.py:66 msgid "Left-handed mode" From 2de807015665eb6082f7481158fe32f92d10659b Mon Sep 17 00:00:00 2001 From: Oliver Cervera Date: Tue, 18 Oct 2022 21:44:34 +0000 Subject: [PATCH 56/77] Translated using Weblate (Italian) Currently translated at 75.2% (346 of 460 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/ --- vue/src/locales/it.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue/src/locales/it.json b/vue/src/locales/it.json index 295b5435de..4983f01f41 100644 --- a/vue/src/locales/it.json +++ b/vue/src/locales/it.json @@ -328,7 +328,7 @@ "select_unit": "Seleziona unità di misura", "Ingredient Editor": "Editor Ingredienti", "Private_Recipe": "Ricetta privata", - "Private_Recipe_Help": "La ricetta viene mostrata solo a te e chi l'hai condivisa.", + "Private_Recipe_Help": "La ricetta viene mostrata solo a te e a chi l'hai condivisa.", "Protected": "Protetto", "Copy Link": "Copia link", "Create_New_Shopping_Category": "Aggiungi nuova categoria di spesa", From 37bd2017b01458b01bda29c7b919d36c931d47e3 Mon Sep 17 00:00:00 2001 From: rdang <41537401+rdangdev@users.noreply.github.com> Date: Fri, 21 Oct 2022 19:13:18 +1100 Subject: [PATCH 57/77] ports are on the wrong service the actual webserver is running on port 8080 and on the web_recipes service, as per all the documentation. 80 will not work, at least on the latest patch. --- docs/install/docker/plain/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/install/docker/plain/docker-compose.yml b/docs/install/docker/plain/docker-compose.yml index 2a3b7c3fd9..c61e468855 100644 --- a/docs/install/docker/plain/docker-compose.yml +++ b/docs/install/docker/plain/docker-compose.yml @@ -13,6 +13,8 @@ services: image: vabene1111/recipes env_file: - ./.env + ports: + - 80:8080 volumes: - staticfiles:/opt/recipes/staticfiles - nginx_config:/opt/recipes/nginx/conf.d @@ -24,7 +26,6 @@ services: image: nginx:mainline-alpine restart: always ports: - - 80:80 env_file: - ./.env depends_on: From d781cbe743835e07109dbb5023f872d2ecfbea0c Mon Sep 17 00:00:00 2001 From: Tomasz Klimczak Date: Fri, 21 Oct 2022 20:22:24 +0000 Subject: [PATCH 58/77] Translated using Weblate (Polish) Currently translated at 100.0% (460 of 460 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/ --- vue/src/locales/pl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue/src/locales/pl.json b/vue/src/locales/pl.json index e4a58898a6..4c5b4eb2aa 100644 --- a/vue/src/locales/pl.json +++ b/vue/src/locales/pl.json @@ -439,7 +439,7 @@ "Day": "Dzień", "Days": "Dni", "Second": "Sekunda", - "Cosmetic": "Kosmetyk", + "Cosmetic": "Kosmetyczne", "API": "API", "Sticky_Nav_Help": "Zawsze pokazuj menu nawigacyjne u góry ekranu.", "Nav_Color": "Kolor nawigacji", From 9dedc5b8fa675a14264fcad649a8a3760fe93666 Mon Sep 17 00:00:00 2001 From: Tiago Rascazzi Date: Sat, 29 Oct 2022 14:08:12 -0400 Subject: [PATCH 59/77] Added nextcloud export implementation --- cookbook/integration/nextcloud_cookbook.py | 92 +++++++++++++++++++++- vue/src/apps/ExportView/ExportView.vue | 1 + 2 files changed, 91 insertions(+), 2 deletions(-) diff --git a/cookbook/integration/nextcloud_cookbook.py b/cookbook/integration/nextcloud_cookbook.py index 6db53f7012..baa8625ce1 100644 --- a/cookbook/integration/nextcloud_cookbook.py +++ b/cookbook/integration/nextcloud_cookbook.py @@ -1,7 +1,8 @@ import json import re -from io import BytesIO +from io import BytesIO, StringIO from zipfile import ZipFile +from PIL import Image from cookbook.helper.image_processing import get_filetype from cookbook.helper.ingredient_parser import IngredientParser @@ -96,5 +97,92 @@ def get_recipe_from_file(self, file): return recipe + def formatTime(self, min): + h = min//60 + m = min % 60 + return f'PT{h}H{m}M0S' + + def get_file_from_recipe(self, recipe): - raise NotImplementedError('Method not implemented in storage integration') + + export = {} + export['name'] = recipe.name + export['description'] = recipe.description + export['url'] = recipe.source_url + export['prepTime'] = self.formatTime(recipe.working_time) + export['cookTime'] = self.formatTime(recipe.waiting_time) + export['totalTime'] = self.formatTime(recipe.working_time+recipe.waiting_time) + export['recipeYield'] = recipe.servings + export['image'] = f'/Recipes/{recipe.name}/full.jpg' + export['imageUrl'] = f'/Recipes/{recipe.name}/full.jpg' + + recipeKeyword = [] + for k in recipe.keywords.all(): + recipeKeyword.append(k.name) + + export['keywords'] = recipeKeyword + + recipeInstructions = [] + recipeIngredient = [] + for s in recipe.steps.all(): + recipeInstructions.append(s.instruction) + + for i in s.ingredients.all(): + recipeIngredient.append(f'{float(i.amount)} {i.unit} {i.food}') + + export['recipeIngredient'] = recipeIngredient + export['recipeInstructions'] = recipeInstructions + + + return "recipe.json", json.dumps(export) + + def get_files_from_recipes(self, recipes, el, cookie): + export_zip_stream = BytesIO() + export_zip_obj = ZipFile(export_zip_stream, 'w') + + for recipe in recipes: + if recipe.internal and recipe.space == self.request.space: + + recipe_stream = StringIO() + filename, data = self.get_file_from_recipe(recipe) + recipe_stream.write(data) + export_zip_obj.writestr(f'{recipe.name}/{filename}', recipe_stream.getvalue()) + recipe_stream.close() + + try: + imageByte = recipe.image.file.read() + export_zip_obj.writestr(f'{recipe.name}/full.jpg', self.getJPEG(imageByte)) + export_zip_obj.writestr(f'{recipe.name}/thumb.jpg', self.getThumb(171, imageByte)) + export_zip_obj.writestr(f'{recipe.name}/thumb16.jpg', self.getThumb(16, imageByte)) + except ValueError: + pass + + el.exported_recipes += 1 + el.msg += self.get_recipe_processed_msg(recipe) + el.save() + + export_zip_obj.close() + + return [[ self.get_export_file_name(), export_zip_stream.getvalue() ]] + + def getJPEG(self, imageByte): + image = Image.open(BytesIO(imageByte)) + image = image.convert('RGB') + + bytes = BytesIO() + image.save(bytes, "JPEG") + return bytes.getvalue() + + def getThumb(self, size, imageByte): + image = Image.open(BytesIO(imageByte)) + + w, h = image.size + m = min(w, h) + + image = image.crop(((w-m)//2, (h-m)//2, (w+m)//2, (h+m)//2)) + image = image.resize([size, size], Image.Resampling.LANCZOS) + image = image.convert('RGB') + + bytes = BytesIO() + image.save(bytes, "JPEG") + return bytes.getvalue() diff --git a/vue/src/apps/ExportView/ExportView.vue b/vue/src/apps/ExportView/ExportView.vue index 5503eaa13d..96a3dd1b04 100644 --- a/vue/src/apps/ExportView/ExportView.vue +++ b/vue/src/apps/ExportView/ExportView.vue @@ -8,6 +8,7 @@ From c147903f1e5af27ea0afb9af2e16e5d0a5d5c507 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Mon, 31 Oct 2022 09:02:14 +0100 Subject: [PATCH 60/77] updated recipe scrapers and compiled translations --- cookbook/locale/el/LC_MESSAGES/django.mo | Bin 0 -> 642 bytes cookbook/locale/id/LC_MESSAGES/django.mo | Bin 0 -> 8059 bytes cookbook/locale/it/LC_MESSAGES/django.mo | Bin 44541 -> 46053 bytes cookbook/locale/pt/LC_MESSAGES/django.mo | Bin 12748 -> 13196 bytes requirements.txt | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 cookbook/locale/el/LC_MESSAGES/django.mo create mode 100644 cookbook/locale/id/LC_MESSAGES/django.mo diff --git a/cookbook/locale/el/LC_MESSAGES/django.mo b/cookbook/locale/el/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..89e25640024c394b4d480bae43ebb3353dc642c1 GIT binary patch literal 642 zcmYk2&u-H|5XKD@2^mg3b6C#R+Flo_Ws@LEnnn?XMyV+vaoN~Y$Hd+>yPK-z%D+pm zNZh%?p~nJ`fHrTyvoKC8g^_;xW_M;j?atrzwJ#pV8gdtDBR7%PNE0=33wev&M&2P! z{S)%%n&+LN-a%en_q=t~Bh;q<6cx)J$}$@N8%@?#RRz)-Zy<9GS+UHMDOBK%w0Z-n zrGtzff;NScoQ!t5Pj>n}a@ZRm4ECS-W2lw3bZGJ-qmSpgp^4(eAMGc!t3g;CqPxNZ zCvgTrq?5)pr0Ij!;g7EWwf zm!gm@l1_y-U^~x~J-WT>Yo2lhn)YO>vO?yZY)=a7kIK0gCEZiHGMvbIc{H84MK05h zB=_`EoCzubj8Zw?<9?-w83Idb8Cy6>L* K>VCN2So;UZAj3HT literal 0 HcmV?d00001 diff --git a/cookbook/locale/id/LC_MESSAGES/django.mo b/cookbook/locale/id/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..8e05898589543ea22dd14b359edcbeea8eba4b72 GIT binary patch literal 8059 zcma)>ON<@aS;s3G6Tk#QGQ0!B@jz%B`_^rH5@NR>q;0n+o*sKzc6%lhu{rnF>3dJ# zdfcf;w|gWY2(ckTC{eNjMaq&zf{;+yu|Pr~v4BM4wStI6R>=wpu|eYZKd0(;x5pxs zRQ<2Vsqg#F_x^7G+eglPIpMg;`SYA--k&6o!SBAnAC9X(kR(3?UIRY>J_0`iz74(& z=HNB(Z@@>O7JUYI4E_-KHSh<)Z-Do}zXU%Bp5dYJ!{7n<68I_b%b?`=XK)YvPw->l zXCan@pX>2^V5jFl9O-`(+~WRU!Jh?RI-4Xv0$v3r$6Zi+d;lJTp9eR<7g+S;;4Lr( z-vGzpZ-HmPKLuX|{~VOOe+!-m|FM7nKmGIf^YWuS{}A}2;6+gDuklCwxCff|CCS&p zm$?6X7K!fnz)Rr!ek^{Mf^0dt0YW;t3!>U&2W-GMK~$Lh9VkBE0%eDP2etoeAByt* zc8`AoUe-Er6MTWqeiqyUQ}Cvtf6NXd&h z^(VoLpzJmU_5C}b=>8@sIsO3r9QZ|0`+4yf;`^7t-{3w4cfrqt7r}3XzXpB~Ds1bg zHqVbl-W1N}W|`X(3NvVX2sWmzOf#>ROP)cpY18C()y~bHcX`GxYG#Ne{sky(0 zaHR`RXY8n4@hffNR>EYyfz1)p`?6`B&5}D+Ue%`B3+vlzX-a$GXGm9-W@78qJY>%Z zie^~Yn8T{p-jG8N*>vHWOJ=`o&_I0@9+;|Y&p|k7vPtf`J=^8&faXc*SzAdr=p!?S zbEHKaSGU@!HKjW|p$9HmY|;DFFI~DKv$Qj}y6K?FO^bbf=^8Vy4$WTo?z^ZL1K4^x zm-(<3tYM07Yd@=PVH#if+}6H5GMHpKmjvfsI!jFsi36K=EXF*gDJm4+9xbb=dOs_9 zkX=Bas8dsR5RLXQu5|Sb=0(-XlD;(iRhL7mSGyFB`K#KyCfPdWW;U;}3!1bGSDs6@ zN;}bqO}AWDb!+yp)?RIK+o}wNk3D9^E^c62l?Uk5WGJq%dGM#>FYQSuypU`?o#tI8 z4?f|4bBpQaW~G@EG-+}#x}F>}Dpk@<+{~Ay6vw7;58PRrbWPf8GOpDEEnjQwTJ*=- zwOw86L2k3P5SCn**`c4#*DgGt+0x=A1j~xW^Lgxe_Y9Mzo+$FyxS9^vO=b1sIn086 zC9@@UV8hgy$1Zp1ooDSFZ;HW(8S&m?Syu-rsz%%R6^iT?^iF4UIalVEuFQgxN<*N} zI=SyXpF4B^ZbI~ueaxX%9tn{lqw8{tGmudvc;noVo*L7YnX60Q&HKP;(&YZic7x58 zQ>J*>@tY>uc1JQ&lf3RMBD-RVcrr{@SIbHDH1J}_t~PeLG)vnw!KhkNx~J_luR2`e z`+r@PWVeZJ2=h7*99Ey3^Eakd=5CE^S5&P_m-FTL&`mOXFupMkZxpU%M$*GGj`}R$ zW17;@Ah$<%gwM%+N#wnDBu9p70sG_uAx2n`xJh~>JJXPq7gD>PDH-;8QMo2%`BPtX z1%X~n&<^jE&zry`cto>A+t|b6{ix_6nK%3)Ri21xy$IYwMok{BsGSVdn#7?by^6*( z*}>S!j*3JxCu5bfWT$q-L(J8!C(V;*$bVgn$sfl6eN0YbWq;SSN4euheym*PNNw%B z%Cwj0u(%EQ|khx}B`%sBQXF9Ju zK9|C#jloix^%(F}pWxRrscDYNX=>h5@;~tI5Gj?bPu9C&1r}kQ6uu`V13a3)&a$K+Qvw2JQ!qW@FGBr;cht#p?thj}GR#2q;lCWF4N}&24 zKgZ0-MjW?#ObKC|MKw|IB9sl)mvVtmw8#*0ye;vBoZ^D;L4I`!ZO@hpTh36>sm-pG z0{_}qnO+|%xbf*B#!o&YxTH5!5-TGK3D1aDkN)~t-h9;icJjEbYUP|B%@gv@uF7|^ zTd9emXP{PeORSHgn-$fd8^uGTMj~_*wlVH0c9G4{^r?cFnmco+AX17{I>9`oN0qK% zI-YCqn89qn7GPDA;$5iPt6I#SRNHAW7Jc3d`3V}UHYxNE^h~jPP}Br=60X-wV5i>?$E%zmx?@3t4_NuuK$*e(uANqKdq_- z(u^loaN%T>zNIEng{1KBl5x=TllvjEID!MH&76Z!q$tdI%G*Dwx~TCF7%kGc}&UC$Im2#;VaUCl7ks?LLgnJ6;wI& zR6*$F&hlXB-&7*4X+4odMysoRGSTRMHhPmpN=LI{b~f*9Z@#)^-rRch`2HIY&pvYU zoza74=Cjf5Zq|%;s||B@=Z)Rb9o0rY8r{WVH_VmwD_2JApB!DjVlH3XxUzn6{mS|} z3rCOKffwn^Wr-TKvyS6;ce&T;m2q#W(mwrp}sq->Z&m*>{p2#}KFXb3(vQ>T_P zBiv$rtl^_wXNwJUzswW~9?RUAx9xIcJZ^hpE^VnfRaHafV2oz8=VshLqy(z3ZAKG2 zrDA1cpN)^HZy2AQeQ^K5*0F*vr|W0$RMh7Zc}d|Lrll&6sr0_Qt|VBKXl_2)y*Ijg zyiTI*xq7r!QeAPv4Re(|c6KN4YMYPlVfkjml*@42+`N39#zAjxu3ta*?jQ2?G_qrP;xHN2)|@KjRG3RpXP*MeFyHU0Y1-e8KYtskv+^w3}sS zHDl#gE*Iyl)@OEMGL%v0omRK5r8_hGeqrea>?K;_P8_I=D4z?fRheISgdjhVILq0r zE3InJ6md)y2Q78*B(7cvfX`}I5=NE?2!bh-?@6+Wqr&b(V%ue%CEJS^A?pcKIgy5~ z*CbIC7rD%lR%D)@faj%Bq+N+J$k^Iq>2tkq+{DhTH*A26b!15vHF8i*>|D8;;j8fk zj-}kl3a7v@l<`3<}^Lnx0zpkPM>qq zmoMO%Q%x1(7^smtwDD-#4A;FKoi<7VIVs;@q#S#+y}t&nGoh_?Jgf`zS?~)<=7^fe zY8cZL-zUek=Q3N+n?F|i8y|8 zNzDVtWRHU=Y(xBJIHdesqbhok`p`zFCtcl@!Qx?BqrExySWK-*#jcD(1iN(I*yR3Q zbKBJm+aw_wD4)TEK^RAhY>G(-JIP)+FSWx_sdr^lU(KhOAZ$!5;e+YD4_01 zg=tVB=@(tA1>b+Nqf=Yu;`jLWbLCmd8`U{%FphXC5vR1kpvG`Vu?V54;y{!}YxH9t z7DwZboyZU~B_fUh*(yO%)D>dL4Tri+hZ$>643N_$_!1ipB{{SNDn|(9`1NN=q$tNn zp)lrAq^+<(OG>6(g>+b;BARYhXGJ3u5HX`pDOLEY08%k|fdlu2AKF2yeO-xP^qt5+ z4VJ3{#xIyOAPRIsv~fAV^6{f-ND8q)^;IjAeI~)p^c$e&!%HFl8Dygl*am3;UD8c4 z|1niOPi2ErdU2EEx)zd&N|RLep65Xwp{8fSW=QM@hd<#GjE5(O#vLhFQqe~+FlyoI zo~&hQ095Hv$kfeL!!$pVcw%N7bQwCLAb=|T@H9RM!J@>P`96U&L8?i_P>YHmK|}6d znR*t6I}}YzM7l|nSNkT0VRE?a>+b44{tzs;?`u*>o zT2WR|4w!Y6akX!DF&6TK^8#NyCr@mOuXYorP8(WMX3jpq{m>KkQE(!OhMt{&UZ~PN zTjN5QqToRzVP5WO4)RC$#Obuo^2@JW{S>wMd5q#vl93dR&8RxPmlgetdfb(#=Jilp o|E~#k(Xn5-`;g8e+h`0FhJ?K}LQk(M7KOz(I{vkhb$OcnFBPT8{{R30 literal 0 HcmV?d00001 diff --git a/cookbook/locale/it/LC_MESSAGES/django.mo b/cookbook/locale/it/LC_MESSAGES/django.mo index e109190f0aece9d9a862002cca0185176f129b1f..b12ec2689bdb0fd07766df8709c67312ec70bc5a 100644 GIT binary patch delta 10695 zcma*scYIV;-pBEqgiu0Dq1P({0VG2T5IR9RND~1SkqpTs8AxV^$t00F2qIF%LY1O` zND)ymsL!&n7Sw%ElvS`IyW-kKcGbnQs}IlTJLj+u>|f7)`OEv1d+#~-ch0>5{OwHq zXJ5oe|D0N5ox|~Loa3~@6ZIWubiCutZ>d(t+0&jr+>3v~{0@#Yf^+jaI?gOyp6)ma zc(Ie?oX1}}JI)RG`E};}oD9e5#&u~P$Kg_EFxEjo)^(hyQ%)g;hN$g$0P9iTjLmQl z*1{Jt4Uc0op2eDY0h90|rlLk`3TfCEuS2yLV)68@f z-atKs`FIp{gEm=?(+AsQcbtxca4ojOcTo@U3--pE*|8^e@~{T=8&DaTfJuz+Or@YF zE5cNqi}`pjw#Eyn3+m;V2{geQskcJ42T_@rgKcpUY9iav#bc-peu|pFc~l0z!)OBv zaXbcPCmHpGL-1xCg}U%j)Oq``HXgR^$FK?Y*Rc_Pg6jXt>hv)6I;iVYQ5n4k+hCvv z`Pa(D2$u+5LhI!Q6q1LVdlW{95bx+!QHEMz{qcZj<)Z6ne>V7|95&jb!qqmn? ziYiQ_z7e$qPedtnpl}3r;U}n6eT90$pHUNtV>W9s6-#k9R$wD`qMm#OcEtx#6M7zX zzgKW5p1@6*$}6D<*^kO(^l1vZ;3#UKV;I8I_JpDROlHQT&bt-)L^%1V6bF!pbmpN3 zthOFTP3%R~b;oV}BsQV`9uCm^e}Tdn8Z!Dj&TO2An(?=&fpR!Y85x8cU_5H(Q&9ag zY=6kMM^Srb1!}Fgpw2sJ>(Ap9>ZdV9?|;{Uj^m+W02X2yDn)OjZuA~D$FERpo{(oU z)eu#8u_JaxWn?01g8A4KXQ48&1T~SBsHJ^KMk(x|pcL&x-SD9GD3S!{I96dTzA`MM z6Gbi6VN|AG$7Psuy_xt!sQWyOy6@w*egKvFBd7_T!l+I-LqWUp9IAd1^(6m7Wv2FE z^I^$FJ<$}@`9ahTmtYQVLM_#ss3$#(ui-a10iPXWeizhc);h1(Q1Y)Y*l-$j!35L< zrlV%)LoG!asy~bxcoAxXYf)>w9TV_bRO%0-&VL0p&?)SKpP-hi{xDPTK8*Y)(lDI{ zo#?|(7(uQ5R@4(eg}UJ%Q4@OyY1ifEwUq)I`qP`Y*PgILh2N72D8%4YtBO zEWv5W1ftHX6q?cSCQimLur>}DZ3Y^S8elBy!!#AOG$(BPpHUh51~sw2qf+~m?N7YH z)KgIp>Y_fq-D2&m|3C`5;TWuk(@`gsViL|rrD_=}mG`0k#Ip@G(Vb(=b^Fn!{V=Ni z%viGrKE=A!zectHh}y)Lu)f~^v~e~?s1x$A9*#tvI2pU*Ol*%EP!l?W%G}GS>(1Kt z&#?jZ3#d%|hRRIc@y1lt=4_5pb+o0R0Xy0ga_k9xP&dl6?c-t{>W`u}S^8A7B$=ps4^*lLpfWWYwL}rr9$1Px?_N{}*5hq>9QnRP zosQIkG;~1?ya}@~j_>MF%)#L}2iM?>s68|3cJtdXgd?c$Lw*rD|3D4Ub2@=*Q1#c4 zXK>Q<&7UO~<3PrDwo%wf$H%A}&GGU%#g{M-Yt1l!+#Z2_sc**S_#Sq{?{ENKQ(!WX zj}_FHqX#cx26_t3Z_(SZHTC(J!1&H43i0?b>UG(UHSnNqe-^dYzeA<+bxgz4s0n?E z+O+L`=9kMP)WD0d7e0k2;y4fgK>Zok`$vqFkpG@^%<_{O+%c2Qgul&V37ApsGBQBD z59^bR^Fm4)J9@TR%M+;0cM0`=Cxy-H*aY>uc1G=m9J~gHp!P%&DuaPA`Pch+4-I;s zx1utz6Pw{7Y=>`PKK>oG_7iv|w7W}D1I$C+XB95M?Kl?OM$AM5c$3Ge|H~0vZu}@GF_#U+<66ctV4nkJb z8G)McAxy!ewjMoc3-4nyI?iDu{HJYiIM-~pW~h{P#U|Jt^}3Em?e3?s27ZkC9(;xx z=zCPgYRoeeO~&@rT_h7xXD9{DY#izdZbn@&3wd*#D%*a>dI2?&xcO#j>fkQw*PK*bG(gWb2u@mwFyX3Fm8mXn>iE%#)wTzSMt4JyCZ$^>*||FXrLn zxC8YhV-}mYVKS=j!&Vr;5Uxah^M6HczN97QzKt;U_y6V;^dy}y4||{nthDV5tSe9x z+JJiRx1g46H%`UFI2oJV#a9%|a5#Q}dR@CMH5nOz%E;KI6H*SVR4&{@+m7B`-6X?y-#2YmElcpcziUo|tdz z8&DJ2g}U$vYGUV5YyLM|Pq@cqEXCRk)!!CtVGfSKzR0RMci}*+8C`A$7=}}5xD6k{ zLs%1UT45$O6%(n?#O4^nbX91vs zI?XAxq~kiQkHb+Sor77_mtzM0-qycD4bbvFlQ9>&Q}2eFP$4RFmDc;Q zp5Fh*Da6z99P+t#4#zqeWM;_iwm$RK7+OK4b*_|Vt@P+^?)58 zF#Xq~?lT$_8Q&?Ppxqfj-XP~rY>SBxn$6Pzlc;B)He)Z;4acI+n`!%3U<2ywP!rjS zy>LG!;OD4`evQ2`ehu%xc4t2d+5r8(G)C8NL-hvM6$bTw@-89Ib%id7pK{FKWgClSO-^P8m?PU{x4D3OM_CjcY_)5X}m9ve+@&e^~8tF4f0W&G>Dq$ z0&I*+Py;`NdAJW7;(64-zhV=tyUDyY?J$?RFG@kL$yQYAcA|Fi3#ggCg1YfZ)WGL# z``=I#{spy!@te(kl2EU03TlE~Q2m+M2z#Nf8-pV-I+=n}^@w#JY68!pi$_ocpGDpH z8`O#7afz)*QRA#aE$K$=%=pe;3Yy_5Y>H=W{Riv6P-~m8 z)qH50;6&#F?olDpq*Y4)8 zad;f{T9)l0|GLo~6tr8Tr~&W8YjGQD4PQoGa0a!8pJOI|k7M!Lz2*ZG#(St&;$pmn zdARs-^S9n(IFfp;eU7slC+s8tTJw)-=#M|+aP0Yn`MtgnCsY3xvvJ6N^S9P2oJIXD z)I|F~X_m~3Vd}e3_iO%?`5z8bZ~*n4sQdjD`(d90KxK4eltLQ{kK#~#3H8mcU2P^X z$Xbco<@-6I-#Qqzca+#kY1B7hnZ2+L{!D!nve{$rGsKSB{9I|zQ^Tvo8tQLiT{UogMrfn)?Q!n1=MJXq zquh&#L~Y{>H0n4-OeA{H{$FaaM_cNX?YYm>R-f`H+t-Tnqm&!i{#umv*ZKcOZDJjJ zY+rNhN!s)Z>;INGyJ+N9b*AB6c!=0R+(*>47nI^K>XYyR+=e${GBJU&2e)7W4#gkv zb)paP74a*fqZ@tGu?zBV57F5FcwSAz(=-$lI;wFh(V7@SEGI_Oem#*wbR_;jZnAjz@^EiBe*jd47HYQPHu5 zNG0@3X+BZFMK=&n*^4`31+kAl9cPLD#3I|@2QN`yN?bm|wCyGMT^0LXQHWcK+h`l1 z_y4dxa|k|1EV1>Q=}WU^F^E`0?4w;rbK)_|bBQliCb|$>(^rV8#0Ek~F7Z8aE0IIA zbTEZ`Dd-qTIh%Np=u5pG(U7u^d#x%jpj?KViKmDsh;c+$LPs+Fe=^0`U&mE^ zoVM4ng!rc#%n@}Sq)<(~OngCnOYF9T1+CL)>rVM!_!BXfs838Hnh}eL_lQr3BF^h= zud9dpwLa3;L)II09`S*4l|W$=p(D$lpmGPwTAl}pxzw8w_fu|!eYgOXC^5op_sAWlxI39Yif6LVFc)L@_C9qw&o8MyG6mUn;!NRg#5mAx5{5y z>K6F}g|Q}o$d~Tv?7Cxv5nmrSQsOUngQ18&7%=A*1Or8-enzkIM@roED&LHB*BiUk zTb1sX`64C3!t%Oqu;}vG)t~2%Oz1yEEey!rU9Vdn@r7J&9P)-Eba>oh%%`lPG~y4H z`Zz7*^G4L^<$k`fr#hqW$fU$^RRLePx?acSOiBG59x9emuN&}H>6ycYvANB0 zy#)oqia^9I3J1%sx^T_8Thn@!`-=mvKj2oBYa-tN-<8$pZrxBTjoEoLwFPdKx7_s> z7WxX;e0NJ@kH?vJbywI|7Odp)Vl#-8_}uc6U?`;VO8w<)A~WU;yD4LEn1r!J8AH5U zwCv36?2OFZjI3-ot9PI5%tla9Pg8s?1M+OT0 zzDPJ&J*<3GLhHf7(o$dX)fv0I)4bL9Rd!2^^7I82elp+<``l8m8}=9Y!UbM8y^?iE zXXkkfU0=DcEaVTmv7SI-&<**t{Wvq?O?NAO;qb9-Zds7^^hScVgPzVFZ9;D!cXoxZ zJmO^=&SmaCH^5#zw#O|9mW90SBmNnF_6#d{)#$N(se7?2J=M?6dn;k;$RTba6AhR- zMz|r>*xUm_vm?28kvF#RK94)8T$9mE?M4jybwQXN9Pyip*d6QjR4#E;+?1x%y|8Fyra#n$yc#Dhuyb}~kOV>=;(Wupx XTlU{)h5f8(d2o$)S&KEt_V@W;7TiLE delta 9330 zcmY+}33yJ|zQ^$;K_p}_G$Lk#7!t&k7-OEtC_&Y%=6N3a8bV_#qSP33jVbybQ>iM) zP_5w_t6WaaRZ4qYr;57Y-@BIk^seXm`>g-kd#}CrT5In&r|0f{zt`9NJU4P>UTi2^ zGZ|9=2L&6G;AhOiNVOWXrnoVCa4p`%v!r!8eX@NJ& z*z?PlGp0P(Wsfn2OH2(6#2%R47>^l9B_|DI-GNz{gM1N2;2I3T{g@lS!7#jpS@9kQ z;bY8&e_&qB9?Q+JII6uHX2B5{isLYX`H&Vk1pEtmQWIa%K6wMwfLmd1?r%C#(Fg})cbtL+@h8+&y+PeL zFwU5E7>a7|iJE~ySQtm52CxW=;2zY>UBS$F6ZPbGFa)2WrxF!^{?QGpVKUZ2UAP2w zVmfBS4A;H~!^sc1_DjwisPpfmX6`u_!um{;2HF!fGyPFZJEk)8uc?_&Lrz?Qdh!g^ z6n%%f@nx6aL=EgAYN>ulb(m1a+6Z-{B+P@IaSRT1?e|bK_ZSoLKUJ82txP9EAFP_DBuxd3s^(` zm23KDz+>uBQO9jjBT7b{(951+hP(DDs68?VwYIBJ=Y8Sw!`PAh66(B|THGA#U~e3P znwblz<3C_Nz5frXXpJ-1wo?>_%8O!2j6uyrd(;4XU|t-Adg2t+K<1*Ba=CLoYG$^h z`uoCp2)U&>g=6*pXRBjBC{s{tbO1F~-{VJ^E76X8IjW=8sE)U}d>3lUzd{Y@BI@{c z)F!-z%Acbi8Jveanxb2KE3o zkf*3U@(MLW!HsQ4#Zc$fM%}m(Y6;#&f9!@jzZaIqahMf7>!_&XEvNzPcKH#PpFwqa z4GZBzEP#Pc_+`YB7=ZIJ0zbtLxD&HsKvR38FjW6}Q6HcvWGOsmu{*E{H8uZ0jch+^ zN)Nl^XIy>_HK3nSpVmKId$wkFZNpJFibfr;fh?ij%R%?v8) zaGn})3F-;cF&HyYGjhOr1hbHT>+-XhgZ#3~Z@c3UQT;r1?Qf8u0h6_rosmTJsH5go zWLpfzj;Mk3K~3Rc)RRxf5S)cNe3JJbzUVj}Kx{*IdZN^Oj(fbDP_PRD30&sS;=CSwNP zK|MfPJLX@zb!j{MT0Fsud+Z8oN&e+>&s{2->R(Y8yu>h!qId0qDyR!tM9pQ^aq<&ThSO;f(Z1#tt` z!6Ud7{oc17t-uE4cQ6r4cVqo=0M@{-Fdx3a@|e3jUrDTw(cIrmqcWO?Z5WG1d+?i& zZLlzYh#EjT>WL4cA0Ea~Jc^pq3$FbK)Y@J{&D>+u-gu50P*6|1NgH82_cvpytk1+J z6AzKM@6E}WyALx$dl2*58SAppLAbIXQ|!kc>CY3BUmeJjVdP*tLuJ`{TB?Dly_Jr7 zJ-1*k+>Lr2PohU_eV$5Dyp3A(EG(#|EEw}(Db(hxiJ@2@BQObz;UMge^HFR46hkok zFuRu`QT>#~$(V?(@X#>kUn313&Qt3E@=#_mY9Mb=#{)*#KSHZxP4W?#A9tVz`W^CS znY*Ybt-(7NhK(^7CSwsCh=p)2>b2fBlKIyf$B(j8l8k!&dLkRt^mFb1L=ET+#^Gg* z#XvSrMT|!sAAq`k1cu@`)BsXZYrg_DlUI;cGdDa`v`Lzcv706dmG^NDK~42o%#90B zH`;*VxE=M{9Yt;0GGpy#Oh&!dT`?yPK+Vh~)WA|P3O!4yXfu3;y739rh|i%exQ)H= ziEB?9XOH(q4P-oO38vy_xB~Sy)EjS)H^zG8tx-#th8nM9-!9jHEIe& zCfL8}@}Tk>I2G%nIy{Pc;;a+xlU7E}P+im#y^9)PD(Z#{T)xKTo6)29e;*Zf96!lE z@t0VG{5a}K{MfQuvjFUYA-ENXp=K=qhjzC|q4G*t0Ba%}-E_iWJcXL+A5i_?!Vtax z_o-;Do?{~V)2JKjk5jcbcP67Q?1Or*2cVW}Gb_z*nzD@&A?97j2y;y z@FaS4;06`>D{7>Fp-#xbw8&zpfy84JHbg!ZW&mmcSFtQU!nPPO%?@+`>iAI9b<y-f7IgJ`_i3sEX%NdEj(=;|SD+v8aJ1q1L#E%SWSTYPxf_JH8P0q#LmbW*}oT z&#?}UOR@d$OJS-y(r|``)mUVpM{J7ANg9DyVYzK2O zn0y6lq+3u+u>*7BF-*iO7>W^#?RC)@PF@Y`VJp<0S%`WozC~@;bEpAcTFm^b!<#hd zhQGN3Z_u}ay3tD1Qf|i5xF5CoZew2j#pV7>ZM!Es z6|HG*)CZ*`CShIFKo+BR@m8#ZcTk%zYMFii6Y)Fp5vWaDdpZB53kTwHEVRNt@m*|5 z{tz2r{7T=Cmd8w{GK_|cI1?MLvTOD|HYd-VZeP1LSb%&OYM}G51a3w?j^>QB!)klo z4Sb*WGHdJ}nT6V%%TP188N>Ac@1~*|IF35uDr&7CpiX>(Bk>h>!(nUf|A07$>^~E_ z&VKPW;Ck|_sMm2aiTX)JZPNLurCE)|aVLgze{+$FF8BqthR?AA`fad(CRaj#@@bfg zGjSS*ZnSSf8h%WE0ky_GKeJ!L3D}r?9}YpY$^M-%6yr#bqo)&<7gPpf(q=odudxC7 zZ5)BoTWp6bum$;5tc@kN+7A0*P4a`NP5A<=VAwW$T_dbao`REbKbFI)+nIk=dTqD6 zbpb|^e~Ek+%uV#epHNeH2eaWbcl|2c*_ePwQT={Ms03^M z-_hgZ z{yyjCCGP0{$yD+X?-JpXwzgPKClZedl@1ouhhwX$?#6`YM`7W&Jz!nP^wvc8#s}Acdl89 zXNgSI7vW^=NHix@KH~l+ghabprI5w!$4jpMFKo;?k(h_LOY|ZR64Au3gvxB!X)Ja9 zACfPT7sX7Veha@PRI-!*jQ{P+nEyHM!YI5)V>e87ZTfKCDk=wvHpF`_S6e*wFI1sC(m#JY zR*;k*NmH7(c{)b;`;?l zq28J(MhC@R`*`PDQryiC)1d!iqVg$Ghv=e&vdm)sfot^Ne+#-3D`PY<&gB7^gOiG2 zD()c$5Y^oATv*@L=hCinlc+&tCYBIi6SIhkgvwMRv%ALE!2QhvUyUCY4&ND|e3H)1qxNFRbIce|f@-fb?m`?k6B8J#X)FgC&U-^`zETK|_Xit4H zq5lBYfl$d$TqUNFZ&8CQUEOh|NklD|hft58UKU>wm0Wv83?xt2{ewv+le{enRMrz= z#0-wja~I`z>WzuwSS^AdJhPU37k+?W;Rc+E&4?Mq5TYN^i1yd0(vW%|yshWoL8Yf! zDaVOc9Q+S{jI{}s+C*+wSDr=xP?{6#h&mjbj&t2P!>AXhz5+vWkZWJ(tU&uIqM_#h zC*p1C$qB_s$`GGX-;L#occ`ZkZ%cpb%ZU>-^v2;tQR?M!CGjCqle_`3jQU7IeV?mf@n(aCHhiN zcE?UTuf5%W|Kl3Aa8ftwm5J5VOA#^Dr(+t1;d&y7C`YLHTTBh|6+}zdo`jQ#S;RnM z6X*3H7831=Y_!Gd{f{6~8A|N))$AXfanwt=e2ue;^Pkwt)yL3LDe5m=-kN+PF^c$$ zw(Z0fq9pN@m`M9OsM12aR^4-Z&KVsKd)bv$jshd3AO#bv9%fpc_%jhIg@uu(@I&rw_5iM z_MY#W60m4zpV0+l+VvUJe`NomLt+~A7}ckGk+=$RaWNGVV&bY4sTk)S*tb@gch{Jv u{@#cQv01!NJ*WJ=;VGSScqcEY;OD)Ub|}DmczKR6Z|7|f0v2ueCj2k%lctXV diff --git a/cookbook/locale/pt/LC_MESSAGES/django.mo b/cookbook/locale/pt/LC_MESSAGES/django.mo index b57ca7660d4f4adf574b2114e9ee9e1a0ded5bd5..4a9ae440c945223437e549d3e10c28e8e6fd2827 100644 GIT binary patch delta 3781 zcmaLZeQ;FO8OQMx@&Y7*K&Vg^mus~I2pe_-2n0pmDG(|Kf(RvWlfB6<-RxcVZW2N5 zBEAsuwZ){^sM9jOk#WYhj%{UHtl~_I&J;%)Yg@5@v=yjzT53D}{`Q_&hCh0S z=YGyP_wKppJonriPINrjRT!=<8!(hXVk&W>%$T?EjkW6!<1^ZAFcpaImdE1_U2e;CG569p_W;Gg@q1tP$EvN}@FP<+L(@teI9lMc5nis6E zpe}p^KZhr=7eBQ9ZOm>dZ4Wh(r;vM_BdE;0jLPV1*ohyY#%pGEB+qQZ9`0}2sc5FB zP#63Tm5C2+`@Hp^sOvNvIR;nZ1k`|AP`~$Z9HwpmKGb;kBXc*8S)anf<#fD6MKeB$ z8h99$vNNdEe`L@9-CA;)F*ndZ4*PIDHsLW;2L6MZSk2@xGp(p`wpn*sJ16t}8#s}s zgMa2b95nNzI0t`t;)Ynv|$9hkjHH9!`b+4)Qpd#R`#ZCpF-Vm7&XB^qgMJc7Bh53n7MM)1Zz;^ zOt$T*s0kLXp%SAKL#50`U3dsv@ln)@&R~H5u;mAnH5tYutvDt_nXO8Pp#60gl3VPy?MtP3(QtfPX_}?o)i7 z6i*!&W#(zziO-_O8Gmg!kqB0Be^W<=MVkiHGg)sh*osQ2i@bTp zM@{e^RO%1mO8gdT<-^wVs2f*&F`URa{66jJsQzE!8vG3w)G=*(IKXt&z)h&lxEA{{ ziAwP~RLU>d{_47LMFXf!_#|op&tL`q2(@W{hT5DbZ2J_>qWyP8Du8CZvWQ_NP>N;9Yl9zfmjanyCsq89KnY65Sd#yN?)?vJ<;&*43|d?xw7fy(ij z;RWSPOS`ugM`Ic_P#!hW+im{?*hu>@YGS{zp2m9G=TQ@l(9rK2u?!cX`j;RthG{9- z6B*PD1Du2VQ7d{LwW3$B9N$Du>@C!0d>0-3tL?9u9rjPbG4#(uWppko6Dv^@+G5Wa zcGyZMYGyua;JZeeK7vb2jCm2OX@3$8CsNwLL<^{e97NrC z0JYh_8}=8>52@%z$FT}eTmOU_;A7MeKeg>r(xd(=-%n*cC;D+WeiOIiD3-Abw__k|s1Mz9GfORD(;1jl@WK zfXX2vOEeSTAXF9-dx$PVn_VSIut!ZnyZuHYMJysNF8aDLC(}Xn5-g}#>NqN6BV`R0 zl2+WHEvR(wC)grpA8~1!O@|&CMeFCwM0~Ya3lG{4cM}r`rCL|rMqE?5)Mgtgqed#|5tX(*a8dvD z)b*;aChoeZf0wNf;! zb-mwxgx>p^#7bfdp`x$lO~iw0D8ZXJMu>T8QWg{Z@9DGRd{*Osu+$e2^N9^aJMk5w zo@gL;6Uzu*^pIU(JK40G37jD5_oNd}yGPBJ$>v&E=+j6UbjPnovfQjZkx@~#dyb_@c%dD&~N8_RPtX}JjXu( delta 3328 zcmYk;d2AGA7{~FqP>yba(xn_C$8xsNgSN_54ofKo1PYXjK$WtEQd)aJk1cYI#=RJeuVXiS4_o7T z9EIPaAN?`Lw88<%Ka=1d5PcO*!iN zGMt0;*cLBf8@y=GuUc=S61?kPcZ_*JCx?L+EQ3Xw$=2DZ4=%(wEW;2wcKjY@a{dsN z$XK#vDl;BcnS4}57vN%CjhgRgq$uVV)^UIHfQ~X<%Chx=<)}(H_I$H-C+c&1tp{-e z=SNW!Hlx1(5P3=_lB_lEN6ps<$<-uT$D;EH12gC-<1*9@LZ}k1L6x@AUf*inhhrE& zjP>{vW?(^QFQGlCid;f{|El#D>+hJt_}$Jt|1Na;a!|%2aR^RCJ>z=R1P!PO8hl$-#A{KdU5mQm%c#9@2vy0G7~m~BZO9zsn1RPpulsK}k7-RJ@5m?yHljAg z$JhdIqbB+jmB@Y6gwZ{{O2y%;lr#ae@GNEgitE0B_qofcM{omq!OUOC6vo%bTSz?S zaDS6bhkapck>47#1@(njuo#b{GLP%)U7wCD-V`EF&8$FGViy+Te$+e?jQZGf7I)vG{0kuayw_ZWr_zo(O`}ijM`+MVOa3bfQ z*z@QC-uL~ec?Y7S%{P?JCd@}=d>K{p8+QC})QTDgdYf)1Y6bgH2^>Lf(qpL2_`W^= z6bEyD9^HzdTakG0(R7NZ{<=|r22_Dz$ZvzmMy+%nD#1$B4Y#5`w;#2Fqu3fxq2~Dr z^|=c;125xxOiA#5u)?TKdK=r|ltI*A6U-XqWjGIYp$yZp8kNvt>uF5n{7Y1V4^iKb zWtoxK4K>~q+2AJ4j!#1+mWM;I5Ver)4jrxJ0Jg%nQ3;$xZNd*QfM3}0W;=clRmv!` z(JuF+D$oy=&`{L%(bfs5#Bx#d7NPc$p^?>pveI{M=G-hjDgy@|Ye<__|>Ok9dr z;xRa%^DI<}522p%ho}{2QD3ce3M#=u?0_X$h9PW;SFxSm|Lb(v;N}hv!*2X8F2Lzn zizkqxm;o$XE1$_h6Rbnsuo3n9vBRFfflBNIQc$y&s3RH(HJ+S#mY7DA>HTMZvxQK$ zYAo1oy2%P+3ZX}`h)`QX#1Ja0kNB^Rq@$IW6C;S{iHU@M&ef`kJh$g1sIJqWLx`B5 zGg>^ci_jxcnbowj*SJ0JFy8i69kop!CKn&K{TH#67)@jo`iYMvw8;yI^#sjvORe5c z9cWn|?z105zk*Pe)HZs!|D76c`z5%F(0i@6oX|$oqg2~LOeNOo#5O&y$;2GZ9H29U zm_;-a^+Z2n60wwcn%G996KZ*_>3+|bB7zZiDGGeGVWHPPV%=&}1l?d7~{z$ri zv^L{Qc1$?D)^20-8~$_RzA6j7A@}$k$L&P19V@bm#Q*hs({Cbr5ottw;z>g72@kUp z^@plZ=e~ei_c(#1SS<%R+lcTD-O&mEe{0)qn9kI$*c&LmKRkmPpPUd c37_i~6%jEae6e?uFYF)uN9*vRv|ADX0(9m Date: Mon, 31 Oct 2022 08:02:46 +0000 Subject: [PATCH 61/77] Bump django from 4.0.7 to 4.0.8 Bumps [django](https://github.com/django/django) from 4.0.7 to 4.0.8. - [Release notes](https://github.com/django/django/releases) - [Commits](https://github.com/django/django/compare/4.0.7...4.0.8) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2406f85785..5767f1096e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==4.0.7 +Django==4.0.8 cryptography==38.0.1 django-annoying==0.10.6 django-autocomplete-light==3.9.4 From 3371102e64a96ec91a85f2467fecb3ab38072848 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Mon, 31 Oct 2022 14:24:41 +0100 Subject: [PATCH 62/77] improved and added tests for share link creation --- cookbook/tests/api/test_api_share_link.py | 14 ++++++++++++++ cookbook/views/api.py | 17 ++++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 cookbook/tests/api/test_api_share_link.py diff --git a/cookbook/tests/api/test_api_share_link.py b/cookbook/tests/api/test_api_share_link.py new file mode 100644 index 0000000000..3fd2982f25 --- /dev/null +++ b/cookbook/tests/api/test_api_share_link.py @@ -0,0 +1,14 @@ +from django.urls import reverse +from django_scopes import scopes_disabled + + +def test_get_share_link(recipe_1_s1, u1_s1, u1_s2, g1_s1, a_u, space_1): + assert u1_s1.get(reverse('api_share_link', args=[recipe_1_s1.pk])).status_code == 200 + assert u1_s2.get(reverse('api_share_link', args=[recipe_1_s1.pk])).status_code == 404 + assert g1_s1.get(reverse('api_share_link', args=[recipe_1_s1.pk])).status_code == 403 + assert a_u.get(reverse('api_share_link', args=[recipe_1_s1.pk])).status_code == 403 + + with scopes_disabled(): + space_1.allow_sharing = False + space_1.save() + assert u1_s1.get(reverse('api_share_link', args=[recipe_1_s1.pk])).status_code == 403 diff --git a/cookbook/views/api.py b/cookbook/views/api.py index 10fb855901..1be0f0d95b 100644 --- a/cookbook/views/api.py +++ b/cookbook/views/api.py @@ -1382,13 +1382,16 @@ def sync_all(request): def share_link(request, pk): - if request.space.allow_sharing and has_group_permission(request.user, ('user',)): - recipe = get_object_or_404(Recipe, pk=pk, space=request.space) - link = ShareLink.objects.create(recipe=recipe, created_by=request.user, space=request.space) - return JsonResponse({'pk': pk, 'share': link.uuid, - 'link': request.build_absolute_uri(reverse('view_recipe', args=[pk, link.uuid]))}) - else: - return JsonResponse({'error': 'sharing_disabled'}, status=403) + if request.user.is_authenticated: + if request.space.allow_sharing and has_group_permission(request.user, ('user',)): + recipe = get_object_or_404(Recipe, pk=pk, space=request.space) + link = ShareLink.objects.create(recipe=recipe, created_by=request.user, space=request.space) + return JsonResponse({'pk': pk, 'share': link.uuid, + 'link': request.build_absolute_uri(reverse('view_recipe', args=[pk, link.uuid]))}) + else: + return JsonResponse({'error': 'sharing_disabled'}, status=403) + + return JsonResponse({'error': 'not_authenticated'}, status=403) @group_required('user') From 327c83ce3252a38360d1983f1d6fbe9e9d050646 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Mon, 31 Oct 2022 14:30:39 +0100 Subject: [PATCH 63/77] improved share link tests --- cookbook/tests/api/test_api_share_link.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cookbook/tests/api/test_api_share_link.py b/cookbook/tests/api/test_api_share_link.py index 3fd2982f25..f4a0a2c45b 100644 --- a/cookbook/tests/api/test_api_share_link.py +++ b/cookbook/tests/api/test_api_share_link.py @@ -1,6 +1,11 @@ +import json + from django.urls import reverse from django_scopes import scopes_disabled +from cookbook.helper.permission_helper import share_link_valid +from cookbook.models import Recipe + def test_get_share_link(recipe_1_s1, u1_s1, u1_s2, g1_s1, a_u, space_1): assert u1_s1.get(reverse('api_share_link', args=[recipe_1_s1.pk])).status_code == 200 @@ -9,6 +14,9 @@ def test_get_share_link(recipe_1_s1, u1_s1, u1_s2, g1_s1, a_u, space_1): assert a_u.get(reverse('api_share_link', args=[recipe_1_s1.pk])).status_code == 403 with scopes_disabled(): + sl = json.loads(u1_s1.get(reverse('api_share_link', args=[recipe_1_s1.pk])).content) + assert share_link_valid(Recipe.objects.filter(pk=sl['pk']).get(), sl['share']) + space_1.allow_sharing = False space_1.save() assert u1_s1.get(reverse('api_share_link', args=[recipe_1_s1.pk])).status_code == 403 From d401c143ec44f0d93beecb447c4b93fd99d98a46 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Mon, 31 Oct 2022 14:58:50 +0100 Subject: [PATCH 64/77] added faq for makrdown preview --- docs/faq.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/faq.md b/docs/faq.md index 5009872f00..46840f09b0 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -48,6 +48,13 @@ The other common issue is that the recommended nginx container is removed from t If removed, the nginx webserver needs to be replaced by something else that servers the /mediafiles/ directory or `GUNICORN_MEDIA` needs to be enabled to allow media serving by the application container itself. + +## Why does the Text/Markdown preview look different than the final recipe ? + +Tandoor has always rendered the recipe instructions markdown on the server. This also allows tandoor to implement things like ingredient templating and scaling in text. +To make editing easier a markdown editor was added to the frontend with integrated preview as a temporary solution. Since the markdown editor uses a different +specification than the server the preview is different to the final result. It is planned to improve this in the future. + ## Why is Tandoor not working on my Raspberry Pi? Please refer to [here](install/docker.md#setup-issues-on-raspberry-pi). From e5b11a34f6766afc8afc1bc61b36b9b1027f7c8a Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Mon, 31 Oct 2022 19:49:24 +0100 Subject: [PATCH 65/77] Update manual.md --- docs/install/manual.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/install/manual.md b/docs/install/manual.md index 5e058eb6db..ddaaa1d588 100644 --- a/docs/install/manual.md +++ b/docs/install/manual.md @@ -215,7 +215,7 @@ bin/pip3 install -r requirements.txt # migrate database bin/python3 manage.py migrate # collect static files -# To prevent later errors, it is advisable to perform these steps more frequently until the output "0 static files copied" appears. +# if the output is not "0 static files copied" you might want to run the commands again to make sure everythig is collected bin/python3 manage.py collectstatic --no-input bin/python3 manage.py collectstatic_js_reverse # change to frontend directory From bc9d077b9d836f82fba0403941caeeb27d1979fc Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Mon, 31 Oct 2022 15:02:09 +0100 Subject: [PATCH 66/77] added used md spec to docs --- docs/faq.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/faq.md b/docs/faq.md index 46840f09b0..cc24befce5 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -55,6 +55,8 @@ Tandoor has always rendered the recipe instructions markdown on the server. This To make editing easier a markdown editor was added to the frontend with integrated preview as a temporary solution. Since the markdown editor uses a different specification than the server the preview is different to the final result. It is planned to improve this in the future. +The markdown renderer follows this markdown specification https://daringfireball.net/projects/markdown/ + ## Why is Tandoor not working on my Raspberry Pi? Please refer to [here](install/docker.md#setup-issues-on-raspberry-pi). From c2c08391ccafc9f2e09fb6633717c826bcd56868 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Mon, 31 Oct 2022 19:51:01 +0100 Subject: [PATCH 67/77] fixed sharing pref saving --- vue/src/components/Settings/MealPlanSettingsComponent.vue | 4 ++-- vue/src/components/Settings/ShoppingSettingsComponent.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vue/src/components/Settings/MealPlanSettingsComponent.vue b/vue/src/components/Settings/MealPlanSettingsComponent.vue index 7d6cac56e5..f95ab8b910 100644 --- a/vue/src/components/Settings/MealPlanSettingsComponent.vue +++ b/vue/src/components/Settings/MealPlanSettingsComponent.vue @@ -3,7 +3,7 @@ { StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_UPDATE) - if (reload !== undefined) { + if (reload) { location.reload() } }).catch(err => { diff --git a/vue/src/components/Settings/ShoppingSettingsComponent.vue b/vue/src/components/Settings/ShoppingSettingsComponent.vue index af0052d4ad..748643cf39 100644 --- a/vue/src/components/Settings/ShoppingSettingsComponent.vue +++ b/vue/src/components/Settings/ShoppingSettingsComponent.vue @@ -2,7 +2,7 @@
Date: Tue, 1 Nov 2022 11:44:56 +0100 Subject: [PATCH 68/77] Enable search plugin for docs I think mkdocs-material's search function would be a great addition to make the documentation even more accessible. At least I was looking for some info just moments ago and would've liked a search bar. From my own projects, I remembered that mkdocs-material does come with the search search plugin enabled by default. But it must be re-added to mkdocs.yml when other plugins are used. So I did. Hope this helps. :) --- mkdocs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/mkdocs.yml b/mkdocs.yml index ed6de84e2d..0e153611b3 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -23,6 +23,7 @@ markdown_extensions: plugins: - include-markdown + - search nav: - Home: 'index.md' From ead3168d80e2ca967a4886ac9e1e3d43aaa8e3da Mon Sep 17 00:00:00 2001 From: Gorkem Date: Sat, 5 Nov 2022 21:09:21 +0000 Subject: [PATCH 69/77] Added translation using Weblate (Turkish) --- vue/src/locales/tr.json | 462 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 462 insertions(+) create mode 100644 vue/src/locales/tr.json diff --git a/vue/src/locales/tr.json b/vue/src/locales/tr.json new file mode 100644 index 0000000000..364fd30d88 --- /dev/null +++ b/vue/src/locales/tr.json @@ -0,0 +1,462 @@ +{ + "warning_feature_beta": "", + "err_fetching_resource": "", + "err_creating_resource": "", + "err_updating_resource": "", + "err_deleting_resource": "", + "err_deleting_protected_resource": "", + "err_moving_resource": "", + "err_merging_resource": "", + "success_fetching_resource": "", + "success_creating_resource": "", + "success_updating_resource": "", + "success_deleting_resource": "", + "success_moving_resource": "", + "success_merging_resource": "", + "file_upload_disabled": "", + "warning_space_delete": "", + "food_inherit_info": "", + "facet_count_info": "", + "step_time_minutes": "", + "confirm_delete": "", + "import_running": "", + "all_fields_optional": "", + "convert_internal": "", + "show_only_internal": "", + "show_split_screen": "", + "Log_Recipe_Cooking": "", + "External_Recipe_Image": "", + "Add_to_Shopping": "", + "Add_to_Plan": "", + "Step_start_time": "", + "Sort_by_new": "", + "Table_of_Contents": "", + "Recipes_per_page": "", + "Show_as_header": "", + "Hide_as_header": "", + "Add_nutrition_recipe": "", + "Remove_nutrition_recipe": "", + "Copy_template_reference": "", + "Save_and_View": "", + "Manage_Books": "", + "Meal_Plan": "", + "Select_Book": "", + "Select_File": "", + "Recipe_Image": "", + "Import_finished": "", + "View_Recipes": "", + "Log_Cooking": "", + "New_Recipe": "", + "Url_Import": "", + "Reset_Search": "", + "Recently_Viewed": "", + "Load_More": "", + "New_Keyword": "", + "Delete_Keyword": "", + "Edit_Keyword": "", + "Edit_Recipe": "", + "Move_Keyword": "", + "Merge_Keyword": "", + "Hide_Keywords": "", + "Hide_Recipes": "", + "Move_Up": "", + "Move_Down": "", + "Step_Name": "", + "Step_Type": "", + "Make_Header": "", + "Make_Ingredient": "", + "Enable_Amount": "", + "Disable_Amount": "", + "Ingredient Editor": "", + "Private_Recipe": "", + "Private_Recipe_Help": "", + "reusable_help_text": "", + "Add_Step": "", + "Keywords": "", + "Books": "", + "Proteins": "", + "Fats": "", + "Carbohydrates": "", + "Calories": "", + "Energy": "", + "Nutrition": "", + "Date": "", + "Share": "", + "Automation": "", + "Parameter": "", + "Export": "", + "Copy": "", + "Rating": "", + "Close": "", + "Cancel": "", + "Link": "", + "Add": "", + "New": "", + "Note": "", + "Success": "", + "Failure": "", + "Protected": "", + "Ingredients": "", + "Supermarket": "", + "Categories": "", + "Category": "", + "Selected": "", + "min": "", + "Servings": "", + "Waiting": "", + "Preparation": "", + "External": "", + "Size": "", + "Files": "", + "File": "", + "Edit": "", + "Image": "", + "Delete": "", + "Open": "", + "Ok": "", + "Save": "", + "Step": "", + "Search": "", + "Import": "", + "Print": "", + "Settings": "", + "or": "", + "and": "", + "Information": "", + "Download": "", + "Create": "", + "Search Settings": "", + "View": "", + "Recipes": "", + "Move": "", + "Merge": "", + "Parent": "", + "Copy Link": "", + "Copy Token": "", + "delete_confirmation": "", + "move_confirmation": "", + "merge_confirmation": "", + "create_rule": "", + "move_selection": "", + "merge_selection": "", + "Root": "", + "Ignore_Shopping": "", + "Shopping_Category": "", + "Shopping_Categories": "", + "Edit_Food": "", + "Move_Food": "", + "New_Food": "", + "Hide_Food": "", + "Food_Alias": "", + "Unit_Alias": "", + "Keyword_Alias": "", + "Delete_Food": "", + "No_ID": "", + "Meal_Plan_Days": "", + "merge_title": "", + "move_title": "", + "Food": "", + "Recipe_Book": "", + "del_confirmation_tree": "", + "delete_title": "", + "create_title": "", + "edit_title": "", + "Name": "", + "Type": "", + "Description": "", + "Recipe": "", + "tree_root": "", + "Icon": "", + "Unit": "", + "Decimals": "", + "Default_Unit": "", + "No_Results": "", + "New_Unit": "", + "Create_New_Shopping Category": "", + "Create_New_Food": "", + "Create_New_Keyword": "", + "Create_New_Unit": "", + "Create_New_Meal_Type": "", + "Create_New_Shopping_Category": "", + "and_up": "", + "and_down": "", + "Instructions": "", + "Unrated": "", + "Automate": "", + "Empty": "", + "Key_Ctrl": "", + "Key_Shift": "", + "Time": "", + "Text": "", + "Shopping_list": "", + "Added_by": "", + "Added_on": "", + "AddToShopping": "", + "IngredientInShopping": "", + "NotInShopping": "", + "OnHand": "", + "FoodOnHand": "", + "FoodNotOnHand": "", + "Undefined": "", + "Create_Meal_Plan_Entry": "", + "Edit_Meal_Plan_Entry": "", + "Title": "", + "Week": "", + "Month": "", + "Year": "", + "Planner": "", + "Planner_Settings": "", + "Period": "", + "Plan_Period_To_Show": "", + "Periods": "", + "Plan_Show_How_Many_Periods": "", + "Starting_Day": "", + "Meal_Types": "", + "Meal_Type": "", + "New_Entry": "", + "Clone": "", + "Drag_Here_To_Delete": "", + "Meal_Type_Required": "", + "Title_or_Recipe_Required": "", + "Color": "", + "New_Meal_Type": "", + "Use_Fractions": "", + "Use_Fractions_Help": "", + "AddFoodToShopping": "", + "RemoveFoodFromShopping": "", + "DeleteShoppingConfirm": "", + "IgnoredFood": "", + "Add_Servings_to_Shopping": "", + "Week_Numbers": "", + "Show_Week_Numbers": "", + "Export_As_ICal": "", + "Export_To_ICal": "", + "Cannot_Add_Notes_To_Shopping": "", + "Added_To_Shopping_List": "", + "Shopping_List_Empty": "", + "Next_Period": "", + "Previous_Period": "", + "Current_Period": "", + "Next_Day": "", + "Previous_Day": "", + "Inherit": "", + "InheritFields": "", + "FoodInherit": "", + "ShowUncategorizedFood": "", + "GroupBy": "", + "Language": "", + "Theme": "", + "SupermarketCategoriesOnly": "", + "MoveCategory": "", + "CountMore": "", + "IgnoreThis": "", + "DelayFor": "", + "Warning": "", + "NoCategory": "", + "InheritWarning": "", + "ShowDelayed": "", + "Completed": "", + "OfflineAlert": "", + "shopping_share": "", + "shopping_auto_sync": "", + "one_url_per_line": "", + "mealplan_autoadd_shopping": "", + "mealplan_autoexclude_onhand": "", + "mealplan_autoinclude_related": "", + "default_delay": "", + "plan_share_desc": "", + "shopping_share_desc": "", + "shopping_auto_sync_desc": "", + "mealplan_autoadd_shopping_desc": "", + "mealplan_autoexclude_onhand_desc": "", + "mealplan_autoinclude_related_desc": "", + "default_delay_desc": "", + "filter_to_supermarket": "", + "Coming_Soon": "", + "Auto_Planner": "", + "New_Cookbook": "", + "Hide_Keyword": "", + "Hour": "", + "Hours": "", + "Day": "", + "Days": "", + "Second": "", + "Seconds": "", + "Clear": "", + "Users": "", + "Invites": "", + "err_move_self": "", + "nothing": "", + "err_merge_self": "", + "show_sql": "", + "filter_to_supermarket_desc": "", + "CategoryName": "", + "SupermarketName": "", + "CategoryInstruction": "", + "shopping_recent_days_desc": "", + "shopping_recent_days": "", + "download_pdf": "", + "download_csv": "", + "csv_delim_help": "", + "csv_delim_label": "", + "SuccessClipboard": "", + "copy_to_clipboard": "", + "csv_prefix_help": "", + "csv_prefix_label": "", + "copy_markdown_table": "", + "in_shopping": "", + "DelayUntil": "", + "Pin": "", + "mark_complete": "", + "QuickEntry": "", + "shopping_add_onhand_desc": "", + "shopping_add_onhand": "", + "related_recipes": "", + "today_recipes": "", + "sql_debug": "", + "remember_search": "", + "remember_hours": "", + "tree_select": "", + "OnHand_help": "", + "ignore_shopping_help": "", + "shopping_category_help": "", + "food_recipe_help": "", + "Foods": "", + "Account": "", + "Cosmetic": "", + "API": "", + "enable_expert": "", + "expert_mode": "", + "simple_mode": "", + "advanced": "", + "fields": "", + "show_keywords": "", + "show_foods": "", + "show_books": "", + "show_rating": "", + "show_units": "", + "show_filters": "", + "not": "", + "save_filter": "", + "filter_name": "", + "left_handed": "", + "left_handed_help": "", + "Custom Filter": "", + "shared_with": "", + "sort_by": "", + "asc": "", + "desc": "", + "date_viewed": "", + "last_cooked": "", + "times_cooked": "", + "date_created": "", + "show_sortby": "", + "search_rank": "", + "make_now": "", + "recipe_filter": "", + "book_filter_help": "", + "review_shopping": "", + "view_recipe": "", + "copy_to_new": "", + "recipe_name": "", + "paste_ingredients_placeholder": "", + "paste_ingredients": "", + "ingredient_list": "", + "explain": "", + "filter": "", + "Website": "", + "App": "", + "Message": "", + "Bookmarklet": "", + "Sticky_Nav": "", + "Sticky_Nav_Help": "", + "Nav_Color": "", + "Nav_Color_Help": "", + "Use_Kj": "", + "Comments_setting": "", + "click_image_import": "", + "no_more_images_found": "", + "import_duplicates": "", + "paste_json": "", + "Click_To_Edit": "", + "search_no_recipes": "", + "search_import_help_text": "", + "search_create_help_text": "", + "warning_duplicate_filter": "", + "reset_children": "", + "reset_children_help": "", + "reset_food_inheritance": "", + "reset_food_inheritance_info": "", + "substitute_help": "", + "substitute_siblings_help": "", + "substitute_children_help": "", + "substitute_siblings": "", + "substitute_children": "", + "SubstituteOnHand": "", + "ChildInheritFields": "", + "ChildInheritFields_help": "", + "InheritFields_help": "", + "show_ingredient_overview": "", + "Ingredient Overview": "", + "last_viewed": "", + "created_on": "", + "updatedon": "", + "Imported_From": "", + "advanced_search_settings": "", + "nothing_planned_today": "", + "no_pinned_recipes": "", + "Planned": "", + "Pinned": "", + "Imported": "", + "Quick actions": "", + "Ratings": "", + "Internal": "", + "Units": "", + "Manage_Emails": "", + "Change_Password": "", + "Social_Authentication": "", + "Random Recipes": "", + "parameter_count": "", + "select_keyword": "", + "add_keyword": "", + "select_file": "", + "select_recipe": "", + "select_unit": "", + "select_food": "", + "remove_selection": "", + "empty_list": "", + "Select": "", + "Supermarkets": "", + "User": "", + "Username": "", + "First_name": "", + "Last_name": "", + "Keyword": "", + "Advanced": "", + "Page": "", + "Single": "", + "Multiple": "", + "Reset": "", + "Disabled": "", + "Disable": "", + "Options": "", + "Create Food": "", + "create_food_desc": "", + "additional_options": "", + "Importer_Help": "", + "Documentation": "", + "Select_App_To_Import": "", + "Import_Supported": "", + "Export_Supported": "", + "Import_Not_Yet_Supported": "", + "Export_Not_Yet_Supported": "", + "Import_Result_Info": "", + "Recipes_In_Import": "", + "Toggle": "", + "Import_Error": "", + "Warning_Delete_Supermarket_Category": "", + "New_Supermarket": "", + "New_Supermarket_Category": "", + "Are_You_Sure": "", + "Valid Until": "" +} From d9465c7f9deef15fe8d4b8fb131505ef61dcf2e3 Mon Sep 17 00:00:00 2001 From: Gorkem Date: Sat, 5 Nov 2022 21:26:12 +0000 Subject: [PATCH 70/77] Translated using Weblate (Turkish) Currently translated at 2.2% (12 of 524 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/tr/ --- cookbook/locale/tr/LC_MESSAGES/django.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cookbook/locale/tr/LC_MESSAGES/django.po b/cookbook/locale/tr/LC_MESSAGES/django.po index f38438e63f..ce151113c9 100644 --- a/cookbook/locale/tr/LC_MESSAGES/django.po +++ b/cookbook/locale/tr/LC_MESSAGES/django.po @@ -6,21 +6,21 @@ # Translators: # Emre S, 2020 # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-07-12 19:20+0200\n" -"PO-Revision-Date: 2020-06-02 19:28+0000\n" -"Last-Translator: Emre S, 2020\n" -"Language-Team: Turkish (https://www.transifex.com/django-recipes/" -"teams/110507/tr/)\n" +"PO-Revision-Date: 2022-11-06 22:09+0000\n" +"Last-Translator: Gorkem \n" +"Language-Team: Turkish \n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Weblate 4.14.1\n" #: .\cookbook\filters.py:23 .\cookbook\templates\forms\ingredients.html:34 #: .\cookbook\templates\stats.html:28 @@ -29,7 +29,7 @@ msgstr "Malzemeler" #: .\cookbook\forms.py:53 msgid "Default unit" -msgstr "" +msgstr "Varsayılan birim" #: .\cookbook\forms.py:54 msgid "Use fractions" @@ -82,7 +82,7 @@ msgstr "" #: .\cookbook\forms.py:65 .\cookbook\templates\recipe_view.html:21 #: .\cookbook\templates\stats.html:47 msgid "Comments" -msgstr "" +msgstr "Yorumlar" #: .\cookbook\forms.py:66 msgid "Left-handed mode" @@ -192,7 +192,7 @@ msgstr "" #: .\cookbook\forms.py:165 msgid "Default" -msgstr "" +msgstr "Varsayılan" #: .\cookbook\forms.py:177 msgid "" @@ -224,7 +224,7 @@ msgstr "" #: .\cookbook\forms.py:271 msgid "Active" -msgstr "" +msgstr "Aktif" #: .\cookbook\forms.py:277 msgid "Search String" From 02bad8cfb9a47003be813faa80020f23f81f3445 Mon Sep 17 00:00:00 2001 From: Gorkem Date: Sat, 5 Nov 2022 21:27:44 +0000 Subject: [PATCH 71/77] Translated using Weblate (Turkish) Currently translated at 27.1% (125 of 460 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/tr/ --- vue/src/locales/tr.json | 250 ++++++++++++++++++++-------------------- 1 file changed, 125 insertions(+), 125 deletions(-) diff --git a/vue/src/locales/tr.json b/vue/src/locales/tr.json index 364fd30d88..cee12989c5 100644 --- a/vue/src/locales/tr.json +++ b/vue/src/locales/tr.json @@ -1,135 +1,135 @@ { "warning_feature_beta": "", - "err_fetching_resource": "", - "err_creating_resource": "", - "err_updating_resource": "", - "err_deleting_resource": "", + "err_fetching_resource": "Kaynak alınırken bir hata oluştu!", + "err_creating_resource": "Kaynak oluşturulurken bir hata oluştu!", + "err_updating_resource": "Kaynak güncellenirken bir hata oluştu!", + "err_deleting_resource": "Kaynak silinirken bir hata oluştu!", "err_deleting_protected_resource": "", "err_moving_resource": "", "err_merging_resource": "", - "success_fetching_resource": "", - "success_creating_resource": "", + "success_fetching_resource": "Kaynak başarıyla getirildi!", + "success_creating_resource": "Kaynak başarıyla oluşturuldu!", "success_updating_resource": "", - "success_deleting_resource": "", - "success_moving_resource": "", - "success_merging_resource": "", - "file_upload_disabled": "", - "warning_space_delete": "", + "success_deleting_resource": "Kaynak başarıyla silindi!", + "success_moving_resource": "Kaynak başarıyla taşındı!", + "success_merging_resource": "Kaynak başarıyla birleştirildi!", + "file_upload_disabled": "Alanınız için dosya yükleme aktif değil.", + "warning_space_delete": "Tüm tarifler, alışveriş listeleri, yemek planları ve oluşturduğunuz her şey dahil olmak üzere silinecektir. Bu geri alınamaz! Bunu yapmak istediğinizden emin misiniz?", "food_inherit_info": "", "facet_count_info": "", - "step_time_minutes": "", + "step_time_minutes": "Dakika olarak adım süresi", "confirm_delete": "", "import_running": "", "all_fields_optional": "", - "convert_internal": "", - "show_only_internal": "", - "show_split_screen": "", + "convert_internal": "Dahili tarif'e dönüştür", + "show_only_internal": "Sadece dahili tarifler", + "show_split_screen": "Bölünmüş Görünüm", "Log_Recipe_Cooking": "", "External_Recipe_Image": "", - "Add_to_Shopping": "", + "Add_to_Shopping": "Alışverişe Ekle", "Add_to_Plan": "", "Step_start_time": "", - "Sort_by_new": "", - "Table_of_Contents": "", - "Recipes_per_page": "", - "Show_as_header": "", - "Hide_as_header": "", + "Sort_by_new": "Yeniye göre sırala", + "Table_of_Contents": "İçindekiler Tablosu", + "Recipes_per_page": "Sayfa Başına Tarif", + "Show_as_header": "Başlığı Göster", + "Hide_as_header": "Başlığı gizle", "Add_nutrition_recipe": "", "Remove_nutrition_recipe": "", "Copy_template_reference": "", - "Save_and_View": "", - "Manage_Books": "", - "Meal_Plan": "", - "Select_Book": "", - "Select_File": "", - "Recipe_Image": "", - "Import_finished": "", - "View_Recipes": "", + "Save_and_View": "Kaydet & Görüntüle", + "Manage_Books": "Kitapları Yönet", + "Meal_Plan": "Yemek Planı", + "Select_Book": "Kitap Seç", + "Select_File": "Dosya Seç", + "Recipe_Image": "Tarif Resmi", + "Import_finished": "İçeriye Aktarma Bitti", + "View_Recipes": "Tarifleri Görüntüle", "Log_Cooking": "", - "New_Recipe": "", - "Url_Import": "", - "Reset_Search": "", - "Recently_Viewed": "", - "Load_More": "", - "New_Keyword": "", - "Delete_Keyword": "", - "Edit_Keyword": "", - "Edit_Recipe": "", - "Move_Keyword": "", - "Merge_Keyword": "", - "Hide_Keywords": "", - "Hide_Recipes": "", - "Move_Up": "", - "Move_Down": "", - "Step_Name": "", - "Step_Type": "", + "New_Recipe": "Yeni Tarif", + "Url_Import": "Url İçeri Aktar", + "Reset_Search": "Aramayı Sıfırla", + "Recently_Viewed": "Son Görüntülenen", + "Load_More": "Daha Fazla", + "New_Keyword": "Yeni Anahtar Kelime", + "Delete_Keyword": "Anahtar Kelimeyi Sil", + "Edit_Keyword": "Anahtar Kelimeyi Düzenle", + "Edit_Recipe": "Tarifi Düzenle", + "Move_Keyword": "Anahtar Kelimeyi Taşı", + "Merge_Keyword": "Anahtar Kelimeyi Birleştir", + "Hide_Keywords": "Anahtar Kelimeyi Gizle", + "Hide_Recipes": "Tarifi Gizle", + "Move_Up": "Yukarı Taşı", + "Move_Down": "Aşağıya Taşı", + "Step_Name": "Adım Adı", + "Step_Type": "Adım Tipi", "Make_Header": "", "Make_Ingredient": "", - "Enable_Amount": "", - "Disable_Amount": "", + "Enable_Amount": "Tutarı Etkinleştir", + "Disable_Amount": "Tutarı Devre Dışı Bırak", "Ingredient Editor": "", - "Private_Recipe": "", + "Private_Recipe": "Özel Tarif", "Private_Recipe_Help": "", "reusable_help_text": "", "Add_Step": "", - "Keywords": "", - "Books": "", - "Proteins": "", - "Fats": "", - "Carbohydrates": "", - "Calories": "", - "Energy": "", - "Nutrition": "", - "Date": "", - "Share": "", - "Automation": "", - "Parameter": "", - "Export": "", - "Copy": "", - "Rating": "", - "Close": "", - "Cancel": "", - "Link": "", - "Add": "", - "New": "", - "Note": "", - "Success": "", - "Failure": "", - "Protected": "", - "Ingredients": "", - "Supermarket": "", - "Categories": "", - "Category": "", - "Selected": "", + "Keywords": "Anahtar Kelimeler", + "Books": "Kitaplar", + "Proteins": "Proteinler", + "Fats": "Yağlar", + "Carbohydrates": "Karbonhidratlar", + "Calories": "Kaloriler", + "Energy": "Enerji", + "Nutrition": "Besin", + "Date": "Tarih", + "Share": "Paylaş", + "Automation": "Otomasyon", + "Parameter": "Parametre", + "Export": "Dışa Aktar", + "Copy": "Kopyala", + "Rating": "Puanlama", + "Close": "Kapat", + "Cancel": "İptal", + "Link": "Bağlantı", + "Add": "Ekle", + "New": "Yeni", + "Note": "Not", + "Success": "Başarılı", + "Failure": "Hata", + "Protected": "Korumalı", + "Ingredients": "Mazemeler", + "Supermarket": "Market", + "Categories": "Kategoriler", + "Category": "Kategori", + "Selected": "Seçilen", "min": "", "Servings": "", "Waiting": "", "Preparation": "", "External": "", - "Size": "", - "Files": "", - "File": "", - "Edit": "", - "Image": "", - "Delete": "", - "Open": "", - "Ok": "", - "Save": "", - "Step": "", - "Search": "", - "Import": "", - "Print": "", - "Settings": "", - "or": "", - "and": "", - "Information": "", - "Download": "", - "Create": "", - "Search Settings": "", - "View": "", - "Recipes": "", - "Move": "", - "Merge": "", + "Size": "Boyut", + "Files": "Dosyalar", + "File": "Dosya", + "Edit": "Düzenle", + "Image": "Resim", + "Delete": "Sil", + "Open": "Aç", + "Ok": "Aç", + "Save": "Kaydet", + "Step": "Adım", + "Search": "Ara", + "Import": "İçeriye Aktar", + "Print": "Yazdır", + "Settings": "Ayarlar", + "or": "veya", + "and": "ve", + "Information": "bilgi", + "Download": "İndir", + "Create": "Oluştur", + "Search Settings": "Arama Ayarları", + "View": "Görüntüle", + "Recipes": "Tarifler", + "Move": "Taşı", + "Merge": "Birleştir", "Parent": "", "Copy Link": "", "Copy Token": "", @@ -353,12 +353,12 @@ "show_sortby": "", "search_rank": "", "make_now": "", - "recipe_filter": "", + "recipe_filter": "Tarif Filtresi", "book_filter_help": "", "review_shopping": "", - "view_recipe": "", - "copy_to_new": "", - "recipe_name": "", + "view_recipe": "Tarif Görüntüle", + "copy_to_new": "Yeni Tarif'e Kopyala", + "recipe_name": "Tarif Adı", "paste_ingredients_placeholder": "", "paste_ingredients": "", "ingredient_list": "", @@ -405,35 +405,35 @@ "advanced_search_settings": "", "nothing_planned_today": "", "no_pinned_recipes": "", - "Planned": "", + "Planned": "Planlanan", "Pinned": "", "Imported": "", - "Quick actions": "", + "Quick actions": "Hızlı işlemler", "Ratings": "", "Internal": "", - "Units": "", + "Units": "Birimler", "Manage_Emails": "", "Change_Password": "", "Social_Authentication": "", - "Random Recipes": "", + "Random Recipes": "Rasgele Tarifler", "parameter_count": "", "select_keyword": "", "add_keyword": "", - "select_file": "", - "select_recipe": "", - "select_unit": "", + "select_file": "Dosya Seç", + "select_recipe": "Tarif Seç", + "select_unit": "Birim Seç", "select_food": "", "remove_selection": "", "empty_list": "", - "Select": "", - "Supermarkets": "", + "Select": "Seç", + "Supermarkets": "Marketler", "User": "", "Username": "", - "First_name": "", - "Last_name": "", + "First_name": "İsim", + "Last_name": "Soyisim", "Keyword": "", "Advanced": "", - "Page": "", + "Page": "Sayfa", "Single": "", "Multiple": "", "Reset": "", @@ -452,11 +452,11 @@ "Export_Not_Yet_Supported": "", "Import_Result_Info": "", "Recipes_In_Import": "", - "Toggle": "", - "Import_Error": "", - "Warning_Delete_Supermarket_Category": "", - "New_Supermarket": "", - "New_Supermarket_Category": "", - "Are_You_Sure": "", - "Valid Until": "" + "Toggle": "Değiştir", + "Import_Error": "İçeri aktarma sırasında bir hata oluştu. Görüntülemek için lütfen sayfanın altındaki Ayrıntıları genişletin.", + "Warning_Delete_Supermarket_Category": "Bir market kategorisinin silinmesi, gıdalarla olan tüm ilişkileri de silecektir. Emin misiniz?", + "New_Supermarket": "Yeni Market", + "New_Supermarket_Category": "Yeni Market Kategorisi", + "Are_You_Sure": "Emin misin?", + "Valid Until": "Geçerlilik Tarihi" } From 126a2d870e712da308964fe8eb8cb2e3b84e1c44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 03:45:14 +0000 Subject: [PATCH 72/77] Bump loader-utils from 1.4.0 to 1.4.1 in /vue Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.1. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.1/CHANGELOG.md) - [Commits](https://github.com/webpack/loader-utils/compare/v1.4.0...v1.4.1) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] --- vue/yarn.lock | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/vue/yarn.lock b/vue/yarn.lock index a09d782a67..053b5ebfd7 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -7297,9 +7297,9 @@ loader-runner@^4.1.0, loader-runner@^4.2.0: integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" - integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== + version "1.4.1" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.1.tgz#278ad7006660bccc4d2c0c1578e17c5c78d5c0e0" + integrity sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q== dependencies: big.js "^5.2.2" emojis-list "^3.0.0" @@ -7745,7 +7745,12 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" -minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: +minimist@^1.2.0: + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== + +minimist@^1.2.5, minimist@^1.2.6: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== From c150c7f84e91eb292bcfe40b4e80cd69eeab822f Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Wed, 9 Nov 2022 12:48:34 +0100 Subject: [PATCH 73/77] fixed recipekeeper integration --- cookbook/integration/recipekeeper.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cookbook/integration/recipekeeper.py b/cookbook/integration/recipekeeper.py index 8e053576bc..cd783bfa76 100644 --- a/cookbook/integration/recipekeeper.py +++ b/cookbook/integration/recipekeeper.py @@ -58,6 +58,13 @@ def get_recipe_from_file(self, file): if s.text == "": continue step.instruction += s.text + ' \n' + step.save() + + for s in file.find("div", {"itemprop": "recipeNotes"}).find_all("p"): + if s.text == "": + continue + step.instruction += s.text + ' \n' + step.save() if file.find("span", {"itemprop": "recipeSource"}).text != '': step.instruction += "\n\n" + _("Imported from") + ": " + file.find("span", {"itemprop": "recipeSource"}).text From 44b2c0203463294d2d1b544cc6e636c07dfb2b74 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Wed, 9 Nov 2022 12:49:23 +0100 Subject: [PATCH 74/77] updated cryptography --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5767f1096e..1e56421be4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ Django==4.0.8 -cryptography==38.0.1 +cryptography==38.0.3 django-annoying==0.10.6 django-autocomplete-light==3.9.4 django-cleanup==6.0.0 From 5e4cac52d6dc70b06e4226301ae06dfd1f47854d Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Wed, 9 Nov 2022 13:23:43 +0100 Subject: [PATCH 75/77] fixed recipe image size with nutrition information --- vue/src/apps/RecipeView/RecipeView.vue | 31 +++++++++++++++----------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/vue/src/apps/RecipeView/RecipeView.vue b/vue/src/apps/RecipeView/RecipeView.vue index 470b847165..2b1e3b9b83 100644 --- a/vue/src/apps/RecipeView/RecipeView.vue +++ b/vue/src/apps/RecipeView/RecipeView.vue @@ -75,7 +75,8 @@
- +
@@ -103,13 +104,6 @@ :style="{ 'max-height': ingredient_height }"/> - -
-
- -
-
@@ -137,10 +131,19 @@
{{ $t("Imported_From") }}
- {{ recipe.source_url }} + {{ recipe.source_url }} +
+ +
+
+ +
+
x.ingredients).flat().length }, - working_time: function() { - return calculateHourMinuteSplit(this.recipe.working_time)}, - waiting_time: function() { - return calculateHourMinuteSplit(this.recipe.waiting_time)}, + working_time: function () { + return calculateHourMinuteSplit(this.recipe.working_time) + }, + waiting_time: function () { + return calculateHourMinuteSplit(this.recipe.waiting_time) + }, }, data() { return { From 16d0fc38f94b4db319e2d70321bfa4ade001f423 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Wed, 9 Nov 2022 14:01:03 +0100 Subject: [PATCH 76/77] improved paste ingredient function to retain order and add to correct step --- .../apps/RecipeEditView/RecipeEditView.vue | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/vue/src/apps/RecipeEditView/RecipeEditView.vue b/vue/src/apps/RecipeEditView/RecipeEditView.vue index ad5bf5d2c3..e2c7486074 100644 --- a/vue/src/apps/RecipeEditView/RecipeEditView.vue +++ b/vue/src/apps/RecipeEditView/RecipeEditView.vue @@ -308,7 +308,7 @@ size="sm" class="ml-1 mb-1 mb-md-0" @click=" - paste_step = step.id + paste_step = step $bvModal.show('id_modal_paste_ingredients') " > @@ -581,12 +581,14 @@ {{ $t("Copy") }} - -