From fb5eb1f65572782c170e19b005dfd7f04543c81f Mon Sep 17 00:00:00 2001 From: Renaud Chaput Date: Fri, 29 Dec 2023 10:33:06 +0100 Subject: [PATCH 01/27] Replace our custom `compression-webpack-plugin` patch with the fixed upstream version (#28510) --- ...-webpack-plugin-npm-6.1.1-3a2a65987e.patch | 22 ---------------- package.json | 2 +- yarn.lock | 25 ++++--------------- 3 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 .yarn/patches/compression-webpack-plugin-npm-6.1.1-3a2a65987e.patch diff --git a/.yarn/patches/compression-webpack-plugin-npm-6.1.1-3a2a65987e.patch b/.yarn/patches/compression-webpack-plugin-npm-6.1.1-3a2a65987e.patch deleted file mode 100644 index 30d5db2739..0000000000 --- a/.yarn/patches/compression-webpack-plugin-npm-6.1.1-3a2a65987e.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/dist/index.js b/dist/index.js -index 57e375592d984e9a429bcd9f800fa2d15cd662e4..0c47d96df3608e23adfd77d887a8f72abbd501c0 100644 ---- a/dist/index.js -+++ b/dist/index.js -@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", { - }); - exports.default = void 0; - --var _crypto = _interopRequireDefault(require("crypto")); -+var _createHash = _interopRequireDefault(require("webpack/lib/util/createHash")); - - var _path = _interopRequireDefault(require("path")); - -@@ -227,7 +227,7 @@ class CompressionPlugin { - originalAlgorithm: this.options.algorithm, - compressionOptions: this.options.compressionOptions, - name, -- contentHash: _crypto.default.createHash("md4").update(input).digest("hex") -+ contentHash: _createHash.default("md4").update(input).digest("hex") - }; - } else { - cacheData.name = (0, _serializeJavascript.default)({ diff --git a/package.json b/package.json index 39d387d6f4..24832bb596 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "classnames": "^2.3.2", "cocoon-js-vanilla": "^1.3.0", "color-blend": "^4.0.0", - "compression-webpack-plugin": "patch:compression-webpack-plugin@npm%3A6.1.1#~/.yarn/patches/compression-webpack-plugin-npm-6.1.1-3a2a65987e.patch", + "compression-webpack-plugin": "^6.1.2", "core-js": "^3.30.2", "cross-env": "^7.0.3", "css-loader": "^5.2.7", diff --git a/yarn.lock b/yarn.lock index 764faff27a..abc2817039 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2354,7 +2354,7 @@ __metadata: classnames: "npm:^2.3.2" cocoon-js-vanilla: "npm:^1.3.0" color-blend: "npm:^4.0.0" - compression-webpack-plugin: "patch:compression-webpack-plugin@npm%3A6.1.1#~/.yarn/patches/compression-webpack-plugin-npm-6.1.1-3a2a65987e.patch" + compression-webpack-plugin: "npm:^6.1.2" core-js: "npm:^3.30.2" cross-env: "npm:^7.0.3" css-loader: "npm:^5.2.7" @@ -5780,9 +5780,9 @@ __metadata: languageName: node linkType: hard -"compression-webpack-plugin@npm:6.1.1": - version: 6.1.1 - resolution: "compression-webpack-plugin@npm:6.1.1" +"compression-webpack-plugin@npm:^6.1.2": + version: 6.1.2 + resolution: "compression-webpack-plugin@npm:6.1.2" dependencies: cacache: "npm:^15.0.5" find-cache-dir: "npm:^3.3.1" @@ -5791,22 +5791,7 @@ __metadata: webpack-sources: "npm:^1.4.3" peerDependencies: webpack: ^4.0.0 || ^5.0.0 - checksum: 2f2ac6ba8f3cf48b523efc5d8e50e0172f4676f47bf5d62f2365185a6d37e96c2dc090e74f5f30ddf4be092e2400c5c7e1fb34301f3f939acf4c9944e1356525 - languageName: node - linkType: hard - -"compression-webpack-plugin@patch:compression-webpack-plugin@npm%3A6.1.1#~/.yarn/patches/compression-webpack-plugin-npm-6.1.1-3a2a65987e.patch": - version: 6.1.1 - resolution: "compression-webpack-plugin@patch:compression-webpack-plugin@npm%3A6.1.1#~/.yarn/patches/compression-webpack-plugin-npm-6.1.1-3a2a65987e.patch::version=6.1.1&hash=129d4d" - dependencies: - cacache: "npm:^15.0.5" - find-cache-dir: "npm:^3.3.1" - schema-utils: "npm:^3.0.0" - serialize-javascript: "npm:^5.0.1" - webpack-sources: "npm:^1.4.3" - peerDependencies: - webpack: ^4.0.0 || ^5.0.0 - checksum: 68d130bcf7dcc3fd13a286dc57426640732593db4a2f326a4b159c7c32e856e2752e4d43e5f44dc42d07a0e477ad08c08d9aba029a958ad57e71f06deb42784f + checksum: 966b1417bbeaa55af8d4b7911cf4435a187adbaaff34d3e9f2ef2b7ff747877469ff965d5b653a2211eaecfd0ce8b3c834d3a8f5519aa15dd79e68bbfea0b69e languageName: node linkType: hard From 1cba91d6d116f482d5dd052bd89adb76bf3aa41e Mon Sep 17 00:00:00 2001 From: Santiago Kozak Date: Fri, 29 Dec 2023 06:48:27 -0300 Subject: [PATCH 02/27] Fix reply icon display in picture-in-picture footer (#28519) --- .../mastodon/features/picture_in_picture/components/footer.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx index 9b26e2d753..ed86d19f5c 100644 --- a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx +++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx @@ -179,7 +179,7 @@ class Footer extends ImmutablePureComponent { if (status.get('in_reply_to_id', null) === null) { replyIcon = 'reply'; - replyIconComponent = RepeatIcon; + replyIconComponent = ReplyIcon; replyTitle = intl.formatMessage(messages.reply); } else { replyIcon = 'reply-all'; From f923eeb9b816e92b0c13038a021a5a1ba4766dfa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 11:11:02 +0100 Subject: [PATCH 03/27] Update dependency sass to v1.69.6 (#28517) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index abc2817039..ff9af41afb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14495,15 +14495,15 @@ __metadata: linkType: hard "sass@npm:^1.62.1": - version: 1.69.5 - resolution: "sass@npm:1.69.5" + version: 1.69.6 + resolution: "sass@npm:1.69.6" dependencies: chokidar: "npm:>=3.0.0 <4.0.0" immutable: "npm:^4.0.0" source-map-js: "npm:>=0.6.2 <2.0.0" bin: sass: sass.js - checksum: a9003a9482f2e467fc412cfe58ba4fa14fb78bef7e1283ce5d64a065f8a31114ec3bbf5d4e724f94eb8512c32c768a6f91f228c7f16a26a300bbf4db293b5608 + checksum: 8153db8e51e74a9007bb54332e14d122c34288c7d21a5f2eaefef753a1b7bb13f35e042dc6247253dab5b1550b05cea27970371e7548286b4f50f23dd1147d89 languageName: node linkType: hard From fb58397a331365086147c858a16f4b80b0ab5281 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 10:11:40 +0000 Subject: [PATCH 04/27] Update dependency axios to v1.6.3 (#28509) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index ff9af41afb..ff7347a2cc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4631,13 +4631,13 @@ __metadata: linkType: hard "axios@npm:^1.4.0": - version: 1.6.2 - resolution: "axios@npm:1.6.2" + version: 1.6.3 + resolution: "axios@npm:1.6.3" dependencies: follow-redirects: "npm:^1.15.0" form-data: "npm:^4.0.0" proxy-from-env: "npm:^1.1.0" - checksum: 9b77e030e85e4f9cbcba7bb52fbff67d6ce906c92d213e0bd932346a50140faf83733bf786f55bd58301bd92f9973885c7b87d6348023e10f7eaf286d0791a1d + checksum: dcc6d982353db33e6893ef01cdf81d0a0548dbd8fba0cb046dc4aee1a6a16226721faa4c2a13b2673d47130509629cdb93bb991b3a2bd4ef17a5ac27a8bba0da languageName: node linkType: hard From 851a9b80c8e3b54a71c1655bb63b782ab763f420 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 11:12:13 +0100 Subject: [PATCH 05/27] Update dependency react-redux-loading-bar to v5.0.7 (#28511) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index ff7347a2cc..c323d1f699 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13614,8 +13614,8 @@ __metadata: linkType: hard "react-redux-loading-bar@npm:^5.0.4": - version: 5.0.5 - resolution: "react-redux-loading-bar@npm:5.0.5" + version: 5.0.7 + resolution: "react-redux-loading-bar@npm:5.0.7" dependencies: prop-types: "npm:^15.7.2" react-lifecycles-compat: "npm:^3.0.4" @@ -13624,7 +13624,7 @@ __metadata: react-dom: ^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 react-redux: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 redux: ^3.0.0 || ^4.0.0 || ^5.0.0 - checksum: 0dbac046c5b8b6bd209ccfc25ccc55dc9158cd737b42b68fd1900dfe46a59c9c7e2b0082d8901b749e7cf2d7e23074590aae74f350a814f205105f47895a6214 + checksum: 45333093e7d28df923a657ad89ffe4673d7bd135ef57c0143fb4d868f21b57aeb9044691f553f7d2afbcc9080a1f8cd3cec5b274c80cb57faf0e87a70f7a2cce languageName: node linkType: hard From 3f0140bbdf72d045cbf55bcd598a0f2d4a885ce4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 10:13:29 +0000 Subject: [PATCH 06/27] Update dependency webauthn to v3.1.0 (#28507) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9b78ca733e..d78d49165d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -510,7 +510,7 @@ GEM validate_email validate_url webfinger (~> 1.2) - openssl (3.1.0) + openssl (3.2.0) openssl-signature_algorithm (1.3.0) openssl (> 2.0) orm_adapter (0.5.0) @@ -797,7 +797,7 @@ GEM public_suffix warden (1.2.9) rack (>= 2.0.9) - webauthn (3.0.0) + webauthn (3.1.0) android_key_attestation (~> 0.3.0) awrence (~> 1.1) bindata (~> 2.4) From 01df9f1abba4aea07c3934c4c075b1e91799cc13 Mon Sep 17 00:00:00 2001 From: Christian Winther Date: Fri, 29 Dec 2023 11:15:10 +0100 Subject: [PATCH 07/27] install "wget" in streaming Dockerfile (#28497) --- streaming/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/streaming/Dockerfile b/streaming/Dockerfile index 6e0a84771c..241009fe89 100644 --- a/streaming/Dockerfile +++ b/streaming/Dockerfile @@ -69,6 +69,7 @@ RUN \ ca-certificates \ curl \ tzdata \ + wget \ ; # Set /opt/mastodon as working directory @@ -101,4 +102,4 @@ USER mastodon # Expose default Streaming ports EXPOSE 4000 # Run streaming when started -CMD [ node ./streaming/index.js ] \ No newline at end of file +CMD [ node ./streaming/index.js ] From 87e9e87a146fce5fd38cbd2e97d4d0c2038220d7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 11:15:43 +0100 Subject: [PATCH 08/27] Update eslint (non-major) (#28494) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 140 +++++++++++++++++++++++++++--------------------------- 1 file changed, 71 insertions(+), 69 deletions(-) diff --git a/yarn.lock b/yarn.lock index c323d1f699..18eab4fd07 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2585,7 +2585,7 @@ __metadata: languageName: node linkType: hard -"@pkgr/utils@npm:^2.3.1": +"@pkgr/utils@npm:^2.4.2": version: 2.4.2 resolution: "@pkgr/utils@npm:2.4.2" dependencies: @@ -3669,14 +3669,14 @@ __metadata: linkType: hard "@typescript-eslint/eslint-plugin@npm:^6.0.0": - version: 6.14.0 - resolution: "@typescript-eslint/eslint-plugin@npm:6.14.0" + version: 6.16.0 + resolution: "@typescript-eslint/eslint-plugin@npm:6.16.0" dependencies: "@eslint-community/regexpp": "npm:^4.5.1" - "@typescript-eslint/scope-manager": "npm:6.14.0" - "@typescript-eslint/type-utils": "npm:6.14.0" - "@typescript-eslint/utils": "npm:6.14.0" - "@typescript-eslint/visitor-keys": "npm:6.14.0" + "@typescript-eslint/scope-manager": "npm:6.16.0" + "@typescript-eslint/type-utils": "npm:6.16.0" + "@typescript-eslint/utils": "npm:6.16.0" + "@typescript-eslint/visitor-keys": "npm:6.16.0" debug: "npm:^4.3.4" graphemer: "npm:^1.4.0" ignore: "npm:^5.2.4" @@ -3689,44 +3689,44 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 6360efb0e142ed91de5e9bddcd041f769feeedd256332733be08f7a74c8ae637cbfb78c6b85d747c73231bbb95cef95ed2d2854ab7d43aebfbedb3a191f447f1 + checksum: c8a68e0953d8b94f6b85d3a82090e61e670bcb0945cbee4d741321c56db727429ad47c48b8403ad1dab3b0842689bd2d4b85c99b76c51ac4f5be7f5f61c4c314 languageName: node linkType: hard "@typescript-eslint/parser@npm:^6.0.0": - version: 6.14.0 - resolution: "@typescript-eslint/parser@npm:6.14.0" + version: 6.16.0 + resolution: "@typescript-eslint/parser@npm:6.16.0" dependencies: - "@typescript-eslint/scope-manager": "npm:6.14.0" - "@typescript-eslint/types": "npm:6.14.0" - "@typescript-eslint/typescript-estree": "npm:6.14.0" - "@typescript-eslint/visitor-keys": "npm:6.14.0" + "@typescript-eslint/scope-manager": "npm:6.16.0" + "@typescript-eslint/types": "npm:6.16.0" + "@typescript-eslint/typescript-estree": "npm:6.16.0" + "@typescript-eslint/visitor-keys": "npm:6.16.0" debug: "npm:^4.3.4" peerDependencies: eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 0344f7f640374e7e5a5b50e9c90fbd161611b3f455132e541ef9116eef7bd3acf364db64bd38d4b6b4fe148414494620c9df660f8ddce036019c38ae8e146585 + checksum: 9d573d14df4ec661dccaca785223a8a330d64f50a9279ff9170b1da22198ff91b9afa3ee7d3d7127c0cbc148c86831e76b33fc5b47d630799e98940ef666bfe0 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:6.14.0": - version: 6.14.0 - resolution: "@typescript-eslint/scope-manager@npm:6.14.0" +"@typescript-eslint/scope-manager@npm:6.16.0": + version: 6.16.0 + resolution: "@typescript-eslint/scope-manager@npm:6.16.0" dependencies: - "@typescript-eslint/types": "npm:6.14.0" - "@typescript-eslint/visitor-keys": "npm:6.14.0" - checksum: 8c59a215af3d7d24d8d0b21c28a858263de471650829f288a941e0eb8af8a054798da5c7594b7f39370219718270c18464b5edb96f451457e5f080a33ba57c2c + "@typescript-eslint/types": "npm:6.16.0" + "@typescript-eslint/visitor-keys": "npm:6.16.0" + checksum: 3b275e528d19f4f36c4acd6cb872b5f004175512dce30cef0ac7a9121bb23d21e5e0f4b62658dbfea2b15851e7fa930372696f25a6c87492f863171ab56f5364 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:6.14.0": - version: 6.14.0 - resolution: "@typescript-eslint/type-utils@npm:6.14.0" +"@typescript-eslint/type-utils@npm:6.16.0": + version: 6.16.0 + resolution: "@typescript-eslint/type-utils@npm:6.16.0" dependencies: - "@typescript-eslint/typescript-estree": "npm:6.14.0" - "@typescript-eslint/utils": "npm:6.14.0" + "@typescript-eslint/typescript-estree": "npm:6.16.0" + "@typescript-eslint/utils": "npm:6.16.0" debug: "npm:^4.3.4" ts-api-utils: "npm:^1.0.1" peerDependencies: @@ -3734,59 +3734,60 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 836a6e84be5a245b07c76968c98e2f3bae064767dde720080fe8f33e226188510778dbca4199b7e42ef675ec3fd6d0ab522ec1c77d6e2a9b50e8e275fe7c72c9 + checksum: a5339cc1375d12411fcb242249143b28401fb18890bb2a1cff5275ba946affb4a2066cd8203e83ac383bd9d791a79ea6ee1cbf7a30deed5c832ed002897bbf82 languageName: node linkType: hard -"@typescript-eslint/types@npm:6.14.0": - version: 6.14.0 - resolution: "@typescript-eslint/types@npm:6.14.0" - checksum: d59306a7a441982a4dcee7d775928fd5086aba9331f7a238f915723a0dc785df0e43af562a30a7c2f1b056a1e49fd64863a8d2450d31706193add0ade87334a4 +"@typescript-eslint/types@npm:6.16.0": + version: 6.16.0 + resolution: "@typescript-eslint/types@npm:6.16.0" + checksum: 74d9a8b7fd1b85fd1824295c92bc2f506148e450c9897f65ddaa089091017df4e25676c5b098b75c8f00529b84492f303a6b1870bb0ffee83997081325891d53 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:6.14.0": - version: 6.14.0 - resolution: "@typescript-eslint/typescript-estree@npm:6.14.0" +"@typescript-eslint/typescript-estree@npm:6.16.0": + version: 6.16.0 + resolution: "@typescript-eslint/typescript-estree@npm:6.16.0" dependencies: - "@typescript-eslint/types": "npm:6.14.0" - "@typescript-eslint/visitor-keys": "npm:6.14.0" + "@typescript-eslint/types": "npm:6.16.0" + "@typescript-eslint/visitor-keys": "npm:6.16.0" debug: "npm:^4.3.4" globby: "npm:^11.1.0" is-glob: "npm:^4.0.3" + minimatch: "npm:9.0.3" semver: "npm:^7.5.4" ts-api-utils: "npm:^1.0.1" peerDependenciesMeta: typescript: optional: true - checksum: 767c3309987b8ad053a2403605a9bd7c4eb3283dece864a741a7531a1c28eea4d85acaa4613141b64e194f9f6c4cbc5bc762c9b9f3a67c6202aa8cbb18b180d2 + checksum: c7109e90b40b3c8f1042beb7f1a7a97eeba3b6a903acd82df4947900d68bd31d04b530a190c099666c5ca4886efc162de7b42de754a44b189e41237210797d9e languageName: node linkType: hard -"@typescript-eslint/utils@npm:6.14.0, @typescript-eslint/utils@npm:^6.5.0": - version: 6.14.0 - resolution: "@typescript-eslint/utils@npm:6.14.0" +"@typescript-eslint/utils@npm:6.16.0, @typescript-eslint/utils@npm:^6.5.0": + version: 6.16.0 + resolution: "@typescript-eslint/utils@npm:6.16.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.4.0" "@types/json-schema": "npm:^7.0.12" "@types/semver": "npm:^7.5.0" - "@typescript-eslint/scope-manager": "npm:6.14.0" - "@typescript-eslint/types": "npm:6.14.0" - "@typescript-eslint/typescript-estree": "npm:6.14.0" + "@typescript-eslint/scope-manager": "npm:6.16.0" + "@typescript-eslint/types": "npm:6.16.0" + "@typescript-eslint/typescript-estree": "npm:6.16.0" semver: "npm:^7.5.4" peerDependencies: eslint: ^7.0.0 || ^8.0.0 - checksum: 72689b2897b89e1bd1c71c1c2ae436d0ccfbcfffabf3be4378de74ad8138b2ecdbeeda7c1720e2f1754569e773f2fc7216f704335e1e56c38c7601ee1d190aeb + checksum: 586c4c0e1ca249daf9958f0d88df3af010a7592a19db1a7dc198754542b584314896536fe56ea9c93dd0ddd531154e7697002643d46e24a8d3a459721a626e91 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:6.14.0": - version: 6.14.0 - resolution: "@typescript-eslint/visitor-keys@npm:6.14.0" +"@typescript-eslint/visitor-keys@npm:6.16.0": + version: 6.16.0 + resolution: "@typescript-eslint/visitor-keys@npm:6.16.0" dependencies: - "@typescript-eslint/types": "npm:6.14.0" + "@typescript-eslint/types": "npm:6.16.0" eslint-visitor-keys: "npm:^3.4.1" - checksum: 0e2363f9f1986ebdb41507c54a666fa1c336eb6beb383dc342a10844d3c42c89067b21c3f158851fa6f0825e1e451a5470b5454fde70a6fc33b4b0259462d954 + checksum: 13c4d90355e288eac432d2845e37bb2acc03dab6d8568564558c1914a9aa44352f2a7ff29d0f50e0b3e68d66cca5f27b2732af5ff193b82571b4366309842880 languageName: node linkType: hard @@ -7406,21 +7407,22 @@ __metadata: linkType: hard "eslint-plugin-prettier@npm:^5.0.0": - version: 5.0.1 - resolution: "eslint-plugin-prettier@npm:5.0.1" + version: 5.1.2 + resolution: "eslint-plugin-prettier@npm:5.1.2" dependencies: prettier-linter-helpers: "npm:^1.0.0" - synckit: "npm:^0.8.5" + synckit: "npm:^0.8.6" peerDependencies: "@types/eslint": ">=8.0.0" eslint: ">=8.0.0" + eslint-config-prettier: "*" prettier: ">=3.0.0" peerDependenciesMeta: "@types/eslint": optional: true eslint-config-prettier: optional: true - checksum: 08e2c7bed93d9f7c86e9aa0bd4f5cc51f65233a446ddfda11e821f12819e1e4be62cfbc2a4e17169c76fded1c4de7371e37e5f2525e81695decaf6c652a41fb0 + checksum: e16c9fbb0e9f8da45bdbb1cf6e4a190266235c3686deede3815196d2604bbe2bac531d1fc9adc3c0b9a03d88b55bd3bfaa4f9d85e34e73dc040d545a1931fab9 languageName: node linkType: hard @@ -11423,6 +11425,15 @@ __metadata: languageName: node linkType: hard +"minimatch@npm:9.0.3, minimatch@npm:^9.0.1": + version: 9.0.3 + resolution: "minimatch@npm:9.0.3" + dependencies: + brace-expansion: "npm:^2.0.1" + checksum: 85f407dcd38ac3e180f425e86553911d101455ca3ad5544d6a7cec16286657e4f8a9aa6695803025c55e31e35a91a2252b5dc8e7d527211278b8b65b4dbd5eac + languageName: node + linkType: hard + "minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": version: 3.1.2 resolution: "minimatch@npm:3.1.2" @@ -11441,15 +11452,6 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^9.0.1": - version: 9.0.3 - resolution: "minimatch@npm:9.0.3" - dependencies: - brace-expansion: "npm:^2.0.1" - checksum: 85f407dcd38ac3e180f425e86553911d101455ca3ad5544d6a7cec16286657e4f8a9aa6695803025c55e31e35a91a2252b5dc8e7d527211278b8b65b4dbd5eac - languageName: node - linkType: hard - "minimist@npm:^1.2.0, minimist@npm:^1.2.6": version: 1.2.8 resolution: "minimist@npm:1.2.8" @@ -15782,13 +15784,13 @@ __metadata: languageName: node linkType: hard -"synckit@npm:^0.8.5": - version: 0.8.5 - resolution: "synckit@npm:0.8.5" +"synckit@npm:^0.8.6": + version: 0.8.6 + resolution: "synckit@npm:0.8.6" dependencies: - "@pkgr/utils": "npm:^2.3.1" - tslib: "npm:^2.5.0" - checksum: 9827f828cabc404b3a147c38f824c8d5b846eb6f65189d965aa0b71ea8ecda5048f8f50b4bdfd8813148844175233cff56c6bc8d87a7118cf10707df870519f4 + "@pkgr/utils": "npm:^2.4.2" + tslib: "npm:^2.6.2" + checksum: 200528062e3915a0190a4c6b1e01436fcfdf812e2e8d977746746f3998bb4182d758af760e51b06a64f8323e705735aff7b4b3efc4a0ab5f75eaccc044a8cfcc languageName: node linkType: hard @@ -16126,7 +16128,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:2.6.2, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.6.0": +"tslib@npm:2.6.2, tslib@npm:^2.4.0, tslib@npm:^2.6.0, tslib@npm:^2.6.2": version: 2.6.2 resolution: "tslib@npm:2.6.2" checksum: e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb From 07ab97d7f9d9c5c77f75fd3d1d120cf47d79eaa3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 10:16:00 +0000 Subject: [PATCH 09/27] Update dependency rubocop-rails to v2.23.1 (#28493) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d78d49165d..68540e049c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -682,7 +682,7 @@ GEM rubocop-performance (1.20.0) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.23.0) + rubocop-rails (2.23.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) From de3fa293b07fc91272ad675e5f12fe4f051bfcd9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 11:16:26 +0100 Subject: [PATCH 10/27] Update dependency fastimage to v2.3.0 (#28488) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 68540e049c..ac186ab542 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -301,7 +301,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fast_blank (1.0.1) - fastimage (2.2.7) + fastimage (2.3.0) ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) From 3fbfc50f178bd04e794404f4552d98021b468693 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 11:17:31 +0100 Subject: [PATCH 11/27] Update dependency brakeman to v6.1.1 (#28487) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ac186ab542..722e13d27b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -175,7 +175,8 @@ GEM blurhash (0.1.7) bootsnap (1.17.0) msgpack (~> 1.2) - brakeman (6.1.0) + brakeman (6.1.1) + racc browser (5.3.1) brpoplpush-redis_script (0.1.3) concurrent-ruby (~> 1.0, >= 1.0.5) From f6f85b9521a84e3c07a84bf8eb4351e4430c2f45 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 11:19:41 +0100 Subject: [PATCH 12/27] Update dependency aws-sdk-s3 to v1.142.0 (#28479) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 722e13d27b..954a4fe35a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -131,16 +131,16 @@ GEM attr_required (1.0.1) awrence (1.2.1) aws-eventstream (1.3.0) - aws-partitions (1.860.0) - aws-sdk-core (3.189.0) + aws-partitions (1.873.0) + aws-sdk-core (3.190.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.74.0) + aws-sdk-kms (1.75.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.141.0) + aws-sdk-s3 (1.142.0) aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) From b01a027543cc80176574ffd0af0ba96f6e3eca96 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 11:19:56 +0100 Subject: [PATCH 13/27] Update dependency tzinfo-data to v1.2023.4 (#28478) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 954a4fe35a..81b4e14beb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -783,7 +783,7 @@ GEM unf (~> 0.1.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2023.3) + tzinfo-data (1.2023.4) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext From 87bf85ffdd75a59d0c4527052d160b3e858e3777 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 11:20:34 +0100 Subject: [PATCH 14/27] Update dependency classnames to v2.5.0 (#28498) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 18eab4fd07..c0515de13f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5531,9 +5531,9 @@ __metadata: linkType: hard "classnames@npm:^2.2.5, classnames@npm:^2.3.2": - version: 2.3.2 - resolution: "classnames@npm:2.3.2" - checksum: cd50ead57b4f97436aaa9f9885c6926323efc7c2bea8e3d4eb10e4e972aa6a1cfca1c7a0e06f8a199ca7498d4339e30bb6002e589e61c9f21248cbf3e8b0b18d + version: 2.5.0 + resolution: "classnames@npm:2.5.0" + checksum: f10a5b07db7fda8eb77f701f795b7006f3de86a723ec62cc10f4d82b4195fc65a578bbf91c47675b8c6fcb2921b903bfea5c670bdb43513e454daa6c2e9738b3 languageName: node linkType: hard From f7f7236fa235fd5541df164d847e1be18e58788b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 10:21:19 +0000 Subject: [PATCH 15/27] Update dependency ws to v8.16.0 (#28504) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index c0515de13f..9cdeb1d7f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17496,8 +17496,8 @@ __metadata: linkType: hard "ws@npm:^8.11.0, ws@npm:^8.12.1, ws@npm:^8.14.2": - version: 8.15.1 - resolution: "ws@npm:8.15.1" + version: 8.16.0 + resolution: "ws@npm:8.16.0" peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ">=5.0.2" @@ -17506,7 +17506,7 @@ __metadata: optional: true utf-8-validate: optional: true - checksum: 9964360dd5ab35c7376bd7c4295a3c8bd44ea0838c9413742548a6fb3ec371fc6c18552d5b8e76bdc21536db1909765612815bae072674b5ec69971605395a96 + checksum: a7783bb421c648b1e622b423409cb2a58ac5839521d2f689e84bc9dc41d59379c692dd405b15a997ea1d4c0c2e5314ad707332d0c558f15232d2bc07c0b4618a languageName: node linkType: hard From 63901bb34babd4923546375d1fae42daa76dfd0d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 11:22:43 +0100 Subject: [PATCH 16/27] Update github/codeql-action action to v3 (#28495) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/codeql.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 3b40c3fd07..6fb93b7fef 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -31,7 +31,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -44,7 +44,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹ️ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -57,6 +57,6 @@ jobs: # ./location_of_script_within_repo/buildscript.sh - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: '/language:${{matrix.language}}' From 128c5b7db3ce6eef59fb6f575514c45086bf6c53 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 29 Dec 2023 05:23:30 -0500 Subject: [PATCH 17/27] Fix `Performance/StringIdentifierArgument` cop (#28508) --- app/models/concerns/remotable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/concerns/remotable.rb b/app/models/concerns/remotable.rb index 6118e204a1..8382c91599 100644 --- a/app/models/concerns/remotable.rb +++ b/app/models/concerns/remotable.rb @@ -46,7 +46,7 @@ module Remotable public_send(:"download_#{attachment_name}!", url) if download_on_assign end - alias_method(:"reset_#{attachment_name}!", "download_#{attachment_name}!") + alias_method(:"reset_#{attachment_name}!", :"download_#{attachment_name}!") end end end From 54ed01538e33874468bbdc768fcc80fcee302927 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 11:25:31 +0100 Subject: [PATCH 18/27] Update dependency core-js to v3.35.0 (#28518) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 9cdeb1d7f4..1baa0da058 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5914,9 +5914,9 @@ __metadata: linkType: hard "core-js@npm:^3.30.2": - version: 3.34.0 - resolution: "core-js@npm:3.34.0" - checksum: 408a77898abe03bf3e5dec2a451c36f4745081cca9022f8bdf9b817d57bb6d3a534d555f47a4b95e1daa5e21dbc79122eac2402e25720d425f5925127e55dcd8 + version: 3.35.0 + resolution: "core-js@npm:3.35.0" + checksum: 1d545ff4406f2afa5e681f44b45ed5f7f119d158b380234d5aa7787ce7e47fc7a635b98b74c28c766ba8191e3db8c2316ad6ab4ff1ddecbc3fd618413a52c29c languageName: node linkType: hard From 5fd16c3ffd86e0eba436714a35e60015328472e0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 11:27:37 +0100 Subject: [PATCH 19/27] Update dependency nokogiri to v1.16.0 (#28513) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 81b4e14beb..5acee3d753 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -482,7 +482,7 @@ GEM net-smtp (0.4.0) net-protocol nio4r (2.5.9) - nokogiri (1.15.5) + nokogiri (1.16.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) oj (3.16.3) From 7df9c4f6f3ae717a5b293ce36d4443f2a4d8492e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 11:39:10 +0100 Subject: [PATCH 20/27] New Crowdin Translations (automated) (#28481) Co-authored-by: GitHub Actions --- app/javascript/mastodon/locales/bg.json | 2 + app/javascript/mastodon/locales/ca.json | 2 +- app/javascript/mastodon/locales/el.json | 8 + app/javascript/mastodon/locales/eo.json | 16 ++ app/javascript/mastodon/locales/es-AR.json | 4 +- app/javascript/mastodon/locales/et.json | 2 + app/javascript/mastodon/locales/fa.json | 4 +- app/javascript/mastodon/locales/fi.json | 2 +- app/javascript/mastodon/locales/gl.json | 2 + app/javascript/mastodon/locales/he.json | 2 +- app/javascript/mastodon/locales/ie.json | 8 + app/javascript/mastodon/locales/is.json | 2 + app/javascript/mastodon/locales/kk.json | 1 + app/javascript/mastodon/locales/ko.json | 6 +- app/javascript/mastodon/locales/lad.json | 3 + app/javascript/mastodon/locales/nn.json | 3 + app/javascript/mastodon/locales/no.json | 7 +- app/javascript/mastodon/locales/ru.json | 2 + app/javascript/mastodon/locales/sk.json | 4 +- app/javascript/mastodon/locales/sr-Latn.json | 2 + app/javascript/mastodon/locales/sr.json | 1 + app/javascript/mastodon/locales/th.json | 3 +- app/javascript/mastodon/locales/uk.json | 1 + app/javascript/mastodon/locales/vi.json | 2 + config/locales/activerecord.ie.yml | 48 +++++ config/locales/devise.ie.yml | 37 ++++ config/locales/devise.ko.yml | 2 +- config/locales/doorkeeper.ie.yml | 146 ++++++++++++++ config/locales/eo.yml | 39 ++++ config/locales/ie.yml | 188 ++++++++++++++++++- config/locales/lad.yml | 92 +++++++++ config/locales/simple_form.fa.yml | 2 +- config/locales/simple_form.ie.yml | 112 +++++++++++ config/locales/simple_form.lad.yml | 34 ++++ config/locales/sk.yml | 27 +++ 35 files changed, 800 insertions(+), 16 deletions(-) diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json index 8a6d6040d6..7ee3c868ae 100644 --- a/app/javascript/mastodon/locales/bg.json +++ b/app/javascript/mastodon/locales/bg.json @@ -32,6 +32,7 @@ "account.featured_tags.last_status_never": "Няма публикации", "account.featured_tags.title": "Главни хаштагове на {name}", "account.follow": "Последване", + "account.follow_back": "Последване взаимно", "account.followers": "Последователи", "account.followers.empty": "Още никой не следва потребителя.", "account.followers_counter": "{count, plural, one {{counter} последовател} other {{counter} последователи}}", @@ -52,6 +53,7 @@ "account.mute_notifications_short": "Заглушаване на известията", "account.mute_short": "Заглушаване", "account.muted": "Заглушено", + "account.mutual": "Взаимни", "account.no_bio": "Няма представен опис.", "account.open_original_page": "Отваряне на първообразната страница", "account.posts": "Публикации", diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index 86f1fb4765..290b364a52 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -32,7 +32,7 @@ "account.featured_tags.last_status_never": "No hi ha tuts", "account.featured_tags.title": "etiquetes destacades de {name}", "account.follow": "Segueix", - "account.follow_back": "Segueix", + "account.follow_back": "Segueix tu també", "account.followers": "Seguidors", "account.followers.empty": "A aquest usuari encara no el segueix ningú.", "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} Seguidors}}", diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json index 83a986ba4e..17a0c9d4da 100644 --- a/app/javascript/mastodon/locales/el.json +++ b/app/javascript/mastodon/locales/el.json @@ -17,9 +17,11 @@ "account.badges.group": "Ομάδα", "account.block": "Αποκλεισμός @{name}", "account.block_domain": "Αποκλεισμός τομέα {domain}", + "account.block_short": "Αποκλεισμός", "account.blocked": "Αποκλεισμένος/η", "account.browse_more_on_origin_server": "Δες περισσότερα στο αρχικό προφίλ", "account.cancel_follow_request": "Απόσυρση αιτήματος παρακολούθησης", + "account.copy": "Αντιγραφή συνδέσμου προφίλ", "account.direct": "Ιδιωτική αναφορά @{name}", "account.disable_notifications": "Σταμάτα να με ειδοποιείς όταν δημοσιεύει ο @{name}", "account.domain_blocked": "Ο τομέας αποκλείστηκε", @@ -30,6 +32,7 @@ "account.featured_tags.last_status_never": "Καμία ανάρτηση", "account.featured_tags.title": "προβεβλημένες ετικέτες του/της {name}", "account.follow": "Ακολούθησε", + "account.follow_back": "Ακολούθησε και εσύ", "account.followers": "Ακόλουθοι", "account.followers.empty": "Κανείς δεν ακολουθεί αυτόν τον χρήστη ακόμα.", "account.followers_counter": "{count, plural, one {{counter} Ακόλουθος} other {{counter} Ακόλουθοι}}", @@ -47,7 +50,11 @@ "account.mention": "Ανάφερε @{name}", "account.moved_to": "Ο/Η {name} έχει υποδείξει ότι ο νέος λογαριασμός του/της είναι τώρα:", "account.mute": "Σώπασε τον @{name}", + "account.mute_notifications_short": "Σίγαση ειδοποιήσεων", + "account.mute_short": "Σίγαση", "account.muted": "Αποσιωπημένος/η", + "account.mutual": "Αμοιβαίοι", + "account.no_bio": "Δεν υπάρχει περιγραφή.", "account.open_original_page": "Ανοικτό", "account.posts": "Τουτ", "account.posts_with_replies": "Τουτ και απαντήσεις", @@ -63,6 +70,7 @@ "account.unendorse": "Να μην παρέχεται στο προφίλ", "account.unfollow": "Άρση ακολούθησης", "account.unmute": "Διακοπή σίγασης @{name}", + "account.unmute_notifications_short": "Σίγαση ειδοποιήσεων", "account.unmute_short": "Κατάργηση σίγασης", "account_note.placeholder": "Κάνε κλικ για να προσθέσεις σημείωση", "admin.dashboard.daily_retention": "Ποσοστό χρηστών που παραμένουν μετά την εγγραφή, ανά ημέρα", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index 4daa699dcf..643329ba99 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -32,6 +32,7 @@ "account.featured_tags.last_status_never": "Neniu afiŝo", "account.featured_tags.title": "Rekomendataj kradvortoj de {name}", "account.follow": "Sekvi", + "account.follow_back": "Sekvu reen", "account.followers": "Sekvantoj", "account.followers.empty": "Ankoraŭ neniu sekvas ĉi tiun uzanton.", "account.followers_counter": "{count, plural, one{{counter} Sekvanto} other {{counter} Sekvantoj}}", @@ -52,6 +53,7 @@ "account.mute_notifications_short": "Silentigu Sciigojn", "account.mute_short": "Silentigu", "account.muted": "Silentigita", + "account.mutual": "Reciproka", "account.no_bio": "Neniu priskribo estas provizita.", "account.open_original_page": "Malfermi la originalan paĝon", "account.posts": "Afiŝoj", @@ -509,6 +511,8 @@ "onboarding.tips.2fa": "Ĉu vi scias? Vi povas sekurigi vian konton per efektivigi dufaktora autentigo en via kontoagordoj.", "onboarding.tips.accounts_from_other_servers": "Ĉu vi scias? Ĉar Mastodon estas sencentra, kelkaj profiloj kiujn vi trovi estas gastigitaj ĉe aliaj serviloj kiuj ne estas via.", "onboarding.tips.migration": "Ĉu vi scias? Se vi sentas ke {domain} ne estas bona servilelekto por vi en la estonteco, vi povas translokiĝi al alia servilo de Mastodon sen malgajni viajn sekvantojn.", + "onboarding.tips.verification": "Ĉu vi sciis? Vi povas kontroli vian konton metante ligilon al via Mastodon-profilo en via propra retejo kaj aldonante la retejon al via profilo. Neniuj kotizoj aŭ dokumentoj necesaj!", + "password_confirmation.exceeds_maxlength": "Pasvorto-konfirmo superas la maksimuman pasvortan longon", "password_confirmation.mismatching": "Pasvorto konfirmo ne kongruas", "picture_in_picture.restore": "Remetu ĝin", "poll.closed": "Finita", @@ -532,6 +536,7 @@ "privacy.unlisted.short": "Nelistigita", "privacy_policy.last_updated": "Laste ĝisdatigita en {date}", "privacy_policy.title": "Politiko de privateco", + "recommended": "Rekomendita", "refresh": "Refreŝigu", "regeneration_indicator.label": "Ŝargado…", "regeneration_indicator.sublabel": "Via abonfluo estas preparata!", @@ -549,6 +554,7 @@ "reply_indicator.cancel": "Nuligi", "report.block": "Bloki", "report.block_explanation": "Vi ne vidos iliajn afiŝojn. Ili ne povos vidi viajn afiŝojn, nek sekvi vin. Ili ne scios, ke vi blokas ilin.", + "report.categories.legal": "Laŭleĝa", "report.categories.other": "Aliaj", "report.categories.spam": "Trudmesaĝo", "report.categories.violation": "Enhavo malobservas unu aŭ plurajn servilajn regulojn", @@ -587,6 +593,7 @@ "report.unfollow": "Malsekvi @{name}", "report.unfollow_explanation": "Vi sekvas ĉi tiun konton. Por ne plu vidi ĝiajn afiŝojn en via hejma templinio, ĉesu sekvi ĝin.", "report_notification.attached_statuses": "{count, plural, one {{count} afiŝo almetita} other {{count} afiŝoj almetitaj}}", + "report_notification.categories.legal": "Laŭleĝa", "report_notification.categories.other": "Alia", "report_notification.categories.spam": "Trudmesaĝo", "report_notification.categories.violation": "Malobservo de la regulo", @@ -599,13 +606,19 @@ "search.quick_action.open_url": "Malfermi URL en Mastodono", "search.quick_action.status_search": "Afiŝoj kiuj kongruas kun {x}", "search.search_or_paste": "Serĉu aŭ algluu URL-on", + "search_popout.full_text_search_disabled_message": "Ne havebla sur {domain}.", + "search_popout.full_text_search_logged_out_message": "Disponebla nur kiam ensalutinte.", + "search_popout.language_code": "ISO-lingva kodo", + "search_popout.options": "Serĉaj opcioj", "search_popout.quick_actions": "Rapidaj agoj", "search_popout.recent": "Lastaj serĉoj", + "search_popout.specific_date": "specifa dato", "search_popout.user": "uzanto", "search_results.accounts": "Profiloj", "search_results.all": "Ĉiuj", "search_results.hashtags": "Kradvortoj", "search_results.nothing_found": "Povis trovi nenion por ĉi tiuj serĉaj terminoj", + "search_results.see_all": "Vidu ĉiujn", "search_results.statuses": "Afiŝoj", "search_results.title": "Serĉ-rezultoj por {q}", "server_banner.about_active_users": "Personoj uzantaj ĉi tiun servilon dum la lastaj 30 tagoj (Aktivaj Uzantoj Monate)", @@ -616,6 +629,8 @@ "server_banner.server_stats": "Statistikoj de la servilo:", "sign_in_banner.create_account": "Krei konton", "sign_in_banner.sign_in": "Saluti", + "sign_in_banner.sso_redirect": "Ensalutu aŭ Registriĝi", + "sign_in_banner.text": "Ensalutu por sekvi profilojn aŭ haŝetikedojn, ŝatatajn, dividi kaj respondi afiŝojn. Vi ankaŭ povas interagi de via konto sur alia servilo.", "status.admin_account": "Malfermi fasadon de moderigado por @{name}", "status.admin_domain": "Malfermu moderigan interfacon por {domain}", "status.admin_status": "Malfermi ĉi tiun mesaĝon en la kontrola interfaco", @@ -632,6 +647,7 @@ "status.edited": "Redaktita {date}", "status.edited_x_times": "Redactita {count, plural, one {{count} fojon} other {{count} fojojn}}", "status.embed": "Enkorpigi", + "status.favourite": "Ŝatata", "status.filter": "Filtri ĉi tiun afiŝon", "status.filtered": "Filtrita", "status.hide": "Kaŝi mesaĝon", diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json index eb6c0f3e4f..7c2e4f0d49 100644 --- a/app/javascript/mastodon/locales/es-AR.json +++ b/app/javascript/mastodon/locales/es-AR.json @@ -32,7 +32,7 @@ "account.featured_tags.last_status_never": "Sin mensajes", "account.featured_tags.title": "Etiquetas destacadas de {name}", "account.follow": "Seguir", - "account.follow_back": "Seguir también", + "account.follow_back": "Seguir", "account.followers": "Seguidores", "account.followers.empty": "Todavía nadie sigue a este usuario.", "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}", @@ -53,7 +53,7 @@ "account.mute_notifications_short": "Silenciar notificaciones", "account.mute_short": "Silenciar", "account.muted": "Silenciado", - "account.mutual": "Mutuo", + "account.mutual": "Seguimiento mutuo", "account.no_bio": "Sin descripción provista.", "account.open_original_page": "Abrir página original", "account.posts": "Mensajes", diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json index c397334109..26657d402e 100644 --- a/app/javascript/mastodon/locales/et.json +++ b/app/javascript/mastodon/locales/et.json @@ -32,6 +32,7 @@ "account.featured_tags.last_status_never": "Postitusi pole", "account.featured_tags.title": "{name} esiletõstetud sildid", "account.follow": "Jälgi", + "account.follow_back": "Jälgi vastu", "account.followers": "Jälgijad", "account.followers.empty": "Keegi ei jälgi veel seda kasutajat.", "account.followers_counter": "{count, plural, one {{counter} jälgija} other {{counter} jälgijat}}", @@ -52,6 +53,7 @@ "account.mute_notifications_short": "Vaigista teavitused", "account.mute_short": "Vaigista", "account.muted": "Vaigistatud", + "account.mutual": "Ühine", "account.no_bio": "Kirjeldust pole lisatud.", "account.open_original_page": "Ava algne leht", "account.posts": "Postitused", diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index a93d0f6617..9f3201ca78 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -13,7 +13,7 @@ "about.rules": "قوانین کارساز", "account.account_note_header": "یادداشت", "account.add_or_remove_from_list": "افزودن یا برداشتن از سیاهه‌ها", - "account.badges.bot": "روبات", + "account.badges.bot": "خودکار", "account.badges.group": "گروه", "account.block": "انسداد ‎@{name}", "account.block_domain": "انسداد دامنهٔ {domain}", @@ -32,6 +32,7 @@ "account.featured_tags.last_status_never": "بدون فرسته", "account.featured_tags.title": "برچسب‌های برگزیدهٔ {name}", "account.follow": "پی‌گرفتن", + "account.follow_back": "دنبال کردن متقابل", "account.followers": "پی‌گیرندگان", "account.followers.empty": "هنوز کسی پی‌گیر این کاربر نیست.", "account.followers_counter": "{count, plural, one {{counter} پی‌گیرنده} other {{counter} پی‌گیرنده}}", @@ -52,6 +53,7 @@ "account.mute_notifications_short": "خموشی آگاهی‌ها", "account.mute_short": "خموشی", "account.muted": "خموش", + "account.mutual": "دوطرفه", "account.no_bio": "شرحی فراهم نشده.", "account.open_original_page": "گشودن صفحهٔ اصلی", "account.posts": "فرسته", diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json index dab7eac1e9..004898651b 100644 --- a/app/javascript/mastodon/locales/fi.json +++ b/app/javascript/mastodon/locales/fi.json @@ -607,7 +607,7 @@ "search.quick_action.status_search": "Julkaisut haulla {x}", "search.search_or_paste": "Hae tai liitä URL-osoite", "search_popout.full_text_search_disabled_message": "Ei saatavilla palvelimella {domain}.", - "search_popout.full_text_search_logged_out_message": "Saatavilla vain sisäänkirjautuneena.", + "search_popout.full_text_search_logged_out_message": "Käytettävissä vain sisäänkirjautuneena.", "search_popout.language_code": "ISO-kielikoodi", "search_popout.options": "Hakuvalinnat", "search_popout.quick_actions": "Pikatoiminnot", diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json index bfd20a4673..48bbb6b307 100644 --- a/app/javascript/mastodon/locales/gl.json +++ b/app/javascript/mastodon/locales/gl.json @@ -32,6 +32,7 @@ "account.featured_tags.last_status_never": "Sen publicacións", "account.featured_tags.title": "Cancelos destacados de {name}", "account.follow": "Seguir", + "account.follow_back": "Seguir tamén", "account.followers": "Seguidoras", "account.followers.empty": "Aínda ninguén segue esta usuaria.", "account.followers_counter": "{count, plural, one {{counter} Seguidora} other {{counter} Seguidoras}}", @@ -52,6 +53,7 @@ "account.mute_notifications_short": "Silenciar notificacións", "account.mute_short": "Acalar", "account.muted": "Acalada", + "account.mutual": "Mutuo", "account.no_bio": "Sen descrición.", "account.open_original_page": "Abrir páxina orixinal", "account.posts": "Publicacións", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index 658e16b856..6758457273 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -32,7 +32,7 @@ "account.featured_tags.last_status_never": "אין חצרוצים", "account.featured_tags.title": "התגיות המועדפות של {name}", "account.follow": "לעקוב", - "account.follow_back": "החזרת עוקב", + "account.follow_back": "לעקוב בחזרה", "account.followers": "עוקבים", "account.followers.empty": "אף אחד לא עוקב אחר המשתמש הזה עדיין.", "account.followers_counter": "{count, plural,one {עוקב אחד} other {{counter} עוקבים}}", diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json index a7cf1caab4..0344470edf 100644 --- a/app/javascript/mastodon/locales/ie.json +++ b/app/javascript/mastodon/locales/ie.json @@ -32,6 +32,7 @@ "account.featured_tags.last_status_never": "Null postas", "account.featured_tags.title": "Recomandat hashtags de {name}", "account.follow": "Sequer", + "account.follow_back": "Sequer reciprocmen", "account.followers": "Sequitores", "account.followers.empty": "Ancor nequi seque ti-ci usator.", "account.followers_counter": "{count, plural, one {{counter} Sequitor} other {{counter} Sequitor}}", @@ -52,6 +53,7 @@ "account.mute_notifications_short": "Silentiar notificationes", "account.mute_short": "Silentiar", "account.muted": "Silentiat", + "account.mutual": "Reciproc", "account.no_bio": "Null descrition providet.", "account.open_original_page": "Aperter li págine original", "account.posts": "Postas", @@ -191,7 +193,9 @@ "conversation.mark_as_read": "Marcar quam leet", "conversation.open": "Vider conversation", "conversation.with": "Con {names}", + "copy_icon_button.copied": "Copiat al Paperiere", "copypaste.copied": "Copiat", + "copypaste.copy_to_clipboard": "Copiar al Paperiere", "directory.federated": "Del conosset fediverse", "directory.local": "De solmen {domain}", "directory.new_arrivals": "Nov arivantes", @@ -280,6 +284,7 @@ "footer.directory": "Profilarium", "footer.get_app": "Obtener li aplication", "footer.invite": "Invitar gente", + "footer.keyboard_shortcuts": "Rapid-tastes", "footer.privacy_policy": "Politica pri privatie", "footer.source_code": "Vider li fonte-code", "footer.status": "Statu", @@ -342,7 +347,9 @@ "keyboard_shortcuts.favourite": "Favoritisar posta", "keyboard_shortcuts.favourites": "Aperter li liste de favorites", "keyboard_shortcuts.federated": "Aperter li federat témpor-linea", + "keyboard_shortcuts.heading": "Rapid-tastes", "keyboard_shortcuts.home": "Aperter li hemal témpor-linea", + "keyboard_shortcuts.hotkey": "Rapid clave", "keyboard_shortcuts.local": "Aperter li local témpor-linea", "keyboard_shortcuts.mention": "Mentionar li autor", "keyboard_shortcuts.muted": "Aperter li lista de silentiat usatores", @@ -599,6 +606,7 @@ "search.search_or_paste": "Serchar o glutinar URL", "search_popout.full_text_search_disabled_message": "Ne disponibil che {domain}.", "search_popout.full_text_search_logged_out_message": "Solmen disponibil con session initiat.", + "search_popout.language_code": "Code de lingue ISO", "search_popout.options": "Sercha-parametres", "search_popout.quick_actions": "Rapid actiones", "search_popout.recent": "Recent serchas", diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json index 46e83b4dbf..fb839503e9 100644 --- a/app/javascript/mastodon/locales/is.json +++ b/app/javascript/mastodon/locales/is.json @@ -32,6 +32,7 @@ "account.featured_tags.last_status_never": "Engar færslur", "account.featured_tags.title": "Myllumerki hjá {name} með aukið vægi", "account.follow": "Fylgjast með", + "account.follow_back": "Fylgjast með til baka", "account.followers": "Fylgjendur", "account.followers.empty": "Ennþá fylgist enginn með þessum notanda.", "account.followers_counter": "{count, plural, one {Fylgjandi: {counter}} other {Fylgjendur: {counter}}}", @@ -52,6 +53,7 @@ "account.mute_notifications_short": "Þagga í tilkynningum", "account.mute_short": "Þagga niður", "account.muted": "Þaggaður", + "account.mutual": "Sameiginlegir", "account.no_bio": "Engri lýsingu útvegað.", "account.open_original_page": "Opna upprunalega síðu", "account.posts": "Færslur", diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json index e0e047ba14..97b1991803 100644 --- a/app/javascript/mastodon/locales/kk.json +++ b/app/javascript/mastodon/locales/kk.json @@ -17,6 +17,7 @@ "account.badges.group": "Топ", "account.block": "@{name} дегенді бұғаттау", "account.block_domain": "{domain} доменін бұғаттау", + "account.block_short": "Бұғаттау", "account.blocked": "Бұғатталған", "account.browse_more_on_origin_server": "Бастапқы профильден шолу", "account.cancel_follow_request": "Withdraw follow request", diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index 5746ab67a5..264781baa3 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -240,7 +240,7 @@ "empty_column.follow_requests": "아직 팔로우 요청이 없습니다. 요청을 받았을 때 여기에 나타납니다.", "empty_column.followed_tags": "아직 아무 해시태그도 팔로우하고 있지 않습니다. 해시태그를 팔로우하면, 여기에 표시됩니다.", "empty_column.hashtag": "이 해시태그는 아직 사용되지 않았습니다.", - "empty_column.home": "당신의 홈 타임라인은 비어있습니다! 더 많은 사람을 팔로우하여 채워보세요. {suggestions}", + "empty_column.home": "당신의 홈 타임라인은 비어있습니다! 더 많은 사람을 팔로우하여 채워보세요.", "empty_column.list": "리스트에 아직 아무것도 없습니다. 리스트의 누군가가 게시물을 올리면 여기에 나타납니다.", "empty_column.lists": "아직 리스트가 없습니다. 리스트를 만들면 여기에 나타납니다.", "empty_column.mutes": "아직 아무도 뮤트하지 않았습니다.", @@ -659,7 +659,7 @@ "status.media_hidden": "미디어 숨겨짐", "status.mention": "@{name} 님에게 멘션", "status.more": "자세히", - "status.mute": "@{name} 님을 뮤트하기", + "status.mute": "@{name} 뮤트", "status.mute_conversation": "이 대화를 뮤트", "status.open": "상세 정보 표시", "status.pin": "고정", @@ -674,7 +674,7 @@ "status.replied_to": "{name} 님에게", "status.reply": "답장", "status.replyAll": "글타래에 답장", - "status.report": "{name} 님을 신고하기", + "status.report": "@{name} 신고하기", "status.sensitive_warning": "민감한 내용", "status.share": "공유", "status.show_filter_reason": "그냥 표시하기", diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json index c54ed2a7e9..ce6cb56473 100644 --- a/app/javascript/mastodon/locales/lad.json +++ b/app/javascript/mastodon/locales/lad.json @@ -482,12 +482,14 @@ "onboarding.profile.discoverable": "Faz ke mi profil apareska en bushkedas", "onboarding.profile.display_name": "Nombre amostrado", "onboarding.profile.display_name_hint": "Tu nombre para amostrar.", + "onboarding.profile.lead": "Siempre puedes kompletar esto mas tadre en las preferensyas, ande tambien ay mas opsyones de personalizasyon.", "onboarding.profile.note": "Tu deskripsyon", "onboarding.profile.note_hint": "Puedes @enmentar a otra djente o #etiketas…", "onboarding.profile.save_and_continue": "Guadra i kontinua", "onboarding.profile.title": "Konfigurasyon de profil", "onboarding.profile.upload_avatar": "Karga imaje de profil", "onboarding.profile.upload_header": "Karga kavesera de profil", + "onboarding.share.lead": "Informe a otros komo toparte en Mastodon!", "onboarding.share.message": "Soy {username} en #Mastodon! Segidme en {url}", "onboarding.share.next_steps": "Posivles sigientes pasos:", "onboarding.share.title": "Partaja tu profil", @@ -497,6 +499,7 @@ "onboarding.steps.follow_people.title": "Personaliza tu linya prinsipala", "onboarding.steps.publish_status.title": "Eskrive tu primera publikasyon", "onboarding.steps.setup_profile.title": "Personaliza tu profil", + "onboarding.steps.share_profile.body": "Informe a tus amigos komo toparte en Mastodon", "onboarding.steps.share_profile.title": "Partaja tu profil de Mastodon", "picture_in_picture.restore": "Restora", "poll.closed": "Serrado", diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json index 3ef2f80eaf..e5b1d2b378 100644 --- a/app/javascript/mastodon/locales/nn.json +++ b/app/javascript/mastodon/locales/nn.json @@ -482,6 +482,7 @@ "onboarding.follows.empty": "Me kan ikkje visa deg nokon resultat no. Du kan prøva å søkja eller bla gjennom utforsk-sida for å finna folk å fylgja, eller du kan prøva att seinare.", "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!", "onboarding.follows.title": "Popular on Mastodon", + "onboarding.profile.discoverable": "Gjør min profil synlig", "onboarding.profile.display_name": "Synleg namn", "onboarding.profile.display_name_hint": "Det fulle namnet eller kallenamnet ditt…", "onboarding.profile.lead": "Du kan alltid fullføra dette seinare i innstillingane, og der er det endå fleire tilpassingsalternativ.", @@ -534,6 +535,7 @@ "privacy.unlisted.short": "Uoppført", "privacy_policy.last_updated": "Sist oppdatert {date}", "privacy_policy.title": "Personvernsreglar", + "recommended": "Anbefalt", "refresh": "Oppdater", "regeneration_indicator.label": "Lastar…", "regeneration_indicator.sublabel": "Heimetidslina di vert førebudd!", @@ -604,6 +606,7 @@ "search.quick_action.status_search": "Innlegg som samsvarer med {x}", "search.search_or_paste": "Søk eller lim inn URL", "search_popout.full_text_search_disabled_message": "Ikkje tilgjengeleg på {domain}.", + "search_popout.full_text_search_logged_out_message": "Bare tilgjengelig ved innlogging.", "search_popout.language_code": "ISO-språkkode", "search_popout.options": "Søkjealternativ", "search_popout.quick_actions": "Hurtighandlinger", diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json index 29eaeddff5..c0f50283ac 100644 --- a/app/javascript/mastodon/locales/no.json +++ b/app/javascript/mastodon/locales/no.json @@ -32,6 +32,7 @@ "account.featured_tags.last_status_never": "Ingen Innlegg", "account.featured_tags.title": "{name} sine fremhevede emneknagger", "account.follow": "Følg", + "account.follow_back": "Følg tilbake", "account.followers": "Følgere", "account.followers.empty": "Ingen følger denne brukeren ennå.", "account.followers_counter": "{count, plural, one {{counter} følger} other {{counter} følgere}}", @@ -52,6 +53,7 @@ "account.mute_notifications_short": "Demp varsler", "account.mute_short": "Demp", "account.muted": "Dempet", + "account.mutual": "Gjensidig", "account.no_bio": "Ingen beskrivelse oppgitt.", "account.open_original_page": "Gå til originalsiden", "account.posts": "Innlegg", @@ -66,7 +68,7 @@ "account.unblock_domain": "Opphev blokkering av {domain}", "account.unblock_short": "Opphev blokkering", "account.unendorse": "Ikke vis frem på profilen", - "account.unfollow": "Avfølg", + "account.unfollow": "Slutt å følge", "account.unmute": "Opphev demping av @{name}", "account.unmute_notifications_short": "Opphev demping av varsler", "account.unmute_short": "Opphev demping", @@ -480,6 +482,7 @@ "onboarding.follows.empty": "Dessverre kan ingen resultater vises akkurat nå. Du kan prøve å bruke søk eller bla gjennom utforske-siden for å finne folk å følge, eller prøve igjen senere.", "onboarding.follows.lead": "Hjem-skjermen din er den viktigste måten å oppleve Mastodon på. Jo flere du følger, jo mer aktiv og interessant blir det. For å komme i gang, er her noen forslag:", "onboarding.follows.title": "Populært på Mastodon", + "onboarding.profile.discoverable": "Gjør min profil synlig", "onboarding.profile.display_name": "Visningsnavn", "onboarding.profile.display_name_hint": "Ditt fulle navn eller ditt morsomme navn…", "onboarding.profile.lead": "Du kan alltid fullføre dette senere i innstillingene, der enda flere tilpasningsalternativer er tilgjengelige.", @@ -532,6 +535,7 @@ "privacy.unlisted.short": "Uoppført", "privacy_policy.last_updated": "Sist oppdatert {date}", "privacy_policy.title": "Personvernregler", + "recommended": "Anbefalt", "refresh": "Oppfrisk", "regeneration_indicator.label": "Laster…", "regeneration_indicator.sublabel": "Dine tidslinje blir gjort klar!", @@ -602,6 +606,7 @@ "search.quick_action.status_search": "Innlegg som samsvarer med {x}", "search.search_or_paste": "Søk eller lim inn URL", "search_popout.full_text_search_disabled_message": "Ikke tilgjengelig på {domain}.", + "search_popout.full_text_search_logged_out_message": "Bare tilgjengelig ved innlogging.", "search_popout.language_code": "ISO språkkode", "search_popout.options": "Alternativer for søk", "search_popout.quick_actions": "Hurtighandlinger", diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json index 37a8328c98..a8ff90cc00 100644 --- a/app/javascript/mastodon/locales/ru.json +++ b/app/javascript/mastodon/locales/ru.json @@ -32,6 +32,7 @@ "account.featured_tags.last_status_never": "Нет постов", "account.featured_tags.title": "Избранные хэштеги {name}", "account.follow": "Подписаться", + "account.follow_back": "Подписаться в ответ", "account.followers": "Подписчики", "account.followers.empty": "На этого пользователя пока никто не подписан.", "account.followers_counter": "{count, plural, one {{counter} подписчик} many {{counter} подписчиков} other {{counter} подписчика}}", @@ -52,6 +53,7 @@ "account.mute_notifications_short": "Отключить уведомления", "account.mute_short": "Немой", "account.muted": "Игнорируется", + "account.mutual": "Взаимно", "account.no_bio": "Описание не предоставлено.", "account.open_original_page": "Открыть исходную страницу", "account.posts": "Посты", diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index 02425d73e0..3e41a2035a 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -21,7 +21,7 @@ "account.blocked": "Blokovaný/á", "account.browse_more_on_origin_server": "Prehľadávaj viac na pôvodnom profile", "account.cancel_follow_request": "Zruš žiadosť o sledovanie", - "account.copy": "Skopíruj odkaz pre profil", + "account.copy": "Skopíruj odkaz na profil", "account.direct": "Spomeň @{name} súkromne", "account.disable_notifications": "Prestaň mi oznamovať, keď má @{name} príspevky", "account.domain_blocked": "Doména skrytá", @@ -32,6 +32,7 @@ "account.featured_tags.last_status_never": "Žiadne príspevky", "account.featured_tags.title": "Odporúčané hashtagy používateľa {name}", "account.follow": "Sleduj", + "account.follow_back": "Nasleduj späť", "account.followers": "Sledovatelia", "account.followers.empty": "Tohto používateľa ešte nikto nenasleduje.", "account.followers_counter": "{count, plural, one {{counter} Sledujúci} few {{counter} Sledujúci} many {{counter} Sledujúcich} other {{counter} Sledujúcich}}", @@ -52,6 +53,7 @@ "account.mute_notifications_short": "Stíš oznámenia", "account.mute_short": "Stíš", "account.muted": "Stíšený", + "account.mutual": "Spoločné", "account.no_bio": "Nie je uvedený žiadny popis.", "account.open_original_page": "Otvor pôvodnú stránku", "account.posts": "Príspevky", diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json index 59ad0ae84e..77c262e957 100644 --- a/app/javascript/mastodon/locales/sr-Latn.json +++ b/app/javascript/mastodon/locales/sr-Latn.json @@ -32,6 +32,7 @@ "account.featured_tags.last_status_never": "Nema objava", "account.featured_tags.title": "Istaknute heš oznake korisnika {name}", "account.follow": "Prati", + "account.follow_back": "Uzvrati praćenje", "account.followers": "Pratioci", "account.followers.empty": "Još uvek niko ne prati ovog korisnika.", "account.followers_counter": "{count, plural, one {{counter} pratilac} few {{counter} pratioca} other {{counter} pratilaca}}", @@ -52,6 +53,7 @@ "account.mute_notifications_short": "Isključi obaveštenja", "account.mute_short": "Isključi", "account.muted": "Ignorisan", + "account.mutual": "Zajednički", "account.no_bio": "Nema opisa.", "account.open_original_page": "Otvori originalnu stranicu", "account.posts": "Objave", diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json index 79786b8d44..85e7567bf4 100644 --- a/app/javascript/mastodon/locales/sr.json +++ b/app/javascript/mastodon/locales/sr.json @@ -32,6 +32,7 @@ "account.featured_tags.last_status_never": "Нема објава", "account.featured_tags.title": "Истакнуте хеш ознаке корисника {name}", "account.follow": "Прати", + "account.follow_back": "Узврати праћење", "account.followers": "Пратиоци", "account.followers.empty": "Још увек нико не прати овог корисника.", "account.followers_counter": "{count, plural, one {{counter} пратилац} few {{counter} пратиоца} other {{counter} пратилаца}}", diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json index d14e37517d..b108e581a4 100644 --- a/app/javascript/mastodon/locales/th.json +++ b/app/javascript/mastodon/locales/th.json @@ -53,6 +53,7 @@ "account.mute_notifications_short": "ซ่อนการแจ้งเตือน", "account.mute_short": "ซ่อน", "account.muted": "ซ่อนอยู่", + "account.mutual": "คนที่มีร่วมกัน", "account.no_bio": "ไม่ได้ให้คำอธิบาย", "account.open_original_page": "เปิดหน้าดั้งเดิม", "account.posts": "โพสต์", @@ -203,7 +204,7 @@ "disabled_account_banner.text": "มีการปิดใช้งานบัญชีของคุณ {disabledAccount} ในปัจจุบัน", "dismissable_banner.community_timeline": "นี่คือโพสต์สาธารณะล่าสุดจากผู้คนที่บัญชีได้รับการโฮสต์โดย {domain}", "dismissable_banner.dismiss": "ปิด", - "dismissable_banner.explore_links": "นี่คือเรื่องข่าวที่ได้รับการแบ่งปันมากที่สุดในเว็บสังคมวันนี้ เรื่องข่าวที่ใหม่กว่าที่ได้รับการโพสต์โดยผู้คนต่าง ๆ มากกว่าจะได้รับการจัดอันดับที่สูงกว่า", + "dismissable_banner.explore_links": "นี่เป็นเรื่องข่าวที่ได้รับการแชร์มากที่สุดในเว็บสังคมวันนี้ เรื่องข่าวที่ใหม่กว่าที่มีคนโพสต์มากกว่าจะได้รับการจัดอันดับที่สูงกว่า", "dismissable_banner.explore_statuses": "นี่คือโพสต์จากทั่วทั้งเว็บสังคมที่กำลังได้รับความสนใจวันนี้ โพสต์ที่ใหม่กว่าที่มีการดันและรายการโปรดมากกว่าจะได้รับการจัดอันดับที่สูงกว่า", "dismissable_banner.explore_tags": "นี่คือแฮชแท็กที่กำลังได้รับความสนใจในเว็บสังคมวันนี้ แฮชแท็กที่มีการใช้โดยผู้คนต่าง ๆ มากกว่าจะได้รับการจัดอันดับที่สูงกว่า", "dismissable_banner.public_timeline": "นี่คือโพสต์สาธารณะล่าสุดจากผู้คนในเว็บสังคมที่ผู้คนใน {domain} ติดตาม", diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json index 92eacaad14..5ec0da599b 100644 --- a/app/javascript/mastodon/locales/uk.json +++ b/app/javascript/mastodon/locales/uk.json @@ -32,6 +32,7 @@ "account.featured_tags.last_status_never": "Немає дописів", "account.featured_tags.title": "{name} виділяє хештеґи", "account.follow": "Підписатися", + "account.follow_back": "Підписатися взаємно", "account.followers": "Підписники", "account.followers.empty": "Ніхто ще не підписаний на цього користувача.", "account.followers_counter": "{count, plural, one {{counter} підписник} few {{counter} підписники} many {{counter} підписників} other {{counter} підписники}}", diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json index 721c7cd4ad..03c6502651 100644 --- a/app/javascript/mastodon/locales/vi.json +++ b/app/javascript/mastodon/locales/vi.json @@ -32,6 +32,7 @@ "account.featured_tags.last_status_never": "Chưa có tút", "account.featured_tags.title": "Hashtag của {name}", "account.follow": "Theo dõi", + "account.follow_back": "Theo dõi lại", "account.followers": "Người theo dõi", "account.followers.empty": "Chưa có người theo dõi nào.", "account.followers_counter": "{count, plural, one {{counter} Người theo dõi} other {{counter} Người theo dõi}}", @@ -52,6 +53,7 @@ "account.mute_notifications_short": "Ẩn thông báo", "account.mute_short": "Ẩn", "account.muted": "Đã ẩn", + "account.mutual": "Đang theo dõi nhau", "account.no_bio": "Chưa có miêu tả.", "account.open_original_page": "Mở trang gốc", "account.posts": "Tút", diff --git a/config/locales/activerecord.ie.yml b/config/locales/activerecord.ie.yml index 0c63299e04..588105ae96 100644 --- a/config/locales/activerecord.ie.yml +++ b/config/locales/activerecord.ie.yml @@ -6,4 +6,52 @@ ie: expires_at: Cludent date options: Optiones user: + agreement: Acorde de servicie + email: E-posta + locale: Local password: Passa-parol + user/account: + username: Nómine del usator + user/invite_request: + text: Rason + errors: + models: + account: + attributes: + username: + reserved: es reservat + admin/webhook: + attributes: + url: + invalid: ne es un valid URL + doorkeeper/application: + attributes: + website: + invalid: ne es un valid URL + import: + attributes: + data: + malformed: es malformat + status: + attributes: + reblog: + taken: de posta ja existe + user: + attributes: + email: + unreachable: sembla ne exister + role_id: + elevated: ne posse esser plu alt quam tui actual rol + user_role: + attributes: + permissions_as_keys: + dangerous: include permissones ne secur por li rol de base + elevated: ne posse includer permissiones ne possedet de tui rol actual + own_role: ne posse esser changeat con tui actual rol + position: + elevated: ne posse esser plu alt quam tui actual rol + own_role: ne posse esser changeat con tui actual rol + webhook: + attributes: + events: + invalid_permissions: ne posse includer evenimentes por queles tu ne have li yures diff --git a/config/locales/devise.ie.yml b/config/locales/devise.ie.yml index 0cf0fbe1fe..847b0f361b 100644 --- a/config/locales/devise.ie.yml +++ b/config/locales/devise.ie.yml @@ -1,6 +1,8 @@ --- ie: devise: + confirmations: + confirmed: Tui e-mail adresse ha esset confirmat successosimen. failure: already_authenticated: Tu ha ja intrat. inactive: Tui conto ancor ne ha esset activat. @@ -13,13 +15,24 @@ ie: unauthenticated: Tu deve intrar o registrar te ante continuar. unconfirmed: Tu deve confirmar tui e-posta ante continuar. mailer: + confirmation_instructions: + action: Verificar e-posta + action_with_app: Confirma e retorna a%{app} + title: Verificar e-posta email_changed: + explanation: 'Li e-mail adresse de tui es changeat a:' extra: Si tu ne changeat tui email-adresse, it es probabil que alqui ha ganiat accesse a tui conto. Ples changear tui passa-parol strax o contacter li administrator del servitor si tu ne posse intrar tui conto. + subject: 'Mastodon: E-posta changeat' + title: Nov adresse de e-posta password_change: explanation: Li passa-parol de tui conto ha esset changeat. extra: Si tu ne changeat tui passa-parol, it es probabil que alqui ha ganiat accesse a tui conto. Ples changear tui passa-parol strax o contacter li administrator del servitor si tu ne posse intrar tui conto. subject: 'Mastodon: Passa-parol changeat' title: Passa-parol changeat + reconfirmation_instructions: + explanation: Confirmar li nov adresse por changeat tui e-posta. + subject: 'Mastodon: E-posta de confirmation por %{instance}' + title: Verificar e-posta reset_password_instructions: action: Changear passa-parol explanation: Tu demandat un nov passa-parol por tui conto. @@ -28,6 +41,18 @@ ie: title: Reiniciar passa-parol two_factor_disabled: explanation: 2-factor autentication por tui conto ha esset desactivisat. Aperter session nu es possibil solmen per email-adresse e passa-parol. + title: 2FA desvalidat + two_factor_enabled: + title: 2FA permisset + unlock_instructions: + subject: 'Mastodon: Desserral instructiones' + webauthn_credential: + added: + subject: 'Mastodon: Nov clave de securitá' + title: Un nov clave de securitá ha esset adjuntet + webauthn_disabled: + subject: 'Mastodon: Autentication con claves de securitá desactivisat' + title: Claves de securitá desactivisat omniauth_callbacks: failure: Ne posset autenticar te de %{kind} pro "%{reason}". passwords: @@ -38,3 +63,15 @@ ie: updated_not_active: Tui passa-parol ha esset changeat successosimen. registrations: signed_up: Benevenit! Tu ha successat registrar te. + updated: Tui conto ha esset actualisat successosimen. + sessions: + already_signed_out: Exeat successosimen. + signed_in: Intrat successosimen. + signed_out: Exeat successosimen. + errors: + messages: + already_confirmed: esset ja confirmat, ples prova intrar + confirmation_period_expired: besona esser confirmat intra %{period}, ples demanda un nov + expired: ha expirat, ples demandar un nov + not_found: ne trovat + not_locked: ne esset serrat diff --git a/config/locales/devise.ko.yml b/config/locales/devise.ko.yml index 3ab7c11a5c..65f660f105 100644 --- a/config/locales/devise.ko.yml +++ b/config/locales/devise.ko.yml @@ -2,7 +2,7 @@ ko: devise: confirmations: - confirmed: 이메일이 성공적으로 승인 되었습니다. + confirmed: 이메일이 성공적으로 확인 되었습니다. send_instructions: 몇 분 이내로 확인 이메일이 발송 됩니다. 이메일을 받지 못 한 경우, 스팸 폴더를 확인하세요. send_paranoid_instructions: 이메일 주소가 저희 데이터베이스에 있는 경우, 몇 분 내에 이메일 주소를 확인하는 방법에 대한 안내가 포함된 이메일을 받을 수 있습니다. 이 이메일을 받지 못했다면 스팸 폴더를 확인해 주세요. failure: diff --git a/config/locales/doorkeeper.ie.yml b/config/locales/doorkeeper.ie.yml index 83c9cc564f..e5e5146558 100644 --- a/config/locales/doorkeeper.ie.yml +++ b/config/locales/doorkeeper.ie.yml @@ -1,11 +1,157 @@ --- ie: + activerecord: + attributes: + doorkeeper/application: + name: Nómine de aplication + redirect_uri: URI de redirection + website: Situ web de aplication + errors: + models: + doorkeeper/application: + attributes: + redirect_uri: + fragment_present: ne posse contener un fragment. + invalid_uri: deve esser un URI valid. + relative_uri: deve esser un URI absolut. + secured_uri: deve esser un URI de HTTPS/SSL. doorkeeper: + applications: + buttons: + authorize: Autorisar + cancel: Anullar + destroy: Destructer + edit: Redacter + submit: Submisser + confirmations: + destroy: Es tu cert? + edit: + title: Modificar aplication + help: + redirect_uri: Usar un linea per URI + index: + application: Aplication + delete: Deleter + empty: Tu have null aplicationes. + name: Nómine + new: Nov aplication + show: Monstrar + title: Tui aplicationes + new: + title: Nov aplication + show: + actions: Actiones + application_id: Clave de client + secret: Secrete de client + title: 'Aplication: %{name}' + authorizations: + buttons: + authorize: Autorisar + deny: Negar + error: + title: Alquo ha errat + new: + title: Autorisation besonat + authorized_applications: + buttons: + revoke: Revocar + confirmations: + revoke: Es tu cert? + index: + authorized_at: Autorisat ye %{date} + last_used_at: Ultimmen usat ye %{date} + never_used: Nequande usat + scopes: Permissiones + superapp: Intern + title: Tui autorisat aplicationes + errors: + messages: + invalid_client: Fallit autentification pro ínconosset client, manca de client-autentification, o ne subtenet metode de autentification. + invalid_redirect_uri: Li uri de redirection includet ne es valid. + invalid_request: + unknown: Li petition manca un postulat parametre, include un ne apoyat parametre-valore, o es altrimen mal format. + unsupported_grant_type: Li tip de autorisation concedet ne es subtenet per li autorisant servitor. + unsupported_response_type: Li autorisant servitor ne subtene ti-ci tip de response. + flash: + applications: + create: + notice: Aplication creat. + destroy: + notice: Aplication deletet. + update: + notice: Aplication actualisat. + authorized_applications: + destroy: + notice: Aplication revocat. grouped_scopes: + access: + read: Accesse solmen por leer + read/write: Accesse por leer e scrir + write: Accesse solmen por scrir title: + accounts: Contos + admin/accounts: Administration de contos + admin/all: Omni functiones administrativ + admin/reports: Administration de raportes + all: Plen accesse a tui conto Mastodon + blocks: Bloccas + bookmarks: Marcatores + conversations: Conversationes + favourites: Favorites + filters: Filtres follow: Seques, silentias e bloccas + follows: Seque + lists: Listes + media: Medie-atachamentes mutes: Silentias + notifications: Notificationes + push: Notificationes push + reports: Raportes + search: Serchar + statuses: Postas + layouts: + admin: + nav: + applications: Aplicationes scopes: + admin:read: leer li tot data sur li servitor + admin:read:accounts: leer sensitiv information de omni contos + admin:read:domain_allows: leer sensitiv information pri omni permisses de dominia + admin:read:domain_blocks: leer sensitiv information pri omni bloccas de dominia + admin:read:email_domain_blocks: leer sensitiv information pri omni bloccas de dominia basat sur e-posta + admin:read:ip_blocks: leer sensitiv information pri omni bloccas de IP + admin:read:reports: leer sensitiv information pri omni raportes e raportat contos + admin:write: modificar li tot data sur li servitor + admin:write:accounts: far moderatori actiones sur contos + admin:write:canonical_email_blocks: far moderatori actiones sur canonic bloccas de e-posta + admin:write:domain_allows: far actiones de moderation sur permisses de dominia + admin:write:domain_blocks: far actiones de moderation sur bloccas de dominia + admin:write:email_domain_blocks: far actiones de moderation sur bloccas de dominia basat sur e-posta + admin:write:ip_blocks: fa moderatori actiones sur bloccas de IP + admin:write:reports: far moderatori actiones sur raportes + follow: modifica li relationes del conto + read: lee omni datas de tui conto + read:accounts: vide li informationes pri li conto + read:blocks: vider tui bloccas + read:bookmarks: vider tui marcatores + read:favourites: vider tui favorites + read:filters: vider tui filtres + read:follows: vider tui sequitores + read:lists: vider tui listes read:mutes: vider tui silentias + read:notifications: vider tui notificationes + read:reports: vider tui raportes + read:search: serchar in tui nómine + read:statuses: vider omni postas + write: modificar li tot data de tui conto + write:accounts: modifica tui profile + write:blocks: bloccar contos e dominias write:conversations: silentiar e deleter conversationes + write:favourites: favorit postas + write:filters: crea filtres + write:follows: sequer homes + write:lists: crear listes write:mutes: silentiar persones e conversationes + write:notifications: aclarar tui notificationes + write:reports: raportar altri persones + write:statuses: publicar postas diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 9ae5953943..8a0033ee6a 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -1260,11 +1260,20 @@ eo: overwrite_long: Anstataŭigi la nunajn registrojn per la novaj preface: Vi povas importi datumojn, kiujn vi eksportis el alia servilo, kiel liston de homoj, kiujn vi sekvas aŭ blokas. success: Viaj datumoj estis sukcese alŝutitaj kaj estos traktitaj kiel planite + titles: + following: Importado de sekvaj kontoj + lists: Importi listojn + muting: Importado de silentigitaj kontoj + type: Importi tipon + type_groups: + constructive: Sekvoj & Legosignoj + destructive: Blokas kaj silentigas types: blocking: Listo de blokitoj bookmarks: Legosignoj domain_blocking: Listo de blokitaj domajnoj following: Listo de sekvatoj + lists: Listoj muting: Listo de silentigitoj upload: Alŝuti invites: @@ -1279,6 +1288,7 @@ eo: '86400': 1 tago expires_in_prompt: Neniam generate: Krei + invalid: Ĉi tiu invito ne validas invited_by: 'Vi estis invitita de:' max_uses: one: 1 uzo @@ -1305,6 +1315,18 @@ eo: title: Aŭtentiga historio mail_subscriptions: unsubscribe: + action: Jes, malabonu + complete: Malabonita + confirmation_html: Ĉu vi certas, ke vi volas malaboni por ricevi %{type} por Mastodon ĉe %{domain} al via retpoŝto ĉe %{email}? Vi ĉiam povas reaboni de viaj retpoŝtaj sciigaj agordoj. + emails: + notification_emails: + favourite: plej ŝatataj sciigaj retpoŝtoj + follow: sekvu sciigajn retmesaĝojn + follow_request: sekvu petajn retpoŝtojn + mention: menciu sciigajn retmesaĝojn + reblog: plifortigi sciigajn retpoŝtojn + resubscribe_html: Se vi malabonis erare, vi povas reaboni de viaj retpoŝtaj sciigaj agordoj. + success_html: Vi ne plu ricevos %{type} por Mastodon sur %{domain} al via retpoŝto ĉe %{email}. title: Malaboni media_attachments: validations: @@ -1385,6 +1407,7 @@ eo: update: subject: "%{name} redaktis afiŝon" notifications: + administration_emails: Admin retpoŝtaj sciigoj email_events: Eventoj por retpoŝtaj sciigoj email_events_hint: 'Elekti la eventojn pri kioj vi volas ricevi sciigojn:' other_settings: Aliaj agordoj de sciigoj @@ -1421,6 +1444,7 @@ eo: expired: La enketo jam finiĝis invalid_choice: La elektita voĉdono ne ekzistas over_character_limit: ne povas esti po pli longa ol %{max} signoj + self_vote: Vi ne povas voĉdoni en viaj propraj balotenketoj too_few_options: devas enhavi pli da unu propono too_many_options: ne povas enhavi pli da %{max} proponoj preferences: @@ -1428,7 +1452,14 @@ eo: posting_defaults: Afiŝaj defaŭltoj public_timelines: Publikaj templinioj privacy: + hint_html: "Agordu kiel vi volas ke via profilo kaj viaj afiŝoj estu trovitaj. Diversaj funkcioj en Mastodon povas helpi vin atingi pli larĝan publikon kiam ĝi estas ebligita. Prenu momenton por revizii ĉi tiujn agordojn por certigi, ke ili taŭgas por via uzokazo." privacy: Privateco + privacy_hint_html: Kontrolu kiom vi volas malkaŝi por la avantaĝo de aliaj. Homoj malkovras interesajn profilojn kaj bonegajn apojn foliumante la sekvaĵojn de aliaj homoj kaj vidante de kiuj aplikaĵoj ili afiŝas, sed vi eble preferas konservi ĝin kaŝita. + reach: Atingo + reach_hint_html: Kontrolu ĉu vi volas esti malkovrita kaj sekvita de novaj homoj. Ĉu vi volas ke viaj afiŝoj aperu sur la ekrano Esplori? Ĉu vi volas ke aliaj homoj vidu vin en siaj sekvaj rekomendoj? Ĉu vi volas akcepti ĉiujn novajn sekvantojn aŭtomate, aŭ havi granulan kontrolon pri ĉiu? + search: Serĉu + search_hint_html: Kontrolu kiel vi volas esti trovita. Ĉu vi volas, ke homoj trovu vin laŭ tio, pri kio vi publike afiŝis? Ĉu vi volas, ke homoj ekster Mastodonto trovu vian profilon dum serĉado en la reto? Bonvolu memori, ke totala ekskludo de ĉiuj serĉiloj ne povas esti garantiita por publika informo. + title: Privateco kaj atingo privacy_policy: title: Privateca politiko reactions: @@ -1470,6 +1501,9 @@ eo: over_daily_limit: Vi transpasis la limigon al %{limit} samtage planitaj mesaĝoj over_total_limit: Vi transpasis la limigon al %{limit} planitaj mesaĝoj too_soon: La planita dato devas esti en la estonteco + self_destruct: + lead_html: Bedaŭrinde, %{domain} konstante fermiĝas. Se vi havis konton tie, vi ne povos daŭrigi uzi ĝin, sed vi ankoraŭ povas peti sekurkopion de viaj datumoj. + title: Ĉi tiu servilo fermiĝas sessions: activity: Lasta ago browser: Retumilo @@ -1638,6 +1672,10 @@ eo: default: "%Y.%b.%d, %H:%M" month: "%b %Y" time: "%H:%M" + translation: + errors: + quota_exceeded: La tutservila uzkvoto por la tradukservo estas superita. + too_many_requests: Lastatempe estis tro multaj petoj al la tradukservo. two_factor_authentication: add: Aldoni disable: Malebligi 2FA-n @@ -1717,6 +1755,7 @@ eo: title: Bonvenon, %{name}! users: follow_limit_reached: Vi ne povas sekvi pli ol %{limit} homo(j) + go_to_sso_account_settings: Iru al la agordoj de la konto de via identeca provizanto invalid_otp_token: Nevalida kodo de dufaktora aŭtentigo otp_lost_help_html: Se vi perdas aliron al ambaŭ, vi povas kontakti %{email} seamless_external_login: Vi estas ensalutinta per ekstera servo, do pasvortaj kaj retadresaj agordoj ne estas disponeblaj. diff --git a/config/locales/ie.yml b/config/locales/ie.yml index 6013923e3f..99e628fe3b 100644 --- a/config/locales/ie.yml +++ b/config/locales/ie.yml @@ -72,6 +72,7 @@ ie: enabled_msg: Successosimen desgelat li conto de %{username} followers: Sequitores follows: Seque + header: Cap-image inbox_url: Inbuxe URL invite_request_text: Rason por adhesion invited_by: Invitat de @@ -118,6 +119,7 @@ ie: remote_suspension_irreversible: Li data de ti-ci conto ha esset deletet ínreversibilmen. remote_suspension_reversible_hint_html: Li conto ha esset suspendet che su servitor, e li data va esser completmen removet ye %{date}. Til tande, li lontan servitor posse restaurar ti conto sin quelcunc mal efectes. Si tu vole remover omni data del conto ínmediatmen, tu posse far it in infra. remove_avatar: Remover li avatar + remove_header: Remover cap-image removed_avatar_msg: Successosimen removet li avatar-image de %{username} removed_header_msg: Successosimen removet li cap-image de %{username} resend_confirmation: @@ -287,6 +289,7 @@ ie: deleted_account: deletet conto filter_by_action: Filtrar per action filter_by_user: Filtrar per usator + title: Jurnale de audit announcements: destroyed_msg: Proclamation deletet successosimen! edit: @@ -330,6 +333,7 @@ ie: no_emoji_selected: Null emoji esset changeat pro que null esset selectet not_permitted: Tu ne es permisset far ti action overwrite: Remplazzar + shortcode: Curt-code shortcode_hint: Adminim 2 carácteres, solmen lítteres, ciffres e sublineas title: Customisat emoji uncategorized: Íncategorisat @@ -461,6 +465,9 @@ ie: unsuppress: Restaurar seque-recomandation instances: availability: + failures_recorded: + one: Fallit prova por %{count} die. + other: Fallit provas por %{count} dies. no_failures_recorded: Null fallimentes registrat. title: Disponibilitá warning: Li ultim prova conexer a ti servitor ha esset ínsuccessosi @@ -485,6 +492,8 @@ ie: instance_followers_measure: nor sequitores ta instance_follows_measure: lor sequitores ci instance_languages_dimension: Max grand lingues + instance_media_attachments_measure: salvat medie-atachamentes + instance_reports_measure: raportes pri les instance_statuses_measure: salvat postas delivery: all: Omni @@ -565,6 +574,7 @@ ie: notes: one: "%{count} nota" other: "%{count} notas" + action_log: Jurnale de audit action_taken_by: Action fat de actions: delete_description_html: Li raportat postas va esser deletet e un admoniment va esser registrat por auxiliar te escalar si hay futuri infractiones del sam conto. @@ -670,26 +680,36 @@ ie: manage_announcements: Tractar proclamationes manage_announcements_description: Permisse usatores tractar proclamationes sur li servitor manage_appeals: Gerer Apelles + manage_appeals_description: Permisse que usatores inspecte apelles contra actiones de moderatores manage_blocks: Gerer Bloccas manage_blocks_description: Permisse que usatores blocca provisores de e-posta e IP-adresses manage_custom_emojis: Gerer Customisat Emojis manage_custom_emojis_description: Permisse que usatores gere customisat emojis sur li servitor manage_federation: Gerer Federation - manage_federation_description: Permisse que usatores sive blocca sive permisse federation con altri domenes, e controla liverabilitá + manage_federation_description: Permisse que usatores sive blocca sive permisse federation con altri dominias, e controla liverabilitá manage_invites: Gerer Invitationes + manage_invites_description: Permisse que usatores naviga e deactiva ligamentes de invitation manage_reports: Gerer Raportes + manage_reports_description: Permisse que usatores inspecte raportes e fa actiones de moderation contra les manage_roles: Gerer Roles + manage_roles_description: Permisse que usatores gere e assigna roles sub li lores manage_rules: Gerer Regules manage_rules_description: Permisse que usatores changea regules del servitor manage_settings: Gerer Parametres manage_settings_description: Permisse que usatores changea parametres del situ manage_taxonomies: Gerer Taxonomies + manage_taxonomies_description: Permisse que usatores inspecte contenete de tendentie e actualisar parametres de hashtags manage_user_access: Gerer Usator-Accesse manage_user_access_description: Permisse usatores desactivisar li 2-factor autentication de altri usatores, changear lor email-adresses, e reiniciar lor passa-paroles manage_users: Gerer usatores - manage_webhooks: Gerer Web-crocs + manage_users_description: Permisse que usatores vide detallies de altri usatores e fa actiones de moderation contra les + manage_webhooks: Gerer Webcrocs + view_audit_log: Vider li Jurnale de Audit view_audit_log_description: Permisse que usatores vide li historie de administrativ actiones sur li servitor + view_dashboard: Vider Panel de Control + view_dashboard_description: Permisse que usatores usa li panel de control e varie metricas view_devops: DevOps + view_devops_description: Permise que usatores usa paneles de control de Sidekiq e pgHero title: Roles rules: add_new: Adjunter un regule @@ -704,6 +724,8 @@ ie: appearance: preamble: Customisar li interfacie web de Mastodon. title: Aspecte + content_retention: + title: Retention de contenete discovery: follow_recommendations: Seque-recomandationes preamble: Exposir interessant contenete es importantissim por incorporar nov usatores qui fórsan conosse nequi che Mastodon. Decider qualmen diferent utensiles de decovrition functiona che vor servitor. @@ -740,6 +762,9 @@ ie: documentation_link: Aprender plu title: Actualisationes disponibil type: Specie + types: + major: Majori lansament + minor: Minori lansament version: Version statuses: account: Autor @@ -781,16 +806,39 @@ ie: system_checks: database_schema_check: message_html: Hay pendent migrationes de database. Ples far les por far cert que li aplication functiona quam expectat + elasticsearch_health_red: + message_html: Li cluster Elasticsearch es ínsalubri (statu rubi), functiones por serchar ne disponibil + elasticsearch_health_yellow: + message_html: Li cluster Elasticsearch es ínsalubri (statu yelb); investigar li rason vell esser un bon idé elasticsearch_preset: action: Vider li documentation + message_html: Tui cluster Elasticsearch have plu quam un node, ma Mastodon ne es configurat por usar les. elasticsearch_preset_single_node: action: Vider li documentation + message_html: Tui cluster Elasticsearch have solmen un node, ples configurar ES_PRESET quam single_node_cluster. + elasticsearch_running_check: + message_html: Ne posset conexer a Elasticsearch. Ples confirmar que it ha esset executet, o desactivar serchada de plen textu + elasticsearch_version_check: + message_html: 'Version de Elasticsearch íncompatibil: %{value}' + version_comparison: Elasticsearch %{running_version} executet ma %{required_version} postulat rules_check: action: Gerer regules de servitor + message_html: Tu ancor ne ha definit quelcunc regules de servitor. software_version_critical_check: + action: Vider actualisationes disponibil message_html: Un critical actualisation por Mastodon es disposibil, ples actualisar tam rapidmen possibil. software_version_patch_check: action: Vider actualisationes disponibil + message_html: Un actualisation por Mastodon quel fixa problemas es disponibil. + upload_check_privacy_error: + action: Vider ci por plu information + message_html: "Vor web-servitor es misconfigurat. Li privatie de vor usatores es in risca." + upload_check_privacy_error_object_storage: + action: Cliccar ci por plu information + message_html: "Vor inmagasinage de objectes es misconfigurat. Li privatie de vor usatores es in risca." + tags: + review: Statu de revision + updated_msg: Parametres pri hashtags actualisat successosimen title: Administration trends: allow: Permisser @@ -805,9 +853,13 @@ ie: no_link_selected: Null ligamentes esset changeat pro que null esset selectet publishers: no_publisher_selected: Null editores esset changeat pro que necun esset selectet + shared_by_over_week: + one: Partit de un person durant li ultim semane + other: Partit de %{count} persones durant li ultim semane title: Ligamentes in tendentie usage_comparison: Partit %{today} vezes hodie, in comparation a %{yesterday} yer not_allowed_to_trend: Ne permisset esser in tendentie + only_allowed: Solmen li permissetes pending_review: Sub inspection preview_card_providers: allowed: Ligamentes de ti-ci editor posse esser in tendentie @@ -859,10 +911,50 @@ ie: empty: Vu ancor ha definit null prefigurationes de avise. title: Modificar prefigurationes de avise webhooks: + add_new: Adjunter punctu terminal + delete: Deleter + disable: Desactivisar + disabled: Desactivisat + edit: Redacter punctu terminal + empty: Tu ancor ne have quelcunc configurat punctus terminal por webcrocs. + enable: Activisar enabled: Activ + enabled_events: + one: 1 eveniment activisat + other: "%{count} evenimentes activisat" events: Evenimentes + new: Nov webcroc + rotate_secret: Rotar secrete + secret: Secrete de signation status: Statu + title: Webcrocs + webhook: Webcroc admin_mailer: + new_appeal: + actions: + delete_statuses: deleter su postas + disable: gelar su conto + mark_statuses_as_sensitive: marcar su postas quam sensitiv + none: un admoniment + sensitive: marcar su conto quam sensitiv + silence: limitar su conto + suspend: suspender su conto + body: "%{target} apella un moderatori decision fat de %{action_taken_by} ye %{date}, quel esset %{type}. Ilu scrit:" + next_steps: Tu posse aprobar li apelle por desfar li decision moderatori, o ignorar it. + subject: "%{username} apella un moderatori decision che %{instance}" + new_critical_software_updates: + body: Nov critic versiones de Mastodon ha esset lansat, vu fórsan vole actualisar tam tost quam es possibil! + subject: Critic actualisationes por Mastodon es disponibil por %{instance}! + new_pending_account: + body: Li detallies del nov conto es in-infra. Vu posse aprobar o rejecter ti aplication. + subject: Nov conto por tractation che %{instance} (%{username}) + new_report: + body: "%{reporter} ha raportet %{target}" + body_remote: Alqui de %{domain} ha raportet %{target} + subject: Nov raporte por %{instance} (#%{id}) + new_software_updates: + body: Nov versiones de Mastodon ha esset lansat, vu fórsan vole actualisar! + subject: Nov versiones Mastodon es disponibil por %{instance}! new_trends: new_trending_links: title: Populari ligamentes @@ -1284,10 +1376,45 @@ ie: images_and_video: On ne posse atachar un video a un posta quel ja contene images migrations: acct: Translocat a + cancel: Anullar redirection + cancelled_msg: Anullat redirection con successe. + errors: + already_moved: es li sam conto a equel tu ha ja translocat + missing_also_known_as: ne es un alias de ti-ci conto + move_to_self: ne posse esser li conto actual + not_found: ne posset esser trovat + followers_count: Sequitores al témpor de translocation + incoming_migrations: Translocant de un conto diferent + on_cooldown: Tu ha recentmen migrat tui conto. Ti function va esser disponibil denov pos %{count} dies. + past_migrations: Passat migrationes + proceed_with_move: Translocar sequitores + redirected_msg: Tui conto nu have un redirection a %{acct}. + redirecting_to: Tui conto redirecte a %{acct}. set_redirect: Configurar un redirection + warning: + backreference_required: Li nov conto deve in prim esser configurat por retroreferentiar ti-ci conto + before: 'Ante proceder, ples leer ti notas cuidosimen:' + other_data: Necun altri data va esser translocat automaticmen + moderation: + title: Moderation move_handler: + carry_blocks_over_text: Ti usator translocat se de %{acct}, quel tu hat bloccat. carry_mutes_over_text: Ti-ci usator movet se de %{acct}, quel tu hat silentiat. + copy_account_note_text: 'Vi tui notas pri ti usator qui translocat se de %{acct}:' notification_mailer: + admin: + report: + subject: "%{name} inviat un raporte" + sign_up: + subject: "%{name} adheret" + favourite: + body: 'Tui posta esset favoritisat de %{name}:' + subject: "%{name} favoritisat tui posta" + title: Nov favoritisation + follow: + body: "%{name} nu seque te!" + subject: "%{name} nu seque te" + title: Nov sequitor follow_request: action: Tractar petitiones de sequer body: "%{name} ha petit sequer te" @@ -1295,6 +1422,8 @@ ie: title: Nov petition de sequer mention: action: Responder + body: 'Tu esset mentionat de %{name} in:' + subject: Tu esset mentionat de %{name} title: Nov mention poll: subject: Un balotation de %{name} ha finit @@ -1346,6 +1475,7 @@ ie: too_many_options: ne posse contener plu quam %{max} optiones preferences: other: Altri + posting_defaults: Predefinitiones por postar public_timelines: Public témpor-lineas privacy: hint_html: "Customisa qualmen tu vole que tui profil e tui postas posse esser trovat. Mastodon have un varietá de manieres por auxiliar te atinger un auditorie plu grand quande activisat. Prende un moment por reviser ti parametres por far cert que ili concorda tui casu de usation." @@ -1383,6 +1513,11 @@ ie: remove_selected_followers: Remover selectet sequitores remove_selected_follows: Dessequer selectet usatores status: Statu del conto + remote_follow: + missing_resource: Ne posset trovar li besonat URL de redirection por tui conto + reports: + errors: + invalid_rules: ne refere valid regules rss: content_warning: 'Avise pri li contenete:' descriptions: @@ -1476,9 +1611,16 @@ ie: one: "%{count} video" other: "%{count} videos" boosted_from_html: Boostat de %{acct_link} + content_warning: 'Avise de contenete: %{warning}' default_language: Sam quam li lingue del interfacie + disallowed_hashtags: + one: 'contenet un ínpermisset hashtag: %{tags}' + other: 'contenet li ínpermisset hashtags: %{tags}' edited_at_html: Modificat ye %{date} + errors: + in_reply_not_found: Li posta a quel tu prova responder ne sembla exister. open_in_web: Aperter in web + over_character_limit: límite de carácteres de %{max} transpassat pin_errors: direct: On ne posse pinglar postas queles es visibil solmen a mentionat usatores limit: Tu ja ha pinglat li maxim númere de postas @@ -1495,8 +1637,11 @@ ie: show_more: Monstrar plu show_newer: Monstrar plu nov show_older: Monstrar plu old + show_thread: Monstrar fil title: "%{name}: «%{quote}»" visibilities: + direct: Direct + private: Solmen por sequitores private_long: Monstrar solmen a sequitores public: Public public_long: Omnes posse vider @@ -1508,17 +1653,37 @@ ie: exceptions: Exceptiones explanation: Deletion de postas es un operation expensiv, e pro to es efectuat lentmen quande li servitor ne es ocupat. Pro to, on posse deleter tui postas un cert témpor pos atinger un cert etá. ignore_favs: Ignorar favorites + ignore_reblogs: Ignorar boosts interaction_exceptions: Exceptiones basat sur interactiones + interaction_exceptions_explanation: Nota que it ne es garantit que un posta va esser deletet si su númere de favoritisationes o boosts descresce sub li sill pos que it ha esset súper it. keep_direct: Retener missages direct keep_direct_hint: Ne delete quelcunc de tui direct missages + keep_media: Conservar postas con medie-atachamentes + keep_media_hint: Ne delete quelcunc de tui postas quel have medie-atachamentes keep_pinned: Conservar pinglat postas keep_pinned_hint: Delete null de tui pinglat postas keep_polls: Conservar balotationes keep_polls_hint: Delete null de tui balotationes + keep_self_bookmark: Conservar postas queles tu ha marcat + keep_self_bookmark_hint: Ne delete tui propri postas si tu ha marcat les keep_self_fav: Retener postas favorit de te + keep_self_fav_hint: Ne delete tui propri postas si tu ha favoritisat les min_age: '1209600': 2 semanes + '15778476': 6 mensus + '2629746': 1 mensu '31556952': 1 annu + '5259492': 2 mensus + '604800': 1 semane + '63113904': 2 annus + '7889238': 3 mensus + min_age_label: Sill de etá + min_favs: Conservar postas favoritisat adminim + min_favs_hint: Ne delete quelcunc de tui postas quel ha recivet adminim ti-ci númere de favoritisationes. Lassar vacui por deleter postas sin egard a su númere de favoritisationes + min_reblogs: Conservar postas boostat adminim + min_reblogs_hint: Ne delete quelcunc de tui postas quel ha recivet adminim ti-ci númere de boosts. Lassar vacui por deleter postas sin egard a su númere de boosts + stream_entries: + sensitive_content: Sensitiv contenete strikes: errors: too_late: It es tro tard por apellar ti admoniment @@ -1595,22 +1760,37 @@ ie: mark_statuses_as_sensitive: Tui postas che %{acct} ha esset marcat quam sensitiv none: Admoniment por %{acct} sensitive: Tui postas che %{acct} ve esser marcat quam sensitiv pos nu + silence: Tui conto %{acct} ha esset limitat + suspend: Tui conto %{acct} ha esset suspendet title: delete_statuses: Postas efaciat + disable: Conto gelat + mark_statuses_as_sensitive: Postas marcat quam sensitiv + none: Admoniment sensitive: Conto marcat quam sensitiv silence: Conto limitat suspend: Conto suspendet welcome: edit_profile_action: Configuration de profil + edit_profile_step: Tu posse personalisar tui profil por cargar un profil-image, changear tui monstrat nómine e plu. Tu posse optar tractar nov sequitores ante que ili es permisset sequer te. explanation: Vi quelc suggestiones por que tu mey comensar final_action: Comensar postar + final_step: 'Comensa a postar! Mem sin sequitores, tui public postas posse esser videt de altres, per exemple in li local témpor-linea o in hashtags. Tu fórsan vole introducter te per li hashtag #introductions.' + full_handle: Tui plen usator-nómine + full_handle_hint: Ti-ci es ti quel tu vell dir a tui amics por que ili mey inviar missages a te o sequer te de un altri servitor. subject: Benevenit a Mastodon title: Benevenit, %{name}! users: + follow_limit_reached: Tu ne posse sequer plu quam %{limit} persones + go_to_sso_account_settings: Ear al parametres de conto de tui provisor de identification + invalid_otp_token: Ínvalid 2-factor code + otp_lost_help_html: Si tu perdit accesse a ambis, tu posse contacter %{email} seamless_external_login: Tu ha intrat per un servicie external, dunc parametres pri tui passa-parol e email-adresse ne es disponibil. + signed_in_as: 'Session apertet quam:' verification: extra_instructions_html: 'Nota: Li ligament in tui websitu posse esser ínvisibil. Li important parte es rel="me" quel prevente fals self-identification in websitus con contenete generat de usatores. Tu posse mem usar un link element in li cap-section del págine vice a, ma li HTML code deve esser accessibil sin executer JavaScript.' here_is_how: Vide qualmen + instructions_html: Copiar e collar li code ci infra in li HTML de tui web-situ. Poy adjunter li adresse de tui web-situ ad-in un del aditional campes sur tui profil ex li section "Modificar profil" e salvar li changes. verification: Verification verified_links: Tui verificat ligamentes webauthn_credentials: @@ -1620,3 +1800,7 @@ ie: success: Tui clave de securitá esset adjuntet con successe. delete: Deleter delete_confirmation: Vole tu vermen deleter ti-ci clave de securitá? + invalid_credential: Ínvalid clave de securitá + not_enabled: Tu ancor ne ha possibilisat WebAuthn + not_supported: Ti-ci navigator ne subtene claves de securitá + registered_on: Adheret ye %{date} diff --git a/config/locales/lad.yml b/config/locales/lad.yml index 471b830a3e..5c541d9f99 100644 --- a/config/locales/lad.yml +++ b/config/locales/lad.yml @@ -333,6 +333,7 @@ lad: not_permitted: No tienes permiso para realizar esta aksyon overwrite: Sobreskrive shortcode: Kodiche kurto + shortcode_hint: Al menos 2 karakteres, solo karakteres alfanumerikos i sulinyados title: Emojis personalizados uncategorized: No kategorizado unlist: No lista @@ -525,6 +526,7 @@ lad: total_reported: Raportos sovre eyos total_storage: Aneksos de multimedia totals_time_period_hint_html: Los totales amostrados a kontinuasyon inkluyen datos para todo el tiempo. + unknown_instance: Por agora no ay dingun rejistro en este domeno en este sirvidor. invites: deactivate_all: Dezaktiva todos filter: @@ -705,27 +707,41 @@ lad: manage_users: Administra utilizadores manage_users_description: Permete a los utilizadores ver los peratim de otros utilizadores i realizar aksyones de moderasyon kontra eyos manage_webhooks: Administrar webhooks + view_audit_log: Mostra defter de revisyon + view_audit_log_description: Permete a los utilizadores ver una estoria de aksyones administrativas en el sirvidor view_dashboard: Ve pano + view_dashboard_description: Permete a los utilizadores akseder al panel de kontrolo i varias metrikas view_devops: DevOps + view_devops_description: Permete a los utilizadores akseder a los paneles de kontrolo Sidekiq i pgHero title: Rolos rules: add_new: Adjusta regla delete: Efasa + description_html: Aunke la majorita afirma aver meldado i estar de akodro kon los terminos de servisyo, la djente normalmente no los melda asta dempues de ke surja algun problema. Az ke sea mas kolay ver las normas de tu sirvidor de un vistazo estipulándolas en una lista de puntos. Aprova ke kada norma sea corta i kolay, ama sin estar divididas en munchos puntos. edit: Edita regla + empty: Dinguna regla del sirvidor tiene sido definida. title: Reglas del sirvidor settings: about: manage_rules: Administra reglas del sirvidor + preamble: Mete aki enformasyon detalyada sovre komo el sirvidor es operado, moderado i finansyado. + rules_hint: Ay una area dedikada para las reglas a las ke se aspera ke tus utilizadores sigan. title: Sovre esto appearance: preamble: Personaliza la enterfaz web de Mastodon. title: Aparensya branding: + preamble: La marka de tu sirvidor lo desferensia de otros sirvidores de la red. Esta enformasyon puede amostrarse por una varieta de entornos, komo en la enterfaz web de Mastodon, en aplikasyones nativas, en previsualizasiones de atadijos en otros sitios internetikos i en aplikasyones de mesajes, etc. Por esta razon, es mijor mantener esta enformasyon klara, breve i konsiza. title: Marka content_retention: + preamble: Kontrola komo el kontenido jenerado por el utilizador se magazina en Mastodon. title: Retensyon de kontenido + default_noindex: + desc_html: Afekta a todos los utilizadores ke no trokaron esta preferensya eyos mezmos + title: Ekskluye utilizadores de la indeksasyon de los bushkadores komo preferensya predeterminada discovery: follow_recommendations: Rekomendasyones de kuentos + preamble: Ekspone kontenido enteresante a la superfisie es fundamental para inkorporar muevos utilizadores ke pueden no koneser a dinguno Mastodon. Kontrola komo fonksionan varias opsiones de diskuvrimiento en tu sirvidor. profile_directory: Katalogo de profiles public_timelines: Linyas de tiempo publikas publish_discovered_servers: Publika sirvidores diskuviertos @@ -816,6 +832,7 @@ lad: software_version_patch_check: action: Amostra aktualizasyones desponivles upload_check_privacy_error: + action: Klika aki para mas enformasyon message_html: "Tu sirvidor de web es mal konfigurado. La privasita de tus utilizadores esta en riziko." upload_check_privacy_error_object_storage: action: Ve aki para mas enformasyon @@ -837,6 +854,9 @@ lad: no_link_selected: No se troko dingun atadijo porke no eskojites dinguno publishers: no_publisher_selected: No se troko dingun publikador porke no eskojites dinguno + shared_by_over_week: + one: Partajado por una persona durante la ultima semana + other: Partajado por %{count} personas durante la ultima semana title: Atadijos en trend usage_comparison: Partajado %{today} vezes oy, komparado kon %{yesterday} ayer not_allowed_to_trend: Sin permiso para estar en trendes @@ -874,6 +894,7 @@ lad: not_listable: No seran rekomendadas not_trendable: No aperesera en trendes not_usable: No se pueden uzar + peaked_on_and_decaying: Alkanso el piko en %{date}, agora dekresiendo title: Etiketas en trend trendable: Pueden apareser en trendes trending_rank: Trend n.º %{rank} @@ -943,16 +964,23 @@ lad: title: Publikasyones en trend new_trending_tags: title: Etiketas en trend + subject: Muevo trend para revizion en %{instance} aliases: add_new: Kriya un alias + created_msg: Tienes kriyado djustamente el muevo alias. Agora puedes ampesar la movida dizde el kuento viejo. + deleted_msg: El alias fue supremido djustamente. La movida de akel kuento a esta ya no sera posivle. empty: No tienes aliases. + hint_html: Si keres migrar de otro kuento a este, aki puedes kriyar un alias, kale proseder antes de ampesar a mover suivantes del kuento anterior a este. Esta aksion por si mezma es inofensiva i reversivle. La migrasyon del kuento se inisya dizde el kuento viejo. remove: Dezata alias appearance: advanced_web_interface: Enterfaz web avanzada + advanced_web_interface_hint: 'Si keres utilizar todo el ancho de ekran, la enterfaz web avanzada te permete konfigurar varias kolumnas desferentes para ver tanta enformasyon al mezmo tiempo komo keras: Linya prinsipala, avizos, linya de tiempo federada, kualkier numero de listas i etiketas.' animations_and_accessibility: Animasyones i aksesivilita confirmation_dialogs: Dialogos de konfirmasyon discovery: Diskuvrimiento localization: + body: Mastodon es trezladado por volontarios. + guide_link: https://crowdin.com/project/mastodon guide_link_text: Todos pueden kontribuir. sensitive_content: Kontenido sensivle application_mailer: @@ -1067,15 +1095,27 @@ lad: x_months: "%{count} me" x_seconds: "%{count} s" deletes: + challenge_not_passed: Los datos introdusidos son yerrados + confirm_password: Eskrive tu kod aktual para demostrar tu identita + confirm_username: Eskrive tu nombre de utilizador para konfirmar proceed: Efasa kuento success_msg: Tu kuento fue efasado kon reusho warning: before: 'Antes de kontinuar, por favor melda kon atensyon las sigientes notas:' + caches: El kontenido ke tiene sido magazinado en kashe por otros sirvidores puede persistir + data_removal: Tus publikasyones i el resto de datos se supremiran definitivamente + email_change_html: Puedes trokar tu adreso de posta elektronika sin supremir tu kuento + email_contact_html: Si ainda no te tiene parvenido, puedes eskrivir a %{email} para pider ayuda + email_reconfirmation_html: Si no te tiene parvenido la posta de konfirmasyon, puedes retornar a solisitarlo + irreversible: No podras restaurar ni reaktivar tu kuento + more_details_html: Para mas detalyos, ver la politika de privasita. + username_available: Tu nombre de utilizador retornara a estar desponivle username_unavailable: Tu nombre de utilizador no estara desponivle disputes: strikes: action_taken: Aksyon tomada appeal: Apela + appeal_approved: Este amonestamiento fue apelado kon sukseso i ya no es valido appeal_rejected: La apelasyon fue refuzada appeal_submitted_at: Apelasyon embiada appealed_msg: Tu apelasyon fue embiada. Si la achetamos, se te avizara. @@ -1143,6 +1183,7 @@ lad: add_new: Adjusta muevo errors: limit: Tienes alkansado el karar maksimo de etiketas + hint_html: "Avalia tus etiketas mas importantes en tu profil. Se amostran de forma prominente en tu profil publiko i permeten a los utilizadores navigar por tus publikasyones publikas espesifikamente basho akeyas etiketas." filters: contexts: account: Profiles @@ -1154,7 +1195,11 @@ lad: add_keyword: Adjusta biervo yave keywords: Biervos yaves statuses: Publikasyones individualas + statuses_hint_html: Este filtro se aplika a las publikasyones individualas eskojidas endependientemente de si koensidan kon los biervos yave a kontinuasyon. Revize o suprema publikasyones del filtro. title: Edita filtro + errors: + deprecated_api_multiple_keywords: Estos parametros no se pueden trokar dizde esta aplikasyon porke se aplikan a mas de un biervo yave de filtro. Utiliza una aplikasyon mas reziente o la enterfaz web. + invalid_context: Se suminstro un konteksto malato o vazyo index: contexts: Filtros en %{contexts} delete: Efasa @@ -1191,7 +1236,13 @@ lad: none: Dinguno order_by: Ordena por save_changes: Guadra trokamientos + select_all_matching_items: + one: Eskoje %{count} elemento ke koensida kon tu bushkeda. + other: Eskoje todos los %{count} elementos ke koensidan kon tu bushkeda. today: oy + validation_errors: + one: Algo no esta bien! Por favor, reviza el yerro mas abasho + other: Algo no esta bien! Por favor, reviza %{count} yerros mas abasho imports: errors: empty: Dosya CSV vaziya @@ -1208,6 +1259,7 @@ lad: recent_imports: Importasyones resyentes states: finished: Finalizado + in_progress: En progreso scheduled: Programado unconfirmed: Sin konfirmasyon status: Estado @@ -1250,6 +1302,7 @@ lad: one: 1 uzo other: "%{count} uzos" max_uses_prompt: Sin limito + prompt: Djenera i partaja atadijos kon otros para darles akseso a este sirvidor table: expires_at: Kaduka uses: Uzos @@ -1314,8 +1367,16 @@ lad: disabled_account: Tu kuento aktual no sera kompletamente utilizable dempues. Portanto, tendras akseso a la eksportasyon de datos ansi komo a la reaktivasyon. followers: Esta aksion migrara a todos los suivantes del kuento aktual al muevo kuento only_redirect_html: Alternativamente, solo puedes poner un readreso en tu profil. + other_data: No se moveran otros datos otomatikamente + redirect: El profil de tu kuento aktual se aktualizara kon un avizo de readreso i sera eskluido de las bushkedas moderation: title: Moderasyon + move_handler: + carry_blocks_over_text: Este utilizador se movio dizde %{acct}, ke blokates. + carry_mutes_over_text: Este utilizador se movio dizde %{acct}, ke silensiates. + copy_account_note_text: 'Este utilizador se movio dizde %{acct}, aki estavan tus notas anteriores sovre el:' + navigation: + toggle_menu: Alterna menu notification_mailer: admin: report: @@ -1353,6 +1414,7 @@ lad: notifications: administration_emails: Avizos de administrasyon por posta email_events: Evenimyentos para avizos por posta + email_events_hint: 'Eskoje los evenimientos para los kualos keres risivir avizos:' other_settings: Otras preferensyas de avizos number: human: @@ -1365,6 +1427,8 @@ lad: thousand: K trillion: T otp_authentication: + code_hint: Introduse el kodiche jenerado por tu aplikasyon de autentifikasyon para konfirmar + description_html: Si kapasitas autentifikasyon en dos pasos kon una aplikasyon de autentifikasyon, la entrada rekerira ke estes en posesyon de tu telefon, ke djenerara kodiches para ke entres. enable: Kapasita instructions_html: "Eskanea este kodiche QR dizde Google Authenticator o una aplikasyon similar en tu telefon. A partir de agora, esta aplikasyon djenerara kodiches ke tendras ke ingresar kuando keras konektarte kon tu kuento." manual_instructions: 'Si no puedes eskanear el kodiche QR i nesesitas introdusirlo manualmente, este es el sekreto en teksto plano:' @@ -1418,14 +1482,24 @@ lad: mutual: Mutual primary: Prinsipal relationship: Relasyon + remove_selected_domains: Kita todos los suivantes de los domenos eskojidos remove_selected_followers: Kita a los suivantes eskojidos remove_selected_follows: Desige a los utilizadores eskojidos status: Estado del kuento + remote_follow: + missing_resource: No se pudo topar el URL del readreso rekerido para tu kuento + reports: + errors: + invalid_rules: no faze referensia a reglas validas rss: content_warning: 'Avertensya de kontenido:' descriptions: account: Publikasyones publikas de @%{acct} tag: 'Publikasyones publikas etiketadas kon #%{hashtag}' + scheduled_statuses: + over_daily_limit: Tienes superado el limito de %{limit} publikasyones programadas para akel diya + over_total_limit: Tienes superado el limito de %{limit} publikasyones programadas + too_soon: La data programada deve estar en el avenir self_destruct: title: Este sirvidor esta serrando sessions: @@ -1453,6 +1527,7 @@ lad: weibo: Weibo current_session: Sesyon aktuala description: "%{browser} en %{platform}" + explanation: Estos son los navigadores internetikos konektados aktualmente kon tu kuento de Mastodon. ip: IP platforms: adobe_air: Adobe Air @@ -1543,11 +1618,16 @@ lad: public: Publiko public_long: Todos pueden ver unlisted: No listado + unlisted_long: Todos pueden ver, ama no esta listado en las linyas de tiempo publikas statuses_cleanup: enabled: Otomatikamente efasa publikasyones viejas + enabled_hint: Supreme otomatikamente tus publikasyones kuando alkansen un limito de tiempo espesifikado, a manko ke koensiden kon alguna de las eksepsiones detalyadas debasho exceptions: Eksepsiones + explanation: Porke la efasasion de mesajes es una operasyon kostoza, esto se faze avagar, a lo longo de un tiempo, kuando el sirvidor no esta okupado. Por esta razon, puede ser ke tus publikasyones sean efasadas un tiempo dempues de ke alkansen el limito de tiempo espesifikado. ignore_favs: Ignora favoritos ignore_reblogs: Ignora repartajasyones + interaction_exceptions: Eksepsiones bazadas en enteraksyones + interaction_exceptions_explanation: Akodrate ke no ay garantiya de ke se supremen las publikasyones ke estan por debasho de los limitos de favoritos o de repartajasiones si los tienen superado en algun momento. keep_direct: Manten enmentaduras privadas keep_direct_hint: No efasa dingunos mesajes privados keep_media: Manten publikasyones kon atamientos @@ -1569,8 +1649,11 @@ lad: '604800': 1 semana '63113904': 2 anyos '7889238': 3 mezes + min_age_label: Limito de tiempo min_favs: Manten publikasyones favoritadas a lo manko + min_favs_hint: No efasa dinguna de las publikasyones ke plazgan a mas de esta kantita de personas. Desha en blanko para supremir publikasyones sin importar el numero de personas a las ke plazen las publikasyones min_reblogs: Manten publikasyones repartajadas a lo manko + min_reblogs_hint: No efasa dinguna de las publikasyones ke ayan sido repartajadas mas de este numero de vezes. Desha en blanko para supremir publikasyones sin importar el numero de repartajasiones stream_entries: sensitive_content: Kontenido sensivle strikes: @@ -1635,6 +1718,8 @@ lad: disable: Ya no puedes uzar tu kuento, ama tu profil i el resto de datos permanesen intactos. Puedes solisitar una kopia de sigurita de tus datos, trokar la konfigurasyon de tu kuento o supremirlo. mark_statuses_as_sensitive: Algunas de tus publikasyones an sido markados komo sensivles por los moderadores de %{instance}. Esto sinyifika ke la djente tendra ke pulsar los dosyas multimedia en las publikasyones antes de ke se amostre una vista previa. Puedes markar los dosyas multimedia komo sensivles tu mezmo kuando publikes en el avenir. sensitive: A partir de agora todas los dosyas multimedia ke subas seran markados komo sensivles i eskondidos tras una avertensya. + silence: Ainda puedes uzar tu kuento, ama solo las personas ke te estan sigiendo veran tus publikasyones en este sirvidor, i puedes ser eskluido de varias fonksionalitas de diskuvrimiento. Portanto, otros kuentos podran ampesar a segirte manualmente. + suspend: Ya no puedes utilizar tu kuento, i tu profil i el resto de datos ya no son aksesivles. Ainda puedes inisyar sesion para solisitar una kopia de sigurita de tus datos, asta ke estos sean supremidos por kompleto en unos 30 diyas, aunke konservaremos algunos datos bazikos para impedir ke evitas la suspensyon. reason: 'Razon:' statuses: 'Publikasyones relevantes:' subject: @@ -1655,7 +1740,12 @@ lad: suspend: Kuento suspendido welcome: edit_profile_action: Konfigurasyon de profil + edit_profile_step: Puedes personalizar tu profil kargando una foto de profil, trokando tu nombre de utilizador i muncho mas. Puedes optar por revizar a los muevos suivantes antes de ke puedan segirte. + explanation: Aki ay algunos konsejos para ampesar final_action: Ampesa a publikar + final_step: 'Ampesa a publikar! Inkluzo sin suivantes, tus publikasyones publikas pueden ser vistas por otros, por enshemplo en la linya de tiempo lokal o en etiketas. Tal vez keras aprezentarte kon la etiketa de #introduksiones.' + full_handle: Tu sovrenombre kompleto + full_handle_hint: Esto es lo ke le dirias a tus haverim para ke eyos puedan embiarte mesajes o segirte dizde otra instansya. subject: Bienvenido a Mastodon title: Bienvenido, %{name}! users: @@ -1668,10 +1758,12 @@ lad: webauthn_credentials: add: Adjusta mueva yave de sigurita create: + error: Uvo un problem al adjustar tu yave de sigurita. Por favor aprova de muevo. success: Tu yave de sigurita fue adjustada kon sukseso. delete: Efasa delete_confirmation: Estas siguro ke keres efasar esta yave de sigurita? destroy: + error: Uvo un problem al efasar tu yave de sigurita. Por favor aprova de muevo. success: Tu yave de sigurita fue efasada kon sukseso. invalid_credential: Yave de sigurita no valida nickname_hint: Introduska el sovrenombre de tu mueva yave de sigurita diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml index 5ff495a540..23fbc43b07 100644 --- a/config/locales/simple_form.fa.yml +++ b/config/locales/simple_form.fa.yml @@ -162,7 +162,7 @@ fa: defaults: autofollow: دعوت از دیگران برای عضو شدن و پیگیری حساب شما avatar: تصویر نمایه - bot: این حساب یک ربات است + bot: این یک حساب خودکار شده است chosen_languages: جدا کردن زبان‌ها confirm_new_password: تأیید گذرواژه تازه confirm_password: تأیید گذرواژه diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml index 672ff9d003..3bcce47d36 100644 --- a/config/locales/simple_form.ie.yml +++ b/config/locales/simple_form.ie.yml @@ -3,11 +3,20 @@ ie: simple_form: hints: account: + discoverable: Tui public postas e profil posse esser recomandat in multiplic areas de Mastodon e tui profil posse esser suggestat a altri usatores. + display_name: Tui complet nómine o tui amusant nómine. + fields: Tui websitu, pronómines, etá, quocunc quel tu vole. + note: 'Tu posse @mentionar altri persones o #hashtags.' unlocked: Persones va posser sequer te sin petir aprobation. Desselecte si tu vole manualmen tractar petitiones de sequer e decider ca acceptar o rejecter nov sequitores. + account_alias: + acct: Specificar li usatornomine@dominia del conto ex quel tu vole translocar + account_migration: + acct: Specificar li usatornomine@dominia del conto a quel tu vole translocar account_warning_preset: text: Tu posse usar posta-sintaxe, quam URLs, hashtags e mentiones title: Ínobligatori. Ne visibil al recipiente admin_account_action: + include_statuses: Li usator va posser vider quel postas ha causat li moderatori action o admonition send_email_notification: Li usator va reciver un explication de ti quel evenit con su conto text_html: Ínobligatori. Tu posse usar posta-sintaxe. Tu posse adjunter preconfigurationes de avises por sparar témpor type_html: Selecte quo far con %{acct} @@ -48,24 +57,49 @@ ie: setting_display_media_default: Celar medie marcat quam sensitiv setting_display_media_hide_all: Sempre celar medie setting_display_media_show_all: Sempre monstrar medie + featured_tag: + name: 'Vi quelc hashtags usat max recentmen de te:' + filters: + action: Selecter quel action a far quande un posta egala un filtre + actions: + hide: Celar completmen li contenete filtrat, quam si it ne existe + warn: Celar li contenete filtrat detra un avise mentionant li titul del filtre form_admin_settings: bootstrap_timeline_accounts: Ti-ci contos va esser pinglat al parte superiori del recomandationes por nov usatores. + peers_api_enabled: Un liste de nómines de dominia queles ti-ci servitor ha incontrat in li fediverse. Ci null data es includet pri ca tu confedera con un cert servitor o ne; it indica solmen que tui servitor conosse it. Usat per servicies colectent general statisticas pri federation. + profile_directory: Li profilarium monstra omni usatores volent esser decovribil. + site_contact_email: Qualmen on posse contacter te por inquestes legal o de apoy. site_contact_username: Qualmen li gente posse atinger te sur Mastodon. + site_title: Quant persones posse aluder a tui servitor ultra su nómine de dominia. theme: Li dessine quel ínregistrat visitantes e nov usatores vide. timeline_preview: Ínregistrat visitantes va posser vider li max recent public postas disponibil che li servitor. trends_as_landing_page: Monstrar populari contenete a ínregistrat visitantes vice un description del servitor. Besona que tendenties es activisat. form_challenge: current_password: Tu nu intra un area secur ip_block: + comment: Facultativ. Ne obliviar pro quo tu adjuntet ti-ci regul. severities: sign_up_block: Nov registrationes ne va esser possibil sign_up_requires_approval: Nov registrationes va besonar tui aprobation + severity: Selecter quo va evenir con demandes ex ti-ci IP + rule: + text: Descrir un regul o postulation por usatores sur ti-ci servitor. Prova scrir un descrition curt e simplic + user: + role: Permissiones de usator decidet per su rol + user_role: + color: Color a usar por li rol tra li UI, quam RGB (rubi-verdi-blu) in formate hex + highlighted: Va far li rol publicmen visibil + name: Public nómine del rol, si li rol va esser monstrat quam signe + permissions_as_keys: Usatores con ti-ci rol va haver accesse a... webhook: events: Selecter evenimentes a misser + template: Composir tui propri carga JSON usant interpolation de variabiles. Lassa blanc por JSON predefinit. url: Ad u misser evenimentes labels: account: + discoverable: Monstrar profil e postas in algoritmes de decovrition fields: + name: Etiquette value: Contenete indexable: Includer public postas in resultates de sercha account_warning_preset: @@ -73,7 +107,14 @@ ie: title: Titul admin_account_action: send_email_notification: Notificar li usator per e-posta + text: Admonition customisat type: Action + types: + disable: Gelar + none: Misser un admonition + sensitive: Sensitiv + silence: Limitar + suspend: Suspender warning_preset_id: Usar un prefiguration de avise announcement: all_day: Eveniment del tot die @@ -81,7 +122,12 @@ ie: scheduled_at: Planar publication starts_at: Comense del eveniment text: Proclamation + appeal: + text: Explicar pro que ti-ci decision mey esser renversat defaults: + autofollow: Invitar a sequer tui conto + avatar: Foto de profil + bot: Ti-ci conto es automatisat chosen_languages: Filtrar lingues confirm_new_password: Confirmar nov passa-parol confirm_password: Confirmar passa-parol @@ -91,28 +137,94 @@ ie: display_name: Nómine a monstrar email: E-posta expires_in: Expirar pos + fields: Campes aditional + header: Cap-image honeypot: "%{label} (ne plenar)" + irreversible: Lassar cader vice celar locale: Lingue del interfacie new_password: Nov passa-parol note: Biografie password: Passa-parol + phrase: Clave-parol o frase + setting_advanced_layout: Possibilisar web-interfacie avansat setting_default_language: Lingue in quel postar setting_default_privacy: Privatie de postada setting_default_sensitive: Sempre marcar medie quam sensitiv setting_display_media_default: Predefinitiones setting_display_media_hide_all: Celar omno setting_display_media_show_all: Monstrar omno + setting_expand_spoilers: Sempre expander postas marcat con admonitiones de contenete + setting_system_font_ui: Usar predefinit fonte de sistema setting_theme: Tema de situ setting_trends: Monstrar li hodial tendenties setting_unfollow_modal: Monstrar dialog de confirmation ante dessequer alquem setting_use_pending_items: Mode lent + severity: Severitá + sign_in_token_attempt: Code de securitá + title: Titul + username: Nómine de usator + whole_word: Plen parol + filters: + actions: + warn: Celar con un admonition form_admin_settings: + custom_css: Custom CSS + profile_directory: Possibilisar profilarium registrations_mode: Qui posse registrar se + show_domain_blocks: Vider bloccas de dominia + show_domain_blocks_rationale: Monstrar pro quo cert dominias esset bloccat + site_contact_email: Contact e-mail adresse + site_title: Nómine de servitor theme: Predefenit tema + trendable_by_default: Possibilisar tendenties sin priori inspection trends: Possibilisar tendenties trends_as_landing_page: Usar tendenties quam frontispicie + invite: + comment: Comentar + invite_request: + text: Pro quo tu vole adherer? + ip_block: + comment: Comentar + ip: IP + severities: + no_access: Bloccar accesse + sign_up_block: Bloccar usator-registrationes + sign_up_requires_approval: Limitar usator-registrationes + severity: Regul notification_emails: + favourite: Alqui favoritisat tui posta + follow: Alqui sequet te follow_request: Alqui petit sequer te + mention: Alqui mentionat te + pending_account: Nov conto besonant inspection + report: Nov raporte es submisset + software_updates: + all: Notificar pri omni nov actualisationes + critical: Notificar solmen pri critical actualisationes + label: Un nov version de Mastodon es disponibil trending_tag: Nov tendentie besonant inspection + rule: + text: Regul tag: + name: Hashtag trendable: Permisse que ti-ci hashtag apari sub tendenties + user: + role: Rol + time_zone: Zone temporal + user_role: + color: Color del insignie + name: Nómine + permissions_as_keys: Permissiones + position: Prioritá + webhook: + events: Evenimentes activisat + url: URL de punctu terminal + 'no': 'No' + recommended: Recomandat + required: + mark: "*" + text: besonat + title: + sessions: + webauthn: Usar un de tui claves de securitá por intrar + 'yes': 'Yes' diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml index aeac5f1c58..c23960e07d 100644 --- a/config/locales/simple_form.lad.yml +++ b/config/locales/simple_form.lad.yml @@ -3,10 +3,13 @@ lad: simple_form: hints: account: + discoverable: Tus publikasyones publikas i profil pueden ser avaliadas o rekomendadas en varias partes de Mastodon i tu profil puede ser sujerido a otros utilizadores. display_name: Tu nombre para amostrar. fields: Tu deskripsyon, pronombres, edad, todo lo ke keras. + indexable: Tus publikasyones publikas pueden apareser en rezultados de bushkeda en Mastodon. Personas ke enteraktuaron kon tus publikasyones syempre pueden bushkarlas inkluzo si trokes esta preferensya. note: 'Puedes @enmentar a otra djente o #etiketas.' show_collections: Otra djente podra ver tus segidos i suivantes. Personas a las kualas siges siempre podran ver que las estas sigiendo. + unlocked: Djente va poder segirte sin solisitar tu achetasyon. Deseleksyona si keres revizar solisitasyones de segimyento i dechidir si keres achetar o refuzar a muevos suivantes. account_alias: acct: Espesifika tu nombre de utilizador@domeno del kuento de ande keres migrar account_migration: @@ -118,6 +121,7 @@ lad: otp: 'Introduse el kodiche de autentifikasyon de dos pasos djenerado por tu aplikasyon de telefon o uza uno de tus kodiches de recuperasyon:' webauthn: Si es una yave USB, asigurete de insertarla y, si es necesario, pulsala. settings: + indexable: Tu pajina de profil puede apareser en rezultados de bushkeda en Google, Bing i otros. show_application: Tu siempre podras ver dizde kuala aplikasyon publikates tu publikasyon. tag: name: Solo se puede trokar la kapitalizasyon de las letras, por enshemplo, para ke sea mas meldable @@ -132,9 +136,11 @@ lad: position: Un rolo mas alto deside la rezolusyon de konfliktos en algunas situasyones. Algunas aksyones solo pueden levarse por rolos kon menor priorita webhook: events: Eskoje evenimientos para embiar + template: Kriya tu propio JSON uzando interpolasyon de las variavlas. Deshalo en blanko para el JSON predeterminado. url: Ande los evenimientos seran embiados labels: account: + discoverable: Avalia profil i publikasyones en algoritmos de deskuvrimyento fields: name: Etiketa value: Kontenido @@ -183,6 +189,9 @@ lad: expires_in: Kaduka dempues de fields: Datos adisyonales header: Imaje de kavesera + honeypot: "%{label} (no inche)" + inbox_url: URL del kuti de relevo + irreversible: Refuza en lugar de eskonder locale: Lingua de enterfaz max_uses: Maksimo numero de uzos new_password: Muevo kod @@ -190,17 +199,27 @@ lad: otp_attempt: Kodiche de dos pasos password: Kod phrase: Biervo yave o fraza + setting_advanced_layout: Kapasita la enterfaz web avanzada setting_aggregate_reblogs: Agrupa repartajasyones en linyas setting_always_send_emails: Siempre embia avizos por posta setting_auto_play_gif: Siempre reproduse los GIFs animados + setting_boost_modal: Amostra ventana de konfirmasyon antes de repartajar setting_default_language: Lingua de publikasyones setting_default_privacy: Privasita de publikasyones + setting_default_sensitive: Syempre marka multimedia komo sensivles + setting_delete_modal: Mostra dialogo de konfirmasyon antes de efasar una publikasyon + setting_disable_swiping: Inkapasita movimyentos de arresvalamiento + setting_display_media: Vizualizasyon de multimedia setting_display_media_default: Predeterminado setting_display_media_hide_all: Eskonde todo setting_display_media_show_all: Amostra todo + setting_expand_spoilers: Siempre espande las publikasyones markadas kon avertensyas de kontenido + setting_hide_network: Eskonde tu red sosyala setting_reduce_motion: Reduse el movimyento en animasyones setting_system_font_ui: Uza el font predeterminado del sistem + setting_theme: Tema del sitio setting_trends: Amostra los trendes de oy + setting_unfollow_modal: Mostra dialogo de konfirmasyon antes de desegir a alguno setting_use_blurhash: Amostra gradientes koloridos para kontenido multimedia eskondido setting_use_pending_items: Modo lento severity: Severita @@ -263,6 +282,8 @@ lad: sign_up_requires_approval: Limita enrejistrasyones severity: Regla notification_emails: + appeal: Alguno tiene apelado una dechizyon de moderasyon + digest: Embia rezumen de posta elektronika favourite: A alguno le plaze tu publikasyon follow: Alguno te ampeso a segir follow_request: Alguno tiene solisitado segirte @@ -276,25 +297,38 @@ lad: label: Mueva version de Mastodon esta desponivle none: Nunkua avizame de aktualizasyones (no rekomendado) patch: Avizame de aktualizasyones de yerros + trending_tag: Un muevo trend nesesita revizyon rule: text: Regla settings: indexable: Inkluye la pajina de profil en los bushkadores + show_application: Amostra aplikasyon uzada para adjustar publikasyones tag: + listable: Permite ke esta etiketa apareska en bushkedas i sujestyones name: Etiketa + trendable: Permite ke esta etiketa apareska en trendes + usable: Permite ke publikasyones uzen esta etiketa user: role: Rolo + time_zone: Zona de tiempo user_role: + color: Kolor de insinya + highlighted: Mostra rolo komo insinya en profiles de utilizadores name: Nombre permissions_as_keys: Permisos position: Priorita webhook: events: Evenimientos kapasitados + template: Modelo de kontenido url: URL de Endpoint 'no': 'No' not_recommended: No rekomendado + overridden: Sovreskrive recommended: Rekomendado required: mark: "*" text: rekerido + title: + sessions: + webauthn: Uza una de tus yaves de sigurita para konektarte 'yes': Si diff --git a/config/locales/sk.yml b/config/locales/sk.yml index ab2bc51553..4fe190cfec 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -435,6 +435,7 @@ sk: delivery: all: Všetko failing: Zlyhávajúce + stop: Zastav doručenie unavailable: Nedostupné delivery_available: Je v dosahu doručovania empty: Nenájdené žiadne domény. @@ -579,6 +580,7 @@ sk: manage_roles: Spravuj postavenia manage_rules: Spravuj pravidlá manage_settings: Spravuj nastavenia + manage_user_access: Spravuj užívateľský prístup manage_users: Spravuj užívateľov title: Postavenia rules: @@ -621,9 +623,11 @@ sk: software_updates: critical_update: Kritické — prosím aktualizuj rýchlo documentation_link: Zisti viac + release_notes: Poznámky k vydaniu title: Dostupné aktualizácie types: major: Hlavné vydanie + patch: Opravné vydanie - opravy a jednoducho uplatniteľné zmeny version: Verzia statuses: account: Autor @@ -692,7 +696,9 @@ sk: title: Populárne príspevky tags: dashboard: + tag_servers_measure: iné servery tag_uses_measure: užívateľov celkovo + not_usable: Nemôže byť použitý title: Populárne štítky trending_rank: 'Populárne #%{rank}' usable: Môže byť použitý @@ -708,7 +714,11 @@ sk: disable: Vypni disabled: Vypnuté enable: Povoľ + status: Stav admin_mailer: + new_appeal: + actions: + none: varovanie new_pending_account: body: Podrobnosti o novom účte sú uvedené nižšie. Môžeš túto registračnú požiadavku buď prijať, alebo zamietnúť. subject: Nový účet očakáva preverenie na %{instance} (%{username}) @@ -757,6 +767,9 @@ sk: apply_for_account: Vyžiadaj si účet captcha_confirmation: title: Bezpečnostná kontrola + confirmations: + login_link: prihlás sa + welcome_title: Vitaj, %{name}! delete_account: Vymaž účet delete_account_html: Pokiaľ chceš svoj účet odtiaľto vymazať, môžeš tak urobiť tu. Budeš požiadaný/á o potvrdenie tohto kroku. description: @@ -786,6 +799,9 @@ sk: setup: link_not_received: Nedostal/a si odkaz? title: Skontroluj svoju schránku + sign_in: + preamble_html: Prihlás sa so svojimi údajmi pre %{domain}. Pokiaľ je tvoj účet hostovaný na inom serveri, nebudeš sa môcť prihlásiť tu. + title: Prihlás sa na %{domain} status: account_status: Stav účtu confirming: Čaká sa na dokončenie potvrdenia emailom. @@ -841,6 +857,9 @@ sk: silence: Obmedzenie účtu domain_validator: invalid_domain: nieje správny tvar domény + edit_profile: + basic_information: Základné informácie + other: Ostatné errors: '400': Požiadavka, ktorú si odoslal/a, bola buď nesprávna, alebo znehodnotená. '403': Nemáš povolenie pre zobrazenie tejto stránky. @@ -885,22 +904,28 @@ sk: public: Verejné osi thread: Konverzácie edit: + add_keyword: Pridaj kľúčové slovo + keywords: Kľúčové slová title: Uprav triedenie errors: invalid_context: Nebola poskytnutá žiadna, alebo ide o neplatnú súvislosť index: delete: Vymaž empty: Nemáš žiadné filtrovanie. + expires_on: Expiruje dňa %{date} title: Triedenia new: title: Pridaj nové triedenie generic: all: Všetko + cancel: Zruš changes_saved_msg: Zmeny boli úspešne uložené! + confirm: Potvrď copy: Kopíruj delete: Vymaž order_by: Zoraď podľa save_changes: Ulož zmeny + today: dnes validation_errors: few: Niečo ešte nieje celkom v poriadku! Prosím skontroluj %{count} chýb uvedených nižšie many: Niečo ešte nieje celkom v poriadku! Prosím skontroluj %{count} chýb uvedených nižšie @@ -923,6 +948,7 @@ sk: bookmarks: Záložky domain_blocking: Zoznam blokovaných domén following: Zoznam sledovaných + lists: Zoznamy muting: Zoznam ignorovaných upload: Nahraj invites: @@ -1182,6 +1208,7 @@ sk: keep_pinned: Ponechaj pripnuté príspevky keep_pinned_hint: Nevymaže žiadne s tvojich pripnutých príspevkov keep_self_bookmark: Ponechaj príspevky, ktoré sú záložkami + keep_self_fav: Ponechať príspevky, ktoré si si obľúbil/a stream_entries: sensitive_content: Senzitívny obsah tags: From fd57e40681f1f9c15f83a440858bcd117af9ba1f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 11:55:05 +0100 Subject: [PATCH 21/27] Update dependency rubocop-performance to v1.20.1 (#28492) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5acee3d753..8e25f302bc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -680,7 +680,7 @@ GEM rubocop (~> 1.41) rubocop-factory_bot (2.24.0) rubocop (~> 1.33) - rubocop-performance (1.20.0) + rubocop-performance (1.20.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) rubocop-rails (2.23.1) From ba5f659bb3066dc8a70eaab469bba1b1398919a9 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 29 Dec 2023 05:55:50 -0500 Subject: [PATCH 22/27] Use shorter attribute query methods in `Announcement` (#28474) --- app/models/announcement.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/announcement.rb b/app/models/announcement.rb index 2cd7c1d5ed..83a8d3682c 100644 --- a/app/models/announcement.rb +++ b/app/models/announcement.rb @@ -28,8 +28,8 @@ class Announcement < ApplicationRecord has_many :announcement_reactions, dependent: :destroy validates :text, presence: true - validates :starts_at, presence: true, if: -> { ends_at.present? } - validates :ends_at, presence: true, if: -> { starts_at.present? } + validates :starts_at, presence: true, if: :ends_at? + validates :ends_at, presence: true, if: :starts_at? before_validation :set_published, on: :create @@ -46,7 +46,7 @@ class Announcement < ApplicationRecord end def time_range? - starts_at.present? && ends_at.present? + starts_at? && ends_at? end def mentions From 3599622b5bcdfd44f7df664428a749896fde319e Mon Sep 17 00:00:00 2001 From: Cal Moody Date: Fri, 29 Dec 2023 06:32:40 -0500 Subject: [PATCH 23/27] Fix destructive actions in dropdowns not using error color in light theme (#28484) --- app/javascript/styles/mastodon-light/diff.scss | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss index 3777fccbfb..3a27c974ad 100644 --- a/app/javascript/styles/mastodon-light/diff.scss +++ b/app/javascript/styles/mastodon-light/diff.scss @@ -300,10 +300,15 @@ html { } &__item { + color: $darker-text-color; + + &--dangerous { + color: $error-value-color; + } + a, button { background: $white; - color: $darker-text-color; } } } @@ -315,9 +320,9 @@ html { .privacy-dropdown__option.active .privacy-dropdown__option__content strong, .privacy-dropdown__option:hover .privacy-dropdown__option__content, .privacy-dropdown__option:hover .privacy-dropdown__option__content strong, -.dropdown-menu__item a:active, -.dropdown-menu__item a:focus, -.dropdown-menu__item a:hover, +.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:active, +.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:focus, +.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:hover, .actions-modal ul li:not(:empty) a.active, .actions-modal ul li:not(:empty) a.active button, .actions-modal ul li:not(:empty) a:active, From fcfdeadc04983ab6937df6ce6a04dbe38e33b1a5 Mon Sep 17 00:00:00 2001 From: Claire Date: Fri, 29 Dec 2023 17:23:07 +0100 Subject: [PATCH 24/27] Fix random `NoMethodError` errors on cached `CustomFilter` objects (#28521) --- app/models/custom_filter.rb | 19 +++++++++++++++++-- app/models/custom_filter_keyword.rb | 10 +++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb index 5a53e73ba8..9c936fed39 100644 --- a/app/models/custom_filter.rb +++ b/app/models/custom_filter.rb @@ -17,8 +17,23 @@ class CustomFilter < ApplicationRecord self.ignored_columns += %w(whole_word irreversible) - alias_attribute :title, :phrase - alias_attribute :filter_action, :action + # NOTE: We previously used `alias_attribute` but this does not play nicely + # with cache + def title + phrase + end + + def title=(value) + self.phrase = value + end + + def filter_action + action + end + + def filter_action=(value) + self.action = value + end VALID_CONTEXTS = %w( home diff --git a/app/models/custom_filter_keyword.rb b/app/models/custom_filter_keyword.rb index 3158b3b79a..1812a43081 100644 --- a/app/models/custom_filter_keyword.rb +++ b/app/models/custom_filter_keyword.rb @@ -17,7 +17,15 @@ class CustomFilterKeyword < ApplicationRecord validates :keyword, presence: true - alias_attribute :phrase, :keyword + # NOTE: We previously used `alias_attribute` but this does not play nicely + # with cache + def phrase + keyword + end + + def phrase=(value) + self.keyword = value + end before_save :prepare_cache_invalidation! before_destroy :prepare_cache_invalidation! From 6374358357ee81b5f137f471f028a56974109155 Mon Sep 17 00:00:00 2001 From: Claire Date: Fri, 29 Dec 2023 17:34:13 +0100 Subject: [PATCH 25/27] Change media to be hidden/blurred by default in report modal (#28522) --- app/javascript/mastodon/components/media_attachments.jsx | 5 ++++- .../mastodon/features/report/components/status_check_box.jsx | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/javascript/mastodon/components/media_attachments.jsx b/app/javascript/mastodon/components/media_attachments.jsx index 7b945a0ea2..63fe3e67f9 100644 --- a/app/javascript/mastodon/components/media_attachments.jsx +++ b/app/javascript/mastodon/components/media_attachments.jsx @@ -15,6 +15,7 @@ export default class MediaAttachments extends ImmutablePureComponent { lang: PropTypes.string, height: PropTypes.number, width: PropTypes.number, + visible: PropTypes.bool, }; static defaultProps = { @@ -51,7 +52,7 @@ export default class MediaAttachments extends ImmutablePureComponent { }; render () { - const { status, width, height } = this.props; + const { status, width, height, visible } = this.props; const mediaAttachments = status.get('media_attachments'); const language = status.getIn(['language', 'translation']) || status.get('language') || this.props.lang; @@ -99,6 +100,7 @@ export default class MediaAttachments extends ImmutablePureComponent { height={height} inline sensitive={status.get('sensitive')} + visible={visible} onOpenVideo={noop} /> )} @@ -113,6 +115,7 @@ export default class MediaAttachments extends ImmutablePureComponent { lang={language} sensitive={status.get('sensitive')} defaultWidth={width} + visible={visible} height={height} onOpenMedia={noop} /> diff --git a/app/javascript/mastodon/features/report/components/status_check_box.jsx b/app/javascript/mastodon/features/report/components/status_check_box.jsx index 8bee76e591..481ee3e5ed 100644 --- a/app/javascript/mastodon/features/report/components/status_check_box.jsx +++ b/app/javascript/mastodon/features/report/components/status_check_box.jsx @@ -47,7 +47,7 @@ class StatusCheckBox extends PureComponent { - + ); From df43bb124c9e7cae177b9dcab4bf3c5af2bb7058 Mon Sep 17 00:00:00 2001 From: Cal Moody Date: Fri, 29 Dec 2023 06:32:40 -0500 Subject: [PATCH 26/27] [Glitch] Fix destructive actions in dropdowns not using error color in light theme Port 3599622b5bcdfd44f7df664428a749896fde319e to glitch-soc Signed-off-by: Claire --- .../flavours/glitch/styles/mastodon-light/diff.scss | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss index 456252750b..740d7222f8 100644 --- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss +++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss @@ -296,10 +296,15 @@ html { } &__item { + color: $darker-text-color; + + &--dangerous { + color: $error-value-color; + } + a, button { background: $white; - color: $darker-text-color; } } } @@ -311,9 +316,9 @@ html { .privacy-dropdown__option.active .privacy-dropdown__option__content strong, .privacy-dropdown__option:hover .privacy-dropdown__option__content, .privacy-dropdown__option:hover .privacy-dropdown__option__content strong, -.dropdown-menu__item a:active, -.dropdown-menu__item a:focus, -.dropdown-menu__item a:hover, +.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:active, +.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:focus, +.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:hover, .actions-modal ul li:not(:empty) a.active, .actions-modal ul li:not(:empty) a.active button, .actions-modal ul li:not(:empty) a:active, From eb342a608218862a831dbdcbe446d56be27f928b Mon Sep 17 00:00:00 2001 From: Claire Date: Fri, 29 Dec 2023 17:47:30 +0100 Subject: [PATCH 27/27] Fix media attachments not being hidden in report modal in glitch flavor --- .../flavours/glitch/components/media_attachments.jsx | 8 ++++---- .../features/report/components/status_check_box.jsx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/javascript/flavours/glitch/components/media_attachments.jsx b/app/javascript/flavours/glitch/components/media_attachments.jsx index 4e777437a0..9dd3fcfd95 100644 --- a/app/javascript/flavours/glitch/components/media_attachments.jsx +++ b/app/javascript/flavours/glitch/components/media_attachments.jsx @@ -15,7 +15,7 @@ export default class MediaAttachments extends ImmutablePureComponent { lang: PropTypes.string, height: PropTypes.number, width: PropTypes.number, - revealed: PropTypes.bool, + visible: PropTypes.bool, }; static defaultProps = { @@ -52,7 +52,7 @@ export default class MediaAttachments extends ImmutablePureComponent { }; render () { - const { status, width, height, revealed } = this.props; + const { status, width, height, visible } = this.props; const mediaAttachments = status.get('media_attachments'); const language = status.getIn(['language', 'translation']) || status.get('language') || this.props.lang; @@ -100,7 +100,7 @@ export default class MediaAttachments extends ImmutablePureComponent { height={height} inline sensitive={status.get('sensitive')} - revealed={revealed} + visible={visible} onOpenVideo={noop} /> )} @@ -115,7 +115,7 @@ export default class MediaAttachments extends ImmutablePureComponent { lang={language} sensitive={status.get('sensitive')} defaultWidth={width} - revealed={revealed} + visible={visible} height={height} onOpenMedia={noop} /> diff --git a/app/javascript/flavours/glitch/features/report/components/status_check_box.jsx b/app/javascript/flavours/glitch/features/report/components/status_check_box.jsx index a368c41ce6..5fe6888dc5 100644 --- a/app/javascript/flavours/glitch/features/report/components/status_check_box.jsx +++ b/app/javascript/flavours/glitch/features/report/components/status_check_box.jsx @@ -45,7 +45,7 @@ class StatusCheckBox extends PureComponent { - } /> + } /> );