From e715531dd3562a6c6b21f24b7ca2fb0a0df0ee8a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 4 May 2026 23:21:52 +0200 Subject: [PATCH 1/7] Update devDependencies (non-major) (#38901) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: ChaosExAnima --- .../mastodon/components/dropdown_menu.tsx | 2 +- package.json | 2 +- yarn.lock | 712 ++++++++---------- 3 files changed, 323 insertions(+), 393 deletions(-) diff --git a/app/javascript/mastodon/components/dropdown_menu.tsx b/app/javascript/mastodon/components/dropdown_menu.tsx index c3b683392d..107b256e18 100644 --- a/app/javascript/mastodon/components/dropdown_menu.tsx +++ b/app/javascript/mastodon/components/dropdown_menu.tsx @@ -90,7 +90,7 @@ export const DropdownMenuItemContent: React.FC<{ item: MenuItem }> = ({ ); }; -export const DropdownMenu = ({ +export const DropdownMenu = ({ items, loading, scrollable, diff --git a/package.json b/package.json index a75ef025db..1820f78296 100644 --- a/package.json +++ b/package.json @@ -180,7 +180,7 @@ "lint-staged": "^16.2.6", "msw": "^2.12.1", "msw-storybook-addon": "^2.0.6", - "oxfmt": "^0.33.0", + "oxfmt": "^0.47.0", "playwright": "^1.57.0", "react-test-renderer": "^18.2.0", "storybook": "^10.3.0", diff --git a/yarn.lock b/yarn.lock index e64ccc30c3..9ae9e89c94 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1211,25 +1211,25 @@ __metadata: languageName: node linkType: hard -"@cacheable/memory@npm:^2.0.5": - version: 2.0.5 - resolution: "@cacheable/memory@npm:2.0.5" +"@cacheable/memory@npm:^2.0.8": + version: 2.0.8 + resolution: "@cacheable/memory@npm:2.0.8" dependencies: - "@cacheable/utils": "npm:^2.3.0" - "@keyv/bigmap": "npm:^1.1.0" - hookified: "npm:^1.12.2" - keyv: "npm:^5.5.4" - checksum: 10c0/bef5b26de58c4ca20d7cce457d053766b5fb13de48bf444e0ecf56481a16e6556a194dafc28f41906ae4e6cd053ef3d57686c770b8e7a2d381648505bd673839 + "@cacheable/utils": "npm:^2.4.0" + "@keyv/bigmap": "npm:^1.3.1" + hookified: "npm:^1.15.1" + keyv: "npm:^5.6.0" + checksum: 10c0/d12ec24e1257cda849329f629a8d0508e8f220827e2c198936f5554899df54401861b775a03f24ab51f01bacfb798cc03d3a82848adcd88d662ea8f22e802057 languageName: node linkType: hard -"@cacheable/utils@npm:^2.3.0": - version: 2.3.1 - resolution: "@cacheable/utils@npm:2.3.1" +"@cacheable/utils@npm:^2.4.0": + version: 2.4.1 + resolution: "@cacheable/utils@npm:2.4.1" dependencies: - hashery: "npm:^1.2.0" - keyv: "npm:^5.5.4" - checksum: 10c0/04802bc11293ff569204e5f143cd11314856e3453de3e5757068cfd9df5c974a80aa9974c8400d88b22de3af70a7d8511d2d7fe927356365f41b765693a4c4bb + hashery: "npm:^1.5.1" + keyv: "npm:^5.6.0" + checksum: 10c0/ca2af47636ed27ab26dfedf12add639f42b90c289ecd5d816fb7a299074d9df463751745a83abfb81f6236a70c8ea40f0902e984869638a5ca3a7274e203f987 languageName: node linkType: hard @@ -1282,7 +1282,7 @@ __metadata: languageName: node linkType: hard -"@csstools/css-syntax-patches-for-csstree@npm:^1.0.25, @csstools/css-syntax-patches-for-csstree@npm:^1.1.3": +"@csstools/css-syntax-patches-for-csstree@npm:^1.1.3": version: 1.1.3 resolution: "@csstools/css-syntax-patches-for-csstree@npm:1.1.3" peerDependencies: @@ -2428,14 +2428,13 @@ __metadata: linkType: hard "@formatjs/cli@npm:^6.1.1": - version: 6.7.4 - resolution: "@formatjs/cli@npm:6.7.4" + version: 6.14.4 + resolution: "@formatjs/cli@npm:6.14.4" peerDependencies: - "@glimmer/syntax": ^0.95.0 - "@vue/compiler-core": ^3.5.12 - content-tag: ^3.0.0 - ember-template-recast: ^6.1.5 - vue: ^3.5.12 + "@glimmer/syntax": ^0.84.3 || ^0.95.0 + "@vue/compiler-core": ^3.5.0 + content-tag: ^4.1.0 + vue: ^3.5.0 peerDependenciesMeta: "@glimmer/env": optional: true @@ -2449,13 +2448,11 @@ __metadata: optional: true content-tag: optional: true - ember-template-recast: - optional: true vue: optional: true bin: formatjs: bin/formatjs - checksum: 10c0/11ff474cd79bef464a2aa50d0a5145542aaf414445399f3eb6d5693c0f3ebed1fdb90b58a5f88a5c834a3344624baf7b457d622a4697534ada271ad97532eac9 + checksum: 10c0/9f0b20b316db985f083eef540f23e4eb657cece7ef46aaedc54fc9672bc341efbad4106242068c8faa4b26730e25703c86cce73ca706f8da535495132d62187e languageName: node linkType: hard @@ -2831,15 +2828,15 @@ __metadata: languageName: node linkType: hard -"@keyv/bigmap@npm:^1.1.0": - version: 1.3.0 - resolution: "@keyv/bigmap@npm:1.3.0" +"@keyv/bigmap@npm:^1.3.1": + version: 1.3.1 + resolution: "@keyv/bigmap@npm:1.3.1" dependencies: - hashery: "npm:^1.2.0" - hookified: "npm:^1.13.0" + hashery: "npm:^1.4.0" + hookified: "npm:^1.15.0" peerDependencies: - keyv: ^5.5.4 - checksum: 10c0/68fe63451097067d8359dc25b7e5b832fe9d99493ca32602686026c8d14c9ca7ecaf19312df9420c7f54df8de1b26e7305f9189fa364a82f39730710eb895f9e + keyv: ^5.6.0 + checksum: 10c0/acc6a4a5edf462ce23e95672ab4bfaf7cd1941dff6bf3a2f671ce467961ace1fac9d3eb75a9ed9a8e92012e00a7d8b16ad1677bc539a52c3ad0cec31473e2349 languageName: node linkType: hard @@ -2950,7 +2947,7 @@ __metadata: marky: "npm:^1.2.5" msw: "npm:^2.12.1" msw-storybook-addon: "npm:^2.0.6" - oxfmt: "npm:^0.33.0" + oxfmt: "npm:^0.47.0" path-complete-extname: "npm:^1.0.0" playwright: "npm:^1.57.0" postcss-preset-env: "npm:^11.0.0" @@ -3356,135 +3353,135 @@ __metadata: languageName: node linkType: hard -"@oxfmt/binding-android-arm-eabi@npm:0.33.0": - version: 0.33.0 - resolution: "@oxfmt/binding-android-arm-eabi@npm:0.33.0" +"@oxfmt/binding-android-arm-eabi@npm:0.47.0": + version: 0.47.0 + resolution: "@oxfmt/binding-android-arm-eabi@npm:0.47.0" conditions: os=android & cpu=arm languageName: node linkType: hard -"@oxfmt/binding-android-arm64@npm:0.33.0": - version: 0.33.0 - resolution: "@oxfmt/binding-android-arm64@npm:0.33.0" +"@oxfmt/binding-android-arm64@npm:0.47.0": + version: 0.47.0 + resolution: "@oxfmt/binding-android-arm64@npm:0.47.0" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@oxfmt/binding-darwin-arm64@npm:0.33.0": - version: 0.33.0 - resolution: "@oxfmt/binding-darwin-arm64@npm:0.33.0" +"@oxfmt/binding-darwin-arm64@npm:0.47.0": + version: 0.47.0 + resolution: "@oxfmt/binding-darwin-arm64@npm:0.47.0" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@oxfmt/binding-darwin-x64@npm:0.33.0": - version: 0.33.0 - resolution: "@oxfmt/binding-darwin-x64@npm:0.33.0" +"@oxfmt/binding-darwin-x64@npm:0.47.0": + version: 0.47.0 + resolution: "@oxfmt/binding-darwin-x64@npm:0.47.0" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@oxfmt/binding-freebsd-x64@npm:0.33.0": - version: 0.33.0 - resolution: "@oxfmt/binding-freebsd-x64@npm:0.33.0" +"@oxfmt/binding-freebsd-x64@npm:0.47.0": + version: 0.47.0 + resolution: "@oxfmt/binding-freebsd-x64@npm:0.47.0" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@oxfmt/binding-linux-arm-gnueabihf@npm:0.33.0": - version: 0.33.0 - resolution: "@oxfmt/binding-linux-arm-gnueabihf@npm:0.33.0" +"@oxfmt/binding-linux-arm-gnueabihf@npm:0.47.0": + version: 0.47.0 + resolution: "@oxfmt/binding-linux-arm-gnueabihf@npm:0.47.0" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@oxfmt/binding-linux-arm-musleabihf@npm:0.33.0": - version: 0.33.0 - resolution: "@oxfmt/binding-linux-arm-musleabihf@npm:0.33.0" +"@oxfmt/binding-linux-arm-musleabihf@npm:0.47.0": + version: 0.47.0 + resolution: "@oxfmt/binding-linux-arm-musleabihf@npm:0.47.0" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@oxfmt/binding-linux-arm64-gnu@npm:0.33.0": - version: 0.33.0 - resolution: "@oxfmt/binding-linux-arm64-gnu@npm:0.33.0" +"@oxfmt/binding-linux-arm64-gnu@npm:0.47.0": + version: 0.47.0 + resolution: "@oxfmt/binding-linux-arm64-gnu@npm:0.47.0" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@oxfmt/binding-linux-arm64-musl@npm:0.33.0": - version: 0.33.0 - resolution: "@oxfmt/binding-linux-arm64-musl@npm:0.33.0" +"@oxfmt/binding-linux-arm64-musl@npm:0.47.0": + version: 0.47.0 + resolution: "@oxfmt/binding-linux-arm64-musl@npm:0.47.0" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@oxfmt/binding-linux-ppc64-gnu@npm:0.33.0": - version: 0.33.0 - resolution: "@oxfmt/binding-linux-ppc64-gnu@npm:0.33.0" +"@oxfmt/binding-linux-ppc64-gnu@npm:0.47.0": + version: 0.47.0 + resolution: "@oxfmt/binding-linux-ppc64-gnu@npm:0.47.0" conditions: os=linux & cpu=ppc64 & libc=glibc languageName: node linkType: hard -"@oxfmt/binding-linux-riscv64-gnu@npm:0.33.0": - version: 0.33.0 - resolution: "@oxfmt/binding-linux-riscv64-gnu@npm:0.33.0" +"@oxfmt/binding-linux-riscv64-gnu@npm:0.47.0": + version: 0.47.0 + resolution: "@oxfmt/binding-linux-riscv64-gnu@npm:0.47.0" conditions: os=linux & cpu=riscv64 & libc=glibc languageName: node linkType: hard -"@oxfmt/binding-linux-riscv64-musl@npm:0.33.0": - version: 0.33.0 - resolution: "@oxfmt/binding-linux-riscv64-musl@npm:0.33.0" +"@oxfmt/binding-linux-riscv64-musl@npm:0.47.0": + version: 0.47.0 + resolution: "@oxfmt/binding-linux-riscv64-musl@npm:0.47.0" conditions: os=linux & cpu=riscv64 & libc=musl languageName: node linkType: hard -"@oxfmt/binding-linux-s390x-gnu@npm:0.33.0": - version: 0.33.0 - resolution: "@oxfmt/binding-linux-s390x-gnu@npm:0.33.0" +"@oxfmt/binding-linux-s390x-gnu@npm:0.47.0": + version: 0.47.0 + resolution: "@oxfmt/binding-linux-s390x-gnu@npm:0.47.0" conditions: os=linux & cpu=s390x & libc=glibc languageName: node linkType: hard -"@oxfmt/binding-linux-x64-gnu@npm:0.33.0": - version: 0.33.0 - resolution: "@oxfmt/binding-linux-x64-gnu@npm:0.33.0" +"@oxfmt/binding-linux-x64-gnu@npm:0.47.0": + version: 0.47.0 + resolution: "@oxfmt/binding-linux-x64-gnu@npm:0.47.0" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@oxfmt/binding-linux-x64-musl@npm:0.33.0": - version: 0.33.0 - resolution: "@oxfmt/binding-linux-x64-musl@npm:0.33.0" +"@oxfmt/binding-linux-x64-musl@npm:0.47.0": + version: 0.47.0 + resolution: "@oxfmt/binding-linux-x64-musl@npm:0.47.0" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@oxfmt/binding-openharmony-arm64@npm:0.33.0": - version: 0.33.0 - resolution: "@oxfmt/binding-openharmony-arm64@npm:0.33.0" +"@oxfmt/binding-openharmony-arm64@npm:0.47.0": + version: 0.47.0 + resolution: "@oxfmt/binding-openharmony-arm64@npm:0.47.0" conditions: os=openharmony & cpu=arm64 languageName: node linkType: hard -"@oxfmt/binding-win32-arm64-msvc@npm:0.33.0": - version: 0.33.0 - resolution: "@oxfmt/binding-win32-arm64-msvc@npm:0.33.0" +"@oxfmt/binding-win32-arm64-msvc@npm:0.47.0": + version: 0.47.0 + resolution: "@oxfmt/binding-win32-arm64-msvc@npm:0.47.0" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@oxfmt/binding-win32-ia32-msvc@npm:0.33.0": - version: 0.33.0 - resolution: "@oxfmt/binding-win32-ia32-msvc@npm:0.33.0" +"@oxfmt/binding-win32-ia32-msvc@npm:0.47.0": + version: 0.47.0 + resolution: "@oxfmt/binding-win32-ia32-msvc@npm:0.47.0" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@oxfmt/binding-win32-x64-msvc@npm:0.33.0": - version: 0.33.0 - resolution: "@oxfmt/binding-win32-x64-msvc@npm:0.33.0" +"@oxfmt/binding-win32-x64-msvc@npm:0.47.0": + version: 0.47.0 + resolution: "@oxfmt/binding-win32-x64-msvc@npm:0.47.0" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -4363,8 +4360,8 @@ __metadata: linkType: hard "@testing-library/react@npm:^16.3.0": - version: 16.3.0 - resolution: "@testing-library/react@npm:16.3.0" + version: 16.3.2 + resolution: "@testing-library/react@npm:16.3.2" dependencies: "@babel/runtime": "npm:^7.12.5" peerDependencies: @@ -4378,7 +4375,7 @@ __metadata: optional: true "@types/react-dom": optional: true - checksum: 10c0/3a2cb1f87c9a67e1ebbbcfd99b94b01e496fc35147be8bc5d8bf07a699c7d523a09d57ef2f7b1d91afccd1a28e21eda3b00d80187fbb51b1de01e422592d845e + checksum: 10c0/f9c7f0915e1b5f7b750e6c7d8b51f091b8ae7ea99bacb761d7b8505ba25de9cfcb749a0f779f1650fb268b499dd79165dc7e1ee0b8b4cb63430d3ddc81ffe044 languageName: node linkType: hard @@ -5256,46 +5253,46 @@ __metadata: linkType: hard "@vitest/browser-playwright@npm:^4.1.0": - version: 4.1.2 - resolution: "@vitest/browser-playwright@npm:4.1.2" + version: 4.1.5 + resolution: "@vitest/browser-playwright@npm:4.1.5" dependencies: - "@vitest/browser": "npm:4.1.2" - "@vitest/mocker": "npm:4.1.2" + "@vitest/browser": "npm:4.1.5" + "@vitest/mocker": "npm:4.1.5" tinyrainbow: "npm:^3.1.0" peerDependencies: playwright: "*" - vitest: 4.1.2 + vitest: 4.1.5 peerDependenciesMeta: playwright: optional: false - checksum: 10c0/701a750a16059be20dddb6884e9aaad43002e1d08da94df31b0dba9abed33d0c3faba8b1c56b7da25b61b0faab1e72597cbcedd2b969f4f6139b2e17a3fd4d06 + checksum: 10c0/47b0ecc13757e638f7765cb4b3172e817a25249b00bc4e9462f4228b6336c0b2f7bb692ae636373f55c8e9b35d18eaecb03abd5f15b0c42a8351da9a62f23d9f languageName: node linkType: hard -"@vitest/browser@npm:4.1.2, @vitest/browser@npm:^4.1.0": - version: 4.1.2 - resolution: "@vitest/browser@npm:4.1.2" +"@vitest/browser@npm:4.1.5, @vitest/browser@npm:^4.1.0": + version: 4.1.5 + resolution: "@vitest/browser@npm:4.1.5" dependencies: "@blazediff/core": "npm:1.9.1" - "@vitest/mocker": "npm:4.1.2" - "@vitest/utils": "npm:4.1.2" + "@vitest/mocker": "npm:4.1.5" + "@vitest/utils": "npm:4.1.5" magic-string: "npm:^0.30.21" pngjs: "npm:^7.0.0" sirv: "npm:^3.0.2" tinyrainbow: "npm:^3.1.0" ws: "npm:^8.19.0" peerDependencies: - vitest: 4.1.2 - checksum: 10c0/8ff656df7c3796f24b38800f42cc59902b15196556ef1df1cf931faf0b095db9677109c2e855ed8915c36bc6aae804b4c53e22c069c749ed2b7e16d8eefddde5 + vitest: 4.1.5 + checksum: 10c0/ea95d100853dd7a1ea9f1b036edfe441688bf5873742341ebf169ab2e32041ab6e21e5f2df918c3c4b9f110265457cdce0c0afa83407617e460a83979ae48e44 languageName: node linkType: hard "@vitest/coverage-v8@npm:^4.1.0": - version: 4.1.2 - resolution: "@vitest/coverage-v8@npm:4.1.2" + version: 4.1.5 + resolution: "@vitest/coverage-v8@npm:4.1.5" dependencies: "@bcoe/v8-coverage": "npm:^1.0.2" - "@vitest/utils": "npm:4.1.2" + "@vitest/utils": "npm:4.1.5" ast-v8-to-istanbul: "npm:^1.0.0" istanbul-lib-coverage: "npm:^3.2.2" istanbul-lib-report: "npm:^3.0.1" @@ -5305,12 +5302,12 @@ __metadata: std-env: "npm:^4.0.0-rc.1" tinyrainbow: "npm:^3.1.0" peerDependencies: - "@vitest/browser": 4.1.2 - vitest: 4.1.2 + "@vitest/browser": 4.1.5 + vitest: 4.1.5 peerDependenciesMeta: "@vitest/browser": optional: true - checksum: 10c0/2f4488efb34a5d9e3a70631ba263e153eecba8ec0da52cb874cdc674c88369061706572b9fc0c302376fd1de58aedc86a2f9f75e5a521084e31a1446c85f2c40 + checksum: 10c0/71bf669cc1714611855caef5e89b4f3e405e410bdb34e4b2f6fbc9dc5e50dd9e09e73068c1750f6bfa03f0cd9209a2b6e03665c3bdbd34e0adff1ca65c482b7b languageName: node linkType: hard @@ -5327,44 +5324,25 @@ __metadata: languageName: node linkType: hard -"@vitest/expect@npm:4.1.0": - version: 4.1.0 - resolution: "@vitest/expect@npm:4.1.0" +"@vitest/expect@npm:4.1.5": + version: 4.1.5 + resolution: "@vitest/expect@npm:4.1.5" dependencies: "@standard-schema/spec": "npm:^1.1.0" "@types/chai": "npm:^5.2.2" - "@vitest/spy": "npm:4.1.0" - "@vitest/utils": "npm:4.1.0" + "@vitest/spy": "npm:4.1.5" + "@vitest/utils": "npm:4.1.5" chai: "npm:^6.2.2" - tinyrainbow: "npm:^3.0.3" - checksum: 10c0/91cd7bb036401df5dfd9204f3de9a0afdb21dea6ee154622e5ed849e87a0df68b74258d490559c7046d3c03bc7aa634e9b0c166942a21d5e475c86c971486091 + tinyrainbow: "npm:^3.1.0" + checksum: 10c0/5184682304db471aa20024c1154210ad3d6d590afb61646201ce1a15297259f9a35f92f8fad4435bc8a82135e307ddd27c8495f72417d72d9aa139eb281d9e06 languageName: node linkType: hard -"@vitest/mocker@npm:4.1.0": - version: 4.1.0 - resolution: "@vitest/mocker@npm:4.1.0" +"@vitest/mocker@npm:4.1.5": + version: 4.1.5 + resolution: "@vitest/mocker@npm:4.1.5" dependencies: - "@vitest/spy": "npm:4.1.0" - estree-walker: "npm:^3.0.3" - magic-string: "npm:^0.30.21" - peerDependencies: - msw: ^2.4.9 - vite: ^6.0.0 || ^7.0.0 || ^8.0.0-0 - peerDependenciesMeta: - msw: - optional: true - vite: - optional: true - checksum: 10c0/f61d3df6461008eb1e62ba465172207b29bd0d9866ff6bc88cd40fc99cd5d215ad89e2894ba6de87068e33f75de903b28a65ccc6074edf3de1fbead6a4a369cc - languageName: node - linkType: hard - -"@vitest/mocker@npm:4.1.2": - version: 4.1.2 - resolution: "@vitest/mocker@npm:4.1.2" - dependencies: - "@vitest/spy": "npm:4.1.2" + "@vitest/spy": "npm:4.1.5" estree-walker: "npm:^3.0.3" magic-string: "npm:^0.30.21" peerDependencies: @@ -5375,7 +5353,7 @@ __metadata: optional: true vite: optional: true - checksum: 10c0/f23094f3c7e1e5af42e6a468f0815c1ecdcab85cb3a56ab6f3f214a9808a40271467d4352cae972482b9738cc31c62c7312d8b0da227d6ea03d2b3aacb8d385f + checksum: 10c0/bcfe97700476130933c7ea33fa670c8d2768a81de5325ce407f901e55c2f66cabbb88a7b6cffb46ddf33dff7d8fc209d769fb298f568e310fbeead9b36f6fdb9 languageName: node linkType: hard @@ -5388,43 +5366,34 @@ __metadata: languageName: node linkType: hard -"@vitest/pretty-format@npm:4.1.0": - version: 4.1.0 - resolution: "@vitest/pretty-format@npm:4.1.0" - dependencies: - tinyrainbow: "npm:^3.0.3" - checksum: 10c0/638077f53b5f24ff2d4bc062e69931fa718141db28ddafe435de98a402586b82e8c3cadfc580c0ad233d7f0203aa22d866ac2adca98b83038dbd5423c3d7fe27 - languageName: node - linkType: hard - -"@vitest/pretty-format@npm:4.1.2": - version: 4.1.2 - resolution: "@vitest/pretty-format@npm:4.1.2" +"@vitest/pretty-format@npm:4.1.5": + version: 4.1.5 + resolution: "@vitest/pretty-format@npm:4.1.5" dependencies: tinyrainbow: "npm:^3.1.0" - checksum: 10c0/6f57519c707e6a3d1ff8630ca87ce78fda9bf7bb33f6e4a0c775a8b510f2a6cee109849e2cdb736b0280681c567bd03e4cff724cbf0962950c9ff81377f0b2bc + checksum: 10c0/42b5e9b75e87c0a884d36bee364e2d07ee45e96f413377737a74993e077d90c3a12aa36743855aee5e4e28b78fae20e3e6de5eef8d5344b9aba2bc1e1d5537a1 languageName: node linkType: hard -"@vitest/runner@npm:4.1.0": - version: 4.1.0 - resolution: "@vitest/runner@npm:4.1.0" +"@vitest/runner@npm:4.1.5": + version: 4.1.5 + resolution: "@vitest/runner@npm:4.1.5" dependencies: - "@vitest/utils": "npm:4.1.0" + "@vitest/utils": "npm:4.1.5" pathe: "npm:^2.0.3" - checksum: 10c0/9e09ca1b9070d3fe26c9bd48443d21b9fe2cb9abb2f694300bd9e5065f4e904f7322c07cd4bafadfed6fb11adfb50e4d1535f327ac6d24b6c373e92be90510bc + checksum: 10c0/6a03b313a121155f6dd9e32eeb103c0e12440f586bc4ba1f0d77444e44c6df4652a44443718552037463115635b8378e11f35902d90ce1326f77743219fca056 languageName: node linkType: hard -"@vitest/snapshot@npm:4.1.0": - version: 4.1.0 - resolution: "@vitest/snapshot@npm:4.1.0" +"@vitest/snapshot@npm:4.1.5": + version: 4.1.5 + resolution: "@vitest/snapshot@npm:4.1.5" dependencies: - "@vitest/pretty-format": "npm:4.1.0" - "@vitest/utils": "npm:4.1.0" + "@vitest/pretty-format": "npm:4.1.5" + "@vitest/utils": "npm:4.1.5" magic-string: "npm:^0.30.21" pathe: "npm:^2.0.3" - checksum: 10c0/582c22988c47a99d93dd17ef660427fefe101f67ae4394b64fe58ec103ddc55fc5993626b4a2b556e0a38d40552abaca78196907455e794805ba197b3d56860f + checksum: 10c0/e11bf50d06702331290750a40eaef86078c108df3cd9a52bb1be7b84250048790163f36827525be6a383a4bb1994fc35e6d0c24239a41688b0bb68a1d15d172f languageName: node linkType: hard @@ -5437,25 +5406,18 @@ __metadata: languageName: node linkType: hard -"@vitest/spy@npm:4.1.0": - version: 4.1.0 - resolution: "@vitest/spy@npm:4.1.0" - checksum: 10c0/363776bbffda45af76ff500deacb9b1a35ad8b889462c1be9ebe5f29578ce1dd2c4bd7858c8188614a7db9699a5c802b7beb72e5a18ab5130a70326817961446 - languageName: node - linkType: hard - -"@vitest/spy@npm:4.1.2": - version: 4.1.2 - resolution: "@vitest/spy@npm:4.1.2" - checksum: 10c0/2b5888d536d3e2083c5f8939763e6d780c2c03cc60e1ab45f9d04eacf14467acb9724cae1c4778e4c06426d49d04517e190122882953054a4b13fda44780bb14 +"@vitest/spy@npm:4.1.5": + version: 4.1.5 + resolution: "@vitest/spy@npm:4.1.5" + checksum: 10c0/fda6b1ee0a2fec1a152d8041aba7a79744c3876863b244d1ed406d02b36e8ccc997edb2e3963d1027d728d3dc5a33813e11bef53a0a14fc7de4de5e721d0f591 languageName: node linkType: hard "@vitest/ui@npm:^4.1.0": - version: 4.1.2 - resolution: "@vitest/ui@npm:4.1.2" + version: 4.1.5 + resolution: "@vitest/ui@npm:4.1.5" dependencies: - "@vitest/utils": "npm:4.1.2" + "@vitest/utils": "npm:4.1.5" fflate: "npm:^0.8.2" flatted: "npm:^3.4.2" pathe: "npm:^2.0.3" @@ -5463,8 +5425,8 @@ __metadata: tinyglobby: "npm:^0.2.15" tinyrainbow: "npm:^3.1.0" peerDependencies: - vitest: 4.1.2 - checksum: 10c0/9fad46c544f754e29739995fb00edcaa4567ff03d46ce347471f5fa6b905167ba1e11a00e96d2dcfe9c3271e18b54e52294728a04288fcc2b9438a753ff538d2 + vitest: 4.1.5 + checksum: 10c0/2109480d08516abe3350994ebfcb9adc8a2eb4bb1839c48a336d6ff3378eb49a520ad6490f177e60034ed4fcf579206d9ab14995e951cbf6d4c7c792c46fe202 languageName: node linkType: hard @@ -5479,25 +5441,14 @@ __metadata: languageName: node linkType: hard -"@vitest/utils@npm:4.1.0": - version: 4.1.0 - resolution: "@vitest/utils@npm:4.1.0" +"@vitest/utils@npm:4.1.5": + version: 4.1.5 + resolution: "@vitest/utils@npm:4.1.5" dependencies: - "@vitest/pretty-format": "npm:4.1.0" - convert-source-map: "npm:^2.0.0" - tinyrainbow: "npm:^3.0.3" - checksum: 10c0/222afbdef4f680a554bb6c3d946a4a879a441ebfb8597295cb7554d295e0e2624f3d4c2920b5767bbb8961a9f8a16756270ffc84032f5ea432cdce080ccab050 - languageName: node - linkType: hard - -"@vitest/utils@npm:4.1.2": - version: 4.1.2 - resolution: "@vitest/utils@npm:4.1.2" - dependencies: - "@vitest/pretty-format": "npm:4.1.2" + "@vitest/pretty-format": "npm:4.1.5" convert-source-map: "npm:^2.0.0" tinyrainbow: "npm:^3.1.0" - checksum: 10c0/d96475e0703b6e5208c6c0f570c1235278cbac3f3913a9aa4203a3e617c9eaca85a184bfd5d13cf366b84754df787ab8bc85242c5e0c63105ee7176c186a2136 + checksum: 10c0/72409717e68018e5fe42fa173cc4eff6def8c35bd52013f86ddb414cd28d73fcc425ac62968e01a52371b3fd5a7a775536283d2f1d64432753f628712a6a4908 languageName: node linkType: hard @@ -5592,10 +5543,10 @@ __metadata: languageName: node linkType: hard -"ansi-regex@npm:^6.0.1": - version: 6.0.1 - resolution: "ansi-regex@npm:6.0.1" - checksum: 10c0/cbe16dbd2c6b2735d1df7976a7070dd277326434f0212f43abf6d87674095d247968209babdaad31bb00882fa68807256ba9be340eec2f1004de14ca75f52a08 +"ansi-regex@npm:^6.2.2": + version: 6.2.2 + resolution: "ansi-regex@npm:6.2.2" + checksum: 10c0/05d4acb1d2f59ab2cf4b794339c7b168890d44dda4bf0ce01152a8da0213aca207802f930442ce8cd22d7a92f44907664aac6508904e75e038fa944d2601b30f languageName: node linkType: hard @@ -5956,13 +5907,6 @@ __metadata: languageName: node linkType: hard -"balanced-match@npm:^3.0.1": - version: 3.0.1 - resolution: "balanced-match@npm:3.0.1" - checksum: 10c0/ac8dd63a5b260610c2cbda982f436e964c1b9ae8764d368a523769da40a31710abd6e19f0fdf1773c4ad7b2ea7ba7b285d547375dc723f6e754369835afc8e9f - languageName: node - linkType: hard - "balanced-match@npm:^4.0.2": version: 4.0.4 resolution: "balanced-match@npm:4.0.4" @@ -6144,16 +6088,16 @@ __metadata: languageName: node linkType: hard -"cacheable@npm:^2.2.0": - version: 2.2.0 - resolution: "cacheable@npm:2.2.0" +"cacheable@npm:^2.3.4": + version: 2.3.4 + resolution: "cacheable@npm:2.3.4" dependencies: - "@cacheable/memory": "npm:^2.0.5" - "@cacheable/utils": "npm:^2.3.0" - hookified: "npm:^1.13.0" - keyv: "npm:^5.5.4" - qified: "npm:^0.5.2" - checksum: 10c0/39b09e68b0a3da6c53dba1ed10dd13b63bf03f1fcb93ee941dd324d758e2d84466f1acb0c760fa78b23377be15ee58dc9acfb1fde85a89d2483d195b2f75e249 + "@cacheable/memory": "npm:^2.0.8" + "@cacheable/utils": "npm:^2.4.0" + hookified: "npm:^1.15.0" + keyv: "npm:^5.6.0" + qified: "npm:^0.9.0" + checksum: 10c0/47139d83bed1a74f4e0bd5c102a0865146149fd192d572e61f141947ac6d7d8fa334794a25ac47d8df3758522b5c53a740ccfd31cc611fa098ea598ab08b7e20 languageName: node linkType: hard @@ -6404,10 +6348,10 @@ __metadata: languageName: node linkType: hard -"commander@npm:^14.0.2": - version: 14.0.2 - resolution: "commander@npm:14.0.2" - checksum: 10c0/245abd1349dbad5414cb6517b7b5c584895c02c4f7836ff5395f301192b8566f9796c82d7bd6c92d07eba8775fe4df86602fca5d86d8d10bcc2aded1e21c2aeb +"commander@npm:^14.0.3": + version: 14.0.3 + resolution: "commander@npm:14.0.3" + checksum: 10c0/755652564bbf56ff2ff083313912b326450d3f8d8c85f4b71416539c9a05c3c67dbd206821ca72635bf6b160e2afdefcb458e86b317827d5cb333b69ce7f1a24 languageName: node linkType: hard @@ -6562,9 +6506,9 @@ __metadata: languageName: node linkType: hard -"cosmiconfig@npm:^9.0.0": - version: 9.0.0 - resolution: "cosmiconfig@npm:9.0.0" +"cosmiconfig@npm:^9.0.1": + version: 9.0.1 + resolution: "cosmiconfig@npm:9.0.1" dependencies: env-paths: "npm:^2.2.1" import-fresh: "npm:^3.3.0" @@ -6575,7 +6519,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10c0/1c1703be4f02a250b1d6ca3267e408ce16abfe8364193891afc94c2d5c060b69611fdc8d97af74b7e6d5d1aac0ab2fb94d6b079573146bc2d756c2484ce5f0ee + checksum: 10c0/a5d4d95599687532ee072bca60170133c24d4e08cd795529e0f22c6ce5fde9409eaf4f26e36e3d671f43270ef858fc68f3c7b0ec28e58fac7ddebda5b7725306 languageName: node linkType: hard @@ -6621,10 +6565,10 @@ __metadata: languageName: node linkType: hard -"css-functions-list@npm:^3.2.3": - version: 3.2.3 - resolution: "css-functions-list@npm:3.2.3" - checksum: 10c0/03f9ed34eeed310d2b1cf0e524eea02bc5f87854a4de85f8957ea432ab1036841a3fb00879590519f7bb8fda40d992ce7a72fa9b61696ca1dc53b90064858f96 +"css-functions-list@npm:^3.3.3": + version: 3.3.3 + resolution: "css-functions-list@npm:3.3.3" + checksum: 10c0/7b9e5dd94e0178b2edb0f3263de5ae7942e56ab0b73420d4adb8fea003367e1dbc94fe8ea300bf732d1423f7eafb523e695136f0a4e6ae4f0abec66848219ee6 languageName: node linkType: hard @@ -6650,7 +6594,7 @@ __metadata: languageName: node linkType: hard -"css-tree@npm:^3.0.0, css-tree@npm:^3.0.1, css-tree@npm:^3.1.0, css-tree@npm:^3.2.1": +"css-tree@npm:^3.0.0, css-tree@npm:^3.0.1, css-tree@npm:^3.2.1": version: 3.2.1 resolution: "css-tree@npm:3.2.1" dependencies: @@ -7981,12 +7925,12 @@ __metadata: languageName: node linkType: hard -"file-entry-cache@npm:^11.1.1": - version: 11.1.1 - resolution: "file-entry-cache@npm:11.1.1" +"file-entry-cache@npm:^11.1.2": + version: 11.1.2 + resolution: "file-entry-cache@npm:11.1.2" dependencies: - flat-cache: "npm:^6.1.19" - checksum: 10c0/aa639f5dd578f63984a941f34b112180a4bd9d091d03970752437958158932957fc576861b9fbcf4d6eceaeb0779ad5359befdc321cc1bac59aa6f56f6b1d205 + flat-cache: "npm:^6.1.20" + checksum: 10c0/14a251661750b783236d8e2fdf98da642b0069d6bd2b512caed36ee6a6d719b06493f15fcdda5ec32a61770d5eba6ac885b4ff4a64e57f3cc2a33d99aebabd08 languageName: node linkType: hard @@ -8058,18 +8002,18 @@ __metadata: languageName: node linkType: hard -"flat-cache@npm:^6.1.19": - version: 6.1.19 - resolution: "flat-cache@npm:6.1.19" +"flat-cache@npm:^6.1.20": + version: 6.1.22 + resolution: "flat-cache@npm:6.1.22" dependencies: - cacheable: "npm:^2.2.0" - flatted: "npm:^3.3.3" - hookified: "npm:^1.13.0" - checksum: 10c0/80c2d3c6ff2b7327920dacf2ab57e70ba4e865120209e41295689f029fcec17a6b49892ded7ce758d968d2b097fa2f9ab4e52923d971f3cdc90af9faba4680fd + cacheable: "npm:^2.3.4" + flatted: "npm:^3.4.2" + hookified: "npm:^1.15.0" + checksum: 10c0/ec94fba4ecb10b43567bb815f19e178d4351a66a58117b06a06c81bda6b579c2ed75d8cbd9ea90a2ab9408493b564ffef55386f263f20d1d73bb991fa97de67f languageName: node linkType: hard -"flatted@npm:^3.2.9, flatted@npm:^3.3.3, flatted@npm:^3.4.2": +"flatted@npm:^3.2.9, flatted@npm:^3.4.2": version: 3.4.2 resolution: "flatted@npm:3.4.2" checksum: 10c0/a65b67aae7172d6cdf63691be7de6c5cd5adbdfdfe2e9da1a09b617c9512ed794037741ee53d93114276bff3f93cd3b0d97d54f9b316e1e4885dde6e9ffdf7ed @@ -8254,10 +8198,10 @@ __metadata: languageName: node linkType: hard -"get-east-asian-width@npm:^1.0.0, get-east-asian-width@npm:^1.3.0": - version: 1.4.0 - resolution: "get-east-asian-width@npm:1.4.0" - checksum: 10c0/4e481d418e5a32061c36fbb90d1b225a254cc5b2df5f0b25da215dcd335a3c111f0c2023ffda43140727a9cafb62dac41d022da82c08f31083ee89f714ee3b83 +"get-east-asian-width@npm:^1.0.0, get-east-asian-width@npm:^1.5.0": + version: 1.5.0 + resolution: "get-east-asian-width@npm:1.5.0" + checksum: 10c0/bff8bbc8d81790b9477f7aa55b1806b9f082a8dc1359fff7bd8b96939622c86b729685afc2bfeb22def1fc6ef1e5228e4d87dd4e6da60bc43a5edfb03c4ee167 languageName: node linkType: hard @@ -8435,9 +8379,9 @@ __metadata: languageName: node linkType: hard -"globby@npm:^16.1.0": - version: 16.1.0 - resolution: "globby@npm:16.1.0" +"globby@npm:^16.2.0": + version: 16.2.0 + resolution: "globby@npm:16.2.0" dependencies: "@sindresorhus/merge-streams": "npm:^4.0.0" fast-glob: "npm:^3.3.3" @@ -8445,7 +8389,7 @@ __metadata: is-path-inside: "npm:^4.0.0" slash: "npm:^5.1.0" unicorn-magic: "npm:^0.4.0" - checksum: 10c0/45dd4dd8311401b37ed426ad7ea7a6e8fdda2518bb0d62fbf0a46c2e6b81bcbd2c8d4fbcbcf4c0600bba15c5a8f4621785d0177acbb1b545f02f6b49f2cdbe24 + checksum: 10c0/fc0675e01dc1da5095f30dccc46a3047fc38d45ca08c21c1aa871bd79d38682f507d84a159be168019db5fffaa09c5663c3679c29190a2d4f999dc91d7ff6406 languageName: node linkType: hard @@ -8532,12 +8476,12 @@ __metadata: languageName: node linkType: hard -"hashery@npm:^1.2.0": - version: 1.2.0 - resolution: "hashery@npm:1.2.0" +"hashery@npm:^1.4.0, hashery@npm:^1.5.1": + version: 1.5.1 + resolution: "hashery@npm:1.5.1" dependencies: - hookified: "npm:^1.13.0" - checksum: 10c0/57905ae4bcb12faedf222b1f39cc05424ae2a2bba1f613b9c582a4e5012b8361c14a25a5a0c16da7eca70ee8338ad2924d6b9566667014c927a36d4b90ad5b72 + hookified: "npm:^1.15.0" + checksum: 10c0/ab4225b655a7b0d05df99b1a59d5b3a51fe433f82422ca25e6f3f4c4ddd30adb49ebd38e0047ef9bded93319c1e9fc857e16aa382e554929c871cb77d39fc463 languageName: node linkType: hard @@ -8603,10 +8547,17 @@ __metadata: languageName: node linkType: hard -"hookified@npm:^1.12.2, hookified@npm:^1.13.0": - version: 1.13.0 - resolution: "hookified@npm:1.13.0" - checksum: 10c0/26718a60385ab95f20173323c175a23b06efcc1fac613c51714c9c38038c7395ed52d3bea660840c8362d92dc38022ae4469c2a531728f6116f4df53f70505e7 +"hookified@npm:^1.15.0, hookified@npm:^1.15.1": + version: 1.15.1 + resolution: "hookified@npm:1.15.1" + checksum: 10c0/6b691374fa97ae57169fb29f90e723499fda5e85494654fbe55c4768b3ccbf3e14c0adc8d0f365f32c503b60d7c06f907781f5966c03d41c423575eb5e16860c + languageName: node + linkType: hard + +"hookified@npm:^2.1.1": + version: 2.2.0 + resolution: "hookified@npm:2.2.0" + checksum: 10c0/7017d2b66945490293a5aba239e7b39f39071dd940fa019348c7ffea92b91b8c267853c4c51680ed0f3687b33352582fa4d2cff6dd4c5a1c5c44b037276f07aa languageName: node linkType: hard @@ -9599,12 +9550,12 @@ __metadata: languageName: node linkType: hard -"keyv@npm:^5.5.4": - version: 5.5.4 - resolution: "keyv@npm:5.5.4" +"keyv@npm:^5.6.0": + version: 5.6.0 + resolution: "keyv@npm:5.6.0" dependencies: "@keyv/serialize": "npm:^1.1.1" - checksum: 10c0/8dad7f61022c6348c4c691a19468b7c238198252edbd3cc08277d95253c137af7ce5ffd763b6ffded4a75cbe03dc3134f1adcd3dd26c5767c2c9c254e3b39001 + checksum: 10c0/c3ea795b6e03593ca57c8f70928a69bad14c13389a7fb75649a115ff55615244b04d8902798d841c17f0bb4a8a8866c97133b543b93f151b440170bba09176db languageName: node linkType: hard @@ -9834,19 +9785,18 @@ __metadata: linkType: hard "lint-staged@npm:^16.2.6": - version: 16.2.7 - resolution: "lint-staged@npm:16.2.7" + version: 16.4.0 + resolution: "lint-staged@npm:16.4.0" dependencies: - commander: "npm:^14.0.2" + commander: "npm:^14.0.3" listr2: "npm:^9.0.5" - micromatch: "npm:^4.0.8" - nano-spawn: "npm:^2.0.0" - pidtree: "npm:^0.6.0" + picomatch: "npm:^4.0.3" string-argv: "npm:^0.3.2" - yaml: "npm:^2.8.1" + tinyexec: "npm:^1.0.4" + yaml: "npm:^2.8.2" bin: lint-staged: bin/lint-staged.js - checksum: 10c0/9a677c21a8112d823ae5bc565ba2c9e7b803786f2a021c46827a55fe44ed59def96edb24fc99c06a2545cdbbf366022ad82addcb3bf60c712f3b98ef92069717 + checksum: 10c0/67625a49a2a01368c7df2da7e553567a79c4b261d9faf3436e00fc3a2f9c4bbe7295909012c47b3d9029e269fd7d7469901a5120573527a032f15797aa497c26 languageName: node linkType: hard @@ -10117,10 +10067,10 @@ __metadata: languageName: node linkType: hard -"meow@npm:^14.0.0": - version: 14.0.0 - resolution: "meow@npm:14.0.0" - checksum: 10c0/dbe4e136e0f858472d8b8c24d382054fe9898f6f47c58a42be25e6b1985e5ae31048573bf399f6e5877bf9d5b89cb840beae7350682019f998ff30baaa5e4106 +"meow@npm:^14.1.0": + version: 14.1.0 + resolution: "meow@npm:14.1.0" + checksum: 10c0/f0ca4bb4fd08e4b9470fcbb7332deb61d72d40d4bda18ffb87c1a98e5014c0b44749ae9f0cab18fa532e26d61cef5d453831f9ae23ac09fa8ea0e0469be73ebc languageName: node linkType: hard @@ -10396,13 +10346,6 @@ __metadata: languageName: node linkType: hard -"nano-spawn@npm:^2.0.0": - version: 2.0.0 - resolution: "nano-spawn@npm:2.0.0" - checksum: 10c0/d00f9b5739f86e28cb732ffd774793e110810cded246b8393c75c4f22674af47f98ee37b19f022ada2d8c9425f800e841caa0662fbff4c0930a10e39339fb366 - languageName: node - linkType: hard - "nanoid@npm:^3.3.11": version: 3.3.11 resolution: "nanoid@npm:3.3.11" @@ -10810,29 +10753,29 @@ __metadata: languageName: node linkType: hard -"oxfmt@npm:^0.33.0": - version: 0.33.0 - resolution: "oxfmt@npm:0.33.0" +"oxfmt@npm:^0.47.0": + version: 0.47.0 + resolution: "oxfmt@npm:0.47.0" dependencies: - "@oxfmt/binding-android-arm-eabi": "npm:0.33.0" - "@oxfmt/binding-android-arm64": "npm:0.33.0" - "@oxfmt/binding-darwin-arm64": "npm:0.33.0" - "@oxfmt/binding-darwin-x64": "npm:0.33.0" - "@oxfmt/binding-freebsd-x64": "npm:0.33.0" - "@oxfmt/binding-linux-arm-gnueabihf": "npm:0.33.0" - "@oxfmt/binding-linux-arm-musleabihf": "npm:0.33.0" - "@oxfmt/binding-linux-arm64-gnu": "npm:0.33.0" - "@oxfmt/binding-linux-arm64-musl": "npm:0.33.0" - "@oxfmt/binding-linux-ppc64-gnu": "npm:0.33.0" - "@oxfmt/binding-linux-riscv64-gnu": "npm:0.33.0" - "@oxfmt/binding-linux-riscv64-musl": "npm:0.33.0" - "@oxfmt/binding-linux-s390x-gnu": "npm:0.33.0" - "@oxfmt/binding-linux-x64-gnu": "npm:0.33.0" - "@oxfmt/binding-linux-x64-musl": "npm:0.33.0" - "@oxfmt/binding-openharmony-arm64": "npm:0.33.0" - "@oxfmt/binding-win32-arm64-msvc": "npm:0.33.0" - "@oxfmt/binding-win32-ia32-msvc": "npm:0.33.0" - "@oxfmt/binding-win32-x64-msvc": "npm:0.33.0" + "@oxfmt/binding-android-arm-eabi": "npm:0.47.0" + "@oxfmt/binding-android-arm64": "npm:0.47.0" + "@oxfmt/binding-darwin-arm64": "npm:0.47.0" + "@oxfmt/binding-darwin-x64": "npm:0.47.0" + "@oxfmt/binding-freebsd-x64": "npm:0.47.0" + "@oxfmt/binding-linux-arm-gnueabihf": "npm:0.47.0" + "@oxfmt/binding-linux-arm-musleabihf": "npm:0.47.0" + "@oxfmt/binding-linux-arm64-gnu": "npm:0.47.0" + "@oxfmt/binding-linux-arm64-musl": "npm:0.47.0" + "@oxfmt/binding-linux-ppc64-gnu": "npm:0.47.0" + "@oxfmt/binding-linux-riscv64-gnu": "npm:0.47.0" + "@oxfmt/binding-linux-riscv64-musl": "npm:0.47.0" + "@oxfmt/binding-linux-s390x-gnu": "npm:0.47.0" + "@oxfmt/binding-linux-x64-gnu": "npm:0.47.0" + "@oxfmt/binding-linux-x64-musl": "npm:0.47.0" + "@oxfmt/binding-openharmony-arm64": "npm:0.47.0" + "@oxfmt/binding-win32-arm64-msvc": "npm:0.47.0" + "@oxfmt/binding-win32-ia32-msvc": "npm:0.47.0" + "@oxfmt/binding-win32-x64-msvc": "npm:0.47.0" tinypool: "npm:2.1.0" dependenciesMeta: "@oxfmt/binding-android-arm-eabi": @@ -10875,7 +10818,7 @@ __metadata: optional: true bin: oxfmt: bin/oxfmt - checksum: 10c0/77f670459a26a14844bdc9b34e7e06eae0b787138e265e28fa011eb9181f232cf784cd1c40adca1416d2af3f5c1af1ed08d3815860bb4596edcb0c4e3773d1f3 + checksum: 10c0/2651c383e1a35d88e573a74e714e618cb0dcc0ec9c522dcbd822baa75aa2d793bd657d8abdfbb3e27f0a9886be174ebe620f842a7c0e86a18c7b591d59f649c1 languageName: node linkType: hard @@ -11179,15 +11122,6 @@ __metadata: languageName: node linkType: hard -"pidtree@npm:^0.6.0": - version: 0.6.0 - resolution: "pidtree@npm:0.6.0" - bin: - pidtree: bin/pidtree.js - checksum: 10c0/0829ec4e9209e230f74ebf4265f5ccc9ebfb488334b525cb13f86ff801dca44b362c41252cd43ae4d7653a10a5c6ab3be39d2c79064d6895e0d78dc50a5ed6e9 - languageName: node - linkType: hard - "pify@npm:^4.0.1": version: 4.0.1 resolution: "pify@npm:4.0.1" @@ -11778,14 +11712,14 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.0.0, postcss@npm:^8.4.35, postcss@npm:^8.5.10, postcss@npm:^8.5.6": - version: 8.5.12 - resolution: "postcss@npm:8.5.12" +"postcss@npm:^8.0.0, postcss@npm:^8.4.35, postcss@npm:^8.5.10, postcss@npm:^8.5.13": + version: 8.5.13 + resolution: "postcss@npm:8.5.13" dependencies: nanoid: "npm:^3.3.11" picocolors: "npm:^1.1.1" source-map-js: "npm:^1.2.1" - checksum: 10c0/5baebaf574c567bc1b3d61197f38af4ce5920b8f611c887fb6bc3dcc14af00253c169dbf19897bc889cce0b0d9818ab5eb4ea0caedf02b0bab10da8a43ce8c12 + checksum: 10c0/3aa7c8cbdfbfd99b34406a433cef56d164dd135fc9cb9e63d487cc363291f877a55ec7b8ff6ec15348c17c2d98a43be46bfad671e6340403041a3e79f70c2f2f languageName: node linkType: hard @@ -11951,12 +11885,12 @@ __metadata: languageName: node linkType: hard -"qified@npm:^0.5.2": - version: 0.5.2 - resolution: "qified@npm:0.5.2" +"qified@npm:^0.9.0": + version: 0.9.1 + resolution: "qified@npm:0.9.1" dependencies: - hookified: "npm:^1.13.0" - checksum: 10c0/4234ba1c0d3b14f31752a39f6788b2490cebad57abd1ce0cee0e04d2fe04a234463785d47559d364affe4d1578aad06fa2fd67b87044688708bf56d4a18ce44a + hookified: "npm:^2.1.1" + checksum: 10c0/815cfaefac67a702cd8aec9f7ac946ee7acf985ad13f518d0ec30f3ba5c7e74b72e014cf316b493baa54d81f4fadb2a2cf60a0a197326fd14fa68e6e7cf96832 languageName: node linkType: hard @@ -13500,13 +13434,13 @@ __metadata: languageName: node linkType: hard -"string-width@npm:^8.0.0, string-width@npm:^8.1.0": - version: 8.1.0 - resolution: "string-width@npm:8.1.0" +"string-width@npm:^8.0.0, string-width@npm:^8.2.0": + version: 8.2.1 + resolution: "string-width@npm:8.2.1" dependencies: - get-east-asian-width: "npm:^1.3.0" - strip-ansi: "npm:^7.1.0" - checksum: 10c0/749b5d0dab2532b4b6b801064230f4da850f57b3891287023117ab63a464ad79dd208f42f793458f48f3ad121fe2e1f01dd525ff27ead957ed9f205e27406593 + get-east-asian-width: "npm:^1.5.0" + strip-ansi: "npm:^7.1.2" + checksum: 10c0/d467b4eaf4c40a01bb438a2620e77badd2456ffd5131c9973abe4f3acf7c802d5b21f3b6a00a5e33a7fc28ca8f9c103226e01bac61e9f259659c6f46d78e353a languageName: node linkType: hard @@ -13619,12 +13553,12 @@ __metadata: languageName: node linkType: hard -"strip-ansi@npm:^7.0.1, strip-ansi@npm:^7.1.0": - version: 7.1.0 - resolution: "strip-ansi@npm:7.1.0" +"strip-ansi@npm:^7.0.1, strip-ansi@npm:^7.1.0, strip-ansi@npm:^7.1.2": + version: 7.2.0 + resolution: "strip-ansi@npm:7.2.0" dependencies: - ansi-regex: "npm:^6.0.1" - checksum: 10c0/a198c3762e8832505328cbf9e8c8381de14a4fa50a4f9b2160138158ea88c0f5549fb50cb13c651c3088f47e63a108b34622ec18c0499b6c8c3a5ddf6b305ac4 + ansi-regex: "npm:^6.2.2" + checksum: 10c0/544d13b7582f8254811ea97db202f519e189e59d35740c46095897e254e4f1aa9fe1524a83ad6bc5ad67d4dd6c0281d2e0219ed62b880a6238a16a17d375f221 languageName: node linkType: hard @@ -13746,50 +13680,48 @@ __metadata: linkType: hard "stylelint@npm:^17.0.0": - version: 17.0.0 - resolution: "stylelint@npm:17.0.0" + version: 17.10.0 + resolution: "stylelint@npm:17.10.0" dependencies: + "@csstools/css-calc": "npm:^3.2.0" "@csstools/css-parser-algorithms": "npm:^4.0.0" - "@csstools/css-syntax-patches-for-csstree": "npm:^1.0.25" + "@csstools/css-syntax-patches-for-csstree": "npm:^1.1.3" "@csstools/css-tokenizer": "npm:^4.0.0" "@csstools/media-query-list-parser": "npm:^5.0.0" "@csstools/selector-resolve-nested": "npm:^4.0.0" "@csstools/selector-specificity": "npm:^6.0.0" - balanced-match: "npm:^3.0.1" colord: "npm:^2.9.3" - cosmiconfig: "npm:^9.0.0" - css-functions-list: "npm:^3.2.3" - css-tree: "npm:^3.1.0" + cosmiconfig: "npm:^9.0.1" + css-functions-list: "npm:^3.3.3" + css-tree: "npm:^3.2.1" debug: "npm:^4.4.3" fast-glob: "npm:^3.3.3" fastest-levenshtein: "npm:^1.0.16" - file-entry-cache: "npm:^11.1.1" + file-entry-cache: "npm:^11.1.2" global-modules: "npm:^2.0.0" - globby: "npm:^16.1.0" + globby: "npm:^16.2.0" globjoin: "npm:^0.1.4" html-tags: "npm:^5.1.0" ignore: "npm:^7.0.5" import-meta-resolve: "npm:^4.2.0" - imurmurhash: "npm:^0.1.4" is-plain-object: "npm:^5.0.0" - known-css-properties: "npm:^0.37.0" mathml-tag-names: "npm:^4.0.0" - meow: "npm:^14.0.0" + meow: "npm:^14.1.0" micromatch: "npm:^4.0.8" normalize-path: "npm:^3.0.0" picocolors: "npm:^1.1.1" - postcss: "npm:^8.5.6" + postcss: "npm:^8.5.13" postcss-safe-parser: "npm:^7.0.1" postcss-selector-parser: "npm:^7.1.1" postcss-value-parser: "npm:^4.2.0" - string-width: "npm:^8.1.0" + string-width: "npm:^8.2.0" supports-hyperlinks: "npm:^4.4.0" svg-tags: "npm:^1.0.0" table: "npm:^6.9.0" - write-file-atomic: "npm:^7.0.0" + write-file-atomic: "npm:^7.0.1" bin: stylelint: bin/stylelint.mjs - checksum: 10c0/ad1ebabb17904c1bc0e386b078b9656c02942b60ae3663a00b2b23c60e9c6adffbd6787999ad4473cb558c0fc195c0d9e0de5a5e8f063752b61fe3a281fc4433 + checksum: 10c0/4a899cdc9de7d281dcd94174e5eb94f1c904f3e608df5a13039d2f67a4f7d7a304ea75c5a6c77e448f83f66c12dcde1e0d4aa03ed7ee5c964d3966de6a6ad2e6 languageName: node linkType: hard @@ -14020,10 +13952,10 @@ __metadata: languageName: node linkType: hard -"tinyexec@npm:^1.0.2": - version: 1.0.2 - resolution: "tinyexec@npm:1.0.2" - checksum: 10c0/1261a8e34c9b539a9aae3b7f0bb5372045ff28ee1eba035a2a059e532198fe1a182ec61ac60fa0b4a4129f0c4c4b1d2d57355b5cb9aa2d17ac9454ecace502ee +"tinyexec@npm:^1.0.2, tinyexec@npm:^1.0.4": + version: 1.1.2 + resolution: "tinyexec@npm:1.1.2" + checksum: 10c0/9e0ef6c001ce54688cf16833a02f70a339276219ca947b88930b124267de2cffc764ff44e87e7369384b1d75ab63491465412cbbdf06f2437956b9ab66ab4491 languageName: node linkType: hard @@ -14051,13 +13983,6 @@ __metadata: languageName: node linkType: hard -"tinyrainbow@npm:^3.0.3": - version: 3.0.3 - resolution: "tinyrainbow@npm:3.0.3" - checksum: 10c0/1e799d35cd23cabe02e22550985a3051dc88814a979be02dc632a159c393a998628eacfc558e4c746b3006606d54b00bcdea0c39301133956d10a27aa27e988c - languageName: node - linkType: hard - "tinyrainbow@npm:^3.1.0": version: 3.1.0 resolution: "tinyrainbow@npm:3.1.0" @@ -14789,7 +14714,7 @@ __metadata: languageName: node linkType: hard -"vite@npm:^6.0.0 || ^7.0.0 || ^8.0.0-0, vite@npm:^8.0.0": +"vite@npm:^6.0.0 || ^7.0.0 || ^8.0.0, vite@npm:^8.0.0": version: 8.0.10 resolution: "vite@npm:8.0.10" dependencies: @@ -14847,16 +14772,16 @@ __metadata: linkType: hard "vitest@npm:^4.1.0": - version: 4.1.0 - resolution: "vitest@npm:4.1.0" + version: 4.1.5 + resolution: "vitest@npm:4.1.5" dependencies: - "@vitest/expect": "npm:4.1.0" - "@vitest/mocker": "npm:4.1.0" - "@vitest/pretty-format": "npm:4.1.0" - "@vitest/runner": "npm:4.1.0" - "@vitest/snapshot": "npm:4.1.0" - "@vitest/spy": "npm:4.1.0" - "@vitest/utils": "npm:4.1.0" + "@vitest/expect": "npm:4.1.5" + "@vitest/mocker": "npm:4.1.5" + "@vitest/pretty-format": "npm:4.1.5" + "@vitest/runner": "npm:4.1.5" + "@vitest/snapshot": "npm:4.1.5" + "@vitest/spy": "npm:4.1.5" + "@vitest/utils": "npm:4.1.5" es-module-lexer: "npm:^2.0.0" expect-type: "npm:^1.3.0" magic-string: "npm:^0.30.21" @@ -14867,20 +14792,22 @@ __metadata: tinybench: "npm:^2.9.0" tinyexec: "npm:^1.0.2" tinyglobby: "npm:^0.2.15" - tinyrainbow: "npm:^3.0.3" - vite: "npm:^6.0.0 || ^7.0.0 || ^8.0.0-0" + tinyrainbow: "npm:^3.1.0" + vite: "npm:^6.0.0 || ^7.0.0 || ^8.0.0" why-is-node-running: "npm:^2.3.0" peerDependencies: "@edge-runtime/vm": "*" "@opentelemetry/api": ^1.9.0 "@types/node": ^20.0.0 || ^22.0.0 || >=24.0.0 - "@vitest/browser-playwright": 4.1.0 - "@vitest/browser-preview": 4.1.0 - "@vitest/browser-webdriverio": 4.1.0 - "@vitest/ui": 4.1.0 + "@vitest/browser-playwright": 4.1.5 + "@vitest/browser-preview": 4.1.5 + "@vitest/browser-webdriverio": 4.1.5 + "@vitest/coverage-istanbul": 4.1.5 + "@vitest/coverage-v8": 4.1.5 + "@vitest/ui": 4.1.5 happy-dom: "*" jsdom: "*" - vite: ^6.0.0 || ^7.0.0 || ^8.0.0-0 + vite: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: "@edge-runtime/vm": optional: true @@ -14894,6 +14821,10 @@ __metadata: optional: true "@vitest/browser-webdriverio": optional: true + "@vitest/coverage-istanbul": + optional: true + "@vitest/coverage-v8": + optional: true "@vitest/ui": optional: true happy-dom: @@ -14904,7 +14835,7 @@ __metadata: optional: false bin: vitest: vitest.mjs - checksum: 10c0/48048e4391e4e8190aa12b1c868bef4ad8d346214631b4506e0dc1f3241ecb8bcb24f296c38a7d98eae712a042375ae209da4b35165db38f9a9bc79a3a9e2a04 + checksum: 10c0/196eaf5e95b45a3f6d3001a2408d7dc6f146c29c873ed4e42e1ad4c9327122934fb3793a12b6ce3b7c25d355e738b20123acc0894ce30358c3370b15f4bd0865 languageName: node linkType: hard @@ -15354,13 +15285,12 @@ __metadata: languageName: node linkType: hard -"write-file-atomic@npm:^7.0.0": - version: 7.0.0 - resolution: "write-file-atomic@npm:7.0.0" +"write-file-atomic@npm:^7.0.1": + version: 7.0.1 + resolution: "write-file-atomic@npm:7.0.1" dependencies: - imurmurhash: "npm:^0.1.4" signal-exit: "npm:^4.0.1" - checksum: 10c0/f5dd7c0324ae03b399974484fbe56363654c3884920e3c4f4d59b690596f113f60f4061a3c0aa5e6f4c22e5b9e7e0608954fd8131a916c9123b68a17ba886345 + checksum: 10c0/69cebb64945e22928a24ae7e2a55bf54438c92d6f657c1fa5e96b7c7a50f6c022e7454ab5c259079bb35f60296242f3a21234c79320d64a8ad57675b56a2098d languageName: node linkType: hard @@ -15454,12 +15384,12 @@ __metadata: languageName: node linkType: hard -"yaml@npm:^2.8.1": - version: 2.8.1 - resolution: "yaml@npm:2.8.1" +"yaml@npm:^2.8.2": + version: 2.8.4 + resolution: "yaml@npm:2.8.4" bin: yaml: bin.mjs - checksum: 10c0/7c587be00d9303d2ae1566e03bc5bc7fe978ba0d9bf39cc418c3139d37929dfcb93a230d9749f2cb578b6aa5d9ebebc322415e4b653cb83acd8bc0bc321707f3 + checksum: 10c0/0a33a1fa28d4bc79f61a12ec7ef7a2bce0ce5f8e80c6eaecfb4a0c88c08767dd1ede372b6a3bcd70891213b8c9f3169b355c97e77026d3b3459e10d2cccaef1e languageName: node linkType: hard From 066456ecdf6c8bff07827454f8e7c768b25b52d2 Mon Sep 17 00:00:00 2001 From: Kenta Ishizaki <153918146+55728@users.noreply.github.com> Date: Tue, 5 May 2026 13:54:34 +0900 Subject: [PATCH 2/7] Fix typo in typed_functions.ts comment (#38590) --- app/javascript/mastodon/store/typed_functions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/mastodon/store/typed_functions.ts b/app/javascript/mastodon/store/typed_functions.ts index 79bca08a52..b6f46db686 100644 --- a/app/javascript/mastodon/store/typed_functions.ts +++ b/app/javascript/mastodon/store/typed_functions.ts @@ -230,7 +230,7 @@ export function createDataLoadingThunk< ): ReturnType>; /** - * This function creates a Redux Thunk that handles loading data asynchronously (usually from the API), dispatching `pending`, `fullfilled` and `rejected` actions. + * This function creates a Redux Thunk that handles loading data asynchronously (usually from the API), dispatching `pending`, `fulfilled` and `rejected` actions. * * You can run a callback on the `onData` results to either dispatch side effects or modify the payload. * From 0aae54dfd9d4e7402f9a3addf5dd6622d5a166c2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 5 May 2026 10:17:59 +0200 Subject: [PATCH 3/7] Update dependency linzer to v0.7.9 (#38874) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f28240ce2f..94bbf5d18c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -411,15 +411,13 @@ GEM rexml link_header (0.0.8) lint_roller (1.1.0) - linzer (0.7.8) + linzer (0.7.9) cgi (>= 0.4.2, < 0.6.0) forwardable (~> 1.3, >= 1.3.3) logger (~> 1.7, >= 1.7.0) net-http (>= 0.6, < 0.10) - openssl (>= 3, < 5) rack (>= 2.2, < 4.0) starry (~> 0.2) - stringio (~> 3.1, >= 3.1.2) uri (~> 1.0, >= 1.0.2) llhttp-ffi (0.5.1) ffi-compiler (~> 1.0) From 127de5bb3dfa6a84d4901f89be36749d016c6634 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 5 May 2026 12:24:49 +0200 Subject: [PATCH 4/7] New Crowdin Translations (automated) (#38905) Co-authored-by: GitHub Actions --- app/javascript/mastodon/locales/ar.json | 3 - app/javascript/mastodon/locales/ast.json | 3 - app/javascript/mastodon/locales/az.json | 3 - app/javascript/mastodon/locales/be.json | 7 +- app/javascript/mastodon/locales/bg.json | 3 - app/javascript/mastodon/locales/br.json | 1 - app/javascript/mastodon/locales/ca.json | 3 - app/javascript/mastodon/locales/cs.json | 3 - app/javascript/mastodon/locales/cy.json | 115 ++++++++++++++++++- app/javascript/mastodon/locales/da.json | 7 +- app/javascript/mastodon/locales/de.json | 3 - app/javascript/mastodon/locales/el.json | 15 +-- app/javascript/mastodon/locales/en-GB.json | 3 - app/javascript/mastodon/locales/eo.json | 3 - app/javascript/mastodon/locales/es-AR.json | 5 +- app/javascript/mastodon/locales/es-MX.json | 7 +- app/javascript/mastodon/locales/es.json | 7 +- app/javascript/mastodon/locales/et.json | 7 +- app/javascript/mastodon/locales/eu.json | 3 - app/javascript/mastodon/locales/fa.json | 3 - app/javascript/mastodon/locales/fi.json | 7 +- app/javascript/mastodon/locales/fil.json | 2 - app/javascript/mastodon/locales/fo.json | 3 - app/javascript/mastodon/locales/fr-CA.json | 3 - app/javascript/mastodon/locales/fr.json | 3 - app/javascript/mastodon/locales/fy.json | 3 - app/javascript/mastodon/locales/ga.json | 3 - app/javascript/mastodon/locales/gd.json | 3 - app/javascript/mastodon/locales/gl.json | 3 - app/javascript/mastodon/locales/he.json | 3 - app/javascript/mastodon/locales/hi.json | 3 - app/javascript/mastodon/locales/hu.json | 3 - app/javascript/mastodon/locales/ia.json | 3 - app/javascript/mastodon/locales/id.json | 3 - app/javascript/mastodon/locales/ie.json | 3 - app/javascript/mastodon/locales/io.json | 3 - app/javascript/mastodon/locales/is.json | 3 - app/javascript/mastodon/locales/it.json | 5 +- app/javascript/mastodon/locales/ja.json | 3 - app/javascript/mastodon/locales/kab.json | 3 - app/javascript/mastodon/locales/ko.json | 3 - app/javascript/mastodon/locales/la.json | 1 - app/javascript/mastodon/locales/lad.json | 2 - app/javascript/mastodon/locales/lt.json | 3 - app/javascript/mastodon/locales/lv.json | 3 - app/javascript/mastodon/locales/ms.json | 3 - app/javascript/mastodon/locales/nan-TW.json | 3 - app/javascript/mastodon/locales/ne.json | 2 - app/javascript/mastodon/locales/nl.json | 9 +- app/javascript/mastodon/locales/nn.json | 3 - app/javascript/mastodon/locales/no.json | 3 - app/javascript/mastodon/locales/pl.json | 3 - app/javascript/mastodon/locales/pt-BR.json | 3 - app/javascript/mastodon/locales/pt-PT.json | 3 - app/javascript/mastodon/locales/ru.json | 3 - app/javascript/mastodon/locales/ry.json | 3 - app/javascript/mastodon/locales/sc.json | 3 - app/javascript/mastodon/locales/sco.json | 2 - app/javascript/mastodon/locales/si.json | 3 - app/javascript/mastodon/locales/sk.json | 3 - app/javascript/mastodon/locales/sl.json | 3 - app/javascript/mastodon/locales/sq.json | 3 - app/javascript/mastodon/locales/sr-Latn.json | 3 - app/javascript/mastodon/locales/sr.json | 3 - app/javascript/mastodon/locales/sv.json | 3 - app/javascript/mastodon/locales/th.json | 3 - app/javascript/mastodon/locales/tok.json | 3 - app/javascript/mastodon/locales/tr.json | 4 +- app/javascript/mastodon/locales/uk.json | 3 - app/javascript/mastodon/locales/vi.json | 3 - app/javascript/mastodon/locales/zh-CN.json | 7 +- app/javascript/mastodon/locales/zh-HK.json | 3 - app/javascript/mastodon/locales/zh-TW.json | 5 +- config/locales/be.yml | 1 - config/locales/cy.yml | 92 ++++++++++++++- config/locales/da.yml | 67 ++++++++++- config/locales/de.yml | 40 ++++++- config/locales/el.yml | 67 ++++++++++- config/locales/en-GB.yml | 1 - config/locales/es-AR.yml | 67 ++++++++++- config/locales/es-MX.yml | 67 ++++++++++- config/locales/es.yml | 67 ++++++++++- config/locales/et.yml | 53 ++++++++- config/locales/fi.yml | 39 ++++++- config/locales/fr-CA.yml | 1 - config/locales/fr.yml | 1 - config/locales/ga.yml | 1 - config/locales/gd.yml | 1 - config/locales/gl.yml | 1 - config/locales/he.yml | 1 - config/locales/hu.yml | 1 - config/locales/is.yml | 1 - config/locales/it.yml | 4 +- config/locales/nan-TW.yml | 1 - config/locales/nl.yml | 53 ++++++++- config/locales/nn.yml | 1 - config/locales/pt-BR.yml | 1 - config/locales/pt-PT.yml | 1 - config/locales/simple_form.da.yml | 5 + config/locales/simple_form.el.yml | 5 + config/locales/simple_form.es-AR.yml | 5 + config/locales/simple_form.es-MX.yml | 5 + config/locales/simple_form.es.yml | 5 + config/locales/simple_form.fi.yml | 1 + config/locales/simple_form.it.yml | 5 + config/locales/simple_form.nl.yml | 2 + config/locales/simple_form.ru.yml | 2 + config/locales/simple_form.sq.yml | 1 + config/locales/simple_form.zh-CN.yml | 5 + config/locales/simple_form.zh-TW.yml | 7 +- config/locales/sq.yml | 44 ++++++- config/locales/sv.yml | 1 - config/locales/tr.yml | 22 +++- config/locales/vi.yml | 1 - config/locales/zh-CN.yml | 67 ++++++++++- config/locales/zh-TW.yml | 69 ++++++++++- 116 files changed, 1010 insertions(+), 248 deletions(-) diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json index fb08a71ee6..7c819ac8ac 100644 --- a/app/javascript/mastodon/locales/ar.json +++ b/app/javascript/mastodon/locales/ar.json @@ -224,11 +224,8 @@ "block_modal.remote_users_caveat": "سوف نطلب من الخادم {domain} أن يحترم قرارك، لكن الالتزام غير مضمون لأن بعض الخواديم قد تتعامل مع نصوص الكتل بشكل مختلف. قد تظل المنشورات العامة مرئية للمستخدمين غير المسجلين الدخول.", "block_modal.show_less": "تفاصيل أقلّ", "block_modal.show_more": "تفاصيل أكثر", - "block_modal.they_cant_mention": "لن يستطيع ذِكرك أو متابعتك.", - "block_modal.they_cant_see_posts": "لن يستطيع مطالعة منشوراتك ولن تطالع منشوراته.", "block_modal.they_will_know": "سيعلم أنه قد حُظِر.", "block_modal.title": "أتريد حظر هذا المستخدم؟", - "block_modal.you_wont_see_mentions": "لن تر المنشورات التي يُشار فيهم إليه.", "boost_modal.combo": "يُمكنك الضّغط على {combo} لتخطي هذا في المرة المُقبلة", "boost_modal.reblog": "أتريد إعادة نشر المنشور؟", "boost_modal.undo_reblog": "أتريد إلغاء إعادة نشر المنشور؟", diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json index 444b40aabb..41ae7b44d2 100644 --- a/app/javascript/mastodon/locales/ast.json +++ b/app/javascript/mastodon/locales/ast.json @@ -82,9 +82,6 @@ "attachments_list.unprocessed": "(ensin procesar)", "block_modal.show_less": "Amosar menos", "block_modal.show_more": "Amosar más", - "block_modal.they_cant_mention": "Nun van poder mencionate o siguite.", - "block_modal.they_cant_see_posts": "Nun pueden ver les tos espublizaciones y tu nun podrás ver les suyes.", - "block_modal.you_wont_see_mentions": "Nun verás espublizaciones que-yos mencionen.", "bundle_column_error.error.body": "La páxina solicitada nun se pudo renderizar. Ye posible que seya pola mor d'un fallu nel códigu o por un problema de compatibilidá del restolador.", "bundle_column_error.error.title": "¡Oh, non!", "bundle_column_error.network.body": "Hebo un error al tentar de cargar esta páxina. Esto pudo ser pola mor d'un problema temporal cola conexón a internet o con esti sirvidor.", diff --git a/app/javascript/mastodon/locales/az.json b/app/javascript/mastodon/locales/az.json index 41dc1c7d40..fa80ce6bec 100644 --- a/app/javascript/mastodon/locales/az.json +++ b/app/javascript/mastodon/locales/az.json @@ -165,11 +165,8 @@ "block_modal.remote_users_caveat": "{domain} serverindən qərarınıza hörmət etməsini xahiş edəcəyik. Ancaq, bəzi serverlər əngəlləmələri fərqli şəkildə idarə edə bilər deyə, qərarınıza uymağına zəmanət verilmir. Hər kəsə açıq göndərişlər, hələ də sistemə giriş etməmiş istifadəçilərə görünə bilər.", "block_modal.show_less": "Daha az göstər", "block_modal.show_more": "Daha çox göstər", - "block_modal.they_cant_mention": "O səni teq edə bilməz və ya izləyə bilməz.", - "block_modal.they_cant_see_posts": "O sənin paylaşımlarını görməyəcək, sən də onun paylaşımlarını görməyəcəksən.", "block_modal.they_will_know": "O sənin onu blokladığını görə biləcək.", "block_modal.title": "İstifadəçi bloklansın?", - "block_modal.you_wont_see_mentions": "Onu teq edən postları görməyəcəksən.", "boost_modal.combo": "Növbəti dəfə bunu atlamaq üçün {combo} klikləyə bilərsən", "boost_modal.reblog": "Paylaşım təkrar paylaşılsın?", "boost_modal.undo_reblog": "Təkrar paylaşım ləğv edilsin?", diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json index ddc53d31f0..c626154900 100644 --- a/app/javascript/mastodon/locales/be.json +++ b/app/javascript/mastodon/locales/be.json @@ -328,14 +328,15 @@ "annual_report.summary.share_on_mastodon": "Падзяліцца ў Mastodon", "attachments_list.unprocessed": "(неапрацаваны)", "audio.hide": "Схаваць аўдыя", + "block_modal.no_collections": "Вы не зможаце дадаць адно аднаго ў калекцыі. Пры патрэбе вы будзеце выдаленыя з ужо існых калекцый абаіх.", "block_modal.remote_users_caveat": "Мы папросім сервер {domain} паважаць Ваш выбар. Аднак гэта не гарантуецца, паколькі некаторыя серверы могуць апрацоўваць блакіроўкі іншым чынам. Публічныя паведамленні могуць заставацца бачнымі для ананімных карыстальнікаў.", "block_modal.show_less": "Паказаць меньш", "block_modal.show_more": "Паказаць больш", - "block_modal.they_cant_mention": "Карыстальнік не зможа згадваць або сачыць за вамі.", - "block_modal.they_cant_see_posts": "Карыстальнік не будзе бачыць Вашых допісаў, а Вы — ягоных.", + "block_modal.they_cant_mention": "Вы не зможаце згадваць, падпісвацца або цытаваць адно аднаго.", + "block_modal.they_cant_see_posts": "Гэты карыстальнік не зможа ўбачыць Ваш кантэнт, а Вы не зможаце ягоны.", "block_modal.they_will_know": "Карыстальнік убачыць, што адбылася блакіроўка.", "block_modal.title": "Заблакіраваць карыстальніка?", - "block_modal.you_wont_see_mentions": "Вы не ўбачыце паведамленняў са згадваннем карыстальніка.", + "block_modal.you_wont_see_mentions": "Вы не ўбачыце допісы іншых людзей, дзе гэты карыстальнік згадваецца.", "boost_modal.combo": "Націсніце {combo}, каб прапусціць наступным разам", "boost_modal.reblog": "Пашырыць допіс?", "boost_modal.undo_reblog": "Прыбраць допіс?", diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json index 7281a4cb34..0eb1be738c 100644 --- a/app/javascript/mastodon/locales/bg.json +++ b/app/javascript/mastodon/locales/bg.json @@ -113,11 +113,8 @@ "block_modal.remote_users_caveat": "Ще приканим сървъра {domain} да уважава решението ви. За съжаление не можем да гарантираме това защото някои сървъри могат да третират блокиранията по различен начин. Публичните постове може да продължат да бъдат видими за потребители, които не са се регистрирали.", "block_modal.show_less": "Повече на показ", "block_modal.show_more": "По-малко на показ", - "block_modal.they_cant_mention": "Те не могат да ви споменават или последват.", - "block_modal.they_cant_see_posts": "Те не могат да виждат публикациите ви, а и вие не можете да виждате техните.", "block_modal.they_will_know": "Те могат да видят, че са блокирани.", "block_modal.title": "Блокирате ли потребителя?", - "block_modal.you_wont_see_mentions": "Няма да виждате публикациите, които ги споменават.", "boost_modal.combo": "Можете да натиснете {combo}, за да пропуснете това следващия път", "boost_modal.reblog": "Подсилвате ли публикация?", "boost_modal.undo_reblog": "Без подсилване на публикация ли?", diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json index f43050e09b..288131bc9f 100644 --- a/app/javascript/mastodon/locales/br.json +++ b/app/javascript/mastodon/locales/br.json @@ -107,7 +107,6 @@ "audio.hide": "Kuzhat ar c'hleved", "block_modal.show_less": "Diskouez nebeutoc'h", "block_modal.show_more": "Diskouez muioc'h", - "block_modal.they_cant_mention": "Ne c'hall na menegiñ na heuliañ ac'hanoc'h.", "block_modal.title": "Stankañ an implijer·ez?", "boost_modal.combo": "Ar wezh kentañ e c'halliot gwaskañ war {combo} evit tremen hebiou", "boost_modal.reblog": "Skignañ an embannadur?", diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index 9946756b62..223209ddd2 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -169,11 +169,8 @@ "block_modal.remote_users_caveat": "Li demanarem al servidor {domain} que respecti la vostra decisió, tot i que no podem garantir-ho, ja que alguns servidors gestionen de forma diferent els blocatges. És possible que els usuaris no autenticats puguin veure les publicacions públiques.", "block_modal.show_less": "Mostra'n menys", "block_modal.show_more": "Mostra'n més", - "block_modal.they_cant_mention": "No us poden esmentar, ni seguir.", - "block_modal.they_cant_see_posts": "No poden veure les vostres publicacions, ni vosaltres les seves.", "block_modal.they_will_know": "Poden veure que els heu blocat.", "block_modal.title": "Bloquem l'usuari?", - "block_modal.you_wont_see_mentions": "No veureu publicacions que l'esmentin.", "boost_modal.combo": "Pots prémer {combo} per a evitar-ho el pròxim cop", "boost_modal.reblog": "Voleu impulsar la publicació?", "boost_modal.undo_reblog": "Voleu retirar l'impuls a la publicació?", diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json index 87428e5c20..1a4d4a507f 100644 --- a/app/javascript/mastodon/locales/cs.json +++ b/app/javascript/mastodon/locales/cs.json @@ -210,11 +210,8 @@ "block_modal.remote_users_caveat": "Požádáme server {domain}, aby respektoval vaše rozhodnutí. Úplné dodržování nastavení však není zaručeno, protože některé servery mohou řešit blokování různě. Veřejné příspěvky mohou být stále viditelné pro nepřihlášené uživatele.", "block_modal.show_less": "Zobrazit méně", "block_modal.show_more": "Zobrazit více", - "block_modal.they_cant_mention": "Nemůže vás zmiňovat ani sledovat.", - "block_modal.they_cant_see_posts": "Nemůže vidět vaše příspěvky a vy neuvidíte jeho.", "block_modal.they_will_know": "Může vidět, že je zablokovaný.", "block_modal.title": "Zablokovat uživatele?", - "block_modal.you_wont_see_mentions": "Neuvidíte příspěvky, které ho zmiňují.", "boost_modal.combo": "Příště můžete pro přeskočení stisknout {combo}", "boost_modal.reblog": "Boostnout příspěvek?", "boost_modal.undo_reblog": "Zrušit boostování příspěvku?", diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json index a1252a4b93..9e3b3901b6 100644 --- a/app/javascript/mastodon/locales/cy.json +++ b/app/javascript/mastodon/locales/cy.json @@ -43,6 +43,7 @@ "account.featured": "Nodwedd", "account.featured.accounts": "Proffilau", "account.featured.collections": "Casgliadau", + "account.featured.new_collection": "Casgliad newydd", "account.field_overflow": "Dangos cynnwys llawn", "account.filters.all": "Pob gweithgaredd", "account.filters.boosts_toggle": "Dangos hybiau", @@ -68,8 +69,19 @@ "account.go_to_profile": "Mynd i'r proffil", "account.hide_reblogs": "Cuddio hybiau gan @{name}", "account.in_memoriam": "Er Cof.", + "account.join_modal.day": "Diwrnod", + "account.join_modal.me": "Rydych wedi ymuno â {server} ar", + "account.join_modal.me_anniversary": "Ffedysawd Hapus! Rydych wedi ymuno â {server} ar", + "account.join_modal.me_today": "Dyma'ch diwrnod cyntaf ar {server}!", + "account.join_modal.other": "Ymunodd {name} â {server} ar", + "account.join_modal.other_today": "Mae'n diwrnod cyntaf {name} ar {server}!", + "account.join_modal.share.celebrate": "Rhannwch bostiad dathlu", + "account.join_modal.share.intro": "Rhannu postiad cyflwyno", + "account.join_modal.share.welcome": "Rhannwch postiad croeso", + "account.join_modal.years": "{number, plural, one {blwyddyn} other {blwyddyn}}", "account.joined_short": "Ymunodd", "account.languages": "Newid ieithoedd wedi tanysgrifio iddyn nhw", + "account.last_active": "Yn weithgar ddiwethaf", "account.link_verified_on": "Gwiriwyd perchnogaeth y ddolen yma ar {date}", "account.locked_info": "Mae'r statws preifatrwydd cyfrif hwn wedi'i osod i fod ar glo. Mae'r perchennog yn adolygu'r sawl sy'n gallu eu dilyn.", "account.media": "Cyfryngau", @@ -98,8 +110,10 @@ "account.mute_short": "Anwybyddu", "account.muted": "Wedi anwybyddu", "account.mutual": "Rydych chi'n dilyn eich gilydd", + "account.name.copy": "Copïo dolen", "account.name.help.domain": "{domain} yw'r gweinydd sy'n cynnal proffil a phostiadau'r defnyddiwr.", "account.name.help.domain_self": "{domain} yw eich gweinydd sy'n cynnal eich proffil a'ch postiadau.", + "account.name.help.footer": "Yn union fel y gallwch anfon negeseuon e-bost at bobl gan ddefnyddio gwahanol ddarparwyr e-bost, gallwch ryngweithio â phobl ar weinyddion Mastodon eraill, a chyda neb ar apiau Ffedysawd eraill.", "account.name.help.header": "Mae dolen fel cyfeiriad e-bost", "account.name.help.username": "{username} yw enw defnyddiwr y cyfrif hwn ar eu gweinydd. Efallai bod gan rywun ar weinydd arall yr un enw defnyddiwr.", "account.name.help.username_self": "{username} yw eich enw defnyddiwr ar y gweinydd hwn. Efallai bod gan rywun ar weinydd arall yr un enw defnyddiwr.", @@ -114,6 +128,7 @@ "account.note.edit_button": "Golygu", "account.note.title": "Nodyn personol (yn weladwy i chi yn unig)", "account.open_original_page": "Agor y dudalen wreiddiol", + "account.pending": "Dan ystyriaeth", "account.posts": "Postiadau", "account.remove_from_followers": "Tynnu {name} o'ch dilynwyr", "account.report": "Adrodd @{name}", @@ -132,29 +147,45 @@ "account.unmute": "Dad-dewi {name}", "account.unmute_notifications_short": "Dad-dewi hysbysiadau", "account.unmute_short": "Dad-anwybyddu", + "account_edit.advanced_settings.bot_hint": "Rhoi arwydd i eraill bod y cyfrif yn bennaf yn cyflawni gweithredoedd awtomataidd ac efallai fydd e ddim yn cael ei fonitro", + "account_edit.advanced_settings.bot_label": "Cyfrif awtomataidd", + "account_edit.advanced_settings.title": "Gosodiadau uwch", + "account_edit.bio.add_label": "Ychwanegu cyflwyniad", + "account_edit.bio.edit_label": "Golygu'r cyflwyniad", "account_edit.bio.placeholder": "Ychwanegwch gyflwyniad byr i helpu eraill i'ch adnabod chi.", "account_edit.bio.title": "Cyflwyniad", "account_edit.bio_modal.add_title": "Ychwanegu cyflwyniad", "account_edit.bio_modal.edit_title": "Golygu'r cyflwyniad", "account_edit.column_button": "Gorffen", "account_edit.column_title": "Golygu Proffil", + "account_edit.custom_fields.add_label": "Ychwanegu maes", + "account_edit.custom_fields.edit_label": "Golygu maes", "account_edit.custom_fields.placeholder": "Ychwanegwch eich rhagenwau, dolenni allanol, neu unrhyw beth arall hoffech ei rannu.", "account_edit.custom_fields.reorder_button": "Ail-drefnu meysydd", "account_edit.custom_fields.tip_content": "Gallwch chi ychwanegu hygrededd at eich cyfrif Mastodon yn hawdd trwy wirio dolenni i unrhyw wefannau rydych chi'n berchen arnyn nhw.", "account_edit.custom_fields.tip_title": "Awgrym: Ychwanegu dolenni wedi'u gwirio", "account_edit.custom_fields.title": "Meysydd cyfaddas", "account_edit.custom_fields.verified_hint": "Sut ydw i'n ychwanegu dolen wedi'i gwirio?", + "account_edit.display_name.add_label": "Ychwanegu enw dangos", + "account_edit.display_name.edit_label": "Golygu enw dangos", "account_edit.display_name.placeholder": "Eich enw dangos yw sut mae'ch enw'n ymddangos ar eich proffil ac mewn llinellau amser.", "account_edit.display_name.title": "Enw dangos", + "account_edit.featured_hashtags.edit_label": "Ychwanegu hashnodau", "account_edit.featured_hashtags.placeholder": "Helpwch eraill i adnabod, a chael mynediad cyflym at eich hoff bynciau.", "account_edit.featured_hashtags.title": "Hashnodau dan sylw", + "account_edit.field_actions.delete": "Dileu maes", + "account_edit.field_actions.edit": "Golygu maes", "account_edit.field_delete_modal.confirm": "Ydych chi'n siŵr eich bod chi eisiau dileu'r maes cyfaddas hwn? Does dim modd dadwneud y weithred hon.", "account_edit.field_delete_modal.delete_button": "Dileu", "account_edit.field_delete_modal.title": "Dileu maes cyfaddas?", "account_edit.field_edit_modal.add_title": "Ychwanegu maes cyfaddas", + "account_edit.field_edit_modal.discard_confirm": "Dileu", + "account_edit.field_edit_modal.discard_message": "Mae gennych chi newidiadau heb eu cadw. Ydych chi'n siŵr eich bod chi eisiau eu dileu?", "account_edit.field_edit_modal.edit_title": "Golygu maes cyfaddas", + "account_edit.field_edit_modal.length_warning": "Wedi mynd y tu hwnt i'r terfyn nodau sy'n cael eu hargymell. Efallai bydd defnyddwyr symudol ddim yn gweld eich maes yn llawn.", "account_edit.field_edit_modal.link_emoji_warning": "Rydym yn argymell yn erbyn defnyddio emoji personol ar y cyd ag URLau. Bydd meysydd personol sy'n cynnwys y ddau yn cael eu harddangos fel testun yn unig yn hytrach nag fel dolen, er mwyn atal dryswch ymhlith defnyddwyr.", "account_edit.field_edit_modal.name_hint": "e.e. “Gwefan bersonol”", + "account_edit.field_edit_modal.name_label": "Label", "account_edit.field_edit_modal.url_warning": "I ychwanegu dolen, cofiwch gynnwys {protocol} ar y dechrau.", "account_edit.field_edit_modal.value_hint": "E.e. “https://example.me”", "account_edit.field_edit_modal.value_label": "Gwerth", @@ -180,6 +211,8 @@ "account_edit.image_edit.alt_edit_button": "Golygu testun amgen", "account_edit.image_edit.remove_button": "Tynnu delwedd", "account_edit.image_edit.replace_button": "Amnewid delwedd", + "account_edit.item_list.delete": "Dileu {name}", + "account_edit.item_list.edit": "Golygu {name}", "account_edit.name_modal.add_title": "Ychwanegu enw dangos", "account_edit.name_modal.edit_title": "Golygu enw dangos", "account_edit.profile_tab.button_label": "Cyfaddasu", @@ -191,6 +224,10 @@ "account_edit.profile_tab.show_media.title": "Dangos y tab ‘Cyfryngau’", "account_edit.profile_tab.show_media_replies.description": "Pan fydd wedi'i alluogi, mae'r tab Cyfryngau yn dangos eich postiadau ac atebion i bostiadau pobl eraill.", "account_edit.profile_tab.show_media_replies.title": "Cynhwyswch atebion ar y tab ‘Cyfryngau’", + "account_edit.profile_tab.show_relations.description": "Yn dangos cyfrifon rydych chi'n eu dilyn a dilynwyr i ddefnyddwyr eraill yn eich proffil. Bydd pobl yn dal i allu gweld a ydych chi'n eu dilyn.", + "account_edit.profile_tab.show_relations.title": "Dangos ‘Dilynwyr’ ac ‘Yn Dilyn’", + "account_edit.profile_tab.subtitle": "Cyfaddaswch sut mae eich proffil yn cael ei ddangos.", + "account_edit.profile_tab.title": "Gosodiadau dangos proffil", "account_edit.save": "Cadw", "account_edit.upload_modal.back": "Nôl", "account_edit.upload_modal.done": "Gorffen", @@ -200,6 +237,10 @@ "account_edit.upload_modal.step_upload.dragging": "Gollwng i lwytho i fyny", "account_edit.upload_modal.step_upload.header": "Dewiswch ddelwedd", "account_edit.upload_modal.step_upload.hint": "Fformat WEBP, PNG, GIF neu JPG, hyd at {limit}MB.{br}Bydd y ddelwedd yn cael ei haddasu i {width}x{height}px.", + "account_edit.upload_modal.title_add.avatar": "Ychwanegu llun proffil", + "account_edit.upload_modal.title_add.header": "Ychwanegu llun clawr", + "account_edit.upload_modal.title_replace.avatar": "Amnewid llun proffil", + "account_edit.upload_modal.title_replace.header": "Amnewid llun clawr", "account_edit.verified_modal.details": "Ychwanegwch hygrededd at eich proffil Mastodon trwy wirio dolenni i wefannau personol. Dyma sut mae'n gweithio:", "account_edit.verified_modal.invisible_link.details": "Ychwanegwch y ddolen at eich pennyn. Y rhan bwysig yw rel=\"me\" sy'n atal dynwared ar wefannau gyda chynnwys sy'n cael ei gynhyrchu gan ddefnyddwyr. Gallwch hyd yn oed ddefnyddio tag dolen ym mhennyn y dudalen yn lle {tag}, ond rhaid bod yr HTML yn hygyrch ac heb weithredu JavaScript.", "account_edit.verified_modal.invisible_link.summary": "Sut ydw i'n gwneud y ddolen yn anweledig?", @@ -208,10 +249,14 @@ "account_edit.verified_modal.step2.header": "Ychwanegwch eich gwefan fel maes cyfaddas", "account_edit.verified_modal.title": "Sut i ychwanegu dolen wedi'i gwirio", "account_edit_tags.add_tag": "Ychwanegu #{tagName}", + "account_edit_tags.column_title": "Golygu Tagiau", "account_edit_tags.help_text": "Mae hashnodau dan sylw yn helpu defnyddwyr i ddarganfod a rhyngweithio â'ch proffil. Maen nhw'n ymddangos fel hidlwyr ar olwg Gweithgaredd eich tudalen Proffil.", + "account_edit_tags.max_tags_reached": "Rydych chi wedi cyrraedd y nifer uchaf o hashnodau dan sylw.", "account_edit_tags.search_placeholder": "Rhowch hashnod…", "account_edit_tags.suggestions": "Awgrymiadau:", "account_edit_tags.tag_status_count": "{count, plural, one {# postiad} other {# postsiad}}", + "account_list.hidden_notice": "Dim ond chi sy'n gallu gweld hyn. I ddangos y rhestr hon i eraill, ewch i {page} > {modal} > {field} .", + "account_list.total": "{total, plural, one {# cyfrif} other {# cyfrif}}", "account_note.placeholder": "Clicio i ychwanegu nodyn", "admin.dashboard.daily_retention": "Cyfradd cadw defnyddwyr fesul diwrnod ar ôl cofrestru", "admin.dashboard.monthly_retention": "Cyfradd cadw defnyddwyr fesul mis ar ôl cofrestru", @@ -286,11 +331,8 @@ "block_modal.remote_users_caveat": "Byddwn yn gofyn i'r gweinydd {domain} barchu eich penderfyniad. Fodd bynnag, nid yw cydymffurfiad wedi'i warantu gan y gall rhai gweinyddwyr drin rhwystrau mewn ffyrdd gwahanol. Mae'n bosibl y bydd postiadau cyhoeddus yn dal i fod yn weladwy i ddefnyddwyr nad ydynt wedi mewngofnodi.", "block_modal.show_less": "Dangos llai", "block_modal.show_more": "Dangos rhagor", - "block_modal.they_cant_mention": "Dydyn nhw ddim yn gallu eich crybwyll na'ch dilyn.", - "block_modal.they_cant_see_posts": "Dydyn nhw ddim yn gallu gweld eich postiadau a fyddwch chi ddim yn gweld eu rhai nhw.", "block_modal.they_will_know": "Gallan nhw weld eu bod wedi'u rhwystro.", "block_modal.title": "Blocio defnyddiwr?", - "block_modal.you_wont_see_mentions": "Fyddwch chi ddim yn gweld postiadau sy'n sôn amdanyn nhw.", "boost_modal.combo": "Mae modd pwyso {combo} er mwyn hepgor hyn tro nesa", "boost_modal.reblog": "Hybu postiad?", "boost_modal.undo_reblog": "Dad-hybu postiad?", @@ -316,6 +358,7 @@ "closed_registrations_modal.find_another_server": "Dod o hyd i weinydd arall", "closed_registrations_modal.preamble": "Mae Mastodon wedi'i ddatganoli, felly does dim gwahaniaeth ble rydych chi'n creu eich cyfrif, byddwch chi'n gallu dilyn a rhyngweithio ag unrhyw un ar y gweinydd hwn. Gallwch hyd yn oed ei gynnal un eich hun!", "closed_registrations_modal.title": "Cofrestru ar Mastodon", + "collection.share_modal.share_link_label": "Rhannu dolen", "collection.share_modal.share_via_post": "Postio ar Mastodon", "collection.share_modal.share_via_system": "Rhannwch i…", "collection.share_modal.title": "Rhannu casgliad", @@ -323,38 +366,70 @@ "collection.share_template_other": "Edrychwch ar y casgliad trawiadol hwn: {link}", "collection.share_template_own": "Edrychwch ar fy nghasgliad newydd: {link}", "collections.account_count": "{count, plural, one {# cyfrif} other {# cyfrif}}", + "collections.accounts.empty_description": "Ychwanegu hyd at {count} cyfrif", + "collections.accounts.empty_editor_title": "Does neb yn y casgliad hwn eto", "collections.accounts.empty_title": "Mae'r casgliad hwn yn wag", + "collections.block_collection_owner": "Rhwystro cyfrif", + "collections.by_account": "gan {account_handle}", "collections.collection_description": "Disgrifiad", + "collections.collection_language": "Iaith", + "collections.collection_language_none": "Dim", "collections.collection_name": "Enw", "collections.collection_topic": "Pwnc", "collections.confirm_account_removal": "Ydych chi'n siŵr eich bod chi eisiau tynnu'r cyfrif hwn o'r casgliad hwn?", "collections.content_warning": "Rhybudd cynnwys", "collections.continue": "Parhau", + "collections.copy_link": "Copïo dolen", + "collections.copy_link_confirmation": "Copïwyd dolen y casgliad i'r clipfwrdd", "collections.create.accounts_title": "Pwy fyddwch chi'n ei gynnwys yn y casgliad hwn?", "collections.create.basic_details_title": "Manylion sylfaenol", "collections.create.steps": "Cam {step}/{total}", "collections.create_collection": "Creu casgliad", "collections.delete_collection": "Dileu casgliad", "collections.description_length_hint": "Terfyn o 100 nod", + "collections.detail.author_added_you_on_date": "Ychwanegodd {author} chi ar {date}", "collections.detail.loading": "Yn llwytho casgliad…", "collections.detail.revoke_inclusion": "Tynnu fi", + "collections.detail.sensitive_content": "Cynnwys sensitif", "collections.detail.sensitive_note": "Mae'r casgliad hwn yn cynnwys cyfrifon a chynnwys a allai fod yn sensitif i rai defnyddwyr.", "collections.detail.share": "Rhannu'r casgliad hwn", + "collections.detail.you_are_in_this_collection": "Rydych chi wedi'ch cynnwys yn y casgliad hwn", "collections.edit_details": "Golygu manylion", + "collections.error_loading_collections": "Bu gwall wrth geisio llwytho'r casgliadau hyn.", + "collections.hidden_accounts_description": "Rydych chi wedi'ch rhwystro neu mudo {count, plural, one {defnyddiwr} other {defnyddiwr}}", + "collections.hidden_accounts_link": "{count, plural, one {# cyfrif cudd} other {# cyfrif cudd}}", + "collections.hints.accounts_counter": "{count} / {max} cyfrif", "collections.last_updated_at": "Diweddarwyd ddiwethaf: {date}", + "collections.list.collections_with_count": "{count, plural, one {# Casgliad} other {# Casgliad}}", + "collections.list.created_by_author": "Crëwyd gan {name}", + "collections.list.created_by_you": "Crëwyd gan gennych chi", + "collections.list.featuring_you": "Yn eich cynnwys chi", "collections.manage_accounts": "Rheoli cyfrifon", "collections.mark_as_sensitive": "Marcio fel sensitif", "collections.mark_as_sensitive_hint": "Yn cuddio disgrifiad a chyfrifon y casgliad y tu ôl i rybudd cynnwys. Bydd enw'r casgliad yn dal i fod yn weladwy.", + "collections.maximum_collection_count_description": "Mae eich gweinydd yn caniatáu creu hyd at {count} o gasgliadau.", + "collections.maximum_collection_count_reached": "Rydych chi wedi creu'r nifer mwyaf o gasgliadau", "collections.name_length_hint": "Terfyn o 40 nod", "collections.new_collection": "Casgliad newydd", + "collections.pending_accounts.message": "Gall cyfrifon ymddangos fel rhai sydd ar y gweill pan fyddwn yn aros am ymateb gan y defnyddiwr neu ei weinydd. Dim ond chi all weld cyfrifon sydd ar y gweill.", + "collections.pending_accounts.title": "Pam rydw i'n gweld cyfrifon sydd ar y gweill?", + "collections.remove_account": "Tynnu", "collections.report_collection": "Adroddwch am y casgliad hwn", "collections.revoke_collection_inclusion": "Tynnu fy hun o'r casgliad hwn", "collections.revoke_inclusion.confirmation": "Rydych chi wedi cael eich tynnu o \"{collection}\"", "collections.revoke_inclusion.error": "Bu gwall, ceisiwch eto yn nes ymlaen.", + "collections.search_accounts_label": "Chwiliwch am gyfrif i'w ychwanegu", "collections.search_accounts_max_reached": "Rydych chi wedi ychwanegu'r nifer mwyaf o gyfrifon", "collections.sensitive": "Sensitif", + "collections.share_short": "Rhannu", + "collections.suggestions.can_not_add": "Dim modd ei ychwanegu", + "collections.suggestions.can_not_add_desc": "Efallai bod y cyfrifon hyn wedi dewis peidio â chael eu darganfod, neu efallai eu bod ar weinydd nad yw'n cefnogi casgliadau.", + "collections.suggestions.must_follow": "Rhaid dilyn yn gyntaf", + "collections.suggestions.must_follow_desc": "Mae'r cyfrifon hyn yn adolygu pob cais dilyn. Gall dilynwyr eu hychwanegu at gasgliadau.", "collections.topic_hint": "Ychwanegwch hashnod sy'n helpu eraill i ddeall prif bwnc y casgliad hwn.", "collections.topic_special_chars_hint": "Bydd nodau arbennig yn cael eu tynnu wrth gadw", + "collections.unlisted_collections_description": "Nid yw'r rhain yn ymddangos ar eich proffil i eraill. Gall unrhyw un sydd â'r ddolen eu darganfod.", + "collections.unlisted_collections_with_count": "Casgliadau heb eu rhestru ({count})", "collections.view_collection": "Gweld y casgliad", "collections.visibility_public": "Cyhoeddus", "collections.visibility_public_hint": "Mae modd eu canfod mewn canlyniadau chwilio a mannau eraill lle mae argymhellion yn ymddangos.", @@ -380,8 +455,10 @@ "column.lists": "Rhestrau", "column.mutes": "Defnyddwyr wedi'u tewi", "column.notifications": "Hysbysiadau", + "column.other_collections": "Casgliadau gan {name}", "column.pins": "Postiadau wedi eu pinio", "column.public": "Ffrwd y ffederasiwn", + "column.your_collections": "Eich Casgliadau", "column_back_button.label": "Nôl", "column_header.hide_settings": "Cuddio'r dewisiadau", "column_header.moveLeft_settings": "Symud y golofn i'r chwith", @@ -446,6 +523,10 @@ "confirmations.follow_to_list.confirm": "Dilyn ac ychwanegu at y rhestr", "confirmations.follow_to_list.message": "Mae angen i chi fod yn dilyn {name} i'w ychwanegu at restr.", "confirmations.follow_to_list.title": "Dilyn defnyddiwr?", + "confirmations.hide_featured_tab.confirm": "Cuddio'r tab", + "confirmations.hide_featured_tab.intro": "Gallwch newid hyn unrhyw bryd o dan Golygu proffil > gosodiadau'r tab Proffil .", + "confirmations.hide_featured_tab.message": "Bydd hyn yn cuddio'r tab ar gyfer defnyddwyr ar {serverName} a gweinyddion eraill sy'n rhedeg y fersiwn ddiweddaraf o Mastodon. Gall dangosiadau eraill amrywio.", + "confirmations.hide_featured_tab.title": "Cuddio'r tab \"Nodwedd\"?", "confirmations.logout.confirm": "Allgofnodi", "confirmations.logout.message": "Ydych chi'n siŵr eich bod am allgofnodi?", "confirmations.logout.title": "Allgofnodi?", @@ -484,6 +565,7 @@ "content_warning.hide": "Cuddio'r postiad", "content_warning.show": "Dangos beth bynnag", "content_warning.show_more": "Dangos rhagor", + "content_warning.show_short": "Dangos", "conversation.delete": "Dileu sgwrs", "conversation.mark_as_read": "Nodi fel wedi'i ddarllen", "conversation.open": "Gweld sgwrs", @@ -524,6 +606,14 @@ "domain_pill.your_server": "Eich cartref digidol, lle mae'ch holl bostiadau'n byw. Ddim yn hoffi'r un hon? Trosglwyddwch weinyddion ar unrhyw adeg a dewch â'ch dilynwyr hefyd.", "domain_pill.your_username": "Eich dynodwr unigryw ar y gweinydd hwn. Mae'n bosibl dod o hyd i ddefnyddwyr gyda'r un enw defnyddiwr ar wahanol weinyddion.", "dropdown.empty": "Dewis dewis", + "email_subscriptions.email": "E-bost", + "email_subscriptions.form.action": "Tanysgrifio", + "email_subscriptions.form.bottom": "Derbyniwch bostiadau yn eich blwch derbyn heb greu cyfrif Mastodon. Dad-danysgrifiwch unrhyw bryd. Am ragor o wybodaeth, cyfeiriwch at y Polisi Preifatrwydd .", + "email_subscriptions.form.title": "Cofrestrwch am ddiweddariadau e-bost gan {name}", + "email_subscriptions.submitted.lead": "Gwiriwch eich blwch derbyn am e-bost i orffen cofrestru ar gyfer diweddariadau e-bost.", + "email_subscriptions.submitted.title": "Un cam arall", + "email_subscriptions.validation.email.blocked": "Darparwr e-bost wedi'i rwystro", + "email_subscriptions.validation.email.invalid": "Cyfeiriad e-bost annilys", "embed.instructions": "Gosodwch y post hwn ar eich gwefan drwy gopïo'r côd isod.", "embed.preview": "Dyma sut olwg fydd arno:", "emoji_button.activity": "Gweithgarwch", @@ -541,12 +631,21 @@ "emoji_button.search_results": "Canlyniadau chwilio", "emoji_button.symbols": "Symbolau", "emoji_button.travel": "Teithio a Llefydd", + "empty_column.account_featured.other": "Nid yw {acct} wedi cynnwys unrhyw beth eto.", + "empty_column.account_featured_self.no_collections_button": "Creu casgliad", + "empty_column.account_featured_self.no_collections_hide_tab": "Cuddio'r tab hwn yn lle hynny", + "empty_column.account_featured_self.pre_collections": "Cadwch lygad allan am Gasgliadau", + "empty_column.account_featured_self.pre_collections_desc": "Mae Casgliadau (sy'n dod yn Mastodon 4.6) yn caniatáu ichi greu eich rhestrau cyfrifon wedi'u curadu eich hun i'w hargymell i eraill.", + "empty_column.account_featured_self.showcase_accounts": "Dangoswch eich hoff gyfrifon", + "empty_column.account_featured_self.showcase_accounts_desc": "Rhestrau wedi'u curadu o gyfrifon yw Casgliadau i helpu eraill i ddarganfod mwy o'r Fediverse.", + "empty_column.account_featured_unknown.other": "Dyw'r cyfrif hwn ddim wedi cynnwys unrhyw beth eto.", "empty_column.account_hides_collections": "Mae'r defnyddiwr wedi dewis i beidio rhannu'r wybodaeth yma", "empty_column.account_suspended": "Cyfrif wedi'i atal", "empty_column.account_timeline": "Dim postiadau yma!", "empty_column.account_unavailable": "Dyw'r proffil ddim ar gael", "empty_column.blocks": "Dydych chi heb rwystro unrhyw ddefnyddwyr eto.", "empty_column.bookmarked_statuses": "Does gennych chi ddim unrhyw bostiad wedi'u cadw fel nod tudalen eto. Pan fyddwch yn gosod nod tudalen i un, mi fydd yn ymddangos yma.", + "empty_column.collections.featured_in": "Dydych chi heb gael eich ychwanegu at unrhyw gasgliadau eto.", "empty_column.community": "Mae'r ffrwd lleol yn wag. Beth am ysgrifennu rhywbeth cyhoeddus!", "empty_column.direct": "Does gennych chi unrhyw grybwylliadau preifat eto. Pan fyddwch chi'n anfon neu'n derbyn un, bydd yn ymddangos yma.", "empty_column.disabled_feed": "Mae'r ffrwd hon wedi'i hanalluogi gan weinyddwyr eich gweinydd.", @@ -580,6 +679,10 @@ "featured_carousel.header": "{count, plural, one {Postiad wedi'i binio} other {Postiadau wedi'u pinio}}", "featured_carousel.slide": "Postiad {current, number} of {max, number}", "featured_tags.more_items": "+{count}", + "featured_tags.suggestions": "Yn ddiweddar rydych chi wedi postio am {items}. Ychwanegu'r rhain fel hashnodau dan sylw?", + "featured_tags.suggestions.add": "Ychwanegu", + "featured_tags.suggestions.added": "Rheoli eich hashnodau dan sylw ar unrhyw adeg o dan Golygu Proffil > Hashnodau dan sylw .", + "featured_tags.suggestions.dismiss": "Dim diolch", "filter_modal.added.context_mismatch_explanation": "Dyw'r categori hidlo hwn ddim yn berthnasol i'r cyd-destun yr ydych wedi cyrchu'r postiad hwn ynddo. Os ydych chi am i'r postiad gael ei hidlo yn y cyd-destun hwn hefyd, bydd yn rhaid i chi olygu'r hidlydd.", "filter_modal.added.context_mismatch_title": "Diffyg cyfatebiaeth cyd-destun!", "filter_modal.added.expired_explanation": "Mae'r categori hidlydd hwn wedi dod i ben, bydd angen i chi newid y dyddiad dod i ben er mwyn iddo fod yn berthnasol.", @@ -622,7 +725,9 @@ "follow_suggestions.who_to_follow": "Pwy i ddilyn", "followed_tags": "Hashnodau rydych yn eu dilyn", "followers.hide_other_followers": "Mae'r defnyddiwr hwn wedi dewis peidio â gwneud ei ddilynwyr eraill yn weladwy", + "followers.title": "Yn dilyn {name}", "following.hide_other_following": "Mae'r defnyddiwr hwn wedi dewis peidio â gwneud gweddill y rhai maen nhw'n eu dilyn yn weladwy", + "following.title": "Wedi'i ddilyn gan {name}", "footer.about": "Ynghylch", "footer.about_mastodon": "Ynglŷn â Mastodon", "footer.about_server": "Ynglŷn â {domain}", @@ -634,6 +739,7 @@ "footer.source_code": "Gweld y cod ffynhonnell", "footer.status": "Statws", "footer.terms_of_service": "Telerau gwasanaeth", + "form_error.blank": "Gall y maes ddim fod yn wag.", "form_field.optional": "(dewisol)", "generic.saved": "Wedi'i Gadw", "getting_started.heading": "Dechrau arni", @@ -817,6 +923,7 @@ "navigation_panel.expand_followed_tags": "Agor dewislen hashnodau dilyn", "navigation_panel.expand_lists": "Ehangu dewislen y rhestr", "not_signed_in_indicator.not_signed_in": "Rhaid i chi fewngofnodi i weld yr adnodd hwn.", + "notification.added_to_collection": "Ychwanegodd {name} chi at gasgliad", "notification.admin.report": "Adroddodd {name} {target}", "notification.admin.report_account": "Adroddodd {name} {count, plural, one {un postiad} other {# postiad}} gan {target} oherwydd {category}", "notification.admin.report_account_other": "Adroddodd {name} {count, plural, one {un postiad} two {# bostiad} few {# postiad} other {# postiad}} gan {target}", @@ -826,6 +933,7 @@ "notification.admin.sign_up.name_and_others": "Cofrestrodd {name} {count, plural, one {ac # arall} other {a # arall}}", "notification.annual_report.message": "Mae eich #Wrapstodon {year} yn aros i chi! Gwelwch eich uchafbwyntiau ac amseroedd i'w cofio o'r flwyddyn hon ar Mastodon!", "notification.annual_report.view": "Gweld #Wrapstodon", + "notification.collection_update": "Golygodd {name} gasgliad rydych chi ynddo", "notification.favourite": "Ffafriodd {name} eich postiad", "notification.favourite.name_and_others_with_link": "Ffafriodd {name} a {count, plural, one {# arall} other {# arall}} eich postiad", "notification.favourite_pm": "Mae {name} wedi ffefrynnu eich cyfeiriad preifat", @@ -1089,6 +1197,7 @@ "server_banner.active_users": "defnyddwyr gweithredol", "server_banner.administered_by": "Gweinyddir gan:", "server_banner.is_one_of_many": "Mae {domain} yn un o'r nifer o weinyddion Mastodon annibynnol y gallwch eu defnyddio i gymryd rhan yn y ffedysawd.", + "server_banner.more_about_this_server": "Mwy am y gweinydd hwn", "server_banner.server_stats": "Ystadegau'r gweinydd:", "sign_in_banner.create_account": "Creu cyfrif", "sign_in_banner.follow_anyone": "Dilynwch unrhyw un ar draws y ffedysawd a gweld y cyfan mewn trefn gronolegol. Dim algorithmau, hysbysebion, na straeon er mwyn cliciadau yn y golwg.", diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json index f005c6095b..06d4d1e2fb 100644 --- a/app/javascript/mastodon/locales/da.json +++ b/app/javascript/mastodon/locales/da.json @@ -328,14 +328,15 @@ "annual_report.summary.share_on_mastodon": "Del på Mastodon", "attachments_list.unprocessed": "(ubehandlet)", "audio.hide": "Skjul lyd", + "block_modal.no_collections": "I kan ikke tilføje hinanden til samlinger. I bliver automatisk fjernet fra hinandens eksisterende samlinger, hvis det er relevant.", "block_modal.remote_users_caveat": "Serveren {domain} vil blive bedt om at respektere din beslutning. Overholdelse er dog ikke garanteret, da nogle servere kan håndtere blokke forskelligt. Offentlige indlæg kan stadig være synlige for ikke-indloggede brugere.", "block_modal.show_less": "Vis mindre", "block_modal.show_more": "Vis flere", - "block_modal.they_cant_mention": "Vedkommende kan ikke omtale eller følge dig.", - "block_modal.they_cant_see_posts": "Vedkommende kan ikke se dine indlæg, og du vil ikke se vedkommendes.", + "block_modal.they_cant_mention": "I kan ikke omtale, følge eller citere hinanden.", + "block_modal.they_cant_see_posts": "De kan ikke se dit indhold, og du kan ikke se deres.", "block_modal.they_will_know": "Vedkommende kan se den aktive blokering.", "block_modal.title": "Blokér bruger?", - "block_modal.you_wont_see_mentions": "Du vil ikke se indlæg, som omtaler vedkommende.", + "block_modal.you_wont_see_mentions": "Du vil ikke se indlæg fra andre, hvor de omtales.", "boost_modal.combo": "Du kan trykke {combo} for at springe dette over næste gang", "boost_modal.reblog": "Fremhæv indlæg?", "boost_modal.undo_reblog": "Fjern fremhævelse af indlæg?", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index f8b0256347..d07108df73 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -331,11 +331,8 @@ "block_modal.remote_users_caveat": "Wir werden den Server {domain} bitten, deine Entscheidung zu respektieren. Allerdings kann nicht garantiert werden, dass sie eingehalten wird, weil einige Server Blockierungen unterschiedlich handhaben können. Öffentliche Beiträge können für nicht angemeldete Nutzer*innen weiterhin sichtbar sein.", "block_modal.show_less": "Weniger anzeigen", "block_modal.show_more": "Mehr anzeigen", - "block_modal.they_cant_mention": "Das Profil wird dich nicht erwähnen oder dir folgen können.", - "block_modal.they_cant_see_posts": "Deine Beiträge können nicht mehr angesehen werden und du wirst deren Beiträge nicht mehr sehen.", "block_modal.they_will_know": "Das Profil wird erkennen können, dass du es blockiert hast.", "block_modal.title": "Profil blockieren?", - "block_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.", "boost_modal.combo": "Mit {combo} erscheint dieses Fenster nicht mehr", "boost_modal.reblog": "Beitrag teilen?", "boost_modal.undo_reblog": "Beitrag nicht mehr teilen?", diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json index 23d5ba3b7e..c0ce1821c0 100644 --- a/app/javascript/mastodon/locales/el.json +++ b/app/javascript/mastodon/locales/el.json @@ -328,14 +328,15 @@ "annual_report.summary.share_on_mastodon": "Κοινοποίηση στο Mastodon", "attachments_list.unprocessed": "(μη επεξεργασμένο)", "audio.hide": "Απόκρυψη αρχείου ήχου", + "block_modal.no_collections": "Κανένας από τους δύο σας δεν μπορεί να προσθέσει ο ένας τον άλλο σε συλλογές. Θα αφαιρεθεί αυτόματα ο ένας από τις υπάρχουσες συλλογές του άλλου, αν υπάρχουν.", "block_modal.remote_users_caveat": "Θα ζητήσουμε από τον διακομιστή {domain} να σεβαστεί την απόφασή σου. Ωστόσο, η συμμόρφωση δεν είναι εγγυημένη δεδομένου ότι ορισμένοι διακομιστές ενδέχεται να χειρίζονται τους αποκλεισμούς διαφορετικά. Οι δημόσιες αναρτήσεις ενδέχεται να είναι ορατές σε μη συνδεδεμένους χρήστες.", "block_modal.show_less": "Εμφάνιση λιγότερων", "block_modal.show_more": "Εμφάνιση περισσότερων", - "block_modal.they_cant_mention": "Δεν μπορεί να σε επισημάνει ή να σε ακολουθήσει.", - "block_modal.they_cant_see_posts": "Δεν μπορεί να δει τις αναρτήσεις σου και δε θα δεις τις δικές του.", + "block_modal.they_cant_mention": "Δεν μπορείτε να επισημάνετε, να ακολουθήσετε ή να παραθέσετε ο ένας τον άλλον.", + "block_modal.they_cant_see_posts": "Δεν μπορεί να δει το περιεχόμενό σου και δε θα δεις το δικό του.", "block_modal.they_will_know": "Μπορούν να δει ότι έχει αποκλειστεί.", "block_modal.title": "Αποκλεισμός χρήστη;", - "block_modal.you_wont_see_mentions": "Δε θα βλέπεις τις αναρτήσεις που τον επισημαίνουν.", + "block_modal.you_wont_see_mentions": "Δε θα βλέπεις τις αναρτήσεις από άλλους που τον επισημαίνουν.", "boost_modal.combo": "Μπορείς να πατήσεις {combo} για να το προσπεράσεις την επόμενη φορά", "boost_modal.reblog": "Ενίσχυση ανάρτησης;", "boost_modal.undo_reblog": "Αναίρεση ενίσχυσης;", @@ -713,8 +714,8 @@ "follow_requests.unlocked_explanation": "Παρόλο που ο λογαριασμός σου δεν είναι κλειδωμένος, το προσωπικό του {domain} θεώρησε πως ίσως να θέλεις να ελέγχεις χειροκίνητα αυτά τα αιτήματα ακολούθησης.", "follow_suggestions.curated_suggestion": "Επιλογή προσωπικού", "follow_suggestions.dismiss": "Να μην εμφανιστεί ξανά", - "follow_suggestions.featured_longer": "Προσεκτικά επιλεγμένα απ' την ομάδα του {domain}", - "follow_suggestions.friends_of_friends_longer": "Δημοφιλή μεταξύ των ατόμων που ακολουθείς", + "follow_suggestions.featured_longer": "Προσεκτικά επιλεγμένο απ' την ομάδα του {domain}", + "follow_suggestions.friends_of_friends_longer": "Δημοφιλές μεταξύ των ατόμων που ακολουθείς", "follow_suggestions.hints.featured": "Αυτό το προφίλ έχει επιλεγεί προσεκτικά από την ομάδα του {domain}.", "follow_suggestions.hints.friends_of_friends": "Αυτό το προφίλ είναι δημοφιλές μεταξύ των ατόμων που ακολουθείς.", "follow_suggestions.hints.most_followed": "Αυτό το προφίλ είναι ένα από τα πιο ακολουθούμενα στο {domain}.", @@ -722,8 +723,8 @@ "follow_suggestions.hints.similar_to_recently_followed": "Αυτό το προφίλ είναι παρόμοιο με τα προφίλ που έχεις ακολουθήσει πρόσφατα.", "follow_suggestions.personalized_suggestion": "Εξατομικευμένη πρόταση", "follow_suggestions.popular_suggestion": "Δημοφιλής πρόταση", - "follow_suggestions.popular_suggestion_longer": "Δημοφιλή στο {domain}", - "follow_suggestions.similar_to_recently_followed_longer": "Παρόμοια με προφίλ που ακολούθησες πρόσφατα", + "follow_suggestions.popular_suggestion_longer": "Δημοφιλές στο {domain}", + "follow_suggestions.similar_to_recently_followed_longer": "Παρόμοιο με προφίλ που ακολούθησες πρόσφατα", "follow_suggestions.view_all": "Εμφάνιση όλων", "follow_suggestions.who_to_follow": "Ποιον να ακολουθήσεις", "followed_tags": "Ακολουθούμενες ετικέτες", diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json index 1a41eb4db7..7d6ddb61be 100644 --- a/app/javascript/mastodon/locales/en-GB.json +++ b/app/javascript/mastodon/locales/en-GB.json @@ -309,11 +309,8 @@ "block_modal.remote_users_caveat": "We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.", "block_modal.show_less": "Show less", "block_modal.show_more": "Show more", - "block_modal.they_cant_mention": "They can't mention or follow you.", - "block_modal.they_cant_see_posts": "They can't see your posts and you won't see theirs.", "block_modal.they_will_know": "They can see that they're blocked.", "block_modal.title": "Block user?", - "block_modal.you_wont_see_mentions": "You won't see posts that mention them.", "boost_modal.combo": "You can press {combo} to skip this next time", "boost_modal.reblog": "Boost post?", "boost_modal.undo_reblog": "Unboost post?", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index ae0f37e8eb..f8e87d1607 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -125,11 +125,8 @@ "block_modal.remote_users_caveat": "Ni petos al la servilo {domain} respekti vian elekton. Tamen, plenumo ne estas garantiita ĉar iuj serviloj eble manipulas blokojn malsame. Publikaj afiŝoj eble ankoraŭ estas videbla por ne-ensalutintaj uzantoj.", "block_modal.show_less": "Montri malpli", "block_modal.show_more": "Montri pli", - "block_modal.they_cant_mention": "Ili ne povas mencii aŭ sekvi vin.", - "block_modal.they_cant_see_posts": "Ili ne povas vidi viajn afiŝojn kaj vi ne povas vidi iliajn.", "block_modal.they_will_know": "Ili povas vidi, ke ili estas blokita.", "block_modal.title": "Ĉu bloki uzanton?", - "block_modal.you_wont_see_mentions": "Vi ne vidos afiŝojn, ke mencii ilin.", "boost_modal.combo": "Vi povas premi {combo} por preterpasi sekvafoje", "boost_modal.reblog": "Ĉu diskonigi afiŝon?", "boost_modal.undo_reblog": "Ĉu ĉesi diskonigi afiŝon?", diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json index 9c6afef6d1..1dcf23a892 100644 --- a/app/javascript/mastodon/locales/es-AR.json +++ b/app/javascript/mastodon/locales/es-AR.json @@ -328,14 +328,15 @@ "annual_report.summary.share_on_mastodon": "Compartir en Mastodon", "attachments_list.unprocessed": "[sin procesar]", "audio.hide": "Ocultar audio", + "block_modal.no_collections": "Ninguno de ustedes pueden agregarse entre sí a las colecciones. Serás eliminado automáticamente de las colecciones existentes de los demás, si es aplicable.", "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar los bloqueos de forma diferente. Los mensajes públicos todavía podrían estar visibles para los usuarios no conectados.", "block_modal.show_less": "Mostrar menos", "block_modal.show_more": "Mostrar más", - "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.", + "block_modal.they_cant_mention": "No pueden mencionarse, seguirse ni citarse unos a otros.", "block_modal.they_cant_see_posts": "No pueden ver tus mensajes y vos no verás los suyos.", "block_modal.they_will_know": "Pueden ver que están bloqueados.", "block_modal.title": "¿Bloquear usuario?", - "block_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.", + "block_modal.you_wont_see_mentions": "No verás mensajes de otros que los mencionen.", "boost_modal.combo": "Podés hacer clic en {combo} para saltar esto la próxima vez", "boost_modal.reblog": "¿Adherir al mensaje?", "boost_modal.undo_reblog": "¿Dejar de adherir al mensaje?", diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json index 0a986a50f6..37de85f2c4 100644 --- a/app/javascript/mastodon/locales/es-MX.json +++ b/app/javascript/mastodon/locales/es-MX.json @@ -328,14 +328,15 @@ "annual_report.summary.share_on_mastodon": "Compartir en Mastodon", "attachments_list.unprocessed": "(sin procesar)", "audio.hide": "Ocultar audio", + "block_modal.no_collections": "Ninguno de los dos podrá añadirse mutuamente a las colecciones. Se les eliminará automáticamente de las colecciones existentes del otro, si procede.", "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar bloques de forma diferente. Las publicaciones públicas pueden ser todavía visibles para los usuarios no conectados.", "block_modal.show_less": "Mostrar menos", "block_modal.show_more": "Mostrar más", - "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.", - "block_modal.they_cant_see_posts": "No pueden ver tus publicaciones y tú no verás las de ellos.", + "block_modal.they_cant_mention": "No pueden mencionarse, seguirse ni citarse entre ustedes.", + "block_modal.they_cant_see_posts": "Ellos no pueden ver tu contenido y tú no verás el de ellos.", "block_modal.they_will_know": "Pueden ver que están bloqueados.", "block_modal.title": "¿Deseas bloquear al usuario?", - "block_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.", + "block_modal.you_wont_see_mentions": "No verás las publicaciones de otras personas en las que se les mencione.", "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez", "boost_modal.reblog": "¿Deseas impulsar la publicación?", "boost_modal.undo_reblog": "¿Dejar de impulsar la publicación?", diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index f71bc11a20..33d9704ffa 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -328,14 +328,15 @@ "annual_report.summary.share_on_mastodon": "Compartir en Mastodon", "attachments_list.unprocessed": "(sin procesar)", "audio.hide": "Ocultar audio", + "block_modal.no_collections": "Ninguno de vosotros podrá añadirse mutuamente a colecciones. Seréis eliminados automáticamente de las colecciones mutuas de cada uno, si las hubiera.", "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar bloqueos de forma distinta. Los mensajes públicos pueden ser todavía visibles para los usuarios que no hayan iniciado sesión.", "block_modal.show_less": "Mostrar menos", "block_modal.show_more": "Mostrar más", - "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.", - "block_modal.they_cant_see_posts": "No pueden ver tus publicaciones y tú no verás las suyas.", + "block_modal.they_cant_mention": "No podréis mencionaros, seguiros o citaros mutuamente.", + "block_modal.they_cant_see_posts": "No podrá ver tu contenido y tú no podrás ver el suyo.", "block_modal.they_will_know": "Pueden ver que están bloqueados.", "block_modal.title": "¿Bloquear usuario?", - "block_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.", + "block_modal.you_wont_see_mentions": "No podrás ver publicaciones de otros donde sea mencionado.", "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez", "boost_modal.reblog": "¿Impulsar la publicación?", "boost_modal.undo_reblog": "¿Dejar de impulsar la publicación?", diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json index ac87e2de9c..a24e946f03 100644 --- a/app/javascript/mastodon/locales/et.json +++ b/app/javascript/mastodon/locales/et.json @@ -328,14 +328,15 @@ "annual_report.summary.share_on_mastodon": "Jaga Mastodonis", "attachments_list.unprocessed": "(töötlemata)", "audio.hide": "Peida heliriba", + "block_modal.no_collections": "Kumbki teist ei saa teineteist kogumikesse lisada. Vajaduse korral eemaldatakse teid automaatselt teineteise olemasolevatest kogumikest.", "block_modal.remote_users_caveat": "Serverile {domain} edastatakse palve otsust järgida. Ometi pole see tagatud, kuna mõned serverid võivad blokeeringuid käsitleda omal moel. Avalikud postitused võivad tuvastamata kasutajatele endiselt näha olla.", "block_modal.show_less": "Kuva vähem", "block_modal.show_more": "Kuva rohkem", - "block_modal.they_cant_mention": "Ta ei saa sind mainida ega jälgida.", - "block_modal.they_cant_see_posts": "Ta ei näe sinu postitusi ja sa ei näe tema omi.", + "block_modal.they_cant_mention": "Te ei saa üksteist mainida, jälgida ega tsiteerida.", + "block_modal.they_cant_see_posts": "Nad ei näe sinu sisu ja sina ei näe nende oma.", "block_modal.they_will_know": "Ta näeb, et ta on blokeeritud.", "block_modal.title": "Kas blokeerid kasutaja?", - "block_modal.you_wont_see_mentions": "Sa ei näe postitusi, mis mainivad teda.", + "block_modal.you_wont_see_mentions": "Sa ei näe teiste postitusi, milles neid mainitakse.", "boost_modal.combo": "Vajutades {combo}, saad selle edaspidi vahele jätta", "boost_modal.reblog": "Jagada postitust?", "boost_modal.undo_reblog": "Tühista postituse jagamine?", diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json index dc58b8d677..dd7e7c3569 100644 --- a/app/javascript/mastodon/locales/eu.json +++ b/app/javascript/mastodon/locales/eu.json @@ -156,11 +156,8 @@ "block_modal.remote_users_caveat": "{domain} zerbitzariari zure erabakia errespeta dezan eskatuko diogu. Halere, araua beteko den ezin da bermatu, zerbitzari batzuk modu desberdinean kudeatzen baitituzte blokeoak. Baliteke argitalpen publikoak saioa hasi ez duten erabiltzaileentzat ikusgai egotea.", "block_modal.show_less": "Erakutsi gutxiago", "block_modal.show_more": "Erakutsi gehiago", - "block_modal.they_cant_mention": "Ezin zaitu aipatu ezta jarraitu ere.", - "block_modal.they_cant_see_posts": "Ezin ditu zure bidalketak ikusi eta zuk ez dituzu bereak ikusiko.", "block_modal.they_will_know": "Ezin du ikusi blokeatuta duzunik.", "block_modal.title": "Erabiltzailea blokeatu nahi duzu?", - "block_modal.you_wont_see_mentions": "Ez duzu ikusiko bera aipatzen duen argitalpenik.", "boost_modal.combo": "{combo} sakatu dezakezu hurrengoan hau saltatzeko", "boost_modal.reblog": "Bultzatu bidalketa?", "boost_modal.undo_reblog": "Bidalketari bultzada kendu?", diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index 4871297b04..b40f9822a7 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -331,11 +331,8 @@ "block_modal.remote_users_caveat": "از کارساز {domain} خواهیم خواست که به تصمیمتان احترام بگذارد. با این حال تضمینی برای رعایتش وجود ندارد؛ زیرا برخی کارسازها ممکن است مسدودی را متفاوت مدیریت کنند. ممکن است فرسته‌های عمومی همچنان برای کاربران وارد نشده نمایان باشند.", "block_modal.show_less": "نمایش کم‌تر", "block_modal.show_more": "نمایش بیش‌تر", - "block_modal.they_cant_mention": "نمی‌تواند نامتان را برده یا پیتان بگیرد.", - "block_modal.they_cant_see_posts": "نمی‌تواند فرسته‌هایتان را ببیند و فرسته‌هایش را نمی‌بینید.", "block_modal.they_will_know": "می‌تواند ببینند که مسدود شده.", "block_modal.title": "انسداد کاربر؟", - "block_modal.you_wont_see_mentions": "فرسته‌هایی که به او اشاره کرده‌اند را نخواهید دید.", "boost_modal.combo": "دکمهٔ {combo} را بزنید تا دیگر این را نبینید", "boost_modal.reblog": "تقویت فرسته؟", "boost_modal.undo_reblog": "ناتقویت فرسته؟", diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json index 41c15d66cd..9e0ae04782 100644 --- a/app/javascript/mastodon/locales/fi.json +++ b/app/javascript/mastodon/locales/fi.json @@ -328,14 +328,15 @@ "annual_report.summary.share_on_mastodon": "Jaa Mastodonissa", "attachments_list.unprocessed": "(käsittelemätön)", "audio.hide": "Piilota ääni", + "block_modal.no_collections": "Kumpikaan teistä ei voi lisätä toista kokoelmiin. Sinut poistetaan automaattisesti kummankin mahdollisista olemassa olevista kokoelmista.", "block_modal.remote_users_caveat": "Pyydämme palvelinta {domain} kunnioittamaan päätöstäsi. Myötämielisyyttä ei kuitenkaan taata, koska jotkin palvelimet voivat käsitellä estoja eri tavalla. Julkiset julkaisut voivat silti näkyä kirjautumattomille käyttäjille.", "block_modal.show_less": "Näytä vähemmän", "block_modal.show_more": "Näytä enemmän", - "block_modal.they_cant_mention": "Hän ei voi enää mainita eikä seurata sinua.", - "block_modal.they_cant_see_posts": "Hän ei voi enää nähdä julkaisujasi, etkä sinä voi nähdä hänen.", + "block_modal.they_cant_mention": "Ette voi mainita, seurata ettekä lainata toisianne.", + "block_modal.they_cant_see_posts": "Hän ei voi nähdä sisältöäsi, etkä sinä näe enää hänen.", "block_modal.they_will_know": "Hän voi nähdä, että hänet on estetty.", "block_modal.title": "Estetäänkö käyttäjä?", - "block_modal.you_wont_see_mentions": "Et näe enää julkaisuja, joissa hänet mainitaan.", + "block_modal.you_wont_see_mentions": "Et näe enää muiden käyttäjien julkaisuja, joissa hänet mainitaan.", "boost_modal.combo": "Ensi kerralla voit ohittaa tämän painamalla {combo}", "boost_modal.reblog": "Tehostetaanko julkaisua?", "boost_modal.undo_reblog": "Perutaanko julkaisun tehostus?", diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json index 6899544b2f..2b5a480f7e 100644 --- a/app/javascript/mastodon/locales/fil.json +++ b/app/javascript/mastodon/locales/fil.json @@ -88,10 +88,8 @@ "audio.hide": "Itago ang tunog", "block_modal.show_less": "Magpakita ng mas kaunti", "block_modal.show_more": "Magpakita ng higit pa", - "block_modal.they_cant_mention": "Hindi sila makakabanggit sa iyo o sundan ka.", "block_modal.they_will_know": "Makita nila na hinarangan sila.", "block_modal.title": "Harangan ang tagagamit?", - "block_modal.you_wont_see_mentions": "Hindi ka makakakita ng mga post na nagbanggit sa kanila.", "boost_modal.combo": "Maari mong pindutin ang {combo} upang laktawan ito sa susunod na oras", "bundle_column_error.error.title": "Naku!", "bundle_column_error.network.body": "Nagkaroon ng kamalian habang sinusubukang i-karga ang pahinang ito. Maaaring dahil ito sa pansamantalang problema ng iyong koneksyon sa internet o ang server na ito.", diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json index 54353cb277..8680c3b72e 100644 --- a/app/javascript/mastodon/locales/fo.json +++ b/app/javascript/mastodon/locales/fo.json @@ -235,11 +235,8 @@ "block_modal.remote_users_caveat": "Vit biðja ambætaran {domain} virða tína avgerð. Kortini er eingin vissa um samsvar, av tí at fleiri ambætarar handfara blokkar ymiskt. Almennir postar kunnu framvegis vera sjónligir fyri brúkarar, sum ikki eru innritaðir.", "block_modal.show_less": "Vís minni", "block_modal.show_more": "Vís meiri", - "block_modal.they_cant_mention": "Tey kunnu hvørki nevna teg ella fylgja tær.", - "block_modal.they_cant_see_posts": "Tey síggja ikki tínar postar og tú sært ikki teirra.", "block_modal.they_will_know": "Tey síggja, at tey eru bannað.", "block_modal.title": "Banna brúkara?", - "block_modal.you_wont_see_mentions": "Tú sært ikki postar, sum nevna tey.", "boost_modal.combo": "Tú kanst trýsta á {combo} fyri at loypa uppum hetta næstu ferð", "boost_modal.reblog": "Stimbra post?", "boost_modal.undo_reblog": "Strika stimbran av posti?", diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json index c92fff2821..a6ba4c814f 100644 --- a/app/javascript/mastodon/locales/fr-CA.json +++ b/app/javascript/mastodon/locales/fr-CA.json @@ -331,11 +331,8 @@ "block_modal.remote_users_caveat": "Nous allons demander au serveur {domain} de respecter votre décision. Cependant, ce respect n'est pas garanti, car certains serveurs peuvent gérer différemment les blocages. Les messages publics peuvent rester visibles par les utilisateur·rice·s non connecté·e·s.", "block_modal.show_less": "Afficher moins", "block_modal.show_more": "Afficher plus", - "block_modal.they_cant_mention": "Iel ne pourra plus vous mentionner ou vous suivre.", - "block_modal.they_cant_see_posts": "Iel ne pourra plus voir vos messages et vous ne verrez plus les siens.", "block_modal.they_will_know": "Iel pourra voir qu'iel est bloqué·e.", "block_modal.title": "Bloquer l'utilisateur·ice ?", - "block_modal.you_wont_see_mentions": "Vous ne verrez plus les messages qui le ou la mentionnent.", "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour sauter ceci la prochaine fois", "boost_modal.reblog": "Partager le message ?", "boost_modal.undo_reblog": "Annuler le partage du message ?", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index ee74c5a452..d12b189f12 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -331,11 +331,8 @@ "block_modal.remote_users_caveat": "Nous allons demander au serveur {domain} de respecter votre décision. Cependant, ce respect n'est pas garanti, car certains serveurs peuvent gérer différemment les blocages. Les messages publics peuvent rester visibles par les utilisateur·rice·s non connecté·e·s.", "block_modal.show_less": "Afficher moins", "block_modal.show_more": "Afficher plus", - "block_modal.they_cant_mention": "Iel ne pourra plus vous mentionner ou vous suivre.", - "block_modal.they_cant_see_posts": "Iel ne pourra plus voir vos messages et vous ne verrez plus les siens.", "block_modal.they_will_know": "Iel pourra voir qu'iel est bloqué·e.", "block_modal.title": "Bloquer l'utilisateur·ice ?", - "block_modal.you_wont_see_mentions": "Vous ne verrez plus les messages qui le ou la mentionnent.", "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois", "boost_modal.reblog": "Partager le message ?", "boost_modal.undo_reblog": "Annuler le partage du message ?", diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json index 81e0b4edd3..26b43ac623 100644 --- a/app/javascript/mastodon/locales/fy.json +++ b/app/javascript/mastodon/locales/fy.json @@ -109,11 +109,8 @@ "block_modal.remote_users_caveat": "Wy freegje de server {domain} om jo beslút te respektearjen. It neilibben hjirfan is echter net garandearre, omdat guon servers blokkaden oars ynterpretearje kinne. Iepenbiere berjochten binne mooglik noch hieltyd sichtber foar net-oanmelde brûkers.", "block_modal.show_less": "Minder toane", "block_modal.show_more": "Mear toane", - "block_modal.they_cant_mention": "Sy kinne jo net fermelde of folgje.", - "block_modal.they_cant_see_posts": "De persoan kin jo berjochten net sjen en jo ek net harren berjochten.", "block_modal.they_will_know": "De persoan kin sjen dat dy blokkearre wurdt.", "block_modal.title": "Brûker blokkearje?", - "block_modal.you_wont_see_mentions": "Jo sjogge gjin berjochten mear dy’t dizze account fermelde.", "boost_modal.combo": "Jo kinne op {combo} drukke om dit de folgjende kear oer te slaan", "boost_modal.reblog": "Berjocht booste?", "boost_modal.undo_reblog": "Berjocht net langer booste?", diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json index f788d07746..96da1b8d85 100644 --- a/app/javascript/mastodon/locales/ga.json +++ b/app/javascript/mastodon/locales/ga.json @@ -331,11 +331,8 @@ "block_modal.remote_users_caveat": "Iarrfaimid ar an bhfreastalaí {domain} meas a bheith agat ar do chinneadh. Mar sin féin, ní ráthaítear comhlíonadh toisc go bhféadfadh roinnt freastalaithe bloic a láimhseáil ar bhealach difriúil. Seans go mbeidh postálacha poiblí fós le feiceáil ag úsáideoirí nach bhfuil logáilte isteach.", "block_modal.show_less": "Taispeáin níos lú", "block_modal.show_more": "Taispeáin níos mó", - "block_modal.they_cant_mention": "Ní féidir leo tú a lua ná a leanúint.", - "block_modal.they_cant_see_posts": "Ní féidir leo do chuid postálacha a fheiceáil agus ní fheicfidh tú a gcuid postanna.", "block_modal.they_will_know": "Is féidir leo a fheiceáil go bhfuil bac orthu.", "block_modal.title": "Úsáideoir a bhlocáil?", - "block_modal.you_wont_see_mentions": "Ní fheicfidh tú postálacha a luann iad.", "boost_modal.combo": "Is féidir leat {combo} a bhrú chun é seo a scipeáil an chéad uair eile", "boost_modal.reblog": "An post a threisiú?", "boost_modal.undo_reblog": "An deireadh a chur le postáil?", diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json index 3f1883f52e..a75885358c 100644 --- a/app/javascript/mastodon/locales/gd.json +++ b/app/javascript/mastodon/locales/gd.json @@ -331,11 +331,8 @@ "block_modal.remote_users_caveat": "Iarraidh sinn air an fhrithealaiche {domain} gun gèill iad ri do cho-dhùnadh. Gidheadh, chan eil barantas gun gèill iad on a làimhsicheas cuid a fhrithealaichean bacaidhean air dòigh eadar-dhealaichte. Dh’fhaoidte gum faic daoine gun chlàradh a-steach na postaichean poblach agad fhathast.", "block_modal.show_less": "Seall nas lugha dheth", "block_modal.show_more": "Seall barrachd dheth", - "block_modal.they_cant_mention": "Chan urrainn dhaibh iomradh a thoirt ort no do leantainn.", - "block_modal.they_cant_see_posts": "Chan fhaic iad na postaichean agad ’s chan fhaic thu na postaichean aca-san.", "block_modal.they_will_know": "Chì iad gun deach am bacadh.", "block_modal.title": "A bheil thu airson an cleachdaiche a bhacadh?", - "block_modal.you_wont_see_mentions": "Chan fhaic thu na postaichean a bheir iomradh orra.", "boost_modal.combo": "Brùth air {combo} nam b’ fheàrr leat leum a ghearradh thar seo an ath-thuras", "boost_modal.reblog": "A bheil thu airson am post a bhrosnachadh?", "boost_modal.undo_reblog": "A bheil thu airson sgur de bhrosnachadh a’ phuist?", diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json index 04c93bebf1..1e9f5305b8 100644 --- a/app/javascript/mastodon/locales/gl.json +++ b/app/javascript/mastodon/locales/gl.json @@ -331,11 +331,8 @@ "block_modal.remote_users_caveat": "Ímoslle pedir ao servidor {domain} que respecte a túa decisión. Emporiso, non hai garantía de que atenda a petición xa que os servidores xestionan os bloqueos de formas diferentes. As publicacións públicas poderían aínda ser visibles para usuarias que non iniciaron sesión.", "block_modal.show_less": "Mostrar menos", "block_modal.show_more": "Mostrar máis", - "block_modal.they_cant_mention": "Non te pode seguir nin mencionar.", - "block_modal.they_cant_see_posts": "Non pode ver as túas publicacións nin ti as de ela.", "block_modal.they_will_know": "Pode ver que a bloqueaches.", "block_modal.title": "Bloquear usuaria?", - "block_modal.you_wont_see_mentions": "Non verás publicacións que a mencionen.", "boost_modal.combo": "Preme {combo} para ignorar isto na seguinte vez", "boost_modal.reblog": "Promover publicación?", "boost_modal.undo_reblog": "Retirar promoción?", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index 0c534fe1db..8deaff385e 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -331,11 +331,8 @@ "block_modal.remote_users_caveat": "אנו נבקש מהשרת {domain} לכבד את החלטתך. עם זאת, ציות למוסכמות איננו מובטח כיוון ששרתים מסויימים עשויים לטפל בחסימות בצורה אחרת. הודעות פומביות עדיין יהיו גלויות לעיני משתמשים שאינם מחוברים.", "block_modal.show_less": "הצג פחות", "block_modal.show_more": "הצג עוד", - "block_modal.they_cant_mention": "הם אינם יכולים לאזכר אותך או לעקוב אחריך.", - "block_modal.they_cant_see_posts": "הם לא יכולים לראות את הודעותיך ואתם לא תוכלו לראות את שלהם.", "block_modal.they_will_know": "הם יכולים לראות שהם חסומים.", "block_modal.title": "לחסום משתמש?", - "block_modal.you_wont_see_mentions": "לא תראה הודעות שמאזכרות אותם.", "boost_modal.combo": "ניתן להקיש {combo} כדי לדלג בפעם הבאה", "boost_modal.reblog": "להדהד הודעה?", "boost_modal.undo_reblog": "להסיר הדהוד?", diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json index b5c49b217e..27d86e4190 100644 --- a/app/javascript/mastodon/locales/hi.json +++ b/app/javascript/mastodon/locales/hi.json @@ -94,11 +94,8 @@ "block_modal.remote_users_caveat": "हम {domain} को आपके निर्णय का सम्मान करने को कहेंगे।हालाकि इसकी आपूर्ति कि प्रत्याभूति नहीं हे। क्योंकि कुछ सर्वर ब्लॉक को अलग तरह से निभा सकते हे। अभी भी सार्वजानिक पोस्ट लोग- इन बगैर के उपयोगकर्ताओं को दिख सकती हैं।", "block_modal.show_less": "कम दिखाएं", "block_modal.show_more": "और दिखाएँ", - "block_modal.they_cant_mention": "वे आपको मेंशन या फॉलो नहीं कर सकते", - "block_modal.they_cant_see_posts": "वो आपके पोस्ट नहीं देख सकते और न आप उनके", "block_modal.they_will_know": "वे नहीं देख सकते कि उन्हें ब्लॉक किया गया है", "block_modal.title": "यूजर को ब्लॉक करें?", - "block_modal.you_wont_see_mentions": "वो पोस्ट आप नहीं देख सकते जिनमें उन्हें मेंशन किया गया है", "boost_modal.combo": "अगली बार स्किप करने के लिए आप {combo} दबा सकते है", "bundle_column_error.copy_stacktrace": "कॉपी एरर रिपोर्ट", "bundle_column_error.error.body": "अनुरोधित पेज प्रस्तुत नहीं किया जा सका। यह हमारे कोड में बग या ब्राउज़र संगतता समस्या के कारण हो सकता है।", diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index bca3270e81..9990ad5904 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -330,11 +330,8 @@ "block_modal.remote_users_caveat": "Arra kérjük a {domain} kiszolgálót, hogy tartsa tiszteletben a döntésedet. Ugyanakkor az együttműködés nem garantált, mivel néhány kiszolgáló másképp kezelheti a letiltásokat. A nyilvános bejegyzések a be nem jelentkezett felhasználók számára továbbra is látszódhatnak.", "block_modal.show_less": "Kevesebb mutatása", "block_modal.show_more": "Több mutatása", - "block_modal.they_cant_mention": "Nem említhet meg és nem követhet téged.", - "block_modal.they_cant_see_posts": "Nem láthatja a bejegyzéseidet, és te sem fogod látni az övéit.", "block_modal.they_will_know": "Láthatja, hogy le van tiltva.", "block_modal.title": "Letiltsuk a felhasználót?", - "block_modal.you_wont_see_mentions": "Nem látsz majd őt említő bejegyzéseket.", "boost_modal.combo": "Hogy átugord ezt következő alkalommal, használd {combo}", "boost_modal.reblog": "Bejegyzés megtolása?", "boost_modal.undo_reblog": "Megtolás visszavonása?", diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json index f4c473a688..a880a37074 100644 --- a/app/javascript/mastodon/locales/ia.json +++ b/app/javascript/mastodon/locales/ia.json @@ -115,11 +115,8 @@ "block_modal.remote_users_caveat": "Nos demandera al servitor {domain} de respectar tu decision. Nonobstante, le conformitate non es garantite perque alcun servitores pote tractar le blocadas de maniera differente. Le messages public pote esser totevia visibile pro le usatores non authenticate.", "block_modal.show_less": "Monstrar minus", "block_modal.show_more": "Monstrar plus", - "block_modal.they_cant_mention": "Le persona non pote mentionar te o sequer te.", - "block_modal.they_cant_see_posts": "Iste persona non potera vider tu messages e tu non videra le sues.", "block_modal.they_will_know": "Le persona pote saper de esser blocate.", "block_modal.title": "Blocar usator?", - "block_modal.you_wont_see_mentions": "Tu non videra le messages que mentiona iste persona.", "boost_modal.combo": "Tu pote premer {combo} pro saltar isto le proxime vice", "boost_modal.reblog": "Impulsar le message?", "boost_modal.undo_reblog": "Cessar de impulsar le message?", diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json index 833ce29192..f9d840020c 100644 --- a/app/javascript/mastodon/locales/id.json +++ b/app/javascript/mastodon/locales/id.json @@ -92,11 +92,8 @@ "block_modal.remote_users_caveat": "Kami akan meminta {domain} server untuk menghargai keputusan Anda. Namun, kepatuhan tak dapat dipastikan karena beberapa server dapat menangani blokir secara beragam. Postingan publik masih dapat terlihat oleh pengguna tanpa masuk.", "block_modal.show_less": "Tampilkan lebih sedikit", "block_modal.show_more": "Tampilkan lebih banyak", - "block_modal.they_cant_mention": "Mereka tidak dapat menyebut atau mengikuti Anda.", - "block_modal.they_cant_see_posts": "Mereka tidak dapat melihat postingan Anda dan Anda tidak dapat melihat postingan mereka.", "block_modal.they_will_know": "Mereka dapat melihat bahwa mereka diblokir.", "block_modal.title": "Blokir pengguna?", - "block_modal.you_wont_see_mentions": "Anda tidak akan melihat kiriman yang menyebutkan mereka.", "boost_modal.combo": "Anda dapat menekan {combo} untuk melewati ini", "boost_modal.reblog": "Pacu kiriman?", "boost_modal.undo_reblog": "Jangan pacu kiriman?", diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json index 45b4a8f8d1..2b636760ff 100644 --- a/app/javascript/mastodon/locales/ie.json +++ b/app/javascript/mastodon/locales/ie.json @@ -80,11 +80,8 @@ "block_modal.remote_users_caveat": "Noi va petir que li servitor {domain} mey respecter tui decision. Támen, obedientie ne es garantit pro que chascun servitor gere bloccas diferentmen. Possibilmen public postas va restar visibil a usatores de inloggat.", "block_modal.show_less": "Monstrar minu", "block_modal.show_more": "Monstrar plu", - "block_modal.they_cant_mention": "Ne posse mentionar ni sequer te.", - "block_modal.they_cant_see_posts": "Ne posse vider tui postas e inversi.", "block_modal.they_will_know": "Va esser conscient que tu ha bloccat.", "block_modal.title": "Bloccar usator?", - "block_modal.you_wont_see_mentions": "Tu ne va vider postas mentionant li usator.", "boost_modal.combo": "Li proxim vez tu posse pressar {combo} por passar to-ci", "bundle_column_error.copy_stacktrace": "Copiar erra-raporte", "bundle_column_error.error.body": "Li demandat págine ne posset esser rendit. Fórsan it es un problema in nor code, o un problema de compatibilitá con li navigator.", diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json index 512717621f..70a074ea14 100644 --- a/app/javascript/mastodon/locales/io.json +++ b/app/javascript/mastodon/locales/io.json @@ -174,11 +174,8 @@ "block_modal.remote_users_caveat": "Ni questionos {domain} di la servilo por respektar vua decido. Publika posti forsan ankore estas videbla a neenirinta uzanti.", "block_modal.show_less": "Montrar mine", "block_modal.show_more": "Montrar plu", - "block_modal.they_cant_mention": "Oli ne povas mencionar o sequar vu.", - "block_modal.they_cant_see_posts": "Oli ne povas vidar vua mesaji e vu ne vidos vidar olia.", "block_modal.they_will_know": "Oli povas vidar ke oli esas blokusita.", "block_modal.title": "Blokusar uzanto?", - "block_modal.you_wont_see_mentions": "Vu ne vidos mesaji qua mencionas oli.", "boost_modal.combo": "Vu povas pulsar {combo} por omisar co venontafoye", "boost_modal.reblog": "Ka repetar posto?", "boost_modal.undo_reblog": "Ka desrepetar posto?", diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json index cb87555cc3..8df530d248 100644 --- a/app/javascript/mastodon/locales/is.json +++ b/app/javascript/mastodon/locales/is.json @@ -331,11 +331,8 @@ "block_modal.remote_users_caveat": "Við munum biðja {domain} netþjóninn um að virða ákvörðun þína. Hitt er svo annað mál hvort hann fari eftir þessu, ekki er hægt að tryggja eftirfylgni því sumir netþjónar meðhöndla útilokanir á sinn hátt. Opinberar færslur gætu verið sýnilegar notendum sem ekki eru skráðir inn.", "block_modal.show_less": "Sýna minna", "block_modal.show_more": "Sýna meira", - "block_modal.they_cant_mention": "Viðkomandi geta ekki minnst á þig eða fylgst með þér.", - "block_modal.they_cant_see_posts": "Viðkomandi geta ekki séð færslurnar þínar og þú ekki þeirra.", "block_modal.they_will_know": "Viðkomandi geta séð að þeir eru útilokaðir.", "block_modal.title": "Útiloka notanda?", - "block_modal.you_wont_see_mentions": "Þú munt ekki sjá færslur sem minnast á viðkomandi aðila.", "boost_modal.combo": "Þú getur ýtt á {combo} til að sleppa þessu næst", "boost_modal.reblog": "Endurbirta færslu?", "boost_modal.undo_reblog": "Taka færslu úr endurbirtingu?", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index 3f9d5ad688..f933efc269 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -331,11 +331,10 @@ "block_modal.remote_users_caveat": "Chiederemo al server {domain} di rispettare la tua decisione. Tuttavia, la conformità non è garantita poiché alcuni server potrebbero gestire i blocchi in modo diverso. I post pubblici potrebbero essere ancora visibili agli utenti che non hanno effettuato l'accesso.", "block_modal.show_less": "Mostra meno", "block_modal.show_more": "Mostra di più", - "block_modal.they_cant_mention": "Non possono menzionarti o seguirti.", - "block_modal.they_cant_see_posts": "Non possono vedere i tuoi post e tu non vedrai i loro.", + "block_modal.they_cant_mention": "Non potete menzionarvi, seguirvi o citarvi a vicenda.", + "block_modal.they_cant_see_posts": "Non possono vedere i tuoi contenuti e tu non vedrai i loro.", "block_modal.they_will_know": "Possono vedere che sono bloccati.", "block_modal.title": "Bloccare l'utente?", - "block_modal.you_wont_see_mentions": "Non vedrai i post che li menzionano.", "boost_modal.combo": "Puoi premere {combo} per saltare questo passaggio, la prossima volta", "boost_modal.reblog": "Condividere il post?", "boost_modal.undo_reblog": "Annullare la condivisione del post?", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 2459d80f24..3da2e851d4 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -156,11 +156,8 @@ "block_modal.remote_users_caveat": "このサーバーはあなたのブロックの意思を尊重するように {domain} へ通知します。しかし、サーバーによってはブロック機能の扱いが異なる場合もありえるため、相手のサーバー側で求める通りの処理が行われる確証はありません。また、公開投稿はユーザーがログアウト状態であれば閲覧できる可能性があります。", "block_modal.show_less": "表示を減らす", "block_modal.show_more": "続きを表示", - "block_modal.they_cant_mention": "相手はあなたへの返信やフォローができなくなります。", - "block_modal.they_cant_see_posts": "相手はあなたの投稿を閲覧できなくなり、あなたも相手の投稿を閲覧できなくなります。", "block_modal.they_will_know": "ブロックは相手からわかります。", "block_modal.title": "ユーザーをブロックしますか？", - "block_modal.you_wont_see_mentions": "宛先に相手が入っている投稿も閲覧できなくなります。", "boost_modal.combo": "次からは{combo}を押せばスキップできます", "boost_modal.reblog": "ブーストしますか？", "boost_modal.undo_reblog": "ブーストを解除しますか？", diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json index d777d26982..56ca50eea6 100644 --- a/app/javascript/mastodon/locales/kab.json +++ b/app/javascript/mastodon/locales/kab.json @@ -214,10 +214,7 @@ "audio.hide": "Ffer amesli", "block_modal.show_less": "Ssken-d drus", "block_modal.show_more": "Ssken-d ugar", - "block_modal.they_cant_mention": "Ur zmiren ad k·m-id-bedren, ur zmiren ad k·m-ḍefren.", - "block_modal.they_cant_see_posts": "Ur yezmir ad wali tisuffaɣ-ik·im, ur tettwaliḍ tidak-is.", "block_modal.title": "Sewḥel aseqdac ?", - "block_modal.you_wont_see_mentions": "Ur tezmireḍ ara ad twaliḍ tisuffaɣ anda d-yettwabdar.", "boost_modal.combo": "Tzemreḍ ad tsiteḍ ɣef {combo} akken ad tzegleḍ aya tikelt i d-iteddun", "boost_modal.reblog": "Zuzer tasuffeɣt?", "bundle_column_error.copy_stacktrace": "Nɣel tuccḍa n uneqqis", diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index 45045e2b06..0dc559865c 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -188,11 +188,8 @@ "block_modal.remote_users_caveat": "우리는 {domain} 서버가 당신의 결정을 존중해 주길 부탁할 것입니다. 하지만 몇몇 서버는 차단을 다르게 취급할 수 있기 때문에 규정이 준수되는 것을 보장할 수는 없습니다. 공개 게시물은 로그인 하지 않은 사용자들에게 여전히 보여질 수 있습니다.", "block_modal.show_less": "간략히 보기", "block_modal.show_more": "더 보기", - "block_modal.they_cant_mention": "나를 멘션하거나 팔로우 할 수 없습니다.", - "block_modal.they_cant_see_posts": "상대방이 내 게시물을 볼 수 없게 되며 나도 상대방의 게시물을 볼 수 없게 됩니다.", "block_modal.they_will_know": "자신이 차단 당했다는 사실을 확인할 수 있습니다.", "block_modal.title": "사용자를 차단할까요?", - "block_modal.you_wont_see_mentions": "해당 사용자를 멘션한 게시물이 보이지 않게 됩니다.", "boost_modal.combo": "다음엔 {combo}를 눌러서 이 과정을 건너뛸 수 있습니다", "boost_modal.reblog": "게시물을 부스트할까요?", "boost_modal.undo_reblog": "게시물을 부스트 취소할까요?", diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json index d6c88a68d1..af2c10551a 100644 --- a/app/javascript/mastodon/locales/la.json +++ b/app/javascript/mastodon/locales/la.json @@ -54,7 +54,6 @@ "alert.unexpected.message": "Error inopinatus occurrit.", "announcement.announcement": "Proclamatio", "attachments_list.unprocessed": "(immūtātus)", - "block_modal.you_wont_see_mentions": "Nuntios quibus eos commemorant non videbis.", "boost_modal.combo": "Potes premēre {combo} ut hoc iterum transilīre", "bundle_column_error.error.title": "Eheu!", "bundle_column_error.retry": "Retemptare", diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json index 313e2f62d4..f4f6a6aa1e 100644 --- a/app/javascript/mastodon/locales/lad.json +++ b/app/javascript/mastodon/locales/lad.json @@ -108,10 +108,8 @@ "audio.hide": "Eskonde audio", "block_modal.show_less": "Amostra manko", "block_modal.show_more": "Amostra mas", - "block_modal.they_cant_mention": "No te puede enmentar ni segir.", "block_modal.they_will_know": "Puede ver ke esta blokado.", "block_modal.title": "Bloka utilizador?", - "block_modal.you_wont_see_mentions": "No veras publikasyones ke lo enmentan.", "boost_modal.combo": "Puedes klikar {combo} para ometer esto la proksima vez", "boost_modal.reblog": "Repartajar puvlikasyon?", "boost_modal.undo_reblog": "Departajar puvlikasyon?", diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json index 6cd6c55f1d..e9f49ef603 100644 --- a/app/javascript/mastodon/locales/lt.json +++ b/app/javascript/mastodon/locales/lt.json @@ -151,11 +151,8 @@ "block_modal.remote_users_caveat": "Paprašysime serverio {domain} gerbti tavo sprendimą. Tačiau atitiktis negarantuojama, nes kai kurie serveriai gali skirtingai tvarkyti blokavimus. Vieši įrašai vis tiek gali būti matomi neprisijungusiems naudotojams.", "block_modal.show_less": "Rodyti mažiau", "block_modal.show_more": "Rodyti daugiau", - "block_modal.they_cant_mention": "Jie negali tau parašyti ar sekti.", - "block_modal.they_cant_see_posts": "Jie negali matyti tavo įrašus, o tu nematysi jų.", "block_modal.they_will_know": "Jie gali matyti, kad yra užblokuoti.", "block_modal.title": "Blokuoti naudotoją?", - "block_modal.you_wont_see_mentions": "Nematysi įrašus, kuriuose jie paminimi.", "boost_modal.combo": "Galima paspausti {combo}, kad praleisti tai kitą kartą", "boost_modal.reblog": "Pasidalinti įrašą?", "boost_modal.undo_reblog": "Nebepasidalinti įrašo?", diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json index da87d2d9f5..094d293d99 100644 --- a/app/javascript/mastodon/locales/lv.json +++ b/app/javascript/mastodon/locales/lv.json @@ -179,11 +179,8 @@ "block_modal.remote_users_caveat": "Mēs lūgsim serverim {domain} ņemt vērā Tavu lēmumu. Tomēr sadarbība nav garantēta, jo atsevišķi serveri bloķēšanu var apstrādāt citādi. Publiski ieraksti, iespējams, joprojām būs redzami lietotājiem, kuri nav pieteikušies.", "block_modal.show_less": "Rādīt mazāk", "block_modal.show_more": "Rādīt vairāk", - "block_modal.they_cant_mention": "Lietotājs nevarēs Tevi pieminēt vai Tev sekot.", - "block_modal.they_cant_see_posts": "Lietotājs nevarēs redzēt Tavus, un Tu neredzēsi lietotāja ierakstus.", "block_modal.they_will_know": "Lietotājs varēs redzēt, ka ir bloķēts.", "block_modal.title": "Bloķēt lietotāju?", - "block_modal.you_wont_see_mentions": "Tu neredzēsi ierakstus, kuros ir minēts šis lietotājs.", "boost_modal.combo": "Nospied {combo}, lai nākamreiz šo izlaistu", "boost_modal.reblog": "Pastiprināt ierakstu?", "boost_modal.undo_reblog": "Atcelt ieraksta pastiprināšanu?", diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json index d984de72cc..cd34511c1a 100644 --- a/app/javascript/mastodon/locales/ms.json +++ b/app/javascript/mastodon/locales/ms.json @@ -102,11 +102,8 @@ "block_modal.remote_users_caveat": "Kami akan meminta pelayan {domain} untuk menghormati keputusan anda. Bagaimanapun, pematuhan tidak dijamin kerana ada pelayan yang mungkin menangani sekatan dengan cara berbeza. Hantaran awam mungkin masih tampak kepada pengguna yang tidak log masuk.", "block_modal.show_less": "Tunjuk kurang", "block_modal.show_more": "Tunjuk lebih", - "block_modal.they_cant_mention": "Dia tidak boleh menyebut tentang anda atau mengikut anda.", - "block_modal.they_cant_see_posts": "Dia tidak boleh melihat hantaran anda dan sebaliknya.", "block_modal.they_will_know": "Dia boleh lihat bahawa dia disekat.", "block_modal.title": "Sekat pengguna?", - "block_modal.you_wont_see_mentions": "Anda tidak akan melihat hantaran yang menyebut tentangnya.", "boost_modal.combo": "Anda boleh tekan {combo} untuk melangkauinya pada waktu lain", "boost_modal.reblog": "Galakkan hantaran?", "boost_modal.undo_reblog": "Nyahgalakkan hantaran?", diff --git a/app/javascript/mastodon/locales/nan-TW.json b/app/javascript/mastodon/locales/nan-TW.json index fe74b24abd..fc3de78cc4 100644 --- a/app/javascript/mastodon/locales/nan-TW.json +++ b/app/javascript/mastodon/locales/nan-TW.json @@ -331,11 +331,8 @@ "block_modal.remote_users_caveat": "Guán ē要求服侍器 {domain} 尊重lí ê決定。但是bô法度保證ta̍k ê服侍器lóng遵守，因為tsi̍t-kuá服侍器huân-sè用別款方法處理封鎖。公開ê PO文可能iáu是ē hōo bô登入ê用者看著。", "block_modal.show_less": "看khah少", "block_modal.show_more": "顯示其他ê內容", - "block_modal.they_cant_mention": "In buē-tàng 提起á是跟tuè lí。", - "block_modal.they_cant_see_posts": "Lín buē-tàng互相看著對方ê PO文。", "block_modal.they_will_know": "In通看見in hőng封鎖。", "block_modal.title": "Kám beh封鎖用者？", - "block_modal.you_wont_see_mentions": "Lí buē看見提起in ê PO文。", "boost_modal.combo": "後擺lí thang tshi̍h {combo} 跳過", "boost_modal.reblog": "Kám beh轉PO？", "boost_modal.undo_reblog": "Kám beh取消轉PO？", diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json index 9ab7a53658..7d4788dbcf 100644 --- a/app/javascript/mastodon/locales/ne.json +++ b/app/javascript/mastodon/locales/ne.json @@ -75,10 +75,8 @@ "block_modal.remote_users_caveat": "हामी सर्भर {domain} लाई तपाईंको निर्णयको सम्मान गर्न सोध्नेछौं। तर, हामी अनुपालनको ग्यारेन्टी दिन सक्दैनौं किनभने केही सर्भरहरूले ब्लकहरू फरक रूपमा ह्यान्डल गर्न सक्छन्। सार्वजनिक पोस्टहरू लग इन नभएका प्रयोगकर्ताहरूले देख्न सक्छन्।", "block_modal.show_less": "कम देखाउनुहोस्", "block_modal.show_more": "थप देखाउनुहोस्", - "block_modal.they_cant_mention": "तिनीहरूले तपाईंलाई उल्लेख गर्न वा फलो गर्न सक्दैनन्।", "block_modal.they_will_know": "उनीहरूले उनीहरू ब्लक गरिएको देख्न सक्छन्।", "block_modal.title": "प्रयोगकर्तालाई ब्लक गर्ने?", - "block_modal.you_wont_see_mentions": "तपाईंले तिनीहरूलाई उल्लेख गरिएका पोस्टहरू देख्नुहुने छैन।", "boost_modal.reblog": "पोस्ट बुस्ट गर्ने?", "boost_modal.undo_reblog": "पोस्ट अनबुस्ट गर्ने?", "bundle_column_error.copy_stacktrace": "त्रुटि रिपोर्ट प्रतिलिपि गर्नुहोस्", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index 819433d12f..5d363fc197 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -223,6 +223,8 @@ "account_edit.profile_tab.show_media.title": "Tabblad 'Media' tonen", "account_edit.profile_tab.show_media_replies.description": "Wanneer dit is ingeschakeld, worden op het tabblad Media zowel jouw berichten en reacties op berichten van anderen weergegeven.", "account_edit.profile_tab.show_media_replies.title": "Jouw reacties aan het tabblad 'Media' toevoegen", + "account_edit.profile_tab.show_relations.title": "‘Volgers’ en ‘Gevolgde accounts’ tonen", + "account_edit.profile_tab.title": "Weergave-instellingen profiel", "account_edit.save": "Opslaan", "account_edit.upload_modal.back": "Terug", "account_edit.upload_modal.done": "Klaar", @@ -325,11 +327,8 @@ "block_modal.remote_users_caveat": "We vragen de server {domain} om je besluit te respecteren. Het naleven hiervan is echter niet gegarandeerd, omdat sommige servers blokkades anders kunnen interpreteren. Openbare berichten zijn mogelijk nog steeds zichtbaar voor niet-ingelogde gebruikers.", "block_modal.show_less": "Minder tonen", "block_modal.show_more": "Meer tonen", - "block_modal.they_cant_mention": "De persoon kan jou niet vermelden of volgen.", - "block_modal.they_cant_see_posts": "De persoon kan jouw berichten niet zien en jij ook niet diens berichten.", "block_modal.they_will_know": "De persoon kan zien dat die wordt geblokkeerd.", "block_modal.title": "Gebruiker blokkeren?", - "block_modal.you_wont_see_mentions": "Je ziet geen berichten meer die dit account vermelden.", "boost_modal.combo": "Je kunt {combo} klikken om dit de volgende keer over te slaan", "boost_modal.reblog": "Bericht boosten?", "boost_modal.undo_reblog": "Bericht niet langer boosten?", @@ -749,7 +748,7 @@ "hashtag.column_settings.tag_mode.all": "Allemaal", "hashtag.column_settings.tag_mode.any": "Een van deze", "hashtag.column_settings.tag_mode.none": "Geen van deze", - "hashtag.column_settings.tag_toggle": "Additionele tags aan deze kolom toevoegen", + "hashtag.column_settings.tag_toggle": "Extra tags aan deze kolom toevoegen", "hashtag.counter_by_accounts": "{count, plural, one {{counter} deelnemer} other {{counter} deelnemers}}", "hashtag.counter_by_uses": "{count, plural, one {{counter} bericht} other {{counter} berichten}}", "hashtag.counter_by_uses_today": "{count, plural, one {{counter} bericht} other {{counter} berichten}} vandaag", @@ -1128,7 +1127,7 @@ "report.mute": "Negeren", "report.mute_explanation": "Je kunt diens berichten niet zien. Je kunt nog wel gevolgd worden en jouw berichten zijn nog zichtbaar, maar diegene kan niet zien dat die wordt genegeerd.", "report.next": "Volgende", - "report.placeholder": "Extra opmerkingen", + "report.placeholder": "Aanvullende opmerkingen", "report.reasons.dislike": "Ik vind het niet leuk", "report.reasons.dislike_description": "Het is iets wat je niet wilt zien", "report.reasons.legal": "Het is wettelijk niet toegestaan", diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json index 3fbc7621eb..9a81ab554a 100644 --- a/app/javascript/mastodon/locales/nn.json +++ b/app/javascript/mastodon/locales/nn.json @@ -313,11 +313,8 @@ "block_modal.remote_users_caveat": "Me vil be tenaren {domain} om å respektera di avgjerd. Me kan ikkje garantera at det vert gjort, sidan nokre tenarar kan handtera blokkering ulikt. Offentlege innlegg kan framleis vera synlege for ikkje-innlogga brukarar.", "block_modal.show_less": "Vis mindre", "block_modal.show_more": "Vis meir", - "block_modal.they_cant_mention": "Dei kan ikkje nemna eller fylgja deg.", - "block_modal.they_cant_see_posts": "Dei kan ikkje sjå innlegga dine, og du vil ikkje sjå deira.", "block_modal.they_will_know": "Dei kan sjå at dei er blokkerte.", "block_modal.title": "Blokker brukaren?", - "block_modal.you_wont_see_mentions": "Du ser ikkje innlegg som nemner dei.", "boost_modal.combo": "Du kan trykkja {combo} for å hoppa over dette neste gong", "boost_modal.reblog": "Framhev innlegget?", "boost_modal.undo_reblog": "Fjern framhevinga?", diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json index 47ffd1bd92..9ca73413d0 100644 --- a/app/javascript/mastodon/locales/no.json +++ b/app/javascript/mastodon/locales/no.json @@ -177,11 +177,8 @@ "block_modal.remote_users_caveat": "Vi vil be serveren {domain} om å respektere din beslutning. Det er imidlertid ingen garanti at det blir overholdt, siden noen servere kan håndtere blokkeringer på forskjellig vis. Offentlige innlegg kan fortsatt være synlige for ikke-innloggede brukere.", "block_modal.show_less": "Vis mindre", "block_modal.show_more": "Vis mer", - "block_modal.they_cant_mention": "De kan ikke nevne eller følge deg.", - "block_modal.they_cant_see_posts": "De kan ikke se dine innlegg og du kommer ikke til å se deres.", "block_modal.they_will_know": "De kan se at de er blitt blokkert.", "block_modal.title": "Blokker bruker?", - "block_modal.you_wont_see_mentions": "Du kommer ikke til å se innlegg som nevner dem.", "boost_modal.combo": "You kan trykke {combo} for å hoppe over dette neste gang", "boost_modal.reblog": "Fremhev innlegg?", "boost_modal.undo_reblog": "Fjern fremheving?", diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index 803cb5ecb3..4705cd2600 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -237,11 +237,8 @@ "block_modal.remote_users_caveat": "Poprosimy serwer {domain} o uszanowanie twojej decyzji. Nie jest to jednak gwarantowane, bo niektóre serwery mogą obsługiwać blokady w inny sposób. Publiczne wpisy mogą być nadal widoczne dla niezalogowanych użytkowników.", "block_modal.show_less": "Pokaż mniej", "block_modal.show_more": "Pokaż więcej", - "block_modal.they_cant_mention": "Nie może cię wzmiankować ani obserwować.", - "block_modal.they_cant_see_posts": "Nie zobaczycie wzajemnie swoich wpisów.", "block_modal.they_will_know": "Zobaczy informację o blokadzie.", "block_modal.title": "Zablokować?", - "block_modal.you_wont_see_mentions": "Nie zobaczysz wpisów, które zawierają wzmianki o tej osobie.", "boost_modal.combo": "Możesz kliknąć {combo}, aby pominąć tę czynność następnym razem", "boost_modal.reblog": "Podbić wpis?", "boost_modal.undo_reblog": "Cofnąć podbicie?", diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index 47a9325ba0..99638fe17a 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -331,11 +331,8 @@ "block_modal.remote_users_caveat": "Pediremos ao servidor {domain} que respeite sua decisão. No entanto, a conformidade não é garantida, já que alguns servidores podem lidar com bloqueios de maneira diferente. As publicações abertas ainda podem estar visíveis para usuários não logados.", "block_modal.show_less": "Mostrar menos", "block_modal.show_more": "Mostrar mais", - "block_modal.they_cant_mention": "Não poderá mencionar ou seguir você.", - "block_modal.they_cant_see_posts": "Não poderá ver suas publicações e você não verá as dele/a.", "block_modal.they_will_know": "Poderá ver que você bloqueou.", "block_modal.title": "Bloquear usuário?", - "block_modal.you_wont_see_mentions": "Você não verá publicações que mencionem este usuário.", "boost_modal.combo": "Pressione {combo} para pular isto na próxima vez", "boost_modal.reblog": "Impulsionar a publicação?", "boost_modal.undo_reblog": "Retirar o impulso da publicação?", diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json index e361651c02..cfd304599e 100644 --- a/app/javascript/mastodon/locales/pt-PT.json +++ b/app/javascript/mastodon/locales/pt-PT.json @@ -314,11 +314,8 @@ "block_modal.remote_users_caveat": "Solicitaremos ao servidor {domain} que respeite a sua decisão. No entanto, o cumprimento não é garantido, sendo que alguns servidores podem gerir bloqueios de forma diferente. As publicações públicas podem continuar visíveis para utilizadores não autenticados.", "block_modal.show_less": "Mostrar menos", "block_modal.show_more": "Mostrar mais", - "block_modal.they_cant_mention": "Ele não o pode mencionar nem seguir.", - "block_modal.they_cant_see_posts": "Eles não podem ver as suas publicações e você não verá as deles.", "block_modal.they_will_know": "Ele pode ver que o bloqueaste.", "block_modal.title": "Bloquear utilizador?", - "block_modal.you_wont_see_mentions": "Não verás publicações que mencionem este utilizador.", "boost_modal.combo": "Pode clicar em {combo} para não voltar a ver isto", "boost_modal.reblog": "Partilhar a publicação?", "boost_modal.undo_reblog": "Deixar de partilhar a publicação?", diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json index 28cefe2e04..4b8c14d28c 100644 --- a/app/javascript/mastodon/locales/ru.json +++ b/app/javascript/mastodon/locales/ru.json @@ -287,11 +287,8 @@ "block_modal.remote_users_caveat": "Мы попросим сервер {domain} уважать ваше решение, однако нельзя гарантировать, что он будет соблюдать блокировку, поскольку некоторые серверы могут по-разному обрабатывать запросы. Публичные посты по-прежнему могут быть видны неавторизованным пользователям.", "block_modal.show_less": "Показать меньше", "block_modal.show_more": "Показать больше", - "block_modal.they_cant_mention": "Он не сможет ни упоминать вас, ни подписаться на вас.", - "block_modal.they_cant_see_posts": "Он не сможет видеть ваши посты, а вы не будете видеть его посты.", "block_modal.they_will_know": "Он будет знать, что вы его блокируете.", "block_modal.title": "Заблокировать пользователя?", - "block_modal.you_wont_see_mentions": "Вы не увидите посты, которые его упоминают.", "boost_modal.combo": "{combo}, чтобы пропустить это в следующий раз", "boost_modal.reblog": "Продвинуть пост?", "boost_modal.undo_reblog": "Отменить продвижение?", diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json index dbaf6f7136..f608f0039c 100644 --- a/app/javascript/mastodon/locales/ry.json +++ b/app/javascript/mastodon/locales/ry.json @@ -76,11 +76,8 @@ "block_modal.remote_users_caveat": "Попросиме ґазду сервера {domain} честовати вашоє рішеня. Айбо не ґарантуєме повный соглас, бо даякі серверы можут брати блокованя по-инчакому. Публичні дописы годно быти видко незалоґованым хосновачам.", "block_modal.show_less": "Указати менше", "block_modal.show_more": "Указати бульше", - "block_modal.they_cant_mention": "Они не можут вас споминати авадь слідовати.", - "block_modal.they_cant_see_posts": "Они не можут видіти ваші публикації, тай наспак — вы йихні.", "block_modal.they_will_know": "Они видят, ож сут заблоковані.", "block_modal.title": "Заблоковати хосновача?", - "block_modal.you_wont_see_mentions": "Не будете видіти публикації тай споминкы сього хосновача.", "boost_modal.combo": "Можете клынцнути {combo} другый раз обы сесе пропустити", "bundle_column_error.copy_stacktrace": "Укопіровати звіт за хыбу", "bundle_column_error.error.body": "Не годни сьме указати зажадану сторунку. Годно быти спозад хыбы у нашум сістемі, авадь проблемы зумісности бравзера.", diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json index 5bbeef42c2..2cc4cb3818 100644 --- a/app/javascript/mastodon/locales/sc.json +++ b/app/javascript/mastodon/locales/sc.json @@ -105,11 +105,8 @@ "block_modal.remote_users_caveat": "Amus a pedire a su serbidore {domain} de rispetare sa detzisione tua. Nointames custu, su rispetu no est garantidu ca unos cantos serbidores diant pòdere gestire is blocos de manera diferente. Is publicatzione pùblicas diant pòdere ancora èssere visìbiles a is utentes chi no ant fatu s'atzessu.", "block_modal.show_less": "Ammustra·nde prus pagu", "block_modal.show_more": "Ammustra·nde prus", - "block_modal.they_cant_mention": "Non ti podent mentovare nen sighire.", - "block_modal.they_cant_see_posts": "Non podent bìdere is publicatziones tuas e tue non podes bìdere cussas issoro.", "block_modal.they_will_know": "Non podent bìdere chi ddos as blocadu.", "block_modal.title": "Boles blocare s'utente?", - "block_modal.you_wont_see_mentions": "No as a bìdere is publicatziones chi mèntovent custa persone.", "boost_modal.combo": "Podes incarcare {combo} pro brincare custu sa borta chi benit", "boost_modal.reblog": "Boles potentziare sa publicatzione?", "boost_modal.undo_reblog": "Boles tzessare de potentziare sa publicatzione?", diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json index 73fd821101..ceda9cbd58 100644 --- a/app/javascript/mastodon/locales/sco.json +++ b/app/javascript/mastodon/locales/sco.json @@ -64,8 +64,6 @@ "attachments_list.unprocessed": "(No processed)", "audio.hide": "Stow audio", "block_modal.remote_users_caveat": "We will ask the server {domain} tae respect yer decision. Awtho mind compliance isnae a guarantee, sin some servers may haundle blocks differently. Public posts may yet be visible tae non-loggit-in uisers.", - "block_modal.they_cant_mention": "Thay cannae mention or follae you.", - "block_modal.they_cant_see_posts": "Thay cannae see yer posts and you willnae see thairs.", "block_modal.they_will_know": "Thay can see that they're blockit.", "block_modal.title": "Block uiser?", "boost_modal.combo": "Ye kin chap {combo} tae dingie this neist tim", diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json index d0fd49ad7f..3e39a942e2 100644 --- a/app/javascript/mastodon/locales/si.json +++ b/app/javascript/mastodon/locales/si.json @@ -107,11 +107,8 @@ "block_modal.remote_users_caveat": "ඔබගේ තීරණයට ගරු කරන ලෙස අපි සේවාදායකයාගෙන් {domain} ඉල්ලා සිටිමු. කෙසේ වෙතත්, සමහර සේවාදායකයන් අවහිර කිරීම් වෙනස් ලෙස හසුරුවන බැවින් අනුකූලතාව සහතික නොවේ. පොදු පළ කිරීම් තවමත් ලොග් වී නොමැති පරිශීලකයින්ට දෘශ්‍යමාන විය හැකිය.", "block_modal.show_less": "අඩුවෙන් පෙන්වන්න", "block_modal.show_more": "තව පෙන්වන්න", - "block_modal.they_cant_mention": "ඔවුන්ට ඔබව සඳහන් කිරීමට හෝ අනුගමනය කිරීමට නොහැකිය.", - "block_modal.they_cant_see_posts": "ඔවුන්ට ඔබේ සටහන් දැකිය නොහැකි අතර ඔබට ඔවුන්ගේ සටහන් නොපෙනේ.", "block_modal.they_will_know": "අවහිර කළ බව දකිනු ඇත.", "block_modal.title": "අවහිර කරන්නද?", - "block_modal.you_wont_see_mentions": "ඒවා සඳහන් කරන සටහන් ඔබට නොපෙනේ.", "boost_modal.combo": "ඊළඟ වතාවේ මෙය මඟ හැරීමට {combo} එබීමට හැකිය", "boost_modal.reblog": "පළ කිරීම වැඩි කරන්නද?", "boost_modal.undo_reblog": "පළ කිරීම බූස්ට් නොකරන්නද?", diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index 05ac8dbac6..ccce04abd7 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -122,11 +122,8 @@ "block_modal.remote_users_caveat": "Požiadame server {domain} o rešpektovanie vášho rozhodnutia. Nevieme to však zaručiť, keďže niektoré servery pristupujú k blokovaniu inak. Verejné príspevky sa stále môžu zobrazovať neprihláseným ľuďom.", "block_modal.show_less": "Zobraziť menej", "block_modal.show_more": "Zobraziť viac", - "block_modal.they_cant_mention": "Nemôžu ťa spomenúť, alebo nasledovať.", - "block_modal.they_cant_see_posts": "On/a nemôže vidieť tvoje príspevky a ty neuvidíš jej/ho.", "block_modal.they_will_know": "Môžu vidieť, že sú zablokovaní/ý.", "block_modal.title": "Blokovať užívateľa?", - "block_modal.you_wont_see_mentions": "Neuvidíš príspevky, ktoré ich spomínajú.", "boost_modal.combo": "Nabudúce môžete preskočiť stlačením {combo}", "boost_modal.reblog": "Zdieľať príspevok?", "boost_modal.undo_reblog": "Zrušiť zdieľanie?", diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json index 3157b06a33..636b276996 100644 --- a/app/javascript/mastodon/locales/sl.json +++ b/app/javascript/mastodon/locales/sl.json @@ -131,11 +131,8 @@ "block_modal.remote_users_caveat": "Strežnik {domain} bomo pozvali, naj spoštuje vašo odločitev. Kljub temu pa ni gotovo, da bo strežnik prošnjo upošteval, saj nekateri strežniki blokiranja obravnavajo drugače. Javne objave bodo morda še vedno vidne neprijavljenim uporabnikom.", "block_modal.show_less": "Pokaži manj", "block_modal.show_more": "Pokaži več", - "block_modal.they_cant_mention": "Ne more vas omenjati ali vam slediti.", - "block_modal.they_cant_see_posts": "Ne vidi vaših objav, vi pa ne njegovih.", "block_modal.they_will_know": "Ne more videti, da je blokiran.", "block_modal.title": "Blokiram uporabnika?", - "block_modal.you_wont_see_mentions": "Objav, ki ga omenjajo, ne boste videli.", "boost_modal.combo": "Če želite naslednjič to preskočiti, lahko pritisnete {combo}", "boost_modal.reblog": "Izpostavim objavo?", "boost_modal.undo_reblog": "Ali želite preklicati izpostavitev objave?", diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json index 108f59ac11..cc993ce578 100644 --- a/app/javascript/mastodon/locales/sq.json +++ b/app/javascript/mastodon/locales/sq.json @@ -327,11 +327,8 @@ "block_modal.remote_users_caveat": "Do t’i kërkojmë shërbyesit {domain} të respektojë vendimin tuaj. Por, pajtimi s’është i garantuar, ngaqë disa shërbyes mund t’i trajtojnë ndryshe bllokimet. Psotimet publike mundet të jenë ende të dukshme për përdorues pa bërë hyrje në llogari.", "block_modal.show_less": "Shfaq më pak", "block_modal.show_more": "Shfaq më tepër", - "block_modal.they_cant_mention": "S’mund t’u përmendin, ose t’ju ndjekin.", - "block_modal.they_cant_see_posts": "S’mund të shohin postimet tuaja dhe as ju të tyret.", "block_modal.they_will_know": "Mund të shohin se janë bllokuar.", "block_modal.title": "Të bllokohet përdoruesi?", - "block_modal.you_wont_see_mentions": "S’do të shihni postimet ku përmenden.", "boost_modal.combo": "Që kjo të anashkalohet herës tjetër, mund të shtypni {combo}", "boost_modal.reblog": "Përforcim postimi?", "boost_modal.undo_reblog": "Të hiqet përforcim për postimin?", diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json index 2b517b4209..3561d76127 100644 --- a/app/javascript/mastodon/locales/sr-Latn.json +++ b/app/javascript/mastodon/locales/sr-Latn.json @@ -106,11 +106,8 @@ "block_modal.remote_users_caveat": "Zamolićemo server {domain} da poštuje vašu odluku. Međutim, usklađenost nije zagarantovana jer neki serveri mogu drugačije da obrađuju blokove. Javne objave mogu i dalje biti vidljive korisnicima koji nisu prijavljeni.", "block_modal.show_less": "Prikaži manje", "block_modal.show_more": "Prikaži više", - "block_modal.they_cant_mention": "Ne mogu da vas pominju ili prate.", - "block_modal.they_cant_see_posts": "Ne mogu da vide vaše objave, a vi nećete videti njihove.", "block_modal.they_will_know": "Mogu da vide da su blokirani.", "block_modal.title": "Blokirati korisnika?", - "block_modal.you_wont_see_mentions": "Nećete videti objave koje ih pominju.", "boost_modal.combo": "Možete pritisnuti {combo} da preskočite ovo sledeći put", "bundle_column_error.copy_stacktrace": "Kopiraj izveštaj o grešci", "bundle_column_error.error.body": "Nije moguće prikazati traženu stranicu. Razlog može biti greška u našem kodu ili problem sa kompatibilnošću pretraživača.", diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json index ee12b86e13..0e8c16933c 100644 --- a/app/javascript/mastodon/locales/sr.json +++ b/app/javascript/mastodon/locales/sr.json @@ -83,11 +83,8 @@ "block_modal.remote_users_caveat": "Замолићемо сервер {domain} да поштује вашу одлуку. Међутим, усклађеност није загарантована јер неки сервери могу другачије да обрађују блокове. Јавне објаве могу и даље бити видљиве корисницима који нису пријављени.", "block_modal.show_less": "Прикажи мање", "block_modal.show_more": "Прикажи више", - "block_modal.they_cant_mention": "Не могу да вас помињу или прате.", - "block_modal.they_cant_see_posts": "Не могу да виде ваше објаве, а ви нећете видети њихове.", "block_modal.they_will_know": "Могу да виде да су блокирани.", "block_modal.title": "Блокирати корисника?", - "block_modal.you_wont_see_mentions": "Нећете видети објаве које их помињу.", "boost_modal.combo": "Можете притиснути {combo} да прескочите ово следећи пут", "bundle_column_error.copy_stacktrace": "Копирај извештај о грешци", "bundle_column_error.error.body": "Није могуће приказати тражену страницу. Разлог може бити грешка у нашем коду или проблем са компатибилношћу претраживача.", diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json index 8f9fa4ce13..ec504852ae 100644 --- a/app/javascript/mastodon/locales/sv.json +++ b/app/javascript/mastodon/locales/sv.json @@ -324,11 +324,8 @@ "block_modal.remote_users_caveat": "Vi kommer att be servern {domain} att respektera ditt beslut. Dock garanteras inte efterlevnad eftersom vissa servrar kan hantera blockeringar på olika sätt. Offentliga inlägg kan fortfarande vara synliga för icke-inloggade användare.", "block_modal.show_less": "Visa mindre", "block_modal.show_more": "Visa mer", - "block_modal.they_cant_mention": "De kan inte nämna eller följa dig.", - "block_modal.they_cant_see_posts": "De kan inte se dina inlägg och du kan inte se deras.", "block_modal.they_will_know": "De kan se att de är blockerade.", "block_modal.title": "Blockera användare?", - "block_modal.you_wont_see_mentions": "Du kommer inte att se inlägg som nämner dem.", "boost_modal.combo": "Du kan trycka på {combo} för att hoppa över detta nästa gång", "boost_modal.reblog": "Boosta inlägg?", "boost_modal.undo_reblog": "Avboosta inlägg?", diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json index fcfa54e5ef..9b4ffa3e40 100644 --- a/app/javascript/mastodon/locales/th.json +++ b/app/javascript/mastodon/locales/th.json @@ -123,11 +123,8 @@ "block_modal.remote_users_caveat": "เราจะขอให้เซิร์ฟเวอร์ {domain} เคารพการตัดสินใจของคุณ อย่างไรก็ตาม ไม่รับประกันการปฏิบัติตามข้อกำหนดเนื่องจากเซิร์ฟเวอร์บางแห่งอาจจัดการการปิดกั้นแตกต่างกัน โพสต์สาธารณะอาจยังคงปรากฏแก่ผู้ใช้ที่ไม่ได้เข้าสู่ระบบ", "block_modal.show_less": "แสดงน้อยลง", "block_modal.show_more": "แสดงเพิ่มเติม", - "block_modal.they_cant_mention": "เขาไม่สามารถกล่าวถึงหรือติดตามคุณ", - "block_modal.they_cant_see_posts": "เขาไม่สามารถเห็นโพสต์ของคุณและคุณจะไม่เห็นโพสต์ของเขา", "block_modal.they_will_know": "เขาสามารถเห็นว่ามีการปิดกั้นเขา", "block_modal.title": "ปิดกั้นผู้ใช้?", - "block_modal.you_wont_see_mentions": "คุณจะไม่เห็นโพสต์ที่กล่าวถึงเขา", "boost_modal.combo": "คุณสามารถกดปุ่ม {combo} เพื่อข้ามสิ่งนี้ในครั้งถัดไป", "boost_modal.reblog": "ดันโพสต์?", "boost_modal.undo_reblog": "เลิกดันโพสต์?", diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json index 09edda7fac..a90f410272 100644 --- a/app/javascript/mastodon/locales/tok.json +++ b/app/javascript/mastodon/locales/tok.json @@ -114,11 +114,8 @@ "block_modal.remote_users_caveat": "mi pana e wile sina tawa ma {domain}. taso ma li ken kepeken nasin ante la pakala li ken. jan li awen ken lukin e toki kepeken sijelo ala.", "block_modal.show_less": "o lili e toki", "block_modal.show_more": "o suli e toki", - "block_modal.they_cant_mention": "ona li ken ala toki tawa sina li ken ala kute e sina.", - "block_modal.they_cant_see_posts": "ona li ken ala lukin e toki sina. sina ken ala lukin e toki ona.", "block_modal.they_will_know": "ona li ken sona e ni: sina len e ona.", "block_modal.title": "o len ala len e jan?", - "block_modal.you_wont_see_mentions": "jan li toki e nimi ona la sina lukin ala e toki ni.", "boost_modal.combo": "sina ken luka e nena {combo} tawa ni: sina wile ala luka e nena lon tenpo kama", "boost_modal.reblog": "o pana ala pana sin e toki?", "boost_modal.undo_reblog": "o weka ala weka e pana toki?", diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json index 889618412a..e3445e75bb 100644 --- a/app/javascript/mastodon/locales/tr.json +++ b/app/javascript/mastodon/locales/tr.json @@ -113,6 +113,7 @@ "account.name.copy": "İsmi Kopyala", "account.name.help.domain": "{domain} kullanıcının profilini ve gönderilerini barındıran sunucudur.", "account.name.help.domain_self": "{domain} profilinizi ve gönderilerinizi barındıran sunucunuzdur.", + "account.name.help.footer": "Tıpkı farklı e-posta sağlayıcılarını kullanan kişilere e-posta gönderebileceğiniz gibi, diğer Mastodon sunucularındaki kullanıcılarla ve diğer Fediverse uygulamalarındaki herkesle etkileşim kurabilirsiniz.", "account.name.help.header": "Takma ad bir e-posta adresi gibidir", "account.name.help.username": "{username} bu hesabın sunucudaki kullanıcı adıdır. Başka bir sunucudaki başka bir kişi de aynı kullanıcı adına sahip olabilir.", "account.name.help.username_self": "{username} bu sunucudaki kullanıcı adınızdır. Başka bir sunucudaki başka bir kullanıcı da aynı kullanıcı adına sahip olabilir.", @@ -325,11 +326,8 @@ "block_modal.remote_users_caveat": "{domain} sunucusundan kararınıza saygı duymasını isteyeceğiz. Ancak, Uymaları garanti değildir çünkü bazı sunucular engellemeyi farklı şekilde yapıyorlar. Herkese açık gönderiler giriş yapmamış kullanıcılara görüntülenmeye devam edebilir.", "block_modal.show_less": "Daha az göster", "block_modal.show_more": "Daha fazla göster", - "block_modal.they_cant_mention": "Size değinemez veya sizi takip edemezler.", - "block_modal.they_cant_see_posts": "Onlar sizin gönderilerinizi görmeye devam edebilir, ancak siz onlarınkini göremezsiniz.", "block_modal.they_will_know": "Engellendiklerini görebiliyorlar.", "block_modal.title": "Kullanıcıyı engelle?", - "block_modal.you_wont_see_mentions": "Onlara değinen gönderileri göremezsiniz.", "boost_modal.combo": "Bir daha ki sefere {combo} tuşuna basabilirsin", "boost_modal.reblog": "Gönderiyi yeniden paylaş?", "boost_modal.undo_reblog": "Gönderinin yeniden paylaşımını geri al?", diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json index 88f09f9b0e..7a6d6dd60e 100644 --- a/app/javascript/mastodon/locales/uk.json +++ b/app/javascript/mastodon/locales/uk.json @@ -163,11 +163,8 @@ "block_modal.remote_users_caveat": "Ми попросимо сервер {domain} поважати ваше рішення. Однак дотримання вимог не гарантується, оскільки деякі сервери можуть обробляти блоки по-різному. Загальнодоступні дописи все ще можуть бути видимими для користувачів, які не увійшли в систему.", "block_modal.show_less": "Згорнути", "block_modal.show_more": "Розгорнути", - "block_modal.they_cant_mention": "Вони не можуть згадувати та стежити за вами.", - "block_modal.they_cant_see_posts": "Вони не можуть бачити ваших дописів, а ви бачитимете їхні.", "block_modal.they_will_know": "Вони можуть бачити, що вони заблоковані.", "block_modal.title": "Заблокувати користувача?", - "block_modal.you_wont_see_mentions": "Ви не бачитимете дописів, де їх згадано.", "boost_modal.combo": "Ви можете натиснути {combo}, щоби пропустити це наступного разу", "boost_modal.reblog": "Поширити допис?", "boost_modal.undo_reblog": "Скасувати поширення?", diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json index 4f32b1b533..c72ad4ccf4 100644 --- a/app/javascript/mastodon/locales/vi.json +++ b/app/javascript/mastodon/locales/vi.json @@ -331,11 +331,8 @@ "block_modal.remote_users_caveat": "Chúng tôi sẽ yêu cầu {domain} tôn trọng quyết định của bạn. Tuy nhiên, việc tuân thủ không được đảm bảo vì một số máy chủ có thể xử lý việc chặn theo cách khác nhau. Các tút công khai vẫn có thể hiển thị đối với người dùng chưa đăng nhập.", "block_modal.show_less": "Thu gọn", "block_modal.show_more": "Hiện thêm", - "block_modal.they_cant_mention": "Họ không thể theo dõi & nhắc đến bạn.", - "block_modal.they_cant_see_posts": "Cả hai không còn nhìn thấy tút của nhau.", "block_modal.they_will_know": "Họ sẽ biết đã bị bạn chặn.", "block_modal.title": "Chặn tài khoản này?", - "block_modal.you_wont_see_mentions": "Bạn không còn thấy tút có nhắc đến họ.", "boost_modal.combo": "Nhấn {combo} để bỏ qua bước này", "boost_modal.reblog": "Đăng lại?", "boost_modal.undo_reblog": "Bỏ đăng lại?", diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index e8d207b37b..f5c6b9aaaf 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -328,14 +328,15 @@ "annual_report.summary.share_on_mastodon": "在Mastodon上分享", "attachments_list.unprocessed": "(未处理)", "audio.hide": "隐藏音频", + "block_modal.no_collections": "你们双方都无法将对方加入收藏列表。若适用，你们将会自动从彼此现有的收藏列表中移除。", "block_modal.remote_users_caveat": "我们将要求站点 {domain} 尊重你的决定。然而，我们无法保证对方一定遵从，因为某些站点可能会以不同的方案处理屏蔽操作。公开嘟文仍然可能对未登录用户可见。", "block_modal.show_less": "折叠", "block_modal.show_more": "显示更多", - "block_modal.they_cant_mention": "他们不能提及或关注你。", - "block_modal.they_cant_see_posts": "他们看不到你的嘟文，你也看不到他们的嘟文。", + "block_modal.they_cant_mention": "你将无法提及、关注、引用彼此。", + "block_modal.they_cant_see_posts": "他们看不到你发布的内容，你也看不到他们的。", "block_modal.they_will_know": "对方将能看到自己被屏蔽。", "block_modal.title": "确定要屏蔽此用户？", - "block_modal.you_wont_see_mentions": "你将不会看到提及他们的嘟文。", + "block_modal.you_wont_see_mentions": "你将不会看到其他人提及对方的嘟文。", "boost_modal.combo": "下次按住 {combo} 即可跳过此提示", "boost_modal.reblog": "是否要转嘟？", "boost_modal.undo_reblog": "是否要取消转嘟？", diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json index 309a87546f..d47f2da6f6 100644 --- a/app/javascript/mastodon/locales/zh-HK.json +++ b/app/javascript/mastodon/locales/zh-HK.json @@ -175,11 +175,8 @@ "block_modal.remote_users_caveat": "我們會要求 {domain} 伺服器尊重你的決定。然而，由於部份伺服器可能以不同方式處理封鎖，因此無法保證一定會成功。公開帖文仍然有機會被未登入的使用者看見。", "block_modal.show_less": "顯示更少", "block_modal.show_more": "顯示更多", - "block_modal.they_cant_mention": "對方無法提及和追蹤你。", - "block_modal.they_cant_see_posts": "你們無法看到對方的帖文。", "block_modal.they_will_know": "對方會看到自己被封鎖。", "block_modal.title": "封鎖使用者？", - "block_modal.you_wont_see_mentions": "你將不會看到提及對方的帖文。", "boost_modal.combo": "你下次可以按 {combo} 來跳過", "bundle_column_error.copy_stacktrace": "複製錯誤報告", "bundle_column_error.error.body": "無法提供請求的頁面。這可能是因為代碼出現錯誤或瀏覽器出現兼容問題。", diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json index b9e3a6b9bb..f984e40939 100644 --- a/app/javascript/mastodon/locales/zh-TW.json +++ b/app/javascript/mastodon/locales/zh-TW.json @@ -328,14 +328,15 @@ "annual_report.summary.share_on_mastodon": "於 Mastodon 上分享", "attachments_list.unprocessed": "（未處理）", "audio.hide": "隱藏音訊", + "block_modal.no_collections": "您們雙方都無法將對方加入收藏名單。如適用，您們將自動自彼此現有收藏名單中移除。", "block_modal.remote_users_caveat": "我們會要求 {domain} 伺服器尊重您的決定。然而，我們無法保證所有伺服器皆會遵守，某些伺服器可能以不同方式處理封鎖。未登入之使用者仍可能看見您的公開嘟文。", "block_modal.show_less": "減少顯示", "block_modal.show_more": "顯示更多", - "block_modal.they_cant_mention": "他們無法提及或跟隨您。", + "block_modal.they_cant_mention": "您無法提及、跟隨、或引用彼此。", "block_modal.they_cant_see_posts": "他們無法讀取您的嘟文，且您不會見到他們的嘟文。", "block_modal.they_will_know": "他們能見到他們已被封鎖。", "block_modal.title": "是否封鎖該使用者？", - "block_modal.you_wont_see_mentions": "您將不會見到提及他們的嘟文。", + "block_modal.you_wont_see_mentions": "您將不會見到其他人提及他們的嘟文。", "boost_modal.combo": "您下次可以按 {combo} 跳過", "boost_modal.reblog": "是否要轉嘟？", "boost_modal.undo_reblog": "是否要取消轉嘟？", diff --git a/config/locales/be.yml b/config/locales/be.yml index 232c0186b5..c4d99b955b 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -824,7 +824,6 @@ be: manage_custom_emojis: Кіраванне адвольнымі эмодзі manage_custom_emojis_description: Дазваляе кіраваць адвольнымі эмодзі на серверы manage_email_subscriptions: Наладзіць падпіскі па электроннай пошце - manage_email_subscriptions_description: Дазвольце карыстальнікам падпісвацца на карыстальнікаў з гэтым дазволам праз электронную пошту manage_federation: Кіраваць федэрацыяй manage_federation_description: Дазваляе карыстальнікам блакіраваць або дазваляць аб'яднанне з іншымі даменамі і кантраляваць магчымасць дастаўкі manage_invites: Кіраванне запрашэннямі diff --git a/config/locales/cy.yml b/config/locales/cy.yml index df3d3fb75c..4ef5ef8efa 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -527,6 +527,71 @@ cy: resolved_dns_records_hint_html: Mae'r enw parth yn cyd-fynd â'r parthau MX canlynol, sy'n gyfrifol yn y pen draw am dderbyn e-bost. Bydd rhwystro parth MX yn rhwystro cofrestriadau o unrhyw gyfeiriad e-bost sy'n defnyddio'r un parth MX, hyd yn oed os yw'r enw parth gweladwy yn wahanol. Byddwch yn ofalus i beidio â rhwystro'r prif ddarparwyr e-bost. resolved_through_html: Wedi'i ddatrys trwy %{domain} title: Parthau e-bost wedi'u rhwystro + email_subscriptions: + accounts: + account: Cyfrif + active: Gweithredol + empty: + hint: Does gan unrhyw gyfrifon ddim tanysgrifwyr eto. + no_lists_yet: Dim rhestrau eto + inactive: Anweithredol + last_email: E-bost diwethaf + lead: Bydd cyfrifon sydd wedi galluogi'r nodwedd ac sydd â thanysgrifwyr yn ymddangos isod. + status: Statws + subscribers: Tanysgrifwyr + title: Rhestrau postio + additional_footer_texts: + show: + title: Testun troedyn ychwanegol + compliance_settings: + additional_footer_text: + action: Rheoli + hint: Testun dewisol sy'n ymddangos yn nhroedyn e-byst cylchlythyr yn unig + title: Testun troedyn ychwanegol + lead: Mae modd ystyried cylchlythyrau e-bost yn negeseuon e-bost marchnata, yn dibynnu ar yr awdurdodaethau lle rydych chi'n gweithredu. + privacy_policy: + action: Rheoli + hint: Mae dolen i'r polisi hwn yn nhroedyn pob e-bost + title: Polisi preifatrwydd + title: Gosodiadau cydymffurfio + danger_zone: + disable_feature: + action: Analluogi + hint: Diffoddwch y nodwedd ar gyfer pob cyfrif + title: Analluogi nodwedd + erase_all_data: + action: Dileu data + hint: Yn dileu pob e-bost ym mhob rhestr bostio yn barhaol + title: Dileu'r holl ddata + title: Parth perygl + disabled_msg: Mae tanysgrifiadau e-bost wedi cael eu hanalluogi'n llwyddiannus. + index: + disabled: + cannot_be_enabled: Dyw eich darparwr technegol ddim wedi galluogi'r nodwedd hon ar gyfer eich gweinydd. + description: Mae'r nodwedd hon yn caniatáu i gyfrifon penodol ychwanegu teclyn at eu proffiliau, gan alluogi ymwelwyr heb gyfrif Mastodon i dderbyn eu postiadau drwy e-bost. + get_started: Cychwyn arni + lead: Caniatáu i ymwelwyr dderbyn postiadau drwy e-bost o gyfrifon pwrpasol ar y gweinydd hwn. + title: Cylchlythyrau e-bost + purged_msg: Mae holl ddata tanysgrifiadau e-bost yn cael ei ddileu. + roles: + accounts: Cyfrifon + edit_role: Golygu rôl + empty: + hint: Does gan neb ganiatâd i ddefnyddio'r nodwedd hon. + no_roles_added: Dim rolau wedi'u hychwanegu + lead: Gall cyfrifon gyda'r rolau canlynol alluogi'r nodwedd hon ar eu proffiliau. + manage_roles: Rheoli rolau + role_name: Enw'r rôl + title: Rolau + setups: + show: + enable_feature: Galluogi nodwedd + important_information: Gwybodaeth bwysig + list: + 1_permission_explanation: Pan fydd y nodwedd hon wedi'i galluogi, gall cyfrifon sydd â'r caniatâd dynodedig ychwanegu ffurflen casglu e-byst at eu proffiliau. + 2_feature_explanation: Pan fydd ymwelwyr yn cofrestru ar dudalen proffil cyfrif ac yn cadarnhau eu tanysgrifiad, byddan yn dechrau derbyn diweddariadau e-bost pan fydd y cyfrif yn creu postiadau cyhoeddus newydd. + 3_privacy_policy_warning: Bydd gan weinyddwyr gweinydd fynediad at y cyfeiriadau e-bost (PII) sy'n cael eu casglu. O'r herwydd, rhaid diweddaru'r polisi preifatrwydd a'r Telerau Gwasanaeth ar gyfer y gweinydd cyn defnyddio'r nodwedd hon. + 4_cost_warning: Gall e-byst olygu ffi yn dibynnu ar y drefn cynnal. Trafodwch â'ch darparwr cynnal cyn ei alluogi, gan y gallai'r nodwedd hon gynyddu nifer yr e-byst a anfonir o'ch gweinydd yn sylweddol. export_domain_allows: new: title: Mewnforio parth yn caniatáu @@ -856,7 +921,7 @@ cy: manage_custom_emojis: Rheoli Emojis Cyfaddas manage_custom_emojis_description: Yn caniatáu i ddefnyddwyr reoli emojis cyfaddas ar y gweinydd manage_email_subscriptions: Rheoli Tanysgrifiadau E-bost - manage_email_subscriptions_description: Caniatáu i ddefnyddwyr danysgrifio i ddefnyddwyr sydd â'r caniatâd hwn drwy e-bost + manage_email_subscriptions_description: Caniatáu i ddefnyddwyr sydd â'r caniatâd hwn alluogi'r nodwedd cylchlythyr e-bost ar gyfer eu cyfrif manage_federation: Rheoli Ffederasiwn manage_federation_description: Yn caniatáu i ddefnyddwyr rwystro neu ganiatáu ffedereiddio â pharthau eraill, a rheoli'r gallu i gyflawni manage_invites: Rheoli Gwahoddiadau @@ -1899,6 +1964,31 @@ cy: copy_account_note_text: 'Symudodd y defnyddiwr hwn o %{acct}, dyma oedd eich nodiadau blaenorol amdanynt:' navigation: toggle_menu: Toglo'r ddewislen + notification_fallbacks: + added_to_collection: + title_html: Ychwanegodd %{name} chi at gasgliad + admin_report: + title_html: Mae %{name} wedi adrodd ar %{target} + admin_sign_up: + title_and_others_html: + few: Mae %{name} a %{count} eraill wedi cofrestru + many: Mae %{name} a %{count} eraill wedi cofrestru + one: Mae %{name} ac un arall wedi cofrestru + other: Mae %{name} a %{count} eraill wedi cofrestru + two: Mae %{name} a %{count} eraill wedi cofrestru + zero: Mae %{name} a %{count} eraill wedi cofrestru + title_html: Mae %{name} wedi cofrestru + collection_update: + title_html: Mae %{name} wedi diweddaru casgliad rydych chi ynddo + generic: + sign_in: Mewngofnodwch i ap gwe Mastodon + summary_html: Rydych chi ar ap nad yw'n cefnogi'r fersiwn ddiweddaraf o Mastodon. %{link} am ymarferoldeb llawn. + moderation_warning: + summary_html: Rydych chi ar ap nad yw'n cefnogi'r fersiwn ddiweddaraf o Mastodon. %{link}. + title: Rydych chi wedi derbyn rhybudd cymedroli. + severed_relationships: + summary_html: Mae gweinyddwr o %{from} wedi atal %{target}, sy'n golygu nad ydych yn gallu derbyn diweddariadau ganddyn nhw na rhyngweithio â nhw bellach. Ewch i %{link} i adfer rhestr o'r perthnasoedd coll. + title: Colli cysylltiadau gyda %{name} notification_mailer: admin: report: diff --git a/config/locales/da.yml b/config/locales/da.yml index 9cc6120ef8..1f8795c7fc 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -487,6 +487,71 @@ da: resolved_dns_records_hint_html: Domænenavnet opløses til flg. MX-domæner, som i sidste ende er ansvarlige for e-mailmodtagelse. Blokering af et MX-domæne blokerer også tilmeldinger fra enhver e-mailadresse på det pågældende MX-domæne, selv hvis det synlige domænenavn er et andet. Pas på ikke at blokere større e-mailudbydere. resolved_through_html: Opløst via %{domain} title: Blokerede e-maildomæner + email_subscriptions: + accounts: + account: Konto + active: Aktive + empty: + hint: Ingen konti har abonnenter endnu. + no_lists_yet: Ingen lister endnu + inactive: Inaktive + last_email: Seneste e-mail + lead: Nedenfor vises de konti, der har aktiveret funktionen og har abonnenter. + status: Status + subscribers: Abonnenter + title: Mailinglister + additional_footer_texts: + show: + title: Yderligere tekst til sidefod + compliance_settings: + additional_footer_text: + action: Administrér + hint: Valgfri tekst, der kun vises i sidefoden på e-mail-nyhedsbreve + title: Yderligere tekst til sidefod + lead: E-mail-nyhedsbreve kan blive betragtet som markedsføringsmails afhængigt af de jurisdiktioner, hvor du opererer. + privacy_policy: + action: Administrér + hint: Denne politik er linket til i bunden af hver e-mail + title: Privatlivspolitik + title: Compliance-indstillinger + danger_zone: + disable_feature: + action: Deaktivér + hint: Slå funktionen fra for alle konti + title: Deaktivér funktion + erase_all_data: + action: Slet data + hint: Sletter alle e-mails i alle mailinglister permanent + title: Slet alle data + title: Farezone + disabled_msg: E-mail-abonnementer er blevet deaktiveret. + index: + disabled: + cannot_be_enabled: Din tekniske udbyder har ikke aktiveret denne funktion på din server. + description: Denne funktion giver angivne konti mulighed for at tilføje en widget til deres profiler, så besøgende uden en Mastodon-konto kan modtage deres indlæg via e-mail. + get_started: Kom i gang + lead: Tillad besøgende at modtage indlæg via e-mail fra dedikerede konti på denne server. + title: Nyhedsbreve via e-mail + purged_msg: Alle data vedrørende e-mail-abonnementer slettes. + roles: + accounts: Konti + edit_role: Rediger rolle + empty: + hint: Ingen har tilladelse til at bruge denne funktion. + no_roles_added: Ingen roller tilføjet + lead: Brugere med følgende roller kan aktivere denne funktion på deres profiler. + manage_roles: Administrer roller + role_name: Rollenavn + title: Roller + setups: + show: + enable_feature: Aktivér funktion + important_information: Vigtig information + list: + 1_permission_explanation: Når denne funktion er aktiveret, kan brugere med de angivne rettigheder tilføje en formular til indsamling af e-mailadresser til deres profiler. + 2_feature_explanation: Når besøgende tilmelder sig på en kontos profilside og bekræfter deres abonnement, vil de begynde at modtage e-mail-opdateringer, når kontoen opretter nye offentlige indlæg. + 3_privacy_policy_warning: Serveradministratorer vil have adgang til de indsamlede personoplysninger (e-mailadresser). Derfor skal serverens privatlivspolitik og servicevilkår opdateres, inden denne funktion tages i brug. + 4_cost_warning: Der kan påløbe et gebyr for e-mails afhængigt af hostingopsætningen. Tal med din hostingudbyder, inden du aktiverer funktionen, da den kan medføre en markant stigning i antallet af e-mails, der sendes fra din server. export_domain_allows: new: title: Importeret domæne tillader @@ -792,7 +857,7 @@ da: manage_custom_emojis: Administrere tilpassede emojier manage_custom_emojis_description: Tillader brugere at administrere tilpassede emojier på serveren manage_email_subscriptions: Administrer e-mail-abonnementer - manage_email_subscriptions_description: Giv brugere mulighed for at abonnere på andre brugere med denne tilladelse via e-mail + manage_email_subscriptions_description: Giv brugere med denne tilladelse mulighed for at aktivere funktionen til e-mail-nyhedsbreve på deres konto manage_federation: Administrere federation manage_federation_description: Tillader brugere at blokere eller tillade federation med andre domæner og styre leverbarhed manage_invites: Administrere invitationer diff --git a/config/locales/de.yml b/config/locales/de.yml index 40e3df1c8b..6d377c9962 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -487,6 +487,45 @@ de: resolved_dns_records_hint_html: Die Domain wird zu den folgenden MX-Domains aufgelöst, die für die Annahme von E-Mails zuständig sind. Das Sperren einer MX-Domain sperrt Anmeldungen aller E-Mail-Adressen, die dieselbe MX-Domain verwenden, auch wenn die sichtbare Domain anders lautet. Achte daher darauf, keine großen E-Mail-Anbieter versehentlich zu sperren. resolved_through_html: Durch %{domain} aufgelöst title: Gesperrte E-Mail-Domains + email_subscriptions: + accounts: + account: Konto + active: Aktiviert + empty: + hint: Bisher wurden keine Konten abonniert. + no_lists_yet: Noch keine Listen vorhanden + inactive: Deaktiviert + lead: Konten, die die Funktion aktiviert haben und abonniert wurden, werden unten angezeigt. + status: Status + subscribers: Abonnent*innen + title: Mailingliste + compliance_settings: + additional_footer_text: + action: Verwalten + privacy_policy: + action: Verwalten + title: Datenschutzerklärung + danger_zone: + disable_feature: + action: Deaktivieren + title: Funktion deaktivieren + erase_all_data: + action: Daten löschen + title: Alle Daten löschen + title: Gefahrenzone + index: + disabled: + get_started: Loslegen + roles: + accounts: Konten + edit_role: Rolle bearbeiten + manage_roles: Rollen verwalten + role_name: Name der Rolle + title: Rollen + setups: + show: + enable_feature: Funktionen aktivieren + important_information: Wichtige Informationen export_domain_allows: new: title: Erlaubte Domains importieren @@ -792,7 +831,6 @@ de: manage_custom_emojis: Emojis manage_custom_emojis_description: Spezielle Emojis dieses Servers verwalten manage_email_subscriptions: E-Mail-Abonnements - manage_email_subscriptions_description: Profile können per E-Mail-Benachrichtigung abonniert werden manage_federation: Föderation manage_federation_description: Domains anderer Mastodon-Server sperren/zulassen – und Zustellbarkeit kontrollieren manage_invites: Einladungen diff --git a/config/locales/el.yml b/config/locales/el.yml index b1bd805375..3ed839cd0d 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -487,6 +487,71 @@ el: resolved_dns_records_hint_html: Το όνομα τομέα επιλύεται στους ακόλουθους τομείς MX, οι οποίοι είναι τελικά υπεύθυνοι για την αποδοχή των email. Αποκλείοντας έναν τομέα MX θα αποκλείει τις εγγραφές από οποιαδήποτε διεύθυνση email που χρησιμοποιεί τον ίδιο τομέα MX, ακόμη και αν το ορατό όνομα τομέα είναι διαφορετικό. Προσέξτε να μην αποκλείσετε τους μεγάλους παρόχους ηλεκτρονικού ταχυδρομείου. resolved_through_html: Επιλύθηκε μέσω %{domain} title: Αποκλεισμένοι τομείς email + email_subscriptions: + accounts: + account: Λογαριασμός + active: Ενεργός + empty: + hint: Κανένας λογαριασμός δεν έχει συνδρομητές ακόμη. + no_lists_yet: Καμία λίστα ακόμη + inactive: Ανενεργός + last_email: Τελευταίο email + lead: Λογαριασμοί που έχουν ενεργοποιήσει τη λειτουργία και έχουν συνδρομητές θα εμφανίζονται παρακάτω. + status: Κατάσταση + subscribers: Συνδρομητές + title: Λίστες αλληλογραφίας + additional_footer_texts: + show: + title: Πρόσθετο κείμενο υποσέλιδου + compliance_settings: + additional_footer_text: + action: Διαχείριση + hint: Προαιρετικό κείμενο που εμφανίζεται στο υποσέλιδο των email ενημερωτικού δελτίου μόνο + title: Πρόσθετο κείμενο υποσέλιδου + lead: Τα email ενημερωτικού δελτίου μπορεί να θεωρηθούν διαφημιστικά μηνύματα, ανάλογα με τις δικαιοδοσίες όπου λειτουργείτε. + privacy_policy: + action: Διαχείριση + hint: Αυτή η πολιτική συνδέεται στο υποσέλιδο κάθε email + title: Πολιτική απορρήτου + title: Ρυθμίσεις συμμόρφωσης + danger_zone: + disable_feature: + action: Απενεργοποίηση + hint: Απενεργοποιήστε τη λειτουργία για όλους τους λογαριασμούς + title: Απενεργοποίηση λειτουργίας + erase_all_data: + action: Διαγραφή δεδομένων + hint: Θα διαγράψει μόνιμα όλα τα email σε όλες τις λίστες αλληλογραφίας + title: Διαγραφή όλων των δεδομένων + title: Επικίνδυνη ζώνη + disabled_msg: Οι συνδρομές email έχουν απενεργοποιηθεί επιτυχώς. + index: + disabled: + cannot_be_enabled: Ο τεχνικός σας πάροχος δεν έχει ενεργοποιήσει αυτήν τη λειτουργία για τον διακομιστή σας. + description: Αυτή η λειτουργία επιτρέπει σε συγκεκριμένους λογαριασμούς να προσθέσουν ένα γραφικό στοιχείο στο προφίλ τους, επιτρέποντας στους επισκέπτες χωρίς λογαριασμό Mastodon να λαμβάνουν τις αναρτήσεις τους μέσω email. + get_started: Ξεκινήστε + lead: Να επιτρέπεται στους επισκέπτες να λαμβάνουν αναρτήσεις μέσω email από αποκλειστικούς λογαριασμούς σε αυτόν τον διακομιστή. + title: Ενημερωτικά δελτία email + purged_msg: Όλα τα δεδομένα συνδρομής email διαγράφονται. + roles: + accounts: Λογαριασμοί + edit_role: Επεξεργασία ρόλου + empty: + hint: Κανένας δεν έχει δικαίωμα να χρησιμοποιήσει αυτήν τη λειτουργία. + no_roles_added: Δεν προστέθηκαν ρόλοι + lead: Λογαριασμοί με τους ακόλουθους ρόλους μπορούν να ενεργοποιήσουν αυτήν τη λειτουργία στο προφίλ τους. + manage_roles: Διαχείριση ρόλων + role_name: Όνομα ρόλου + title: Ρόλοι + setups: + show: + enable_feature: Ενεργοποίηση λειτουργίας + important_information: Σημαντικές πληροφορίες + list: + 1_permission_explanation: Όταν αυτή η λειτουργία είναι ενεργοποιημένη, οι λογαριασμοί με τα καθορισμένα δικαιώματα μπορούν να προσθέσουν μια φόρμα συλλογής email στα προφίλ τους. + 2_feature_explanation: Όταν οι επισκέπτες εγγράφονται στη σελίδα προφίλ ενός λογαριασμού και επιβεβαιώνουν τη συνδρομή τους, θα αρχίσουν να λαμβάνουν ενημερωτικά email όταν ο λογαριασμός δημιουργεί νέες δημόσιες αναρτήσεις. + 3_privacy_policy_warning: Οι διαχειριστές του διακομιστή θα έχουν πρόσβαση σε PII (διευθύνσεις email) που συλλέχθηκαν. Ως εκ τούτου, η Πολιτική απορρήτου και οι Όροι υπηρεσίας για τον διακομιστή πρέπει να ενημερωθούν πριν από τη χρήση αυτής της λειτουργίας. + 4_cost_warning: Τα μηνύματα email μπορούν να επιβαρύνονται με κόστος ανάλογα με τη ρύθμιση φιλοξενίας. Συζητήστε με τον πάροχο φιλοξενίας σας πριν την ενεργοποιήσετε, καθώς αυτή η λειτουργία θα μπορούσε να αυξήσει δραστικά το ποσό των μηνυμάτων email που αποστέλλονται από τον διακομιστή σας. export_domain_allows: new: title: Εισαγωγή επιτρεπόμενων τομέων @@ -792,7 +857,7 @@ el: manage_custom_emojis: Διαχείριση Προσαρμοσμένων Emojis manage_custom_emojis_description: Επιτρέπει στους χρήστες να διαχειρίζονται προσαρμοσμένα emojis στον διακομιστή manage_email_subscriptions: Διαχείριση Συνδρομών Email - manage_email_subscriptions_description: Να επιτρέπεται στους χρήστες να εγγράφονται σε χρήστες με αυτήν την άδεια μέσω ηλεκτρονικού ταχυδρομείου + manage_email_subscriptions_description: Να επιτρέπεται στους χρήστες με αυτό το δικαίωμα να ενεργοποιούν τη λειτουργία email ενημερωτικού δελτίου για το λογαριασμό τους manage_federation: Διαχείριση Ομοσπονδίας manage_federation_description: Επιτρέπει στους χρήστες να αποκλείουν ή να επιτρέπουν τις συναλλαγές με άλλους τομείς και να ελέγχουν την παράδοση manage_invites: Διαχείριση Προσκλήσεων diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index f9638d9264..c1b2407446 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -792,7 +792,6 @@ en-GB: manage_custom_emojis: Manage Custom Emojis manage_custom_emojis_description: Allows users to manage custom emojis on the server manage_email_subscriptions: Manage Email Subscriptions - manage_email_subscriptions_description: Allow users to subscribe to users with this permission by email manage_federation: Manage Federation manage_federation_description: Allows users to block or allow federation with other domains, and control deliverability manage_invites: Manage Invites diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml index 19b6ffcee4..b4ed310577 100644 --- a/config/locales/es-AR.yml +++ b/config/locales/es-AR.yml @@ -487,6 +487,71 @@ es-AR: resolved_dns_records_hint_html: El nombre de dominio resuelve los siguientes dominios MX, los cuales son responsables en última instancia de aceptar el correo electrónico. Bloquear un dominio MX bloqueará los registros de cualquier dirección de correo electrónico que utilice el mismo dominio MX, incluso si el nombre de dominio visible es diferente. Tené cuidado de no bloquear los principales proveedores de correo electrónico. resolved_through_html: Resuelto a través de %{domain} title: Dominios bloqueados de correo electrónico + email_subscriptions: + accounts: + account: Cuenta + active: Activa + empty: + hint: Aún no hay cuentas con suscriptores. + no_lists_yet: Aún no hay listas + inactive: Inactiva + last_email: Último correo electrónico + lead: Las cuentas que habilitaron la función y tienen suscriptores se mostrarán a continuación. + status: Estado + subscribers: Suscriptores + title: Listas de correo + additional_footer_texts: + show: + title: Texto de pie de página adicional + compliance_settings: + additional_footer_text: + action: Administrar + hint: Texto opcional que aparece solo en el pie de los correos electrónicos del boletín de noticias + title: Texto de pie de página adicional + lead: Los boletines de correo electrónico pueden considerarse correos electrónicos de marketing, dependiendo de las jurisdicciones en las que operás. + privacy_policy: + action: Administrar + hint: Esta política está vinculada en el pie de cada correo electrónico + title: Política de privacidad + title: Configuración de cumplimiento + danger_zone: + disable_feature: + action: Deshabilitar + hint: Deshabilitar función para todas las cuentas + title: Deshabilitar función + erase_all_data: + action: Eliminar datos + hint: Eliminar permanentemente todos los correos electrónicos de todas las listas de correo + title: Eliminar todos los datos + title: Zona de peligro + disabled_msg: Las suscripciones de correo electrónico se deshabilitaron correctamente. + index: + disabled: + cannot_be_enabled: Tu proveedor técnico no habilitó esta función para tu servidor. + description: Esta función permite a las cuentas especificadas agregar un widget a sus perfiles, permitiendo a los visitantes sin una cuenta de Mastodon recibir sus mensajes por correo electrónico. + get_started: Primeros pasos + lead: Permitir a los visitantes recibir mensajes por correo electrónico de cuentas dedicadas en este servidor. + title: Boletines de noticias + purged_msg: Todos los datos de las suscripciones de correo electrónico están siendo eliminados. + roles: + accounts: Cuentas + edit_role: Editar rol + empty: + hint: Nadie tiene permiso para usar esta función. + no_roles_added: No hay roles agregados + lead: Las cuentas con los siguientes roles pueden habilitar esta función en sus perfiles. + manage_roles: Administrar roles + role_name: Nombre del rol + title: Roles + setups: + show: + enable_feature: Habilitar función + important_information: Información importante + list: + 1_permission_explanation: Cuando esta función está habilitada, las cuentas con los permisos designados pueden agregar un formulario de recopilación de correo electrónico a sus perfiles. + 2_feature_explanation: Cuando los visitantes se registren en la página de perfil de una cuenta y confirmen su suscripción, comenzarán a recibir actualizaciones por correo electrónico cuando la cuenta cree nuevos mensajes públicos. + 3_privacy_policy_warning: Los administradores del servidor tendrán acceso a PII (direcciones de correo electrónico). Como tal, la política de privacidad y los términos de servicio para el servidor deben ser actualizados antes de usar esta función. + 4_cost_warning: Los correos electrónicos pueden incurrir en un cargo dependiendo de la configuración del alojamiento. Hable con su proveedor de alojamiento antes de habilitar esta función, ya que la misma podría aumentar drásticamente la cantidad de correos electrónicos enviados desde tu servidor. export_domain_allows: new: title: Importar permisos de dominio @@ -792,7 +857,7 @@ es-AR: manage_custom_emojis: Administrar emojis personalizados manage_custom_emojis_description: Permite a los usuarios administrar emojis personalizados en el servidor manage_email_subscriptions: Administrar suscripciones de correo electrónico - manage_email_subscriptions_description: Permitir a los usuarios suscribirse a usuarios con este permiso por correo electrónico + manage_email_subscriptions_description: Permitir a los usuarios con este permiso habilitar la función del boletín de noticias por correo electrónico para sus cuentas manage_federation: Administrar Federación manage_federation_description: Permite a los usuarios bloquear o permitir la federación con otros dominios y controlar las entregas manage_invites: Administrar invitaciones diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml index 010e63c374..8a3e953d30 100644 --- a/config/locales/es-MX.yml +++ b/config/locales/es-MX.yml @@ -487,6 +487,71 @@ es-MX: resolved_dns_records_hint_html: El nombre de dominio resuelve los siguientes dominios MX, los cuales son responsables en última instancia de aceptar el correo electrónico. Bloquear un dominio MX bloqueará los registros de cualquier dirección de correo electrónico que utilice el mismo dominio MX, incluso si el nombre de dominio visible es diferente. Ten cuidado de no bloquear los principales proveedores de correo electrónico. resolved_through_html: Resuelto a través de %{domain} title: Dominios de correo bloqueados + email_subscriptions: + accounts: + account: Cuenta + active: Activa + empty: + hint: Ninguna cuenta tiene suscriptores todavía. + no_lists_yet: No hay listas todavía + inactive: Inactiva + last_email: Último correo electrónico + lead: Las cuentas que han habilitado la función y tienen suscriptores se mostrarán a continuación. + status: Estado + subscribers: Suscriptores + title: Listas de correo + additional_footer_texts: + show: + title: Texto de pie de página adicional + compliance_settings: + additional_footer_text: + action: Administrar + hint: Texto opcional que aparece únicamente en el pie de los correos electrónicos del boletín de noticias + title: Texto de pie de página adicional + lead: Los boletines de correo electrónico pueden considerarse correos electrónicos de marketing, dependiendo de las jurisdicciones en las que operas. + privacy_policy: + action: Administrar + hint: Esta política está enlazada en el pie de cada correo electrónico + title: Política de privacidad + title: Ajustes de cumplimiento normativo + danger_zone: + disable_feature: + action: Desactivar + hint: Desactivar función para todas las cuentas + title: Desactivar función + erase_all_data: + action: Borrar datos + hint: Borra permanentemente todos los correos electrónicos de todas las listas de correo + title: Borrar todos los datos + title: Zona peligrosa + disabled_msg: Las suscripciones de correo electrónico se han desactivado correctamente. + index: + disabled: + cannot_be_enabled: Tu proveedor técnico no ha habilitado esta función para tu servidor. + description: Esta función permite a las cuentas especificadas añadir un widget a sus perfiles, permitiendo a los visitantes sin una cuenta de Mastodon recibir sus publicaciones por correo electrónico. + get_started: Primeros pasos + lead: Permitir a los visitantes recibir publicaciones por correo electrónico de cuentas dedicadas en este servidor. + title: Boletines de correo electrónico + purged_msg: Todos los datos de las suscripciones de correo electrónico están siendo borrados. + roles: + accounts: Cuentas + edit_role: Editar rol + empty: + hint: Nadie tiene permiso para usar esta función. + no_roles_added: No se han añadido roles + lead: Las cuentas con los siguientes roles pueden habilitar esta función en sus perfiles. + manage_roles: Administrar roles + role_name: Nombre del rol + title: Roles + setups: + show: + enable_feature: Activar función + important_information: Información importante + list: + 1_permission_explanation: Cuando esta función está activada, las cuentas con los permisos designados pueden añadir un formulario de recopilación de correo electrónico a sus perfiles. + 2_feature_explanation: Cuando los visitantes se registran en la página de perfil de una cuenta y confirman su suscripción, comenzarán a recibir actualizaciones por correo electrónico cuando la cuenta cree nuevas publicaciones públicas. + 3_privacy_policy_warning: Los administradores del servidor tendrán acceso a información de identificación personal (direcciones de correo electrónico). Por lo tanto, la política de privacidad y los Términos del Servicio del servidor deben actualizarse antes de usar esta función. + 4_cost_warning: Los correos electrónicos pueden incurrir en un cargo dependiendo de la configuración del alojamiento. Habla con tu proveedor de alojamiento antes de activarlo, ya que esta característica podría aumentar drásticamente la cantidad de correos electrónicos enviados desde tu servidor. export_domain_allows: new: title: Importar dominios permitidos @@ -792,7 +857,7 @@ es-MX: manage_custom_emojis: Administrar Emojis Personalizados manage_custom_emojis_description: Permite a los usuarios gestionar emojis personalizados en el servidor manage_email_subscriptions: Gestionar suscripciones por correo electrónico - manage_email_subscriptions_description: Permitir a los usuarios suscribirse a otros usuarios con este permiso por correo electrónico + manage_email_subscriptions_description: Permite a los usuarios con este permiso habilitar la función del boletín de noticias por correo electrónico para su cuenta manage_federation: Administrar Federación manage_federation_description: Permite a los usuarios bloquear o permitir la federación con otros dominios, y controlar la entregabilidad manage_invites: Administrar Invitaciones diff --git a/config/locales/es.yml b/config/locales/es.yml index 3cdc00f1f9..4c81cacafe 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -487,6 +487,71 @@ es: resolved_dns_records_hint_html: El nombre de dominio resuelve los siguientes dominios MX, los cuales son responsables en última instancia de aceptar el correo electrónico. Bloquear un dominio MX bloqueará los registros de cualquier dirección de correo electrónico que utilice el mismo dominio MX, incluso si el nombre de dominio visible es diferente. Ten cuidado de no bloquear los principales proveedores de correo electrónico. resolved_through_html: Resuelto a través de %{domain} title: Dominios de correo bloqueados + email_subscriptions: + accounts: + account: Cuenta + active: Activa + empty: + hint: Aún no hay cuentas con suscriptores. + no_lists_yet: Aún no hay listas + inactive: Inactiva + last_email: Último correo electrónico + lead: Las cuentas que han habilitado la función y tienen suscriptores se mostrarán a continuación. + status: Estado + subscribers: Suscriptores + title: Listas de correo + additional_footer_texts: + show: + title: Texto de pie de página adicional + compliance_settings: + additional_footer_text: + action: Administrar + hint: Texto opcional que aparece únicamente en el pie de los correos electrónicos del boletín de noticias + title: Texto de pie de página adicional + lead: Los boletines de correo electrónico pueden considerarse correos electrónicos de marketing, dependiendo de las jurisdicciones en las que operas. + privacy_policy: + action: Administrar + hint: Esta política está enlazada en el pie de cada correo electrónico + title: Política de privacidad + title: Ajustes de cumplimiento normativo + danger_zone: + disable_feature: + action: Desactivar + hint: Desactivar función para todas las cuentas + title: Desactivar función + erase_all_data: + action: Borrar datos + hint: Borra permanentemente todos los correos electrónicos de todas las listas de correo + title: Borrar todos los datos + title: Zona peligrosa + disabled_msg: Las suscripciones de correo electrónico se han desactivado correctamente. + index: + disabled: + cannot_be_enabled: Tu proveedor técnico no ha habilitado esta función para tu servidor. + description: Esta función permite a las cuentas especificadas añadir un widget a sus perfiles, permitiendo a los visitantes sin una cuenta de Mastodon recibir sus publicaciones por correo electrónico. + get_started: Primeros pasos + lead: Permitir a los visitantes recibir publicaciones por correo electrónico de cuentas dedicadas en este servidor. + title: Boletines de correo electrónico + purged_msg: Todos los datos de las suscripciones de correo electrónico están siendo borrados. + roles: + accounts: Cuentas + edit_role: Editar rol + empty: + hint: Nadie tiene permiso para usar esta función. + no_roles_added: No se han añadido roles + lead: Las cuentas con los siguientes roles pueden habilitar esta función en sus perfiles. + manage_roles: Administrar roles + role_name: Nombre del rol + title: Roles + setups: + show: + enable_feature: Activar función + important_information: Información importante + list: + 1_permission_explanation: Cuando esta función está activada, las cuentas con los permisos designados pueden añadir un formulario de recopilación de correo electrónico a sus perfiles. + 2_feature_explanation: Cuando los visitantes se registran en la página de perfil de una cuenta y confirman su suscripción, comenzarán a recibir actualizaciones por correo electrónico cuando la cuenta cree nuevas publicaciones públicas. + 3_privacy_policy_warning: Los administradores del servidor tendrán acceso a información de identificación personal (direcciones de correo electrónico). Por lo tanto, la política de privacidad y los Términos del Servicio del servidor deben actualizarse antes de usar esta función. + 4_cost_warning: Los correos electrónicos pueden incurrir en un cargo dependiendo de la configuración del alojamiento. Habla con tu proveedor de alojamiento antes de activarlo, ya que esta característica podría aumentar drásticamente la cantidad de correos electrónicos enviados desde tu servidor. export_domain_allows: new: title: Importar dominios permitidos @@ -792,7 +857,7 @@ es: manage_custom_emojis: Administrar Emojis Personalizados manage_custom_emojis_description: Permite a los usuarios gestionar emojis personalizados en el servidor manage_email_subscriptions: Administrar suscripciones de correo electrónico - manage_email_subscriptions_description: Permitir a los usuarios suscribirse a usuarios con este permiso por correo electrónico + manage_email_subscriptions_description: Permite a los usuarios con este permiso habilitar la función del boletín de noticias por correo electrónico para su cuenta manage_federation: Administrar Federación manage_federation_description: Permite a los usuarios bloquear o permitir la federación con otros dominios, y controlar la entregabilidad manage_invites: Administrar Invitaciones diff --git a/config/locales/et.yml b/config/locales/et.yml index 3d4068c914..bedf62ade4 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -487,6 +487,58 @@ et: resolved_dns_records_hint_html: Domeeninimi lahendatakse järgmistele MX-domeenidele, mis on lõppkokkuvõttes vastutavad e-kirjade vastuvõtmise eest. MX-domeeni blokeerimine blokeerib registreerimise mis tahes e-posti aadressilt, mis kasutab sama MX-domeeni, isegi kui nähtav domeeninimi on erinev. Ole ettevaatlik, et mitte blokeerida peamisi e-posti teenusepakkujaid. resolved_through_html: Lahendatud %{domain} kaudu title: Blokeeritud e-posti domeenid + email_subscriptions: + accounts: + account: Konto + active: Aktiivne + empty: + hint: Ühelgi kontol pole veel tellijaid. + no_lists_yet: Veel pole loetelusid + inactive: Mitteaktiivne + last_email: Viimane e-post + lead: Allpool kuvatakse kontod, kus see funktsioon on aktiveeritud ja millel on tellijaid. + status: Olek + subscribers: Tellijad + title: Meililistid + additional_footer_texts: + show: + title: Täiendav jaluse tekst + compliance_settings: + additional_footer_text: + action: Halda + hint: Valikuline tekst, mida kuvatakse ainult uudis-e-kirjade jaluses + title: Täiendav jaluse tekst + lead: E-posti uudiskirju võidakse käsitleda turundusmeilidena, sõltuvalt sellest, millises jurisdiktsioonis tegutsetakse. + privacy_policy: + action: Haldamine + hint: Need reeglid lingitakse iga e-kirja jalusesse + title: Privaatsusreeglid + title: Vastavuse seaded + danger_zone: + disable_feature: + action: Keela + hint: Lülita funktsioon kõikidel kontodel välja + title: Keela funktsioon + erase_all_data: + action: Kustuta andmed + hint: Kustutab kõigist meililistidest kõik e-kirjad lõplikult + title: Kustuta kõik andmed + title: Ohtlik ala + disabled_msg: E-kirja teavituste tellimine on edukalt keelatud. + index: + disabled: + cannot_be_enabled: Tehniline teenusepakkuja ei ole seda funktsiooni sinu serveris aktiveerinud. + description: See funktsioon võimaldab määratud kontodel lisada oma profiilile vidina, mis võimaldab külastajatel, kellel pole Mastodoni kontot, saada kontode postitusi e-posti teel. + get_started: Alustamine + lead: Võimalda külastajatel saada selle serveri määratud kontodelt postitusi e-posti teel. + title: E-posti uudiskirjad + purged_msg: Kõik e-posti tellimuste andmed kustutatakse. + roles: + accounts: Kontod + edit_role: Muuda rolli + empty: + hint: Kellelgi pole õigust seda oskust kasutada. + no_roles_added: Rolle pole lisatud export_domain_allows: new: title: Lubatud domeenide import @@ -792,7 +844,6 @@ et: manage_custom_emojis: Halda isetehtud emotikone manage_custom_emojis_description: Lubab kasutajatel hallata serveris isetehtud emotikone manage_email_subscriptions: Halda e-posti tellimusi - manage_email_subscriptions_description: Luba selle õigusega kasutajatel tellida kasutajaid e-posti teel manage_federation: Halda födereerumist manage_federation_description: Lubab kasutajail keelata või lubada föderatsioone teiste domeenidega ja hallata ühenduvust manage_invites: Halda kutseid diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 50e65f71d2..3d0608f59c 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -487,6 +487,44 @@ fi: resolved_dns_records_hint_html: Verkkotunnusnimi kytkeytyy seuraaviin MX-verkkotunnuksiin, jotka ovat viime kädessä vastuussa sähköpostin vastaanottamisesta. MX-verkkotunnuksen estäminen estää rekisteröitymisen mistä tahansa sähköpostiosoitteesta, joka käyttää samaa MX-verkkotunnusta, vaikka näkyvä verkkotunnuksen nimi olisikin erilainen. Varo estämästä suuria sähköpostipalvelujen tarjoajia. resolved_through_html: Ratkaistu verkkotunnuksen %{domain} kautta title: Estetyt sähköpostiverkkotunnukset + email_subscriptions: + accounts: + account: Tili + empty: + hint: Millään tilillä ei ole vielä tilaajia. + no_lists_yet: Ei vielä listoja + lead: Alla näkyvät tilit, jotka ovat ottaneet ominaisuuden käyttöön ja joilla on tilaajia. + status: Tila + subscribers: Tilaajia + title: Postituslistat + additional_footer_texts: + show: + title: Alatunnisteen lisäteksti + compliance_settings: + additional_footer_text: + action: Hallitse + title: Alatunnisteen lisäteksti + privacy_policy: + action: Hallitse + title: Tietosuojakäytäntö + danger_zone: + disable_feature: + action: Poista käytöstä + hint: Poista ominaisuus käytöstä kaikilta tileiltä + title: Poista ominaisuus käytöstä + title: Vaaravyöhyke + index: + disabled: + get_started: Aloita + roles: + edit_role: Muokkaa roolia + manage_roles: Hallitse rooleja + role_name: Roolin nimi + title: Roolit + setups: + show: + enable_feature: Ota ominaisuus käyttöön + important_information: Tärkeää tietoa export_domain_allows: new: title: Tuo sallittuja verkkotunnuksia @@ -792,7 +830,6 @@ fi: manage_custom_emojis: Hallita mukautettuja emojeita manage_custom_emojis_description: Sallii käyttäjien hallita palvelimen mukautettuja emojeita manage_email_subscriptions: Hallita sähköpostitilauksia - manage_email_subscriptions_description: Sallii käyttäjien tilata sähköpostitse käyttäjiä, joilla on tämä käyttöoikeus manage_federation: Hallita federointia manage_federation_description: Sallii käyttäjien estää tai sallia federointi muiden verkkotunnusten kanssa ja hallita toimitusta manage_invites: Hallita kutsuja diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml index 2aba25e5dc..603ed0c15b 100644 --- a/config/locales/fr-CA.yml +++ b/config/locales/fr-CA.yml @@ -792,7 +792,6 @@ fr-CA: manage_custom_emojis: Gérer les émojis personnalisés manage_custom_emojis_description: Permet aux utilisateur⋅rice⋅s de gérer les émoticônes personnalisées sur le serveur manage_email_subscriptions: Gérer les abonnements par courriel - manage_email_subscriptions_description: Autoriser l'abonnement par courriel aux comptes ayant cette permission manage_federation: Gérer de la féderation manage_federation_description: Permet aux utilisateur⋅rice⋅s de bloquer ou d'autoriser la fédération avec d'autres domaines, et de contrôler la capacité de livraison manage_invites: Gérer les invitations diff --git a/config/locales/fr.yml b/config/locales/fr.yml index ed6d12c437..1522d8f980 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -792,7 +792,6 @@ fr: manage_custom_emojis: Gérer les émojis personnalisés manage_custom_emojis_description: Permet aux utilisateur⋅rice⋅s de gérer les émoticônes personnalisées sur le serveur manage_email_subscriptions: Gérer les abonnements par courriel - manage_email_subscriptions_description: Autoriser l'abonnement par courriel aux comptes ayant cette permission manage_federation: Gérer de la féderation manage_federation_description: Permet aux utilisateur⋅rice⋅s de bloquer ou d'autoriser la fédération avec d'autres domaines, et de contrôler la capacité de livraison manage_invites: Gérer les invitations diff --git a/config/locales/ga.yml b/config/locales/ga.yml index c10b74cdb9..46096a3c48 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -840,7 +840,6 @@ ga: manage_custom_emojis: Bainistigh Emojis Saincheaptha manage_custom_emojis_description: Ligeann sé d'úsáideoirí emojis saincheaptha a bhainistiú ar an bhfreastalaí manage_email_subscriptions: Bainistigh Síntiúis Ríomhphoist - manage_email_subscriptions_description: Ceadaigh d’úsáideoirí liostáil le húsáideoirí leis an gcead seo trí ríomhphost manage_federation: Cónaidhm a bhainistiú manage_federation_description: Ligeann sé d’úsáideoirí cónaidhm a bhlocáil nó a cheadú le fearainn eile, agus inseachadacht a rialú manage_invites: Bainistigh Cuirí diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 656564d243..8ba20031e8 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -824,7 +824,6 @@ gd: manage_custom_emojis: Stiùireadh nan Emojis gnàthaichte manage_custom_emojis_description: Leigidh seo le cleachdaichean Emojis gnàthaichte a stiùireadh air an fhrithealaiche manage_email_subscriptions: Stiùireadh fo-sgrìobhaidhean puist-d - manage_email_subscriptions_description: Leigidh seo le cleachdaichean fo-sgrìobhadh air a’ phost-d a dhèanamh air na cleachdaichean aig a bheil an cead seo manage_federation: Stiùireadh a’ cho-nasgaidh manage_federation_description: Leigidh seo le cleachdaichean an co-nasgadh le àrainnean eile a bhacadh no a cheadachadh agus stiùireadh dè ghabhas lìbhrigeadh manage_invites: Stiùireadh nan cuiridhean diff --git a/config/locales/gl.yml b/config/locales/gl.yml index e27b4b27cb..441e067cf9 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -792,7 +792,6 @@ gl: manage_custom_emojis: Xestionar Emojis personalizados manage_custom_emojis_description: Permite xestionar os emojis personalizados do servidor manage_email_subscriptions: Xestionar subscripcións por correo - manage_email_subscriptions_description: Permitir que as usuarias se subscriban por correo a outras usuarias con este permiso manage_federation: Xestionar a federación manage_federation_description: Permite bloquear ou permitir a federación con outros dominios, e controlar as entregas manage_invites: Xestionar Convites diff --git a/config/locales/he.yml b/config/locales/he.yml index b340e2d446..ea0b6aa507 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -824,7 +824,6 @@ he: manage_custom_emojis: ניהול סמלונים בהתאמה אישית manage_custom_emojis_description: מאפשר למשתמשים לנהל סמלונים בהתאמה אישית של השרת manage_email_subscriptions: ניהול הרשמות דוא"ל - manage_email_subscriptions_description: לאפשר למשתמשיםות להרשים למשתמשיםות ע"י הרשאה בדוא"ל manage_federation: ניהול פדרציה manage_federation_description: מאפשר למשתמשים לחסום או לאפשר התממשקות עם שמות מתחם אחרים manage_invites: ניהול הזמנות diff --git a/config/locales/hu.yml b/config/locales/hu.yml index fdf584155e..837bb1d6dc 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -792,7 +792,6 @@ hu: manage_custom_emojis: Egyedi emodzsik kezelése manage_custom_emojis_description: Lehetővé teszi a felhasználó számára, hogy a kiszolgáló egyéni emodzsiait kezelje manage_email_subscriptions: E-mail-feliratkozások kezelése - manage_email_subscriptions_description: Engedélyezés, hogy a felhasználók e-maillel feliratkozzanak az ilyen jogosultságú felhasználókra manage_federation: Föderáció kezelése manage_federation_description: Lehetővé teszi a felhasználó számára, hogy más domainnekkel való föderációt engedélyezzen vagy letiltson, illetve szabályozza a kézbesítést manage_invites: Meghívások kezelése diff --git a/config/locales/is.yml b/config/locales/is.yml index 8d82adf061..15e924962e 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -792,7 +792,6 @@ is: manage_custom_emojis: Sýsla með sérsniðin lyndistákn manage_custom_emojis_description: Leyfir notendum að sýsla með sérsniðin lyndistákn á netþjóninum manage_email_subscriptions: Sýsla með tölvupóstáskriftir - manage_email_subscriptions_description: Leyfa notendum að gerast áskrifendur að tölvupósti frá notendum með þessa heimild manage_federation: Sýsla með netþjónasambönd manage_federation_description: Leyfir notendum að loka á eða leyfa samþættingu við önnur lén (federation) og stýra afhendingu skilaboða manage_invites: Sýsla með boðsgesti diff --git a/config/locales/it.yml b/config/locales/it.yml index 92ed0fb6d0..317d829cd5 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -487,6 +487,9 @@ it: resolved_dns_records_hint_html: Il nome di dominio si risolve nei seguenti domini MX, che sono in ultima analisi responsabili dell'accettazione delle e-mail. Il blocco di un dominio MX bloccherà le registrazioni da qualsiasi indirizzo e-mail che utilizzi lo stesso dominio MX, anche se il nome di dominio visibile è diverso. Fai attenzione a non bloccare i principali provider di posta elettronica. resolved_through_html: Risolto attraverso %{domain} title: Domini e-mail bloccati + email_subscriptions: + accounts: + account: Account export_domain_allows: new: title: Importare i permessi di dominio @@ -792,7 +795,6 @@ it: manage_custom_emojis: Gestisci emoji personalizzate manage_custom_emojis_description: Consente agli utenti di gestire emoji personalizzate sul server manage_email_subscriptions: Gestisci le iscrizioni via email - manage_email_subscriptions_description: Consenti agli utenti di iscriversi tramite email agli utenti, con questa autorizzazione manage_federation: Gestisci Federazione manage_federation_description: Consente agli utenti di bloccare o consentire la federazione con altri domini e controllare la consegnabilità manage_invites: Gestisci Inviti diff --git a/config/locales/nan-TW.yml b/config/locales/nan-TW.yml index ac96e97aea..513fdf8f49 100644 --- a/config/locales/nan-TW.yml +++ b/config/locales/nan-TW.yml @@ -776,7 +776,6 @@ nan-TW: manage_custom_emojis: 管理自訂ê Emoji manage_custom_emojis_description: 允准用者管理佇tsit ê服侍器ê自訂Emoji manage_email_subscriptions: 管理訂電子phue - manage_email_subscriptions_description: 允准用者用電子phue訂有chit ê權限ê用者 manage_federation: 管理聯邦 manage_federation_description: 允准用者封鎖á是允准kap其他域名相連，mā控制寄送ê能力 manage_invites: 管理邀請 diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 2baf36f4e5..8531bc6de7 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -487,6 +487,56 @@ nl: resolved_dns_records_hint_html: De domeinnaam slaat op de volgende MX-domeinen die uiteindelijk verantwoordelijk zijn voor het accepteren van e-mail. Het blokkeren van een MX-domein blokkeert aanmeldingen van elk e-mailadres dat hetzelfde MX-domein gebruikt, zelfs als de zichtbare domeinnaam anders is. Pas op dat u geen grote e-mailproviders blokkeert. resolved_through_html: Geblokkeerd via %{domain} title: Geblokkeerde e-maildomeinen + email_subscriptions: + accounts: + account: Account + active: Actief + empty: + hint: Geen enkel account heeft nog abonnees. + no_lists_yet: Nog geen lijsten + inactive: Inactief + last_email: Meest recente e-mail + status: Status + subscribers: Abonnees + title: Mailinglijsten + additional_footer_texts: + show: + title: Aanvullende voettekst + compliance_settings: + additional_footer_text: + action: Beheren + hint: Optionele tekst dat alleen onderin de e-mailnieuwsbrief verschijnt + title: Aanvullende voettekst + privacy_policy: + action: Beheren + title: Privacybeleid + title: Compliance-instellingen + danger_zone: + disable_feature: + action: Uitschakelen + hint: Functionaliteit voor alle accounts uitschakelen + title: Functionaliteit uitschakelen + erase_all_data: + action: Gegevens verwijderen + title: Alle gegevens verwijderen + title: Gevarenzone + index: + disabled: + get_started: Aan de slag + title: E-mailnieuwsbrieven + roles: + accounts: Accounts + edit_role: Rol bewerken + empty: + hint: Niemand heeft het recht om deze functionaliteit te gebruiken. + no_roles_added: Geen rollen toegevoegd + manage_roles: Rollen beheren + role_name: Naam rol + title: Rollen + setups: + show: + enable_feature: Functionaliteit inschakelen + important_information: Belangrijke informatie export_domain_allows: new: title: Toegestane domeinen importeren @@ -792,7 +842,6 @@ nl: manage_custom_emojis: Lokale emoji's beheren manage_custom_emojis_description: Staat gebruikers toe om lokale emoji's op de server te beheren manage_email_subscriptions: E-mailabonnementen beheren - manage_email_subscriptions_description: Sta gebruikers toe om zich per e-mail te abonneren op gebruikers met deze rechten manage_federation: Federatie beheren manage_federation_description: Staat gebruikers toe om federatie met andere domeinen te blokkeren of toe te staan en om de bezorging te bepalen manage_invites: Uitnodigingen beheren @@ -1745,7 +1794,9 @@ nl: title_html: "%{name} werkte een verzameling bij waar jij in zit" generic: sign_in: In de Mastodon web-app inloggen + summary_html: Je gebruikt een app die de meest recente versie van Mastodon niet ondersteunt. Ga naar %{link} voor de volledige functionaliteit. moderation_warning: + summary_html: Je gebruikt een app die de meest recente versie van Mastodon niet ondersteunt. %{link}. title: Je hebt een moderatie-waarschuwing ontvangen. severed_relationships: summary_html: Een beheerder van %{from} heeft %{target} geschorst, wat betekent dat je geen updates meer van deze gebruiker kunt ontvangen of met deze gebruiker kunt communiceren. Ga naar %{link} voor een overzicht van verloren verbindingen. diff --git a/config/locales/nn.yml b/config/locales/nn.yml index ecf2d27290..7e32990452 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -792,7 +792,6 @@ nn: manage_custom_emojis: Handtere tilpassa emojiar manage_custom_emojis_description: Let brukarar handtere tilpassa emojiar på tenaren manage_email_subscriptions: Handter epostabonnement - manage_email_subscriptions_description: Folk kan abonnera på brukarar med dette løyvet via epost manage_federation: Handtere føderasjon manage_federation_description: Let brukarar blokkera eller tillata føderasjon med andre domener, samt styra kva som skal leverast manage_invites: Handsam innbydingar diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 9fa6084d3e..b19d0e34cf 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -792,7 +792,6 @@ pt-BR: manage_custom_emojis: Gerenciar Emojis Personalizados manage_custom_emojis_description: Permite aos usuários gerenciar emojis personalizados no servidor manage_email_subscriptions: Gerenciar assinaturas do e-mail - manage_email_subscriptions_description: Permitir que usuários se inscrevam com essa permissão por e-mail manage_federation: Gerenciar Federação manage_federation_description: Permite aos usuários bloquear ou permitir federação com outros domínios e controlar a entregabilidade manage_invites: Gerenciar convites diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index cb190e250c..84cec11eab 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -792,7 +792,6 @@ pt-PT: manage_custom_emojis: Gerir emojis personalizados manage_custom_emojis_description: Permite aos utilizadores gerirem os emojis personalizados do servidor manage_email_subscriptions: Gerir Subscrições de E-mail - manage_email_subscriptions_description: Permitir que os utilizadores subscrevam por e-mail às atualizações dos utilizadores com esta permissão manage_federation: Gerir federação manage_federation_description: Permite aos utilizadores bloquearem ou permitirem a federação com outros domínios e controlar a entregabilidade manage_invites: Gerir convites diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml index 99e4525106..6f6c3352fa 100644 --- a/config/locales/simple_form.da.yml +++ b/config/locales/simple_form.da.yml @@ -92,6 +92,7 @@ da: closed_registrations_message: Vises, når tilmeldinger er lukket content_cache_retention_period: Alle indlæg fra andre servere (herunder fremhævelser og besvarelser) slettes efter det angivne antal dage uden hensyn til lokal brugerinteraktion med disse indlæg. Dette omfatter indlæg, hvor en lokal bruger har markeret dem som bogmærker eller favoritter. Private omtaler mellem brugere fra forskellige instanser vil også være tabt og umulige at gendanne. Brugen af denne indstilling er beregnet til særlige formål instanser og bryder mange brugerforventninger ved implementering til almindelig brug. custom_css: Man kan anvende tilpassede stilarter på Mastodon-webversionen. + email_footer_text: Valgfri tekst, der vises i sidefoden på e-mail-nyhedsbreve. favicon: WEBP, PNG, GIF eller JPG. Tilsidesætter standard Mastodon favikonet på mobilenheder med et tilpasset ikon. landing_page: Vælger, hvilken side nye besøgende ser, når de først ankommer til din server. Hvis du vælger "Trender", skal trends være aktiveret i Opdagelse-indstillingerne. Hvis du vælger "Lokalt feed", skal "Adgang til live feeds med lokale indlæg" være indstillet til "Alle" i Opdagelse-indstillingerne. mascot: Tilsidesætter illustrationen i den avancerede webgrænseflade. @@ -294,6 +295,7 @@ da: closed_registrations_message: Tilpasset besked, når tilmelding er utilgængelig content_cache_retention_period: Opbevaringsperiode for eksternt indhold custom_css: Tilpasset CSS + email_footer_text: Yderligere tekst til sidefod favicon: Favikon landing_page: Landingside for nye besøgende local_live_feed_access: Adgang til live feeds med lokale indlæg @@ -322,6 +324,9 @@ da: trendable_by_default: Tillad ikke-reviderede trends trends: Aktivér trends wrapstodon: Aktivér Wrapstodon + form_email_subscriptions_confirmation: + agreement_email_volume: Jeg er indforstået med, at aktivering af denne funktion kan medføre en betydelig stigning i antallet af e-mails, der sendes fra serveren, og at jeg alene er ansvarlig for eventuelle omkostninger i den forbindelse. + agreement_privacy_and_terms: Jeg har opdateret privatlivspolitikken og servicevilkårene. interactions: must_be_follower: Blokér notifikationer fra bruger, der ikke følger dig must_be_following: Blokér notifikationer fra brugere, du ikke følger diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml index 2a346840dc..26f62f2737 100644 --- a/config/locales/simple_form.el.yml +++ b/config/locales/simple_form.el.yml @@ -92,6 +92,7 @@ el: closed_registrations_message: Εμφανίζεται όταν κλείνουν οι εγγραφές content_cache_retention_period: Όλες οι αναρτήσεις από άλλους διακομιστές (συμπεριλαμβανομένων των ενισχύσεων και απαντήσεων) θα διαγραφούν μετά τον καθορισμένο αριθμό ημερών, χωρίς να λαμβάνεται υπόψη οποιαδήποτε αλληλεπίδραση τοπικού χρήστη με αυτές τις αναρτήσεις. Αυτό περιλαμβάνει αναρτήσεις όπου ένας τοπικός χρήστης την έχει χαρακτηρίσει ως σελιδοδείκτη ή αγαπημένη. Θα χαθούν επίσης ιδιωτικές επισημάνσεις μεταξύ χρηστών από διαφορετικές οντότητες και θα είναι αδύνατο να αποκατασταθούν. Η χρήση αυτής της ρύθμισης προορίζεται για οντότητες ειδικού σκοπού και χαλάει πολλές προσδοκίες του χρήστη όταν εφαρμόζεται για χρήση γενική σκοπού. custom_css: Μπορείς να εφαρμόσεις προσαρμοσμένα στυλ στην έκδοση ιστού του Mastodon. + email_footer_text: Προαιρετικό κείμενο που εμφανίζεται στο υποσέλιδο των email ενημερωτικού δελτίου μόνο. favicon: WEBP, PNG, GIF ή JPG. Παρακάμπτει το προεπιλεγμένο favicon του Mastodon με ένα προσαρμοσμένο εικονίδιο. landing_page: Επιλέγει ποια σελίδα βλέπουν οι νέοι επισκέπτες όταν φτάνουν για πρώτη φορά στο διακομιστή σας. Αν επιλέξετε "Τάσεις", τότε οι τάσεις πρέπει να είναι ενεργοποιημένες στις Ρυθμίσεις Ανακάλυψης. Αν επιλέξετε "Τοπική ροή", τότε το "Πρόσβαση σε ζωντανές ροές με τοπικές αναρτήσεις" πρέπει να οριστεί σε "Όλοι" στις Ρυθμίσεις Ανακάλυψης. mascot: Παρακάμπτει την εικονογραφία στην προηγμένη διεπαφή ιστού. @@ -294,6 +295,7 @@ el: closed_registrations_message: Προσαρμοσμένο μήνυμα όταν οι εγγραφές δεν είναι διαθέσιμες content_cache_retention_period: Περίοδος διατήρησης απομακρυσμένου περιεχομένου custom_css: Προσαρμοσμένη CSS + email_footer_text: Πρόσθετο κείμενο υποσέλιδου favicon: Favicon landing_page: Σελίδα προσγείωσης για νέους επισκέπτες local_live_feed_access: Πρόσβαση σε ζωντανές ροές με ανάδειξη τοπικών αναρτήσεων @@ -322,6 +324,9 @@ el: trendable_by_default: Επίτρεψε τις τάσεις χωρίς προηγούμενο έλεγχο trends: Ενεργοποίηση τάσεων wrapstodon: Ενεργοποίηση Wrapstodon + form_email_subscriptions_confirmation: + agreement_email_volume: Κατανοώ ότι η ενεργοποίηση αυτής της λειτουργίας μπορεί να αυξήσει σημαντικά τον όγκο των μηνυμάτων email που αποστέλλονται από τον διακομιστή και ότι είμαι αποκλειστικά υπεύθυνος για κάθε κόστος που θα προκύψει. + agreement_privacy_and_terms: Έχω ενημερώσει την Πολιτική Απορρήτου και τους Όρους Υπηρεσίας. interactions: must_be_follower: Μπλόκαρε τις ειδοποιήσεις από όσους δεν σε ακολουθούν must_be_following: Μπλόκαρε τις ειδοποιήσεις από όσους δεν ακολουθείς diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml index 0988e6b910..178a0b5700 100644 --- a/config/locales/simple_form.es-AR.yml +++ b/config/locales/simple_form.es-AR.yml @@ -92,6 +92,7 @@ es-AR: closed_registrations_message: Mostrado cuando los registros están cerrados content_cache_retention_period: Todos los mensajes de otros servidores (incluyendo adhesiones y respuestas) se eliminarán después del número de días especificado, sin tener en cuenta la interacción del usuario local con esos mensajes. Esto incluye mensajes que un usuario local haya agregado a marcadores o los haya marcado como favoritos. Las menciones privadas entre usuarios de diferentes servidores también se perderán y también serán imposibles de restaurar. El uso de esta configuración está destinado a servidores de propósito especial y rompe muchas expectativas de los usuarios cuando se implementa para uso general. custom_css: Podés aplicar estilos personalizados a la versión web de Mastodon. + email_footer_text: Texto opcional que aparece solo en el pie de los correos electrónicos del boletín de noticias. favicon: WEBP, PNG, GIF o JPG. Reemplaza el favicón predeterminado de Mastodon con uno personalizado. landing_page: Selecciona qué página se carga para los nuevos visitantes cuando llegan por primera vez a tu servidor. Si seleccionás «Tendencias», entonces las tendencias tienen que estar habilitadas en la configuración de «Descubrimiento». Si seleccionás «Línea temporal local», entonces «Acceso a líneas temporales en vivo, destacando mensajes locales» tiene que estar establecida a «Todos» en la configuración de «Descubrimiento». mascot: Reemplaza la ilustración en la interface web avanzada. @@ -294,6 +295,7 @@ es-AR: closed_registrations_message: Mensaje personalizado cuando los registros no están disponibles content_cache_retention_period: Período de retención de contenido remoto custom_css: CSS personalizado + email_footer_text: Texto de pie de página adicional favicon: Favicón landing_page: Página de carga para nuevos visitantes local_live_feed_access: Acceso a líneas temporales en vivo, destacando mensajes locales @@ -322,6 +324,9 @@ es-AR: trendable_by_default: Permitir tendencias sin revisión previa trends: Habilitar tendencias wrapstodon: Habilitar MastodonAnual + form_email_subscriptions_confirmation: + agreement_email_volume: Entiendo que habilitar esta función puede aumentar significativamente el volumen de correos electrónicos enviados desde el servidor y que soy la única persona responsable de cualquier coste incurrido. + agreement_privacy_and_terms: Actualicé la política de privacidad y los términos del servicio. interactions: must_be_follower: Bloquear notificaciones de cuentas que no te siguen must_be_following: Bloquear notificaciones de cuentas que no seguís diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml index f9d4a7a6f0..9eb9d85446 100644 --- a/config/locales/simple_form.es-MX.yml +++ b/config/locales/simple_form.es-MX.yml @@ -92,6 +92,7 @@ es-MX: closed_registrations_message: Mostrado cuando los registros están cerrados content_cache_retention_period: Todas las publicaciones de otros servidores (incluyendo impuestos y respuestas) serán borrados después del número de días especificado, sin tener en cuenta cualquier interacción del usuario local con esas publicaciones. Esto incluye los mensajes que un usuario local haya marcado como favoritos. Las menciones privadas entre usuarios de diferentes instancias también se perderán y será imposible restaurarlas. El uso de esta configuración está pensado para instancias de propósito especial y rompe muchas expectativas de los usuarios cuando se implementa para uso general. custom_css: Puedes aplicar estilos personalizados a la versión web de Mastodon. + email_footer_text: Texto opcional que aparece únicamente en el pie de los correos electrónicos del boletín de correo electrónico. favicon: WEBP, PNG, GIF o JPG. Reemplaza el icono predeterminado de Mastodon con un icono personalizado. landing_page: Selecciona qué página ven los nuevos visitantes cuando llegan por primera vez a tu servidor. Si seleccionas "Tendencias", entonces las tendencias deben estar habilitadas en la Configuración de Descubrimiento. Si selecciona "Cronología local", entonces "Acceso a las cronologías que destacan publicaciones locales" debe configurarse a "Todos" en la Configuración de Descubrimiento. mascot: Reemplaza la ilustración en la interfaz web avanzada. @@ -294,6 +295,7 @@ es-MX: closed_registrations_message: Mensaje personalizado cuando los registros no están disponibles content_cache_retention_period: Periodo de conservación de contenidos remotos custom_css: CSS personalizado + email_footer_text: Texto de pie de página adicional favicon: Favicon landing_page: Página de inicio para nuevos visitantes local_live_feed_access: Acceso a las cronologías que destacan publicaciones locales @@ -322,6 +324,9 @@ es-MX: trendable_by_default: Permitir tendencias sin revisión previa trends: Habilitar tendencias wrapstodon: Habilitar Wrapstodon + form_email_subscriptions_confirmation: + agreement_email_volume: Entiendo que activar esta característica puede aumentar significativamente el volumen de correos electrónicos enviados desde el servidor, y que soy el único responsable de cualquier coste incurrido. + agreement_privacy_and_terms: He actualizado la Política de Privacidad y los Términos del Servicio. interactions: must_be_follower: Bloquear notificaciones de personas que no te siguen must_be_following: Bloquear notificaciones de personas que no sigues diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml index 07ba58d25e..e173cb48f3 100644 --- a/config/locales/simple_form.es.yml +++ b/config/locales/simple_form.es.yml @@ -92,6 +92,7 @@ es: closed_registrations_message: Mostrado cuando los registros están cerrados content_cache_retention_period: Todas las publicaciones de otros servidores (incluso impulsos y respuestas) se eliminarán después del número de días especificado, sin tener en cuenta la interacción del usuario local con esos mensajes. Esto incluye mensajes donde un usuario local los ha marcado como marcadores o favoritos. Las menciones privadas entre usuarios de diferentes instancias también se perderán sin posibilidad de recuperación. El uso de esta configuración está destinado a instancias de propósito especial, y rompe muchas expectativas de los usuarios cuando se implementa para un uso de propósito general. custom_css: Puedes aplicar estilos personalizados a la versión web de Mastodon. + email_footer_text: Texto opcional que aparece únicamente en el pie de los correos electrónicos del boletín de correo electrónico. favicon: WEBP, PNG, GIF o JPG. Reemplaza el favicon predeterminado de Mastodon con un icono personalizado. landing_page: Selecciona qué página ven los nuevos visitantes cuando llegan por primera vez a tu servidor. Si seleccionas "Tendencias", entonces las tendencias deben estar habilitadas en la Configuración de Descubrimiento. Si selecciona "Cronología local", entonces "Acceso a las cronologías que destacan publicaciones locales" debe configurarse a "Todos" en la Configuración de Descubrimiento. mascot: Reemplaza la ilustración en la interfaz web avanzada. @@ -294,6 +295,7 @@ es: closed_registrations_message: Mensaje personalizado cuando los registros no están disponibles content_cache_retention_period: Período de retención de contenido remoto custom_css: CSS personalizado + email_footer_text: Texto de pie de página adicional favicon: Favicon landing_page: Página de inicio para nuevos visitantes local_live_feed_access: Acceso a las cronologías que destacan publicaciones locales @@ -322,6 +324,9 @@ es: trendable_by_default: Permitir tendencias sin revisión previa trends: Habilitar tendencias wrapstodon: Habilitar Wrapstodon + form_email_subscriptions_confirmation: + agreement_email_volume: Entiendo que activar esta característica puede aumentar significativamente el volumen de correos electrónicos enviados desde el servidor, y que soy el único responsable de cualquier coste incurrido. + agreement_privacy_and_terms: He actualizado la Política de Privacidad y los Términos del Servicio. interactions: must_be_follower: Bloquear notificaciones de personas que no te siguen must_be_following: Bloquear notificaciones de personas que no sigues diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml index 33e826cf14..004d7b7ab7 100644 --- a/config/locales/simple_form.fi.yml +++ b/config/locales/simple_form.fi.yml @@ -294,6 +294,7 @@ fi: closed_registrations_message: Mukautettu viesti, kun rekisteröityminen ei ole saatavilla content_cache_retention_period: Etäsisällön säilytysaika custom_css: Mukautettu CSS + email_footer_text: Alatunnisteen lisäteksti favicon: Sivustokuvake landing_page: Uusien kävijöiden aloitussivu local_live_feed_access: Pääsy paikallisia julkaisuja esitteleviin livesyötteisiin diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml index ea609dd40d..05ab3ee4ed 100644 --- a/config/locales/simple_form.it.yml +++ b/config/locales/simple_form.it.yml @@ -92,6 +92,7 @@ it: closed_registrations_message: Visualizzato alla chiusura delle iscrizioni content_cache_retention_period: Tutti i post da altri server (inclusi booster e risposte) verranno eliminati dopo il numero specificato di giorni, senza tener conto di eventuali interazioni con gli utenti locali con tali post. Questo include i post in cui un utente locale ha contrassegnato come segnalibri o preferiti. Anche le menzioni private tra utenti di diverse istanze andranno perse e impossibile da ripristinare. L'uso di questa impostazione è inteso per casi di scopo speciale e rompe molte aspettative dell'utente quando implementato per uso generale. custom_css: È possibile applicare stili personalizzati sulla versione web di Mastodon. + email_footer_text: Testo opzionale che compare solo nel piè di pagina delle email della newsletter. favicon: WEBP, PNG, GIF o JPG. Sostituisce la favicon predefinita di Mastodon con un'icona personalizzata. landing_page: Seleziona quale pagina vedono i nuovi visitatori al loro primo arrivo sul tuo server. Se selezioni "Tendenze", è necessario abilitare le tendenze nelle Impostazioni di scoperta. Se selezioni "Feed locale", allora è necessario impostare "Accesso ai feed in diretta con post locali" su "Tutti" nelle Impostazioni di scoperta. mascot: Sostituisce l'illustrazione nell'interfaccia web avanzata. @@ -294,6 +295,7 @@ it: closed_registrations_message: Messaggio personalizzato quando le iscrizioni non sono disponibili content_cache_retention_period: Periodo di ritenzione del contenuto remoto custom_css: Personalizza CSS + email_footer_text: Testo aggiuntivo a piè di pagina favicon: Favicon landing_page: Pagina di destinazione per i nuovi visitatori local_live_feed_access: Accesso ai feed dal vivo con post locali @@ -322,6 +324,9 @@ it: trendable_by_default: Consenti le tendenze senza revisione preventiva trends: Abilita le tendenze wrapstodon: Abilita Wrapstodon + form_email_subscriptions_confirmation: + agreement_email_volume: Comprendo che l'attivazione di questa funzione potrebbe aumentare significativamente il volume di email inviate dal server e che sono l'unico/a responsabile di eventuali costi sostenuti. + agreement_privacy_and_terms: Ho aggiornato l'Informativa sulla privacy e i Termini di servizio. interactions: must_be_follower: Blocca notifiche da chi non ti segue must_be_following: Blocca notifiche dalle persone che non segui diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml index 85b9f9d795..50a36f3083 100644 --- a/config/locales/simple_form.nl.yml +++ b/config/locales/simple_form.nl.yml @@ -92,6 +92,7 @@ nl: closed_registrations_message: Weergegeven wanneer registratie van nieuwe accounts is uitgeschakeld content_cache_retention_period: Alle berichten van andere servers (inclusief boosts en reacties) worden verwijderd na het opgegeven aantal dagen, ongeacht enige lokale gebruikersinteractie met die berichten. Dit betreft ook berichten die een lokale gebruiker aan diens bladwijzers heeft toegevoegd of als favoriet heeft gemarkeerd. Privéberichten tussen gebruikers van verschillende servers gaan ook verloren en zijn onmogelijk te herstellen. Het gebruik van deze instelling is bedoeld voor servers die een speciaal doel dienen en overtreedt veel gebruikersverwachtingen wanneer deze voor algemeen gebruik wordt geïmplementeerd. custom_css: Je kunt aangepaste CSS toepassen op de webversie van deze Mastodon-server. + email_footer_text: Optionele tekst dat alleen onderin de e-mailnieuwsbrieven verschijnt. favicon: WEBP, PNG, GIF of JPG. Vervangt de standaard Mastodon favicon met een aangepast pictogram. landing_page: Selecteert welke pagina nieuwe bezoekers te zien krijgen wanneer ze voor het eerst op jouw server terechtkomen. Wanneer je ‘Trends’ selecteert, moeten trends ingeschakeld zijn onder 'Serverinstellingen > Ontdekken'. Wanneer je ‘Lokale tijdlijn’ selecteert, moet ‘Toegang tot openbare lokale berichten’ worden ingesteld op ‘Iedereen’ onder 'Serverinstellingen > Ontdekken'. mascot: Overschrijft de illustratie in de geavanceerde webomgeving. @@ -294,6 +295,7 @@ nl: closed_registrations_message: Aangepast bericht wanneer registratie is uitgeschakeld content_cache_retention_period: Bewaartermijn voor externe inhoud custom_css: Aangepaste CSS + email_footer_text: Aanvullende voettekst favicon: Favicon landing_page: Landingspagina voor nieuwe bezoekers local_live_feed_access: Toegang tot openbare lokale berichten diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml index 656a4bfc20..8e18dc3eaa 100644 --- a/config/locales/simple_form.ru.yml +++ b/config/locales/simple_form.ru.yml @@ -60,6 +60,8 @@ ru: setting_default_quote_policy_private: Посты, созданные в Mastodon с видимостью только для подписчиков, не могут быть процитированы другими пользователями. setting_default_quote_policy_unlisted: Если кто-нибудь процитирует вас, его пост тоже будет скрыт из алгоритмических лент. setting_default_sensitive: Медиа деликатного характера скрыты по умолчанию и могут быть показаны по нажатию на них + setting_display_media_default: Показывать предупреждение перед отображением контента, отмеченного как чувствительный + setting_display_media_hide_all: Показывать предупреждение перед отображением любого контента setting_emoji_style: Как отображать эмодзи. Если выбран вариант «Автоматически», то будут использованы системные эмодзи, а для устаревших браузеров — Twemoji. setting_quick_boosting_html: Отметьте флажок, чтобы при нажатии на кнопку %{boost_icon} Продвинуть не выбирать между продвижением и цитированием, а сразу продвигать пост. Цитирование будет доступно из меню поста (%{options_icon}). setting_system_scrollbars_ui: Работает только в браузерах для ПК на основе Safari или Chrome diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml index 0785e9a1bf..24e6f4ffb1 100644 --- a/config/locales/simple_form.sq.yml +++ b/config/locales/simple_form.sq.yml @@ -293,6 +293,7 @@ sq: closed_registrations_message: Mesazh vetjak për pamundësi regjistrimesh të reja content_cache_retention_period: Periudhë mbajtjeje lënde të largët custom_css: CSS Vetjake + email_footer_text: Tekst fundfaqeje shtesë favicon: Favikonë landing_page: Faqe mbërritje për vizitorë të rinj local_live_feed_access: Hyrje te prurje të atypëratyshme që përmbajnë postime vendore diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml index 84c7e271b3..7e33b34500 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -92,6 +92,7 @@ zh-CN: closed_registrations_message: 在关闭注册时显示 content_cache_retention_period: 来自其它实例的所有嘟文（包括转嘟与回复）都将在指定天数后被删除，不论本实例用户是否与这些嘟文产生过交互。这包括被本实例用户喜欢和收藏的嘟文。实例间用户的私下提及也将丢失并无法恢复。此设置针对的是特殊用途的实例，用于一般用途时会打破许多用户的期望。 custom_css: 你可以为网页版 Mastodon 应用自定义样式。 + email_footer_text: 仅在电子报邮件页脚中显示的可选文本。 favicon: WEBP、PNG、GIF 或 JPG。使用自定义图标覆盖 Mastodon 的默认图标。 landing_page: 选择新访客首次访问你的服务器时看到的页面。 如果选择“热门”，则需要在“发现”设置中启用热门趋势。 如果选择“本站动态”，则在“发现”设置中“展示本站嘟文的实时动态访问权限”一项需要设置为“所有人”。 mascot: 覆盖高级网页界面中的绘图形象。 @@ -293,6 +294,7 @@ zh-CN: closed_registrations_message: 在关闭注册时显示的自定义消息 content_cache_retention_period: 外站内容保留期 custom_css: 自定义 CSS + email_footer_text: 附加页脚文本 favicon: Favicon landing_page: 新访客的主页 local_live_feed_access: 展示本站嘟文的实时动态访问权限 @@ -321,6 +323,9 @@ zh-CN: trendable_by_default: 允许在未审核的情况下将话题置为热门 trends: 启用热门 wrapstodon: 启用 Wrapstodon 年度回顾 + form_email_subscriptions_confirmation: + agreement_email_volume: 我已充分理解，启用此功能可能会显著增加服务器发送的电子邮件数量，且对所有因此产生的任何费用全权负责。 + agreement_privacy_and_terms: 我已更新隐私政策及服务条款。 interactions: must_be_follower: 屏蔽来自未关注我的用户的通知 must_be_following: 屏蔽来自我未关注的用户的通知 diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml index 7e5a65f020..616a9acb86 100644 --- a/config/locales/simple_form.zh-TW.yml +++ b/config/locales/simple_form.zh-TW.yml @@ -92,6 +92,7 @@ zh-TW: closed_registrations_message: 於註冊關閉時顯示 content_cache_retention_period: 所有來自其他伺服器之嘟文（包括轉嘟與回嘟）將於指定之天數後自動刪除，不論這些嘟文與本地使用者間的任何互動。這將包含本地使用者已標記為書籤或最愛之嘟文。不同站點使用者間之私訊亦將遺失且不可回復。此設定應適用於特殊情況，若常規使用將超乎多數使用者預期。 custom_css: 您於 Mastodon 網頁版本中能套用客製化風格。 + email_footer_text: 僅顯示於電子報郵件中之可選填備註文字。 favicon: WEBP、PNG、GIF、或 JPG。使用自訂圖示替代預設 Mastodon favicon 圖示。 landing_page: 選擇當新訪客第一次造訪您伺服器時所見之頁面。若您選擇「熱門趨勢」，則該功能必須於探索設定中啟用。若您選擇「本站時間軸」，則探索設定中「允許瀏覽本站嘟文之即時內容」功能必須設定為「任何人」。 mascot: 覆寫進階網頁介面中的圖例。 @@ -153,7 +154,7 @@ zh-TW: dmca_email: 能使用上述用於「法律通知用途電子郵件」之相同電子郵件。 domain: 您所提供線上服務之唯一識別。 jurisdiction: 列出帳單支付人之居住國家。若為公司或其他實體，請列出其註冊地所在的國家，及城市、地區、領土、或州別等。 - min_age: 不應低於您所屬法律管轄區要求之最低年齡。 + min_age: 不應低於您所屬司法管轄區要求之最低年齡。 user: chosen_languages: 當勾選時，公開時間軸將僅顯示所選擇語言之嘟文。此設定不會影響您首頁時間軸與列表。 date_of_birth: @@ -293,6 +294,7 @@ zh-TW: closed_registrations_message: 當註冊關閉時的客製化訊息 content_cache_retention_period: 遠端內容保留期限 custom_css: 自訂 CSS + email_footer_text: 其他備註文字 favicon: 網站圖示 (Favicon) landing_page: 新訪客之登陸頁面 local_live_feed_access: 允許瀏覽本站嘟文之即時內容 @@ -321,6 +323,9 @@ zh-TW: trendable_by_default: 允許熱門趨勢直接顯示，不需經過審核 trends: 啟用熱門趨勢 wrapstodon: 啟用 Mastodon 年度回顧 + form_email_subscriptions_confirmation: + agreement_email_volume: 我已充分理解啟用此功能可能顯著增加此伺服器寄送之電子郵件數量，並對所有產生之任何費用全權負責。 + agreement_privacy_and_terms: 我已更新隱私權政策與服務條款。 interactions: must_be_follower: 封鎖非跟隨者的通知 must_be_following: 封鎖您未跟隨之使用者的通知 diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 7ab201bc21..99e238af90 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -487,6 +487,49 @@ sq: resolved_dns_records_hint_html: Emri i përkatësisë u përket përkatësive vijuese MX, që janë përgjegjëset përfundimtare për pranim email-esh. Bllokimi i një përkatësie MX do të bllokojë regjistrime nga çfarëdo adrese email që përdor të njëjtën përkatësi MX, edhe nëse emri i dukshëm i përkatësisë është i ndryshëm. Hapni sytë të mos bllokoni shërbime të njohur email-esh. resolved_through_html: Zgjidhur përmes %{domain} title: Përkatësi email të bllokuara + email_subscriptions: + accounts: + account: Llogari + active: Aktive + empty: + hint: Ende s’ka llogari me pajtimtarë. + no_lists_yet: Ende pa lista + inactive: Joaktive + last_email: Email-i i fundit + lead: Llogaritë që kanë aktivizuar veçorinë dhe kanë pajtimtarë do të shfaqen më poshtë. + status: Gjendje + subscribers: Pajtimtarë + title: Lista postimesh + additional_footer_texts: + show: + title: Tekst fundfaqeje shtesë + compliance_settings: + additional_footer_text: + action: Administrojini + hint: Tekst opsional që shfaqet vetëm te fundfaqja e email-eve të buletinit + title: Tekst fundfaqeje shtesë + privacy_policy: + action: Administrojini + title: Rregulla privatësie + title: Rregullime përputhjeje me rregullore dhe ligje + danger_zone: + disable_feature: + action: Çaktivizoje + title: Çaktivizoje veçorinë + erase_all_data: + action: Fshiji të dhënat + title: Fshiji krejt të dhënat + title: Zonë rreziku + index: + title: Dërgoni buletine me email + roles: + manage_roles: Administroni role + role_name: Emër roli + title: Role + setups: + show: + enable_feature: Aktivizoje veçorinë + important_information: Informacion i rëndësishëm export_domain_allows: new: title: Importoni lejime përkatësish @@ -787,7 +830,6 @@ sq: manage_custom_emojis: Të Administrojë Emoxhi Vetjake manage_custom_emojis_description: U lejon përdoruesve të administrojnë te shërbyesi emoxhi vetjake manage_email_subscriptions: Administroni Pajtime Me Email - manage_email_subscriptions_description: Lejojini përdoruesit të pajtohen me email te përdorues me këtë leje manage_federation: Të Administrojë Federim manage_federation_description: U lejon përdoruesve të bllokojnë ose lejojnë federim me përkatësi të tjera dhe të kontrollojnë shpërndarjen manage_invites: Të Administrojë Ftesa diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 8a7262b096..3d00d95195 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -792,7 +792,6 @@ sv: manage_custom_emojis: Hantera egna emojier manage_custom_emojis_description: Tillåter användare att hantera egna emojier på servern manage_email_subscriptions: Hantera e-postprenumerationer - manage_email_subscriptions_description: Tillåt användare att prenumerera på användare med denna behörighet via e-post manage_federation: Hantera federering manage_federation_description: Tillåter användare att blockera eller tillåta federering med andra domäner, samt kontrollera levererbarhet manage_invites: Hantera inbjudningar diff --git a/config/locales/tr.yml b/config/locales/tr.yml index b601f2d36d..2c05c635c6 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -792,7 +792,6 @@ tr: manage_custom_emojis: Özel İfadeleri Yönetme manage_custom_emojis_description: Kullanıcıların sunucudaki özel ifadeleri yönetmesine izin verir manage_email_subscriptions: E-posta Aboneliklerini Yönet - manage_email_subscriptions_description: Kullanıcılara bu izne sahip diğer kullanıcıları e-posta yoluyla takip etme olanağı verin manage_federation: Birleştirme Yönetme manage_federation_description: Kullanıcıların diğer alan adlarıyla birleştirmeye izin vermesi veya engellemesine ve teslim edilebilirliği denetlemesine izin verir manage_invites: Davetleri Yönetme @@ -1731,6 +1730,27 @@ tr: copy_account_note_text: 'Bu kullanıcı %{acct} adresinden taşındı, işte onlarla ilgili önceki notlarınız:' navigation: toggle_menu: Menüyü aç/kapa + notification_fallbacks: + added_to_collection: + title_html: "%{name} sizi bir koleksiyona ekledi" + admin_report: + title_html: "%{name}, %{target} kişisini bildirdi" + admin_sign_up: + title_and_others_html: + one: "%{name} ve bir kişi kaydoldu" + other: "%{name} ve %{count} kişi kaydoldu" + title_html: "%{name} kayıt oldu" + collection_update: + title_html: "%{name} olduğunuz bir koleksiyonu güncelledi" + generic: + sign_in: Mastodon web uygulamasını kullanmak için oturum açın + summary_html: Şu anda Mastodon'un en son sürümünü desteklemeyen bir uygulamayı kullanıyorsunuz. Tüm özelliklerden yararlanmak için %{link} adresini ziyaret edin. + moderation_warning: + summary_html: Şu anda Mastodon'un en son sürümünü desteklemeyen bir uygulamayı kullanıyorsunuz. %{link}. + title: Hesabınız bir denetim uyarısı aldı. + severed_relationships: + summary_html: "%{from} adresinden bir yönetici, %{target} hesabını askıya aldı; bu nedenle artık bu hesaptan güncellemeler alamayacak ve bu hesapla etkileşimde bulunamayacaksınız. Kaybedilen ilişkilerin listesini görmek için %{link} adresine tıklayın." + title: "%{name} ile bağlantılar koptu" notification_mailer: admin: report: diff --git a/config/locales/vi.yml b/config/locales/vi.yml index f4aee09dd8..fd29b46fce 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -776,7 +776,6 @@ vi: manage_custom_emojis: Quản lý emoji manage_custom_emojis_description: Cho phép quản lý các emoji tùy chỉnh trên máy chủ manage_email_subscriptions: Quản lý đăng ký đọc qua email - manage_email_subscriptions_description: Cho phép người dùng đăng ký nhận thông báo qua email từ những người dùng có quyền này manage_federation: Quản lý liên hợp manage_federation_description: Cho phép chặn hoặc liên hợp với các máy chủ khác và kiểm soát khả năng phân phối manage_invites: Quản lý lời mời diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 96f026c317..7c02995de8 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -477,6 +477,71 @@ zh-CN: resolved_dns_records_hint_html: 该域名解析的 MX 记录所指向的域名如下，这些域名被用于接收电子邮件。 即使电子邮件地址域名与 MX 域名不同，屏蔽一个 MX 域名意味着阻止任何使用相同 MX 域名的邮箱地址注册本站账号。 请谨慎操作，不要误屏蔽主要的邮箱提供商。 resolved_through_html: 通过 %{domain} 解析 title: 被封禁的邮箱域名 + email_subscriptions: + accounts: + account: 账号 + active: 已生效 + empty: + hint: 目前还没有账号拥有订阅者。 + no_lists_yet: 尚无列表 + inactive: 未生效 + last_email: 最新电子邮件 + lead: 已启用此功能并拥有订阅者的账号会在下方显示。 + status: 状态 + subscribers: 订阅者 + title: 邮件列表 + additional_footer_texts: + show: + title: 附加页脚文本 + compliance_settings: + additional_footer_text: + action: 管理 + hint: 仅在电子报邮件页脚中显示的可选文本 + title: 附加页脚文本 + lead: 取决于你服务器运行所在的司法管辖区，邮件电子报可能被视作营销邮件。 + privacy_policy: + action: 管理 + hint: 每封邮件的页脚都会包含指向此政策的链接 + title: 隐私政策 + title: 合规设置 + danger_zone: + disable_feature: + action: 禁用 + hint: 为所有账号关闭此功能 + title: 禁用功能 + erase_all_data: + action: 清除数据 + hint: 永久删除所有邮件列表中的所有电子邮件地址 + title: 清除所有数据 + title: 危险操作区 + disabled_msg: 已成功禁用电子邮件订阅。 + index: + disabled: + cannot_be_enabled: 你的技术提供商尚未为你的服务器启用此功能。 + description: 此功能允许指定账号在个人资料页添加微件小工具，使没有 Mastodon 账号的访客也能通过电子邮件接受此账号的嘟文。 + get_started: 开始使用 + lead: 允许访客通过电子邮件接收此服务器上指定账号的内容。 + title: 邮件电子报 + purged_msg: 正在清除所有电子邮件订阅数据。 + roles: + accounts: 账号 + edit_role: 编辑角色 + empty: + hint: 没有人具备使用此功能的权限。 + no_roles_added: 没有添加角色 + lead: 具有下列角色的账号可以在其个人资料中启用此功能。 + manage_roles: 管理角色 + role_name: 角色名称 + title: 角色 + setups: + show: + enable_feature: 启用功能 + important_information: 重要信息 + list: + 1_permission_explanation: 此功能启用时，具有指定权限的账号可以在个人资料页面添加电子邮件收集表单。 + 2_feature_explanation: 访客在账号的个人资料页面注册并确认订阅后，将于所订阅账号发表新的公开嘟文时收到电子邮件推送。 + 3_privacy_policy_warning: 服务器管理员将可以访问收集到的个人信息（此处为电子邮件地址）。因此，使用此功能前必须更新服务器的隐私政策及服务条款。 + 4_cost_warning: 取决于托管设置，发送电子邮件时可能产生额外费用。由于此功能可能会大幅增加你服务器发送电子邮件的数量，请在启用前和你的托管服务提供商进行联系。 export_domain_allows: new: title: 导入域名允许列表 @@ -776,7 +841,7 @@ zh-CN: manage_custom_emojis: 管理自定义表情 manage_custom_emojis_description: 允许用户管理站点上的自定义表情 manage_email_subscriptions: 管理邮件订阅 - manage_email_subscriptions_description: 允许其他用户通过电子邮件订阅具备此权限的用户 + manage_email_subscriptions_description: 允许拥有此权限的用户为其账号启用邮件电子报功能 manage_federation: 管理联合 manage_federation_description: 允许用户禁止或允许本站同其他站点的联合，并控制消息投递能力 manage_invites: 管理邀请 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 7dd91d1c2c..d2ff545b17 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -49,7 +49,7 @@ zh-TW: title: 為 %{username} 變更電子郵件地址 change_role: changed_msg: 成功修改角色！ - edit_roles: 管理使用者權限 + edit_roles: 管理使用者角色權限 label: 變更角色 no_role: 沒有角色 title: 為 %{username} 變更角色 @@ -477,6 +477,71 @@ zh-TW: resolved_dns_records_hint_html: 網域名稱解析為以下 MX 網域，這些網域最終負責接收電子郵件。封鎖 MX 網域將會封鎖任何來自使用相同 MX 網域的電子郵件註冊，即便可見的域名是不同的也一樣。請注意，不要封鎖主要的電子郵件服務提供商。 resolved_through_html: 透過 %{domain} 解析 title: 已封鎖電子郵件網域 + email_subscriptions: + accounts: + account: 帳號 + active: 生效中 + empty: + hint: 尚無任何擁有訂閱者之帳號。 + no_lists_yet: 尚無列表 + inactive: 已停用 + last_email: 最新電子郵件地址 + lead: 已啟用此功能並擁有訂閱者之帳號將於下方顯示。 + status: 狀態 + subscribers: 訂閱者 + title: 電子郵件列表 + additional_footer_texts: + show: + title: 其他備註文字 + compliance_settings: + additional_footer_text: + action: 管理 + hint: 僅顯示於電子報郵件中之可選填備註文字 + title: 其他備註文字 + lead: 電子報可能被視為數位行銷電子郵件，取決於您所運行伺服器之司法管轄區。 + privacy_policy: + action: 管理 + hint: 此政策將連結於每封電子郵件之信尾 + title: 隱私權政策 + title: 法律遵循設定 + danger_zone: + disable_feature: + action: 停用 + hint: 替所有帳號關閉此功能 + title: 停用功能 + erase_all_data: + action: 清除資料 + hint: 於所有電子郵件列表永久刪除所有電子郵件地址 + title: 清除所有資料 + title: 危險區域！ + disabled_msg: 已成功停用電子郵件訂閱。 + index: + disabled: + cannot_be_enabled: 您的技術提供商未替您伺服器啟用此功能。 + description: 此功能允許指定帳號於他們的個人檔案中新增小工具，使沒有 Mastodon 帳號之訪客也能透過電子郵件接收他們的嘟文。 + get_started: 開始使用 + lead: 允許訪客透過電子郵件接收此伺服器上指定帳號內容。 + title: 電子報 + purged_msg: 已清除所有電子郵件訂閱資料。 + roles: + accounts: 帳號 + edit_role: 編輯角色 + empty: + hint: 無人有權使用此功能。 + no_roles_added: 尚未加入角色 + lead: 擁有以下角色之帳號能於他們的個人檔案中啟用此功能。 + manage_roles: 管理角色 + role_name: 角色名稱 + title: 角色 + setups: + show: + enable_feature: 啟用功能 + important_information: 重要資訊 + list: + 1_permission_explanation: 當啟用此功能時，具有指定權限之帳號能於其個人檔案中新增電子郵件清單。 + 2_feature_explanation: 訪客於帳號個人檔案頁面註冊並確認訂閱後，該帳號發表公開嘟文時，他們將會收到電子郵件通訊。 + 3_privacy_policy_warning: 伺服器管理員將能存取收集到的 PII （電子郵件地址）。有鑑於此，啟用此功能前務必更新此伺服器之隱私權政策與服務條款。 + 4_cost_warning: 依據伺服器託管方式，電子郵件可能產生額外費用。由於此功能可能大幅增加您的伺服器寄送電子郵件數量，請於啟用前聯繫您的服務提供商。 export_domain_allows: new: title: 匯入網域白名單 @@ -776,7 +841,7 @@ zh-TW: manage_custom_emojis: 管理自訂 emoji 表情符號 manage_custom_emojis_description: 允許使用者管理伺服器上之自訂 emoji 表情符號 manage_email_subscriptions: 管理電子郵件訂閱 - manage_email_subscriptions_description: 此權限允許使用者透過電子郵件訂閱其他使用者動態 + manage_email_subscriptions_description: 允許擁有此權限之使用者替他們帳號啟用電子報功能 manage_federation: 管理聯邦宇宙 manage_federation_description: 允許使用者封鎖或允許與其他網域的聯邦宇宙，並控制傳遞能力 manage_invites: 管理邀請 From 3bc27b9b6441fddc143750e369125ab14cd9ae05 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 5 May 2026 16:46:47 +0200 Subject: [PATCH 5/7] Resolve unknown tagged collections in remote posts (#38900) --- app/lib/activitypub/activity/create.rb | 11 +++++ .../process_status_update_service.rb | 18 +++++++- .../tagged_collection_resolve_worker.rb | 24 ++++++++++ spec/lib/activitypub/activity/create_spec.rb | 25 ++++++++--- .../process_status_update_service_spec.rb | 4 ++ .../tagged_collection_resolve_worker_spec.rb | 44 +++++++++++++++++++ 6 files changed, 118 insertions(+), 8 deletions(-) create mode 100644 app/workers/tagged_collection_resolve_worker.rb create mode 100644 spec/workers/tagged_collection_resolve_worker_spec.rb diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 3b86d561c4..9d79a963ac 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -47,6 +47,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity @mentions = [] @tagged_objects = [] @unresolved_mentions = [] + @unresolved_collections = [] @silenced_account_ids = [] @params = {} @quote = nil @@ -68,6 +69,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity resolve_thread(@status) resolve_unresolved_mentions(@status) + resolve_unresolved_collections(@status) fetch_replies(@status) fetch_and_verify_quote distribute @@ -286,8 +288,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity # TODO: We probably want to resolve unknown objects and push them to an `@unresolved_tagged_objects` on failure collection = ActivityPub::TagManager.instance.uri_to_resource(tag['id'], Collection) + collection ||= ActivityPub::FetchRemoteFeaturedCollectionService.new.call(tag['id'], request_id: @options[:request_id]) @tagged_objects << TaggedObject.new(uri: ActivityPub::TagManager.instance.uri_for(collection), object: collection, ap_type: 'FeaturedCollection') if collection.present? + rescue Mastodon::UnexpectedResponseError, *Mastodon::HTTP_CONNECTION_ERRORS + @unresolved_collections << tag['id'] end def process_attachments @@ -378,6 +383,12 @@ class ActivityPub::Activity::Create < ActivityPub::Activity end end + def resolve_unresolved_collections(status) + @unresolved_collections.uniq.each do |uri| + TaggedCollectionResolveWorker.perform_in(rand(PROCESSING_DELAY), status.id, uri, { 'request_id' => @options[:request_id] }) + end + end + def fetch_replies(status) collection = @object['replies'] return if collection.blank? diff --git a/app/services/activitypub/process_status_update_service.rb b/app/services/activitypub/process_status_update_service.rb index a76c49ca08..954e5f0de0 100644 --- a/app/services/activitypub/process_status_update_service.rb +++ b/app/services/activitypub/process_status_update_service.rb @@ -237,11 +237,22 @@ class ActivityPub::ProcessStatusUpdateService < BaseService end def update_tagged_objects! + unresolved_tagged_objects = [] + current_tagged_objects = @raw_tagged_objects.filter_map do |tagged_object| url = tagged_object['id'] # TODO: We probably want to resolve unknown objects at authoring time - ActivityPub::TagManager.instance.uri_to_resource(url, Collection) + collection = ActivityPub::TagManager.instance.uri_to_resource(url, Collection) + collection ||= ActivityPub::FetchRemoteFeaturedCollectionService.new.call(url, request_id: @request_id) + + collection + rescue Mastodon::UnexpectedResponseError, *Mastodon::HTTP_CONNECTION_ERRORS + # Since previous tagged objects are about already-known collections, + # they don't try to resolve again and won't fall into this case. + # In other words, this failure case is only for new collections and can safely be retried later + unresolved_tagged_objects << url + nil end # Any previously-unresolved URI would be resolved here @@ -252,6 +263,11 @@ class ActivityPub::ProcessStatusUpdateService < BaseService # Remove unused links @status.tagged_objects.where.not(uri: current_tagged_objects.map { |object| ActivityPub::TagManager.instance.uri_for(object) }).delete_all + + # Queue unresolved collections for later + unresolved_tagged_objects.uniq.each do |uri| + TaggedCollectionResolveWorker.perform_in(rand(PROCESSING_DELAY), @status.id, uri, { 'request_id' => @request_id }) + end end def update_mentions! diff --git a/app/workers/tagged_collection_resolve_worker.rb b/app/workers/tagged_collection_resolve_worker.rb new file mode 100644 index 0000000000..5bbfe2f248 --- /dev/null +++ b/app/workers/tagged_collection_resolve_worker.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +class TaggedCollectionResolveWorker + include Sidekiq::Worker + include ExponentialBackoff + include JsonLdHelper + + sidekiq_options queue: 'pull', retry: 7 + + def perform(status_id, uri, options = {}) + status = Status.find_by(id: status_id) + return if status.nil? + + collection = ActivityPub::TagManager.instance.uri_to_resource(uri, Collection) + collection ||= ActivityPub::FetchRemoteFeaturedCollectionService.new.call(uri, request_id: options['request_id']) + return if collection.nil? + + status.tagged_objects.upsert({ ap_type: 'FeaturedCollection', object_id: collection.id, object_type: 'Collection' }, unique_by: %w(status_id object_type object_id)) + rescue Mastodon::UnexpectedResponseError => e + response = e.response + + raise(e) unless response_error_unsalvageable?(response) + end +end diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb index f21552caf5..8dc6d9d425 100644 --- a/spec/lib/activitypub/activity/create_spec.rb +++ b/spec/lib/activitypub/activity/create_spec.rb @@ -88,10 +88,16 @@ RSpec.describe ActivityPub::Activity::Create do content: '@bob lorem ipsum', published: 1.hour.ago.utc.iso8601, updated: 1.hour.ago.utc.iso8601, - tag: { - type: 'Mention', - href: 'http://notexisting.dontexistingtld/actor', - }, + tag: [ + { + type: 'Mention', + href: 'http://notexisting.dontexistingtld/actor', + }, + { + type: 'FeaturedCollection', + id: 'http://notexisting.notexistingtld/collection', + }, + ], } end @@ -150,8 +156,10 @@ RSpec.describe ActivityPub::Activity::Create do expect(Notification.count).to eq 2 end - it 'ignores unprocessable mention', :aggregate_failures do - stub_request(:get, invalid_mention_json[:tag][:href]).to_raise(HTTP::ConnectionError) + it 'ignores unprocessable mentions and tagged collections', :aggregate_failures do + stub_request(:get, invalid_mention_json[:tag][0][:href]).to_raise(HTTP::ConnectionError) + stub_request(:get, invalid_mention_json[:tag][1][:id]).to_raise(HTTP::ConnectionError) + # When receiving the post that contains an invalid mention… described_class.new(activity_for_object(invalid_mention_json), sender, delivery: true).perform @@ -166,7 +174,10 @@ RSpec.describe ActivityPub::Activity::Create do expect(status.nil?).to be false # It has queued a mention resolve job - expect(MentionResolveWorker).to have_enqueued_sidekiq_job(status.id, invalid_mention_json[:tag][:href], anything) + expect(MentionResolveWorker).to have_enqueued_sidekiq_job(status.id, invalid_mention_json[:tag][0][:href], anything) + + # It has queued a collection resolve job + expect(TaggedCollectionResolveWorker).to have_enqueued_sidekiq_job(status.id, invalid_mention_json[:tag][1][:id], anything) end end diff --git a/spec/services/activitypub/process_status_update_service_spec.rb b/spec/services/activitypub/process_status_update_service_spec.rb index 5df86eed54..593471f1c7 100644 --- a/spec/services/activitypub/process_status_update_service_spec.rb +++ b/spec/services/activitypub/process_status_update_service_spec.rb @@ -7,6 +7,7 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do let!(:status) { Fabricate(:status, text: 'Hello world', uri: 'https://example.com/statuses/1234', account: Fabricate(:account, domain: 'example.com')) } let(:bogus_mention) { 'https://example.com/users/erroringuser' } + let(:bogus_collection) { 'https://example.com/collections/erroringcollection' } let(:payload) do { '@context': 'https://www.w3.org/ns/activitystreams', @@ -21,6 +22,7 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do { type: 'Mention', href: ActivityPub::TagManager.instance.uri_for(alice) }, { type: 'Mention', href: bogus_mention }, { type: 'FeaturedCollection', id: ActivityPub::TagManager.instance.uri_for(featured_collection) }, + { type: 'FeaturedCollection', id: bogus_collection }, ], } end @@ -39,6 +41,7 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do tags.each { |t| status.tags << t } media_attachments.each { |m| status.media_attachments << m } stub_request(:get, bogus_mention).to_raise(HTTP::ConnectionError) + stub_request(:get, bogus_collection).to_raise(HTTP::ConnectionError) end describe '#call' do @@ -50,6 +53,7 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do spoiler_text: eq('Show more') ) expect(MentionResolveWorker).to have_enqueued_sidekiq_job(status.id, bogus_mention, anything) + expect(TaggedCollectionResolveWorker).to have_enqueued_sidekiq_job(status.id, bogus_collection, anything) end context 'when the changes are only in sanitized-out HTML' do diff --git a/spec/workers/tagged_collection_resolve_worker_spec.rb b/spec/workers/tagged_collection_resolve_worker_spec.rb new file mode 100644 index 0000000000..ee5c193ec5 --- /dev/null +++ b/spec/workers/tagged_collection_resolve_worker_spec.rb @@ -0,0 +1,44 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe TaggedCollectionResolveWorker do + let(:status_id) { -42 } + let(:uri) { 'https://example.com/collections/unknown' } + + describe '#perform' do + subject { described_class.new.perform(status_id, uri, {}) } + + context 'with a non-existent status' do + it 'returns nil' do + expect(subject).to be_nil + end + end + + context 'with a valid user' do + let(:status) { Fabricate(:status) } + let(:status_id) { status.id } + + let(:service_double) { instance_double(ActivityPub::FetchRemoteFeaturedCollectionService) } + + before do + allow(ActivityPub::FetchRemoteFeaturedCollectionService).to receive(:new).and_return(service_double) + + allow(service_double) + .to receive(:call) + .with(uri, anything) do + Fabricate(:remote_collection, account: Fabricate.build(:account, domain: 'example.com'), uri: uri) + end + end + + it 'resolves the collection and adds a new tagged object', :aggregate_failures do + expect { subject } + .to change { status.reload.tagged_objects } + .from([]) + .to(a_collection_including(having_attributes(object: having_attributes(uri: uri)))) + + expect(service_double).to have_received(:call).once + end + end + end +end From 5e3e11bbfa89f3f8a4e115b5f8f4d478ba04da60 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 5 May 2026 16:46:52 +0200 Subject: [PATCH 6/7] Fix role management interface not offering to require 2FA for all users (#38906) --- app/views/admin/roles/_form.html.haml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/admin/roles/_form.html.haml b/app/views/admin/roles/_form.html.haml index 0d24e82d3c..51114beac1 100644 --- a/app/views/admin/roles/_form.html.haml +++ b/app/views/admin/roles/_form.html.haml @@ -25,12 +25,12 @@ = form.input :highlighted, wrapper: :with_label - - if current_user.role.administrator? || current_user.role != form.object - .fields-group - = form.input :require_2fa, - wrapper: :with_label +- if current_user.role.administrator? || current_user.role != form.object + .fields-group + = form.input :require_2fa, + wrapper: :with_label - %hr.spacer/ +%hr.spacer/ - if Mastodon::Feature.collections_enabled? From cb2e7705848e602b7cdc513560004715134b10d4 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 5 May 2026 17:15:55 +0200 Subject: [PATCH 7/7] Remove duplicate index `index_email_subscriptions_on_account_id` (#38907) --- ...505155103_remove_email_subscriptions_duplicate_index.rb | 7 +++++++ db/schema.rb | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20260505155103_remove_email_subscriptions_duplicate_index.rb diff --git a/db/migrate/20260505155103_remove_email_subscriptions_duplicate_index.rb b/db/migrate/20260505155103_remove_email_subscriptions_duplicate_index.rb new file mode 100644 index 0000000000..0d4a869aae --- /dev/null +++ b/db/migrate/20260505155103_remove_email_subscriptions_duplicate_index.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class RemoveEmailSubscriptionsDuplicateIndex < ActiveRecord::Migration[8.1] + def change + remove_index :email_subscriptions, :account_id + end +end diff --git a/db/schema.rb b/db/schema.rb index 62eff610c6..51e2cef103 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.1].define(version: 2026_04_23_141611) do +ActiveRecord::Schema[8.1].define(version: 2026_05_05_155103) do # These are extensions that must be enabled in order to support this database enable_extension "pg_catalog.plpgsql" @@ -516,7 +516,6 @@ ActiveRecord::Schema[8.1].define(version: 2026_04_23_141611) do t.string "locale", null: false t.datetime "updated_at", null: false t.index ["account_id", "email"], name: "index_email_subscriptions_on_account_id_and_email", unique: true - t.index ["account_id"], name: "index_email_subscriptions_on_account_id" t.index ["confirmation_token"], name: "index_email_subscriptions_on_confirmation_token", unique: true, where: "(confirmation_token IS NOT NULL)" end