diff options
32 files changed, 5789 insertions, 1818 deletions
diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..e00e56cf --- /dev/null +++ b/.editorconfig @@ -0,0 +1,18 @@ +# EditorConfig is awesome: https://EditorConfig.org + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true + +[*.{js,json,ts,tsx}] +charset = utf-8 +indent_style = space +indent_size = 4 + +[package.json] +indent_style = space +indent_size = 2 @@ -74,13 +74,14 @@ The result is in `dist`. This can be loaded as an unpacked extension ## Developing with a clean profile -Run `npm run dev` to run the extension using a clean browser profile with hot reloading. Use `npm run dev:firefox` for Firefox. This uses [`web-ext run`](https://extensionworkshop.com/documentation/develop/web-ext-command-reference/#commands). +Run `npm run dev` to run the extension using a clean browser profile with hot reloading. Use `npm run dev:firefox` for Firefox. This uses [`web-ext run`](https://extensionworkshop.com/documentation/develop/web-ext-command-reference/#commands). +Known chromium bug: Extension is not loaded properly on first start. Visit `chrome://extensions/` and reload the extension. # Credit The awesome [Invidious API](https://github.com/omarroth/invidious/wiki/API) was previously used. -Originally forked from [YTSponsorSkip](https://github.com/OfficialNoob/YTSponsorSkip), but zero code remains. +Originally forked from [YTSponsorSkip](https://github.com/NDevTK/YTSponsorSkip), but zero code remains. Icons made by: * <a href="https://www.flaticon.com/authors/gregor-cresnar" title="Gregor Cresnar">Gregor Cresnar</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a> and are licensed by <a href="http://creativecommons.org/licenses/by/3.0/" title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a> diff --git a/manifest/manifest.json b/manifest/manifest.json index 86c725ee..a9538d4d 100644 --- a/manifest/manifest.json +++ b/manifest/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_fullName__", "short_name": "SponsorBlock", - "version": "2.0.5", + "version": "2.0.5.1", "default_locale": "en", "description": "__MSG_Description__", "content_scripts": [{ diff --git a/package-lock.json b/package-lock.json index c48f5987..02902828 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,6 +46,15 @@ "minimist": "^1.2.5" } }, +<<<<<<< HEAD +======= + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -207,9 +216,15 @@ } }, "@babel/parser": { +<<<<<<< HEAD "version": "7.11.2", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.2.tgz", "integrity": "sha512-Vuj/+7vLo6l1Vi7uuO+1ngCDNeVmNbTngcJFKCR/oEtz8tKz0CJxZEGmPt9KcIloZhOZ3Zit6xbpXT2MDlS9Vw==", +======= + "version": "7.11.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz", + "integrity": "sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA==", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "dev": true }, "@babel/plugin-syntax-async-generators": { @@ -418,6 +433,7 @@ "resolve-from": "^5.0.0" }, "dependencies": { +<<<<<<< HEAD "find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -450,10 +466,17 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", +======= + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "dev": true } } }, +<<<<<<< HEAD "@istanbuljs/schema": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz", @@ -541,6 +564,53 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", +======= + "@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, + "requires": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + }, + "dependencies": { + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "dev": true }, "supports-color": { @@ -554,6 +624,7 @@ } } }, +<<<<<<< HEAD "@jest/core": { "version": "26.2.2", "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.2.2.tgz", @@ -598,11 +669,238 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "@istanbuljs/schema": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz", + "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==", + "dev": true + }, + "@jest/console": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.3.0.tgz", + "integrity": "sha512-/5Pn6sJev0nPUcAdpJHMVIsA8sKizL2ZkcKPE5+dJrCccks7tcM7c9wbgHudBJbxXLoTbqsHkG1Dofoem4F09w==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^26.3.0", + "jest-util": "^26.3.0", + "slash": "^3.0.0" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 + "@types/node": "*", + "@types/yargs": "^15.0.0", + "chalk": "^4.0.0" + } + }, +<<<<<<< HEAD +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 + "@types/yargs": { + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", + "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, +<<<<<<< HEAD + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, +======= +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" +<<<<<<< HEAD + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" +======= +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", +<<<<<<< HEAD +======= + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "@jest/core": { + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.4.0.tgz", + "integrity": "sha512-mpXm4OjWQbz7qbzGIiSqvfNZ1FxX6ywWgLtdSD2luPORt5zKPtqcdDnX7L8RdfMaj1znDBgN2+gB094ZIr7vnA==", + "dev": true, + "requires": { + "@jest/console": "^26.3.0", + "@jest/reporters": "^26.4.0", + "@jest/test-result": "^26.3.0", + "@jest/transform": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.4", + "jest-changed-files": "^26.3.0", + "jest-config": "^26.4.0", + "jest-haste-map": "^26.3.0", + "jest-message-util": "^26.3.0", + "jest-regex-util": "^26.0.0", + "jest-resolve": "^26.4.0", + "jest-resolve-dependencies": "^26.4.0", + "jest-runner": "^26.4.0", + "jest-runtime": "^26.4.0", + "jest-snapshot": "^26.4.0", + "jest-util": "^26.3.0", + "jest-validate": "^26.4.0", + "jest-watcher": "^26.3.0", + "micromatch": "^4.0.2", + "p-each-series": "^2.1.0", + "rimraf": "^3.0.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -697,6 +995,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "dev": true }, "strip-ansi": { @@ -729,6 +1028,7 @@ } }, "@jest/environment": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.2.0.tgz", "integrity": "sha512-oCgp9NmEiJ5rbq9VI/v/yYLDpladAAVvFxZgNsnJxOETuzPZ0ZcKKHYjKYwCtPOP1WCrM5nmyuOhMStXFGHn+g==", @@ -748,11 +1048,44 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.3.0.tgz", + "integrity": "sha512-EW+MFEo0DGHahf83RAaiqQx688qpXgl99wdb8Fy67ybyzHwR1a58LHcO376xQJHfmoXTu89M09dH3J509cx2AA==", + "dev": true, + "requires": { + "@jest/fake-timers": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/node": "*", + "jest-mock": "^26.3.0" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, +<<<<<<< HEAD +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -815,6 +1148,7 @@ } }, "@jest/fake-timers": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.2.0.tgz", "integrity": "sha512-45Gfe7YzYTKqTayBrEdAF0qYyAsNRBzfkV0IyVUm3cx7AsCWlnjilBM4T40w7IXT5VspOgMPikQlV0M6gHwy/g==", @@ -836,11 +1170,45 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.3.0.tgz", + "integrity": "sha512-ZL9ytUiRwVP8ujfRepffokBvD2KbxbqMhrXSBhSdAhISCw3gOkuntisiSFv+A6HN0n0fF4cxzICEKZENLmW+1A==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "@sinonjs/fake-timers": "^6.0.1", + "@types/node": "*", + "jest-message-util": "^26.3.0", + "jest-mock": "^26.3.0", + "jest-util": "^26.3.0" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, +<<<<<<< HEAD +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -903,6 +1271,102 @@ } }, "@jest/globals": { + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.4.0.tgz", + "integrity": "sha512-QKwoVAeL9d0xaEM9ebPvfc+bolN04F+o3zM2jswGDBiiNjCogZ3LvOaqumRdDyz6kLmbx+UhgMBAVuLunbXZ2A==", + "dev": true, + "requires": { + "@jest/environment": "^26.3.0", + "@jest/types": "^26.3.0", + "expect": "^26.4.0" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^15.0.0", + "chalk": "^4.0.0" + } + }, + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 + "@types/yargs": { + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", + "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, +<<<<<<< HEAD + "@jest/globals": { "version": "26.2.0", "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.2.0.tgz", "integrity": "sha512-Hoc6ScEIPaym7RNytIL2ILSUWIGKlwEv+JNFof9dGYOdvPjb2evEURSslvCMkNuNg1ECEClTE8PH7ULlMJntYA==", @@ -921,11 +1385,66 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "@jest/reporters": { + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.4.0.tgz", + "integrity": "sha512-14OPAAuYhgRBSNxAocVluX6ksdMdK/EuP9NmtBXU9g1uKaVBrPnohn/CVm6iMot1a9iU8BCxa5715YRf8FEg/A==", + "dev": true, + "requires": { + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^26.3.0", + "@jest/test-result": "^26.3.0", + "@jest/transform": "^26.3.0", + "@jest/types": "^26.3.0", + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.2", + "graceful-fs": "^4.2.4", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^4.0.3", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.0.2", + "jest-haste-map": "^26.3.0", + "jest-resolve": "^26.4.0", + "jest-util": "^26.3.0", + "jest-worker": "^26.3.0", + "node-notifier": "^7.0.0", + "slash": "^3.0.0", + "source-map": "^0.6.0", + "string-length": "^4.0.1", + "terminal-link": "^2.0.0", + "v8-to-istanbul": "^5.0.1" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, +<<<<<<< HEAD +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -970,12 +1489,30 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, +<<<<<<< HEAD +======= + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, +<<<<<<< HEAD +======= + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "supports-color": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", @@ -987,6 +1524,7 @@ } } }, +<<<<<<< HEAD "@jest/reporters": { "version": "26.2.2", "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.2.2.tgz", @@ -1077,11 +1615,25 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, +======= + "@jest/source-map": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.3.0.tgz", + "integrity": "sha512-hWX5IHmMDWe1kyrKl7IhFwqOuAreIwHhbe44+XH2ZRHjrKIh0LO5eLQ/vxHFeAfRwJapmxuqlGAEYLadDq6ZGQ==", + "dev": true, + "requires": { + "callsites": "^3.0.0", + "graceful-fs": "^4.2.4", + "source-map": "^0.6.0" + }, + "dependencies": { +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "graceful-fs": { "version": "4.2.4", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", "dev": true +<<<<<<< HEAD }, "has-flag": { "version": "4.0.0", @@ -1224,6 +1776,118 @@ "jest-runtime": "^26.2.2" }, "dependencies": { +======= + } + } + }, + "@jest/test-result": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.3.0.tgz", + "integrity": "sha512-a8rbLqzW/q7HWheFVMtghXV79Xk+GWwOK1FrtimpI5n1la2SY0qHri3/b0/1F0Ve0/yJmV8pEhxDfVwiUBGtgg==", + "dev": true, + "requires": { + "@jest/console": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^15.0.0", + "chalk": "^4.0.0" + } + }, + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, + "@types/yargs": { + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", + "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "@jest/test-sequencer": { + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.4.0.tgz", + "integrity": "sha512-9Z7lCShS7vERp+DRwIVNH/6sHMWwJK1DPnGCpGeVLGJJWJ4Y08sQI3vIKdmKHu2KmwlUBpRM+BFf7NlVUkl5XA==", + "dev": true, + "requires": { + "@jest/test-result": "^26.3.0", + "graceful-fs": "^4.2.4", + "jest-haste-map": "^26.3.0", + "jest-runner": "^26.4.0", + "jest-runtime": "^26.4.0" + }, + "dependencies": { "graceful-fs": { "version": "4.2.4", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", @@ -1233,6 +1897,123 @@ } }, "@jest/transform": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.3.0.tgz", + "integrity": "sha512-Isj6NB68QorGoFWvcOjlUhpkT56PqNIsXKR7XfvoDlCANn/IANlh8DrKAA2l2JKC3yWSMH5wS0GwuQM20w3b2A==", + "dev": true, + "requires": { + "@babel/core": "^7.1.0", + "@jest/types": "^26.3.0", + "babel-plugin-istanbul": "^6.0.0", + "chalk": "^4.0.0", + "convert-source-map": "^1.4.0", + "fast-json-stable-stringify": "^2.0.0", + "graceful-fs": "^4.2.4", + "jest-haste-map": "^26.3.0", + "jest-regex-util": "^26.0.0", + "jest-util": "^26.3.0", + "micromatch": "^4.0.2", + "pirates": "^4.0.1", + "slash": "^3.0.0", + "source-map": "^0.6.1", + "write-file-atomic": "^3.0.0" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^15.0.0", + "chalk": "^4.0.0" + } + }, + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, + "@types/yargs": { + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", + "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true +<<<<<<< HEAD + } + } + }, + "@jest/transform": { "version": "26.2.2", "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.2.2.tgz", "integrity": "sha512-c1snhvi5wRVre1XyoO3Eef5SEWpuBCH/cEbntBUd9tI5sNYiBDmO0My/lc5IuuGYKp/HFIHV1eZpSx5yjdkhKw==", @@ -1408,6 +2189,315 @@ "dev": true, "requires": { "type-detect": "4.0.8" +======= + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + } + } + }, + "@jest/types": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", + "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^13.0.0" + } + }, + "@nodelib/fs.scandir": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", + "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==", + "dev": true, + "requires": { + "@nodelib/fs.stat": "2.0.3", + "run-parallel": "^1.1.9" + } + }, + "@nodelib/fs.stat": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", + "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==", + "dev": true + }, + "@nodelib/fs.walk": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz", + "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==", + "dev": true, + "requires": { + "@nodelib/fs.scandir": "2.1.3", + "fastq": "^1.6.0" + } + }, + "@npmcli/move-file": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz", + "integrity": "sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==", + "dev": true, + "requires": { + "mkdirp": "^1.0.4" + }, + "dependencies": { + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true + } + } + }, + "@sindresorhus/is": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", + "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", + "dev": true + }, + "@sinonjs/commons": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz", + "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==", + "dev": true, + "requires": { + "type-detect": "4.0.8" + } + }, + "@sinonjs/fake-timers": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz", + "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.7.0" + } + }, + "@szmarczak/http-timer": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", + "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", + "dev": true, + "requires": { + "defer-to-connect": "^1.0.1" + } + }, + "@types/babel__core": { + "version": "7.1.9", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.9.tgz", + "integrity": "sha512-sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw==", + "dev": true, + "requires": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "@types/babel__generator": { + "version": "7.6.1", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz", + "integrity": "sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==", + "dev": true, + "requires": { + "@babel/types": "^7.0.0" + } + }, + "@types/babel__template": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz", + "integrity": "sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==", + "dev": true, + "requires": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "@types/babel__traverse": { + "version": "7.0.13", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.13.tgz", + "integrity": "sha512-i+zS7t6/s9cdQvbqKDARrcbrPvtJGlbYsMkazo03nTAK3RX9FNrLllXys22uiTGJapPOTZTQ35nHh4ISph4SLQ==", + "dev": true, + "requires": { + "@babel/types": "^7.3.0" + } + }, + "@types/chrome": { + "version": "0.0.91", + "resolved": "https://registry.npmjs.org/@types/chrome/-/chrome-0.0.91.tgz", + "integrity": "sha512-vNvo9lJkp1AvViWrUwe1bxhoMwr5dRZWlgr1DTuaNkz97LsG56lDX1sceWeZir2gRACJ5vdHtoRdVAvm8C75Ug==", + "dev": true, + "requires": { + "@types/filesystem": "*" + } + }, + "@types/color-name": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", + "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", + "dev": true + }, + "@types/filesystem": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/filesystem/-/filesystem-0.0.29.tgz", + "integrity": "sha512-85/1KfRedmfPGsbK8YzeaQUyV1FQAvMPMTuWFQ5EkLd2w7szhNO96bk3Rh/SKmOfd9co2rCLf0Voy4o7ECBOvw==", + "dev": true, + "requires": { + "@types/filewriter": "*" + } + }, + "@types/filewriter": { + "version": "0.0.28", + "resolved": "https://registry.npmjs.org/@types/filewriter/-/filewriter-0.0.28.tgz", + "integrity": "sha1-wFTor02d11205jq8dviFFocU1LM=", + "dev": true + }, + "@types/firefox-webext-browser": { + "version": "70.0.1", + "resolved": "https://registry.npmjs.org/@types/firefox-webext-browser/-/firefox-webext-browser-70.0.1.tgz", + "integrity": "sha512-hjHsTR9vKs+yikWbNS/s7TVCx15M/MEn+VYx47wtT/W/wORsIZDD75gfUfP7lkzi+IxRvKMQBB/5/wMFlfgvgQ==", + "dev": true + }, + "@types/graceful-fs": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz", + "integrity": "sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "@types/istanbul-lib-coverage": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz", + "integrity": "sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==", + "dev": true + }, + "@types/istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "*" + } + }, + "@types/istanbul-reports": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz", + "integrity": "sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "*", + "@types/istanbul-lib-report": "*" + } + }, + "@types/jest": { + "version": "24.9.1", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.9.1.tgz", + "integrity": "sha512-Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==", + "dev": true, + "requires": { + "jest-diff": "^24.3.0" + } + }, + "@types/jquery": { + "version": "3.3.31", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.31.tgz", + "integrity": "sha512-Lz4BAJihoFw5nRzKvg4nawXPzutkv7wmfQ5121avptaSIXlDNJCUuxZxX/G+9EVidZGuO0UBlk+YjKbwRKJigg==", + "dev": true, + "requires": { + "@types/sizzle": "*" + } + }, + "@types/json-schema": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz", + "integrity": "sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ==", + "dev": true + }, + "@types/minimatch": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", + "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", + "dev": true + }, + "@types/node": { + "version": "14.0.27", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.27.tgz", + "integrity": "sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g==", + "dev": true + }, + "@types/normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==", + "dev": true + }, + "@types/prettier": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.0.2.tgz", + "integrity": "sha512-IkVfat549ggtkZUthUzEX49562eGikhSYeVGX97SkMFn+sTZrgRewXjQ4tPKFPCykZHkX1Zfd9OoELGqKU2jJA==", + "dev": true + }, + "@types/prop-types": { + "version": "15.7.3", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz", + "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==" + }, + "@types/react": { + "version": "16.9.22", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.22.tgz", + "integrity": "sha512-7OSt4EGiLvy0h5R7X+r0c7S739TCU/LvWbkNOrm10lUwNHe7XPz5OLhLOSZeCkqO9JSCly1NkYJ7ODTUqVnHJQ==", + "requires": { + "@types/prop-types": "*", + "csstype": "^2.2.0" +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 } }, "@sinonjs/fake-timers": { @@ -2001,6 +3091,7 @@ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, +<<<<<<< HEAD "fsevents": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", @@ -2008,6 +3099,8 @@ "dev": true, "optional": true }, +======= +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -2047,6 +3140,16 @@ "integrity": "sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==", "dev": true }, + "aggregate-error": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", + "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==", + "dev": true, + "requires": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + } + }, "ajv": { "version": "6.10.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", @@ -2065,6 +3168,15 @@ "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==", "dev": true }, +<<<<<<< HEAD +======= + "ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "dev": true + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "ajv-merge-patch": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/ajv-merge-patch/-/ajv-merge-patch-4.1.0.tgz", @@ -2110,9 +3222,9 @@ } }, "ansi-colors": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", - "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", "dev": true }, "ansi-escapes": { @@ -2328,12 +3440,6 @@ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, "array-unique": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", @@ -2455,9 +3561,15 @@ "dev": true }, "aws4": { +<<<<<<< HEAD "version": "1.10.0", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz", "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==", +======= + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz", + "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "dev": true }, "babel": { @@ -2721,6 +3833,7 @@ } }, "babel-jest": { +<<<<<<< HEAD "version": "26.2.2", "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.2.2.tgz", "integrity": "sha512-JmLuePHgA+DSOdOL8lPxCgD2LhPPm+rdw1vnxR73PpIrnmKCS2/aBhtkAcxQWuUcW2hBrH8MJ3LKXE7aWpNZyA==", @@ -2731,12 +3844,25 @@ "@types/babel__core": "^7.1.7", "babel-plugin-istanbul": "^6.0.0", "babel-preset-jest": "^26.2.0", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.3.0.tgz", + "integrity": "sha512-sxPnQGEyHAOPF8NcUsD0g7hDCnvLL2XyblRBcgrzTWBB/mAIpWow3n1bEL+VghnnZfreLhFSBsFluRoK2tRK4g==", + "dev": true, + "requires": { + "@jest/transform": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/babel__core": "^7.1.7", + "babel-plugin-istanbul": "^6.0.0", + "babel-preset-jest": "^26.3.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "chalk": "^4.0.0", "graceful-fs": "^4.2.4", "slash": "^3.0.0" }, "dependencies": { "@jest/types": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.2.0.tgz", "integrity": "sha512-lvm3rJvctxd7+wxKSxxbzpDbr4FXDLaC57WEKdUIZ2cjTYuxYSc0zlyD7Z4Uqr5VdKxRUrtwIkiqBuvgf8uKJA==", @@ -2744,11 +3870,32 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, +<<<<<<< HEAD +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -3202,6 +4349,7 @@ } }, "babel-preset-jest": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.2.0.tgz", "integrity": "sha512-R1k8kdP3R9phYQugXeNnK/nvCGlBzG4m3EoIIukC80GXb6wCv2XiwPhK6K9MAkQcMszWBYvl2Wm+yigyXFQqXg==", @@ -3209,6 +4357,15 @@ "requires": { "babel-plugin-jest-hoist": "^26.2.0", "babel-preset-current-node-syntax": "^0.1.2" +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.3.0.tgz", + "integrity": "sha512-5WPdf7nyYi2/eRxCbVrE1kKCWxgWY4RsPEbdJWFm7QsesFGqjdkyLeu1zRkwM1cxK6EPIlNd6d2AxLk7J+t4pw==", + "dev": true, + "requires": { + "babel-plugin-jest-hoist": "^26.2.0", + "babel-preset-current-node-syntax": "^0.1.3" +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 } }, "babel-register": { @@ -3408,9 +4565,15 @@ "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==" }, "binary-extensions": { +<<<<<<< HEAD "version": "1.13.1", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", +======= + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", + "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "dev": true, "optional": true }, @@ -3857,9 +5020,9 @@ }, "dependencies": { "get-stream": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", - "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "dev": true, "requires": { "pump": "^3.0.0" @@ -3946,591 +5109,41 @@ } }, "chokidar": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", - "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz", + "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==", "dev": true, "optional": true, "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.4.0" }, "dependencies": { - "fsevents": { - "version": "1.2.11", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz", - "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==", + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", "dev": true, "optional": true, "requires": { - "bindings": "^1.5.0", - "nan": "^2.12.1", - "node-pre-gyp": "*" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.1.3", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "debug": { - "version": "3.2.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "^2.1.1" - } - }, - "deep-extend": { - "version": "0.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "^2.6.0" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "glob": { - "version": "7.1.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.24", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ignore-walk": { - "version": "3.0.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimatch": "^3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "bundled": true, - "dev": true, - "optional": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true, - "optional": true - }, - "minipass": { - "version": "2.9.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } - }, - "minizlib": { - "version": "1.3.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "^2.9.0" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "needle": { - "version": "2.4.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "^3.2.6", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.14.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4.4.2" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - }, - "npm-bundled": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "npm-normalize-package-bin": "^1.0.1" - } - }, - "npm-normalize-package-bin": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "npm-packlist": { - "version": "1.4.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "wrappy": "1" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "rimraf": { - "version": "2.7.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "glob": "^7.1.3" - } - }, - "safe-buffer": { - "version": "5.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "dev": true, - "optional": true - }, - "semver": { - "version": "5.7.1", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "4.4.13", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.8.6", - "minizlib": "^1.2.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.3" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "wide-align": { - "version": "1.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "^1.0.2 || 2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "yallist": { - "version": "3.1.1", - "bundled": true, - "dev": true, - "optional": true - } + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" } }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, "optional": true, "requires": { +<<<<<<< HEAD "is-glob": "^3.1.0", "path-dirname": "^1.0.0" }, @@ -4545,14 +5158,47 @@ "is-extglob": "^2.1.0" } } +======= + "fill-range": "^7.0.1" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "optional": true, + "requires": { + "to-regex-range": "^5.0.1" +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 } }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "optional": true + }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true, "optional": true +<<<<<<< HEAD +======= + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "optional": true, + "requires": { + "is-number": "^7.0.0" + } +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 } } }, @@ -4635,6 +5281,12 @@ } } }, + "clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "dev": true + }, "cli-boxes": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz", @@ -5062,19 +5714,19 @@ "dev": true }, "copy-webpack-plugin": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz", - "integrity": "sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz", + "integrity": "sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==", "dev": true, "requires": { - "cacache": "^12.0.3", - "find-cache-dir": "^2.1.0", - "glob-parent": "^3.1.0", - "globby": "^7.1.1", - "is-glob": "^4.0.1", - "loader-utils": "^1.2.3", - "minimatch": "^3.0.4", + "cacache": "^15.0.4", + "fast-glob": "^3.2.4", + "find-cache-dir": "^3.3.1", + "glob-parent": "^5.1.1", + "globby": "^11.0.1", + "loader-utils": "^2.0.0", "normalize-path": "^3.0.0", +<<<<<<< HEAD "p-limit": "^2.2.1", "schema-utils": "^1.0.0", "serialize-javascript": "^2.1.2", @@ -5117,6 +5769,273 @@ "requires": { "crc": "^3.4.4", "readable-stream": "^2.0.0" +======= + "p-limit": "^3.0.1", + "schema-utils": "^2.7.0", + "serialize-javascript": "^4.0.0", + "webpack-sources": "^1.4.3" +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 + }, + "dependencies": { + "ajv": { + "version": "6.12.3", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", + "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "cacache": { + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz", + "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==", + "dev": true, + "requires": { + "@npmcli/move-file": "^1.0.1", + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "glob": "^7.1.4", + "infer-owner": "^1.0.4", + "lru-cache": "^6.0.0", + "minipass": "^3.1.1", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.2", + "mkdirp": "^1.0.3", + "p-map": "^4.0.0", + "promise-inflight": "^1.0.1", + "rimraf": "^3.0.2", + "ssri": "^8.0.0", + "tar": "^6.0.2", + "unique-filename": "^1.1.1" + } + }, + "chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "dev": true + }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "dev": true + }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "find-cache-dir": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", + "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", + "dev": true, + "requires": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "json5": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "requires": { + "semver": "^6.0.0" + } + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true + }, + "p-limit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz", + "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + }, + "dependencies": { + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + } + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "requires": { + "find-up": "^4.0.0" + } + }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, + "schema-utils": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", + "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.4", + "ajv": "^6.12.2", + "ajv-keywords": "^3.4.1" + } + }, + "serialize-javascript": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", + "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", + "dev": true, + "requires": { + "randombytes": "^2.1.0" + } + }, + "ssri": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz", + "integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==", + "dev": true, + "requires": { + "minipass": "^3.1.1" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + } + } + }, + "core-js": { + "version": "2.6.11", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", + "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true + }, + "crc": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz", + "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==", + "dev": true, + "requires": { + "buffer": "^5.1.0" + } + }, + "crc32-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz", + "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=", + "dev": true, + "requires": { + "crc": "^3.4.4", + "readable-stream": "^2.0.0" }, "dependencies": { "readable-stream": { @@ -5512,12 +6431,12 @@ } }, "dir-glob": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz", - "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", "dev": true, "requires": { - "path-type": "^3.0.0" + "path-type": "^4.0.0" } }, "dispensary": { @@ -5762,6 +6681,7 @@ "dev": true, "requires": { "ansi-colors": "^4.1.1" +<<<<<<< HEAD }, "dependencies": { "ansi-colors": { @@ -5770,6 +6690,8 @@ "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", "dev": true } +======= +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 } }, "entities": { @@ -5967,6 +6889,7 @@ "estraverse": "^4.1.1" } }, +<<<<<<< HEAD "glob-parent": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", @@ -5997,6 +6920,35 @@ "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, "requires": { +======= + "globals": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", + "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", + "dev": true, + "requires": { + "type-fest": "^0.8.1" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true + }, + "levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "requires": { +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "prelude-ls": "^1.2.1", "type-check": "~0.4.0" } @@ -6280,6 +7232,7 @@ } }, "expect": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/expect/-/expect-26.2.0.tgz", "integrity": "sha512-8AMBQ9UVcoUXt0B7v+5/U5H6yiUR87L6eKCfjE3spx7Ya5lF+ebUo37MCFBML2OiLfkX1sxmQOZhIDonyVTkcw==", @@ -6290,10 +7243,23 @@ "jest-get-type": "^26.0.0", "jest-matcher-utils": "^26.2.0", "jest-message-util": "^26.2.0", +======= + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-26.4.0.tgz", + "integrity": "sha512-dbYDJhFcqQsamlos6nEwAMe+ahdckJBk5fmw1DYGLQGabGSlUuT+Fm2jHYw5119zG3uIhP+lCQbjJhFEdZMJtg==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "ansi-styles": "^4.0.0", + "jest-get-type": "^26.3.0", + "jest-matcher-utils": "^26.4.0", + "jest-message-util": "^26.3.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "jest-regex-util": "^26.0.0" }, "dependencies": { "@jest/types": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.2.0.tgz", "integrity": "sha512-lvm3rJvctxd7+wxKSxxbzpDbr4FXDLaC57WEKdUIZ2cjTYuxYSc0zlyD7Z4Uqr5VdKxRUrtwIkiqBuvgf8uKJA==", @@ -6301,11 +7267,32 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, +<<<<<<< HEAD +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -6357,9 +7344,15 @@ "dev": true }, "jest-get-type": { +<<<<<<< HEAD "version": "26.0.0", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.0.0.tgz", "integrity": "sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz", + "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "dev": true }, "supports-color": { @@ -6477,6 +7470,65 @@ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", "dev": true }, + "fast-glob": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz", + "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==", + "dev": true, + "requires": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.0", + "merge2": "^1.3.0", + "micromatch": "^4.0.2", + "picomatch": "^2.2.1" + }, + "dependencies": { + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + } + } + }, "fast-json-patch": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.2.1.tgz", @@ -6510,6 +7562,15 @@ "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==", "dev": true }, + "fastq": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz", + "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==", + "dev": true, + "requires": { + "reusify": "^1.0.4" + } + }, "fb-watchman": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz", @@ -6641,6 +7702,15 @@ "jsonfile": "^4.0.0", "universalify": "^0.1.0" } +<<<<<<< HEAD +======= + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 } } }, @@ -6840,6 +7910,18 @@ "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==", "dev": true } +<<<<<<< HEAD +======= + } + }, + "fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dev": true, + "requires": { + "minipass": "^3.0.0" +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 } }, "fs-write-stream-atomic": { @@ -6893,9 +7975,9 @@ "dev": true }, "fsevents": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", - "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", + "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", "dev": true, "optional": true }, @@ -7008,24 +8090,12 @@ } }, "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", "dev": true, "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "^2.1.0" - } - } + "is-glob": "^4.0.1" } }, "global-dirs": { @@ -7079,38 +8149,23 @@ "dev": true }, "globby": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", - "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz", + "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==", "dev": true, "requires": { - "array-union": "^1.0.1", - "dir-glob": "^2.0.0", - "glob": "^7.1.2", - "ignore": "^3.3.5", - "pify": "^3.0.0", - "slash": "^1.0.0" + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" }, "dependencies": { - "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "dev": true, - "requires": { - "array-uniq": "^1.0.1" - } - }, - "ignore": { - "version": "3.3.10", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", - "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==", - "dev": true - }, - "pify": { + "slash": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true } } @@ -7395,9 +8450,9 @@ "dev": true }, "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", + "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", "dev": true }, "import-fresh": { @@ -7440,6 +8495,12 @@ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true + }, "infer-owner": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", @@ -7535,13 +8596,13 @@ "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, "is-binary-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, "optional": true, "requires": { - "binary-extensions": "^1.0.0" + "binary-extensions": "^2.0.0" } }, "is-buffer": { @@ -7893,6 +8954,7 @@ "dev": true }, "jest": { +<<<<<<< HEAD "version": "26.2.2", "resolved": "https://registry.npmjs.org/jest/-/jest-26.2.2.tgz", "integrity": "sha512-EkJNyHiAG1+A8pqSz7cXttoVa34hOEzN/MrnJhYnfp5VHxflVcf2pu3oJSrhiy6LfIutLdWo+n6q63tjcoIeig==", @@ -7911,11 +8973,43 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-26.4.0.tgz", + "integrity": "sha512-lNCOS+ckRHE1wFyVtQClBmbsOVuH2GWUTJMDL3vunp9DXcah+V8vfvVVApngClcdoc3rgZpqOfCNKLjxjj2l4g==", + "dev": true, + "requires": { + "@jest/core": "^26.4.0", + "import-local": "^3.0.2", + "jest-cli": "^26.4.0" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, +<<<<<<< HEAD +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -7993,6 +9087,7 @@ } }, "jest-cli": { +<<<<<<< HEAD "version": "26.2.2", "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.2.2.tgz", "integrity": "sha512-vVcly0n/ijZvdy6gPQiQt0YANwX2hLTPQZHtW7Vi3gcFdKTtif7YpI85F8R8JYy5DFSWz4x1OW0arnxlziu5Lw==", @@ -8001,14 +9096,30 @@ "@jest/core": "^26.2.2", "@jest/test-result": "^26.2.0", "@jest/types": "^26.2.0", +======= + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.4.0.tgz", + "integrity": "sha512-kw2Pr3V2x9/WzSDGsbz/MJBNlCoPMxMudrIavft4bqRlv5tASjU51tyO+1Os1LdW2dAnLQZYsxFUZ8oWPyssGQ==", + "dev": true, + "requires": { + "@jest/core": "^26.4.0", + "@jest/test-result": "^26.3.0", + "@jest/types": "^26.3.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "chalk": "^4.0.0", "exit": "^0.1.2", "graceful-fs": "^4.2.4", "import-local": "^3.0.2", "is-ci": "^2.0.0", +<<<<<<< HEAD "jest-config": "^26.2.2", "jest-util": "^26.2.0", "jest-validate": "^26.2.0", +======= + "jest-config": "^26.4.0", + "jest-util": "^26.3.0", + "jest-validate": "^26.4.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "prompts": "^2.0.1", "yargs": "^15.3.1" } @@ -8067,6 +9178,7 @@ } }, "jest-changed-files": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.2.0.tgz", "integrity": "sha512-+RyJb+F1K/XBLIYiL449vo5D+CvlHv29QveJUWNPXuUicyZcq+tf1wNxmmFeRvAU1+TzhwqczSjxnCCFt7+8iA==", @@ -8085,11 +9197,223 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.3.0.tgz", + "integrity": "sha512-1C4R4nijgPltX6fugKxM4oQ18zimS7LqQ+zTTY8lMCMFPrxqBFb7KJH0Z2fRQJvw2Slbaipsqq7s1mgX5Iot+g==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "execa": "^4.0.0", + "throat": "^5.0.0" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^15.0.0", + "chalk": "^4.0.0" + } + }, + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, + "@types/yargs": { + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", + "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "execa": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz", + "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + } + }, + "get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "dev": true + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "requires": { + "path-key": "^3.0.0" + } + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + } + } + }, + "jest-config": { + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.4.0.tgz", + "integrity": "sha512-MxsvrBug8YY+C4QcUBtmgnHyFeW7w3Ouk/w9eplCDN8VJGVyBEZFe8Lxzfp2pSqh0Dqurqv8Oik2YkbekGUlxg==", + "dev": true, + "requires": { + "@babel/core": "^7.1.0", + "@jest/test-sequencer": "^26.4.0", + "@jest/types": "^26.3.0", + "babel-jest": "^26.3.0", + "chalk": "^4.0.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.1", + "graceful-fs": "^4.2.4", + "jest-environment-jsdom": "^26.3.0", + "jest-environment-node": "^26.3.0", + "jest-get-type": "^26.3.0", + "jest-jasmine2": "^26.4.0", + "jest-regex-util": "^26.0.0", + "jest-resolve": "^26.4.0", + "jest-util": "^26.3.0", + "jest-validate": "^26.4.0", + "micromatch": "^4.0.2", + "pretty-format": "^26.4.0" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, +<<<<<<< HEAD "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -8270,6 +9594,15 @@ "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 } }, "@types/yargs": { @@ -8353,9 +9686,15 @@ "dev": true }, "jest-get-type": { +<<<<<<< HEAD "version": "26.0.0", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.0.0.tgz", "integrity": "sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz", + "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "dev": true }, "micromatch": { @@ -8369,12 +9708,21 @@ } }, "pretty-format": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.2.0.tgz", "integrity": "sha512-qi/8IuBu2clY9G7qCXgCdD1Bf9w+sXakdHTRToknzMtVy0g7c4MBWaZy7MfB7ndKZovRO6XRwJiAYqq+MC7SDA==", "dev": true, "requires": { "@jest/types": "^26.2.0", +======= + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.0.tgz", + "integrity": "sha512-mEEwwpCseqrUtuMbrJG4b824877pM5xald3AkilJ47Po2YLr97/siejYQHqj2oDQBeJNbu+Q0qUuekJ8F0NAPg==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -8422,6 +9770,7 @@ } }, "jest-each": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.2.0.tgz", "integrity": "sha512-gHPCaho1twWHB5bpcfnozlc6mrMi+VAewVPNgmwf81x2Gzr6XO4dl+eOrwPWxbkYlgjgrYjWK2xgKnixbzH3Ew==", @@ -8442,11 +9791,45 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.4.0.tgz", + "integrity": "sha512-+cyBh1ehs6thVT/bsZVG+WwmRn2ix4Q4noS9yLZgM10yGWPW12/TDvwuOV2VZXn1gi09/ZwJKJWql6YW1C9zNw==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "chalk": "^4.0.0", + "jest-get-type": "^26.3.0", + "jest-util": "^26.3.0", + "pretty-format": "^26.4.0" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, +<<<<<<< HEAD +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -8498,6 +9881,7 @@ "dev": true }, "jest-get-type": { +<<<<<<< HEAD "version": "26.0.0", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.0.0.tgz", "integrity": "sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==", @@ -8510,6 +9894,20 @@ "dev": true, "requires": { "@jest/types": "^26.2.0", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz", + "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==", + "dev": true + }, + "pretty-format": { + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.0.tgz", + "integrity": "sha512-mEEwwpCseqrUtuMbrJG4b824877pM5xald3AkilJ47Po2YLr97/siejYQHqj2oDQBeJNbu+Q0qUuekJ8F0NAPg==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -8527,6 +9925,7 @@ } }, "jest-environment-jsdom": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.2.0.tgz", "integrity": "sha512-sDG24+5M4NuIGzkI3rJW8XUlrpkvIdE9Zz4jhD8OBnVxAw+Y1jUk9X+lAOD48nlfUTlnt3lbAI3k2Ox+WF3S0g==", @@ -8538,10 +9937,24 @@ "@types/node": "*", "jest-mock": "^26.2.0", "jest-util": "^26.2.0", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.3.0.tgz", + "integrity": "sha512-zra8He2btIMJkAzvLaiZ9QwEPGEetbxqmjEBQwhH3CA+Hhhu0jSiEJxnJMbX28TGUvPLxBt/zyaTLrOPF4yMJA==", + "dev": true, + "requires": { + "@jest/environment": "^26.3.0", + "@jest/fake-timers": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/node": "*", + "jest-mock": "^26.3.0", + "jest-util": "^26.3.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "jsdom": "^16.2.2" }, "dependencies": { "@jest/types": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.2.0.tgz", "integrity": "sha512-lvm3rJvctxd7+wxKSxxbzpDbr4FXDLaC57WEKdUIZ2cjTYuxYSc0zlyD7Z4Uqr5VdKxRUrtwIkiqBuvgf8uKJA==", @@ -8549,11 +9962,32 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, +<<<<<<< HEAD +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -8616,6 +10050,7 @@ } }, "jest-environment-node": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.2.0.tgz", "integrity": "sha512-4M5ExTYkJ19efBzkiXtBi74JqKLDciEk4CEsp5tTjWGYMrlKFQFtwIVG3tW1OGE0AlXhZjuHPwubuRYY4j4uOw==", @@ -8637,11 +10072,46 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.3.0.tgz", + "integrity": "sha512-c9BvYoo+FGcMj5FunbBgtBnbR5qk3uky8PKyRVpSfe2/8+LrNQMiXX53z6q2kY+j15SkjQCOSL/6LHnCPLVHNw==", + "dev": true, + "requires": { + "@jest/environment": "^26.3.0", + "@jest/fake-timers": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/node": "*", + "jest-mock": "^26.3.0", + "jest-util": "^26.3.0" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, +<<<<<<< HEAD +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -8710,12 +10180,21 @@ "dev": true }, "jest-haste-map": { +<<<<<<< HEAD "version": "26.2.2", "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.2.2.tgz", "integrity": "sha512-3sJlMSt+NHnzCB+0KhJ1Ut4zKJBiJOlbrqEYNdRQGlXTv8kqzZWjUKQRY3pkjmlf+7rYjAV++MQ4D6g4DhAyOg==", "dev": true, "requires": { "@jest/types": "^26.2.0", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.3.0.tgz", + "integrity": "sha512-DHWBpTJgJhLLGwE5Z1ZaqLTYqeODQIZpby0zMBsCU9iRFHYyhklYqP4EiG73j5dkbaAdSZhgB938mL51Q5LeZA==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/graceful-fs": "^4.1.2", "@types/node": "*", "anymatch": "^3.0.3", @@ -8723,15 +10202,22 @@ "fsevents": "^2.1.2", "graceful-fs": "^4.2.4", "jest-regex-util": "^26.0.0", +<<<<<<< HEAD "jest-serializer": "^26.2.0", "jest-util": "^26.2.0", "jest-worker": "^26.2.1", +======= + "jest-serializer": "^26.3.0", + "jest-util": "^26.3.0", + "jest-worker": "^26.3.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "micromatch": "^4.0.2", "sane": "^4.0.3", "walker": "^1.0.7" }, "dependencies": { "@jest/types": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.2.0.tgz", "integrity": "sha512-lvm3rJvctxd7+wxKSxxbzpDbr4FXDLaC57WEKdUIZ2cjTYuxYSc0zlyD7Z4Uqr5VdKxRUrtwIkiqBuvgf8uKJA==", @@ -8739,11 +10225,32 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, +<<<<<<< HEAD +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -8871,6 +10378,7 @@ } }, "jest-jasmine2": { +<<<<<<< HEAD "version": "26.2.2", "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.2.2.tgz", "integrity": "sha512-Q8AAHpbiZMVMy4Hz9j1j1bg2yUmPa1W9StBvcHqRaKa9PHaDUMwds8LwaDyzP/2fkybcTQE4+pTMDOG9826tEw==", @@ -8893,10 +10401,35 @@ "jest-snapshot": "^26.2.2", "jest-util": "^26.2.0", "pretty-format": "^26.2.0", +======= + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.4.0.tgz", + "integrity": "sha512-cGBxwzDDKB09EPJ4pE69BMDv+2lO442IB1xQd+vL3cua2OKdeXQK6iDlQKoRX/iP0RgU5T8sn9yahLcx/+ox8Q==", + "dev": true, + "requires": { + "@babel/traverse": "^7.1.0", + "@jest/environment": "^26.3.0", + "@jest/source-map": "^26.3.0", + "@jest/test-result": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "expect": "^26.4.0", + "is-generator-fn": "^2.0.0", + "jest-each": "^26.4.0", + "jest-matcher-utils": "^26.4.0", + "jest-message-util": "^26.3.0", + "jest-runtime": "^26.4.0", + "jest-snapshot": "^26.4.0", + "jest-util": "^26.3.0", + "pretty-format": "^26.4.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "throat": "^5.0.0" }, "dependencies": { "@jest/types": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.2.0.tgz", "integrity": "sha512-lvm3rJvctxd7+wxKSxxbzpDbr4FXDLaC57WEKdUIZ2cjTYuxYSc0zlyD7Z4Uqr5VdKxRUrtwIkiqBuvgf8uKJA==", @@ -8904,11 +10437,32 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, +<<<<<<< HEAD +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -8960,12 +10514,21 @@ "dev": true }, "pretty-format": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.2.0.tgz", "integrity": "sha512-qi/8IuBu2clY9G7qCXgCdD1Bf9w+sXakdHTRToknzMtVy0g7c4MBWaZy7MfB7ndKZovRO6XRwJiAYqq+MC7SDA==", "dev": true, "requires": { "@jest/types": "^26.2.0", +======= + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.0.tgz", + "integrity": "sha512-mEEwwpCseqrUtuMbrJG4b824877pM5xald3AkilJ47Po2YLr97/siejYQHqj2oDQBeJNbu+Q0qUuekJ8F0NAPg==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -8983,6 +10546,7 @@ } }, "jest-leak-detector": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.2.0.tgz", "integrity": "sha512-aQdzTX1YiufkXA1teXZu5xXOJgy7wZQw6OJ0iH5CtQlOETe6gTSocaYKUNui1SzQ91xmqEUZ/WRavg9FD82rtQ==", @@ -9000,11 +10564,42 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.4.0.tgz", + "integrity": "sha512-7EXKKEKnAWUPyiVtGZzJflbPOtYUdlNoevNVOkAcPpdR8xWiYKPGNGA6sz25S+8YhZq3rmkQJYAh3/P0VnoRwA==", + "dev": true, + "requires": { + "jest-get-type": "^26.3.0", + "pretty-format": "^26.4.0" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, +<<<<<<< HEAD +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -9056,6 +10651,7 @@ "dev": true }, "jest-get-type": { +<<<<<<< HEAD "version": "26.0.0", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.0.0.tgz", "integrity": "sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==", @@ -9068,6 +10664,20 @@ "dev": true, "requires": { "@jest/types": "^26.2.0", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz", + "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==", + "dev": true + }, + "pretty-format": { + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.0.tgz", + "integrity": "sha512-mEEwwpCseqrUtuMbrJG4b824877pM5xald3AkilJ47Po2YLr97/siejYQHqj2oDQBeJNbu+Q0qUuekJ8F0NAPg==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -9085,6 +10695,7 @@ } }, "jest-matcher-utils": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.2.0.tgz", "integrity": "sha512-2cf/LW2VFb3ayPHrH36ZDjp9+CAeAe/pWBAwsV8t3dKcrINzXPVxq8qMWOxwt5BaeBCx4ZupVGH7VIgB8v66vQ==", @@ -9104,11 +10715,44 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.4.0.tgz", + "integrity": "sha512-u+xdCdq+F262DH+PutJKXLGr2H5P3DImdJCir51PGSfi3TtbLQ5tbzKaN8BkXbiTIU6ayuAYBWTlU1nyckVdzA==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "jest-diff": "^26.4.0", + "jest-get-type": "^26.3.0", + "pretty-format": "^26.4.0" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, +<<<<<<< HEAD +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -9154,9 +10798,15 @@ "dev": true }, "diff-sequences": { +<<<<<<< HEAD "version": "26.0.0", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.0.0.tgz", "integrity": "sha512-JC/eHYEC3aSS0vZGjuoc4vHA0yAQTzhQQldXMeMF+JlxLGJlCO38Gma82NV9gk1jGFz8mDzUMeaKXvjRRdJ2dg==", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.3.0.tgz", + "integrity": "sha512-5j5vdRcw3CNctePNYN0Wy2e/JbWT6cAYnXv5OuqPhDpyCGc0uLu2TK0zOCJWNB9kOIfYMSpIulRaDgIi4HJ6Ig==", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "dev": true }, "has-flag": { @@ -9166,6 +10816,7 @@ "dev": true }, "jest-diff": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.2.0.tgz", "integrity": "sha512-Wu4Aopi2nzCsHWLBlD48TgRy3Z7OsxlwvHNd1YSnHc7q1NJfrmyCPoUXrTIrydQOG5ApaYpsAsdfnMbJqV1/wQ==", @@ -9190,6 +10841,32 @@ "dev": true, "requires": { "@jest/types": "^26.2.0", +======= + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.4.0.tgz", + "integrity": "sha512-wwC38HlOW+iTq6j5tkj/ZamHn6/nrdcEOc/fKaVILNtN2NLWGdkfRaHWwfNYr5ehaLvuoG2LfCZIcWByVj0gjg==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "diff-sequences": "^26.3.0", + "jest-get-type": "^26.3.0", + "pretty-format": "^26.4.0" + } + }, + "jest-get-type": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz", + "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==", + "dev": true + }, + "pretty-format": { + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.0.tgz", + "integrity": "sha512-mEEwwpCseqrUtuMbrJG4b824877pM5xald3AkilJ47Po2YLr97/siejYQHqj2oDQBeJNbu+Q0qUuekJ8F0NAPg==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -9207,6 +10884,7 @@ } }, "jest-message-util": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.2.0.tgz", "integrity": "sha512-g362RhZaJuqeqG108n1sthz5vNpzTNy926eNDszo4ncRbmmcMRIUAZibnd6s5v2XSBCChAxQtCoN25gnzp7JbQ==", @@ -9214,6 +10892,15 @@ "requires": { "@babel/code-frame": "^7.0.0", "@jest/types": "^26.2.0", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.3.0.tgz", + "integrity": "sha512-xIavRYqr4/otGOiLxLZGj3ieMmjcNE73Ui+LdSW/Y790j5acqCsAdDiLIbzHCZMpN07JOENRWX5DcU+OQ+TjTA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@jest/types": "^26.3.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/stack-utils": "^1.0.1", "chalk": "^4.0.0", "graceful-fs": "^4.2.4", @@ -9223,6 +10910,7 @@ }, "dependencies": { "@jest/types": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.2.0.tgz", "integrity": "sha512-lvm3rJvctxd7+wxKSxxbzpDbr4FXDLaC57WEKdUIZ2cjTYuxYSc0zlyD7Z4Uqr5VdKxRUrtwIkiqBuvgf8uKJA==", @@ -9230,11 +10918,32 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, +<<<<<<< HEAD +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -9352,16 +11061,26 @@ } }, "jest-mock": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.2.0.tgz", "integrity": "sha512-XeC7yWtWmWByoyVOHSsE7NYsbXJLtJNgmhD7z4MKumKm6ET0si81bsSLbQ64L5saK3TgsHo2B/UqG5KNZ1Sp/Q==", "dev": true, "requires": { "@jest/types": "^26.2.0", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.3.0.tgz", + "integrity": "sha512-PeaRrg8Dc6mnS35gOo/CbZovoDPKAeB1FICZiuagAgGvbWdNNyjQjkOaGUa/3N3JtpQ/Mh9P4A2D4Fv51NnP8Q==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*" }, "dependencies": { "@jest/types": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.2.0.tgz", "integrity": "sha512-lvm3rJvctxd7+wxKSxxbzpDbr4FXDLaC57WEKdUIZ2cjTYuxYSc0zlyD7Z4Uqr5VdKxRUrtwIkiqBuvgf8uKJA==", @@ -9369,11 +11088,32 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, +<<<<<<< HEAD +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -9448,6 +11188,7 @@ "dev": true }, "jest-resolve": { +<<<<<<< HEAD "version": "26.2.2", "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.2.2.tgz", "integrity": "sha512-ye9Tj/ILn/0OgFPE/3dGpQPUqt4dHwIocxt5qSBkyzxQD8PbL0bVxBogX2FHxsd3zJA7V2H/cHXnBnNyyT9YoQ==", @@ -9458,12 +11199,25 @@ "graceful-fs": "^4.2.4", "jest-pnp-resolver": "^1.2.2", "jest-util": "^26.2.0", +======= + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.4.0.tgz", + "integrity": "sha512-bn/JoZTEXRSlEx3+SfgZcJAVuTMOksYq9xe9O6s4Ekg84aKBObEaVXKOEilULRqviSLAYJldnoWV9c07kwtiCg==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.4", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^26.3.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "read-pkg-up": "^7.0.1", "resolve": "^1.17.0", "slash": "^3.0.0" }, "dependencies": { "@jest/types": { +<<<<<<< HEAD "version": "26.2.0", "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.2.0.tgz", "integrity": "sha512-lvm3rJvctxd7+wxKSxxbzpDbr4FXDLaC57WEKdUIZ2cjTYuxYSc0zlyD7Z4Uqr5VdKxRUrtwIkiqBuvgf8uKJA==", @@ -9471,11 +11225,32 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, +<<<<<<< HEAD +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -9554,6 +11329,7 @@ "dev": true, "requires": { "has-flag": "^4.0.0" +<<<<<<< HEAD } } } @@ -9639,10 +11415,13 @@ "dev": true, "requires": { "has-flag": "^4.0.0" +======= +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 } } } }, +<<<<<<< HEAD "jest-runner": { "version": "26.2.2", "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.2.2.tgz", @@ -9920,11 +11699,44 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "jest-resolve-dependencies": { + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.4.0.tgz", + "integrity": "sha512-hznK/hlrlhu8hwdbieRdHFKmcV83GW8t30libt/v6j1L3IEzb8iN21SaWzV8KRAAK4ijiU0kuge0wnHn+0rytQ==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "jest-regex-util": "^26.0.0", + "jest-snapshot": "^26.4.0" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, +<<<<<<< HEAD +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -9969,6 +11781,7 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, +<<<<<<< HEAD "diff-sequences": { "version": "26.0.0", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.0.0.tgz", @@ -9981,12 +11794,15 @@ "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", "dev": true }, +======= +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, +<<<<<<< HEAD "jest-diff": { "version": "26.2.0", "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.2.0.tgz", @@ -10023,6 +11839,8 @@ "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", "dev": true }, +======= +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "supports-color": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", @@ -10034,6 +11852,7 @@ } } }, +<<<<<<< HEAD "jest-util": { "version": "26.2.0", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.2.0.tgz", @@ -10056,11 +11875,61 @@ "requires": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", +======= + "jest-runner": { + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.4.0.tgz", + "integrity": "sha512-XF+tnUGolnPriu6Gg+HHWftspMjD5NkTV2mQppQnpZe39GcUangJ0al7aBGtA3GbVAcRd048DQiJPmsQRdugjw==", + "dev": true, + "requires": { + "@jest/console": "^26.3.0", + "@jest/environment": "^26.3.0", + "@jest/test-result": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.7.1", + "exit": "^0.1.2", + "graceful-fs": "^4.2.4", + "jest-config": "^26.4.0", + "jest-docblock": "^26.0.0", + "jest-haste-map": "^26.3.0", + "jest-leak-detector": "^26.4.0", + "jest-message-util": "^26.3.0", + "jest-resolve": "^26.4.0", + "jest-runtime": "^26.4.0", + "jest-util": "^26.3.0", + "jest-worker": "^26.3.0", + "source-map-support": "^0.5.6", + "throat": "^5.0.0" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/node": "*", "@types/yargs": "^15.0.0", "chalk": "^4.0.0" } }, +<<<<<<< HEAD +======= + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "@types/yargs": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", @@ -10080,6 +11949,7 @@ "color-convert": "^2.0.1" } }, +<<<<<<< HEAD "braces": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", @@ -10089,6 +11959,8 @@ "fill-range": "^7.0.1" } }, +======= +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "chalk": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", @@ -10114,6 +11986,7 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, +<<<<<<< HEAD "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -10123,6 +11996,8 @@ "to-regex-range": "^5.0.1" } }, +======= +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "graceful-fs": { "version": "4.2.4", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", @@ -10133,6 +12008,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", +<<<<<<< HEAD "dev": true }, "is-number": { @@ -10151,6 +12027,10 @@ "picomatch": "^2.0.5" } }, +======= + "dev": true + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "supports-color": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", @@ -10159,6 +12039,7 @@ "requires": { "has-flag": "^4.0.0" } +<<<<<<< HEAD }, "to-regex-range": { "version": "5.0.1", @@ -10242,6 +12123,538 @@ "color-name": "~1.1.4" } }, +======= + } + } + }, + "jest-runtime": { + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.4.0.tgz", + "integrity": "sha512-1fjZgGpkyQBUTo59Vi19I4IcsBwzY6uwVFNjUmR06iIi3XRErkY28yimi4IUDRrofQErqcDEw2n3DF9WmQ6vEg==", + "dev": true, + "requires": { + "@jest/console": "^26.3.0", + "@jest/environment": "^26.3.0", + "@jest/fake-timers": "^26.3.0", + "@jest/globals": "^26.4.0", + "@jest/source-map": "^26.3.0", + "@jest/test-result": "^26.3.0", + "@jest/transform": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/yargs": "^15.0.0", + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.4", + "jest-config": "^26.4.0", + "jest-haste-map": "^26.3.0", + "jest-message-util": "^26.3.0", + "jest-mock": "^26.3.0", + "jest-regex-util": "^26.0.0", + "jest-resolve": "^26.4.0", + "jest-snapshot": "^26.4.0", + "jest-util": "^26.3.0", + "jest-validate": "^26.4.0", + "slash": "^3.0.0", + "strip-bom": "^4.0.0", + "yargs": "^15.3.1" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^15.0.0", + "chalk": "^4.0.0" + } + }, + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, + "@types/yargs": { + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", + "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-serializer": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.3.0.tgz", + "integrity": "sha512-IDRBQBLPlKa4flg77fqg0n/pH87tcRKwe8zxOVTWISxGpPHYkRZ1dXKyh04JOja7gppc60+soKVZ791mruVdow==", + "dev": true, + "requires": { + "@types/node": "*", + "graceful-fs": "^4.2.4" + }, + "dependencies": { + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + } + } + }, + "jest-snapshot": { + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.4.0.tgz", + "integrity": "sha512-vFGmNGWHMBomrlOpheTMoqihymovuH3GqfmaEIWoPpsxUXyxT3IlbxI5I4m2vg0uv3HUJYg5JoGrkgMzVsAwCg==", + "dev": true, + "requires": { + "@babel/types": "^7.0.0", + "@jest/types": "^26.3.0", + "@types/prettier": "^2.0.0", + "chalk": "^4.0.0", + "expect": "^26.4.0", + "graceful-fs": "^4.2.4", + "jest-diff": "^26.4.0", + "jest-get-type": "^26.3.0", + "jest-haste-map": "^26.3.0", + "jest-matcher-utils": "^26.4.0", + "jest-message-util": "^26.3.0", + "jest-resolve": "^26.4.0", + "natural-compare": "^1.4.0", + "pretty-format": "^26.4.0", + "semver": "^7.3.2" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^15.0.0", + "chalk": "^4.0.0" + } + }, + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, + "@types/yargs": { + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", + "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "diff-sequences": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.3.0.tgz", + "integrity": "sha512-5j5vdRcw3CNctePNYN0Wy2e/JbWT6cAYnXv5OuqPhDpyCGc0uLu2TK0zOCJWNB9kOIfYMSpIulRaDgIi4HJ6Ig==", + "dev": true + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "jest-diff": { + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.4.0.tgz", + "integrity": "sha512-wwC38HlOW+iTq6j5tkj/ZamHn6/nrdcEOc/fKaVILNtN2NLWGdkfRaHWwfNYr5ehaLvuoG2LfCZIcWByVj0gjg==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "diff-sequences": "^26.3.0", + "jest-get-type": "^26.3.0", + "pretty-format": "^26.4.0" + } + }, + "jest-get-type": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz", + "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==", + "dev": true + }, + "pretty-format": { + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.0.tgz", + "integrity": "sha512-mEEwwpCseqrUtuMbrJG4b824877pM5xald3AkilJ47Po2YLr97/siejYQHqj2oDQBeJNbu+Q0qUuekJ8F0NAPg==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-util": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.3.0.tgz", + "integrity": "sha512-4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "@types/node": "*", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.4", + "is-ci": "^2.0.0", + "micromatch": "^4.0.2" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^15.0.0", + "chalk": "^4.0.0" + } + }, + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, + "@types/yargs": { + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", + "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + } + } + }, + "jest-validate": { + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.4.0.tgz", + "integrity": "sha512-t56Z/FRMrLP6mpmje7/YgHy0wOzcuc6i3LBXz6kjmsUWYN62OuMdC86Vg9/dX59SvyitSqqegOrx+h7BkNXeaQ==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "camelcase": "^6.0.0", + "chalk": "^4.0.0", + "jest-get-type": "^26.3.0", + "leven": "^3.1.0", + "pretty-format": "^26.4.0" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^15.0.0", + "chalk": "^4.0.0" + } + }, + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, + "@types/yargs": { + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", + "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "camelcase": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz", + "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==", + "dev": true + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", @@ -10255,6 +12668,7 @@ "dev": true }, "jest-get-type": { +<<<<<<< HEAD "version": "26.0.0", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.0.0.tgz", "integrity": "sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==", @@ -10369,13 +12783,144 @@ "requires": { "has-flag": "^4.0.0" } +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz", + "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==", + "dev": true + }, + "pretty-format": { + "version": "26.4.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.0.tgz", + "integrity": "sha512-mEEwwpCseqrUtuMbrJG4b824877pM5xald3AkilJ47Po2YLr97/siejYQHqj2oDQBeJNbu+Q0qUuekJ8F0NAPg==", + "dev": true, + "requires": { + "@jest/types": "^26.3.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-watcher": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.3.0.tgz", + "integrity": "sha512-XnLdKmyCGJ3VoF6G/p5ohbJ04q/vv5aH9ENI+i6BL0uu9WWB6Z7Z2lhQQk0d2AVZcRGp1yW+/TsoToMhBFPRdQ==", + "dev": true, + "requires": { + "@jest/test-result": "^26.3.0", + "@jest/types": "^26.3.0", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "jest-util": "^26.3.0", + "string-length": "^4.0.1" + }, + "dependencies": { + "@jest/types": { + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz", + "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^15.0.0", + "chalk": "^4.0.0" + } + }, + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "dev": true, + "requires": { + "@types/istanbul-lib-report": "*" + } + }, + "@types/yargs": { + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", + "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 } } }, "jest-worker": { +<<<<<<< HEAD "version": "26.2.1", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.2.1.tgz", "integrity": "sha512-+XcGMMJDTeEGncRb5M5Zq9P7K4sQ1sirhjdOxsN1462h6lFo9w59bl2LVQmdGEEeU3m+maZCkS2Tcc9SfCHO4A==", +======= + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.3.0.tgz", + "integrity": "sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "dev": true, "requires": { "@types/node": "*", @@ -10438,9 +12983,15 @@ "dev": true }, "jsdom": { +<<<<<<< HEAD "version": "16.3.0", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.3.0.tgz", "integrity": "sha512-zggeX5UuEknpdZzv15+MS1dPYG0J/TftiiNunOeNxSl3qr8Z6cIlQpN0IdJa44z9aFxZRIVqRncvEhQ7X5DtZg==", +======= + "version": "16.4.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz", + "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "dev": true, "requires": { "abab": "^2.0.3", @@ -11001,6 +13552,12 @@ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", "dev": true }, + "merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true + }, "micromatch": { "version": "3.1.10", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", @@ -11083,6 +13640,71 @@ "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" +<<<<<<< HEAD +======= + }, + "minipass": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz", + "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + }, + "dependencies": { + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + } + } + }, + "minipass-collect": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", + "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", + "dev": true, + "requires": { + "minipass": "^3.0.0" + } + }, + "minipass-flush": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", + "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "dev": true, + "requires": { + "minipass": "^3.0.0" + } + }, + "minipass-pipeline": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "dev": true, + "requires": { + "minipass": "^3.0.0" + } + }, + "minizlib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz", + "integrity": "sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==", + "dev": true, + "requires": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "dependencies": { + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + } + } +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 }, "mississippi": { "version": "3.0.0", @@ -11232,9 +13854,9 @@ } }, "nan": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", - "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", + "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==", "dev": true, "optional": true }, @@ -11412,12 +14034,15 @@ "version": "7.3.2", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", +<<<<<<< HEAD "dev": true }, "uuid": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz", "integrity": "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==", +======= +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "dev": true }, "which": { @@ -11592,9 +14217,15 @@ } }, "onetime": { +<<<<<<< HEAD "version": "5.1.1", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.1.tgz", "integrity": "sha512-ZpZpjcJeugQfWsfyQlshVoowIIQ1qBGSVll4rfDq6JJVO//fesjoX808hXWfBjY+ROZgpKDI5TRSRBSoJiZ8eg==", +======= + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "dev": true, "requires": { "mimic-fn": "^2.1.0" @@ -11675,9 +14306,9 @@ } }, "get-stream": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", - "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "dev": true, "requires": { "pump": "^3.0.0" @@ -11787,6 +14418,18 @@ "p-limit": "^2.0.0" } }, +<<<<<<< HEAD +======= + "p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dev": true, + "requires": { + "aggregate-error": "^3.0.0" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", @@ -11913,7 +14556,8 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", - "dev": true + "dev": true, + "optional": true }, "path-exists": { "version": "3.0.0", @@ -11937,21 +14581,10 @@ "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" }, "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "dev": true, - "requires": { - "pify": "^3.0.0" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - } - } + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true }, "pbkdf2": { "version": "3.0.17", @@ -12315,6 +14948,7 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", +<<<<<<< HEAD "dev": true, "requires": { "@types/normalize-package-data": "^2.4.0", @@ -12405,30 +15039,31 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", +======= +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "dev": true, "optional": true, "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" }, "dependencies": { - "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "parse-json": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.1.tgz", + "integrity": "sha512-ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ==", "dev": true, "optional": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1", + "lines-and-columns": "^1.1.6" } }, +<<<<<<< HEAD "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -12448,6 +15083,84 @@ } } }, +======= + "type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "dev": true + } + } + }, + "read-pkg-up": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", + "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", + "dev": true, + "requires": { + "find-up": "^4.1.0", + "read-pkg": "^5.2.0", + "type-fest": "^0.8.1" + }, + "dependencies": { + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + } + } + }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, + "readdirp": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", + "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", + "dev": true, + "optional": true, + "requires": { + "picomatch": "^2.2.1" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "regenerate": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", @@ -12616,6 +15329,15 @@ "psl": "^1.1.28", "punycode": "^2.1.1" } +<<<<<<< HEAD +======= + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 } } }, @@ -12736,6 +15458,12 @@ "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", "dev": true }, + "reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true + }, "rimraf": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.1.tgz", @@ -12761,6 +15489,15 @@ "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==", "dev": true }, +<<<<<<< HEAD +======= + "run-parallel": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz", + "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==", + "dev": true + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "run-queue": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", @@ -12821,6 +15558,17 @@ "micromatch": "^3.1.4", "minimist": "^1.1.1", "walker": "~1.0.5" +<<<<<<< HEAD +======= + }, + "dependencies": { + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + } +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 } }, "sax": { @@ -12881,12 +15629,6 @@ "semver": "^6.3.0" } }, - "serialize-javascript": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz", - "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==", - "dev": true - }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -13178,9 +15920,15 @@ } }, "sonic-boom": { +<<<<<<< HEAD "version": "1.0.2", "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.0.2.tgz", "integrity": "sha512-sRMmXu7uFDXoniGvtLHuQk5KWovLWoi6WKASn7rw0ro41mPf0fOolkGp4NE6680CbxvNh26zWNyFQYYWXe33EA==", +======= + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.1.0.tgz", + "integrity": "sha512-JyOf+Xt7GBN4tAic/DD1Bitw6OMgSHAnswhPeOiLpfRoSjPNjEIi73UF3OxHzhSNn9WavxGuCZzprFCGFSNwog==", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "dev": true, "requires": { "atomic-sleep": "^1.0.0", @@ -13723,6 +16471,40 @@ "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==", "dev": true }, + "tar": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.2.tgz", + "integrity": "sha512-Glo3jkRtPcvpDlAs/0+hozav78yoXKFr+c4wgw62NNMO3oo4AaJdCo21Uu7lcwr55h39W2XD1LMERc64wtbItg==", + "dev": true, + "requires": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.0", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "dependencies": { + "chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "dev": true + }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + } + } + }, "tar-stream": { "version": "1.6.2", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz", @@ -13798,16 +16580,26 @@ } }, "terser-webpack-plugin": { +<<<<<<< HEAD "version": "1.4.4", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz", "integrity": "sha512-U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA==", +======= + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz", + "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "dev": true, "requires": { "cacache": "^12.0.2", "find-cache-dir": "^2.1.0", "is-wsl": "^1.1.0", "schema-utils": "^1.0.0", +<<<<<<< HEAD "serialize-javascript": "^3.1.0", +======= + "serialize-javascript": "^4.0.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "source-map": "^0.6.1", "terser": "^4.1.2", "webpack-sources": "^1.4.0", @@ -13821,9 +16613,15 @@ "dev": true }, "serialize-javascript": { +<<<<<<< HEAD "version": "3.1.0", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz", "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==", +======= + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", + "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "dev": true, "requires": { "randombytes": "^2.1.0" @@ -14053,11 +16851,18 @@ "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=" }, "ts-jest": { +<<<<<<< HEAD "version": "26.1.4", "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.1.4.tgz", "integrity": "sha512-Nd7diUX6NZWfWq6FYyvcIPR/c7GbEF75fH1R6coOp3fbNzbRJBZZAn0ueVS0r8r9ral1VcrpneAFAwB3TsVS1Q==", +======= + "version": "26.2.0", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.2.0.tgz", + "integrity": "sha512-9+y2qwzXdAImgLSYLXAb/Rhq9+K4rbt0417b8ai987V60g2uoNWBBmMkYgutI7D8Zhu+IbCSHbBtrHxB9d7xyA==", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "dev": true, "requires": { + "@types/jest": "26.x", "bs-logger": "0.x", "buffer-from": "1.x", "fast-json-stable-stringify": "2.x", @@ -14070,6 +16875,105 @@ "yargs-parser": "18.x" }, "dependencies": { +<<<<<<< HEAD +======= + "@jest/types": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^15.0.0", + "chalk": "^3.0.0" + } + }, + "@types/jest": { + "version": "26.0.9", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.9.tgz", + "integrity": "sha512-k4qFfJ5AUKrWok5KYXp2EPm89b0P/KZpl7Vg4XuOTVVQEhLDBDBU3iBFrjjdgd8fLw96aAtmnwhXHl63bWeBQQ==", + "dev": true, + "requires": { + "jest-diff": "^25.2.1", + "pretty-format": "^25.2.1" + } + }, + "@types/yargs": { + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", + "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "diff-sequences": { + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz", + "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "jest-diff": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz", + "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==", + "dev": true, + "requires": { + "chalk": "^3.0.0", + "diff-sequences": "^25.2.6", + "jest-get-type": "^25.2.6", + "pretty-format": "^25.5.0" + } + }, + "jest-get-type": { + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz", + "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==", + "dev": true + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "json5": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", @@ -14079,17 +16983,50 @@ "minimist": "^1.2.5" } }, +<<<<<<< HEAD +======= + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true }, + "pretty-format": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz", + "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==", + "dev": true, + "requires": { + "@jest/types": "^25.5.0", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^16.12.0" + } + }, "semver": { "version": "7.3.2", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", "dev": true +<<<<<<< HEAD +======= + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 } } }, @@ -14455,9 +17392,9 @@ "dev": true }, "uuid": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz", - "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz", + "integrity": "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==", "dev": true }, "v8-compile-cache": { @@ -14467,9 +17404,15 @@ "dev": true }, "v8-to-istanbul": { +<<<<<<< HEAD "version": "4.1.4", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz", "integrity": "sha512-Rw6vJHj1mbdK8edjR7+zuJrpDtKIgNdAvTSAcpYfgMIw+u2dPDntD3dgN4XQFLU2/fvFQdzj+EeSGfd/jnY5fQ==", +======= + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz", + "integrity": "sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q==", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.1", @@ -14548,6 +17491,7 @@ "graceful-fs": "^4.1.2", "neo-async": "^2.5.0", "watchpack-chokidar2": "^2.0.0" +<<<<<<< HEAD }, "dependencies": { "anymatch": { @@ -14632,6 +17576,92 @@ "dev": true, "optional": true }, +======= + } + }, + "watchpack-chokidar2": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz", + "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==", + "dev": true, + "optional": true, + "requires": { + "chokidar": "^2.1.8" + }, + "dependencies": { + "binary-extensions": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", + "dev": true, + "optional": true + }, + "chokidar": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", + "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", + "dev": true, + "optional": true, + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" + } + }, + "fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "dev": true, + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "optional": true, + "requires": { + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "optional": true, + "requires": { + "is-extglob": "^2.1.0" + } + } + } + }, + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, + "optional": true, + "requires": { + "binary-extensions": "^1.0.0" + } + }, +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -14639,6 +17669,7 @@ "dev": true, "optional": true }, +<<<<<<< HEAD "readdirp": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", @@ -14669,6 +17700,53 @@ "optional": true, "requires": { "chokidar": "^2.1.8" +======= + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "optional": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "readdirp": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", + "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "dev": true, + "optional": true, + "requires": { + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, + "optional": true + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 } }, "wcwidth": { @@ -15046,16 +18124,6 @@ } } }, - "webpack-log": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz", - "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", - "dev": true, - "requires": { - "ansi-colors": "^3.0.0", - "uuid": "^3.3.2" - } - }, "webpack-merge": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz", diff --git a/package.json b/package.json index b2189a99..d809f6d5 100644 --- a/package.json +++ b/package.json @@ -19,10 +19,17 @@ "@types/firefox-webext-browser": "70.0.1", "@types/jest": "^24.0.23", "@types/jquery": "^3.3.31", +<<<<<<< HEAD "copy-webpack-plugin": "^5.0.5", "jest": "^26.2.2", "rimraf": "^3.0.0", "ts-jest": "^26.1.4", +======= + "copy-webpack-plugin": "^6.0.3", + "jest": "^26.4.0", + "rimraf": "^3.0.0", + "ts-jest": "^26.2.0", +>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422 "ts-loader": "^6.2.1", "typescript": "~3.7.3", "web-ext": "^5.0.0", diff --git a/public/_locales/bg/messages.json b/public/_locales/bg/messages.json index d84afc72..9a02f664 100644 --- a/public/_locales/bg/messages.json +++ b/public/_locales/bg/messages.json @@ -3,6 +3,10 @@ "message": "SponsorBlock за YouTube - пропускай спонсорства", "description": "Name of the extension." }, + "Description": { + "message": "Прескачайте спонсорства, напомняния за абониране, и други неща в YouTube клипове. Докладвайте спонсорства на клиповете които гледате, за да спестите време на други потребители.", + "description": "Description of the extension." + }, "400": { "message": "Сървърът каза, че тази заявка е невалидна" }, @@ -15,17 +19,11 @@ "channelWhitelisted": { "message": "Каналът е добавен към Whitelist!" }, - "Sponsor": { - "message": "спонсор" - }, - "Sponsors": { - "message": "спонсори" - }, "Segment": { - "message": "част със спонсорство" + "message": "сегмент" }, "Segments": { - "message": "части със спонсорство" + "message": "сегменти" }, "reportButtonTitle": { "message": "Докладвай" @@ -66,17 +64,11 @@ "Unknown": { "message": "Възникна грешка при подаването на Вашите спонсорски времена, моля опитайте отново по-късно." }, - "sponsorFound": { - "message": "Спонсорите на това видео са в базата данни!" - }, - "sponsor404": { - "message": "Няма намерени спонсорства" - }, "sponsorStart": { - "message": "Спонсорството Започва Сега" + "message": "Сегментът Започва Сега" }, "sponsorEnd": { - "message": "Спонсорството Започва Сега" + "message": "Сегментът Свършва Сега" }, "noVideoID": { "message": "Не е намерено YouTube видео в този раздел. Ако сте сигурни, че това е YouTube раздел, затворете този изскачащ прозорец и го отворете отново. Ако това не проработи, опитайте се да презаредите раздела." @@ -87,24 +79,15 @@ "voted": { "message": "Гласувано!" }, + "serverDown": { + "message": "Изглежда, че сървърът не работи. Свържете се с програмиста незабавно." + }, "connectionError": { "message": "Възникна грешка с връзката. Код на грешката: " }, - "wantToSubmit": { - "message": "Искате ли да подадете спонсорствата за това видео ID" - }, - "leftTimes": { - "message": "Изглежда, че не сте подали някои спонсорства. Върнете се в страницата и ги подайте (те не са изтрити)." - }, - "clearTimes": { - "message": "Премахни Спонсорствата" - }, "openPopup": { "message": "Отворете изскачащия прозорец на SponsorBlock" }, - "SubmitTimes": { - "message": "Подайте спонсорите" - }, "submitCheck": { "message": "Сигурни ли сте, че искате да подадете това?" }, @@ -114,9 +97,6 @@ "removeFromWhitelist": { "message": "Премахване на канала от Whitelist" }, - "voteOnTime": { - "message": "Гласуване за спонсорства" - }, "savedPeopleFrom": { "message": "Вие сте помогнали на хора да пропуснат " }, @@ -140,5 +120,69 @@ }, "hideButtons": { "message": "Скриване на бутоните в YouTube Player-а" + }, + "to": { + "message": "до", + "description": "Used between segments. Example: 1:20 to 1:30" + }, + "category_sponsor": { + "message": "Спонсорство" + }, + "category_intro_description": { + "message": "Интервал без някакво съдържание. Може да бъде пауза, статичен кадър, анимация. Това не трябва да се използва за анимации, съдържащи информация или в музикални клипове." + }, + "category_interaction_description": { + "message": "Когато има кратко напомняне да харесате, да се абонирате или да последвате канала по средата на съдържанието. Ако е дълго или заради нещо специфично, трябва да е под \"само-реклама\"." + }, + "category_selfpromo": { + "message": "Неплатена/Само-реклама" + }, + "category_selfpromo_description": { + "message": "Подобно на \"спонсорство\", но е неплатено. Това включва merchandise, дарения или информация с кого каналът има сътрудничество." + }, + "category_music_offtopic": { + "message": "Музика: Част без музика" + }, + "category_music_offtopic_description": { + "message": "Само да се използва в музикални клипове. Това включва интрота и outro-та в музикални клипове." + }, + "category_livestream_messages": { + "message": "Поточно предаване: Четене на съобщения/дарения" + }, + "category_livestream_messages_short": { + "message": "Четене на съобщения" + }, + "disable": { + "message": "Забрани" + }, + "manualSkip": { + "message": "Ръчно Прескачане" + }, + "showOverlay": { + "message": "Показване в seek лентата" + }, + "colorFormatIncorrect": { + "message": "Вашият цвят не е форматиран правилно. Трябва да бъде 3- или 6-цифрен hex код с \"#\" в началото." + }, + "category": { + "message": "Категория" + }, + "downvoteDescription": { + "message": "Грешно/Неправилно Време" + }, + "incorrectCategory": { + "message": "Грешна Категория" + }, + "nonMusicCategoryOnMusic": { + "message": "Този клип е категоризиран като музика. Сигурни ли сте, че искате да докладвате сегментите с не-музикална категория? Освен ако видеото не е наистина музика, не би трябвало да докладвате този сегмент. Моля, прочетете правилата, ако сте объркани." + }, + "multipleSegments": { + "message": "Няколко Сегмента" + }, + "guidelines": { + "message": "Правила" + }, + "categoryUpdate1": { + "message": "Категориите са тук!" } } diff --git a/public/_locales/cs/messages.json b/public/_locales/cs/messages.json index d197ddc1..5ed3753a 100644 --- a/public/_locales/cs/messages.json +++ b/public/_locales/cs/messages.json @@ -1,8 +1,13 @@ { - "Sponsor": { - "message": "sponzor" + "fullName": { + "message": "SponsorBlock pro YouTube - Přeskoč Sponzorství", + "description": "Name of the extension." }, - "Sponsors": { - "message": "sponzoři" + "Description": { + "message": "Přeskoč sponzorství, žadonění o odběr a další v YouTube videích. Nahlaš sponzorované segmenty na videích co sleduješ a ušetři ostatním čas.", + "description": "Description of the extension." + }, + "400": { + "message": "Server hlásí, že tento požadavek je neplatný" } } diff --git a/public/_locales/de/messages.json b/public/_locales/de/messages.json index 5eb6ba94..db5aa8bb 100644 --- a/public/_locales/de/messages.json +++ b/public/_locales/de/messages.json @@ -19,17 +19,11 @@ "channelWhitelisted": { "message": "Der Kanal wurde auf die Whitelist gesetzt!" }, - "Sponsor": { - "message": "Sponsor" - }, - "Sponsors": { - "message": "Sponsoren" - }, "Segment": { - "message": "gesponsorter Inhalt" + "message": "segment" }, "Segments": { - "message": "gesponserte Segmente" + "message": "segmente" }, "upvoteButtonInfo": { "message": "Diese Einreichung positiv bewerten" @@ -80,22 +74,22 @@ "message": "Deine Segmente konnten nicht gesendet werden, bitte versuche es später erneut." }, "sponsorFound": { - "message": "Die gesponserten Inhalte dieses Videos befinden sich bereits in der Datenbank!" + "message": "Dieses Video hat Segmente in der Datenbank!" }, "sponsor404": { - "message": "Keine Sponsoren gefunden" + "message": "Keine Segmente gefunden" }, "sponsorStart": { - "message": "Gesponserter Inhalt beginnt" + "message": "Segment startet jetzt" }, "sponsorEnd": { - "message": "Gesponserter Inhalt endet" + "message": "Segment endet jetzt" }, "noVideoID": { "message": "Keine YouTube-Videos in diesem Tab gefunden. Wenn dies ein Youtube-Tab ist, schließe dieses Pop-up und öffne es erneut. Wenn das nicht hilft, versuche den Tab neu zu laden." }, "success": { - "message": "Erfolg!" + "message": "Geschafft!" }, "voted": { "message": "Abgestimmt!" @@ -107,19 +101,19 @@ "message": "Ein Verbindungsfehler ist aufgetreten. Fehlermeldung: " }, "wantToSubmit": { - "message": "Möchtest du die Segmente für die Video Id senden" + "message": "Möchtest du für Video-ID einreichen" }, "leftTimes": { "message": "Scheinbar hast du einige Segmente noch nicht gesendet. Kehre zur Seite zurück um sie zu senden (sie sind noch gespeichert)." }, "clearTimes": { - "message": "Lösche Auswahl" + "message": "Segmente löschen" }, "openPopup": { "message": "Öffne SponsorBlock-Popup" }, "SubmitTimes": { - "message": "Diese Zeiten einreichen" + "message": "Segment absenden" }, "submitCheck": { "message": "Bist du sicher, dass die Auswahl abgeschickt werden soll?" @@ -131,10 +125,7 @@ "message": "Kanal von der Whitelist entfernen" }, "voteOnTime": { - "message": "Stimme für Zeiten ab" - }, - "recordTimes": { - "message": "Lege das Zeitfenster eines gesponserten Inhalts fest" + "message": "Über ein Segment abstimmen" }, "soFarUHSubmited": { "message": "Gemeldet wurden von dir bisher" @@ -149,13 +140,10 @@ "message": "hier" }, "recordTimesDescription": { - "message": "Klicke den Knopf unten, wenn der gesponsorte Inhalt beginnt und endet, um aufzunehmen und\n einzusenden." + "message": "Klicken Sie auf die Schaltfläche unten, wenn das Segment startet und endet, um es in die Datenbank einzusenden." }, "popupHint": { - "message": "Hinweis: In den Optionen lässt sich eine Taste für das Festlegen von Anfang/Ende des gesponserten Inhalts, sowie für das Einsenden festlegen" - }, - "lastTimes": { - "message": "Letzte ausgewählte Zeitabschnitte" + "message": "Hinweis: Drücken Sie die Semikolon-Taste während Sie auf ein Video fokussiert sind, um das Start/Ende eines Segments zu melden und das einzureichende Zitat anzugeben. (Dies kann in den Optionen geändert werden)" }, "clearTimesButton": { "message": "Zeiten löschen" @@ -205,20 +193,17 @@ "whatDeleteButton": { "message": "Dierser Button im YouTube-Player löscht alle nicht übermittelten Segmente für das aktuelle Video." }, - "disableViewTracking": { - "message": "Deaktiviere das Mitzählen übersprungener Sponsoren" - }, "enableViewTracking": { - "message": "Aktiviere das Mitzählen übersprungener Sponsoren" + "message": "Aktiviere mitzählen übersprungener Segmente" }, "whatViewTracking": { - "message": "Diese Funktion hält fest, welche Sponsoren von dir übersprungen wurden und hilft anderen zu erfahren, was ihre Einsendungen bewirkt haben.\n Außerdem dienen die Werte zusammen mit positiven Rückmeldungen als Anti-Spam-Schutz. \n Wenn ein gesponserter Inhalt übersprungen wird, sendet die Erweiterung eine Nachricht an den Server. \n Hoffentlich wird diese Funktion auch weiterhin genutzt, damit der Algorithmus funktioniert. :)" + "message": "Dieses Feature zählt die Segmente, die du übersprungen hast, um die Benutzer wissen zu lassen, wie sehr ihre Einreichung anderen geholfen hat und als Metrik zusammen mit positiven Bewertungen verwendet wurde, um sicherzustellen, dass Spam nicht in die Datenbank gelangt. Die Erweiterung sendet jedes Mal, wenn du ein Segment überspringst, eine Nachricht an den Server. Hoffentlich ändern die meisten Leute diese Einstellung nicht, so dass die Zahlen korrekt sind. :)" }, "showNotice": { "message": "Benachrichtigung wieder zeigen" }, "longDescription": { - "message": "SponsorBlock ermöglicht es Ihnen, Sponsoren, Intros, Abonnement-Erinnerungen und andere nervige Teile von YouTube-Videos zu überspringen. SponsorBlock ist eine Crowdsourcing-basierte Browser-Erweiterung, in der jeder Start- und Endzeit von gesponserten und anderen Segmenten von YouTube-Videos einreichen kann. Sobald eine Person diese Informationen einreicht, überspringen alle anderen mit dieser Erweiterung das gesponserte Segment. Sie können auch Nicht-Musik-Abschnitte von Musikvideos überspringen.", + "message": "SponsorBlock lässt dich über Sponsoren, Intros, Outros, Abonnement-Erinnerungen und andere nervige Teile von YouTube-Videos überspringen. SponsorBlock ist eine Crowdsourced Browser-Erweiterung, in der jeder die Start- und Endzeit gesponserter Segmente und anderer Segmente von YouTube-Videos einreicht. Sobald eine Person diese Informationen einreicht, überspringen alle anderen mit dieser Erweiterung das gesponserte Segment. Sie können auch nicht Musik Abschnitte von Musikvideos überspringen.", "description": "Full description of the extension on the store pages." }, "website": { @@ -238,7 +223,7 @@ "description": "The second line of the message displayed after the notice was upgraded." }, "setStartSponsorShortcut": { - "message": "Segment aufnehmen Taste festlegen" + "message": "Tastenkombination für das Starten eines Segments festlegen" }, "setSubmitKeybind": { "message": "Segment einsenden Taste festlegen" @@ -280,14 +265,11 @@ "enableAutoSkip": { "message": "Automatisches Überspringen aktivieren" }, - "autoSkipDescription": { - "message": "Auto-Überspringen überspringt gesponserte Inhalte für dich. Wenn deaktiviert, fragt die Benachrichtigung, ob übersprungen werden soll." - }, "audioNotification": { "message": "Audio-Benachrichtigung beim Überspringen" }, "audioNotificationDescription": { - "message": "Audio-Benachrichtigung beim Überspringen wird einen Ton abspielen, wenn ein Sponsor übersprungen wird. Wenn deaktiviert (oder wenn Automatisches-Überspringen deaktiviert ist), wird kein Ton abgespielt." + "message": "Audio-Benachrichtigung. Es wird ein Ton abgespielt, wenn ein Segment übersprungen wird. Wenn deaktiviert (oder wenn Automatisches-Überspringen deaktiviert ist), wird kein Ton abgespielt." }, "showTimeWithSkips": { "message": "Zeit ohne übersprungenen Inhalt anzeigen" @@ -302,7 +284,7 @@ "message": "Du erspartest dir " }, "minLower": { - "message": "Minute" + "message": "minute" }, "minsLower": { "message": "Minuten" @@ -319,9 +301,6 @@ "youHaveSavedTimeEnd": { "message": " ihrer Zeit." }, - "guildlinesSummary": { - "message": "- Stellen Sie sicher, dass Ihr Segment nur kostenpflichtige Werbeaktionen enthält, nichts anderes.\n- Stellen Sie sicher, dass das Überspringen dieses Segments wertvolle Inhalte nicht abschneiden wird\n- Wenn das ganze Video ein Sponsor ist, bitte nicht melden. Ein vollständiges Video-Reporting-System wird bald herauskommen.\n- Bitte melde keine Haftungsausschlüsse, die Voreingenommenheit zeigen könnten (falls ein Bewertungsvideo gesponsert wird, überspringen Sie nicht, wenn sie dies erwähnen)." - }, "statusReminder": { "message": "Überprüfe status.sponsor.ajay.app für den Serverstatus." }, @@ -344,7 +323,7 @@ "message": "Automatisch überspringen" }, "showSkipNotice": { - "message": "Zeige Hinweis nach dem Übersprung eines Sponsors" + "message": "Zeige Pop-Up nach dem Übersprung eines Segments" }, "keybindCurrentlySet": { "message": ". Es ist derzeit gesetzt auf:" @@ -383,7 +362,7 @@ "message": "Minimale Dauer (Sekunden):" }, "minDurationDescription": { - "message": "Sponsor Segmente, die kürzer als der festgelegte Wert sind, werden nicht übersprungen oder im Player angezeigt." + "message": "Segmente, die kürzer als der festgelegte Wert sind, werden nicht übersprungen oder im Player angezeigt." }, "shortCheck": { "message": "Die folgende Einreichung ist kürzer als Ihre Mindestdauer. Dies könnte bedeuten, dass dies bereits eingereicht wurde und aufgrund dieser Option einfach ignoriert wird. Sind Sie sicher, dass Sie einreichen möchten?" @@ -413,13 +392,13 @@ "message": "Sind sie sicher dass sie das zurücksetzen wollen?" }, "confirmPrivacy": { - "message": "Das Video wurde als ungelistet erkannt. Klicken Sie auf Abbrechen, wenn Sie nicht nach Sponsoren suchen möchten." + "message": "Das Video wurde als nicht aufgelistet erkannt. Klicken Sie auf Abbrechen, wenn Sie nicht nach Segmenten suchen möchten." }, "unlistedCheck": { "message": "Nicht gelistete Videos ignorieren" }, "whatUnlistedCheck": { - "message": "Diese Einstellung verlangsamt den Sponsor-Block erheblich. Sponsor-Suchvorgänge erfordern das Senden der Video-ID an den Server. Wenn Sie sich Sorgen darüber machen, dass nicht gelistete Video-IDs über das Internet gesendet werden, aktivieren Sie diese Option." + "message": "Diese Einstellung wird SponsorBlock leicht verlangsamen. Das Überspringen von Segment Suchanfragen erfordert das Senden der Video-ID an den Server. Wenn Sie sich Sorgen darüber machen, dass nicht gelistete Video-IDs über das Internet gesendet werden, aktivieren Sie diese Option." }, "mobileUpdateInfo": { "message": "m.youtube.com wird jetzt unterstützt" @@ -477,7 +456,7 @@ }, "to": { "message": "bis", - "description": "Used between sponsor times. Example: 1:20 to 1:30" + "description": "Used between segments. Example: 1:20 to 1:30" }, "category_sponsor": { "message": "Sponsor" @@ -498,7 +477,7 @@ "message": "Endkarten/Credits" }, "category_outro_description": { - "message": "Credits oder wenn die YouTube-Endkarten erscheinen. Nicht für gesprochene Fazits. Dies sollte keine nützlichen Inhalte beinhalten. Dies sollte nicht für Musikvideos verwendet werden." + "message": "Credits oder wenn die YouTube-Endkarten erscheinen. Nicht für Schlussfolgerungen mit Informationen. Dies sollte nicht für Musikvideos verwendet werden." }, "category_interaction": { "message": "Interaktions-Erinnerung (Abonnieren)" @@ -596,13 +575,13 @@ "message": "Falls dies weiterhin geschieht, könnte dies durch Ihren Werbeblocker verursacht werden. Bitte überprüfen Sie https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests" }, "forceChannelCheck": { - "message": "Kanalprüfung erzwingen vor dem Überspringen von Sponsoren" + "message": "Kanalprüfung erzwingen vor dem Überspringen von Segmenten" }, "whatForceChannelCheck": { - "message": "Standardmäßig überspringt er Sponsoren sofort, bevor er überhaupt weiß, was der Kanal ist. Standardmäßig werden auf den Kanälen auf der Whitelist-Liste einige null Sekunden Sponsoren übersprungen. Das Aktivieren dieser Option verhindert dies, aber das Überspringen hat eine leichte Verzögerung, da die Kanal-ID einige Zeit in Anspruch nehmen kann. Diese Verzögerung kann bei schnellen Internetverbindungen unauffällig sein." + "message": "Standardmäßig überspringt er Segmente sofort, bevor er überhaupt weiß, welcher Kanal das ist. Standardmäßig werden einige Segmente am Anfang des Videos auf den Kanälen auf der Whitelist übersprungen. Das Aktivieren dieser Option verhindert dies, aber das Überspringen hat eine leichte Verzögerung, da die Channel-ID einige Zeit in Anspruch nehmen kann. Diese Verzögerung kann bei schnellen Internetverbindungen unauffällig sein." }, "forceChannelCheckPopup": { - "message": "Bedenken Sie die Aktivierung der Force-Channel-Prüfung vor dem Überspringen von Sponsoren" + "message": "Bedenken Sie die Aktivierung von \"Kanalprüfung erzwingen vor dem Überspringen von Segmenten\"" }, "downvoteDescription": { "message": "Nicht korrektes/Falsches Timing" diff --git a/public/_locales/el/messages.json b/public/_locales/el/messages.json index 0967ef42..52fc1e69 100644 --- a/public/_locales/el/messages.json +++ b/public/_locales/el/messages.json @@ -1 +1,179 @@ -{} +{ + "Segment": { + "message": "τμήμα" + }, + "Segments": { + "message": "τμήματα" + }, + "upvoteButtonInfo": { + "message": "Κάντε upvote αυτήν την υποβολή" + }, + "reportButtonTitle": { + "message": "Αναφορά" + }, + "reportButtonInfo": { + "message": "Αναφέρετε αυτή την υποβολή σαν λανθασμένη." + }, + "Dismiss": { + "message": "Παράβλεψη" + }, + "Loading": { + "message": "Φόρτωση..." + }, + "Mins": { + "message": "Λεπτά" + }, + "Secs": { + "message": "Δευτερόλεπτα" + }, + "Hide": { + "message": "Να μην εμφανίζεται ποτέ" + }, + "paused": { + "message": "Σε παύση" + }, + "manualPaused": { + "message": "Λήξη χρονομέτρου" + }, + "clearThis": { + "message": "Θέλετε σίγουρα να εκκαθαρίσετε τη φόρμα;\n\n" + }, + "success": { + "message": "Επιτυχία!" + }, + "voted": { + "message": "Ψηφίστηκε!" + }, + "clearTimes": { + "message": "Καθαρισμός τμημάτων" + }, + "here": { + "message": "εδώ" + }, + "Options": { + "message": "Επιλογές" + }, + "website": { + "message": "Ιστοσελίδα", + "description": "Used on Firefox Store Page" + }, + "sourceCode": { + "message": "Πηγαίος Κώδικας", + "description": "Used on Firefox Store Page" + }, + "errorCode": { + "message": "Κωδικός σφάλματος: " + }, + "skip": { + "message": "Παράκαμψη" + }, + "skipped": { + "message": "Παραλείφθηκε" + }, + "minLower": { + "message": "λεπτό" + }, + "minsLower": { + "message": "λεπτά" + }, + "hourLower": { + "message": "ώρα" + }, + "hoursLower": { + "message": "ώρες" + }, + "createdBy": { + "message": "Δημιουργήθηκε από" + }, + "add": { + "message": "Προσθήκη" + }, + "save": { + "message": "Αποθήκευση" + }, + "reset": { + "message": "Επαναφορά" + }, + "confirmNoticeTitle": { + "message": "Υποβολή Κατηγορίας" + }, + "submit": { + "message": "Υποβολή" + }, + "cancel": { + "message": "Ακύρωση" + }, + "delete": { + "message": "Διαγραφή" + }, + "preview": { + "message": "Προεπισκόπηση" + }, + "edit": { + "message": "Επεξεργασία" + }, + "to": { + "message": "έως", + "description": "Used between segments. Example: 1:20 to 1:30" + }, + "category_sponsor": { + "message": "Χορηγός" + }, + "category_intro_short": { + "message": "Διάλειμμα" + }, + "disable": { + "message": "Απενεργοποίηση" + }, + "previewColor": { + "message": "Προεπισκόπηση χρώματος", + "description": "Referring to submissions that have not been sent to the server yet." + }, + "category": { + "message": "Κατηγορία" + }, + "skipOption": { + "message": "Παράλειψη Επιλογής", + "description": "Used on the options page to describe the ways to skip the segment (auto skip, manual, etc.)" + }, + "enableTestingServer": { + "message": "Ενεργοποίηση διακομιστή δοκιμαστικών λειτουργιών" + }, + "whatEnableTestingServer": { + "message": "Οι υποβολές και οι ψήφοι ΔΕΝ ΘΑ ΜΕΤΡΗΣΟΥΝ προς τον κεντρικό διακομιστή. Χρησιμοποίησέ το μόνο για δοκιμή." + }, + "bracketNow": { + "message": "(τώρα)" + }, + "moreCategories": { + "message": "Περισσότερες κατηγορίες" + }, + "chooseACategory": { + "message": "Επιλέξτε μια κατηγορία" + }, + "incorrectCategory": { + "message": "Λάθος κατηγορία" + }, + "multipleSegments": { + "message": "Πολλαπλά Τμήματα" + }, + "guidelines": { + "message": "Οδηγίες" + }, + "readTheGuidelines": { + "message": "Διάβασε τις οδηγίες!!", + "description": "Show the first time they submit or if they are \"high risk\"" + }, + "categoryUpdate1": { + "message": "Οι κατηγορίες είναι εδώ!" + }, + "categoryUpdate2": { + "message": "Άνοιξε τις επιλογές για την παράλειψη τίτλων αρχής-τέλους, πωλήσεων κ. α." + }, + "unsubmittedWarning": { + "message": "Ειδοποίηση μη κατοχυρωμένων τμημάτων" + }, + "unsubmittedWarningDescription": { + "message": "Στείλε μια ειδοποίηση όταν αφήνεις βίντεο με τμήματα που δεν έχουν ανέβει" + } +} diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json index cc056c2c..df65bd2e 100644 --- a/public/_locales/en/messages.json +++ b/public/_locales/en/messages.json @@ -112,6 +112,9 @@ "openPopup": { "message": "Open SponsorBlock Popup" }, + "closePopup": { + "message": "Close Popup" + }, "SubmitTimes": { "message": "Submit Segments" }, @@ -471,7 +474,7 @@ "message": "Intermission/Intro Animation" }, "category_intro_description": { - "message": "An interval without actual content. Could be a pause, static frame, repeating animation. This should not be used for transitions containing information or be used on music videos." + "message": "An interval without actual content. Could be a pause, static frame, repeating animation. This should not be used for transitions containing information." }, "category_intro_short": { "message": "Intermission" @@ -480,7 +483,7 @@ "message": "Endcards/Credits" }, "category_outro_description": { - "message": "Credits or when the YouTube endcards appear. Not for conclusions with information. This should not be used on music videos." + "message": "Credits or when the YouTube endcards appear. Not for conclusions with information." }, "category_interaction": { "message": "Interaction Reminder (Subscribe)" @@ -593,7 +596,7 @@ "message": "Wrong Category" }, "nonMusicCategoryOnMusic": { - "message": "This video is categorized as music. Are you sure you would like to submit segments with non-music categories? Unless this video is not actually music, you should not be submitting this segment. Please read the guidelines if you are confused." + "message": "This video is categorized as music. Are you sure you this has a sponsor? If this is actually a \"Non-Music segment\", open up the extension options and enable this category. Then, you can submit this segment as \"Non-Music\" instead of sponsor. Please read the guidelines if you are confused." }, "multipleSegments": { "message": "Multiple Segments" diff --git a/public/_locales/es/messages.json b/public/_locales/es/messages.json index 5be6d868..d6455f8b 100644 --- a/public/_locales/es/messages.json +++ b/public/_locales/es/messages.json @@ -3,6 +3,10 @@ "message": "SponsorBlock para YouTube - Omitir Sponsors", "description": "Name of the extension." }, + "Description": { + "message": "Salte todos los patrocinios, súplicas por suscripción y más en los videos de YouTube. Reporta secciones de patrocinio en los videos que veas para ahorrarle tiempo a los demás.", + "description": "Description of the extension." + }, "400": { "message": "Servidor dijo que esta solicitud no es valida" }, @@ -15,17 +19,11 @@ "channelWhitelisted": { "message": "Canal Permitido!" }, - "Sponsor": { - "message": "sponsor" - }, - "Sponsors": { - "message": "sponsors" - }, "Segment": { - "message": "segmento de sponsor" + "message": "segmento" }, "Segments": { - "message": "segmentos de sponsor" + "message": "segmentos" }, "upvoteButtonInfo": { "message": "Votar a favor de esta sumisión" @@ -76,16 +74,16 @@ "message": "Se ha producido un error enviando tus tiempos de sponsor, por favor inténtalo de nuevo más tarde." }, "sponsorFound": { - "message": "¡Los sponsors de este video están en la base de datos!" + "message": "¡Este video tiene segmentos en la base de datos!" }, "sponsor404": { - "message": "No se encontró ningún sponsor" + "message": "No se han encontrado segmentos" }, "sponsorStart": { - "message": "Sponsor Empieza Ahora" + "message": "El segmento comienza ahora" }, "sponsorEnd": { - "message": "Sponsor Acaba Ahora" + "message": "El segmento termina ahora" }, "noVideoID": { "message": "Ningún video de YouTube se encontró en esta pestaña. Si sabes que esto es una pestaña de YouTube, cierra esta ventana y ábrela otra vez. Si eso no funciona, intenta recargar la pestaña." @@ -103,19 +101,19 @@ "message": "Ha ocurrido un error de conexión. Código de error: " }, "wantToSubmit": { - "message": "¿Quieres enviar los tiempos de sponsor para el vídeo id" + "message": "¿Quiere enviar segmento para el video con ID" }, "leftTimes": { - "message": "Parece que has dejado algunos tiempos de sponsor sin enviar. Vuelve a esa página para enviarlos (no se eliminaron)." + "message": "Parece que has dejado algunos segmentos sin enviar. Vuelva a esa página para enviarlos (no se han borrado)." }, "clearTimes": { - "message": "Eliminar Tiempos de Sponsor" + "message": "Borrar Segmentos" }, "openPopup": { "message": "Abrir Ventana de SponsorBlock" }, "SubmitTimes": { - "message": "Enviar Tiempos de Sponsor" + "message": "Enviar Segmentos" }, "submitCheck": { "message": "¿Estás seguro de que quieres enviar esto?" @@ -127,10 +125,7 @@ "message": "Parar De Permitir Canal" }, "voteOnTime": { - "message": "Votar en un tiempo de sponsor" - }, - "recordTimes": { - "message": "Registrar los tiempos de un sponsor" + "message": "Vote En Un Segmento" }, "soFarUHSubmited": { "message": "Hasta ahora, has enviado" @@ -145,13 +140,10 @@ "message": "aquí" }, "recordTimesDescription": { - "message": "Haga clic en el botón de abajo cuando el sponsor comienza y termina para registrarlo y\nenviarlo a la base de datos." + "message": "Haga clic en el botón de abajo cuando el segmento comience y termine para grabarlo y enviarlo a la base de datos." }, "popupHint": { - "message": "Consejo: Presiona la tecla de punto y coma mientras enfocado en un video para registrar el comienzo/fin de un sponsor y presiona comillas para enviar. (Esto se puede cambiar en las opciones)" - }, - "lastTimes": { - "message": "Últimos mensajes de sponsor elegidos" + "message": "Pista: Presione la tecla de punto y coma mientras está enfocado en un video para indicar el comienzo/final de un segmento y citación para enviarlo. (Esto puede cambiarse en opciones)" }, "clearTimesButton": { "message": "Eliminar Tiempos" @@ -201,18 +193,19 @@ "whatDeleteButton": { "message": "Este es el botón en el reproductor de YouTube que eliminará todos tus segmentos no enviados para el vídeo actual." }, - "disableViewTracking": { - "message": "Desactivar seguimiento de numero de sponsorsomitidos" - }, "enableViewTracking": { - "message": "Activar seguimiento de numero de sponsors omitidos" + "message": "Habilitar el conteo de omisiones" }, "whatViewTracking": { - "message": "Esta opción registra los sponsors que te has saltado para que los otros usuarios sepan cuánto su sumisión ha ayudado a otros y\nes usado como métrica junto con votos positivos para asegurar que el spam no ingrese a la base de datos. La extensión envía un mensaje\nal servidor cada vez que se salta un patrocinador. Esperemos que la mayoría de la gente no cambie esta opción para que los números de vista sean exactos. :)" + "message": "Esta función rastrea los segmentos que se han saltado para que los usuarios sepan en qué medida sus aportes ayudaron a los demás y se utilizan como una métrica junto con los votos favorables para garantizar que no aparezca spam en la base de datos. La extensión envía un mensaje al servidor cada vez que se salta un segmento. Esperemos que la mayoría de la gente no cambie esta configuración para que los números de vista sean exactos. :)" }, "showNotice": { "message": "Mostrar aviso de nuevo" }, + "longDescription": { + "message": "SponsorBlock te permite saltarte los patrocinadores, intros, outros, recordatorios de suscripción y otras partes molestas de los videos de YouTube. SponsorBlock es una extensión de navegador de código abierto que permite a cualquiera enviar el tiempo de inicio y fin de los segmentos de patrocinadores y otros segmentos de los videos de YouTube. Una vez que una persona envía esta información, todos los que tengan esta extensión podrán saltearse ese segmento. También es posible saltar las secciones no musicales de los videos musicales.", + "description": "Full description of the extension on the store pages." + }, "website": { "message": "Sitio Web", "description": "Used on Firefox Store Page" @@ -230,7 +223,7 @@ "description": "The second line of the message displayed after the notice was upgraded." }, "setStartSponsorShortcut": { - "message": "Establecer botón de inicio de sponsor" + "message": "Establecer tecla para iniciar segmento" }, "setSubmitKeybind": { "message": "Establecer botón de envio" @@ -272,14 +265,17 @@ "enableAutoSkip": { "message": "Activar la omisión automática" }, - "autoSkipDescription": { - "message": "La omisión automática omitirá sponsors por ti. Si esta desactivada, aparecerá un aviso preguntando si quieres omitir." - }, "audioNotification": { "message": "Notificación de audio al omitir" }, "audioNotificationDescription": { - "message": "Notificación de audio al omitir reproducirá un sonido cada vez que se omite un sponsor. Si está desactivada (o se desactiva la omisión automática), no se reproducirá ningún sonido." + "message": "Si se salta un segmento, se oirá un sonido de notificación de audio. Si se desactiva (o si se desactiva la función de omisión automática), no se reproducirá ningún sonido." + }, + "showTimeWithSkips": { + "message": "Mostrar la duración del video con las secciones omitidas" + }, + "showTimeWithSkipsDescription": { + "message": "Esta duración aparece entre paréntesis junto al tiempo actual del video, debajo de la barra de navegación. Esta muestra la duración total del vídeo menos cualquier segmento eliminado. Esto incluye los segmentos marcados como solo \"Mostrar en la barra de navegación\"." }, "youHaveSkipped": { "message": "Has omitido " @@ -305,9 +301,6 @@ "youHaveSavedTimeEnd": { "message": " de sus vidas." }, - "guildlinesSummary": { - "message": "- Asegúrate de que tu segmento sólo contiene un segmento de promoción de pago, nada más.\n- Asegúrate de que omitir este segmento no omitirá ningún contenido valioso\n- Si todo el vídeo es un sponsor, por favor, no lo envíen. Pronto saldrá un sistema completo de reportes de vídeo.\n- Por favor, no informe de los avisos que podrían mostrar parcialidad (si un vídeo de revista está patrocinado, no se salte cuando mencionen eso)." - }, "statusReminder": { "message": "Comprueba status.sponsor.ajay.app para ver el estado del servidor." }, @@ -318,58 +311,58 @@ "message": "Esto debería mantenerse privado. Es como una contraseña y no debe ser compartido con nadie. Si alguien tiene esto, pueden imitarte." }, "setUserID": { - "message": "Definir UserID" + "message": "Establecer la ID de usuario" }, "userIDChangeWarning": { - "message": "Advertencia: Cambiar el UserID es permanente. ¿Estás seguro de que desea hacer esto? Asegúrese de hacer una copia de seguridad de su UserID anterior por si acaso." + "message": "Advertencia: El cambio de la ID de usuario es irreversible. ¿Está seguro de que le desea hacerlo? Asegúrese de hacer una copia de respaldo de la anterior por si acaso." }, "createdBy": { "message": "Creado Por" }, "autoSkip": { - "message": "Omisión Automática" + "message": "Omitir automáticamente" }, "showSkipNotice": { - "message": "Mostrar aviso después de que se omita un sponsor" + "message": "Mostrar aviso después de que se omita un segmento" }, "keybindCurrentlySet": { - "message": ". Actualmente está establecido a:" + "message": ". Actualmente está configurado para:" }, "supportInvidious": { - "message": "Soportar Invidious" + "message": "Apoya a Invidious" }, "supportInvidiousDescription": { - "message": "Invidious (invidio.us) es un cliente alternativo para YouTube. Para habilitar soporte, tienes que aceptar los permisos adicionales. Esto NO funciona en modo incógnito en Chrome y otros variantes de Chromium." + "message": "Invidious (invidio.us) es un cliente de YouTube independiente. Para habilitar su soporte, debes aceptar los permisos extra. Esto NO funcionará en modo incógnito de Chrome y otras variantes del Chromium." }, "optionsInfo": { - "message": "Activar soporte de Invidious, deshabilitar omisión automática, ocultar botones y más." + "message": "Activar el soporte para Invidious, desactivar la omisión automática, oculta botones y más." }, "addInvidiousInstance": { - "message": "Añadir nodo de Invidious" + "message": "Agregar una Instancia de Invidious" }, "addInvidiousInstanceDescription": { - "message": "Añadir un nodo de Invidious personalizado. Esto debe estar formateado con SOLO el dominio. Ejemplo: invidious.ajay.app" + "message": "Añade una instancia personalizada de Invidious. Este debe formatearse SÓLO con el dominio. Ejemplo: invidious.ajay.app" }, "add": { - "message": "Añadir" + "message": "Agregar" }, "addInvidiousInstanceError": { - "message": "Esto es un dominio inválido. Esto debería incluir SOLO el dominio. Ejemplo: invidious.ajay.app" + "message": "Este es un dominio inválido. SÓLO debería incluir la parte del dominio. Ejemplo: invidious.ajay.app" }, "resetInvidiousInstance": { - "message": "Restablecer Lista de Nodos de Invidious" + "message": "Restablecer la lista de instancias de Invidious" }, "resetInvidiousInstanceAlert": { - "message": "Estás a punto de restablecer la lista de nodos de invidious" + "message": "Está a punto de reiniciar la lista de instancias del Invidious" }, "currentInstances": { - "message": "Nodos actuales:" + "message": "Instancias actuales:" }, "minDuration": { - "message": "Duración mínima (en segundos):" + "message": "Duración mínima (segundos):" }, "minDurationDescription": { - "message": "Los segmentos de sponsor más cortos que el valor establecido no serán omitidos ni mostrados en el reproductor." + "message": "Los segmentos más cortos que el valor configurado no se omitirán ni se mostrarán en el reproductor." }, "shortCheck": { "message": "La siguiente sumisión es más corto que su opción de duración mínima. Esto podría significar que esto ya se ha enviado y que simplemente se ha ignorado debido a esta opción. ¿Está seguro de que desea enviar?" @@ -392,6 +385,9 @@ "reset": { "message": "Restablecer" }, + "customAddressError": { + "message": "La dirección no tiene el formato adecuado. Asegúrese de que tenga http:// o https:// al principio y que no haya barras al final." + }, "mobileUpdateInfo": { "message": "m.youtube.com ahora es compatible" }, @@ -468,12 +464,12 @@ "message": "ID de canal no cargado todavía." }, "downvoteDescription": { - "message": "Tiempo incorrecto" + "message": "Tiempo incorrecto/equivocado" }, "incorrectCategory": { - "message": "Categoría errónea" + "message": "Categoría Incorrecta" }, "multipleSegments": { - "message": "Varios segmentos" + "message": "Múltiples segmentos" } } diff --git a/public/_locales/fi/messages.json b/public/_locales/fi/messages.json index 714d7e7d..e8d1a8a8 100644 --- a/public/_locales/fi/messages.json +++ b/public/_locales/fi/messages.json @@ -15,18 +15,6 @@ "channelWhitelisted": { "message": "Kanava lisätty valkoiselle listalle!" }, - "Sponsor": { - "message": "sponsori" - }, - "Sponsors": { - "message": "sponsorit" - }, - "Segment": { - "message": "sponsoroitu kohta" - }, - "Segments": { - "message": "sponsoroidut kohdat" - }, "upvoteButtonInfo": { "message": "Äänestä tätä lähetystä" }, @@ -72,18 +60,6 @@ "Unknown": { "message": "Sponsorointiaikoja lähetettäessä tapahtui virhe, yritä myöhemmin uudelleen." }, - "sponsorFound": { - "message": "Tämän videon sponsorit löytyvät tietokannasta!" - }, - "sponsor404": { - "message": "Sponsoreita ei löytynyt" - }, - "sponsorStart": { - "message": "Sponsorointi alkaa nyt" - }, - "sponsorEnd": { - "message": "Sponsorointi päättyy nyt" - }, "noVideoID": { "message": "Välilehdeltä ei löytynyt YouTube-videota. Jos olet varma, että tämä on YouTube-välilehti, sulje tämä ponnahdusikkuna ja avaa se uudelleen. Jos sekään ei toimi, yritä ladata välilehti uudelleen." }, @@ -99,15 +75,9 @@ "connectionError": { "message": "Yhteysvirhe on tapahtunut. Virhekoodi: " }, - "clearTimes": { - "message": "Tyhjennä sponsorointiajat" - }, "openPopup": { "message": "Avaa SponsorBlock-ponnahdusikkuna" }, - "SubmitTimes": { - "message": "Lähetä sponsorointiajat" - }, "submitCheck": { "message": "Haluatko varmasti lähettää tämän?" }, @@ -117,12 +87,6 @@ "removeFromWhitelist": { "message": "Poista kanava valkoiselta listalta" }, - "voteOnTime": { - "message": "Äänestä sponsorointiaikaa" - }, - "recordTimes": { - "message": "Tallenna sponsoroinnin ajat" - }, "soFarUHSubmited": { "message": "Tähän mennessä, olet lähettänyt" }, @@ -311,7 +275,7 @@ }, "to": { "message": "-", - "description": "Used between sponsor times. Example: 1:20 to 1:30" + "description": "Used between segments. Example: 1:20 to 1:30" }, "category_sponsor": { "message": "Sponsori" diff --git a/public/_locales/fr/messages.json b/public/_locales/fr/messages.json index 2cb8948b..5cb81713 100644 --- a/public/_locales/fr/messages.json +++ b/public/_locales/fr/messages.json @@ -19,17 +19,11 @@ "channelWhitelisted": { "message": "Chaîne mise sur liste blanche !" }, - "Sponsor": { - "message": "message commercial" - }, - "Sponsors": { - "message": "messages commerciaux" - }, "Segment": { - "message": "segment commercial" + "message": "segment" }, "Segments": { - "message": "segments commerciaux" + "message": "segments" }, "upvoteButtonInfo": { "message": "Voter pour cette entrée" @@ -80,16 +74,16 @@ "message": "Une erreur s'est produite lors de la soumission, veuillez réessayer plus tard." }, "sponsorFound": { - "message": "Les messages commerciaux pour cette vidéo sont déjà dans notre base de données !" + "message": "Cette vidéo a des segments dans la base de données!" }, "sponsor404": { - "message": "Pas de messages commerciaux trouvés" + "message": "Aucun segment trouvé" }, "sponsorStart": { - "message": "Début du message commercial" + "message": "Début du segement" }, "sponsorEnd": { - "message": "Fin du message commercial" + "message": "Fin du segment" }, "noVideoID": { "message": "Ceci n'est pas un onglet YouTube, ou vous avez cliqué trop tôt. \n Si vous êtes sûr(e) que c'est un onglet YouTube, fermez cette fenêtre et réessayez." @@ -106,21 +100,12 @@ "connectionError": { "message": "Erreur de connexion. Code d'erreur : " }, - "wantToSubmit": { - "message": "Voulez-vous soumettre les segments commerciaux pour cette vidéo" - }, "leftTimes": { - "message": "Vous avez laissé des segments commerciaux non soumis. Retournez sur la vidéo pour les soumettre (ils ont été conservés)." - }, - "clearTimes": { - "message": "Supprimer les segments commerciaux" + "message": "Vous semblez avoir laissé certains segments non soumis. Retournez à cette page pour les soumettre (ils ne sont pas supprimés)." }, "openPopup": { "message": "Ouvrir l'encart SponsorBlock" }, - "SubmitTimes": { - "message": "Soumettre les segments commerciaux" - }, "submitCheck": { "message": "Êtes-vous sûr de vouloir soumettre ces segments?" }, @@ -131,10 +116,7 @@ "message": "Supprimer la chaîne de la liste blanche" }, "voteOnTime": { - "message": "Voter sur un segment commercial" - }, - "recordTimes": { - "message": "Enregistrer un segment commercial" + "message": "Voter pour un segment" }, "soFarUHSubmited": { "message": "Vous avez soumis jusqu'à présent" @@ -148,15 +130,6 @@ "here": { "message": "ici" }, - "recordTimesDescription": { - "message": "Cliquez sur le bouton ci-dessous quand le segment commercial commence puis \nse termine pour l'enregistrer et le soumettre à la base de données." - }, - "popupHint": { - "message": "Astuce : utilisez la touche point-virgule lorsque la vidéo est sélectionnée pour enregistrer le début et la fin d'un segment commercial; utilisez la touche guillemet pour le soumettre. (Les touches peuvent être modifiées dans les options)" - }, - "lastTimes": { - "message": "Derniers temps choisis pour le segment commercial" - }, "clearTimesButton": { "message": "Supprimer les temps" }, @@ -205,22 +178,9 @@ "whatDeleteButton": { "message": "Il s'agit du bouton qui permet de supprimer tous les segments commerciaux depuis le lecteur YouTube." }, - "disableViewTracking": { - "message": "Désactiver le suivi des vues de segments commerciaux" - }, - "enableViewTracking": { - "message": "Activer le suivi des vues de segments commerciaux" - }, - "whatViewTracking": { - "message": "Cette fonctionnalité suit quels segments commerciaux vous avez sautés afin de calculer le bénéfice des soumissions des \nautres utilisateurs. Elle est également utilisée comme métrique, avec les haut-votes, afin de s'assurer que les spams \nsont ignorés. L'extension envoie un message au serveur à chauque fois qu'un segment commercial est sauté. Avec un peu de chance, peu de personnes désactiveront cette fonctionnalité afin d'obtenir des nombres de vues exacts. :)" - }, "showNotice": { "message": "Afficher la notification" }, - "longDescription": { - "message": "SponsorBlock vous permet de sauter les sponsors, les intros, les outros, les rappels d'interaction et d'autres parties ennuyeuses des vidéos YouTube. SponsorBlock est une extension de navigateur participative qui permet à quiconque de soumettre les heures de début et de fin des segments sponsorisés et d'autres segments de vidéos YouTube. Une fois qu'une personne a soumis ces informations, toutes les autres personnes disposant de cette extension passeront directement au segment sponsorisé. Vous pouvez également ignorer les sections non musicales des clips music.", - "description": "Full description of the extension on the store pages." - }, "website": { "message": "Site web", "description": "Used on Firefox Store Page" @@ -237,9 +197,6 @@ "message": "Si elle ne vous plaît pas, cliquez sur le bouton \"Ne plus montrer\".", "description": "The second line of the message displayed after the notice was upgraded." }, - "setStartSponsorShortcut": { - "message": "Changer le raccourci pour enregistrer un segment" - }, "setSubmitKeybind": { "message": "Changer le raccourci pour soumettre les segments" }, @@ -280,15 +237,9 @@ "enableAutoSkip": { "message": "Activer le passage automatique" }, - "autoSkipDescription": { - "message": "Le passage automatique passera automatiquement les sponsors pour vous. Si désactivé, un avis apparaîtra vous demandant si vous souhaitez passer." - }, "audioNotification": { "message": "Notification audio lors du passage" }, - "audioNotificationDescription": { - "message": "La notification audio lors du passage jouera un son à chaque fois qu'un sponsor est ignoré. Si désactivé (ou si le passage automatique est désactivé), aucun son ne sera joué." - }, "showTimeWithSkips": { "message": "Afficher le temps avec les passages supprimés" }, @@ -319,9 +270,6 @@ "youHaveSavedTimeEnd": { "message": " aux autres." }, - "guildlinesSummary": { - "message": "- Assurez-vous que votre segment ne contient que des segments de promotion payante, rien d'autre.\n- Assurez-vous que passer ce segment ne sautera pas de contenu important\n- Si la vidéo entière est un sponsor, s'il vous plaît, ne le signalez pas. Un système complet de reportage vidéo sortira bientôt.\n- Veuillez ne pas signaler les avertissements qui pourraient montrer des biais (si une vidéo de revue est sponsorisée, ne sautez pas quand ils le mentionnent)." - }, "statusReminder": { "message": "Vérifiez status.sponsor.ajay.app pour le status du serveur." }, @@ -344,7 +292,7 @@ "message": "Passage automatique" }, "showSkipNotice": { - "message": "Notifier après qu'un sponsor ait été sauté" + "message": "Notifier après qu'un segment ait été sauté" }, "keybindCurrentlySet": { "message": ". Il est actuellement réglé sur :" @@ -382,9 +330,6 @@ "minDuration": { "message": "Durée minimale (en secondes):" }, - "minDurationDescription": { - "message": "Les segments sponsorisés plus courts que la valeur définie ne seront pas passé ni affichés dans le lecteur." - }, "shortCheck": { "message": "Le segment suivant est plus court que votre option de durée minimale. Cela pourrait signifier qu'il est déjà soumis, et just ignoré par cette option. Êtes-vous sûr de vouloir soumettre ?" }, @@ -412,15 +357,9 @@ "areYouSureReset": { "message": "Voulez-vous vraiment remettre à zéro ?" }, - "confirmPrivacy": { - "message": "Cette vidéo est non-listée. Appuyez sur annuler si vous ne voulez pas vérifier la présence de message commerciaux." - }, "unlistedCheck": { "message": "Ignorer les vidéos non listées" }, - "whatUnlistedCheck": { - "message": "Cette fonctionnalité ralentie légèrement SponsorBlock. La recherche des message commerciaux nécessite l'envoie de l'ID de la vidéo au serveur. Si vous êtes préoccupé par l'envoi de l'ID des vidéos non listées sur Internet, activez cette option." - }, "mobileUpdateInfo": { "message": "m.youtube.com est maintenant pris en charge" }, @@ -477,7 +416,7 @@ }, "to": { "message": "à", - "description": "Used between sponsor times. Example: 1:20 to 1:30" + "description": "Used between segments. Example: 1:20 to 1:30" }, "category_sponsor": { "message": "Message commercial" @@ -498,7 +437,7 @@ "message": "Générique de fin" }, "category_outro_description": { - "message": "Générique de fin ou quand les fiches de fin de vidéo apparaissent. Ne pas utiliser pour les conclusions orales. Ne doit pas inclure de contenu utile. Ne pas utiliser sur les vidéos de musique." + "message": "Crédits ou quand les cartes de terminaison YouTube apparaissent. Pas pour les conclusions avec des informations. Cela ne doit pas être utilisé sur les vidéos de musique." }, "category_interaction": { "message": "Rappel d'interaction (abonnement)" @@ -596,13 +535,7 @@ "message": "Si ça se reproduit, c'est peut-être causé par votre bloqueur de publicités. Veuillez consulter https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests" }, "forceChannelCheck": { - "message": "Forcer la vérification de la chaîne avant de passer les message commerciaux" - }, - "whatForceChannelCheck": { - "message": "Par défaut, les sponsors seront passés immédiatement, avant même que la chaîne soit connue. Des sponsors au début de la vidéo peuvent être passés sur des chaînes sur liste blanche. Activer cette option empêchera cela mais fera que les messages sponsorisés seront passés avec un petit délai, car la récupération du channelID peut prendre du temps. Ce délai peut être imperceptible si vous avez une connexion rapide." - }, - "forceChannelCheckPopup": { - "message": "Envisagez d'activer la vérification forcée de la chaîne avant de passer les messages commerciaux" + "message": "Forcer la vérification du canal avant de passer" }, "downvoteDescription": { "message": "Segment de mauvaise qualité" diff --git a/public/_locales/hr/messages.json b/public/_locales/hr/messages.json index 0967ef42..65c65e49 100644 --- a/public/_locales/hr/messages.json +++ b/public/_locales/hr/messages.json @@ -1 +1,211 @@ -{} +{ + "fullName": { + "message": "SponsorBlock za YouTube - preskoči sponzore", + "description": "Name of the extension." + }, + "Description": { + "message": "Preskoči sponzore, zamolbe za pretplatu i drugo na YouTube videima. Prijavi sponzore na videima koje gledaš kako bi uštedio drugima vrijeme.", + "description": "Description of the extension." + }, + "400": { + "message": "Server je rekao da je zahtjev neispravan" + }, + "429": { + "message": "Unio si previše vremena sponzora za ovaj video, jesi li siguran da ih ima toliko?" + }, + "409": { + "message": "Ovo je već unešeno prije" + }, + "channelWhitelisted": { + "message": "Kanal je dodan na popis dopuštenih!" + }, + "Segment": { + "message": "odsječak" + }, + "Segments": { + "message": "odsječci" + }, + "upvoteButtonInfo": { + "message": "Glasaj za ovaj unos" + }, + "reportButtonTitle": { + "message": "Prijavi" + }, + "reportButtonInfo": { + "message": "Prijavi unos kao nesipravan." + }, + "Dismiss": { + "message": "Odbaci" + }, + "Loading": { + "message": "Učitavanje..." + }, + "Mins": { + "message": "Minute" + }, + "Secs": { + "message": "Sekunde" + }, + "Hide": { + "message": "Nikad ne prikazuj" + }, + "hitGoBack": { + "message": "Klikni unskip kako bi se vratio otkuda si došao." + }, + "unskip": { + "message": "Unskip" + }, + "reskip": { + "message": "Reskip" + }, + "paused": { + "message": "Pauzirano" + }, + "manualPaused": { + "message": "Timer zaustavljen" + }, + "confirmMSG": { + "message": "Kako bi uredio ili obrisao pojedinačne vrijednosti, klikni na gumb info ili otvori okvir dodatka klikom na ikonu dodatka u gornjem desnom kutu." + }, + "clearThis": { + "message": "Jesi li siguran da želiš očistiti ovo?\n\n" + }, + "Unknown": { + "message": "Dogodila se pogreška pri unošenju tvojih vremena sponzora, molim te probaj ponovno kasnije." + }, + "sponsorFound": { + "message": "Ovaj video ima isječke u bazi podataka!" + }, + "sponsor404": { + "message": "Nije pronađen isječak" + }, + "sponsorStart": { + "message": "Isječak započinje sada" + }, + "sponsorEnd": { + "message": "Isječak završava sada" + }, + "noVideoID": { + "message": "YouTube video nije pronađen na ovoj kartici. Ako si siguran da je ovo YouTube kartica, zatvori ovaj okvir i ponovno ga otvori. Ako to ne radi, probaj ponovno učitati karticu." + }, + "success": { + "message": "Uspjeh!" + }, + "voted": { + "message": "Glas podnešen!" + }, + "serverDown": { + "message": "Čini se da server ne radi. Kontaktiraj razvojne programere odmah." + }, + "connectionError": { + "message": "Dogodija se greška u povezivanju. Kod pogreške: " + }, + "wantToSubmit": { + "message": "Želiš li unijeti za video id" + }, + "leftTimes": { + "message": "Izgleda da si ostavio neke isječke nepodnešene. Vrati se na tu stranicu i podnesi ih (nisu izbrisani)." + }, + "clearTimes": { + "message": "Očisti isječke" + }, + "openPopup": { + "message": "Otvori okvir SponsorBlock" + }, + "SubmitTimes": { + "message": "Podnesi isječke" + }, + "submitCheck": { + "message": "Jesi li siguran da želiš unijeti ovo?" + }, + "whitelistChannel": { + "message": "Dodaj kanal na popis dopuštenih" + }, + "removeFromWhitelist": { + "message": "Makni kanal s popisa dopuštenih" + }, + "voteOnTime": { + "message": "Glasaj za isječak" + }, + "soFarUHSubmited": { + "message": "Do sada si podnio" + }, + "savedPeopleFrom": { + "message": "Sačuvao si ljude od " + }, + "viewLeaderboard": { + "message": "Pregledaj tablicu bodova" + }, + "here": { + "message": "ovdje" + }, + "recordTimesDescription": { + "message": "Klikni gumb ispod kada isječak započinje i završava kako bi ga zabilježio i unio u bazu podataka." + }, + "popupHint": { + "message": "Savjet: Pritisni tipku točka-zarez dok si fokusiran na video kako bi zabilježio početak i kraj isječka te podnio isječak. (Ovo se može promijeniti u postavkama)" + }, + "clearTimesButton": { + "message": "Očisti vremena" + }, + "submitTimesButton": { + "message": "Unesi vremena" + }, + "whatChangeUserID": { + "message": "Ovo bi trebalo ostati privatno. slično je lozinki i ne bi se smjelo dijeliti ni s kime. Ako netko ovo ima, mogu se lažno predstavljati kao ti." + }, + "setUserID": { + "message": "Postavi UserID" + }, + "userIDChangeWarning": { + "message": "Oprez: Promjena UserID-a je trajna. Jesi li siguran da želiš ovo napraviti? Napravi kopiju starog UserID-a za svaki slučaj." + }, + "createdBy": { + "message": "Izradio" + }, + "autoSkip": { + "message": "Automatsko preskakanje" + }, + "showSkipNotice": { + "message": "Pokaži obavijest nakon preskakanja isječka" + }, + "keybindCurrentlySet": { + "message": ". Trenutno je postavljeno na:" + }, + "supportInvidious": { + "message": "Podrži Invidious" + }, + "supportInvidiousDescription": { + "message": "Invidious (invidio.us) je YouTube client treće strane. Kako bi omogućio podršku, moraš prihvatiti dodatna dopuštenja. Ovo NE radi u privatnoj kartici na Chrome-u ili drugim carijantama Chromiuma." + }, + "optionsInfo": { + "message": "Omogući podržavanje Invidiousa, onemogući automatsko preskakanje, sakrij gumbe i drugo." + }, + "addInvidiousInstance": { + "message": "Dodaj instancu Invidiousa" + }, + "addInvidiousInstanceDescription": { + "message": "Dodaj prilagođenu instancu Invidiousa. Ona mora biti formatirana sa samom domenom. Primjer: invidious.ajay.app" + }, + "add": { + "message": "Dodaj" + }, + "addInvidiousInstanceError": { + "message": "Ova domena je neispravna. Trebaš unijeti SAMO domenu. Primjer: invidious.ajay.app" + }, + "resetInvidiousInstance": { + "message": "Resetiraj popis instanci Invidiousa" + }, + "resetInvidiousInstanceAlert": { + "message": "Upravo ćeš resetirati popis instanci Invidiousa" + }, + "currentInstances": { + "message": "Trenutne instance:" + }, + "minDuration": { + "message": "Minimalno trajanje (u sekundama):" + }, + "minDurationDescription": { + "message": "Isječci kraći od postavljene vrijednosti neće biti preskočeni ili prikazani u playeru." + } +} diff --git a/public/_locales/id/messages.json b/public/_locales/id/messages.json new file mode 100644 index 00000000..557a0cf1 --- /dev/null +++ b/public/_locales/id/messages.json @@ -0,0 +1,617 @@ +{ + "fullName": { + "message": "SponsorBlock untuk YouTube - Lewati Sponsor", + "description": "Name of the extension." + }, + "Description": { + "message": "Lewati sponsor, meminta subscriber dan lain-lain di video YouTube. Laporkan sponsor di video yang anda tonton untuk menghemat waktu orang lain.", + "description": "Description of the extension." + }, + "400": { + "message": "Server menyatakan permintaan tidak valid" + }, + "429": { + "message": "Anda terlalu banyak mengirim waktu sponsor pada video ini, apakah anda yakin ada sebanyak ini?" + }, + "409": { + "message": "Ini sudah dikirim sebelumnya" + }, + "channelWhitelisted": { + "message": "Channel Didaftar-putihkan!" + }, + "Segment": { + "message": "segmen" + }, + "Segments": { + "message": "segmen" + }, + "upvoteButtonInfo": { + "message": "Upvote submisi ini" + }, + "reportButtonTitle": { + "message": "Laporkan" + }, + "reportButtonInfo": { + "message": "Laporkan submisi ini sebagai kesalahan." + }, + "Dismiss": { + "message": "Hilangkan" + }, + "Loading": { + "message": "Memuat..." + }, + "Mins": { + "message": "Menit" + }, + "Secs": { + "message": "Detik" + }, + "Hide": { + "message": "Jangan tampilkan" + }, + "hitGoBack": { + "message": "Klik jangan lewati untuk kembali ke asal." + }, + "unskip": { + "message": "Jangan Lewati" + }, + "reskip": { + "message": "Lewati Ulang" + }, + "paused": { + "message": "Dijeda" + }, + "manualPaused": { + "message": "Timer Berhenti" + }, + "confirmMSG": { + "message": "Untuk mengedit atau menghapus nilai masing-masing, klik tombol info atau buka popup ekstensi dengan mengklik ikon ekstensi di ujung kanan atas." + }, + "clearThis": { + "message": "Apa anda yakin ingin menghapus ini?\n\n" + }, + "Unknown": { + "message": "Terjadi kesalahan mengirim waktu sponsor, mohon coba lagi nanti." + }, + "sponsorFound": { + "message": "Video ini memiliki segmen di basis data!" + }, + "sponsor404": { + "message": "Tidak ada segmen ditemukan" + }, + "sponsorStart": { + "message": "Segmen Mulai Sekarang" + }, + "sponsorEnd": { + "message": "Segmen Berakhir Sekarang" + }, + "noVideoID": { + "message": "Tidak ada video YouTube yang ditemukan di tab ini. Jika ini merupakan tab YouTube, tutup popup ini dan buka lagi. Jika masih tidak berfungsi, coba muat ulang tab." + }, + "success": { + "message": "Sukses!" + }, + "voted": { + "message": "Divote!" + }, + "serverDown": { + "message": "Sepertinya server sedang down. Kontak pengembang segera." + }, + "connectionError": { + "message": "Kesalahan koneksi terjadi. Kode kesalahan: " + }, + "wantToSubmit": { + "message": "Apakah anda ingin mengirim untuk id video" + }, + "leftTimes": { + "message": "Sepertinya anda lupa mengirimkan beberapa segmen. Kembali ke halaman tadi dan kirimkan itu (itu tidak terhapus)." + }, + "clearTimes": { + "message": "Hapus Segmen" + }, + "openPopup": { + "message": "Buka Popup SponsorBlock" + }, + "SubmitTimes": { + "message": "Kirim Segmen" + }, + "submitCheck": { + "message": "Apakah anda yakin ingin mengirim ini?" + }, + "whitelistChannel": { + "message": "Daftar-putihkan Channel" + }, + "removeFromWhitelist": { + "message": "Hapus Channel Dari Daftar Putih" + }, + "voteOnTime": { + "message": "Beri Segmen Vote" + }, + "soFarUHSubmited": { + "message": "Sejauh ini, anda sudah mengirim" + }, + "savedPeopleFrom": { + "message": "Anda sudah menghemat waktu orang dari " + }, + "viewLeaderboard": { + "message": "Lihat papan peringkat" + }, + "here": { + "message": "disini" + }, + "recordTimesDescription": { + "message": "Klik tombol dibawah saat segmen mulai dan berakhir untuk direkam lalu dikirim ke basis data." + }, + "popupHint": { + "message": "Petunjuk: Tekan tombol titik koma saat terfokus pada video untuk melaporkan awal/akhir dari segmen untuk dikirim. (Bisa diganti di pengaturan)" + }, + "clearTimesButton": { + "message": "Hapus Waktu" + }, + "submitTimesButton": { + "message": "Kirim Waktu" + }, + "publicStats": { + "message": "Ini digunakan di halaman statistik publik untuk menampilkan berapa banyak anda berkontribusi. Lihat disini" + }, + "setUsername": { + "message": "Atur Nama Pengguna" + }, + "discordAdvert": { + "message": "Gabung dengan server resmi discord untuk memberikan kritik dan saran!" + }, + "hideThis": { + "message": "Sembunyikan ini" + }, + "Options": { + "message": "Opsi" + }, + "showButtons": { + "message": "Tampilkan Tombol Di Pemutar Video YouTube" + }, + "hideButtons": { + "message": "Sembunyikan Tombol Di Pemutar Video YouTube" + }, + "hideButtonsDescription": { + "message": "Ini akan menyembunyikan tombol yang muncul di pemutar YouTube untuk mengirimkan segmen yang dilewati." + }, + "showInfoButton": { + "message": "Tampilkan Tombol Info Di Pemutar Video YouTube" + }, + "hideInfoButton": { + "message": "Sembunyikan Tombol Info Di Pemutar Video YouTube" + }, + "whatInfoButton": { + "message": "Ini adalah tombol yang membuka popup di halaman YouTube." + }, + "hideDeleteButton": { + "message": "Sembunyikan Tombol Hapus Di Pemutar Video YouTube" + }, + "showDeleteButton": { + "message": "Tampilkan Tombol Hapus Di Pemutar Video YouTube" + }, + "whatDeleteButton": { + "message": "Ini adalah tombol di pemutar YouTube yang akan menghapus semua segmen yang belum dikirim pada video." + }, + "enableViewTracking": { + "message": "Aktifkan Pelacakan Jumlah Lewati" + }, + "whatViewTracking": { + "message": "Fitur ini melacak segmen mana yang sudah anda lewati untuk memberitahu pengguna berapa banyak submisi mereka telah membantu orang lain dan digunakan sebagai metrik bersamaan dengan upvote untuk memastikan tidak ada spam dalam basis data. Ekstensi mengirim pesan ke server tiap kali anda melewati segmen. Harapannya kebanyakan orang tidak akan mengubah opsi ini agar jumlah tayangan akurat. :)" + }, + "showNotice": { + "message": "Tampilkan Pemberitahuan Lagi" + }, + "longDescription": { + "message": "SponsorBlock membuat anda melewati sponsor, intro, outro, pengingat berlangganan dan segmen mengganggu lainnya di video YouTube. SponsorBlock adalah ekstensi browser crowdsourced yang membolehkan siapa saja mengirim waktu awal dan akhir dari segmen sponsor dan segmen video YouTube lainnya. Setelah seseorang mengirim informasi ini, orang lain yang memakai ekstensi ini akan melewati segmen sponsor di video yang sama. Anda juga dapat melewati bagian non-musik di musik video.", + "description": "Full description of the extension on the store pages." + }, + "website": { + "message": "Situs", + "description": "Used on Firefox Store Page" + }, + "sourceCode": { + "message": "Kode Sumber", + "description": "Used on Firefox Store Page" + }, + "noticeUpdate": { + "message": "Pemberitahuan sudah ditingkatkan!", + "description": "The first line of the message displayed after the notice was upgraded." + }, + "noticeUpdate2": { + "message": "Jika anda masih tidak suka, klik tombol jangan tampilkan.", + "description": "The second line of the message displayed after the notice was upgraded." + }, + "setStartSponsorShortcut": { + "message": "Atur tombol untuk mulai segmen" + }, + "setSubmitKeybind": { + "message": "Atur tombol untuk kirim submisi" + }, + "keybindDescription": { + "message": "Pilih tombol dengan mengetikkannya" + }, + "keybindDescriptionComplete": { + "message": "Tombol diatur menjadi: " + }, + "0": { + "message": "Koneksi Timeout. Cek koneksi internet anda. Jika internet anda berfungsi, server mungkin kewalahan atau down." + }, + "disableSkipping": { + "message": "Nonaktifkan SponsorBlock" + }, + "enableSkipping": { + "message": "Aktifkan SponsorBlock" + }, + "yourWork": { + "message": "Hasil Kerja Anda", + "description": "Used to describe the section that will show you the statistics from your submissions." + }, + "502": { + "message": "Tampaknya server sedang kewalahan. Coba lagi beberapa detik." + }, + "errorCode": { + "message": "Kode Kesalahan: " + }, + "skip": { + "message": "Lewati" + }, + "skipped": { + "message": "Dilewati" + }, + "disableAutoSkip": { + "message": "Nonaktifkan Lewati Otomatis" + }, + "enableAutoSkip": { + "message": "Aktifkan Lewati Otomatis" + }, + "audioNotification": { + "message": "Notifikasi Audio Saat Dilewati" + }, + "audioNotificationDescription": { + "message": "Notifikasi audio akan berbunyi saat melewati sebuah segmen. Jika nonaktif (atau lewati otomatis nonaktif), tidak ada suara yang akan diputar." + }, + "showTimeWithSkips": { + "message": "Tampilkan Waktu Dikurangi Yang Dilewati" + }, + "showTimeWithSkipsDescription": { + "message": "Waktu ini muncul di dalam kurung disamping waktu asli di bilah waktu. Ini menunjukkan durasi total video yang tidak termasuk segmen apapun. Ini termasuk segmen yang ditandai hanya \"Tampilkan Di Bilah Waktu\"." + }, + "youHaveSkipped": { + "message": "Anda sudah melewati " + }, + "youHaveSaved": { + "message": "Anda sudah menghemat waktu " + }, + "minLower": { + "message": "menit" + }, + "minsLower": { + "message": "menit" + }, + "hourLower": { + "message": "jam" + }, + "hoursLower": { + "message": "jam" + }, + "youHaveSavedTime": { + "message": "Anda sudah menghemat waktu orang lain" + }, + "youHaveSavedTimeEnd": { + "message": " dari hidup mereka." + }, + "statusReminder": { + "message": "Cek status.sponsor.ajay.app untuk status server." + }, + "changeUserID": { + "message": "Impor/Ekspor UserID" + }, + "whatChangeUserID": { + "message": "Ini sebaiknya dirahasiakan. Ini terlihat seperti password dan sebaiknya tidak dibagikan ke orang lain. Jika seseorang mempunyai ini, dia dapat berpura-pura menjadi anda." + }, + "setUserID": { + "message": "Atur UserID" + }, + "userIDChangeWarning": { + "message": "Peringatan: Pengubahan UserID bersifat permanen. Apakah anda yakin ingin melakukan ini? Pastikan kamu sudah mencadangkan yang lama untuk berjaga." + }, + "createdBy": { + "message": "Dibuat Oleh" + }, + "autoSkip": { + "message": "Lewati Otomatis" + }, + "showSkipNotice": { + "message": "Tampilkan pemberitahuan setelah melewati segmen" + }, + "keybindCurrentlySet": { + "message": ". Saat ini diatur pada:" + }, + "supportInvidious": { + "message": "Dukungan Invidious" + }, + "supportInvidiousDescription": { + "message": "Invidious (invidio.us) adalah layanan klien YouTube pihak ketiga. Untuk mengaktifkan dukungan, anda harus menerima izin tambahan. Ini TIDAK dapat bekerja di mode penyamaran Chrome dan peramban berbasis Chromium lainnya." + }, + "optionsInfo": { + "message": "Aktifkan dukungan Invidious, nonaktifkan lewati otomatis, tombol sembunyi dan lainnya." + }, + "addInvidiousInstance": { + "message": "Tambah Instansi Invidious" + }, + "addInvidiousInstanceDescription": { + "message": "Tambahkan instansi khusus Invidious. Ini harus diformat dengan HANYA domainnya. Contoh: invidious.ajay.app" + }, + "add": { + "message": "Tambah" + }, + "addInvidiousInstanceError": { + "message": "Domain ini tidak valid. Ini harus HANYA mengandung bagian domainnya. Contoh: invidious.ajay.app" + }, + "resetInvidiousInstance": { + "message": "Reset Daftar Instansi Invidious" + }, + "resetInvidiousInstanceAlert": { + "message": "Anda akan mereset daftar instansi invidious" + }, + "currentInstances": { + "message": "Instansi sekarang:" + }, + "minDuration": { + "message": "Durasi minimal (detik):" + }, + "minDurationDescription": { + "message": "Segmen yang lebih kecil dari nilai yang diatur tidak akan dilewati atau tampil di pemutar." + }, + "shortCheck": { + "message": "Submisi ini lebih pendek dari opsi durasi minimalmu. Ini dapat berarti ini sudah dikirim, dan hanya akan diabaikan karena opsi ini. Apakah anda yakin ingin mengirim?" + }, + "showUploadButton": { + "message": "Tampilkan Tombol Unggah" + }, + "whatUploadButton": { + "message": "Tombol ini muncul di pemutar video YouTube setelah kamu memilih stempel waktu dan siap untuk dikirimkan." + }, + "customServerAddress": { + "message": "Alamat Server SponsorBlock" + }, + "customServerAddressDescription": { + "message": "Alamat yang SponsorBlock gunakan untuk memanggil server.\nKecuali jika anda mempunyai instansi server sendiri, ini tidak perlu diubah." + }, + "save": { + "message": "Simpan" + }, + "reset": { + "message": "Atur ulang" + }, + "customAddressError": { + "message": "Alamat ini tidak berada di bentuk yang benar. Pastikan kamu menggunakan http:// atau https:// di awal dan tidak ada garis mengikuti." + }, + "areYouSureReset": { + "message": "Apakah anda yakin ingin mengatur ulang ini?" + }, + "confirmPrivacy": { + "message": "Video ini dideteksi sebagai tidak terdaftar. Klik batal jika kamu tidak ingin mengecek untuk melewati segmen." + }, + "unlistedCheck": { + "message": "Abaikan Video Tidak Terdaftar/Privat" + }, + "whatUnlistedCheck": { + "message": "Pengaturan ini akan sedikit melambatkan SponsorBlock. Pencarian lewati segmen membutuhkan pengiriman ID video ke server. Jika anda khawatir tentang ID unlisted video terkirim ke internet, hidupkan opsi ini." + }, + "mobileUpdateInfo": { + "message": "m.youtube.com sekarang didukung" + }, + "exportOptions": { + "message": "Impor/Ekspor Semua Pengaturan" + }, + "whatExportOptions": { + "message": "Ini adalah seluruh konfigurasi anda di JSON. Ini mencakup userID anda, maka pastikan anda membagikan ini dengan bijak." + }, + "setOptions": { + "message": "Atur Opsi" + }, + "exportOptionsWarning": { + "message": "Peringatan: Mengubah opsi bersifat permanen dan bisa merusak pemasangan anda. Apakah anda yakin ingin melakukan ini? Pastikan untuk mencadangkan yang lama untuk berjaga." + }, + "incorrectlyFormattedOptions": { + "message": "JSON ini tidak diformat dengan benar. Pengaturan anda tidak berubah." + }, + "confirmNoticeTitle": { + "message": "Kirim Segmen" + }, + "submit": { + "message": "Kirim" + }, + "cancel": { + "message": "Batal" + }, + "delete": { + "message": "Hapus" + }, + "preview": { + "message": "Pratinjau" + }, + "edit": { + "message": "Ubah" + }, + "copyDebugInformation": { + "message": "Salin Informasi Debug Ke Papan Klip" + }, + "copyDebugInformationFailed": { + "message": "Gagal menyalin ke papan klip" + }, + "copyDebugInformationOptions": { + "message": "Salin informasi ke papan klip untuk menyediakan pengembang saat mengangkat bug / saat pengembang memintanya. Informasi sensitif seperti user ID, channel yang didaftar-putihkan, dan alamat server kustom akan dihapus. Namun itu mengandung informasi seperti useragent anda, browser, sistem operasi, dan nomor versi ekstensi. " + }, + "copyDebugInformationComplete": { + "message": "Informasi debug telah disalin ke papan klip. Jangan ragu untuk menghapus informasi yang tidak ingin anda bagikan. Simpan ini di file teks atau salin ke laporan bug." + }, + "theKey": { + "message": "Tombolnya" + }, + "keyAlreadyUsed": { + "message": "terikat pada tindakan lain. Mohon memilih tombol lain." + }, + "to": { + "message": "sampai", + "description": "Used between segments. Example: 1:20 to 1:30" + }, + "category_sponsor": { + "message": "Sponsor" + }, + "category_sponsor_description": { + "message": "Promosi dibayar, tautan dibayar dan iklan langsung. Tidak untuk promosi diri sendiri atau dukungan gratis untuk gerakan/kreator/situs/produk yang mereka suka." + }, + "category_intro": { + "message": "Jeda/Animasi Intro" + }, + "category_intro_description": { + "message": "Bagian yang bukan konten sebenarnya. Dapat berupa jeda, gambar statik, dan animasi berulang di channel. Ini tidak boleh digunakan untuk transisi yang berisi informasi atau digunakan di video musik." + }, + "category_intro_short": { + "message": "Jeda" + }, + "category_outro": { + "message": "Kartu Akhir/Kredit" + }, + "category_outro_description": { + "message": "Kredit atau saat kartu akhir YouTube muncul. Tidak untuk kesimpulan dengan informasi. Tidak boleh dipakai pada video musik." + }, + "category_interaction": { + "message": "Pengingat Interaksi (Berlangganan)" + }, + "category_interaction_description": { + "message": "Saat ada pengingat singkat untuk meminta suka, berlangganan atau mengikuti mereka di tengah konten. Jika panjang atau tentang sesuatu yang spesifik, sebaiknya pakai kategori promosi diri sendiri." + }, + "category_interaction_short": { + "message": "Pengingat Interaksi" + }, + "category_selfpromo": { + "message": "Promosi Diri Sendiri/Tidak Dibayar" + }, + "category_selfpromo_description": { + "message": "Mirip dengan \"sponsor\" kecuali ini tidak dibayar atau promosi diri sendiri. Ini termasuk merchandise, donasi, atau informasi tentang siapa yang berkolaborasi dengan mereka." + }, + "category_music_offtopic": { + "message": "Musik: Bagian Non-Musik" + }, + "category_music_offtopic_description": { + "message": "Hanya gunakan di video musik. Ini termasuk intro dan outro di video musik." + }, + "category_music_offtopic_short": { + "message": "Non-Musik" + }, + "category_livestream_messages": { + "message": "Livestream: Baca Pesan/Donasi" + }, + "category_livestream_messages_short": { + "message": "Membaca Pesan Chat" + }, + "disable": { + "message": "Nonaktif" + }, + "manualSkip": { + "message": "Lewati Manual" + }, + "showOverlay": { + "message": "Tampilkan Di Bilah Waktu" + }, + "colorFormatIncorrect": { + "message": "Warna anda tidak diformat dengan benar. Harusnya terdiri dari 3 atau 6 digit kode heksa dengan tagar di awal." + }, + "previewColor": { + "message": "Warna Pratinjau", + "description": "Referring to submissions that have not been sent to the server yet." + }, + "seekBarColor": { + "message": "Warna Bilah Waktu" + }, + "category": { + "message": "Kategori" + }, + "skipOption": { + "message": "Opsi Lewati", + "description": "Used on the options page to describe the ways to skip the segment (auto skip, manual, etc.)" + }, + "enableTestingServer": { + "message": "Aktifkan Server Beta Testing" + }, + "whatEnableTestingServer": { + "message": "Submisi dan vote anda TIDAK TERHITUNG pada server utama. Hanya gunakan ini untuk percobaan." + }, + "testingServerWarning": { + "message": "Semua submisi dan vote TIDAK TERHITUNG pada server utama saat terkoneksi ke server percobaan." + }, + "bracketNow": { + "message": "(Sekarang)" + }, + "moreCategories": { + "message": "Kategori Lain" + }, + "chooseACategory": { + "message": "Pilih Kategori" + }, + "youMustSelectACategory": { + "message": "Anda harus memilih kategori untuk semua segmen yang anda kirimkan!" + }, + "bracketEnd": { + "message": "(Selesai)" + }, + "hiddenDueToDownvote": { + "message": "disembunyikan: voting rendah" + }, + "hiddenDueToDuration": { + "message": "disembunyikan: terlalu pendek" + }, + "channelDataNotFound": { + "message": "ID Channel belum dimuat." + }, + "adblockerIssue": { + "message": "Sepertinya ada sesuatu yang memblokir kemampuan SponsorBlock untuk mendapatkan data video. Kemungkinan karena ad blocker anda. Mohon cek https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests" + }, + "itCouldBeAdblockerIssue": { + "message": "Jika ini terus terjadi, kemungkinan terjadi karena ad blocker anda. Mohon cek https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests" + }, + "forceChannelCheck": { + "message": "Paksa Cek Channel Sebelum Melewati" + }, + "whatForceChannelCheck": { + "message": "Secara standar, ini akan melewati segmen segera bahkan sebelum tahu apa channelnya. Secara standar, beberapa segmen pada awal video mungkin terlewati pada channel yang didaftar-putihkan. Mengaktifkan opsi ini akan mencegah ini namun membuat semua pelewatan mempunyai sedikit delay karena mendapatkan channelID membutuhkan waktu. Delay ini mungkin menjadi tidak terasa jika anda mempunyai internet yang cepat." + }, + "forceChannelCheckPopup": { + "message": "Pertimbangkan Mengaktifkan \"Paksa Pengecekan Channel Sebelum Pelewatan\"" + }, + "downvoteDescription": { + "message": "Salah, Waktu Tidak Tepat" + }, + "incorrectCategory": { + "message": "Salah Kategori" + }, + "nonMusicCategoryOnMusic": { + "message": "Video ini dikategorikan sebagai musik. Apakah anda yakin ingin mengirim segmen yang kategorinya non-musik? Kecuali jika video ini bukan musik, anda seharusnya tidak mengirim segmen ini. Harap baca pedoman jika anda kebingungan." + }, + "multipleSegments": { + "message": "Banyak Segmen" + }, + "guidelines": { + "message": "Pedoman" + }, + "readTheGuidelines": { + "message": "Baca Pedomannya!!", + "description": "Show the first time they submit or if they are \"high risk\"" + }, + "categoryUpdate1": { + "message": "Kategori disini!" + }, + "categoryUpdate2": { + "message": "Buka opsi untuk melewati intro, outro, merch, dll." + }, + "unsubmittedWarning": { + "message": "Notifikasi Segmen Yang Belum Dikirim" + }, + "unsubmittedWarningDescription": { + "message": "Tampilkan notifikasi saat kamu meninggalkan video dengan segmen yang belum diunggah" + } +} diff --git a/public/_locales/it/messages.json b/public/_locales/it/messages.json index 0e6cc136..aa2cc98f 100644 --- a/public/_locales/it/messages.json +++ b/public/_locales/it/messages.json @@ -19,18 +19,6 @@ "channelWhitelisted": { "message": "Canale aggiunto alla whitelist!" }, - "Sponsor": { - "message": "sponsorizzazione" - }, - "Sponsors": { - "message": "sponsorizzazioni" - }, - "Segment": { - "message": "spezzone sponsorizzato" - }, - "Segments": { - "message": "spezzoni sponsorizzati" - }, "upvoteButtonInfo": { "message": "Vota questa segnalazione" }, @@ -79,18 +67,6 @@ "Unknown": { "message": "Si è verificato un errore durante l'invio dello spezzone sponsorizzato, per favore riprova più tardi." }, - "sponsorFound": { - "message": "I contenuti sponsorizzati di questo video sono nel database!" - }, - "sponsor404": { - "message": "Nessuna sponsorizzazione trovata" - }, - "sponsorStart": { - "message": "La sponsorizzazione inizia adesso" - }, - "sponsorEnd": { - "message": "La sponsorizzazione finisce adesso" - }, "noVideoID": { "message": "Probabilmente questa non è una scheda di YouTube, oppure hai cliccato troppo presto. \nSe sei sicuro di essere in una scheda di YouTube,\n riapri questo popup." }, @@ -106,21 +82,9 @@ "connectionError": { "message": "Si è verificato un errore durante la connessione. Codice errore: " }, - "wantToSubmit": { - "message": "Vuoi inviare gli spezzoni sponsorizzati per il video con id" - }, - "leftTimes": { - "message": "Sembra che tu non abbia inviato alcuni spezzoni sponsorizzati. Ritorna alla pagina precedente per inviarli (non sono stati eliminati)." - }, - "clearTimes": { - "message": "Cancella gli Spezzoni Sponsorizzati" - }, "openPopup": { "message": "Apri il Popup di SponsorBlock" }, - "SubmitTimes": { - "message": "Invia gli Spezzoni Sponsorizzati" - }, "submitCheck": { "message": "Sei sicuro di volerlo inviare?" }, @@ -130,12 +94,6 @@ "removeFromWhitelist": { "message": "Rimuovi Canale dalla Whitelist" }, - "voteOnTime": { - "message": "Vota uno Spezzone Sponsorizzato" - }, - "recordTimes": { - "message": "Registra uno Spezzone Sponsorizzato" - }, "soFarUHSubmited": { "message": "Fino ad ora hai inviato" }, @@ -148,15 +106,6 @@ "here": { "message": "qui" }, - "recordTimesDescription": { - "message": "Premi il pulsante qui sotto quando inizia e finisce la sponsorizzazione per registrarla e\ninviarla al database." - }, - "popupHint": { - "message": "Suggerimento: Premi il tasto punto e virgola mentre il video è attivo per segnalare l'inizio/fine di una sponsorizzazione e virgolette per inviare." - }, - "lastTimes": { - "message": "Ultimi minutaggi sponsorizzati scelti" - }, "clearTimesButton": { "message": "Cancella Minutaggi" }, @@ -205,22 +154,9 @@ "whatDeleteButton": { "message": "Questo è il pulsante che ti permette di cancellare tutti gli spezzoni sponsorizzati nel lettore di YouTube." }, - "disableViewTracking": { - "message": "Disattiva il Monitoraggio delle Sponsorizzazioni" - }, - "enableViewTracking": { - "message": "Disattiva il Monitoraggio delle Sponsorizzazioni" - }, - "whatViewTracking": { - "message": "Questa funzione tiene traccia di quali sponsorizzazioni hai saltato per far sapere agli utenti quanto è stato d'aiuto agli altri il loro contributo e\nviene utilizzato come metrica assieme ai voti positivi per filtrare lo spam dal database. L'estensione invia un messaggio\nal server ogni volta che salti una sponsorizzazione. Si spera che la maggior parte delle persone non modifichi questa impostazione così i numeri sono accurati. :)" - }, "showNotice": { "message": "Mostra di Nuovo l'Avviso" }, - "longDescription": { - "message": "SponsorBlock è un'estensione che salta gli spezzoni con contenuti sponsorizzati nei video di YouTube. SponsorBlock è un'estensione crowdsourced per i browser che permette a chiunque di inviare i minutaggi degli spezzoni sponsorizzati nei video di YouTube. Quando un utente invia una segnalazione, tutti gli altri utenti che utilizzano questa estensione potranno saltare lo spezzone sponsorizzato.", - "description": "Full description of the extension on the store pages." - }, "website": { "message": "Sito Web", "description": "Used on Firefox Store Page" @@ -237,9 +173,6 @@ "message": "Se non ti piace ancora, premi il pulsante \"non mostrare mai\".", "description": "The second line of the message displayed after the notice was upgraded." }, - "setStartSponsorShortcut": { - "message": "Imposta la chiave per l'associazione di tasti per l'inizio dello spezzone dello sponsor" - }, "setSubmitKeybind": { "message": "Imposta la chiave per l'associazione di tasti per le segnalazioni" }, @@ -283,9 +216,6 @@ "audioNotification": { "message": "Notifiche Audio per Salta" }, - "audioNotificationDescription": { - "message": "La notifica audio su salto riprodurrà un suono ogni volta che uno sponsor viene saltato. Se disabilitato (o se il salto automatico è disabilitato), nessun suono verrà riprodotto." - }, "showTimeWithSkips": { "message": "Mostra Tempo Con Salti Rimossi" }, @@ -337,9 +267,6 @@ "autoSkip": { "message": "Salta Automaticamente" }, - "showSkipNotice": { - "message": "Mostra Avviso Dopo Aver Saltato Uno Sponsor" - }, "keybindCurrentlySet": { "message": ". Attualmente è impostato su:" }, @@ -376,9 +303,6 @@ "minDuration": { "message": "Durata minima (secondi):" }, - "minDurationDescription": { - "message": "I segmenti di sponsor più corti del valore impostato non verranno saltati o mostrati." - }, "whatUploadButton": { "message": "Questo pulsante appare sul riproduttore di YouTube dopo che hai selezionato un marcatore temporale e sei pronto ad inviarlo." }, @@ -400,15 +324,9 @@ "areYouSureReset": { "message": "Sei sicuro di voler eseguire il reset?" }, - "confirmPrivacy": { - "message": "Il video è stato rilevato come privato. Fare clic su Annulla se non si desidera controllare la presenza di sponsor." - }, "unlistedCheck": { "message": "Ignora Video Non Pubblicati/Privati" }, - "whatUnlistedCheck": { - "message": "Questa impostazione rallenterà leggermente SponsorBlock. Le ricerche degli sponsor richiedono l'invio dell'ID video al server. Se sei preoccupato per gli ID video non elencati inviati via internet, abilita questa opzione." - }, "mobileUpdateInfo": { "message": "m.youtube.com è ora supportato" }, diff --git a/public/_locales/ko/messages.json b/public/_locales/ko/messages.json index 0967ef42..626ca884 100644 --- a/public/_locales/ko/messages.json +++ b/public/_locales/ko/messages.json @@ -1 +1,140 @@ -{} +{ + "fullName": { + "message": "YouTube용 SponsorBlock - 스폰서 광고 차단", + "description": "Name of the extension." + }, + "Description": { + "message": "YouTube 영상의 스폰서 광고, '구독과 좋아요' 광고 같이 쓸데없는 광고를 모두 건너뛰세요. 영상의 스폰서 광고 구간을 신고하여 다른 사람들의 시간을 절약할 수 있게 해주세요.", + "description": "Description of the extension." + }, + "channelWhitelisted": { + "message": "채널이 화이트리스트에 추가되었습니다!" + }, + "Segment": { + "message": "구간" + }, + "Segments": { + "message": "구간" + }, + "sponsorFound": { + "message": "이 영상의 광고 구간을 서버 데이터베이스에서 찾았습니다!" + }, + "sponsor404": { + "message": "광고 구간을 찾지 못했습니다" + }, + "sponsorStart": { + "message": "광고 구간 시작" + }, + "sponsorEnd": { + "message": "광고 구간 끝" + }, + "noVideoID": { + "message": "현재 페이지에서 YouTube 영상을 찾지 못하였습니다. 이 페이지에 YouTube 영상이 있는 경우, 이 팝업을 닫고 다시 열어주세요. 그래도 이 팝업이 바뀌지 않는 경우, 페이지를 새로고침하세요." + }, + "connectionError": { + "message": "서버 오류가 발생하였습니다. 오류 코드: " + }, + "whitelistChannel": { + "message": "채널을 화이트리스트에 추가하기" + }, + "removeFromWhitelist": { + "message": "채널을 화이트리스트에서 삭제하기" + }, + "setUsername": { + "message": "사용자 이름 설정" + }, + "discordAdvert": { + "message": "공식 디스코드 서버에 들어와서 기능 제안을 해주시거나 피드백을 남겨주세요!" + }, + "Options": { + "message": "설정" + }, + "website": { + "message": "웹사이트", + "description": "Used on Firefox Store Page" + }, + "sourceCode": { + "message": "소스 코드", + "description": "Used on Firefox Store Page" + }, + "disableSkipping": { + "message": "SponsorBlock 비활성화" + }, + "errorCode": { + "message": "오류 코드: " + }, + "minLower": { + "message": "분" + }, + "minsLower": { + "message": "분" + }, + "hourLower": { + "message": "시간" + }, + "hoursLower": { + "message": "시간" + }, + "changeUserID": { + "message": "사용자 ID 가져오기/내보내기" + }, + "createdBy": { + "message": "개발자: " + }, + "autoSkip": { + "message": "자동으로 건너뛰기" + }, + "supportInvidious": { + "message": "Invidious 지원 활성화" + }, + "customServerAddressDescription": { + "message": "SponsorBlock이 데이터를 주고받기 위해 사용하는 서버 주소입니다. 따로 구축한 서버가 없을 경우, 이 주소를 변경하지 않는 것이 좋습니다." + }, + "save": { + "message": "저장" + }, + "customAddressError": { + "message": "올바르지 않은 주소입니다. 주소는 반드시 http:// 또는 https://로 시작해야 하며, 마지막 문자가 슬래시로 끝날 수 없습니다." + }, + "exportOptions": { + "message": "모든 설정 가져오기/내보내기" + }, + "preview": { + "message": "미리보기" + }, + "edit": { + "message": "수정" + }, + "copyDebugInformation": { + "message": "디버그 정보 복사하기" + }, + "copyDebugInformationFailed": { + "message": "클립보드로 복사하는 데 실패했습니다" + }, + "copyDebugInformationOptions": { + "message": "버그를 신고할 때나 개발자가 요청했을 때 필요한 디버그 정보를 복사합니다. 사용자 ID, 화이트리스트 채널 목록와 커스텀 서버 주소 같이 민감한 정보는 절대 포함되지 않습니다. 디버그 정보에는 사용자 에이전트, 브라우저 정보, 사용 중인 운영 체제와 확장 프로그램의 버전 정보가 포함됩니다. " + }, + "copyDebugInformationComplete": { + "message": "디버그 정보가 복사되었습니다. 공유하고 싶지 않은 내용이 있는 경우 자유롭게 수정하신 후, 텍스트 파일로 저장하시거나 버그 신고 페이지에 붙여넣으시면 됩니다." + }, + "colorFormatIncorrect": { + "message": "올바르지 않은 색상 코드입니다. 색상 코드는 샵 (#) 기호로 시작하여 3자리 또는 6자리의 16진수로 구성되어야 합니다." + }, + "previewColor": { + "message": "미리보기 색상", + "description": "Referring to submissions that have not been sent to the server yet." + }, + "seekBarColor": { + "message": "탐색 바 색상" + }, + "category": { + "message": "범주" + }, + "skipOption": { + "message": "건너뛰기 설정", + "description": "Used on the options page to describe the ways to skip the segment (auto skip, manual, etc.)" + }, + "chooseACategory": { + "message": "구간 범주 선택" + } +} diff --git a/public/_locales/nl/messages.json b/public/_locales/nl/messages.json index a53651eb..07125f8b 100644 --- a/public/_locales/nl/messages.json +++ b/public/_locales/nl/messages.json @@ -3,6 +3,10 @@ "message": "SponsorBlock voor YouTube - Sla sponsorberichten over", "description": "Name of the extension." }, + "Description": { + "message": "Skip sponsoren, abonneer-herinneringen en meer in YouTube-videos. Rapporteer sponsors in video's die je kijkt om anderen tijd te besparen.", + "description": "Description of the extension." + }, "400": { "message": "Server zegt dat het verzoek ongeldig is" }, @@ -15,32 +19,26 @@ "channelWhitelisted": { "message": "Kanaal gewhitelist!" }, - "Sponsor": { - "message": "sponsor" - }, - "Sponsors": { - "message": "sponsoren" - }, "Segment": { - "message": "Sponsor segment" + "message": "segment" }, "Segments": { - "message": "Sponsor segmenten" + "message": "segmenten" }, "upvoteButtonInfo": { "message": "Stem op deze indiening" }, "reportButtonTitle": { - "message": "Melden" + "message": "Rapporteren" }, "reportButtonInfo": { "message": "Rapporteer deze indiening als onjuist." }, "Dismiss": { - "message": "Negeren" + "message": "Sluiten" }, "Loading": { - "message": "Bezig met laden..." + "message": "Laden..." }, "Mins": { "message": "Minuten" @@ -52,7 +50,7 @@ "message": "Nooit weergeven" }, "hitGoBack": { - "message": "Druk op unskip om naar waar je vandaan komt te gaan." + "message": "Druk op unskip om terug te gaan naar waar je vandaan komt." }, "unskip": { "message": "Unskip" @@ -66,20 +64,29 @@ "manualPaused": { "message": "Timer gestopt" }, + "confirmMSG": { + "message": "Om individuele waarden te bewerken of te verwijderen, klik je op de info-knop of open je de extensie-popup door op het extensie-icoon in de rechterbovenhoek te klikken." + }, "clearThis": { - "message": "Weet je zeker dat je dit formulier wilt wissen?\n\n" + "message": "Weet je zeker dat je dit wilt wissen?\n\n" + }, + "Unknown": { + "message": "Er is een fout opgetreden bij het indienen van je sponsortijden. Probeer het later opnieuw." + }, + "sponsorFound": { + "message": "Deze video heeft segmenten in de database!" }, "sponsor404": { - "message": "Geen sponsors gevonden" + "message": "Geen segmenten gevonden" }, "sponsorStart": { - "message": "Sponsorschap" + "message": "Segment Begint Nu" }, "sponsorEnd": { - "message": "Sponshopschap eindigt nu" + "message": "Segment Eindigt Nu" }, "noVideoID": { - "message": "Er is geen YouTube-video gevonden op dit tabblad. Als je weet dat dit een YouTube-tabblad is, sluit je deze pop-up en open het opnieuw. Als dat niet werkt, probeer het tabblad opnieuw te laden." + "message": "Er is geen YouTube-video gevonden op dit tabblad. Als je weet dat dit een YouTube-tabblad is, sluit dan deze pop-up en open hem opnieuw. Als dat niet werkt, probeer dan het tabblad opnieuw te laden." }, "success": { "message": "Succesvol!" @@ -87,17 +94,44 @@ "voted": { "message": "Gestemd!" }, + "serverDown": { + "message": "Het lijkt erop dat de server offline is. Contacteer de ontwikkelaar onmiddellijk." + }, "connectionError": { "message": "Er is een verbindingsfout opgetreden. Foutcode: " }, "wantToSubmit": { - "message": "Wilt u de sponsor tijden indienen voor video id" + "message": "Wilt u indienen voor video id" }, "leftTimes": { - "message": "Het lijkt erop dat sommige sponsortijden niet ingezonden zijn. Ga terug naar die pagina om ze in te dienen (deze zijn niet verwijderd)." + "message": "Het lijkt erop dat sommige segmenten niet ingezonden zijn. Ga terug naar die pagina om ze in te dienen (de segmenten zijn niet verwijderd)." }, "clearTimes": { - "message": "Sponsortijden wissen" + "message": "Segmenten verwijderen" + }, + "openPopup": { + "message": "SponsorBlock Popup openen" + }, + "SubmitTimes": { + "message": "Segmenten indienen" + }, + "submitCheck": { + "message": "Weet je zeker dat je dit wilt indienen?" + }, + "whitelistChannel": { + "message": "Whitelist Kanaal" + }, + "removeFromWhitelist": { + "message": "Verwijder kanaal van whitelist" + }, + "voteOnTime": { + "message": "Stem op een segment" + }, + "soFarUHSubmited": { + "message": "Tot nu toe heb je ingediend:" + }, + "savedPeopleFrom": { + "message": "Je hebt mensen geholpen met het vermijden van " }, "viewLeaderboard": { "message": "Bekijk de ranglijst" @@ -105,15 +139,30 @@ "here": { "message": "hier" }, + "recordTimesDescription": { + "message": "Klik op de knop hieronder wanneer het segment start en eindigt om het te registreren en te verzenden naar de database." + }, + "popupHint": { + "message": "Tip: Druk op de puntkomma-toets terwijl een video in focus is om het start/einde van een segment te registreren en op quote om het in te dienen. (Dit kan worden gewijzigd in de opties)" + }, "clearTimesButton": { "message": "Wis tijden" }, "submitTimesButton": { "message": "Dien tijden in" }, + "publicStats": { + "message": "Dit wordt gebruikt op de publieke statistiekenpagina om te laten zien hoeveel u heeft bijgedragen. Bekijk het" + }, "setUsername": { "message": "Gebruikersnaam instellen" }, + "discordAdvert": { + "message": "Word lid van de officiële Discord server om suggesties en feedback te geven!" + }, + "hideThis": { + "message": "Dit verbergen" + }, "Options": { "message": "Opties" }, @@ -123,12 +172,40 @@ "hideButtons": { "message": "Verberg knoppen op YouTube Player" }, + "hideButtonsDescription": { + "message": "Dit verbergt de knoppen die verschijnen op de YouTube-speler om segmenten over te slaan." + }, "showInfoButton": { "message": "Toon info-knop op YouTube-speler" }, "hideInfoButton": { "message": "Verberg info-knop op YouTube Player" }, + "whatInfoButton": { + "message": "Dit is de knop die een pop-up opent op de YouTube-pagina." + }, + "hideDeleteButton": { + "message": "Verberg verwijder-knop op YouTube-speler" + }, + "showDeleteButton": { + "message": "Toon verwijder-knop op YouTube-speler" + }, + "whatDeleteButton": { + "message": "Dit is de knop op de YouTube-speler die al je niet ingezonden segmenten van de huidige video zal wissen." + }, + "enableViewTracking": { + "message": "Bijhouden van het aantal skips inschakelen" + }, + "whatViewTracking": { + "message": "Deze functie houdt bij welke segmenten u hebt overgeslagen om gebruikers te laten weten hoezeer hun indiening anderen heeft geholpen en wordt samen met upvotes als meetwaarde gebruikt om ervoor te zorgen dat spam niet in de database terechtkomt. De extensie stuurt telkens wanneer je een segment overslaat een bericht naar de server. Hopelijk veranderen de meeste mensen deze instelling niet zodat de weergavenummers accuraat zijn. :)" + }, + "showNotice": { + "message": "Toon melding opnieuw" + }, + "longDescription": { + "message": "SponsorBlock laat u sponsoren, intro's, outros, herinneringen om te abonneren en andere vervelende onderdelen van YouTube video's overslaan. SponsorBlock is een crowdsourced browserextensie waarmee iedereen de start- en eindtijd van gesponsorde segmenten en andere segmenten van YouTube-video's kan indienen. Zodra één persoon deze informatie indient, zal iedereen met deze extensie het gesponsorde segment overslaan. Je kunt ook secties zonder muziek in muziekvideo's overslaan.", + "description": "Full description of the extension on the store pages." + }, "website": { "message": "Website", "description": "Used on Firefox Store Page" @@ -137,12 +214,39 @@ "message": "Broncode", "description": "Used on Firefox Store Page" }, + "noticeUpdate": { + "message": "Deze melding is geupgrade!", + "description": "The first line of the message displayed after the notice was upgraded." + }, + "noticeUpdate2": { + "message": "Als het je nog steeds niet bevalt, druk dan op de \"nooit tonen\"-knop.", + "description": "The second line of the message displayed after the notice was upgraded." + }, + "setStartSponsorShortcut": { + "message": "Stel de toets voor de start van een segment in" + }, + "setSubmitKeybind": { + "message": "Stel de toets voor indienen in" + }, + "keybindDescription": { + "message": "Selecteer een toets door hem in te drukken" + }, + "keybindDescriptionComplete": { + "message": "Deze sneltoets is ingesteld op:" + }, + "0": { + "message": "Time-out van de verbinding. Controleer uw internetverbinding. Als uw internet werkt, is de server waarschijnlijk overbelast of offline." + }, "disableSkipping": { "message": "SponsorBlock uitschakelen" }, "enableSkipping": { "message": "SponsorBlock inschakelen" }, + "yourWork": { + "message": "Jouw werk", + "description": "Used to describe the section that will show you the statistics from your submissions." + }, "502": { "message": "De server lijkt overbelast te zijn. Probeer het over een paar seconden opnieuw." }, @@ -161,15 +265,9 @@ "enableAutoSkip": { "message": "Automatisch overslaan inschakelen" }, - "autoSkipDescription": { - "message": "Automatisch Overslaan zal sponsors voor u overslaan. Indien uitgeschakeld, zal een bericht vragen of u wilt overslaan." - }, "audioNotification": { "message": "Audiomelding bij Overslaan" }, - "audioNotificationDescription": { - "message": "Audiomelding bij overslaan zal een geluid afspelen wanneer een sponsor wordt overgeslagen. Indien uitgeschakeld (of automatisch overslaan is uitgeschakeld) wordt er geen geluid afgespeeld." - }, "minLower": { "message": "minuut" }, @@ -182,21 +280,42 @@ "hoursLower": { "message": "uren" }, - "guildlinesSummary": { - "message": "- Zorg ervoor dat uw segment alleen betaalde promoties bevat, niets anders.\n- Zorg ervoor dat het overslaan van dit segment geen waardevolle inhoud overslaat\n- Als de hele video een sponsorsegment is, rapporteer dit alstublieft niet. Binnenkort komt er een systeem om volledige video's te rapporteren.\n- Rapporteer alstublieft geen disclaimers die partijdig kunnen zijn (als een recensievideo gesponsord is, sla deze niet over wanneer ze dit vermelden)." - }, "whatChangeUserID": { - "message": "Dit moet privé blijven. Beschouw dit als wachtwoord en mag met niemand worden gedeeld. Als iemand dit heeft, kunnen ze je imiteren." + "message": "Dit moet privé blijven. Dit is zoals een wachtwoord en mag met niemand worden gedeeld. Als iemand dit heeft, kunnen ze je imiteren." + }, + "setUserID": { + "message": "Stel Gebruiker-Id in" + }, + "createdBy": { + "message": "Aangemaakt door" }, "autoSkip": { "message": "Automatisch overslaan" }, "showSkipNotice": { - "message": "Toon melding na een sponsor is overgeslagen" + "message": "Toon melding nadat een segment is overgeslagen" + }, + "keybindCurrentlySet": { + "message": ". Het is momenteel ingesteld op:" + }, + "supportInvidious": { + "message": "Ondersteuning Invidious" + }, + "add": { + "message": "Toevoegen" + }, + "addInvidiousInstanceError": { + "message": "Dit is een ongeldig domein. Dit moet ALLEEN het domeindeel bevatten. Voorbeeld: invidious.ajay.app" }, "minDuration": { "message": "Minimale duur (seconden):" }, + "minDurationDescription": { + "message": "Segmenten korter dan de ingestelde waarde worden niet overgeslagen of getoond in de speler." + }, + "shortCheck": { + "message": "De volgende inzending is korter dan je \"minimale tijdsduur\"-instelling. Dit kan betekenen dat dit al is ingediend, en genegeerd wordt door deze optie. Weet je zeker dat je dit wilt indienen?" + }, "showUploadButton": { "message": "Toon Upload Knop" }, @@ -206,13 +325,176 @@ "save": { "message": "Bewaren" }, + "reset": { + "message": "Reset" + }, "mobileUpdateInfo": { "message": "m.youtube.com wordt nu ondersteund" }, + "exportOptions": { + "message": "Importeer/Exporteer alle opties" + }, + "setOptions": { + "message": "Opties instellen" + }, + "confirmNoticeTitle": { + "message": "Segment indienen" + }, "submit": { "message": "Bevestigen" }, "cancel": { "message": "Annuleren" + }, + "delete": { + "message": "Verwijderen" + }, + "preview": { + "message": "Voorbeeld" + }, + "edit": { + "message": "Bewerken" + }, + "copyDebugInformation": { + "message": "Foutopsporingsinformatie kopiëren naar klembord" + }, + "copyDebugInformationFailed": { + "message": "Kon niet schrijven naar klembord" + }, + "theKey": { + "message": "De toets" + }, + "keyAlreadyUsed": { + "message": "is gekoppeld aan een andere actie. Selecteer een andere toets." + }, + "to": { + "message": "tot", + "description": "Used between segments. Example: 1:20 to 1:30" + }, + "category_sponsor": { + "message": "Sponsor" + }, + "category_intro": { + "message": "Intermissie/Intro-animatie" + }, + "category_intro_short": { + "message": "Intermissie" + }, + "category_outro": { + "message": "Eindkaarten/Credits" + }, + "category_interaction": { + "message": "Interactieherinnering (Abonneren)" + }, + "category_interaction_short": { + "message": "Interactieherinnering" + }, + "category_selfpromo": { + "message": "Onbetaalde promotie of zelfpromotie" + }, + "category_music_offtopic": { + "message": "Muziek: Sectie zonder muziek" + }, + "category_music_offtopic_description": { + "message": "Alleen voor gebruik in muziekvideo's. Dit omvat introducties of outros in muziekvideo's." + }, + "category_music_offtopic_short": { + "message": "Geen muziek" + }, + "category_livestream_messages": { + "message": "Livestream: Donaties/Lezen van berichten" + }, + "category_livestream_messages_short": { + "message": "Lezen van berichten" + }, + "disable": { + "message": "Uitschakelen" + }, + "manualSkip": { + "message": "Handmatig Overslaan" + }, + "showOverlay": { + "message": "Toon in tijdbalk" + }, + "colorFormatIncorrect": { + "message": "Je kleur is verkeerd geformatteerd. Het moet een hexadecimale code van 3 of 6 cijfers zijn met een hekje aan het begin." + }, + "previewColor": { + "message": "Kleurvoorbeeld", + "description": "Referring to submissions that have not been sent to the server yet." + }, + "seekBarColor": { + "message": "Kleur van tijdbalk" + }, + "category": { + "message": "Categorie" + }, + "skipOption": { + "message": "Manier van overslaan", + "description": "Used on the options page to describe the ways to skip the segment (auto skip, manual, etc.)" + }, + "enableTestingServer": { + "message": "Bèta-testserver gebruiken" + }, + "whatEnableTestingServer": { + "message": "Je inzendingen en stemmen ZULLEN NIET GEREGISTREERD WORDEN op de hoofdserver. Gebruik dit alleen om te testen." + }, + "bracketNow": { + "message": "(Nu)" + }, + "moreCategories": { + "message": "Meer categorieën" + }, + "chooseACategory": { + "message": "Kies een categorie" + }, + "youMustSelectACategory": { + "message": "Je moet een categorie selecteren voor alle segmenten die je indient!" + }, + "bracketEnd": { + "message": "(Einde)" + }, + "hiddenDueToDownvote": { + "message": "verborgen: downvote" + }, + "hiddenDueToDuration": { + "message": "verborgen: te kort" + }, + "channelDataNotFound": { + "message": "KanaalID is nog niet geladen." + }, + "adblockerIssue": { + "message": "Het lijkt erop dat iets de mogelijkheid van SponsorBlock om videogegevens te krijgen blokkeert. Dit is waarschijnlijk uw advertentieblokkeerder. Bekijk https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocks-Requests" + }, + "itCouldBeAdblockerIssue": { + "message": "Als dit blijft optreden, kan dit worden veroorzaakt door uw advertentieblokkeerder. Bekijk https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests" + }, + "downvoteDescription": { + "message": "Verkeerde Timing" + }, + "incorrectCategory": { + "message": "Verkeerde categorie" + }, + "multipleSegments": { + "message": "Meerdere segmenten" + }, + "guidelines": { + "message": "Richtlijnen" + }, + "readTheGuidelines": { + "message": "Lees de Richtlijnen!!", + "description": "Show the first time they submit or if they are \"high risk\"" + }, + "categoryUpdate1": { + "message": "Categorieën zijn er!" + }, + "categoryUpdate2": { + "message": "Open de opties om intro, outros, merch, etc. over te slaan." + }, + "unsubmittedWarning": { + "message": "Notificatie voor niet-ingestuurde segmenten" + }, + "unsubmittedWarningDescription": { + "message": "Stuur een notificatie wanneer je een video verlaat met segmenten die niet zijn geüpload" } } diff --git a/public/_locales/pl_PL/messages.json b/public/_locales/pl_PL/messages.json index f9bc41c5..2603a49f 100644 --- a/public/_locales/pl_PL/messages.json +++ b/public/_locales/pl_PL/messages.json @@ -19,20 +19,14 @@ "channelWhitelisted": { "message": "Kanał dodany do wyjątków!" }, - "Sponsor": { - "message": "sponsor" - }, - "Sponsors": { - "message": "sponsorów" - }, "Segment": { - "message": "segment sponsorowany" + "message": "segment" }, "Segments": { - "message": "segmentami sponsorowanymi" + "message": "segmenty" }, "upvoteButtonInfo": { - "message": "Oceń pozytywnie to zgłoszenie" + "message": "Oceń pozytywnie ten segment" }, "reportButtonTitle": { "message": "Zgłoś" @@ -80,16 +74,16 @@ "message": "Wystąpił błąd podczas przesyłania twojego segmentu. Proszę spróbować ponownie później." }, "sponsorFound": { - "message": "Segmenty sponsora dla tego nagrania są już w bazie!" + "message": "Ten film ma segmenty w bazie danych!" }, "sponsor404": { - "message": "Nie znaleziono segmentów sponsora" + "message": "Nie znaleziono segmentów" }, "sponsorStart": { - "message": "Sponsor zaczyna się teraz" + "message": "Segment zaczyna się teraz" }, "sponsorEnd": { - "message": "Sponsor kończy się teraz" + "message": "Segment kończy się teraz" }, "noVideoID": { "message": "Nie znaleziono filmu na tej karcie. Jeśli wiesz, że to karta YouTube'a, zamknij to okienko i otwórz je ponownie. Jeśli to nie zadziała, spróbuj odświeżyć stronę." @@ -107,19 +101,19 @@ "message": "Błąd z połączeniem. Kod błędu: " }, "wantToSubmit": { - "message": "Chcesz zgłosić segment sponsorowany dla filmu z id" + "message": "Czy chcesz zamieścić dla filmu o ID" }, "leftTimes": { - "message": "Wygląda na to, że masz nie wysłane segmenty sponsora. Cofnij się do tej strony żeby je zgłosić (nie zostały usunięte)." + "message": "Wygląda na to, że zostawiłeś pewne niewysłane segmenty. Cofnij się do tamtej strony, by je zamieścić (nie zostały usunięte)." }, "clearTimes": { - "message": "Usuń segmenty reklamowe" + "message": "Wyczyść segmenty" }, "openPopup": { "message": "Otwórz okienko SponsorBlock" }, "SubmitTimes": { - "message": "Zgłoś segmenty sponsora" + "message": "Prześlij segmenty" }, "submitCheck": { "message": "Czy na pewno chcesz to zamieścić?" @@ -131,10 +125,7 @@ "message": "Usuń kanał z listy wyjątków" }, "voteOnTime": { - "message": "Głosuj na segment sponsora" - }, - "recordTimes": { - "message": "Nagraj czasy segmentów sponsorowanych" + "message": "Oceń segment" }, "soFarUHSubmited": { "message": "Do tej pory zgłosiłeś" @@ -149,13 +140,10 @@ "message": "tutaj" }, "recordTimesDescription": { - "message": "Kliknij przycisk poniżej, gdy segment sponsorowany zaczyna się i kończy, by oznaczyć go i przesłać do bazy danych." + "message": "Kliknij przycisk poniżej, gdy segment zaczyna się i kończy, by oznaczyć go i przesłać do bazy danych." }, "popupHint": { - "message": "Podpowiedź: Klikając średnik kiedy zaznaczone jest zgłaszanie wideo możesz oznaczyć początek reklamy, znakiem cytatu oznaczysz jej koniec. (Klawisze można zmienić w opcjach)" - }, - "lastTimes": { - "message": "Ostanie wybrane czasy reklam" + "message": "Podpowiedź: Wciśnij średnik, koncentrując się na filmie, aby oznaczyć początek/koniec segmentu, i cudzysłów, by go wysłać. (Klawisze można zmienić w opcjach)" }, "clearTimesButton": { "message": "Usuń czasy" @@ -205,18 +193,19 @@ "whatDeleteButton": { "message": "Ten przycisk na odtwarzaczu YouTube wyczyści wszystkie twoje niewysłane segmenty dla bieżącego filmu." }, - "disableViewTracking": { - "message": "Wyłącz licznik przewinięć" - }, "enableViewTracking": { - "message": "Włącz licznik przewinięć" + "message": "Włącz monitorowanie liczby pominięć" }, "whatViewTracking": { - "message": "Ta opcja monitoruje pominięte przez Ciebie segmenty i informuje zgłaszających, ile czasu Ci zaoszczędzili. Wraz z systemem głosowania pomaga też wykrywać spam w zgłoszeniach. Rozszerzenie wysyła zapytanie do serwera za każdym razem, kiedy pomijasz segment reklamowy. Miejmy nadzieję, że większość użytkowników tego nie wyłączy i licznik wyświetleń będzie rzetelny. :)" + "message": "Ta opcja monitoruje pomijane przez Ciebie segmenty, by dać znać użytkownikom, jak bardzo ich wkład pomógł innym, oraz w połączeniu z systemem głosowania zapobiegać dostawaniu się spamu do bazy danych. Rozszerzenie wysyła wiadomość do serwera za każdym razem, kiedy pomijasz segment. Miejmy nadzieję, że większość ludzi tego nie wyłączy i liczniki wyświetleń będą wiarygodne. :)" }, "showNotice": { "message": "Pokaż informacje ponownie" }, + "longDescription": { + "message": "SponsorBlock pozwala pomijać sponsorów, intra, outra, przypomnienia o subskrypcjach i inne irytujące fragmenty filmów na YouTube. SponsorBlock jest opartym na crowdsourcingu rozszerzeniem do przeglądarki, które pozwala każdemu zgłosić początek i koniec segmentów sponsorowanych oraz innych segmentów w filmach na YouTube. Kiedy ktoś już zamieści te informacje, wszyscy pozostali z tym rozszerzeniem będą pomijać segment sponsorowany. Możesz również pomijać fragmenty teledysków bez muzyki.", + "description": "Full description of the extension on the store pages." + }, "website": { "message": "Strona", "description": "Used on Firefox Store Page" @@ -234,7 +223,7 @@ "description": "The second line of the message displayed after the notice was upgraded." }, "setStartSponsorShortcut": { - "message": "Ustaw klawisz do oznaczania początku reklamy" + "message": "Ustaw klawisz do oznaczania początku segmentu" }, "setSubmitKeybind": { "message": "Ustaw klawisz do wysyłania czasów" @@ -271,23 +260,23 @@ "message": "Pominięto" }, "disableAutoSkip": { - "message": "Wyłącz auto przewijanie" + "message": "Wyłącz autopomijanie" }, "enableAutoSkip": { - "message": "Włącz auto przewijanie" - }, - "autoSkipDescription": { - "message": "Auto przewijanie przewinie segment za ciebie, wyłączone wyświetli komunikat z pytaniem czy chcesz przewinąć reklamę." + "message": "Włącz autopomijanie" }, "audioNotification": { - "message": "Powiadomienie dźwiękowe o przewinięciu" + "message": "Powiadomienie dźwiękowe przy pominięciu" }, "audioNotificationDescription": { - "message": "Powiadomienie dźwiękowe po pominięciu będzie odtwarzane za każdym razem, gdy sponsor zostanie pominięty. Jeśli wyłączone (lub automatyczne pomijanie jest wyłączone), dźwięk nie zostanie odtworzony." + "message": "Powiadomienie dźwiękowe przy pominięciu będzie odtwarzane za każdym razem, gdy pomijany jest segment. Jeśli wyłączone (lub automatyczne pomijanie jest wyłączone), dźwięk nie zostanie odtworzony." }, "showTimeWithSkips": { "message": "Pokaż czas po usunięciu segmentów" }, + "showTimeWithSkipsDescription": { + "message": "Czas ten pojawia się w nawiasie obok czasu bieżącego, pod paskiem postępu. Pokazuje on długość całego filmu po odjęciu wszystkich segmentów. Wliczają się w to segmenty ustawione jako \"pokaż na pasku\"." + }, "youHaveSkipped": { "message": "Przewinąłeś " }, @@ -312,9 +301,6 @@ "youHaveSavedTimeEnd": { "message": " czasu." }, - "guildlinesSummary": { - "message": "- Upewnij się, że zgłaszany fragment zawiera tylko reklamę i nic więcej.\n- Upewnij się, że nie zostanie przewinięta wartościowa treść\n- Jeśli całe nagranie to reklama, proszę nie zgłaszaj go. Blokowanie całych nagrań pojawi się wkrótce.\n- Nie ukrywaj treści które są istotne dla użytkownika (nie ukrywaj informacji, że recenzja produktu została opłacona przez producenta)" - }, "statusReminder": { "message": "Sprawdź status serwera na status.sponsor.ajay.app" }, @@ -328,16 +314,16 @@ "message": "Ustaw identyfikator użytkownika" }, "userIDChangeWarning": { - "message": "Uwaga: Zmiana identyfikatora użytkownika jest nieodwracalna. Czy na pewno chcesz to zrobić? Na wszelki wypadek skopiuj swój poprzedni." + "message": "Uwaga: Zmiana identyfikatora użytkownika jest trwała. Czy na pewno chcesz to zrobić? Na wszelki wypadek skopiuj swój poprzedni." }, "createdBy": { "message": "Stworzony przez" }, "autoSkip": { - "message": "Auto przewijanie" + "message": "Autopomijanie" }, "showSkipNotice": { - "message": "Pokaż informację po przewiniętym fragmencie" + "message": "Pokaż informację po pominięciu segmentu" }, "keybindCurrentlySet": { "message": ". Jest obecnie ustawione jako:" @@ -349,7 +335,7 @@ "message": "Invidious (invidio.us) to nieoficjalny klient YouTube'a. Aby włączyć dla niego wsparcie musisz przyznać dodatkowe uprawnienia. W Chrome'ie i innych przeglądarkach bazujących na Chromium, ta opcja nie działa w trybie incognito." }, "optionsInfo": { - "message": "Włącz wsparcie dla Invidious, wyłącz auto przewijanie, ukryj przyciski i więcej." + "message": "Włącz wsparcie dla Invidious, wyłącz autopomijanie, ukryj przyciski i więcej." }, "addInvidiousInstance": { "message": "Dodaj instancje Invidious" @@ -376,7 +362,10 @@ "message": "Minimalny czas trwania (sekundy):" }, "minDurationDescription": { - "message": "Segmenty sponsorowane krótsze niż ustawiona wartość nie będą pomijane ani pokazywane w odtwarzaczu." + "message": "Segmenty krótsze niż ustawiona wartość nie będą pomijane ani pokazywane w odtwarzaczu." + }, + "shortCheck": { + "message": "Ten segment jest krótszy od ustawionego przez Ciebie minimalnego czasu trwania. Może to oznaczać, że ktoś już to zamieścił, ale nie widzisz tego przez to ustawienie. Czy na pewno chcesz to zamieścić?" }, "showUploadButton": { "message": "Pokaż przycisk wysyłania" @@ -402,8 +391,14 @@ "areYouSureReset": { "message": "Czy na pewno chcesz to zresetować?" }, + "confirmPrivacy": { + "message": "Ten film został wykryty jako niepubliczny. Kliknij Anuluj, jeśli nie chcesz sprawdzać, czy są dla niego segmenty." + }, "unlistedCheck": { - "message": "Ignoruj nielistowane/prywatne filmy" + "message": "Ignoruj niepubliczne/prywatne filmy" + }, + "whatUnlistedCheck": { + "message": "Ta opcja spowolni nieco SponsorBlock. Wyszukiwanie istniejących segmentów wymaga wysłania ID filmu do serwera. Jeśli niepokoi Cię fakt wysyłania przez internet ID niepublicznych filmów, włącz tę opcję." }, "mobileUpdateInfo": { "message": "m.youtube.com jest teraz wspierany" @@ -412,11 +407,14 @@ "message": "Importuj/Eksportuj wszystkie ustawienia" }, "whatExportOptions": { - "message": "Oto cała twoja konfiguracja w formacie JSON. Zawarty jest w niej twój identyfikator użytkownika, więc uważaj, komu ją udostępniasz." + "message": "Jest to cała twoja konfiguracja w formacie JSON. Zawarty jest w niej twój identyfikator użytkownika, więc uważaj, komu ją udostępniasz." }, "setOptions": { "message": "Zapisz ustawienia" }, + "exportOptionsWarning": { + "message": "Uwaga: Zmiana ustawień jest trwała i może popsuć twoją instalację. Czy na pewno chcesz to zrobić? Na wszelki wypadek utwórz kopię poprzednich." + }, "incorrectlyFormattedOptions": { "message": "Ten JSON nie został poprawnie sformatowany. Twoje opcje nie zostały zmienione." }, @@ -444,40 +442,64 @@ "copyDebugInformationFailed": { "message": "Nie udało się skopiować do schowka" }, + "copyDebugInformationOptions": { + "message": "Kopiuje do schowka informacje do dostarczenia deweloperowi podczas zgłaszania błędu / gdy deweloper ich sobie zażyczy. Poufne informacje, takie jak ID użytkownika, kanały dodane do wyjątków i adres niestandardowego serwera zostały usunięte. Wciąż zawiera to jednak informacje takie jak twój user agent, przeglądarka, system operacyjny i wersja rozszerzenia. " + }, "copyDebugInformationComplete": { "message": "Informacje do debugowania zostały skopiowane do schowka. Możesz usunąć dane, których nie chcesz udostępniać. Zapisz je w pliku tekstowym albo wklej do raportu podczas zgłaszania błędu." }, "theKey": { "message": "Klucz" }, + "keyAlreadyUsed": { + "message": "jest przypisane do innej akcji. Wybierz proszę inny klawisz." + }, "to": { "message": "do", - "description": "Used between sponsor times. Example: 1:20 to 1:30" + "description": "Used between segments. Example: 1:20 to 1:30" }, "category_sponsor": { "message": "Sponsor" }, + "category_sponsor_description": { + "message": "Płatna promocja, płatne rekomendacje oraz bezpośrednie reklamy. Nie do autopromocji ani darmowych wyrazów uznania dla kwestii/twórców/stron/produktów, które im się podobają." + }, "category_intro": { "message": "Przerwa/Animowane intro" }, + "category_intro_description": { + "message": "Fragment bez faktycznej treści. Może to być pauza, statyczna klatka, powtarzająca się animacja. Nie powinno to być używane do przejść zawierających informacje ani w teledyskach." + }, "category_intro_short": { "message": "Przerwa" }, "category_outro": { "message": "Ekran końcowy/Napisy" }, + "category_outro_description": { + "message": "Napisy końcowe lub gdy pojawia się ekran końcowy. Nie do konkluzji zawierających informacje. Nie powinno to być używane w teledyskach." + }, "category_interaction": { "message": "Przypomnienie o interakcji (Subskrybuj)" }, + "category_interaction_description": { + "message": "Gdy ma miejsce krótkie przypomnienie, by lajkować, subskrybować lub śledzić ich w trakcie kontentu. Jeśli trwa to długo lub dotyczy czegoś konkretnego, powinno być zamiast tego jako promocja własna." + }, "category_interaction_short": { "message": "Przypomnienie o interakcji" }, "category_selfpromo": { "message": "Nieopłacona/Własna promocja" }, + "category_selfpromo_description": { + "message": "Podobnie jak \"sponsor\", ale nieodpłatnie bądź w ramach promocji własnej. Obejmuje to sekcje o własnych produktach, donacjach czy informacje o tym, z kim współpracowali." + }, "category_music_offtopic": { "message": "Muzyka: Sekcja niemuzyczna" }, + "category_music_offtopic_description": { + "message": "Do użytku tylko w filmach muzycznych. Wliczają się w to wprowadzenia i outro w teledyskach." + }, "category_music_offtopic_short": { "message": "Bez muzyki" }, @@ -516,6 +538,12 @@ "enableTestingServer": { "message": "Aktywuj serwer beta-testów" }, + "whatEnableTestingServer": { + "message": "Twoje segmenty i głosy NIE BĘDĄ uwzględniane na głównym serwerze. Używaj tego tylko do testowania." + }, + "testingServerWarning": { + "message": "Żadne segmenty ani głosy NIE BĘDĄ uwzględniane na głównym serwerze podczas połączenia z serwerem testowym. Pamiętaj, żeby to wyłączyć, gdy zechcesz dodać realny wkład." + }, "bracketNow": { "message": "(Teraz)" }, @@ -547,17 +575,23 @@ "message": "Jeśli ten problem się powtarza, możliwą przyczyną jest Twój ad blocker. Sprawdź proszę https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests" }, "forceChannelCheck": { - "message": "Wymuś sprawdzenie kanału przed pominięciem sponsorów" + "message": "Wymuś sprawdzenie kanału przed pominięciem" }, "whatForceChannelCheck": { - "message": "Domyślnie, rozszerzenie pominie sponsorów od razu, jeszcze zanim dowie się jaki to kanał. Pewne segmenty nie trwające nawet sekundy domyślnie mogą zostać pominięte na kanałach dodanych do wyjątków. Włączenie tej opcji temu zapobiegnie, ale wszystkie pominięcia będą nieco opóźnione, gdyż uzyskanie ID kanału może chwilę potrwać. Opóźnienie to może być nieodczuwalne, jeśli masz szybki internet." + "message": "Domyślnie, rozszerzenie pominie segmenty od razu, jeszcze zanim dowie się jaki to kanał. Domyślnie, pewne segmenty na początku filmu mogą zostać pominięte na kanałach dodanych do wyjątków. Włączenie tej opcji temu zapobiegnie, ale wszystkie pominięcia będą nieco opóźnione, gdyż uzyskanie ID kanału może chwilę potrwać. Opóźnienie to może być nieodczuwalne, jeśli masz szybki internet." + }, + "forceChannelCheckPopup": { + "message": "Rozważ włączenie \"Wymuś sprawdzenie kanału przed pominięciem\"" }, "downvoteDescription": { - "message": "Nieprawidłowy przedział czasowy" + "message": "Niepoprawne/Zły czas" }, "incorrectCategory": { "message": "Zła kategoria" }, + "nonMusicCategoryOnMusic": { + "message": "Ten film jest skategoryzowany jako muzyka. Czy na pewno chcesz na nim zamieścić segmenty z kategoriami nieprzeznaczonymi do muzyki? Nie powinieneś ich dodawać, chyba że to faktycznie nie jest muzyka. Przeczytaj proszę wytyczne, jeśli masz wątpliwości." + }, "multipleSegments": { "message": "Wiele segmentów" }, @@ -575,7 +609,7 @@ "message": "Otwórz opcje, aby pominąć intra, outra, merch, itp." }, "unsubmittedWarning": { - "message": "Powiadomienie o nieprzesłanych segmentach" + "message": "Powiadomienie o niewysłanych segmentach" }, "unsubmittedWarningDescription": { "message": "Wyślij powiadomienie po opuszczeniu filmu z segmentami, które nie zostały przesłane" diff --git a/public/_locales/pt_BR/messages.json b/public/_locales/pt_BR/messages.json index 112bca3f..4c7601c5 100644 --- a/public/_locales/pt_BR/messages.json +++ b/public/_locales/pt_BR/messages.json @@ -15,18 +15,6 @@ "channelWhitelisted": { "message": "Canal adicionado à lista branca!" }, - "Sponsor": { - "message": "patrocinador" - }, - "Sponsors": { - "message": "patrocinadores" - }, - "Segment": { - "message": "segmento de patrocinador" - }, - "Segments": { - "message": "segmentos de patrocinadores" - }, "upvoteButtonInfo": { "message": "Votar nesse segmento positivamente" }, @@ -75,18 +63,6 @@ "Unknown": { "message": "Houve um erro ao enviar seus segmentos, tente novamente mais tarde." }, - "sponsorFound": { - "message": "Os patrocinadores desse vídeo estão no banco de dados!" - }, - "sponsor404": { - "message": "Nenhum patrocinador encontrado" - }, - "sponsorStart": { - "message": "Patrocínio começa agora" - }, - "sponsorEnd": { - "message": "Patrocínio termina agora" - }, "noVideoID": { "message": "Nenhum vídeo do YouTube foi encontrado nesta aba. Se você sabe que esta é uma aba do YouTube, feche este pop-up e abra-o novamente. Se isso não funcionar, tente recarregar a aba." }, @@ -102,21 +78,9 @@ "connectionError": { "message": "Ocorreu um erro de conexão. Código de erro: " }, - "wantToSubmit": { - "message": "Quer enviar os segmentos para o vídeo de ID" - }, - "leftTimes": { - "message": "Parece que você se esqueceu de enviar alguns segmentos. Volte para aquela página para enviá-los (eles não foram deletados)." - }, - "clearTimes": { - "message": "Apagar intervalos dos patrocínios" - }, "openPopup": { "message": "Abrir o Popup SponsorBlock" }, - "SubmitTimes": { - "message": "Enviar intervalos de patrocínios" - }, "submitCheck": { "message": "Você tem certeza que deseja enviar isto?" }, @@ -126,12 +90,6 @@ "removeFromWhitelist": { "message": "Remover canal da lista branca" }, - "voteOnTime": { - "message": "Vote num intervalo de patrocínio" - }, - "recordTimes": { - "message": "Grave os intervalos de um patrocínio" - }, "soFarUHSubmited": { "message": "Até agora, você já enviou" }, @@ -144,15 +102,6 @@ "here": { "message": "aqui" }, - "recordTimesDescription": { - "message": "Clique no botão abaixo quando o patrocínio começa e termina para gravá-lo na base de dados." - }, - "popupHint": { - "message": "Dica: Aperte a tecla ponto e vírgula (;) com a janela focada em um vídeo para reportar o começo/fim de um patrocínio e aspas (\") para enviar. (Esta configuração pode ser mudada nas opções.)" - }, - "lastTimes": { - "message": "Últimos Intervalos de Patrocínios Seleciados" - }, "clearTimesButton": { "message": "Limpar Intervalos" }, @@ -201,15 +150,6 @@ "whatDeleteButton": { "message": "Este é o botão que lhe permite saltar todos os patrocínios do player do Youtube." }, - "disableViewTracking": { - "message": "Desactivar registo de visualização de patrocínios" - }, - "enableViewTracking": { - "message": "Activar registo de visualização de patrocínios" - }, - "whatViewTracking": { - "message": "Esta funcionalidade regista que patrocínios tem saltado para que outros utilizadores saibam o quanto as suas submições têm ajudado outros\n e é usado como métrica de votos para evitar spam na base de dados. A extenção \n envia uma notificação ao servidor sempre que salta um patrocínio. Quanto menos pessoas desactivarem esta funcionalidade mais precisas serão as estimativas :)" - }, "showNotice": { "message": "Mostrar notificação outra vez" }, @@ -229,9 +169,6 @@ "message": "Se você ainda não gostar dessa, aperte o botão não mostrar novamente.", "description": "The second line of the message displayed after the notice was upgraded." }, - "setStartSponsorShortcut": { - "message": "Defina a tecla para que marca o início do patrocínio" - }, "setSubmitKeybind": { "message": "Defina a tecla para enviar o segmento de patrocínio" }, @@ -272,15 +209,9 @@ "enableAutoSkip": { "message": "Ativar Salto Automático" }, - "autoSkipDescription": { - "message": "Pular automaticamente irá pular patrocínios por você. Se desabilitado, um aviso irá aparecer perguntando se deseja pular o anúncio." - }, "audioNotification": { "message": "Notificação de áudio ao pular" }, - "audioNotificationDescription": { - "message": "A notificação de áudio ao pular irá tocar um som sempre que um patrocínio for ignorado. Se desativado (ou o pulo automático estiver desativado), nenhum som será reproduzido." - }, "showTimeWithSkips": { "message": "Mostrar tempo com pulos removidos" }, @@ -308,9 +239,6 @@ "youHaveSavedTimeEnd": { "message": " de suas vidas." }, - "guildlinesSummary": { - "message": "- Certifique-se de que seu segmento contém apenas patrocínio, nada mais.\n- Certifique-se de que pular esse segmento não vai pular conteúdo importante.\n- Se todo o vídeo for patrocinado, por favor não o denuncie. Um sistema completo de relatório de vídeo virá em breve.\n- Por favor, não denuncie avisos de parcialidade do vídeo (se um vídeo de avaliação for patrocinado, não pule quando eles mencionarem que é patrocinado)." - }, "statusReminder": { "message": "Verifique status.sponsor.ajay.app para o status do servidor." }, @@ -332,9 +260,6 @@ "autoSkip": { "message": "Pular automaticamente" }, - "showSkipNotice": { - "message": "Mostrar aviso após um patrocínio ser ignorado" - }, "keybindCurrentlySet": { "message": ". Atualmente, está definido para:" }, @@ -371,9 +296,6 @@ "minDuration": { "message": "Duração mínima (segundos):" }, - "minDurationDescription": { - "message": "Segmentos de patrocinadores menores do que o valor definido não serão pulados ou mostrados no reprodutor." - }, "shortCheck": { "message": "A seguinte submissão é mais curta do que sua opção de duração mínima. Isto significa que já foi enviada e que está sendo ignorada devido a esta opção. Tem certeza que deseja enviar mesmo assim?" }, @@ -401,15 +323,9 @@ "areYouSureReset": { "message": "Tem certeza que deseja redefinir?" }, - "confirmPrivacy": { - "message": "O este vídeo está marcado como não listado. Clique em cancelar se você não deseja verificar se há patrocínios." - }, "unlistedCheck": { "message": "Ignorar vídeos não listados/privados" }, - "whatUnlistedCheck": { - "message": "Esta configuração irá diminuir um pouco o desempenho do SponsorBlock. As pesquisas do patrocinador exigem que se envie o ID do vídeo para o servidor. Se você estiver preocupado com o envio de IDs de vídeo não listados pela internet, habilite essa opção." - }, "mobileUpdateInfo": { "message": "m.youtube.com agora é suportado" }, @@ -466,7 +382,7 @@ }, "to": { "message": "até", - "description": "Used between sponsor times. Example: 1:20 to 1:30" + "description": "Used between segments. Example: 1:20 to 1:30" }, "category_sponsor": { "message": "Patrocinador" @@ -551,15 +467,6 @@ "itCouldBeAdblockerIssue": { "message": "Se isso continuar acontecendo, pode ser causado pelo seu bloqueador de anúncios. Por favor, verifique https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock-Requests" }, - "forceChannelCheck": { - "message": "Forçar verificação do canal antes de pular os patrocínios" - }, - "whatForceChannelCheck": { - "message": "Por padrão, isso pulará os patrocínios imediatamente mesmo antes de saber qual é o canal. Por padrão, alguns patrocinadores de zero segundo podem ser ignorados nos canais da lista branca. Habilitar esta opção evitará isso, mas irá fazer com que todos os saltos tenham um ligeiro atraso, já que obter o channelID pode levar algum tempo. Este atraso pode não ser perceptível se você tiver internet rápida." - }, - "forceChannelCheckPopup": { - "message": "Considere habilitar a verificação de canal forçada antes de pular os patrocinadores" - }, "downvoteDescription": { "message": "Incorreto/tempo errado" }, diff --git a/public/_locales/pt_PT/messages.json b/public/_locales/pt_PT/messages.json index 918fff00..10057e0b 100644 --- a/public/_locales/pt_PT/messages.json +++ b/public/_locales/pt_PT/messages.json @@ -15,18 +15,6 @@ "channelWhitelisted": { "message": "Canal adicionado à whitelist!" }, - "Sponsor": { - "message": "patrocinador" - }, - "Sponsors": { - "message": "patrocinadores" - }, - "Segment": { - "message": "segmento de patrocínio" - }, - "Segments": { - "message": "segmentos de patrocínio" - }, "reportButtonTitle": { "message": "Reportar" }, @@ -66,18 +54,6 @@ "Unknown": { "message": "Erro ao enviar os seus segmentos, tente novamente mais tarde." }, - "sponsorFound": { - "message": "Os patrocinadores desse vídeo estão no banco de dados!" - }, - "sponsor404": { - "message": "Nenhum patrocinador encontrado" - }, - "sponsorStart": { - "message": "Patrocínio começa agora" - }, - "sponsorEnd": { - "message": "Patrocínio termina agora" - }, "noVideoID": { "message": "Isto provavelmente não é uma tab do YouTube, ou pode ter clicado muito cedo. \n Se sabe que é uma tab do YouTube,\n feche este popup e abra de novo." }, @@ -90,21 +66,9 @@ "connectionError": { "message": "Deu-se um erro de conecção: Código: " }, - "wantToSubmit": { - "message": "Quer enviar os segmentos para o vídeo de ID" - }, - "leftTimes": { - "message": "Parece que se esqueceu de enviar alguns segmentos. Retorne à página para os enviar (não foram apagados)." - }, - "clearTimes": { - "message": "Apagar intervalos dos patrocínios" - }, "openPopup": { "message": "Abrir o Popup SponsorBlock" }, - "SubmitTimes": { - "message": "Submeter intervalos dos patrocínios" - }, "submitCheck": { "message": "Tem a certeza que pretende submeter?" }, @@ -114,12 +78,6 @@ "removeFromWhitelist": { "message": "Remover canal da Whitelist" }, - "voteOnTime": { - "message": "Vote num intervalo de patrocínio" - }, - "recordTimes": { - "message": "Registe um intervalo de patrocínio" - }, "soFarUHSubmited": { "message": "Até agora submeteu" }, @@ -132,15 +90,6 @@ "here": { "message": "aqui" }, - "recordTimesDescription": { - "message": "Carregue neste botão abaixo quando o patrocínio começar e quando\n acabar para registar e submetê-lo à base de dados" - }, - "popupHint": { - "message": "Dica: Carregue na tecla ; enquanto num vídeo para registar o começo/fim de um patrocínio e \" para submeter" - }, - "lastTimes": { - "message": "Intervalos de Patrocínios Escolhidos mais Recentemente" - }, "clearTimesButton": { "message": "Limpar Intervalos" }, @@ -189,15 +138,6 @@ "whatDeleteButton": { "message": "Este é o botão que lhe permite saltar todos os patrocínios do player do Youtube." }, - "disableViewTracking": { - "message": "Desactivar registo de visualização de patrocínios" - }, - "enableViewTracking": { - "message": "Activar registo de visualização de patrocínios" - }, - "whatViewTracking": { - "message": "Esta funcionalidade regista que patrocínios tem saltado para que outros utilizadores saibam o quanto as suas submições têm ajudado outros\n e é usado como métrica de votos para evitar spam na base de dados. A extenção \n envia uma notificação ao servidor sempre que salta um patrocínio. Quanto menos pessoas desactivarem esta funcionalidade mais precisas serão as estimativas :)" - }, "showNotice": { "message": "Mostrar notificação outra vez" }, diff --git a/public/_locales/ro/messages.json b/public/_locales/ro/messages.json index b796a12e..ee7f5af0 100644 --- a/public/_locales/ro/messages.json +++ b/public/_locales/ro/messages.json @@ -15,18 +15,6 @@ "channelWhitelisted": { "message": "Canalul a fost adăugat la excepții!" }, - "Sponsor": { - "message": "sponsor" - }, - "Sponsors": { - "message": "sponsori" - }, - "Segment": { - "message": "segment sponsorizat" - }, - "Segments": { - "message": "segmente sponsorizate" - }, "upvoteButtonInfo": { "message": "Votează această înregistrare" }, @@ -75,18 +63,6 @@ "Unknown": { "message": "A apărut o eroare în trimiterea timpilor sponsorizărilor, încearcă din nou mai târziu." }, - "sponsorFound": { - "message": "Sponsorii acestui videoclip se află în baza de date!" - }, - "sponsor404": { - "message": "Nu s-a gasit niciun sponsor" - }, - "sponsorStart": { - "message": "Sponsorizarea Începe Acum" - }, - "sponsorEnd": { - "message": "Sponsorizarea Se Termină Acum" - }, "noVideoID": { "message": "Nu există niciun videoclip YouTube în aceast tab. Dacă știți că acesta este un tab YouTube, închideți acest popup și deschideți-l din nou. Daca nici asta nu merge, încercați să reîncărcați pagina." }, @@ -102,21 +78,9 @@ "connectionError": { "message": "A apărut o eroare de conexiune. Cod de eroare: " }, - "wantToSubmit": { - "message": "Doriți să trimiteți timpii sponsorizărilor pentru acest video id" - }, - "leftTimes": { - "message": "Se pare că ați lăsat unii timpi ai sponsorilor netrimiși. Mergeți înapoi la pagina respectivă pentru a îi trimite (timpii nu au fost șterși)." - }, - "clearTimes": { - "message": "Șterge Timpii Sponsorizărilor" - }, "openPopup": { "message": "Deschide Popup-ul SponsorBlock" }, - "SubmitTimes": { - "message": "Trimte Timpii Sponsorizărilor" - }, "submitCheck": { "message": "Sunteți sigur că doriți să trimiteți asta?" }, @@ -126,12 +90,6 @@ "removeFromWhitelist": { "message": "Șterge Canalul De La Excepții" }, - "voteOnTime": { - "message": "Votează Timpii Sponsorizărilor" - }, - "recordTimes": { - "message": "Înregistrează timpul unei sponsorizări" - }, "soFarUHSubmited": { "message": "Până acum, ai trimis" }, @@ -144,15 +102,6 @@ "here": { "message": "aici" }, - "recordTimesDescription": { - "message": "Apasă pe butonul de mai jos când începe o sponsorizare și când se termină pentru a înregistra-o și pentru a o trimite la baza de date." - }, - "popupHint": { - "message": "Indiciu: Apasă pe tasta punct și virgulă în timp ce ești centrat pe videoclip pentru a raporta începutul/finalul unei sponsorizări și apasă pe ghilimele pentru a o trimite. (Acest lucru poate fi schimbat din opțiuni)" - }, - "lastTimes": { - "message": "Ultimii Timpi Ai Mesajului Sponsorizat Aleși" - }, "clearTimesButton": { "message": "Șterge Timpii" }, @@ -201,15 +150,6 @@ "whatDeleteButton": { "message": "Acest buton de pe playerul de YouTube va șterge toate segmentele netrimise pentru videoclipul curent." }, - "disableViewTracking": { - "message": "Dezactivează Urmărirea Săriturilor" - }, - "enableViewTracking": { - "message": "Activează Urmărirea Săriturilor" - }, - "whatViewTracking": { - "message": "Acest lucru urmărește peste ce sponsori ai sărit pentru a informa utilizatorii cât de mult înregistrările lor i-au ajutat pe alții și\neste folosit ca un contor împreună cu upvoturile pentru a ne asigura că spamul nu pătrunde în baza de date. Extensia trimite un mesaj\nserverului de fiecare dată când sari peste un sponsor. Sperăm că majoritatea oamenilor nu vor schimba această setare astfel că numerele să fie exacte. :)" - }, "showNotice": { "message": "Arată Notificarea Din Nou" }, @@ -229,9 +169,6 @@ "message": "Dacă nu îți place, apasă butonul nu mai arăta niciodată.", "description": "The second line of the message displayed after the notice was upgraded." }, - "setStartSponsorShortcut": { - "message": "Setează tasta pentru pornirea sponsorizării" - }, "setSubmitKeybind": { "message": "Setează tasta pentru trimiterea sponsorizării" }, @@ -272,15 +209,9 @@ "enableAutoSkip": { "message": "Activează Autoskip" }, - "autoSkipDescription": { - "message": "Autoskip va sări automat peste segmentele sponsorizate pentru tine. Dacă este dezactivată, o notificare va apărea care vă va întreba dacă doriți să săriți peste." - }, "audioNotification": { "message": "Notificare Audio Când Sari" }, - "audioNotificationDescription": { - "message": "Notificarea audio va reda un sunet atunci când sari peste un segement sponsorizat. Daca este dezactivat (sau autoskip este dezactivat), niciun sunet nu va fi redat." - }, "showTimeWithSkips": { "message": "Arată timpul cu săriturile eliminate" }, @@ -311,9 +242,6 @@ "youHaveSavedTimeEnd": { "message": " din viața lor." }, - "guildlinesSummary": { - "message": "- Asigurați-vă că segmentul conține doar promoții plătite, nimic altceva.\n- Asigurați-vă că dacă săriți peste acest segment nu săriți și peste conținut valoros\n- Dacă tot videoclipul este o sponsorizare, vă rugăm să nu îl trimiteți. Un sistem de trimitere a întregului videoclip este în lucru.\n- Vă rugăm să nu trimiteți mențiunile că videoclipul este sponsorizat care ar putea arăta favoritismul (spre exemplu dacă un videoclip de tip review este sponsorizat, nu trimiteți mențiunea că acel videoclip este sponsorizat)." - }, "statusReminder": { "message": "Verificați status.sponsor.ajay.app pentru starea serverului." }, @@ -335,9 +263,6 @@ "autoSkip": { "message": "Sari Peste Automat" }, - "showSkipNotice": { - "message": "Arată O Notificare După Ce Am Sărit Peste O Sponsorizare" - }, "keybindCurrentlySet": { "message": ". În prezent este setat:" }, @@ -374,9 +299,6 @@ "minDuration": { "message": "Durată minimă (secunde):" }, - "minDurationDescription": { - "message": "Segmentele de sponsor mai scurte decât valoarea setată nu vor fi omise sau afișate în player." - }, "shortCheck": { "message": "Următoarea înregistrare este mai mică decât opțiunea voastră de durată minimă. Acest lucru ar putea însemna că a fost deja trimisă și a fost ignorat datorită acestei opțiuni. Sunteți sigur că doriți să trimiteți?" }, @@ -404,15 +326,9 @@ "areYouSureReset": { "message": "Sunteți sigur că doriți să resetați asta?" }, - "confirmPrivacy": { - "message": "Acest videoclip a fost detectat ca nelistat. Apasă anulați dacă nu doriți să verificați sponsorii." - }, "unlistedCheck": { "message": "Ignoră Videoclipurile Nelistate/Private" }, - "whatUnlistedCheck": { - "message": "Această setare va încetini puțin SponsorBlock. Căutările segmentelor sponsorizate necesită trimiterea ID-ului videoclipului către server. Dacă sunteți îngrijorat de trimiterea ID-ul videoclipurilor nelistate, activați această opțiune." - }, "mobileUpdateInfo": { "message": "m.youtube.com este acum suportat" }, @@ -469,7 +385,7 @@ }, "to": { "message": "până la", - "description": "Used between sponsor times. Example: 1:20 to 1:30" + "description": "Used between segments. Example: 1:20 to 1:30" }, "category_sponsor": { "message": "Sponsor" @@ -489,9 +405,6 @@ "category_outro": { "message": "Ecran De Final/Credite" }, - "category_outro_description": { - "message": "Credite sau când ecranul de final YouTube apare. Nu pentru concluzii vorbite. Nu ar trebui să includă conținut util. Nu ar trebui folosit în videoclipuri muzicale." - }, "category_interaction": { "message": "Reamintire de Interactiune (Abonare)" }, @@ -587,15 +500,6 @@ "itCouldBeAdblockerIssue": { "message": "Dacă acest lucru continuă să se întample, ar putea fi cauzat de adblocker-ul dumneavoastră. Vă rugăm să verificați \nhttps://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests" }, - "forceChannelCheck": { - "message": "Forțează Verificarea Canalului Înainte De A Sări Peste Sponsorizări" - }, - "whatForceChannelCheck": { - "message": "În mod implicit, va sări peste sponsorizări chiar și înainte de a ști ce canal este. În mod implicit, s-ar putea să se sară și peste unele sponsorizări ce încep la secunda zero din canalele excluse. Activând această opțiune va preveni asta, dar va face ca toate săriturile să aibă o ușoară întârziere, deoarece obținerea Id-ului canalului poate dura ceva timp. Această întărziere poate fi neobservată daca aveți internet rapid." - }, - "forceChannelCheckPopup": { - "message": "Consideră Activarea Forțării Verificarii Canalului Înainte De A Sări Peste Sponsorizări" - }, "downvoteDescription": { "message": "Timpi Incorecți/Greșiți" }, diff --git a/public/_locales/ru/messages.json b/public/_locales/ru/messages.json index fbbcf5fd..a2a0b98d 100644 --- a/public/_locales/ru/messages.json +++ b/public/_locales/ru/messages.json @@ -3,32 +3,36 @@ "message": "SponsorBlock для YouTube - Пропускайте спонсорские вставки", "description": "Name of the extension." }, + "Description": { + "message": "Пропускайте спонсорские вставки, просьбы подписаться и другое в видео на YouTube. Отправляйте информацию о спонсорах в видео, чтобы сохранять другим время.", + "description": "Description of the extension." + }, "400": { - "message": "Сервер отклонил этот запрос." + "message": "Сервер отклонил этот запрос" }, "429": { "message": "Вы отправили слишком много спонсоров для этого видео. Вы уверены, что их так много?" }, "409": { - "message": "Этот запрос был отправлен ранее." + "message": "Этот запрос был отправлен ранее" }, "channelWhitelisted": { "message": "Канал добавлен в белый список!" }, - "Sponsor": { - "message": "спонсора" - }, - "Sponsors": { - "message": "спонсоров" - }, "Segment": { - "message": "спонсорская вставка" + "message": "вставка" }, "Segments": { - "message": "спонсорские вставки" + "message": "вставки" + }, + "upvoteButtonInfo": { + "message": "Проголосовать за эту вставку" }, "reportButtonTitle": { - "message": "Ошибка" + "message": "Сообщить об ошибке" + }, + "reportButtonInfo": { + "message": "Сообщить об ошибке в этой вставке." }, "Dismiss": { "message": "Закрыть" @@ -43,7 +47,7 @@ "message": "сек" }, "Hide": { - "message": "Не показывать" + "message": "Никогда не показывать" }, "hitGoBack": { "message": "Нажмите «Назад», чтобы вернуться обратно." @@ -61,7 +65,7 @@ "message": "Таймер остановлен" }, "confirmMSG": { - "message": "\n\nЧтобы изменить или удалить отдельные значения, нажмите кнопку «Информация» или откройте всплывающее окно расширения, щелкнув значок расширения в правом верхнем углу." + "message": "Чтобы изменить или удалить отдельные значения, нажмите кнопку «Информация» или откройте всплывающее окно расширения, щелкнув значок расширения в правом верхнем углу." }, "clearThis": { "message": "Вы уверены, что хотите удалить эту информацию?\n\n" @@ -70,19 +74,19 @@ "message": "При отправке отчета о спонсорском сегменте произошла ошибка. Попытайтесь отправить его позже." }, "sponsorFound": { - "message": "Спонсоры этого видео уже находятся в базе данных!" + "message": "Для этого видео в базе данных указаны вставки!" }, "sponsor404": { - "message": "Спонсорские вставки не найдены" + "message": "Вставок не найдено" }, "sponsorStart": { - "message": "Спонсорская вставка начинается сейчас" + "message": "Вставка начинается отсюда" }, "sponsorEnd": { - "message": "Спонсорская вставка оканчивается сейчас" + "message": "Вставка заканчивается сейчас" }, "noVideoID": { - "message": "Возможно, это не вкладка YouTube, или Вы нажали слишком рано. \n Если это вкладка YouTube,\n закройте это всплывающее окно и откройте его снова." + "message": "Видео YouTube не найдено на этой вкладке. Если вы уверены, что это вкладка YouTube, закройте это всплывающее окно и откройте его снова. Если это не поможет, перезагрузите вкладку." }, "success": { "message": "Успех!" @@ -90,23 +94,26 @@ "voted": { "message": "Голос засчитан!" }, + "serverDown": { + "message": "Кажется, сервера не работают. Незамедлительно свяжитесь с разработчиком." + }, "connectionError": { "message": "Ошибка соединения. Код ошибки: " }, "wantToSubmit": { - "message": "Вы точно хотите отправить отчёт о спонсорских вставках в видео с идентификатором" + "message": "Вы хотите отправить вставки для видео" }, "leftTimes": { - "message": "Вы ещё не отправили отчёты о некоторых спонсорских вставках. Хотите вернуться на эту страницу, чтобы отправить их (они не удаляются)." + "message": "Вы ещё не отправили информацию о некоторых вставках. Вернитесь обратно, чтобы отправить их (они не удалены)." }, "clearTimes": { - "message": "Удалить отмеченные сегменты" + "message": "Очистить вставки" }, "openPopup": { "message": "Открыть всплывающее окно SponsorBlock" }, "SubmitTimes": { - "message": "Отправить отмеченные сегменты" + "message": "Отправить вставки" }, "submitCheck": { "message": "Вы уверены, что хотите отправить эту информацию?" @@ -118,10 +125,7 @@ "message": "Удалить канал из белого списка" }, "voteOnTime": { - "message": "Проголосовать за время спонсорской вставки" - }, - "recordTimes": { - "message": "Записать время спонсорской вставки" + "message": "Проголосовать за вставку" }, "soFarUHSubmited": { "message": "На данный момент Вы отправили" @@ -136,13 +140,10 @@ "message": "здесь" }, "recordTimesDescription": { - "message": "Нажмите кнопку ниже, когда спонсорская вставка начинается и заканчивается, чтобы записать\nи отправить её в базу данных." + "message": "Нажмите кнопку ниже, когда вставка начинается и заканчивается, чтобы записать и отправить её в базу данных." }, "popupHint": { - "message": "Подсказка: нажмите ;, чтобы сообщить начало/конец спонсорской вставки, и \", чтобы отправить. (Это можно изменить в настройках)" - }, - "lastTimes": { - "message": "Последнее выбранное время спонсорской вставки" + "message": "Подсказка: нажмите на кнопку \"Ж\" во время воспроизведения, чтобы сообщить о начале/конце вставки, и \"Э\", чтобы отправить её. (Это можно изменить в настройках)" }, "clearTimesButton": { "message": "Очистить время" @@ -151,7 +152,7 @@ "message": "Отправить время" }, "publicStats": { - "message": "Оно используется на публичной странице статистики, чтобы показать Ваш вклад. Её можно посмотреть " + "message": "Это используется на публичной странице статистики, чтобы показать Ваш вклад. Её можно посмотреть" }, "setUsername": { "message": "Установить имя пользователя" @@ -172,7 +173,7 @@ "message": "Скрыть кнопки в плеере YouTube" }, "hideButtonsDescription": { - "message": "Эта настройка скрывает кнопки для отправки спонсорских вставок, которые появляются в плеере YouTube. Они могут раздражать\n некоторых. Вместо кнопок для отправки спонсорских вставок можно использовать это всплывающее окно. Чтобы скрыть\nуведомление, нажмите кнопку \"Не показывать снова\" в уведомлении. Вы всегда сможете включить эти настройки обратно." + "message": "Эта настройка скрывает кнопки для отправки вставок, которые появляются в плеере YouTube." }, "showInfoButton": { "message": "Показывать кнопку информации в плеере YouTube" @@ -192,17 +193,18 @@ "whatDeleteButton": { "message": "Эта кнопка позволяет Вам очистить все спонсорские вставки в плеере YouTube." }, - "disableViewTracking": { - "message": "Отключить отслеживание количества пропусков спонсорских вставок" - }, "enableViewTracking": { - "message": "Включить отслеживание количества пропусков спонсорских вставок" + "message": "Включить отслеживание количества пропусков вставок" }, "whatViewTracking": { - "message": "Эта возможность отслеживает, какие спонсорские вставки Вы пропустили, чтобы помочь пользователям узнать, насколько их\nвклад помог другим, и используется как метрика, чтобы убедиться, что спам не попадает в базу данных. Расширение отправляет\nсообщение на сервер каждый раз, когда Вы пропускаете спонсорскую вставку. Надеемся, большая часть пользователей не поменяет эту настройку, так что у нас будет точная статистика просмотров :)" + "message": "Эта возможность отслеживает, какие вставки Вы пропустили, чтобы помочь пользователям узнать, насколько их вклад помог другим, и, наряду с голосами, используется как метрика, чтобы убедиться, что спам не попадает в базу данных. Расширение отправляет сообщение на сервер каждый раз, когда Вы пропускаете вставку. Надеемся, большая часть пользователей не поменяет эту настройку, так что у нас будет точная статистика просмотров. :)" }, "showNotice": { - "message": "Показывать уведомление снова" + "message": "Показать уведомление снова" + }, + "longDescription": { + "message": "SponsorBlock позволяет пропускать спонсорские вставки, начальные и конечные заставки, просьбы подписать и другое в видео на YouTube. SponsorBlock — коллективное расширение, которое позволяет каждому отправить время начала и конца подобных вставок в видео. После того, как кто-нибудь отправляет эту информацию, все остальные пользователи расширения будут автоматически пропускать эти вставки. Так же можно пропускать части клипов без музыки.", + "description": "Full description of the extension on the store pages." }, "website": { "message": "Сайт", @@ -221,7 +223,7 @@ "description": "The second line of the message displayed after the notice was upgraded." }, "setStartSponsorShortcut": { - "message": "Назначить горячую клавишу для начала спонсорской вставки" + "message": "Назначить горячую клавишу для начала вставки" }, "setSubmitKeybind": { "message": "Назначить горячую клавишу для отправки" @@ -263,14 +265,17 @@ "enableAutoSkip": { "message": "Включить автоматический пропуск" }, - "autoSkipDescription": { - "message": "Автоматический пропуск будет пропускать спонсорские вставки за Вас. Если выключено, будет показываться уведомление с предложением пропустить." - }, "audioNotification": { "message": "Аудио уведомление при пропуске" }, "audioNotificationDescription": { - "message": "Аудио уведомление о пропуске будет воспроизводиться каждый раз, когда спонсор пропущен. Если отключено (или автоматическое пропуск отключен), звук не будет воспроизводиться." + "message": "Аудио уведомление о пропуске будет воспроизводиться каждый раз, когда вставка пропущена. Если отключено (или автоматический пропуск отключён), звук не будет воспроизводиться." + }, + "showTimeWithSkips": { + "message": "Показывать длительность без вставок" + }, + "showTimeWithSkipsDescription": { + "message": "Эта длительность отображается в скобках рядом с фактической под полосой прокрутки. Показывает длительность видео без вставок. Включает вставки, для которых выбрано \"Отображать в полосе прокрутки\"." }, "youHaveSkipped": { "message": "Вы пропустили " @@ -296,9 +301,6 @@ "youHaveSavedTimeEnd": { "message": " их жизней." }, - "guildlinesSummary": { - "message": "- Убедитесь, что Ваш сегмент содержит только платную интеграцию, и больше ничего.\n- Убедитесь, что пропуск этого сегмента не пропустит никакой ценный контент\n- Если всё видео целиком спонсорское, пожалуйста, не сообщайте о нём. Система для сообщения о целых видео скоро выйдет.\n- Пожалуйста, не сообщайте об отказах от ответственности, которые могут показать предвзятость (если видео с обзором проплачено, не пропускайте, когда они это упоминают)." - }, "statusReminder": { "message": "Смотрите состояние сервера на status.sponsor.ajay.app." }, @@ -321,7 +323,7 @@ "message": "Автоматический пропуск" }, "showSkipNotice": { - "message": "Показывать уведомление после пропуска спонсорской вставки" + "message": "Показывать уведомление после пропуска вставки" }, "keybindCurrentlySet": { "message": ". Он сейчас назначен на:" @@ -360,7 +362,7 @@ "message": "Минимальная длительность (секунд):" }, "minDurationDescription": { - "message": "Спонсорские сегменты короче этого значения не будут пропускаться и не будут показаны в плеере." + "message": "Вставки короче этого значения не будут пропускаться и не будут показаны в плеере." }, "shortCheck": { "message": "Следующий диапазон времени короче, чем Ваша настройка минимальной длительности. Это может означать, что он уже был отправлен, и просто игнорируется из-за этой настройки. Вы действительно хотите отправить?" @@ -390,13 +392,13 @@ "message": "Вы действительно хотите это сбросить?" }, "confirmPrivacy": { - "message": "Было обнаружено, что это видео непубличное. Нажмите \"отмена\", если не хотите проверять его на спонсоров." + "message": "Было обнаружено, что это видео - с доступом по ссылке. Нажмите \"отмена\", если не хотите проверять для него вставки." }, "unlistedCheck": { "message": "Игнорировать непубличные видео" }, "whatUnlistedCheck": { - "message": "Эта настройка значительно замедлит SponsorBlock. Поиск спонсоров требует отправки идентификатора видео на сервер. Если Вас беспокоит отправка идентификаторов непубличных видео по интернету, включите эту настройку." + "message": "Эта настройка незначительно замедлит SponsorBlock. Поиск вставко требует отправки идентификатора видео на сервер. Если Вас беспокоит отправка идентификаторов скрытых видео по интернету, включите эту настройку." }, "mobileUpdateInfo": { "message": "m.youtube.com теперь поддерживается" @@ -407,6 +409,18 @@ "whatExportOptions": { "message": "Это вся конфигурация в формате JSON. Этот файл содержит Ваш идентификатор пользователя, поэтому не забудьте общаться с этим разумно." }, + "setOptions": { + "message": "Параметры установки" + }, + "exportOptionsWarning": { + "message": "Внимание: изменение настроек необратимо и может сломать расширение. Вы действительно хотите это сделать? Сделайте резервную копию на всякий случай." + }, + "incorrectlyFormattedOptions": { + "message": "JSON-файл некорректно отформатирован. Ваши настройки не были изменены." + }, + "confirmNoticeTitle": { + "message": "Отправить вставку" + }, "submit": { "message": "Отправить" }, @@ -425,16 +439,179 @@ "copyDebugInformation": { "message": "Скопировать отладочную информацию в буфер обмена" }, + "copyDebugInformationFailed": { + "message": "Не удалось скопировать в буфер" + }, + "copyDebugInformationOptions": { + "message": "Копирует информацию в буфер обмена, которая будет предоставлена разработчику при возникновении ошибки / по запросу разработчика. Такие сведения, как ID пользователя, список разрешенных каналов и адрес пользовательского сервера не передаются. Однако, отправляются ваш user agent, браузер, операционная система и номер версии расширения. " + }, + "copyDebugInformationComplete": { + "message": "Отладочная информация скопирована в буфер обмена. Вы можете удалить любую информацию, которой не хотите делиться. Сохраните ее в текстовом файле или вставьте в отчет об ошибке." + }, + "theKey": { + "message": "Клавиша" + }, + "keyAlreadyUsed": { + "message": "привязана к другому действию. Пожалуйста, выберите другую клавишу." + }, + "to": { + "message": "до", + "description": "Used between segments. Example: 1:20 to 1:30" + }, + "category_sponsor": { + "message": "Спонсор" + }, + "category_sponsor_description": { + "message": "Рекламные интеграции, реферальные ссылки и реклама напрямую. Не для саморекламы или рекомендациях разных событий/создателей/сайтов/продуктов, которые нравится автору видео." + }, + "category_intro": { + "message": "Пауза/заставка" + }, + "category_intro_description": { + "message": "Интервал без реального содержимого. Может быть паузой, статическим кадром, повторяющейся анимацией. Это не должно использоваться для переходов, содержащих информацию или используемых в музыкальных видео." + }, + "category_intro_short": { + "message": "Пауза" + }, + "category_outro": { + "message": "Конечная заставка/титры" + }, + "category_outro_description": { + "message": "Титры или вставки, содержащие конечные заставки YouTube. Не для частей видео с подытоживанием информации. Это не должно использоваться в музыкальных видео." + }, + "category_interaction": { + "message": "Напоминание о взаимодействии (подписка)" + }, + "category_interaction_description": { + "message": "Когда есть краткое напоминание поставить лайк, подписаться на канал или в соцсетях в середине содержимого. Если эта вставка длительная и о чём-то конкретном, она должна классифицироваться как самореклама." + }, + "category_interaction_short": { + "message": "Напоминание о взаимодействии" + }, + "category_selfpromo": { + "message": "Самореклама/рекомендация" + }, + "category_selfpromo_description": { + "message": "Похоже на \"Спонсора\", но для бесплатной рекламы и саморекламы. Включает себя вставки про мерчендайз, пожертвования или информацию о тех, вместе с кем было сделано видео." + }, + "category_music_offtopic": { + "message": "Музыка: Вставка без музыки" + }, + "category_music_offtopic_description": { + "message": "Только для использования в музыкальных клипах. Включает в себя начальные и конечные заставки клипов." + }, + "category_music_offtopic_short": { + "message": "Без музыки" + }, + "category_livestream_messages": { + "message": "Прямые трансляции: пожертвование/чтение сообщения" + }, + "category_livestream_messages_short": { + "message": "Чтение сообщений" + }, + "disable": { + "message": "Отключить" + }, + "manualSkip": { + "message": "Пропускать вручную" + }, + "showOverlay": { + "message": "Показывать в полосе прокрутки" + }, + "colorFormatIncorrect": { + "message": "Вы ввели неправильный параметр для цвета. Это должно быть 3-х или 6-тизначное шестнадцатеричное число с символом # в начале." + }, + "previewColor": { + "message": "Предпросмотр цвета", + "description": "Referring to submissions that have not been sent to the server yet." + }, + "seekBarColor": { + "message": "Цвет в полосе прокрутки" + }, + "category": { + "message": "Категория" + }, + "skipOption": { + "message": "Способ пропуска", + "description": "Used on the options page to describe the ways to skip the segment (auto skip, manual, etc.)" + }, + "enableTestingServer": { + "message": "Включить сервера для бета-тестов" + }, + "whatEnableTestingServer": { + "message": "Отправленные вами вставки и голоса НЕ БУДУТ ОТПРАВЛЕНЫ на главный сервер. Используйте только для тестирования." + }, + "testingServerWarning": { + "message": "Все отправленные вами вставки и голоса НЕ БУДУТ ОТПРАВЛЕНЫ на главный сервер, пока вы подключены к серверу для тестов. Не забудьте отключить эту настройку, чтобы вновь отправлять на главный сервер." + }, "bracketNow": { "message": "(Сейчас)" }, "moreCategories": { "message": "Прочие категории" }, + "chooseACategory": { + "message": "Выберите категорию" + }, + "youMustSelectACategory": { + "message": "Вы должны выбрать категорию для всех вставок, которые вы отправляете!" + }, "bracketEnd": { "message": "(Конец)" }, + "hiddenDueToDownvote": { + "message": "скрыто: проголосовали против" + }, + "hiddenDueToDuration": { + "message": "скрыто: слишком коротко" + }, + "channelDataNotFound": { + "message": "ID канала еще не загружен." + }, + "adblockerIssue": { + "message": "Кажется, что-то блокирует возможность SponsorBlock'а получать видеоданные. Возможно, это ваш блокировщик рекламы. Пожалуйста, перейдите на https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocker-Blocking-SponsorBlock's-Requests" + }, + "itCouldBeAdblockerIssue": { + "message": "Если это сообщения появляется слишком часто, это может быть вызвано вашим блокировщиком рекламы. Пожалуйста, перейдите на https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests" + }, + "forceChannelCheck": { + "message": "Принудительная проверка каналов перед пропуском" + }, + "whatForceChannelCheck": { + "message": "По умолчанию расширение пропускает вставки сразу же, не проверяя то, какой это канал. По умолчанию некоторые вставки в начале видео могут быть пропущены на каналах из белого списка. Включение этой опции предотвратит это, но все пропуски будут иметь небольшую задержку, так как получение ID канала может занять некоторое время. Эта задержка может быть незаметной, если у вас быстрый интернет." + }, + "forceChannelCheckPopup": { + "message": "Рекомендуем включить \"Принудительная проверка каналов перед пропуском\"" + }, + "downvoteDescription": { + "message": "Неверно указано время" + }, "incorrectCategory": { "message": "Неверная категория" + }, + "nonMusicCategoryOnMusic": { + "message": "Это видео классифицировано как музыка. Вы уверены, что хотите отправить вставки из немузыкальных категорий? Если это видео на самом деле является музыкальным клипом, вы не должны отправлять эту вставку. Пожалуйста, ознакомьтесь с рекомендациями, если Вы запутались." + }, + "multipleSegments": { + "message": "Несколько вставок" + }, + "guidelines": { + "message": "Руководство" + }, + "readTheGuidelines": { + "message": "Прочитайте руководство!!", + "description": "Show the first time they submit or if they are \"high risk\"" + }, + "categoryUpdate1": { + "message": "Приветствуйте категории!" + }, + "categoryUpdate2": { + "message": "Откройте настройки, чтобы пропускать начальные и конечные заставки, саморекламу и другое." + }, + "unsubmittedWarning": { + "message": "Уведомления о неотправленных вставках" + }, + "unsubmittedWarningDescription": { + "message": "Отправлять уведомление, когда вы уходите со страницы видео, вставки к которым Вы не загрузили" } } diff --git a/public/_locales/sk/messages.json b/public/_locales/sk/messages.json index 940e07fc..4220a3de 100644 --- a/public/_locales/sk/messages.json +++ b/public/_locales/sk/messages.json @@ -1,10 +1,4 @@ { - "Sponsor": { - "message": "sponzor" - }, - "Sponsors": { - "message": "sponzori" - }, "reportButtonTitle": { "message": "Nahlásiť" }, @@ -112,7 +106,7 @@ }, "to": { "message": "pre", - "description": "Used between sponsor times. Example: 1:20 to 1:30" + "description": "Used between segments. Example: 1:20 to 1:30" }, "category_sponsor": { "message": "Sponzor" diff --git a/public/_locales/sv/messages.json b/public/_locales/sv/messages.json index 85ec2950..63408c2e 100644 --- a/public/_locales/sv/messages.json +++ b/public/_locales/sv/messages.json @@ -15,18 +15,6 @@ "channelWhitelisted": { "message": "Kanal vitlistad!" }, - "Sponsor": { - "message": "sponsor" - }, - "Sponsors": { - "message": "sponsorer" - }, - "Segment": { - "message": "sponsorsegment" - }, - "Segments": { - "message": "sponsorsegment" - }, "reportButtonTitle": { "message": "Rapportera" }, @@ -72,18 +60,6 @@ "Unknown": { "message": "Ett fel uppstod vid rapportering av sponsorsegment, försök igen senare." }, - "sponsorFound": { - "message": "Den här videons sponsormeddelande finns i databasen!" - }, - "sponsor404": { - "message": "Inga sponsormeddelanden hittades" - }, - "sponsorStart": { - "message": "Sponsormeddelandet Börjar Nu" - }, - "sponsorEnd": { - "message": "Sponsormeddelandet Slutar Nu" - }, "noVideoID": { "message": "Kunde inte hitta någon YouTube-video i denna tab. Om du är säker på att detta är en Youtube-flik, stäng den här rutan och öppna den igen. Ladda om fliken om inte det funkar." }, @@ -99,21 +75,9 @@ "connectionError": { "message": "Anslutningsfel. Felkod: " }, - "wantToSubmit": { - "message": "Vill du rapportera sponsortiderna för video id" - }, - "leftTimes": { - "message": "Du har lämnat några sponsortider orapporterade. Gå tillbaka till den sidan för att rapportera dem (de är inte borttagna)." - }, - "clearTimes": { - "message": "Rensa Sponsortider" - }, "openPopup": { "message": "Öppna SponsorBlock Popup" }, - "SubmitTimes": { - "message": "Rapportera Sponsortider" - }, "submitCheck": { "message": "Är du säker på att du vill rapportera detta?" }, @@ -123,12 +87,6 @@ "removeFromWhitelist": { "message": "Ta bort kanal från vitlistan" }, - "voteOnTime": { - "message": "Rösta på en sponsortid" - }, - "recordTimes": { - "message": "Spela in sponsortider" - }, "soFarUHSubmited": { "message": "Hitills har du rapporterat" }, @@ -141,15 +99,6 @@ "here": { "message": "här" }, - "recordTimesDescription": { - "message": "Klicka på knappen nedan när sponsormeddelandet börjar och slutar för att spela in och rapportera till databasen." - }, - "popupHint": { - "message": "Tips: Tryck på semikolon när fokus är på en video för att markera början/slutet av ett sponsormeddelande och citattecken för att rapportera till databasen. (Kan ändras under inställningar)" - }, - "lastTimes": { - "message": "Senaste Sponsortiderna Valda." - }, "clearTimesButton": { "message": "Rensa Tider" }, @@ -198,15 +147,6 @@ "whatDeleteButton": { "message": "Denna knappen tar bort alla sponsormeddelanden på YouTube-spelaren." }, - "disableViewTracking": { - "message": "Avaktivera Räkning Av Undvikta Sponsormeddelanden" - }, - "enableViewTracking": { - "message": "Aktivera Räkning Av Undvikta Sponsormeddelanden" - }, - "whatViewTracking": { - "message": "Den här funktionen håller koll på vilka sponsormeddelanden du har hoppat över för att uppskatta hur mycket tid en användare har sparat andra och används tillsammans med röster för att se till att spam inte läggs i databasen. Detta tillägg skickar ett meddelande till servern varje gång du hoppar över ett sponsormeddelande. Förhoppningsvis ändrar inte folk den här inställningen så statistiken hålls tillförlitlig. :)" - }, "showNotice": { "message": "Visa Notisen Igen" }, @@ -226,9 +166,6 @@ "message": "Om du ändå inte gillar det, tryck på \"Visa aldrig\"-knappen.", "description": "The second line of the message displayed after the notice was upgraded." }, - "setStartSponsorShortcut": { - "message": "Välj knapp att koppla till start av sponsormeddelande" - }, "setSubmitKeybind": { "message": "Välj knapp att koppla till rapportering av sponsormeddelande" }, @@ -269,15 +206,9 @@ "enableAutoSkip": { "message": "Aktivera Hoppa Över Automatiskt" }, - "autoSkipDescription": { - "message": "Hoppa Över Automatiskt undviker att spela upp sponsormeddelanden för dig. Ifall det är avaktiverat dyker en notis upp som frågar om du vill hoppa över." - }, "audioNotification": { "message": "Ljudeffekt vid hopp" }, - "audioNotificationDescription": { - "message": "Ljudeffekt vid hopp spelar upp en ljudeffekt när du hoppar över ett sponsormeddelande. Ifall det är avaktiverat (eller hoppa över automatiskt är avaktiverat), kommer inget ljud att spelas upp." - }, "youHaveSkipped": { "message": "Du har hoppat över " }, @@ -302,9 +233,6 @@ "youHaveSavedTimeEnd": { "message": " av deras liv." }, - "guildlinesSummary": { - "message": "- Se till att ditt sponsorsegment bara innehåller betald marknadsföring, inget annat.\n- Se till att inget värdefullt innehåll missas genom att hoppa över ditt sponsorsegment\n- Rapportera inte en video ifall hela videon är ett sponsormeddelande. Ett rapporteringssystem för hela videor kommer snart.\n- Se till att inte hoppa över delar som uppmärksammar partiskhet (om en recensionsvideo är sponsrad, hoppa inte över delen av videon där det nämns)." - }, "statusReminder": { "message": "Gå till status.sponsor.ajay.app för serverstatus." }, @@ -326,9 +254,6 @@ "autoSkip": { "message": "Hoppa Över Automatiskt" }, - "showSkipNotice": { - "message": "Visa Notis Efter Sponsormeddelande Har Hoppats Över" - }, "keybindCurrentlySet": { "message": ". Är just nu kopplat till:" }, @@ -365,9 +290,6 @@ "minDuration": { "message": "Minsta varaktighet (sekunder):" }, - "minDurationDescription": { - "message": "Sponsorsegment som är kortare än det satta minstavärdet kommer inte att hoppas över eller visas i spelaren." - }, "shortCheck": { "message": "Följande rapport är kortare än ditt minstavärde i inställningarna. Det skulle kunna betyda att det redan är rapporterat och bara ignorerat på grund av denna inställning. Är du säker på att du vill rapportera?" }, @@ -395,15 +317,9 @@ "areYouSureReset": { "message": "Är du säker på att du vill rensa?" }, - "confirmPrivacy": { - "message": "Videon ser ut att vara olistad. Tryck på avbryt om du inte vill kolla efter sponsorer." - }, "unlistedCheck": { "message": "Ignorera Olistade Videor" }, - "whatUnlistedCheck": { - "message": "Denna inställning kommer göra SponsorBlock märkbart långsammare. Uppslag av sponsormeddelanden kräver att video-ID skickas till servern. Om du är bekymrad över att olistade video-IDn skickas över internet, aktivera denna inställning." - }, "mobileUpdateInfo": { "message": "m.youtube.com stöds nu" }, @@ -460,7 +376,7 @@ }, "to": { "message": "till", - "description": "Used between sponsor times. Example: 1:20 to 1:30" + "description": "Used between segments. Example: 1:20 to 1:30" }, "category_sponsor": { "message": "Sponsormeddelande" diff --git a/public/_locales/tr/messages.json b/public/_locales/tr/messages.json index dc996479..4018fa39 100644 --- a/public/_locales/tr/messages.json +++ b/public/_locales/tr/messages.json @@ -15,18 +15,6 @@ "channelWhitelisted": { "message": "Kanal beyazlistede!" }, - "Sponsor": { - "message": "sponsor" - }, - "Sponsors": { - "message": "sponsorlar" - }, - "Segment": { - "message": "sponsor bölümü" - }, - "Segments": { - "message": "sponsor bölümleri" - }, "upvoteButtonInfo": { "message": "Bu öneriye oy ver" }, @@ -75,18 +63,6 @@ "Unknown": { "message": "Sponsor sürelerini yollarken bir sorun oluştur, lütfen tekrar deneyin." }, - "sponsorFound": { - "message": "Bu videonun sponsorları veritabanında mevcut!" - }, - "sponsor404": { - "message": "Sponsor bulunamadı" - }, - "sponsorStart": { - "message": "Sponsorluk Şimdi Başlıyor" - }, - "sponsorEnd": { - "message": "Sponsorluk Şimdi Bitiyor" - }, "noVideoID": { "message": "Bu sekmede YouTube videosu bulunamadı. Bu sekmenin bir YouTube sekmesi olduğundan eminseniz, bu pencereyi kapatıp, tekrar açın. Eğer o da işe yaramazsa, sekmeyi yenilemeyi deneyin." }, @@ -102,21 +78,9 @@ "connectionError": { "message": "Bağlantı hatası oluştu. Hata kodu: " }, - "wantToSubmit": { - "message": "Bu video için sponsor sürelerini göndermek istiyor musunuz" - }, - "leftTimes": { - "message": "Bazı sponsor sürelerini göndermediğinizi görüyoruz. Göndermek için sayfaya geri dönebilirsiniz (hala mevcutlar)." - }, - "clearTimes": { - "message": "Sponsor Sürelerini Temizle" - }, "openPopup": { "message": "SponsorBlock Penceresini Aç" }, - "SubmitTimes": { - "message": "Sponsor Sürelerini Gönder" - }, "submitCheck": { "message": "Bunu göndermek istediğinize emin misiniz?" }, @@ -126,12 +90,6 @@ "removeFromWhitelist": { "message": "Kanalı Beyazlisteden Kaldır" }, - "voteOnTime": { - "message": "Sponsor Süresi için Oy Kullan" - }, - "recordTimes": { - "message": "Sponsor Süresini Kaydet" - }, "soFarUHSubmited": { "message": "Şu an kadar yolladığınız" }, @@ -144,15 +102,6 @@ "here": { "message": "burada" }, - "recordTimesDescription": { - "message": "Kaydetmek ve veritabanına yollamak için sponsorluk başladığında ve bittiğinde aşağıdaki butona tıklayın." - }, - "popupHint": { - "message": "İpuçu: Sponsorluk süresinin başını ve sonunu raporlamak için video üzerindeyken noktalı virgül tuşuna, yollamak için tırnak tuşuna basınız. (Bu ayarlardan değiştirilebilir.)" - }, - "lastTimes": { - "message": "Son Sponsor Mesajı Süresi Seçildi" - }, "clearTimesButton": { "message": "Süreleri Temizle" }, @@ -201,15 +150,6 @@ "whatDeleteButton": { "message": "Bu, YouTube oynatıcısındaki mevcut video için gönderilmemiş bölümleri temizleyen butondur." }, - "disableViewTracking": { - "message": "Sponsor Atlama Takip Sayacını Devredışı Bırak" - }, - "enableViewTracking": { - "message": "Sponsor Atlama Takip Sayacını Devreye Sok" - }, - "whatViewTracking": { - "message": "Bu özellik, önerinizin diğerlerine ne kadar işe yaradığını bildirmek için atladığınız sponsorları kaydeder ve istenmeyen önerilerin veritabanına girmesini engellemek adına bir ölçü olarak kullanılır. Her sponsor atladığınızda eklenti sunucuya bir mesaj yollar. Umarım bu ayarı birçok kişi değiştirmez ve böylece görüntülenme sayıları doğru kalır. :)" - }, "showNotice": { "message": "Uyarıyı Tekrar Göster" }, @@ -229,9 +169,6 @@ "message": "Eğer hala beğenmediyseniz, asla gösterme butonuna basın.", "description": "The second line of the message displayed after the notice was upgraded." }, - "setStartSponsorShortcut": { - "message": "Sponsor bölümünün başlangıcı için bir tuş belirleyin" - }, "setSubmitKeybind": { "message": "Gönderim için bir tuş belirleyin" }, @@ -272,15 +209,9 @@ "enableAutoSkip": { "message": "Otomatik Atlamayı Devreye Sok" }, - "autoSkipDescription": { - "message": "Otomatik atlama sponsorları sizin için atlayacak. Kapalı olduğunda, atlamak istediğinizi soran bir uyarı ekranı belirecek." - }, "audioNotification": { "message": "Atlamada Sesli Bildirim" }, - "audioNotificationDescription": { - "message": "Atlamada sesli bildirim, bir sponsor bölümü atlandığında bir ses çalar. Eğer devredışı bırakıldıysa (veya otomatik atlama devredışı bırakıldıysa), herhangi bir ses çalmayacak." - }, "youHaveSkipped": { "message": "Bunu atladınız " }, @@ -305,9 +236,6 @@ "youHaveSavedTimeEnd": { "message": " kadar vaktini kurtardınız." }, - "guildlinesSummary": { - "message": "- Bölümünüzün sadece ücretli tanıtım bölümü olduğundan emin olun.\n- Bu bölümü atlamanın önemli içerik bölümlerini de atlamayacağından emin olun. \n- Eğer tüm bölüm sponsor ise, lütfen raporlamayın. Tüm video rapor sistemimiz yakında gelecek.\n- Eğer videoda taraflılık içeren bir uyarı var raporlamayın (Eğer bir inceleme videosu sponsorluysa, bundan bahsettikleri kısmı atlatmayın)." - }, "statusReminder": { "message": "Sunucu durumu için status.sponsor.ajay.app kontrol edin." }, @@ -329,9 +257,6 @@ "autoSkip": { "message": "Otomatik Atla" }, - "showSkipNotice": { - "message": "Sponsor Atladıktan Sonra Uyarı Göster" - }, "keybindCurrentlySet": { "message": ". Şu an buna ayarlı:" }, @@ -368,9 +293,6 @@ "minDuration": { "message": "Minimum süre (saniye):" }, - "minDurationDescription": { - "message": "Belirlenen değerden kısa olan sponsor bölümleri atlanmayacak veya oynatıcıda gözükmeyecektir." - }, "shortCheck": { "message": "Sıradaki öneri belirlediğiniz minimum süre ayarından daha kısa. Bu zaten yollandığı ve bu ayardan dolayı yok sayıldığı anlamına gelebilir. Göndermek istediğinizden emin misiniz?" }, @@ -398,15 +320,9 @@ "areYouSureReset": { "message": "Bunu sıfırlamak istediğinize emin misiniz?" }, - "confirmPrivacy": { - "message": "Bu videonun listede olmadığı belirlendi. Bu videoyu sponsorlar için kontrol etmek istemiyorsanız iptale basınız." - }, "unlistedCheck": { "message": "Listedışı/Özel Videoları Görmezden Gel" }, - "whatUnlistedCheck": { - "message": "Bu ayar SponsorBlock eklentisini az miktarda yavaşlatacaktır. Sponsor kontrolleri, sunucuya video kimlik numarası göndermeyi gerektirir. Eğer listedışı videoların, video kimlik numaralarının internet üzerinden gönderilmesini istemiyorsanız bu seçeneği aktive edin." - }, "mobileUpdateInfo": { "message": "m.youtube.com şu an desteklenmektedir" }, @@ -463,7 +379,7 @@ }, "to": { "message": "'e", - "description": "Used between sponsor times. Example: 1:20 to 1:30" + "description": "Used between segments. Example: 1:20 to 1:30" }, "category_sponsor": { "message": "Sponsor" @@ -539,15 +455,6 @@ "itCouldBeAdblockerIssue": { "message": "Bunu sürekli yaşıyorsanız, reklam engelleyiciniz tarafından gerçekleşiyor olabilir. https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests adresini kontrol edin." }, - "forceChannelCheck": { - "message": "Sponsorları Atlamadan Önce Kanal Kontrolünü Zorla" - }, - "whatForceChannelCheck": { - "message": "Varsayılan olarak, eklenti kanalın ne olduğunu bilmeden önce sponsorları atlayacaktır. Varsayılan olarak, beyaz listede olan kanallarda sıfır saniyelik sponsor bölümleri atlanacaktır. Bu ayarı aktifleştirmek bunu engelleyecektir ancak kanal kimlik bilgisini almak biraz vakit alacağından atlamalarda gecikmeler yaratabilir. Eğer hızlı bir internetiniz varsa bu gecikmeler farkedilmeyebilir." - }, - "forceChannelCheckPopup": { - "message": "Sponsorları Atlamadan Önce Kanal Kontrolünü Zorlamayı Gözden Geçir" - }, "downvoteDescription": { "message": "Hatalı/Yanlış Zaman" }, diff --git a/public/_locales/uk/messages.json b/public/_locales/uk/messages.json index 2d80e8f8..d32cb0bc 100644 --- a/public/_locales/uk/messages.json +++ b/public/_locales/uk/messages.json @@ -15,18 +15,6 @@ "channelWhitelisted": { "message": "Канал доданий у білий список!" }, - "Sponsor": { - "message": "спонсори" - }, - "Sponsors": { - "message": "спонсорів" - }, - "Segment": { - "message": "спонсорська вставка" - }, - "Segments": { - "message": "спонсорські вставки" - }, "reportButtonTitle": { "message": "Помилка" }, @@ -66,18 +54,6 @@ "Unknown": { "message": "При надсиланні звіту про спонсорський сегмент сталася помилка. Спробуйте надіслати його пізніше." }, - "sponsorFound": { - "message": "Спонсори цього відео вже знаходяться в базі даних!" - }, - "sponsor404": { - "message": "Спонсорські вставки не знайдені" - }, - "sponsorStart": { - "message": "Спонсорська вставка починається зараз" - }, - "sponsorEnd": { - "message": "Спонсорська вставка закінчується зараз" - }, "noVideoID": { "message": "Можливо, це не вкладка YouTube, або Ви натиснули занадто рано.\n Якщо це вкладка YouTube,\n закрийте це спливаюче вікно і відкрийте його знову." }, @@ -90,21 +66,9 @@ "connectionError": { "message": "Помилка з'єднання. Код помилки: " }, - "wantToSubmit": { - "message": "Ви точно хочете надіслати звіт про спонсорські вставки у відео з ідентифікатором" - }, - "leftTimes": { - "message": "Ви ще не надіслали звіти про деякі спонсорські вставки. Хочете повернутися на цю сторінку, щоб надіслати їх (вони не видаляються)." - }, - "clearTimes": { - "message": "Видалити відмічені сегменти" - }, "openPopup": { "message": "Відкрийте спливаюче вікно SponsorBlock" }, - "SubmitTimes": { - "message": "Надіслати відмічені сегменти" - }, "submitCheck": { "message": "Ви впевнені, що хочете надіслати цю інформацію?" }, @@ -114,12 +78,6 @@ "removeFromWhitelist": { "message": "Видалити канал з білого списку" }, - "voteOnTime": { - "message": "Проголосувати за час спонсорської вставки" - }, - "recordTimes": { - "message": "Записати час спонсорської вставки" - }, "soFarUHSubmited": { "message": "На даний момент Ви надіслали" }, @@ -132,15 +90,6 @@ "here": { "message": "тут" }, - "recordTimesDescription": { - "message": "Натисніть кнопку нижче, коли спонсорська вставка починається і закінчується, щоб записати\nі надіслати її в базу даних." - }, - "popupHint": { - "message": "Підказка: Натисніть клавішу крапки з комою, щоб повідомити початок/кінець спонсорської вставки і пропозицію для надсилання. (Це можна змінити в налаштуваннях)" - }, - "lastTimes": { - "message": "Останній обраний час спонсорської вставки" - }, "clearTimesButton": { "message": "Очистити час" }, @@ -189,15 +138,6 @@ "whatDeleteButton": { "message": "Ця кнопка дозволяє очистити всі спонсорські вставки в плеєрі YouTube." }, - "disableViewTracking": { - "message": "Вимкнути відстеження кількості пропусків спонсорських вставок" - }, - "enableViewTracking": { - "message": "Увімкнути відстеження кількості пропусків спонсорських вставок" - }, - "whatViewTracking": { - "message": "Ця можливість відстежує, які спонсорські вставки Ви пропустили, щоб допомогти користувачам дізнатися, наскільки їхвнесок допоміг іншим, і використовується як метрика, щоб переконатися, що спам не потрапляє у базу даних. Розширення відправляє повідомлення на сервер кожен раз, коли Ви пропускаєте спонсорську вставку. Сподіваємося, велика частина користувачів не поміняє це налаштування, так що у нас буде точна статистика переглядів :)" - }, "showNotice": { "message": "Показувати сповіщення знову" }, @@ -217,9 +157,6 @@ "message": "Якщо воно Вам все одно не подобається, натисніть «не показувати\".", "description": "The second line of the message displayed after the notice was upgraded." }, - "setStartSponsorShortcut": { - "message": "Призначити гарячу клавішу для початку спонсорської вставки" - }, "setSubmitKeybind": { "message": "Призначити гарячу клавішу для надсилання" }, @@ -260,15 +197,9 @@ "enableAutoSkip": { "message": "Увімкнути автоматичний пропуск" }, - "autoSkipDescription": { - "message": "Автоматичний пропуск буде пропускати спонсорські вставки за Вас. Якщо вимкнено, буде показуватися повідомлення з пропозицією пропустити." - }, "audioNotification": { "message": "Аудіо сповіщення при пропуску" }, - "audioNotificationDescription": { - "message": "Аудіо сповіщення про пропуск буде відтворюватися кожен раз, коли спонсор пропущений. Якщо відключено (або автоматичне пропуск відключений), звук не буде відтворюватися." - }, "youHaveSkipped": { "message": "Ви пропустили " }, @@ -293,9 +224,6 @@ "youHaveSavedTimeEnd": { "message": " їх життя." }, - "guildlinesSummary": { - "message": "- Переконайтеся, що Ваш сегмент містить тільки платну інтеграцію, і більше нічого.\n- Переконайтеся, що пропуск цього сегмента не пропустить жодного цінного контенту\n- Якщо все відео цілком спонсорське, будь ласка, не повідомляйте про нього. Система для повідомлення про цілі відео скоро вийде.\n- Будь ласка, не повідомляйте про відмови від відповідальності, які можуть показати упередженість (якщо відео з оглядом проплачено, не пропускайте, коли вони це згадують)." - }, "statusReminder": { "message": "Дивіться стан сервера на status.sponsor.ajay.app." }, @@ -317,9 +245,6 @@ "autoSkip": { "message": "Автоматичний пропуск" }, - "showSkipNotice": { - "message": "Показувати сповіщення після пропуску спонсорської вставки" - }, "keybindCurrentlySet": { "message": ". Він зараз призначений на:" }, @@ -356,9 +281,6 @@ "minDuration": { "message": "Мінімальна тривалість (секунд):" }, - "minDurationDescription": { - "message": "Спонсорські сегменти коротше цього значення не будуть пропускатися і не будуть показані в плеєрі." - }, "shortCheck": { "message": "Наступний діапазон часу коротше, ніж Ваше налаштування мінімальної тривалості. Це може означати, що він вже був надісланий, і просто ігнорується через це налаштування. Ви дійсно хочете надіслати?" }, @@ -386,15 +308,9 @@ "areYouSureReset": { "message": "Ви дійсно хочете це скинути?" }, - "confirmPrivacy": { - "message": "Було виявлено, що це відео непублічна. Натисніть \"скасування\", якщо не хочете перевіряти його на спонсорів." - }, "unlistedCheck": { "message": "Ігнорувати непублічні відео" }, - "whatUnlistedCheck": { - "message": "Це налаштування значно сповільнить SponsorBlock. Пошук спонсорів вимагає надсилання ідентифікатора відео на сервер. Якщо Вас турбує відправка ідентифікаторів непублічних відео по інтернету, увімкніть це налаштування." - }, "mobileUpdateInfo": { "message": "m.youtube.com тепер підтримується" }, diff --git a/public/_locales/zh_CN/messages.json b/public/_locales/zh_CN/messages.json index f254244a..7f1ef442 100644 --- a/public/_locales/zh_CN/messages.json +++ b/public/_locales/zh_CN/messages.json @@ -15,18 +15,6 @@ "channelWhitelisted": { "message": "频道已加入白名单！" }, - "Sponsor": { - "message": "赞助商广告" - }, - "Sponsors": { - "message": "赞助商广告" - }, - "Segment": { - "message": "赞助商广告片段" - }, - "Segments": { - "message": "赞助商广告片段" - }, "upvoteButtonInfo": { "message": "为这个提交点赞" }, @@ -75,18 +63,6 @@ "Unknown": { "message": "提交您的赞助商广告时间时出错。请稍后再试。" }, - "sponsorFound": { - "message": "此视频的赞助商广告在数据库中！" - }, - "sponsor404": { - "message": "未找到赞助商广告" - }, - "sponsorStart": { - "message": "赞助商广告现在开始" - }, - "sponsorEnd": { - "message": "赞助商广告现在结束" - }, "noVideoID": { "message": "在此标签页未找到 Youtube 视频。如果您确定这是一个 Youtube 页面，请关闭此弹窗并重新打开。如果那没用，请尝试重新加载页面。" }, @@ -102,21 +78,9 @@ "connectionError": { "message": "连接错误。错误代码： " }, - "wantToSubmit": { - "message": "您想要为此视频提交赞助商广告时间吗" - }, - "leftTimes": { - "message": "您似乎还有一些赞助商广告时间未提交。请回到那个页面提交它们（它们未被删除）。" - }, - "clearTimes": { - "message": "清除赞助商广告时间" - }, "openPopup": { "message": "打开 SponsorBlock 弹窗" }, - "SubmitTimes": { - "message": "提交赞助商广告时间" - }, "submitCheck": { "message": "您确定要提交它吗？" }, @@ -126,12 +90,6 @@ "removeFromWhitelist": { "message": "将频道移出白名单" }, - "voteOnTime": { - "message": "为赞助商广告时间投票" - }, - "recordTimes": { - "message": "记录赞助商广告次数" - }, "soFarUHSubmited": { "message": "您目前已提交" }, @@ -144,15 +102,6 @@ "here": { "message": "这里" }, - "recordTimesDescription": { - "message": "当赞助商广告开始和结束时，请点击下面的按钮记录并将其提交到数据库。" - }, - "popupHint": { - "message": "提示：在观看视频时，按下分号键（；）以报告赞助商广告的开始/结束时间，按下引号键（’）提交。（可以在选项中更改）" - }, - "lastTimes": { - "message": "选择的最新的赞助商广告信息时间" - }, "clearTimesButton": { "message": "清除时间" }, @@ -201,15 +150,6 @@ "whatDeleteButton": { "message": "此按钮用于在 Youtube 播放器中清除所有赞助商广告。" }, - "disableViewTracking": { - "message": "禁用赞助商广告跳过统计跟踪" - }, - "enableViewTracking": { - "message": "启用赞助商广告跳过统计跟踪" - }, - "whatViewTracking": { - "message": "此功能追踪您跳过了哪些赞助商广告，以让用户知道他们提交的信息帮助了多少人，并与点赞一同作为依据，来确保垃圾信息不会进入数据库。在您每次跳过赞助商广告时，扩展都会向服务器发送一条消息。希望大部分人不要改变此设置，以使观看数字准确。:)" - }, "showNotice": { "message": "重新显示通知" }, @@ -229,9 +169,6 @@ "message": "如果您依然不喜欢它，请按下不再显示按钮。", "description": "The second line of the message displayed after the notice was upgraded." }, - "setStartSponsorShortcut": { - "message": "设定赞助商广告开始的绑定按键" - }, "setSubmitKeybind": { "message": "设定提交的绑定按键" }, @@ -272,15 +209,9 @@ "enableAutoSkip": { "message": "启用自动跳过" }, - "autoSkipDescription": { - "message": "自动跳过将会为您跳过赞助商广告。如果被禁用，将会显示一个通知询问您是否要跳过。" - }, "audioNotification": { "message": "跳过时音频通知" }, - "audioNotificationDescription": { - "message": "跳过时音频通知会在跳过赞助商广告时播放声音。如果被禁用（或自动跳过被禁用），则不会播放声音。" - }, "youHaveSkipped": { "message": "您已跳过 " }, @@ -305,9 +236,6 @@ "youHaveSavedTimeEnd": { "message": " 的生命。" }, - "guildlinesSummary": { - "message": "- 请确保您的片段只包含付费推广片段，没有其他的东西。\n- 请确保跳过此片段不会跳过重要的内容\n- 如果整个视频本身就是赞助商广告，请不要报告它。完整视频报告系统将在不久后推出。\n- 请不要报告可能产生偏见的免责声明（如果评测视频有赞助商，请不要在他们提到这一点时跳过）。" - }, "statusReminder": { "message": "在 status.sponsor.ajay.app 检查服务器状态。" }, @@ -329,9 +257,6 @@ "autoSkip": { "message": "自动跳过" }, - "showSkipNotice": { - "message": "跳过赞助商广告后显示通知" - }, "keybindCurrentlySet": { "message": "。目前被设定为：" }, @@ -368,9 +293,6 @@ "minDuration": { "message": "最小持续时间(秒)：" }, - "minDurationDescription": { - "message": "短于设定值的赞助商广告片段将不会被跳过或显示在播放器中。" - }, "shortCheck": { "message": "以下的提交短于您的最小持续时间选项。这代表它们可能已经被提交，只是由于该选项被忽略了。您确定要提交吗？" }, @@ -398,15 +320,9 @@ "areYouSureReset": { "message": "您确定要重置它吗？" }, - "confirmPrivacy": { - "message": "未检测到视频的记录。如果您不想检查赞助商广告，请点击取消。" - }, "unlistedCheck": { "message": "忽略未找到记录的视频" }, - "whatUnlistedCheck": { - "message": "此设置将显著的减慢 SponsorBlock 。赞助商广告查找器需要向服务器发送未找到记录的视频 ID 。如果您对通过互联网发送视频 ID 有疑虑，请启用此选项。" - }, "mobileUpdateInfo": { "message": "现已支持 m.youtube.com" }, @@ -463,7 +379,7 @@ }, "to": { "message": "到", - "description": "Used between sponsor times. Example: 1:20 to 1:30" + "description": "Used between segments. Example: 1:20 to 1:30" }, "category_sponsor": { "message": "赞助商广告" @@ -548,15 +464,6 @@ "itCouldBeAdblockerIssue": { "message": "如果这种情况不断发生，它可能是由您的广告拦截器引起的。请查看 https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests" }, - "forceChannelCheck": { - "message": "跳过赞助商广告前强制进行频道检查" - }, - "whatForceChannelCheck": { - "message": "默认情况下，即使还未检测出当前是什么频道，也会立即跳过赞助商广告。默认情况下，即使在白名单中的频道，一些在开头的赞助商广告也可能被跳过。启用此选项将防止这种情况，但所有的跳过将会产生轻微的延迟，因为获取频道 ID 需要一点时间。如果您的网速很快，那延迟可能非常短。" - }, - "forceChannelCheckPopup": { - "message": "请考虑启用跳过赞助商广告前强制进行频道检查" - }, "downvoteDescription": { "message": "不正确/错误的时间" }, diff --git a/src/components/SubmissionNoticeComponent.tsx b/src/components/SubmissionNoticeComponent.tsx index aa59b3c2..610ee490 100644 --- a/src/components/SubmissionNoticeComponent.tsx +++ b/src/components/SubmissionNoticeComponent.tsx @@ -178,7 +178,7 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S // Check if any non music categories are being used on a music video if (this.contentContainer().videoInfo?.microformat?.playerMicroformatRenderer?.category === "Music") { for (const sponsorTime of sponsorTimesSubmitting) { - if (!sponsorTime.category.startsWith("music_")) { + if (sponsorTime.category === "sponsor") { if (!confirm(chrome.i18n.getMessage("nonMusicCategoryOnMusic"))) return; break; diff --git a/src/content.ts b/src/content.ts index 4d6fd3b0..b41bdc7a 100644 --- a/src/content.ts +++ b/src/content.ts @@ -1243,7 +1243,7 @@ function openInfoMenu() { //close button let closeButton = document.createElement("div"); - closeButton.innerText = "Close Popup"; + closeButton.innerText = chrome.i18n.getMessage("closePopup"); closeButton.classList.add("smallLink"); closeButton.setAttribute("align", "center"); closeButton.addEventListener("click", closeInfoMenu); diff --git a/src/popup.ts b/src/popup.ts index 648abc4c..8877028a 100644 --- a/src/popup.ts +++ b/src/popup.ts @@ -418,8 +418,8 @@ async function runThePopup(messageListener?: MessageListener) { extraInfo = " (" + chrome.i18n.getMessage("hiddenDueToDuration") + ")"; } - sponsorTimeButton.innerText = getFormattedTime(request.sponsorTimes[i].segment[0]) + " to " + getFormattedTime(request.sponsorTimes[i].segment[1]) + extraInfo; - + sponsorTimeButton.innerText = getFormattedTime(request.sponsorTimes[i].segment[0]) + " " + chrome.i18n.getMessage("to") + " " + getFormattedTime(request.sponsorTimes[i].segment[1]) + extraInfo; + let votingButtons = document.createElement("div"); let UUID = request.sponsorTimes[i].UUID; @@ -474,7 +474,7 @@ async function runThePopup(messageListener?: MessageListener) { let timeMessage = getFormattedTime(sponsorTimes[i].segment[s]); //if this is an end time if (s == 1) { - timeMessage = " to " + timeMessage; + timeMessage = " " + chrome.i18n.getMessage("to") + " " + timeMessage; } else if (i > 0) { //add commas if necessary timeMessage = ", " + timeMessage; @@ -531,7 +531,7 @@ async function runThePopup(messageListener?: MessageListener) { let timeMessage = getFormattedTime(sponsorTimes[i][s]); //if this is an end time if (s == 1) { - timeMessage = " to " + timeMessage; + timeMessage = " " + chrome.i18n.getMessage("to") + " " + timeMessage; } else if (i > 0) { //add commas if necessary timeMessage = timeMessage; @@ -640,7 +640,7 @@ async function runThePopup(messageListener?: MessageListener) { colonText.innerText = ":"; let toText = document.createElement("span"); - toText.innerText = " to "; + toText.innerText = " " + chrome.i18n.getMessage("to") + " "; //remove all children to replace while (sponsorTimeContainer.firstChild) { diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js index 99dbac35..79fea60b 100644 --- a/webpack/webpack.common.js +++ b/webpack/webpack.common.js @@ -35,11 +35,18 @@ module.exports = env => ({ }, plugins: [ // exclude locale files in moment - new CopyPlugin([ - { from: '.', to: '../', ignore: ['manifest.json'] } - ], - {context: 'public' } - ), + new CopyPlugin({ + patterns: [ + { + from: '.', + to: '../', + globOptions: { + ignore: ['manifest.json'], + }, + context: './public', + } + ] + }), new BuildManifest({ browser: env.browser, pretty: env.mode === "production", |