Merge branch 'develop' into KisaragiEffective-patch-2

addresses #14642

.config/cypress-devcontainer.yml

@@ -2,19 +2,6 @@
 # Misskey configuration
 #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
-#   ┌────────────────────────┐
-#───┘ Initial Setup Password └─────────────────────────────────────────────────────
-
-# Password to initiate setting up admin account.
-# It will not be used after the initial setup is complete.
-#
-# Be sure to change this when you set up Misskey via the Internet.
-#
-# The provider of the service who sets up Misskey on behalf of the customer should
-# set this value to something unique when generating the Misskey config file,
-# and provide it to the customer.
-setupPassword: example_password_please_change_this_or_you_will_get_hacked
-
 #   ┌─────┐
 #───┘ URL └─────────────────────────────────────────────────────
 

.config/example.yml

@@ -59,20 +59,6 @@
 #
 # publishTarballInsteadOfProvideRepositoryUrl: true
 
-#   ┌────────────────────────┐
-#───┘ Initial Setup Password └─────────────────────────────────────────────────────
-
-# Password to initiate setting up admin account.
-# It will not be used after the initial setup is complete.
-#
-# Be sure to change this when you set up Misskey via the Internet.
-#
-# The provider of the service who sets up Misskey on behalf of the customer should
-# set this value to something unique when generating the Misskey config file,
-# and provide it to the customer.
-#
-# setupPassword: example_password_please_change_this_or_you_will_get_hacked
-
 #   ┌─────┐
 #───┘ URL └─────────────────────────────────────────────────────
 

.github/labeler.yml

@@ -6,7 +6,7 @@
 'packages/backend:test':
 - any:
   - changed-files:
-    - any-glob-to-any-file: ['packages/backend/test/**/*', 'packages/backend/test-federation/**/*']
+    - any-glob-to-any-file: ['packages/backend/test/**/*']
 
 'packages/frontend':
 - any:

.github/misskey/test.yml

@@ -1,7 +1,5 @@
 url: 'http://misskey.local'
 
-setupPassword: example_password_please_change_this_or_you_will_get_hacked
-
 # ローカルでテストするときにポートを被らないようにするためデフォルトのものとは変える(以下同じ)
 port: 61812
 

.github/workflows/check-misskey-js-autogen.yml

@@ -21,7 +21,6 @@ jobs:
         uses: actions/checkout@v4.1.1
         with:
           submodules: true
-          persist-credentials: false
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
 
       - name: setup pnpm
@@ -58,7 +57,7 @@ jobs:
           name: generated-misskey-js
           path: packages/misskey-js/generator/built/autogen
 
-  # pull_request_target safety: permissions: read-all, and no user codes are executed
+  # pull_request_target safety: permissions: read-all, and there are no secrets used in this job
   get-actual-misskey-js:
     runs-on: ubuntu-latest
     permissions:
@@ -69,7 +68,6 @@ jobs:
         uses: actions/checkout@v4.1.1
         with:
           submodules: true
-          persist-credentials: false
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
 
       - name: Upload From Merged
@@ -133,7 +131,3 @@ jobs:
           mode: delete
           message: "Thank you!"
           create_if_not_exists: false
-
-      - name: Make failure if changes are detected
-        if: steps.check-changes.outputs.changes == 'true'
-        run: exit 1

.github/workflows/lint.yml

@@ -75,7 +75,7 @@ jobs:
     - run: corepack enable
     - run: pnpm i --frozen-lockfile
     - name: Restore eslint cache
-      uses: actions/cache@v4.1.0
+      uses: actions/cache@v4.0.2
       with:
         path: ${{ env.eslint-cache-path }}
         key: eslint-${{ env.eslint-cache-version }}-${{ matrix.workspace }}-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ github.ref_name }}-${{ github.sha }}

.github/workflows/test-federation.yml

@@ -1,59 +0,0 @@
-name: Test (federation)
-
-on:
-  push:
-    branches:
-      - master
-      - develop
-    paths:
-      - packages/backend/**
-      - packages/misskey-js/**
-      - .github/workflows/test-federation.yml
-  pull_request:
-    paths:
-      - packages/backend/**
-      - packages/misskey-js/**
-      - .github/workflows/test-federation.yml
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [20.16.0]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-      - name: Install FFmpeg
-        uses: FedericoCarboni/setup-ffmpeg@v3
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4.0.3
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: 'pnpm'
-      - name: Build Misskey
-        run: |
-          corepack enable && corepack prepare
-          pnpm i --frozen-lockfile
-          pnpm build
-      - name: Setup
-        run: |
-          cd packages/backend/test-federation
-          bash ./setup.sh
-          sudo chmod 644 ./certificates/*.test.key
-      - name: Start servers
-        # https://github.com/docker/compose/issues/1294#issuecomment-374847206
-        run: |
-          cd packages/backend/test-federation
-          docker compose up -d --scale tester=0
-      - name: Test
-        run: |
-          cd packages/backend/test-federation
-          docker compose run --no-deps tester
-      - name: Stop servers
-        run: |
-          cd packages/backend/test-federation
-          docker compose down

.gitignore

@@ -37,7 +37,7 @@ coverage
 !/.config/docker_example.env
 !/.config/cypress-devcontainer.yml
 docker-compose.yml
-./compose.yml
+compose.yml
 .devcontainer/compose.yml
 !/.devcontainer/compose.yml
 

CHANGELOG.md

@@ -1,109 +1,14 @@
-## 2024.11.0
+## Unreleased
 
 ### General
-- Feat: コンテンツの表示にログインを必須にできるように
-- Feat: 過去のノートを非公開化/フォロワーのみ表示可能にできるように
-- Enhance: 依存関係の更新
-- Enhance: l10nの更新
+-
 
 ### Client
-- Enhance: Bull DashboardでRelationship Queueの状態も確認できるように  
-  (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/751)
-- Enhance: ドライブでソートができるように
-- Enhance: アイコンデコレーション管理画面の改善
-- Enhance: 「単なるラッキー」の取得条件を変更
-- Enhance: 投稿フォームでEscキーを押したときIME入力中ならフォームを閉じないように（ #10866 ）  
-- Enhance: MiAuth, OAuthの認可画面の改善
-  - どのアカウントで認証しようとしているのかがわかるように
-  - 認証するアカウントを切り替えられるように
-- Enhance: Self-XSS防止用の警告を追加
-- Enhance: カタルーニャ語 (ca-ES) に対応
-- Enhance: 個別お知らせページではMetaタグを出力するように
-- Fix: 通知の範囲指定の設定項目が必要ない通知設定でも範囲指定の設定がでている問題を修正
-- Fix: Turnstileが失敗・期限切れした際にも成功扱いとなってしまう問題を修正  
-  (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/768)
-- Fix: デッキのタイムラインカラムで「センシティブなファイルを含むノートを表示」設定が使用できなかった問題を修正
-- Fix: Encode RSS urls with escape sequences before fetching allowing query parameters to be used
-- Fix: リンク切れを修正
-= Fix: ノート投稿ボタンにホバー時のスタイルが適用されていないのを修正  
-  (Cherry-picked from https://github.com/taiyme/misskey/pull/305)
-- Fix: メールアドレス登録有効化時の「完了」ダイアログボックスの表示条件を修正
+-
 
 ### Server
-- Enhance: 起動前の疎通チェックで、DBとメイン以外のRedisの疎通確認も行うように  
-  (Based on https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/588)  
-  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/715)
-- Enhance: リモートユーザーの照会をオリジナルにリダイレクトするように
-- Fix: フォロワーへのメッセージの絵文字をemojisに含めるように
-- Fix: Nested proxy requestsを検出した際にブロックするように
-  [ghsa-gq5q-c77c-v236](https://github.com/misskey-dev/misskey/security/advisories/ghsa-gq5q-c77c-v236)
-- Fix: 招待コードの発行可能な残り数算出に使用すべきロールポリシーの値が違う問題を修正  
-  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/706)
-- Fix: 連合への配信時に、acctの大小文字が区別されてしまい正しくメンションが処理されないことがある問題を修正  
-  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/711)
-- Fix: ローカルユーザーへのメンションを含むノートが連合される際に正しいURLに変換されないことがある問題を修正  
-  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/712)
-- Fix: FTT無効時にユーザーリストタイムラインが使用できない問題を修正  
-  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/709)
-- Fix: User Webhookテスト機能のMock Payloadを修正  
+-
 
-### Misskey.js
-- Fix: Stream初期化時、別途WebSocketを指定する場合の型定義を修正
-
-## 2024.10.1
-
-### Note
-- スパム対策として、モデレータ権限を持つユーザのアクティビティが7日以上確認できない場合は自動的に招待制へと切り替え（コントロールパネル -> モデレーション -> "誰でも新規登録できるようにする"をオフに変更）るようになりました。 ( #13437 )
-	- 切り替わった際はモデレーターへお知らせとして通知されます。登録をオープンな状態で継続したい場合は、コントロールパネルから再度設定を行ってください。
-
-### General
-- Feat: ユーザーの名前に禁止ワードを設定できるように
-
-### Client
-- Enhance: タイムライン表示時のパフォーマンスを向上
-- Enhance: アーカイブした個人宛のお知らせを表示・編集できるように
-- Enhance: l10nの更新
-- Fix: メールアドレス不要でCaptchaが有効な場合にアカウント登録完了後自動でのログインに失敗する問題を修正
-
-### Server
-- Feat: モデレータ権限を持つユーザが全員7日間活動しなかった場合は自動的に招待制へと切り替えるように ( #13437 )
-- Enhance: 個人宛のお知らせは「わかった」を押すと自動的にアーカイブされるように
-- Fix: `admin/emoji/update`エンドポイントのidのみ指定した時不正なエラーが発生するバグを修正
-- Fix: RBT有効時、リノートのリアクションが反映されない問題を修正
-- Fix: キューのエラーログを簡略化するように  
-  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/649)
-
-## 2024.10.0
-
-### Note
-- セキュリティ向上のため、サーバー初期設定時に使用する初期パスワードを設定できるようになりました。今後Misskeyサーバーを新たに設置する際には、初回の起動前にコンフィグファイルの`setupPassword`をコメントアウトし、初期パスワードを設定することをおすすめします。（すでに初期設定を完了しているサーバーについては、この変更に伴い対応する必要はありません）  
-  - ホスティングサービスを運営している場合は、コンフィグファイルを構築する際に`setupPassword`をランダムな値に設定し、ユーザーに通知するようにシステムを更新することをおすすめします。
-  - なお、初期パスワードが設定されていない場合でも初期設定を行うことが可能です（UI上で初期パスワードの入力欄を空欄にすると続行できます）。
-- ユーザーデータを読み込む際の型が一部変更されました。
-	- `twoFactorEnabled`, `usePasswordLessLogin`, `securityKeys`: 自分とモデレーター以外のユーザーからは取得できなくなりました
-
-### General
-- Feat: サーバー初期設定時に初期パスワードを設定できるように
-- Feat: 通報にモデレーションノートを残せるように
-- Feat: 通報の解決種別を設定できるように
-- Enhance: 通報の解決と転送を個別に行えるように
-- Enhance: セキュリティ向上のため、サインイン時もCAPTCHAを求めるようになりました
-- Enhance: 依存関係の更新
-- Enhance: l10nの更新
-- Enhance: Playの「人気」タブで10件以上表示可能に #14399
-- Fix: 連合のホワイトリストが正常に登録されない問題を修正
-
-### Client
-- Enhance: デザインの調整
-- Enhance: ログイン画面の認証フローを改善
-- Fix: クライアント上での時間ベースの実績獲得動作が実績獲得後も発動していた問題を修正  
-  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/657)
-
-### Server
-- Enhance: セキュリティ向上のため、ログイン時にメール通知を行うように
-- Enhance: 自分とモデレーター以外のユーザーから二要素認証関連のデータが取得できないように
-- Enhance: 通報および通報解決時に送出されるSystemWebhookにユーザ情報を含めるように ( #14697 )
-- Fix: `admin/abuse-user-reports`エンドポイントのスキーマが間違っていた問題を修正
 
 ## 2024.9.0
 

CONTRIBUTING.md

@@ -64,29 +64,9 @@ Thank you for your PR! Before creating a PR, please check the following:
 
 Thanks for your cooperation 🤗
 
-### Additional things for ActivityPub payload changes
-*This section is specific to misskey-dev implementation. Other fork or implementation may take different way. A significant difference is that non-"misskey-dev" extension is not described in the misskey-hub's document.*
-
-If PR includes changes to ActivityPub payload, please reflect it in [misskey-hub's document](https://github.com/misskey-dev/misskey-hub-next/blob/master/content/ns.md) by sending PR.
-
-The name of purporsed extension property (referred as "extended property" in later) to ActivityPub shall be prefixed by `_misskey_`. (i.e. `_misskey_quote`)
-
-The extended property in `packages/backend/src/core/activitypub/type.ts` **must** be declared as optional because ActivityPub payloads that comes from older Misskey or other implementation may not contain it.
-
-The extended property must be included in the context definition. Context is defined in `packages/backend/src/core/activitypub/misc/contexts.ts`.
-The key shall be same as the name of extended property, and the value shall be same as "short IRI".
-
-"Short IRI" is defined in misskey-hub's document, but usually takes form of `misskey:<name of extended property>`. (i.e. `misskey:_misskey_quote`)
-
-One should not add property that has defined before by other implementation, or add custom variant value to "well-known" property.
-
 ## Reviewers guide
 Be willing to comment on the good points and not just the things you want fixed 💯
 
-読んでおくといいやつ
-- https://blog.lacolaco.net/posts/1e2cf439b3c2/
-- https://konifar-zatsu.hatenadiary.jp/entry/2024/11/05/192421
-
 ### Review perspective
 - Scope
 	- Are the goals of the PR clear?
@@ -136,8 +116,7 @@ You can improve our translations with your Crowdin account.
 Your changes in Crowdin are automatically submitted as a PR (with the title "New Crowdin translations") to the repository.
 The owner [@syuilo](https://github.com/syuilo) merges the PR into the develop branch before the next release.
 
-If your language is not listed in Crowdin, please open an issue. We will add it to Crowdin.
-For newly added languages, once the translation progress per language exceeds 70%, it will be officially introduced into Misskey and made available to users.
+If your language is not listed in Crowdin, please open an issue.
 
 ![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)
 
@@ -202,45 +181,31 @@ MK_DEV_PREFER=backend pnpm dev
 - HMR may not work in some environments such as Windows.
 
 ## Testing
-You can run non-backend tests by executing following commands:
-```sh
-pnpm --filter frontend test
-pnpm --filter misskey-js test
+- Test codes are located in [`/packages/backend/test`](/packages/backend/test).
+
+### Run test
+Create a config file.
 ```
-
-Backend tests require manual preparation of servers. See the next section for more on this.
-
-### Backend
-There are three types of test codes for the backend:
-- Unit tests: [`/packages/backend/test/unit`](/packages/backend/test/unit)
-- Single-server E2E tests: [`/packages/backend/test/e2e`](/packages/backend/test/e2e)
-- Multiple-server E2E tests: [`/packages/backend/test-federation`](/packages/backend/test-federation)
-
-#### Running Unit Tests or Single-server E2E Tests
-1. Create a config file:
-```sh
 cp .github/misskey/test.yml .config/
 ```
-
-2. Start DB and Redis servers for testing:
-```sh
+Prepare DB/Redis for testing.
+```
 docker compose -f packages/backend/test/compose.yml up
 ```
-Instead, you can prepare an empty (data can be erased) DB and edit `.config/test.yml` appropriately.
+Alternatively, prepare an empty (data can be erased) DB and edit `.config/test.yml`.
 
-3. Run all tests:
-```sh
-pnpm --filter backend test     # unit tests
-pnpm --filter backend test:e2e # single-server E2E tests
+Run all test.
 ```
-If you want to run a specific test, run as a following command:
-```sh
-pnpm --filter backend test -- packages/backend/test/unit/activitypub.ts
-pnpm --filter backend test:e2e -- packages/backend/test/e2e/nodeinfo.ts
+pnpm test
 ```
 
-#### Running Multiple-server E2E Tests
-See [`/packages/backend/test-federation/README.md`](/packages/backend/test-federation/README.md).
+#### Run specify test
+```
+pnpm jest -- foo.ts
+```
+
+### e2e tests
+TODO
 
 ## Environment Variable
 
@@ -613,18 +578,18 @@ ESMではディレクトリインポートは廃止されているのと、デ
 ### Lighten CSS vars
 
 ``` css
-color: hsl(from var(--MI_THEME-accent) h s calc(l + 10));
+color: hsl(from var(--accent) h s calc(l + 10));
 ```
 
 ### Darken CSS vars
 
 ``` css
-color: hsl(from var(--MI_THEME-accent) h s calc(l - 10));
+color: hsl(from var(--accent) h s calc(l - 10));
 ```
 
 ### Add alpha to CSS vars
 
 ``` css
-color: color(from var(--MI_THEME-accent) srgb r g b / 0.5);
+color: color(from var(--accent) srgb r g b / 0.5);
 ```
 

cypress/e2e/basic.cy.ts

@@ -23,7 +23,6 @@ describe('Before setup instance', () => {
 
 		cy.intercept('POST', '/api/admin/accounts/create').as('signup');
 
-		cy.get('[data-cy-admin-initial-password] input').type('example_password_please_change_this_or_you_will_get_hacked');
 		cy.get('[data-cy-admin-username] input').type('admin');
 		cy.get('[data-cy-admin-password] input').type('admin1234');
 		cy.get('[data-cy-admin-ok]').click();
@@ -120,16 +119,11 @@ describe('After user signup', () => {
 	it('signin', () => {
 		cy.visitHome();
 
-		cy.intercept('POST', '/api/signin-flow').as('signin');
+		cy.intercept('POST', '/api/signin').as('signin');
 
 		cy.get('[data-cy-signin]').click();
-
-		cy.get('[data-cy-signin-page-input]').should('be.visible', { timeout: 1000 });
-		// Enterキーで続行できるかの確認も兼ねる
-		cy.get('[data-cy-signin-username] input').type('alice{enter}');
-
-		cy.get('[data-cy-signin-page-password]').should('be.visible', { timeout: 10000 });
-		// Enterキーで続行できるかの確認も兼ねる
+		cy.get('[data-cy-signin-username] input').type('alice');
+		// Enterキーでサインインできるかの確認も兼ねる
 		cy.get('[data-cy-signin-password] input').type('alice1234{enter}');
 
 		cy.wait('@signin');
@@ -144,9 +138,8 @@ describe('After user signup', () => {
 		cy.visitHome();
 
 		cy.get('[data-cy-signin]').click();
-
-		cy.get('[data-cy-signin-page-input]').should('be.visible', { timeout: 1000 });
-		cy.get('[data-cy-signin-username] input').type('alice{enter}');
+		cy.get('[data-cy-signin-username] input').type('alice');
+		cy.get('[data-cy-signin-password] input').type('alice1234{enter}');
 
 		// TODO: cypressにブラウザの言語指定できる機能が実装され次第英語のみテストするようにする
 		cy.contains(/アカウントが凍結されています|This account has been suspended due to/gi);

cypress/support/commands.ts

@@ -48,19 +48,16 @@ Cypress.Commands.add('registerUser', (username, password, isAdmin = false) => {
 	cy.request('POST', route, {
 		username: username,
 		password: password,
-		...(isAdmin ? { setupPassword: 'example_password_please_change_this_or_you_will_get_hacked' } : {}),
 	}).its('body').as(username);
 });
 
 Cypress.Commands.add('login', (username, password) => {
 	cy.visitHome();
 
-	cy.intercept('POST', '/api/signin-flow').as('signin');
+	cy.intercept('POST', '/api/signin').as('signin');
 
 	cy.get('[data-cy-signin]').click();
-	cy.get('[data-cy-signin-page-input]').should('be.visible', { timeout: 1000 });
-	cy.get('[data-cy-signin-username] input').type(`${username}{enter}`);
-	cy.get('[data-cy-signin-page-password]').should('be.visible', { timeout: 10000 });
+	cy.get('[data-cy-signin-username] input').type(username);
 	cy.get('[data-cy-signin-password] input').type(`${password}{enter}`);
 
 	cy.wait('@signin').as('signedIn');

idea/MkDisableSection.vue

@@ -34,7 +34,7 @@ defineProps<{
 	width: 100%;
 	height: 100%;
 	cursor: not-allowed;
-	--color: color(from var(--MI_THEME-error) srgb r g b / 0.25);
+	--color: color(from var(--error) srgb r g b / 0.25);
 	background-size: auto auto;
 	background-image: repeating-linear-gradient(135deg, transparent, transparent 10px, var(--color) 4px, var(--color) 14px);
 }

locales/ar-SA.yml

@@ -626,7 +626,10 @@ abuseReported: "أُرسل البلاغ، شكرًا لك"
 reporter: "المُبلّغ"
 reporteeOrigin: "أصل البلاغ"
 reporterOrigin: "أصل المُبلّغ"
+forwardReport: "وجّه البلاغ إلى المثيل البعيد"
+forwardReportIsAnonymous: "في المثيل البعيد سيظهر المبلّغ كحساب مجهول."
 send: "أرسل"
+abuseMarkAsResolved: "علّم البلاغ كمحلول"
 openInNewTab: "افتح في لسان جديد"
 defaultNavigationBehaviour: "سلوك الملاحة الافتراضي"
 editTheseSettingsMayBreakAccount: "تعديل هذه الإعدادات قد يسبب عطبًا لحسابك"
@@ -1252,6 +1255,7 @@ _theme:
     buttonBg: "خلفية الأزرار"
     buttonHoverBg: "خلفية الأزرار (عند التمرير فوقها)"
     inputBorder: "حواف حقل الإدخال"
+    listItemHoverBg: "خلفية عناصر القائمة (عند التمرير فوقها)"
     driveFolderBg: "خلفية مجلد قرص التخزين"
     messageBg: "خلفية المحادثة"
 _sfx:
@@ -1529,7 +1533,6 @@ _notification:
     reaction: "التفاعل"
     receiveFollowRequest: "طلبات المتابعة"
     followRequestAccepted: "طلبات المتابعة المقبولة"
-    login: "لِج"
     app: "إشعارات التطبيقات المرتبطة"
   _actions:
     followBack: "تابعك بالمثل"

locales/bn-BD.yml

@@ -624,7 +624,10 @@ abuseReported: "আপনার অভিযোগটি দাখিল কর
 reporter: "অভিযোগকারী"
 reporteeOrigin: "অভিযোগটির উৎস"
 reporterOrigin: "অভিযোগকারীর উৎস"
+forwardReport: "রিমোট ইন্সত্যান্সে অভিযোগটি পাঠান"
+forwardReportIsAnonymous: "আপনার তথ্য রিমোট ইন্সত্যান্সে পাঠানো হবে না এবং একটি বেনামী সিস্টেম অ্যাকাউন্ট হিসাবে প্রদর্শিত হবে।"
 send: "পাঠান"
+abuseMarkAsResolved: "অভিযোগটিকে সমাধাকৃত হিসাবে চিহ্নিত করুন"
 openInNewTab: "নতুন ট্যাবে খুলুন"
 openInSideView: "সাইড ভিউতে খুলুন"
 defaultNavigationBehaviour: "ডিফল্ট নেভিগেশন"
@@ -1017,6 +1020,7 @@ _theme:
     buttonBg: "বাটনের পটভূমি"
     buttonHoverBg: "বাটনের পটভূমি (হভার)"
     inputBorder: "ইনপুট ফিল্ডের বর্ডার"
+    listItemHoverBg: "লিস্ট আইটেমের পটভূমি (হোভার)"
     driveFolderBg: "ড্রাইভ ফোল্ডারের পটভূমি"
     wallpaperOverlay: "ওয়ালপেপার ওভারলে"
     badge: "ব্যাজ"
@@ -1309,7 +1313,6 @@ _notification:
     pollEnded: "পোল শেষ"
     receiveFollowRequest: "প্রাপ্ত অনুসরণের অনুরোধসমূহ"
     followRequestAccepted: "গৃহীত অনুসরণের অনুরোধসমূহ"
-    login: "প্রবেশ করুন"
     app: "লিঙ্ক করা অ্যাপ থেকে বিজ্ঞপ্তি"
   _actions:
     followBack: "ফলো ব্যাক করেছে"

locales/ca-ES.yml

@@ -2,15 +2,12 @@
 _lang_: "Català"
 headlineMisskey: "Una xarxa connectada per notes"
 introMisskey: "Benvingut! Misskey és un servei de microblogging descentralitzat de codi obert.\nCrea \"notes\" per compartir els teus pensaments amb tots els que t'envolten. 📡\nAmb \"reaccions\", també pots expressar ràpidament els teus sentiments sobre les notes de tothom. 👍\nExplorem un món nou! 🚀"
-poweredByMisskeyDescription: "{name} És un dels serveis (anomenats instàncies de Misskey) que utilitzen la plataforma de codi obert <b>Misskey</b>."
+poweredByMisskeyDescription: "{name} És un del serveis (anomenats instàncies de Misskey) que utilitzen la plataforma de codi obert <b>Misskey</b>."
 monthAndDay: "{day}/{month}"
 search: "Cercar"
 notifications: "Notificacions"
 username: "Nom d'usuari"
 password: "Contrasenya"
-initialPasswordForSetup: "Contrasenya inicial per la configuració inicial"
-initialPasswordIsIncorrect: "La contrasenya no és correcta."
-initialPasswordForSetupDescription: "Fes servir la contrasenya que has fet servir al fitxer de configuració, si tu mateix has instal·lat Misskey.\nSi fas servir una empresa d'allotjament de Misskey, fes servir la contrasenya que t'han donat.\nSi no has posat cap contrasenya deixar l'espai en blanc."
 forgotPassword: "Contrasenya oblidada"
 fetchingAsApObject: "Cercant en el Fediverse..."
 ok: "OK"
@@ -18,7 +15,7 @@ gotIt: "Ho he entès!"
 cancel: "Cancel·lar"
 noThankYou: "No, gràcies"
 enterUsername: "Introdueix el teu nom d'usuari"
-renotedBy: "Impulsat per {user}"
+renotedBy: "Impulsat per {usuari}"
 noNotes: "Cap nota"
 noNotifications: "Cap notificació"
 instance: "Servidor"
@@ -239,8 +236,6 @@ silencedInstances: "Instàncies silenciades"
 silencedInstancesDescription: "Llista els enllaços d'amfitrió de les instàncies que vols silenciar. Tots els comptes de les instàncies llistades s'establiran com silenciades i només podran fer sol·licitacions de seguiment, i no podran mencionar als comptes locals si no els segueixen. Això no afectarà les instàncies bloquejades."
 mediaSilencedInstances: "Instàncies amb els arxius silenciats"
 mediaSilencedInstancesDescription: "Llista els noms dels servidors que vulguis silenciar els arxius, un servidor per línia. Tots els comptes que pertanyin als servidors llistats seran tractats com sensibles i no podran fer servir emojis personalitzats. Això no tindrà efecte sobre els servidors blocats."
-federationAllowedHosts: "Llista de servidors federats"
-federationAllowedHostsDescription: "Llista dels servidors amb els quals es federa."
 muteAndBlock: "Silencia i bloca"
 mutedUsers: "Usuaris silenciats"
 blockedUsers: "Usuaris bloquejats"
@@ -339,7 +334,6 @@ renameFolder: "Canvia el nom de la carpeta"
 deleteFolder: "Elimina la carpeta"
 folder: "Carpeta "
 addFile: "Afegeix un fitxer"
-showFile: "Mostrar fitxer"
 emptyDrive: "La teva unitat és buida"
 emptyFolder: "La carpeta està buida"
 unableToDelete: "No es pot eliminar"
@@ -454,7 +448,6 @@ totpDescription: "Escriu una contrasenya d'un sol us fent servir l'aplicació d'
 moderator: "Moderador/a"
 moderation: "Moderació"
 moderationNote: "Nota de moderació "
-moderationNoteDescription: "Pots escriure notes que es compartiran entre els moderadors."
 addModerationNote: "Afegir una nota de moderació "
 moderationLogs: "Registre de moderació "
 nUsersMentioned: "{n} usuaris mencionats"
@@ -516,10 +509,6 @@ uiLanguage: "Idioma de l'interfície"
 aboutX: "Respecte a {x}"
 emojiStyle: "Estil d'emoji"
 native: "Nadiu"
-menuStyle: "Estil de menú"
-style: "Estil"
-drawer: "Calaix"
-popup: "Emergent"
 showNoteActionsOnlyHover: "Només mostra accions de la nota en passar amb el cursor"
 showReactionsCount: "Mostra el nombre de reaccions a les publicacions"
 noHistory: "No hi ha un registre previ"
@@ -720,7 +709,10 @@ abuseReported: "La teva denúncia s'ha enviat. Moltes gràcies."
 reporter: "Denunciant "
 reporteeOrigin: "Origen de la denúncia "
 reporterOrigin: "Origen del denunciant"
+forwardReport: "Transferir la denúncia a una instància remota"
+forwardReportIsAnonymous: "En lloc del teu compte, es farà servir un compte anònim com a denunciant al servidor remot."
 send: "Envia"
+abuseMarkAsResolved: "Marca la denúncia com a resolta"
 openInNewTab: "Obre a una pestanya nova"
 openInSideView: "Obre a una vista lateral"
 defaultNavigationBehaviour: "Navegació per defecte"
@@ -922,7 +914,6 @@ followersVisibility: "Visibilitat dels seguidors"
 continueThread: "Veure la continuació del fil"
 deleteAccountConfirm: "Això eliminarà el teu compte irreversiblement. Procedir?"
 incorrectPassword: "Contrasenya incorrecta."
-incorrectTotp: "La contrasenya no és correcta, o ha caducat."
 voteConfirm: "Confirma el teu vot \"{choice}\""
 hide: "Amagar"
 useDrawerReactionPickerForMobile: "Mostrar el selector de reaccions com un calaix al mòbil "
@@ -947,9 +938,6 @@ oneHour: "1 hora"
 oneDay: "Un dia"
 oneWeek: "Una setmana"
 oneMonth: "Un mes"
-threeMonths: "3 mesos"
-oneYear: "1 any"
-threeDays: "3 dies"
 reflectMayTakeTime: "Això pot trigar una estona a tenir efecte"
 failedToFetchAccountInformation: "No es pot obtenir la informació del compte"
 rateLimitExceeded: "S'ha arribat al màxim de peticions"
@@ -1090,7 +1078,6 @@ retryAllQueuesConfirmTitle: "Tornar a intentar-ho tot?"
 retryAllQueuesConfirmText: "Això farà que la càrrega del servidor augmenti temporalment."
 enableChartsForRemoteUser: "Generar gràfiques d'usuaris remots"
 enableChartsForFederatedInstances: "Generar gràfiques d'instàncies remotes"
-enableStatsForFederatedInstances: "Activa les estadístiques de les instàncies remotes federades"
 showClipButtonInNoteFooter: "Afegir \"Retall\" al menú d'acció de la nota"
 reactionsDisplaySize: "Mida de les reaccions"
 limitWidthOfReaction: "Limitar l'amplada màxima de la reacció i mostrar-les en una mida reduïda "
@@ -1281,43 +1268,6 @@ fromX: "De {x}"
 genEmbedCode: "Obtenir el codi per incrustar"
 noteOfThisUser: "Notes d'aquest usuari"
 clipNoteLimitExceeded: "No es poden afegir més notes a aquest clip."
-performance: "Rendiment"
-modified: "Modificat"
-discard: "Descarta"
-thereAreNChanges: "Hi ha(n) {n} canvi(s)"
-signinWithPasskey: "Inicia sessió amb Passkey"
-unknownWebAuthnKey: "Passkey desconeguda"
-passkeyVerificationFailed: "La verificació a fallat"
-passkeyVerificationSucceededButPasswordlessLoginDisabled: "La verificació de la passkey a estat correcta, però s'ha deshabilitat l'inici de sessió sense contrasenya."
-messageToFollower: "Missatge als meus seguidors"
-target: "Assumpte "
-testCaptchaWarning: "És una característica dissenyada per a la prova de CAPTCHA. <strong>No l'utilitzes en l'entorn real.</strong>"
-prohibitedWordsForNameOfUser: "Noms prohibits per escollir noms d'usuari "
-prohibitedWordsForNameOfUserDescription: "Si qualsevol d'aquestes paraules es troben a un nom d'usuari la creació de l'usuari no es durà a terme. Als moderadors no els afecta aquesta restricció."
-yourNameContainsProhibitedWords: "El nom conté paraules prohibides "
-yourNameContainsProhibitedWordsDescription: "Si de veritat vols fer servir aquest nom posat en contacte amb l'administrador."
-thisContentsAreMarkedAsSigninRequiredByAuthor: "L'autor requereix l'inici de sessió per poder veure"
-lockdown: "Bloquejat"
-pleaseSelectAccount: "Seleccionar un compte"
-_accountSettings:
-  requireSigninToViewContents: "És obligatori l'inici de sessió per poder veure el contingut"
-  requireSigninToViewContentsDescription1: "Es requereix l'inici de sessió per poder veure totes les notes i el contingut que has creat. Amb això esperem evitar que els rastrejadors recopilin informació."
-  requireSigninToViewContentsDescription2: "També es desactivaran les vistes prèvies d'URLS (OGP), la incrustació a pàgines web i la visualització des de servidors que no admetin la citació de notes."
-  requireSigninToViewContentsDescription3: "Aquestes restriccions pot ser que no s'apliquin als continguts federats en servidors remots."
-  makeNotesFollowersOnlyBefore: "Permetre que les notes antigues només es mostrin als seguidors."
-  makeNotesFollowersOnlyBeforeDescription: "Mentre aquesta funció estigui activada, les notes que hagin passat la data i hora fixada o hagi passat els temps establert seran visibles només per als teus seguidors. Quan es desactivi, també es restableix l'estat públic de la nota."
-  makeNotesHiddenBefore: "Fes que les notes antigues siguin privades"
-  makeNotesHiddenBeforeDescription: "Mentres aquesta funció estigui activada les notes que hagin superat una data i hora fixada o hagi passat el temps establert només seran visibles per a tu. Si la desactives es restablirà també l'estat públic de les notes."
-  mayNotEffectForFederatedNotes: "Això pot ser que no afecti les notes federades."
-  notesHavePassedSpecifiedPeriod: "Notes publicades durant un període de temps especificat."
-  notesOlderThanSpecifiedDateAndTime: "Notes més antigues de la data i temps especificat "
-_abuseUserReport:
-  forward: "Reenviar "
-  forwardDescription: "Reenvia l'informe a una altra instància com un compte del sistema anònima."
-  resolve: "Solució "
-  accept: "Acceptar "
-  reject: "Rebutjar"
-  resolveTutorial: "Si l'informe és legítim selecciona \"Acceptar\" per resoldre'l positivament. Però si l'informe no és legítim selecciona \"Rebutjar\" per resoldre'l negativament."
 _delivery:
   status: "Estat d'entrega "
   stop: "Suspés"
@@ -1455,7 +1405,6 @@ _serverSettings:
   reactionsBufferingDescription: "Quan s'activa aquesta opció millora bastant el rendiment en recuperar les línies de temps reduint la càrrega de la base. Com a contrapunt, augmentarà  l'ús de memòria de Redís. Desactiva aquesta opció en cas de tenir un servidor amb poca memòria o si tens problemes d'inestabilitat."
   inquiryUrl: "URL de consulta "
   inquiryUrlDescription: "Escriu adreça URL per al formulari de consulta per al mantenidor del servidor o una pàgina web amb el contacte d'informació."
-  thisSettingWillAutomaticallyOffWhenModeratorsInactive: "Si no es detecta activitat per part del moderador durant un període de temps, aquesta opció es desactiva automàticament per evitar el correu brossa."
 _accountMigration:
   moveFrom: "Migrar un altre compte a aquest"
   moveFromSub: "Crear un àlies per un altre compte"
@@ -2009,6 +1958,7 @@ _theme:
     buttonBg: "Fons botó "
     buttonHoverBg: "Fons botó (en passar-hi per sobre)"
     inputBorder: "Contorn del cap d'introducció "
+    listItemHoverBg: "Fons dels elements d'una llista"
     driveFolderBg: "Fons de la carpeta Disc"
     wallpaperOverlay: "Superposició del fons de pantalla "
     badge: "Insígnia "
@@ -2175,11 +2125,8 @@ _auth:
   permissionAsk: "Aquesta aplicació demana els següents permisos"
   pleaseGoBack: "Si us plau, torna a l'aplicació"
   callback: "Tornant a l'aplicació"
-  accepted: "Accés garantit"
   denied: "Accés denegat"
-  scopeUser: "Opera com si fossis aquest usuari"
   pleaseLogin: "Si us plau, identificat per autoritzar l'aplicació."
-  byClickingYouWillBeRedirectedToThisUrl: "Si es garanteix l'accés, seràs redirigit automàticament a la següent adreça URL"
 _antennaSources:
   all: "Totes les publicacions"
   homeTimeline: "Publicacions dels usuaris seguits"
@@ -2288,9 +2235,6 @@ _profile:
   changeBanner: "Canviar el bàner "
   verifiedLinkDescription: "Escrivint una adreça URL que enllaci a aquest perfil, una icona de propietat verificada es mostrarà al costat del camp."
   avatarDecorationMax: "Pot afegir un màxim de {max} decoracions."
-  followedMessage: "Missatge als nous seguidors"
-  followedMessageDescription: "Es pot configurar un missatge curt que es mostra a l'altra persona quan comença a seguir-te."
-  followedMessageDescriptionForLockedAccount: "Si comencen a seguir-te es mostra un missatge de quan es permet aquesta sol·licitud. "
 _exportOrImport:
   allNotes: "Totes les publicacions"
   favoritedNotes: "Notes preferides"
@@ -2429,8 +2373,6 @@ _notification:
   renotedBySomeUsers: "L'han impulsat {n} usuaris"
   followedBySomeUsers: "Et segueixen {n} usuaris"
   flushNotification: "Netejar notificacions"
-  exportOfXCompleted: "Completada l'exportació de {x}"
-  login: "Algú ha iniciat sessió "
   _types:
     all: "Tots"
     note: "Notes noves"
@@ -2445,9 +2387,6 @@ _notification:
     followRequestAccepted: "Petició de seguiment acceptada"
     roleAssigned: "Rol donat"
     achievementEarned: "Assoliment desbloquejat"
-    exportCompleted: "Exportació completada"
-    login: "Iniciar sessió"
-    test: "Prova la notificació"
     app: "Notificacions d'aplicacions"
   _actions:
     followBack: "t'ha seguit també"
@@ -2513,8 +2452,6 @@ _webhookSettings:
     abuseReport: "Quan reps un nou informe de moderació "
     abuseReportResolved: "Quan resols un informe de moderació "
     userCreated: "Quan es crea un usuari"
-    inactiveModeratorsWarning: "Quan el compte d'un moderador no té activitat durant un temps"
-    inactiveModeratorsInvitationOnlyChanged: "Quan el compte d'un moderador no té activitat durant un temps, i el servidor es canvia a registre per invitacions"
   deleteConfirm: "Segur que vols esborrar el webhook?"
   testRemarks: "Si feu clic al botó a la dreta de l'interruptor, podeu enviar un webhook de prova amb dades dummy."
 _abuseReport:
@@ -2560,8 +2497,6 @@ _moderationLogTypes:
   markSensitiveDriveFile: "Fitxer marcat com a sensible"
   unmarkSensitiveDriveFile: "S'ha tret la marca de sensible del fitxer"
   resolveAbuseReport: "Informe resolt"
-  forwardAbuseReport: "Informe reenviat"
-  updateAbuseReportNote: "Nota de moderació d'un informe actualitzat"
   createInvitation: "Crear codi d'invitació "
   createAd: "Anunci creat"
   deleteAd: "Anunci esborrat"
@@ -2642,81 +2577,8 @@ _dataSaver:
     description: "Les imatges en miniatura que serveixen com a vista prèvia de les URLs no es tornaran a carregar."
   _code:
     title: "Ressaltat del codi "
-    description: "Quan s'utilitza codi MFM, no es llegeix fins que es copiï. En els punts destacats del codi s'han de llegir els fitxers definits per a cada llengua que resulti alt, però no es poden llegir automàticament, per la qual cosa es poden reduir les quantitats de comunicació."
-_hemisphere:
-  N: "Hemisferi Nord "
-  S: "Hemisferi Sud"
-  caption: "El fan servir alguns clients per determinar l'estació de l'any."
 _reversi:
-  reversi: "Reversi"
-  gameSettings: "Opcions del joc"
-  chooseBoard: "Escull un taulell"
-  blackOrWhite: "Negres/Blanques"
-  blackIs: "{name} juga amb negres "
-  rules: "Regles"
-  thisGameIsStartedSoon: "El joc començarà en breu"
-  waitingForOther: "Esperant la tirada de l'oponent "
-  waitingForMe: "Esperant el teu torn"
-  waitingBoth: "Prepara't "
-  ready: "Preparat "
-  cancelReady: " No preparat "
-  opponentTurn: "Torn de l'oponent "
-  myTurn: "El teu torn"
-  turnOf: "Li toca a {name}"
-  pastTurnOf: "Torn de {name}"
-  surrender: "Rendeix-te"
-  surrendered: "T'has rendit"
-  timeout: "Temps esgotat"
-  drawn: "Empat"
-  won: "{name} ha guanyat"
-  black: "Negres"
-  white: "Blanques"
   total: "Total"
-  turnCount: "Torn {count}"
-  myGames: "Jugades"
-  allGames: "Totes les jugades"
-  ended: "Acabat"
-  playing: "Jugant"
-  isLlotheo: "Qui tingui menys pedres guanya (Llotheo)"
-  loopedMap: "Mapa de recursiu"
-  canPutEverywhere: "Les fitxes es poden posar a qualsevol lloc"
-  timeLimitForEachTurn: "Temps límit per jugada"
-  freeMatch: "Partida lliure"
-  lookingForPlayer: "Buscant contrincant..."
-  gameCanceled: "La partida s'ha cancel·lat "
-  shareToTlTheGameWhenStart: "Compartir la partida a la línia de temps quan comenci"
-  iStartedAGame: "La partida ha començat! #MisskeyReversi"
-  opponentHasSettingsChanged: "L'oponent h canviat la seva configuració "
-  allowIrregularRules: "Regles irregulars (totalment lliure)"
-  disallowIrregularRules: "Sense regles irregulars"
-  showBoardLabels: "Mostrar el número de línia i columna al tauler de joc"
-  useAvatarAsStone: "Fer servir els avatars dels usuaris com a fitxes"
-_offlineScreen:
-  title: "Fora de línia - No es pot connectar amb el servidor"
-  header: "Impossible connectar amb el servidor"
-_urlPreviewSetting:
-  title: "Configuració per a la previsualització de l'URL"
-  enable: "Activa la previsualització de l'URL"
-  timeout: "Temps màxim per carregar la previsualització de l'URL (ms)"
-  timeoutDescription: "Si l'obtenció de la previsualització triga més que el temps establert, no es generarà la vista prèvia."
-  maximumContentLength: "Longitud màxima del contingut (bytes)"
-  maximumContentLengthDescription: "Si la màxima longitud és més gran que aquest valor, la previsualització no es generarà."
-  requireContentLength: "Generar la previsualització només si es pot obtenir la longitud màxima "
-  requireContentLengthDescription: "Si l'altre servidor no proporciona la longitud màxima, la previsualització no es generarà."
-  userAgent: "User-Agent"
-  userAgentDescription: "Estableix l'User-Agent que és farà servir per a la recuperació de la vista prèvia. Si és deixa en blanc es farà servir l'User-Agent per defecte."
-  summaryProxy: "Proxy endpoints per generar vistes prèvies"
-  summaryProxyDescription: "La vista prèvia es genera fent servir Summaly proxy, no la genera el mateix Misskey."
-  summaryProxyDescription2: "Els següents paràmetres són passats al proxy com cadenes de consulta. Si el proxy no els admet, s'ignoren els valors configurats."
-_mediaControls:
-  pip: "Imatge sobre impressionada "
-  playbackRate: "Velocitat de reproducció "
-  loop: "Reproducció en bucle"
-_contextMenu:
-  title: "Menú contextual"
-  app: "Aplicació "
-  appWithShift: "Aplicació amb la tecla shift"
-  native: "Interfície del navegador"
 _embedCodeGen:
   title: "Personalitza el codi per incrustar"
   header: "Mostrar la capçalera"
@@ -2731,9 +2593,3 @@ _embedCodeGen:
   generateCode: "Crea el codi per incrustar"
   codeGenerated: "Codi generat"
   codeGeneratedDescription: "Si us plau, enganxeu el codi generat al lloc web."
-_selfXssPrevention:
-  warning: "Advertència "
-  title: "\"Enganxa qualsevol cosa en aquesta finestra\"  És tot un engany."
-  description1: "Si posa alguna cosa al seu compte, un usuari malintencionat podria segrestar-la o robar-li les dades."
-  description2: "Si no entens que estàs fent %cpara ara mateix i tanca la finestra."
-  description3: "Per obtenir més informació. {link}"

locales/cs-CZ.yml

@@ -657,7 +657,10 @@ abuseReported: "Nahlášení bylo odesláno. Děkujeme převelice."
 reporter: "Nahlásil"
 reporteeOrigin: "Původ nahlášení"
 reporterOrigin: "Původ nahlasovače"
+forwardReport: "Přeposlat nahlášení do vzdálené instance"
+forwardReportIsAnonymous: "Místo vašeho účtu se ve vzdálené instanci zobrazí anonymní systémový účet jako nahlašovač."
 send: "Odeslat"
+abuseMarkAsResolved: "Označit nahlášení jako vyřešené"
 openInNewTab: "Otevřít v nové kartě"
 openInSideView: "Otevřít v bočním panelu"
 defaultNavigationBehaviour: "Výchozí chování navigace"
@@ -1629,6 +1632,7 @@ _theme:
     buttonBg: "Pozadí tlačítka"
     buttonHoverBg: "Pozadí tlačítka (Hover)"
     inputBorder: "Ohraničení vstupního pole"
+    listItemHoverBg: "Pozadí položky seznamu (Hover)"
     driveFolderBg: "Pozadí složky disku"
     wallpaperOverlay: "Překrytí tapety"
     badge: "Odznak"
@@ -1958,7 +1962,6 @@ _notification:
     receiveFollowRequest: "Obdržené žádosti o sledování"
     followRequestAccepted: "Přijaté žádosti o sledování"
     achievementEarned: "Úspěch odemčen"
-    login: "Přihlásit se"
     app: "Oznámení z propojených aplikací"
   _actions:
     followBack: "vás začal sledovat zpět"

locales/de-DE.yml

@@ -686,7 +686,10 @@ abuseReported: "Deine Meldung wurde versendet. Vielen Dank."
 reporter: "Melder"
 reporteeOrigin: "Herkunft des Gemeldeten"
 reporterOrigin: "Herkunft des Meldenden"
+forwardReport: "Meldung an fremde Instanz weiterleiten"
+forwardReportIsAnonymous: "Anstatt deines Benutzerkontos wird bei der fremden Instanz ein anonymes Systemkonto als Melder angezeigt."
 send: "Senden"
+abuseMarkAsResolved: "Meldung als gelöst markieren"
 openInNewTab: "In neuem Tab öffnen"
 openInSideView: "In Seitenansicht öffnen"
 defaultNavigationBehaviour: "Standardnavigationsverhalten"
@@ -1784,6 +1787,7 @@ _theme:
     buttonBg: "Hintergrund von Schaltflächen"
     buttonHoverBg: "Hintergrund von Schaltflächen (Mouseover)"
     inputBorder: "Rahmen von Eingabefeldern"
+    listItemHoverBg: "Hintergrund von Listeneinträgen (Mouseover)"
     driveFolderBg: "Hintergrund von Drive-Ordnern"
     wallpaperOverlay: "Hintergrundbild-Overlay"
     badge: "Wappen"
@@ -2137,7 +2141,6 @@ _notification:
     receiveFollowRequest: "Erhaltene Follow-Anfragen"
     followRequestAccepted: "Akzeptierte Follow-Anfragen"
     achievementEarned: "Errungenschaft freigeschaltet"
-    login: "Anmelden"
     app: "Benachrichtigungen von Apps"
   _actions:
     followBack: "folgt dir nun auch"

locales/el-GR.yml

@@ -378,7 +378,6 @@ _notification:
     renote: "Κοινοποίηση σημειώματος"
     quote: "Παράθεση"
     reaction: "Αντιδράσεις"
-    login: "Σύνδεση"
   _actions:
     reply: "Απάντηση"
     renote: "Κοινοποίηση σημειώματος"

locales/en-US.yml

@@ -8,9 +8,6 @@ search: "Search"
 notifications: "Notifications"
 username: "Username"
 password: "Password"
-initialPasswordForSetup: "Initial password for setup"
-initialPasswordIsIncorrect: "Initial password for setup is incorrect"
-initialPasswordForSetupDescription: "Use the password you entered in the configuration file if you installed Misskey yourself.\n If you are using a Misskey hosting service, use the password provided.\n If you have not set a password, leave it blank to continue."
 forgotPassword: "Forgot password"
 fetchingAsApObject: "Fetching from the Fediverse..."
 ok: "OK"
@@ -112,7 +109,7 @@ enterEmoji: "Enter an emoji"
 renote: "Renote"
 unrenote: "Remove renote"
 renoted: "Renoted."
-renotedToX: "Renoted to {name}."
+renotedToX: "Renote to {name}."
 cantRenote: "This post can't be renoted."
 cantReRenote: "A renote can't be renoted."
 quote: "Quote"
@@ -239,8 +236,6 @@ silencedInstances: "Silenced instances"
 silencedInstancesDescription: "List the host names of the servers that you want to silence, separated by a new line. All accounts belonging to the listed servers will be treated as silenced, and can only make follow requests, and cannot mention local accounts if not followed. This will not affect the blocked servers."
 mediaSilencedInstances: "Media-silenced servers"
 mediaSilencedInstancesDescription: "List the host names of the servers that you want to media-silence, separated by a new line. All accounts belonging to the listed servers will be treated as sensitive, and can't use custom emojis. This will not affect the blocked servers."
-federationAllowedHosts: "Federation allowed servers"
-federationAllowedHostsDescription: "Specify the hostnames of the servers you want to allow federation separated by line breaks."
 muteAndBlock: "Mutes and Blocks"
 mutedUsers: "Muted users"
 blockedUsers: "Blocked users"
@@ -331,6 +326,7 @@ selectFile: "Select a file"
 selectFiles: "Select files"
 selectFolder: "Select a folder"
 selectFolders: "Select folders"
+fileNotSelected: ""
 renameFile: "Rename file"
 folderName: "Folder name"
 createFolder: "Create a folder"
@@ -338,7 +334,6 @@ renameFolder: "Rename this folder"
 deleteFolder: "Delete this folder"
 folder: "Folder"
 addFile: "Add a file"
-showFile: "Show files"
 emptyDrive: "Your Drive is empty"
 emptyFolder: "This folder is empty"
 unableToDelete: "Unable to delete"
@@ -453,7 +448,6 @@ totpDescription: "Use an authenticator app to enter one-time passwords"
 moderator: "Moderator"
 moderation: "Moderation"
 moderationNote: "Moderation note"
-moderationNoteDescription: "You can fill in notes that will be shared only among moderators."
 addModerationNote: "Add moderation note"
 moderationLogs: "Moderation logs"
 nUsersMentioned: "Mentioned by {n} users"
@@ -515,10 +509,6 @@ uiLanguage: "User interface language"
 aboutX: "About {x}"
 emojiStyle: "Emoji style"
 native: "Native"
-menuStyle: "Menu style"
-style: "Style"
-drawer: "Drawer"
-popup: "Pop up"
 showNoteActionsOnlyHover: "Only show note actions on hover"
 showReactionsCount: "See the number of reactions in notes"
 noHistory: "No history available"
@@ -601,8 +591,6 @@ ascendingOrder: "Ascending"
 descendingOrder: "Descending"
 scratchpad: "Scratchpad"
 scratchpadDescription: "The Scratchpad provides an environment for AiScript experiments. You can write, execute, and check the results of it interacting with Misskey in it."
-uiInspector: "UI inspector"
-uiInspectorDescription: "You can see the UI component server list on memory. UI component will be generated by Ui:C: function."
 output: "Output"
 script: "Script"
 disablePagesScript: "Disable AiScript on Pages"
@@ -719,7 +707,10 @@ abuseReported: "Your report has been sent. Thank you very much."
 reporter: "Reporter"
 reporteeOrigin: "Reportee Origin"
 reporterOrigin: "Reporter Origin"
+forwardReport: "Forward report to remote instance"
+forwardReportIsAnonymous: "Instead of your account, an anonymous system account will be displayed as reporter at the remote instance."
 send: "Send"
+abuseMarkAsResolved: "Mark report as resolved"
 openInNewTab: "Open in new tab"
 openInSideView: "Open in side view"
 defaultNavigationBehaviour: "Default navigation behavior"
@@ -921,7 +912,6 @@ followersVisibility: "Visibility of followers"
 continueThread: "View thread continuation"
 deleteAccountConfirm: "This will irreversibly delete your account. Proceed?"
 incorrectPassword: "Incorrect password."
-incorrectTotp: "The one-time password is incorrect or has expired."
 voteConfirm: "Confirm your vote for \"{choice}\"?"
 hide: "Hide"
 useDrawerReactionPickerForMobile: "Display reaction picker as drawer on mobile"
@@ -946,9 +936,6 @@ oneHour: "One hour"
 oneDay: "One day"
 oneWeek: "One week"
 oneMonth: "One month"
-threeMonths: "3 months"
-oneYear: "1 year"
-threeDays: "3 days"
 reflectMayTakeTime: "It may take some time for this to be reflected."
 failedToFetchAccountInformation: "Could not fetch account information"
 rateLimitExceeded: "Rate limit exceeded"
@@ -1089,7 +1076,6 @@ retryAllQueuesConfirmTitle: "Really retry all?"
 retryAllQueuesConfirmText: "This will temporarily increase the server load."
 enableChartsForRemoteUser: "Generate remote user data charts"
 enableChartsForFederatedInstances: "Generate remote instance data charts"
-enableStatsForFederatedInstances: "Receive remote server stats"
 showClipButtonInNoteFooter: "Add \"Clip\" to note action menu"
 reactionsDisplaySize: "Reaction display size"
 limitWidthOfReaction: "Limit the maximum width of reactions and display them in reduced size."
@@ -1139,7 +1125,7 @@ options: "Options"
 specifyUser: "Specific user"
 lookupConfirm: "Do you want to look up?"
 openTagPageConfirm: "Do you want to open a hashtag page?"
-specifyHost: "Specific host"
+specifyHost: "Specify a host"
 failedToPreviewUrl: "Could not preview"
 update: "Update"
 rolesThatCanBeUsedThisEmojiAsReaction: "Roles that can use this emoji as reaction"
@@ -1280,43 +1266,6 @@ fromX: "From {x}"
 genEmbedCode: "Generate embed code"
 noteOfThisUser: "Notes by this user"
 clipNoteLimitExceeded: "No more notes can be added to this clip."
-performance: "Performance"
-modified: "Modified"
-discard: "Discard"
-thereAreNChanges: "There are {n} change(s)"
-signinWithPasskey: "Sign in with Passkey"
-unknownWebAuthnKey: "Unknown Passkey"
-passkeyVerificationFailed: "Passkey verification has failed."
-passkeyVerificationSucceededButPasswordlessLoginDisabled: "Passkey verification has succeeded but password-less login is disabled."
-messageToFollower: "Message to followers"
-target: "Target"
-testCaptchaWarning: "This function is intended for CAPTCHA testing purposes.\n<strong>Do not use in a production environment.</strong>"
-prohibitedWordsForNameOfUser: "Prohibited words for user names"
-prohibitedWordsForNameOfUserDescription: "If any of the strings in this list are included in the user's name, the name will be denied. Users with moderator privileges are not affected by this restriction."
-yourNameContainsProhibitedWords: "Your name contains prohibited words"
-yourNameContainsProhibitedWordsDescription: "If you wish to use this name, please contact your server administrator."
-thisContentsAreMarkedAsSigninRequiredByAuthor: "Set by the author to require login to view"
-lockdown: "Lockdown"
-pleaseSelectAccount: "Select an account"
-_accountSettings:
-  requireSigninToViewContents: "Require sign-in to view contents"
-  requireSigninToViewContentsDescription1: "Require login to view all notes and other content you have created. This will have the effect of preventing crawlers from collecting your information."
-  requireSigninToViewContentsDescription2: "Content will not be displayed in URL previews (OGP), embedded in web pages, or on servers that don't support note quotes."
-  requireSigninToViewContentsDescription3: "These restrictions may not apply to federated content from other remote servers."
-  makeNotesFollowersOnlyBefore: "Make past notes to be displayed only to followers"
-  makeNotesFollowersOnlyBeforeDescription: "While this feature is enabled, only followers can see notes past the set date and time or have been visible for a set time. When it is deactivated, the note publication status will also be restored."
-  makeNotesHiddenBefore: "Make past notes private"
-  makeNotesHiddenBeforeDescription: "While this feature is enabled, notes that are past the set date and time or have been visible only to you. When it is deactivated, the note publication status will also be restored."
-  mayNotEffectForFederatedNotes: "Notes federated to a remote server may not be effective."
-  notesHavePassedSpecifiedPeriod: "Note that the specified time has passed"
-  notesOlderThanSpecifiedDateAndTime: "Notes before the specified date and time"
-_abuseUserReport:
-  forward: "Forward"
-  forwardDescription: "Forward the report to a remote server as an anonymous system account."
-  resolve: "Resolve"
-  accept: "Accept"
-  reject: "Reject"
-  resolveTutorial: "If the report is legitimate in content, select \"Accept\" to mark the case as resolved in the affirmative.\nIf the content of the report is not legitimate, select \"Reject\" to mark the case as resolved in the negative."
 _delivery:
   status: "Delivery status"
   stop: "Suspended"
@@ -1451,10 +1400,8 @@ _serverSettings:
   fanoutTimelineDescription: "Greatly increases performance of timeline retrieval and reduces load on the database when enabled. In exchange, memory usage of Redis will increase. Consider disabling this in case of low server memory or server instability."
   fanoutTimelineDbFallback: "Fallback to database"
   fanoutTimelineDbFallbackDescription: "When enabled, the timeline will fall back to the database for additional queries if the timeline is not cached. Disabling it further reduces the server load by eliminating the fallback process, but limits the range of timelines that can be retrieved."
-  reactionsBufferingDescription: "When enabled, performance during reaction creation will be greatly improved, reducing the load on the database. However, Redis memory usage will increase."
   inquiryUrl: "Inquiry URL"
   inquiryUrlDescription: "Specify a URL for the inquiry form to the server maintainer or a web page for the contact information."
-  thisSettingWillAutomaticallyOffWhenModeratorsInactive: "If no moderator activity is detected for a while, this setting will be automatically turned off to prevent spam."
 _accountMigration:
   moveFrom: "Migrate another account to this one"
   moveFromSub: "Create alias to another account"
@@ -1771,7 +1718,7 @@ _role:
     canManageAvatarDecorations: "Manage avatar decorations"
     driveCapacity: "Drive capacity"
     alwaysMarkNsfw: "Always mark files as NSFW"
-    canUpdateBioMedia: "Can edit an icon or a banner image"
+    canUpdateBioMedia: "Allow to edit an icon or a banner image"
     pinMax: "Maximum number of pinned notes"
     antennaMax: "Maximum number of antennas"
     wordMuteMax: "Maximum number of characters allowed in word mutes"
@@ -1786,11 +1733,6 @@ _role:
     canSearchNotes: "Usage of note search"
     canUseTranslator: "Translator usage"
     avatarDecorationLimit: "Maximum number of avatar decorations that can be applied"
-    canImportAntennas: "Allow importing antennas"
-    canImportBlocking: "Allow importing blocking"
-    canImportFollowing: "Allow importing following"
-    canImportMuting: "Allow importing muting"
-    canImportUserLists: "Allow importing lists"
   _condition:
     roleAssignedTo: "Assigned to manual roles"
     isLocal: "Local user"
@@ -2008,6 +1950,7 @@ _theme:
     buttonBg: "Button background"
     buttonHoverBg: "Button background (Hover)"
     inputBorder: "Input field border"
+    listItemHoverBg: "List item background (Hover)"
     driveFolderBg: "Drive folder background"
     wallpaperOverlay: "Wallpaper overlay"
     badge: "Badge"
@@ -2174,11 +2117,8 @@ _auth:
   permissionAsk: "This application requests the following permissions"
   pleaseGoBack: "Please go back to the application"
   callback: "Returning to the application"
-  accepted: "Access granted"
   denied: "Access denied"
-  scopeUser: "Operate as the following user"
   pleaseLogin: "Please log in to authorize applications."
-  byClickingYouWillBeRedirectedToThisUrl: "When access is granted, you will automatically be redirected to the following URL"
 _antennaSources:
   all: "All notes"
   homeTimeline: "Notes from followed users"
@@ -2287,9 +2227,6 @@ _profile:
   changeBanner: "Change banner"
   verifiedLinkDescription: "By entering an URL that contains a link to your profile here, an ownership verification icon can be displayed next to the field."
   avatarDecorationMax: "You can add up to {max} decorations."
-  followedMessage: "Message when you are followed"
-  followedMessageDescription: "You can set a short message to be displayed to the recipient when they follow you."
-  followedMessageDescriptionForLockedAccount: "If you have set up that follow requests require approval, this will be displayed when you grant a follow request."
 _exportOrImport:
   allNotes: "All notes"
   favoritedNotes: "Favorite notes"
@@ -2428,8 +2365,6 @@ _notification:
   renotedBySomeUsers: "Renote from {n} users"
   followedBySomeUsers: "Followed by {n} users"
   flushNotification: "Clear notifications"
-  exportOfXCompleted: "Export of {x} has been completed"
-  login: "Someone logged in"
   _types:
     all: "All"
     note: "New notes"
@@ -2444,9 +2379,6 @@ _notification:
     followRequestAccepted: "Accepted follow requests"
     roleAssigned: "Role given"
     achievementEarned: "Achievement unlocked"
-    exportCompleted: "The export has been completed"
-    login: "Sign In"
-    test: "Notification test"
     app: "Notifications from linked apps"
   _actions:
     followBack: "followed you back"
@@ -2509,24 +2441,21 @@ _webhookSettings:
     reaction: "When receiving a reaction"
     mention: "When being mentioned"
   _systemEvents:
-    abuseReport: "When received a new report"
-    abuseReportResolved: "When resolved report"
+    abuseReport: "When received a new abuse report"
+    abuseReportResolved: "When resolved abuse report"
     userCreated: "When user is created"
-    inactiveModeratorsWarning: "When moderators have been inactive for a while"
-    inactiveModeratorsInvitationOnlyChanged: "When a moderator has been inactive for a while, and the server is changed to invitation-only"
   deleteConfirm: "Are you sure you want to delete the Webhook?"
-  testRemarks: "Click the button to the right of the switch to send a test Webhook with dummy data."
 _abuseReport:
   _notificationRecipient:
-    createRecipient: "Add a recipient for reports"
-    modifyRecipient: "Edit a recipient for reports"
+    createRecipient: "Add a recipient for abuse reports"
+    modifyRecipient: "Edit a recipient for abuse reports"
     recipientType: "Notification type"
     _recipientType:
       mail: "Email"
       webhook: "Webhook"
       _captions:
-        mail: "Send the email to moderators' email addresses when you receive reports."
-        webhook: "Send a notification to System Webhook when you receive or resolve reports."
+        mail: "Send the email to moderators' email addresses when you receive abuse."
+        webhook: "Send a notification to SystemWebhook when you receive or resolve abuse."
     keywords: "Keywords"
     notifiedUser: "Users to notify"
     notifiedWebhook: "Webhook to use"
@@ -2559,8 +2488,6 @@ _moderationLogTypes:
   markSensitiveDriveFile: "File marked as sensitive"
   unmarkSensitiveDriveFile: "File unmarked as sensitive"
   resolveAbuseReport: "Report resolved"
-  forwardAbuseReport: "Report forwarded"
-  updateAbuseReportNote: "Moderation note of a report updated"
   createInvitation: "Invite generated"
   createAd: "Ad created"
   deleteAd: "Ad deleted"
@@ -2568,18 +2495,18 @@ _moderationLogTypes:
   createAvatarDecoration: "Avatar decoration created"
   updateAvatarDecoration: "Avatar decoration updated"
   deleteAvatarDecoration: "Avatar decoration deleted"
-  unsetUserAvatar: "User avatar unset"
-  unsetUserBanner: "User banner unset"
-  createSystemWebhook: "System Webhook created"
-  updateSystemWebhook: "System Webhook updated"
-  deleteSystemWebhook: "System Webhook deleted"
-  createAbuseReportNotificationRecipient: "Recipient for reports created"
-  updateAbuseReportNotificationRecipient: "Recipient for reports updated"
-  deleteAbuseReportNotificationRecipient: "Recipient for reports deleted"
-  deleteAccount: "Account deleted"
-  deletePage: "Page deleted"
-  deleteFlash: "Play deleted"
-  deleteGalleryPost: "Gallery post deleted"
+  unsetUserAvatar: "Unset this user's avatar"
+  unsetUserBanner: "Unset this user's banner"
+  createSystemWebhook: "Create SystemWebhook"
+  updateSystemWebhook: "Update SystemWebhook"
+  deleteSystemWebhook: "Delete SystemWebhook"
+  createAbuseReportNotificationRecipient: "Create a recipient for abuse reports"
+  updateAbuseReportNotificationRecipient: "Update recipients for abuse reports"
+  deleteAbuseReportNotificationRecipient: "Delete a recipient for abuse reports"
+  deleteAccount: "Delete the account"
+  deletePage: "Delete the page"
+  deleteFlash: "Delete Play"
+  deleteGalleryPost: "Delete the gallery post"
 _fileViewer:
   title: "File details"
   type: "File type"

locales/es-ES.yml

@@ -8,8 +8,6 @@ search: "Buscar"
 notifications: "Notificaciones"
 username: "Nombre de usuario"
 password: "Contraseña"
-initialPasswordForSetup: "Contraseña para iniciar la inicialización"
-initialPasswordIsIncorrect: "La contraseña para iniciar la configuración inicial es incorrecta."
 forgotPassword: "Olvidé mi contraseña"
 fetchingAsApObject: "Buscando en el fediverso"
 ok: "OK"
@@ -504,8 +502,6 @@ uiLanguage: "Idioma de visualización de la interfaz"
 aboutX: "Acerca de {x}"
 emojiStyle: "Estilo de emoji"
 native: "Nativo"
-menuStyle: "Diseño del menú"
-style: "Diseño"
 showNoteActionsOnlyHover: "Mostrar acciones de la nota sólo al pasar el cursor"
 showReactionsCount: "Mostrar el número de reacciones en las notas"
 noHistory: "No hay datos en el historial"
@@ -704,7 +700,10 @@ abuseReported: "Se ha enviado el reporte. Muchas gracias."
 reporter: "Reportador"
 reporteeOrigin: "Reportar a"
 reporterOrigin: "Origen del reporte"
+forwardReport: "Transferir un informe a una instancia remota"
+forwardReportIsAnonymous: "No puede ver su información de la instancia remota y aparecerá como una cuenta anónima del sistema"
 send: "Enviar"
+abuseMarkAsResolved: "Marcar reporte como resuelto"
 openInNewTab: "Abrir en una Nueva Pestaña"
 openInSideView: "Abrir en una vista al costado"
 defaultNavigationBehaviour: "Navegación por defecto"
@@ -929,9 +928,6 @@ oneHour: "1 hora"
 oneDay: "1 día"
 oneWeek: "1 semana"
 oneMonth: "1 mes"
-threeMonths: "Tres meses"
-oneYear: "Un año"
-threeDays: "Tres días"
 reflectMayTakeTime: "Puede pasar un tiempo hasta que se reflejen los cambios"
 failedToFetchAccountInformation: "No se pudo obtener información de la cuenta"
 rateLimitExceeded: "Se excedió el límite de peticiones"
@@ -1247,14 +1243,6 @@ useNativeUIForVideoAudioPlayer: "Usar la interfaz del navegador cuando se reprod
 keepOriginalFilename: "Mantener el nombre original del archivo"
 noDescription: "No hay descripción"
 alwaysConfirmFollow: "Confirmar siempre cuando se sigue a alguien"
-inquiry: "Contacto"
-tryAgain: "Por favor , inténtalo de nuevo"
-performance: "Rendimiento"
-unknownWebAuthnKey: "Esto no se ha registrado llave maestra."
-messageToFollower: "Mensaje a seguidores"
-_abuseUserReport:
-  accept: "Acepte"
-  reject: "repudio"
 _delivery:
   stop: "Suspendido"
   _type:
@@ -1930,6 +1918,7 @@ _theme:
     buttonBg: "Fondo de botón"
     buttonHoverBg: "Fondo de botón (hover)"
     inputBorder: "Borde de los campos de entrada"
+    listItemHoverBg: "Fondo de elemento de listas (hover)"
     driveFolderBg: "Fondo de capeta del drive"
     wallpaperOverlay: "Transparencia del fondo de pantalla"
     badge: "Medalla"
@@ -2354,8 +2343,6 @@ _notification:
     followRequestAccepted: "El seguimiento fue aceptado"
     roleAssigned: "Rol asignado"
     achievementEarned: "Logro desbloqueado"
-    login: "Iniciar sesión"
-    test: "Pruebas de nofiticaciones"
     app: "Notificaciones desde aplicaciones"
   _actions:
     followBack: "Te sigue de vuelta"
@@ -2414,8 +2401,6 @@ _webhookSettings:
     renote: "Cuando reciba un \"re-note\""
     reaction: "Cuando se recibe una reacción"
     mention: "Cuando hay una mención"
-  _systemEvents:
-    userCreated: "Cuando se crea el usuario."
 _abuseReport:
   _notificationRecipient:
     _recipientType:

locales/fr-FR.yml

@@ -691,7 +691,10 @@ abuseReported: "Le rapport est envoyé. Merci."
 reporter: "Signalé par"
 reporteeOrigin: "Origine du signalement"
 reporterOrigin: "Signalé par"
+forwardReport: "Transférer le signalement à l’instance distante"
+forwardReportIsAnonymous: "L'instance distante ne sera pas en mesure de voir vos informations et apparaîtra comme un compte anonyme du système."
 send: "Envoyer"
+abuseMarkAsResolved: "Marquer le signalement comme résolu"
 openInNewTab: "Ouvrir dans un nouvel onglet"
 openInSideView: "Ouvrir en vue latérale"
 defaultNavigationBehaviour: "Navigation par défaut"
@@ -1701,6 +1704,7 @@ _theme:
     buttonBg: "Arrière-plan du bouton"
     buttonHoverBg: "Arrière-plan du bouton (survolé)"
     inputBorder: "Cadre de la zone de texte"
+    listItemHoverBg: "Arrière-plan d'item de liste (survolé)"
     driveFolderBg: "Arrière-plan du dossier de disque"
     wallpaperOverlay: "Superposition de fond d'écran"
     badge: "Badge"
@@ -2033,7 +2037,6 @@ _notification:
     followRequestAccepted: "Demande d'abonnement acceptée"
     roleAssigned: "Rôle reçu"
     achievementEarned: "Déverrouillage d'accomplissement"
-    login: "Se connecter"
     app: "Notifications provenant des apps"
   _actions:
     followBack: "Suivre"

locales/hu-HU.yml

@@ -1,5 +1,5 @@
 ---
-_lang_: "Magyar"
+_lang_: "Japán"
 monthAndDay: "{month}.{day}."
 search: "Keresés"
 notifications: "Értesítések"
@@ -96,7 +96,6 @@ _notification:
     renote: "Renote"
     quote: "Idézet"
     reaction: "Reakciók"
-    login: "Bejelentkezés"
   _actions:
     renote: "Renote"
 _deck:

locales/id-ID.yml

@@ -196,7 +196,6 @@ followConfirm: "Apakah kamu yakin ingin mengikuti {name}?"
 proxyAccount: "Akun proksi"
 proxyAccountDescription: "Akun proksi merupakan sebuah akun yang bertindak sebagai pengikut instansi luar untuk pengguna dalam kondisi tertentu. Sebagai contoh, ketika pengguna menambahkan seorang pengguna instansi luar ke dalam daftar, aktivitas dari pengguna instansi luar tidak akan disampaikan ke instansi apabila tidak ada pengguna lokal yang mengikuti pengguna tersebut, dengan begitu akun proksilah yang akan mengikutinya."
 host: "Host"
-selectSelf: "Pilih diri sendiri"
 selectUser: "Pilih pengguna"
 recipient: "Penerima"
 annotation: "Keterangan konten"
@@ -233,7 +232,6 @@ blockedInstances: "Instansi terblokir"
 blockedInstancesDescription: "Daftar nama host dari instansi yang diperlukan untuk diblokir. Instansi yang didaftarkan tidak akan dapat berkomunikasi dengan instansi ini."
 silencedInstances: "Instansi yang disenyapkan"
 silencedInstancesDescription: "Daftar nama host dari instansi yang ingin kamu senyapkan. Semua akun dari instansi yang terdaftar akan diperlakukan sebagai disenyapkan. Hal ini membuat akun hanya dapat membuat permintaan mengikuti, dan tidak dapat menyebutkan akun lokal apabila tidak mengikuti. Hal ini tidak akan mempengaruhi instansi yang diblokir."
-federationAllowedHosts: "Server yang membolehkan federasi"
 muteAndBlock: "Bisukan / Blokir"
 mutedUsers: "Pengguna yang dibisukan"
 blockedUsers: "Pengguna yang diblokir"
@@ -332,7 +330,6 @@ renameFolder: "Ubah nama folder"
 deleteFolder: "Hapus folder"
 folder: "Folder"
 addFile: "Tambahkan berkas"
-showFile: "Tampilkan berkas"
 emptyDrive: "Drive kosong"
 emptyFolder: "Folder kosong"
 unableToDelete: "Tidak dapat menghapus"
@@ -507,8 +504,6 @@ uiLanguage: "Bahasa antarmuka pengguna"
 aboutX: "Tentang {x}"
 emojiStyle: "Gaya emoji"
 native: "Native"
-menuStyle: "Gaya menu"
-style: "Gaya"
 showNoteActionsOnlyHover: "Hanya tampilkan aksi catatan saat ditunjuk"
 showReactionsCount: "Lihat jumlah reaksi dalam catatan"
 noHistory: "Tidak ada riwayat"
@@ -707,7 +702,10 @@ abuseReported: "Laporan kamu telah dikirimkan. Terima kasih."
 reporter: "Pelapor"
 reporteeOrigin: "Yang dilaporkan"
 reporterOrigin: "Pelapor"
+forwardReport: "Teruskan laporan ke instansi luar"
+forwardReportIsAnonymous: "Untuk melindungi privasi akun kamu, akun anonim dari sistem akan digunakan sebagai pelapor pada instansi luar."
 send: "Kirim"
+abuseMarkAsResolved: "Tandai laporan sebagai selesai"
 openInNewTab: "Buka di tab baru"
 openInSideView: "Buka di tampilan samping"
 defaultNavigationBehaviour: "Navigasi bawaan"
@@ -932,9 +930,6 @@ oneHour: "1 Jam"
 oneDay: "1 Hari"
 oneWeek: "1 Bulan"
 oneMonth: "satu bulan"
-threeMonths: "3 bulan"
-oneYear: "1 tahun"
-threeDays: "3 hari"
 reflectMayTakeTime: "Mungkin perlu beberapa saat untuk dicerminkan."
 failedToFetchAccountInformation: "Gagal untuk mendapatkan informasi akun"
 rateLimitExceeded: "Batas sudah terlampaui"
@@ -1109,7 +1104,6 @@ preservedUsernames: "Nama pengguna tercadangkan"
 preservedUsernamesDescription: "Daftar nama pengguna yang dicadangkan dipisah dengan baris baru. Nama pengguna berikut akan tidak dapat dipakai pada pembuatan akun normal, namun dapat digunakan oleh admin untuk membuat akun baru. Akun yang sudah ada dengan menggunakan nama pengguna ini tidak akan terpengaruh."
 createNoteFromTheFile: "Buat catatan dari berkas ini"
 archive: "Arsipkan"
-archived: "Diarsipkan"
 channelArchiveConfirmTitle: "Yakin untuk mengarsipkan {name}?"
 channelArchiveConfirmDescription: "Kanal yang diarsipkan tidak akan muncul pada daftar kanal atau hasil pencarian. Postingan baru juga tidak dapat ditambahkan lagi."
 thisChannelArchived: "Kanal ini telah diarsipkan."
@@ -1120,7 +1114,6 @@ preventAiLearning: "Tolak penggunaan Pembelajaran Mesin (AI Generatif)"
 preventAiLearningDescription: "Minta perayap web untuk tidak menggunakan materi teks atau gambar yang telah diposting ke dalam set data Pembelajaran Mesin (Prediktif / Generatif). Hal ini dicapai dengan menambahkan flag HTML-Response \"noai\" ke masing-masing konten. Pencegahan penuh mungkin tidak dapat dicapai dengan flag ini, karena juga dapat diabaikan begitu saja."
 options: "Opsi peran"
 specifyUser: "Pengguna spesifik"
-openTagPageConfirm: "Apakah ingin membuka laman tagar?"
 failedToPreviewUrl: "Tidak dapat dipratinjau"
 update: "Perbarui"
 rolesThatCanBeUsedThisEmojiAsReaction: "Peran yang dapat menggunakan emoji ini sebagai reaksi"
@@ -1253,18 +1246,6 @@ noDescription: "Tidak ada deskripsi"
 alwaysConfirmFollow: "Selalu konfirmasi ketika mengikuti"
 inquiry: "Hubungi kami"
 tryAgain: "Silahkan coba lagi."
-createdLists: "Senarai yang dibuat"
-createdAntennas: "Antena yang dibuat"
-fromX: "Dari {x}"
-noteOfThisUser: "Catatan oleh pengguna ini"
-clipNoteLimitExceeded: "Klip ini tak bisa ditambahi lagi catatan."
-performance: "Kinerja"
-modified: "Diubah"
-thereAreNChanges: "Ada {n} perubahan"
-prohibitedWordsForNameOfUser: "Kata yang dilarang untuk nama pengguna"
-_abuseUserReport:
-  accept: "Setuju"
-  reject: "Tolak"
 _delivery:
   status: "Status pengiriman"
   stop: "Ditangguhkan"
@@ -1729,8 +1710,6 @@ _role:
     canSearchNotes: "Penggunaan pencarian catatan"
     canUseTranslator: "Penggunaan penerjemah"
     avatarDecorationLimit: "Jumlah maksimum dekorasi avatar yang dapat diterapkan"
-    canImportAntennas: "Izinkan mengimpor antena"
-    canImportUserLists: "Izinkan mengimpor senarai"
   _condition:
     roleAssignedTo: "Ditugaskan ke peran manual"
     isLocal: "Pengguna lokal"
@@ -1948,6 +1927,7 @@ _theme:
     buttonBg: "Latar belakang tombol"
     buttonHoverBg: "Latar belakang tombol (Mengambang)"
     inputBorder: "Batas bidang masukan"
+    listItemHoverBg: "Latar belakang daftar item (Mengambang)"
     driveFolderBg: "Latar belakang folder drive"
     wallpaperOverlay: "Lapisan wallpaper"
     badge: "Lencana"
@@ -1967,7 +1947,6 @@ _soundSettings:
   driveFileTypeWarnDescription: "Pilih berkas audio"
   driveFileDurationWarn: "Audio ini terlalu panjang"
   driveFileDurationWarnDescription: "Audio panjang dapat mengganggu penggunaan Misskey. Masih ingin melanjutkan?"
-  driveFileError: "Tak bisa memuat audio. Mohon ubah pengaturan"
 _ago:
   future: "Masa depan"
   justNow: "Baru saja"
@@ -2375,7 +2354,6 @@ _notification:
     followRequestAccepted: "Permintaan mengikuti disetujui"
     roleAssigned: "Peran Diberikan"
     achievementEarned: "Pencapaian didapatkan"
-    login: "Masuk"
     app: "Notifikasi dari aplikasi tertaut"
   _actions:
     followBack: "Ikuti Kembali"
@@ -2440,8 +2418,6 @@ _abuseReport:
   _notificationRecipient:
     _recipientType:
       mail: "Surel"
-      webhook: "Webhook"
-    keywords: "Kata kunci"
 _moderationLogTypes:
   createRole: "Peran telah dibuat"
   deleteRole: "Peran telah dihapus"
@@ -2479,7 +2455,6 @@ _moderationLogTypes:
   deleteAvatarDecoration: "Hapus dekorasi avatar"
   unsetUserAvatar: "Hapus avatar pengguna"
   unsetUserBanner: "Hapus banner pengguna"
-  deleteAccount: "Akun dihapus"
 _fileViewer:
   title: "Rincian berkas"
   type: "Jenis berkas"

locales/index.d.ts

@@ -48,20 +48,6 @@ export interface Locale extends ILocale {
      * パスワード
      */
     "password": string;
-    /**
-     * 初期設定開始用パスワード
-     */
-    "initialPasswordForSetup": string;
-    /**
-     * 初期設定開始用のパスワードが違います。
-     */
-    "initialPasswordIsIncorrect": string;
-    /**
-     * Misskeyを自分でインストールした場合は、設定ファイルに入力したパスワードを使用してください。
-     * Misskeyのホスティングサービスなどを使用している場合は、提供されたパスワードを使用してください。
-     * パスワードを設定していない場合は、空欄にしたまま続行してください。
-     */
-    "initialPasswordForSetupDescription": string;
     /**
      * パスワードを忘れた
      */
@@ -1834,10 +1820,6 @@ export interface Locale extends ILocale {
      * モデレーションノート
      */
     "moderationNote": string;
-    /**
-     * モデレーター間でだけ共有されるメモを記入することができます。
-     */
-    "moderationNoteDescription": string;
     /**
      * モデレーションノートを追加する
      */
@@ -2898,10 +2880,22 @@ export interface Locale extends ILocale {
      * 通報元
      */
     "reporterOrigin": string;
+    /**
+     * リモートサーバーに通報を転送する
+     */
+    "forwardReport": string;
+    /**
+     * リモートサーバーからはあなたの情報は見れず、匿名のシステムアカウントとして表示されます。
+     */
+    "forwardReportIsAnonymous": string;
     /**
      * 送信
      */
     "send": string;
+    /**
+     * 対応済みにする
+     */
+    "abuseMarkAsResolved": string;
     /**
      * 新しいタブで開く
      */
@@ -3706,10 +3700,6 @@ export interface Locale extends ILocale {
      * パスワードが間違っています。
      */
     "incorrectPassword": string;
-    /**
-     * ワンタイムパスワードが間違っているか、期限切れになっています。
-     */
-    "incorrectTotp": string;
     /**
      * 「{choice}」に投票しますか？
      */
@@ -3806,18 +3796,6 @@ export interface Locale extends ILocale {
      * 1ヶ月
      */
     "oneMonth": string;
-    /**
-     * 3ヶ月
-     */
-    "threeMonths": string;
-    /**
-     * 1年
-     */
-    "oneYear": string;
-    /**
-     * 3日
-     */
-    "threeDays": string;
     /**
      * 反映されるまで時間がかかる場合があります。
      */
@@ -4378,10 +4356,6 @@ export interface Locale extends ILocale {
      * リモートサーバーのチャートを生成
      */
     "enableChartsForFederatedInstances": string;
-    /**
-     * リモートサーバーの情報を取得
-     */
-    "enableStatsForFederatedInstances": string;
     /**
      * ノートのアクションにクリップを追加
      */
@@ -5174,123 +5148,6 @@ export interface Locale extends ILocale {
      * パスキーの検証に成功しましたが、パスワードレスログインが無効になっています。
      */
     "passkeyVerificationSucceededButPasswordlessLoginDisabled": string;
-    /**
-     * フォロワーへのメッセージ
-     */
-    "messageToFollower": string;
-    /**
-     * 対象
-     */
-    "target": string;
-    /**
-     * CAPTCHAのテストを目的とした機能です。<strong>本番環境で使用しないでください。</strong>
-     */
-    "testCaptchaWarning": string;
-    /**
-     * 禁止ワード（ユーザーの名前）
-     */
-    "prohibitedWordsForNameOfUser": string;
-    /**
-     * このリストに含まれる文字列がユーザーの名前に含まれる場合、ユーザーの名前の変更を拒否します。モデレーター権限を持つユーザーはこの制限の影響を受けません。
-     */
-    "prohibitedWordsForNameOfUserDescription": string;
-    /**
-     * 変更しようとした名前に禁止された文字列が含まれています
-     */
-    "yourNameContainsProhibitedWords": string;
-    /**
-     * 名前に禁止されている文字列が含まれています。この名前を使用したい場合は、サーバー管理者にお問い合わせください。
-     */
-    "yourNameContainsProhibitedWordsDescription": string;
-    /**
-     * 投稿者により、表示にはログインが必要と設定されています
-     */
-    "thisContentsAreMarkedAsSigninRequiredByAuthor": string;
-    /**
-     * ロックダウン
-     */
-    "lockdown": string;
-    /**
-     * アカウントを選択してください
-     */
-    "pleaseSelectAccount": string;
-    /**
-     * 利用可能なロール
-     */
-    "availableRoles": string;
-    "_accountSettings": {
-        /**
-         * コンテンツの表示にログインを必須にする
-         */
-        "requireSigninToViewContents": string;
-        /**
-         * あなたが作成した全てのノートなどのコンテンツを表示するのにログインを必須にします。クローラーに情報が収集されるのを防ぐ効果が期待できます。
-         */
-        "requireSigninToViewContentsDescription1": string;
-        /**
-         * URLプレビュー(OGP)、Webページへの埋め込み、ノートの引用に対応していないサーバーからの表示も不可になります。
-         */
-        "requireSigninToViewContentsDescription2": string;
-        /**
-         * リモートサーバーに連合されたコンテンツでは、これらの制限が適用されない場合があります。
-         */
-        "requireSigninToViewContentsDescription3": string;
-        /**
-         * 過去のノートをフォロワーのみ表示可能にする
-         */
-        "makeNotesFollowersOnlyBefore": string;
-        /**
-         * この機能が有効になっている間、設定された日時より過去、または設定された時間を経過しているノートがフォロワーのみ表示可能になります。無効に戻すと、ノートの公開状態も元に戻ります。
-         */
-        "makeNotesFollowersOnlyBeforeDescription": string;
-        /**
-         * 過去のノートを非公開化する
-         */
-        "makeNotesHiddenBefore": string;
-        /**
-         * この機能が有効になっている間、設定された日時より過去、または設定された時間を経過しているノートが自分のみ表示可能(非公開化)になります。無効に戻すと、ノートの公開状態も元に戻ります。
-         */
-        "makeNotesHiddenBeforeDescription": string;
-        /**
-         * リモートサーバーに連合されたノートには効果が及ばない場合があります。
-         */
-        "mayNotEffectForFederatedNotes": string;
-        /**
-         * 指定した時間を経過しているノート
-         */
-        "notesHavePassedSpecifiedPeriod": string;
-        /**
-         * 指定した日時より前のノート
-         */
-        "notesOlderThanSpecifiedDateAndTime": string;
-    };
-    "_abuseUserReport": {
-        /**
-         * 転送
-         */
-        "forward": string;
-        /**
-         * 匿名のシステムアカウントとして、リモートサーバーに通報を転送します。
-         */
-        "forwardDescription": string;
-        /**
-         * 解決
-         */
-        "resolve": string;
-        /**
-         * 是認
-         */
-        "accept": string;
-        /**
-         * 否認
-         */
-        "reject": string;
-        /**
-         * 内容が正当である通報に対応した場合は「是認」を選択し、肯定的にケースが解決されたことをマークします。
-         * 内容が正当でない通報の場合は「否認」を選択し、否定的にケースが解決されたことをマークします。
-         */
-        "resolveTutorial": string;
-    };
     "_delivery": {
         /**
          * 配信状態
@@ -5794,10 +5651,6 @@ export interface Locale extends ILocale {
          * サーバー運営者へのお問い合わせフォームのURLや、運営者の連絡先等が記載されたWebページのURLを指定します。
          */
         "inquiryUrlDescription": string;
-        /**
-         * 一定期間モデレーターのアクティビティが検出されなかった場合、スパム防止のためこの設定は自動でオフになります。
-         */
-        "thisSettingWillAutomaticallyOffWhenModeratorsInactive": string;
     };
     "_accountMigration": {
         /**
@@ -7807,6 +7660,10 @@ export interface Locale extends ILocale {
              * 入力ボックスの縁取り
              */
             "inputBorder": string;
+            /**
+             * リスト項目の背景 (ホバー)
+             */
+            "listItemHoverBg": string;
             /**
              * ドライブフォルダーの背景
              */
@@ -8456,26 +8313,14 @@ export interface Locale extends ILocale {
          * アプリケーションに戻っています
          */
         "callback": string;
-        /**
-         * アクセスを許可しました
-         */
-        "accepted": string;
         /**
          * アクセスを拒否しました
          */
         "denied": string;
-        /**
-         * 以下のユーザーとして操作しています
-         */
-        "scopeUser": string;
         /**
          * アプリケーションにアクセス許可を与えるには、ログインが必要です。
          */
         "pleaseLogin": string;
-        /**
-         * アクセスを許可すると、自動で以下のURLに遷移します
-         */
-        "byClickingYouWillBeRedirectedToThisUrl": string;
     };
     "_antennaSources": {
         /**
@@ -9357,7 +9202,7 @@ export interface Locale extends ILocale {
          */
         "youGotQuote": ParameterizedString<"name">;
         /**
-         * {name}がリノートしました
+         * {name}がRenoteしました
          */
         "youRenoted": ParameterizedString<"name">;
         /**
@@ -9436,10 +9281,6 @@ export interface Locale extends ILocale {
          * {x}のエクスポートが完了しました
          */
         "exportOfXCompleted": ParameterizedString<"x">;
-        /**
-         * ログインがありました
-         */
-        "login": string;
         "_types": {
             /**
              * すべて
@@ -9462,7 +9303,7 @@ export interface Locale extends ILocale {
              */
             "reply": string;
             /**
-             * リノート
+             * Renote
              */
             "renote": string;
             /**
@@ -9497,10 +9338,6 @@ export interface Locale extends ILocale {
              * エクスポートが完了した
              */
             "exportCompleted": string;
-            /**
-             * ログイン
-             */
-            "login": string;
             /**
              * 通知のテスト
              */
@@ -9520,7 +9357,7 @@ export interface Locale extends ILocale {
              */
             "reply": string;
             /**
-             * リノート
+             * Renote
              */
             "renote": string;
         };
@@ -9747,14 +9584,6 @@ export interface Locale extends ILocale {
              * ユーザーが作成されたとき
              */
             "userCreated": string;
-            /**
-             * モデレーターが一定期間非アクティブになったとき
-             */
-            "inactiveModeratorsWarning": string;
-            /**
-             * モデレーターが一定期間非アクティブだったため、システムにより招待制へと変更されたとき
-             */
-            "inactiveModeratorsInvitationOnlyChanged": string;
         };
         /**
          * Webhookを削除しますか？
@@ -9926,14 +9755,6 @@ export interface Locale extends ILocale {
          * 通報を解決
          */
         "resolveAbuseReport": string;
-        /**
-         * 通報を転送
-         */
-        "forwardAbuseReport": string;
-        /**
-         * 通報のモデレーションノート更新
-         */
-        "updateAbuseReportNote": string;
         /**
          * 招待コードを作成
          */
@@ -10557,28 +10378,6 @@ export interface Locale extends ILocale {
          */
         "codeGeneratedDescription": string;
     };
-    "_selfXssPrevention": {
-        /**
-         * 警告
-         */
-        "warning": string;
-        /**
-         * 「この画面に何か貼り付けろ」はすべて詐欺です。
-         */
-        "title": string;
-        /**
-         * ここに何かを貼り付けると、悪意のあるユーザーにアカウントを乗っ取られたり、個人情報を盗まれたりする可能性があります。
-         */
-        "description1": string;
-        /**
-         * 貼り付けようとしているものが何なのかを正確に理解していない場合は、%c今すぐ作業を中止してこのウィンドウを閉じてください。
-         */
-        "description2": string;
-        /**
-         * 詳しくはこちらをご確認ください。 {link}
-         */
-        "description3": ParameterizedString<"link">;
-    };
 }
 declare const locales: {
     [lang: string]: Locale;

locales/index.js

@@ -15,7 +15,6 @@ const merge = (...args) => args.reduce((a, c) => ({
 
 const languages = [
 	'ar-SA',
-	'ca-ES',
 	'cs-CZ',
 	'da-DK',
 	'de-DE',

locales/it-IT.yml

@@ -8,9 +8,6 @@ search: "Cerca"
 notifications: "Notifiche"
 username: "Nome utente"
 password: "Password"
-initialPasswordForSetup: "Password iniziale, per avviare le impostazioni"
-initialPasswordIsIncorrect: "Password iniziale, sbagliata."
-initialPasswordForSetupDescription: "Se hai installato Misskey di persona, usa la password che hai indicato nel file di configurazione.\nSe stai utilizzando un servizio di hosting Misskey, usa la password fornita dal gestore.\nSe non hai una password preimpostata, lascia il campo vuoto e continua."
 forgotPassword: "Hai dimenticato la password?"
 fetchingAsApObject: "Recuperando dal Fediverso..."
 ok: "OK"
@@ -68,7 +65,7 @@ reply: "Rispondi"
 loadMore: "Mostra di più"
 showMore: "Espandi"
 showLess: "Comprimi"
-youGotNewFollower: "Hai un nuovo Follower"
+youGotNewFollower: "Adesso ti segue"
 receiveFollowRequest: "Hai ricevuto una richiesta di follow"
 followRequestAccepted: "Ha accettato la tua richiesta di follow"
 mention: "Menzioni"
@@ -80,14 +77,14 @@ export: "Esporta"
 files: "Allegati"
 download: "Scarica"
 driveFileDeleteConfirm: "Vuoi davvero eliminare il file \"{name}\", e le Note a cui è stato allegato?"
-unfollowConfirm: "Vuoi davvero togliere il Following a {name}?"
+unfollowConfirm: "Vuoi davvero smettere di seguire {name}?"
 exportRequested: "Hai richiesto un'esportazione, e potrebbe volerci tempo. Quando sarà compiuta, il file verrà aggiunto direttamente al Drive."
 importRequested: "Hai richiesto un'importazione. Potrebbe richiedere un po' di tempo."
 lists: "Liste"
 noLists: "Nessuna lista"
 note: "Nota"
 notes: "Note"
-following: "Following"
+following: "Follow"
 followers: "Follower"
 followsYou: "Follower"
 createList: "Aggiungi una nuova lista"
@@ -106,7 +103,7 @@ defaultNoteVisibility: "Privacy predefinita delle note"
 follow: "Segui"
 followRequest: "Richiesta di follow"
 followRequests: "Richieste di follow"
-unfollow: "Togli Following"
+unfollow: "Smetti di seguire"
 followRequestPending: "Richiesta in approvazione"
 enterEmoji: "Inserisci emoji"
 renote: "Rinota"
@@ -195,7 +192,7 @@ setWallpaper: "Imposta sfondo"
 removeWallpaper: "Elimina lo sfondo"
 searchWith: "Cerca: {q}"
 youHaveNoLists: "Non hai ancora creato nessuna lista"
-followConfirm: "Confermi il Following a {name}?"
+followConfirm: "Vuoi seguire {name}?"
 proxyAccount: "Profilo proxy"
 proxyAccountDescription: "Un profilo proxy funziona come follower per i profili remoti, sotto certe condizioni. Ad esempio, quando un profilo locale ne inserisce uno remoto in una lista (senza seguirlo), se nessun altro segue quel profilo remoto, le attività non possono essere distribuite. Dunque, il profilo proxy le seguirà per tutti."
 host: "Host"
@@ -239,8 +236,6 @@ silencedInstances: "Istanze silenziate"
 silencedInstancesDescription: "Elenca i nomi host delle istanze che vuoi silenziare. Tutti i profili nelle istanze silenziate vengono trattati come tali. Possono solo inviare richieste di follow e menzionare soltanto i profili locali che seguono. Le istanze bloccate non sono interessate."
 mediaSilencedInstances: "Istanze coi media silenziati"
 mediaSilencedInstancesDescription: "Elenca i nomi host delle istanze di cui vuoi silenziare i media, uno per riga. Tutti gli allegati dei profili nelle istanze silenziate per via degli allegati espliciti, verranno impostati come tali, le emoji personalizzate non saranno disponibili. Le istanze bloccate sono escluse."
-federationAllowedHosts: "Server a cui consentire la federazione"
-federationAllowedHostsDescription: "Indica gli host dei server a cui è consentita la federazione, uno per ogni linea."
 muteAndBlock: "Silenziare e bloccare"
 mutedUsers: "Profili silenziati"
 blockedUsers: "Profili bloccati"
@@ -263,7 +258,7 @@ all: "Tutte"
 subscribing: "Iscrizione"
 publishing: "Pubblicazione"
 notResponding: "Nessuna risposta"
-instanceFollowing: "Istanza Following"
+instanceFollowing: "Seguiti dall'istanza"
 instanceFollowers: "Follower dell'istanza"
 instanceUsers: "Profili nell'istanza"
 changePassword: "Aggiorna Password"
@@ -454,7 +449,6 @@ totpDescription: "Puoi autenticarti inserendo un codice OTP tramite la tua App d
 moderator: "Moderatore"
 moderation: "moderazione"
 moderationNote: "Promemoria di moderazione"
-moderationNoteDescription: "Puoi scrivere promemoria condivisi solo tra moderatori."
 addModerationNote: "Aggiungi promemoria di moderazione"
 moderationLogs: "Cronologia di moderazione"
 nUsersMentioned: "{n} profili ne parlano"
@@ -615,7 +609,7 @@ unsetUserBannerConfirm: "Vuoi davvero rimuovere l'intestazione dal profilo?"
 deleteAllFiles: "Elimina tutti i file"
 deleteAllFilesConfirm: "Vuoi davvero eliminare tutti i file?"
 removeAllFollowing: "Annulla tutti i follow"
-removeAllFollowingDescription: "Togli il Following a tutti i profili su {host}. Utile, ad esempio, quando l'istanza non esiste più."
+removeAllFollowingDescription: "Cancella tutti i follows del server {host}. Per favore, esegui se, ad esempio, l'istanza non esiste più."
 userSuspended: "L'utente è in sospensione"
 userSilenced: "Profilo silenziato"
 yourAccountSuspendedTitle: "Questo profilo è sospeso"
@@ -688,7 +682,7 @@ hardWordMute: "Filtro parole forte"
 regexpError: "errore regex"
 regexpErrorDescription: "Si è verificato un errore nell'espressione regolare alla riga {line} della parola muta {tab}:"
 instanceMute: "Silenziare l'istanza"
-userSaysSomething: "{name} ha detto qualcosa"
+userSaysSomething: "{name} ha parlato"
 makeActive: "Attiva"
 display: "Visualizza"
 copy: "Copia"
@@ -703,7 +697,7 @@ notificationSetting: "Impostazioni notifiche"
 notificationSettingDesc: "Seleziona il tipo di notifiche da visualizzare."
 useGlobalSetting: "Usa impostazioni generali"
 useGlobalSettingDesc: "Quando attiva, verranno utilizzate le impostazioni notifiche del profilo. Altrimenti si possono segliere impostazioni personalizzate."
-other: "Eccetera"
+other: "Ulteriori"
 regenerateLoginToken: "Genera di nuovo un token di connessione"
 regenerateLoginTokenDescription: "Genera un nuovo token di autenticazione. Solitamente questa operazione non è necessaria: quando si genera un nuovo token, tutti i dispositivi vanno disconnessi."
 theKeywordWhenSearchingForCustomEmoji: "Questa sarà la parola chiave durante la ricerca di emoji personalizzate"
@@ -720,7 +714,10 @@ abuseReported: "La segnalazione è stata inviata. Grazie."
 reporter: "il corrispondente"
 reporteeOrigin: "Segnalazione a"
 reporterOrigin: "Segnalazione da"
+forwardReport: "Inoltro di un report a un'istanza remota."
+forwardReportIsAnonymous: "L'istanza remota non vedrà le tue informazioni, apparirai come profilo di sistema, anonimo."
 send: "Inviare"
+abuseMarkAsResolved: "Risolvi segnalazione"
 openInNewTab: "Apri in una nuova scheda"
 openInSideView: "Apri in vista laterale"
 defaultNavigationBehaviour: "Navigazione preimpostata"
@@ -747,7 +744,7 @@ repliesCount: "Numero di risposte inviate"
 renotesCount: "Numero di note che hai ricondiviso"
 repliedCount: "Numero di risposte ricevute"
 renotedCount: "Numero delle tue note ricondivise"
-followingCount: "Numero di Following"
+followingCount: "Numero di profili seguiti"
 followersCount: "Numero di profili che ti seguono"
 sentReactionsCount: "Numero di reazioni inviate"
 receivedReactionsCount: "Numero di reazioni ricevute"
@@ -842,7 +839,7 @@ onlineStatus: "Stato di connessione"
 hideOnlineStatus: "Modalità invisibile"
 hideOnlineStatusDescription: "Attivando questa opzione potresti ridurre l'usabilità di alcune funzioni, come la ricerca."
 online: "Online"
-active: "Attivo"
+active: "Attività"
 offline: "Offline"
 notRecommended: "Sconsigliato"
 botProtection: "Protezione contro i bot"
@@ -901,8 +898,8 @@ pubSub: "Publish/Subscribe del profilo"
 lastCommunication: "La comunicazione più recente"
 resolved: "Risolto"
 unresolved: "Non risolto"
-breakFollow: "Rimuovi Follower"
-breakFollowConfirm: "Vuoi davvero togliere questo Follower?"
+breakFollow: "Impedire di seguirmi"
+breakFollowConfirm: "Vuoi davvero che questo profilo smetta di seguirti?"
 itsOn: "Abilitato"
 itsOff: "Disabilitato"
 on: "Acceso"
@@ -917,12 +914,11 @@ makeReactionsPublicDescription: "La lista delle reazioni che avete fatto è a di
 classic: "Classico"
 muteThread: "Silenziare conversazione"
 unmuteThread: "Riattiva la conversazione"
-followingVisibility: "Visibilità dei Following"
+followingVisibility: "Visibilità dei profili seguiti"
 followersVisibility: "Visibilità dei profili che ti seguono"
 continueThread: "Altre conversazioni"
 deleteAccountConfirm: "Così verrà eliminato il profilo. Vuoi procedere?"
 incorrectPassword: "La password è errata."
-incorrectTotp: "Il codice OTP è sbagliato, oppure scaduto."
 voteConfirm: "Votare per「{choice}」?"
 hide: "Nascondere"
 useDrawerReactionPickerForMobile: "Mostra sul drawer da dispositivo mobile"
@@ -947,9 +943,6 @@ oneHour: "1 ora"
 oneDay: "1 giorno"
 oneWeek: "1 settimana"
 oneMonth: "Un mese"
-threeMonths: "3 mesi"
-oneYear: "1 anno"
-threeDays: "3 giorni"
 reflectMayTakeTime: "Potrebbe essere necessario un po' di tempo perché ciò abbia effetto."
 failedToFetchAccountInformation: "Impossibile recuperare le informazioni sul profilo"
 rateLimitExceeded: "Superato il limite di richieste."
@@ -968,7 +961,7 @@ driveCapOverrideLabel: "Modificare la capienza del Drive per questo profilo"
 driveCapOverrideCaption: "Se viene specificato meno di 0, viene annullato."
 requireAdminForView: "Per visualizzarli, è necessario aver effettuato l'accesso con un profilo amministratore."
 isSystemAccount: "Questi profili vengono creati e gestiti automaticamente dal sistema"
-typeToConfirm: "Digita {x} per continuare"
+typeToConfirm: "Per eseguire questa operazione, digitare {x}"
 deleteAccount: "Eliminazione profilo"
 document: "Documento"
 numberOfPageCache: "Numero di pagine cache"
@@ -1023,7 +1016,7 @@ neverShow: "Non mostrare più"
 remindMeLater: "Rimanda"
 didYouLikeMisskey: "Ti piace Misskey?"
 pleaseDonate: "Misskey è il software libero utilizzato su {host}. Offrendo una donazione è più facile continuare a svilupparlo!"
-correspondingSourceIsAvailable: "Il codice sorgente corrispondente è disponibile su {anchor}."
+correspondingSourceIsAvailable: ""
 roles: "Ruoli"
 role: "Ruolo"
 noRole: "Ruolo non trovato"
@@ -1090,7 +1083,6 @@ retryAllQueuesConfirmTitle: "Vuoi ritentare adesso?"
 retryAllQueuesConfirmText: "Potrebbe sovraccaricare il server temporaneamente."
 enableChartsForRemoteUser: "Abilita i grafici per i profili remoti"
 enableChartsForFederatedInstances: "Abilita i grafici per le istanze federate"
-enableStatsForFederatedInstances: "Informazioni statistiche sui server federati"
 showClipButtonInNoteFooter: "Aggiungi il bottone Clip tra le azioni delle Note"
 reactionsDisplaySize: "Grandezza delle reazioni"
 limitWidthOfReaction: "Limita la larghezza delle reazioni e ridimensionale"
@@ -1133,7 +1125,7 @@ channelArchiveConfirmDescription: "Un canale archiviato non compare nell'elenco
 thisChannelArchived: "Questo canale è stato archiviato."
 displayOfNote: "Visualizzazione delle Note"
 initialAccountSetting: "Impostazioni iniziali del profilo"
-youFollowing: "Following"
+youFollowing: "Seguiti"
 preventAiLearning: "Impedisci l'apprendimento della IA"
 preventAiLearningDescription: "Aggiungendo il campo \"noai\" alla risposta HTML, si indica ai Robot esterni di non usare testi e allegati per addestrare sistemi di Machine Learning (IA predittiva/generativa). Anche se è impossibile sapere se la richiesta venga onorata o semplicemente ignorata."
 options: "Opzioni del ruolo"
@@ -1289,35 +1281,6 @@ signinWithPasskey: "Accedi con passkey"
 unknownWebAuthnKey: "Questa è una passkey sconosciuta."
 passkeyVerificationFailed: "La verifica della passkey non è riuscita."
 passkeyVerificationSucceededButPasswordlessLoginDisabled: "La verifica della passkey è riuscita, ma l'accesso senza password è disabilitato."
-messageToFollower: "Messaggio ai follower"
-target: "Riferimento"
-testCaptchaWarning: "Questa funzione è destinata al test CAPTCHA. <strong>Da non utilizzare in ambiente di produzione.</strong>"
-prohibitedWordsForNameOfUser: "Parole proibite (nome utente)"
-prohibitedWordsForNameOfUserDescription: "Il sistema rifiuta di rinominare un utente, se il nome contiene qualsiasi parola nell'elenco. Sono esenti i profili con privilegi di moderazione."
-yourNameContainsProhibitedWords: "Il nome che hai scelto contiene una o più parole vietate"
-yourNameContainsProhibitedWordsDescription: "Se desideri comunque utilizzare questo nome, contatta l''amministrazione."
-thisContentsAreMarkedAsSigninRequiredByAuthor: "L'autore richiede di iscriversi per vedere il contenuto"
-lockdown: "Isolamento"
-pleaseSelectAccount: "Per favore, seleziona un profilo"
-_accountSettings:
-  requireSigninToViewContents: "Per vedere il contenuto, è necessaria l'iscrizione"
-  requireSigninToViewContentsDescription1: "Richiedere l'iscrizione per visualizzare tutte le Note e gli altri contenuti che hai creato. Probabilmente l'effetto è impedire la raccolta di informazioni da parte dei bot crawler."
-  requireSigninToViewContentsDescription2: "La visualizzazione verrà disabilitata a server che non supportano l'anteprima URL (OGP), all'incorporamento nelle pagine Web e alla citazione delle Note."
-  requireSigninToViewContentsDescription3: "Queste restrizioni potrebbero non applicarsi al contenuto federato su server remoti."
-  makeNotesFollowersOnlyBefore: "Rendi visibili solo ai Follower le Note pubblicate in precedenza"
-  makeNotesFollowersOnlyBeforeDescription: "Mentre questa funzione è abilitata, le Note antecedenti al momento impostato, saranno visibili solo ai profili Follower. Disabilitandola nuovamente, verrà ripristinata anche la visibilità pubblica della Nota."
-  makeNotesHiddenBefore: "Nascondi le Note pubblicate in precedenza"
-  makeNotesHiddenBeforeDescription: "Mentre questa funzione è abilitata, le Note antecedenti al momento impostato, saranno visibili soltanto a te (private). Disabilitandola nuovamente, verrà ripristinata anche la visibilità pubblica della Nota."
-  mayNotEffectForFederatedNotes: "Le Note già federate su server remoti potrebbero non essere modificate."
-  notesHavePassedSpecifiedPeriod: "Note antecedenti al periodo specificato"
-  notesOlderThanSpecifiedDateAndTime: "Note antecedenti al momento specificato"
-_abuseUserReport:
-  forward: "Inoltra"
-  forwardDescription: "Inoltra il report al server remoto, per mezzo di account di sistema, anonimo."
-  resolve: "Risolvi"
-  accept: "Approva"
-  reject: "Rifiuta"
-  resolveTutorial: "Se moderi una segnalazione legittima, scegli \"Approva\" per risolvere positivamente.\nSe la segnalazione non è legittima, seleziona \"Rifiuta\" per risolvere negativamente."
 _delivery:
   status: "Stato della consegna"
   stop: "Sospensione"
@@ -1345,16 +1308,16 @@ _bubbleGame:
 _announcement:
   forExistingUsers: "Solo ai profili attuali"
   forExistingUsersDescription: "L'annuncio sarà visibile solo ai profili esistenti in questo momento. Se disabilitato, sarà visibile anche ai profili che verranno creati dopo la pubblicazione di questo annuncio."
-  needConfirmationToRead: "Conferma di lettura obbligatoria"
-  needConfirmationToReadDescription: "I profili riceveranno una finestra di dialogo che richiede di accettare obbligatoriamente per procedere. Tale richiesta è esente da  \"conferma tutte\"."
+  needConfirmationToRead: "Richiede la conferma di lettura"
+  needConfirmationToReadDescription: "Sarà visualizzata una finestra di dialogo che richiede la conferma di lettura. Inoltre, non è soggetto a conferme di lettura massicce."
   end: "Archivia l'annuncio"
   tooManyActiveAnnouncementDescription: "L'esperienza delle persone può peggiorare se ci sono troppi annunci attivi. Considera anche l'archiviazione degli annunci conclusi."
   readConfirmTitle: "Segnare come già letto?"
   readConfirmText: "Hai già letto \"{title}˝?"
   shouldNotBeUsedToPresentPermanentInfo: "Ti consigliamo di utilizzare gli annunci per pubblicare informazioni tempestive e limitate nel tempo, anziché informazioni importanti a lungo andare nel tempo, poiché potrebbero risultare difficili da ritrovare e peggiorare la fruibilità del servizio, specialmente alle nuove persone iscritte."
   dialogAnnouncementUxWarn: "Ti consigliamo di usarli con cautela, poiché è molto probabile che avere più di un annuncio in stile \"finestra di dialogo\" peggiori sensibilmente la fruibilità del servizio, specialmente alle nuove persone iscritte."
-  silence: "Annuncio silenzioso"
-  silenceDescription: "Attivando questa opzione, non invierai la notifica, evitando che debba essere contrassegnata come già letta."
+  silence: "Silenziare gli annunci"
+  silenceDescription: "Se attivi questa opzione, non riceverai notifiche sugli annunci, evitando di contrassegnarle come già lette."
 _initialAccountSetting:
   accountCreated: "Il tuo profilo è stato creato!"
   letsStartAccountSetup: "Per iniziare, impostiamo il tuo profilo."
@@ -1396,7 +1359,7 @@ _initialTutorial:
   _timeline:
     title: "Come funziona la Timeline"
     description1: "Misskey fornisce alcune Timeline (sequenze cronologiche di Note). Una di queste potrebbe essere stata disattivata dagli amministratori."
-    home: "le Note provenienti dai profili che segui (Following)."
+    home: "le Note provenienti dai profili che segui (follow)."
     local: "tutte le Note pubblicate dai profili di questa istanza."
     social: "sia le Note della Timeline Home che quelle della Timeline Locale, insieme!"
     global: "le Note da pubblicate da tutte le altre istanze federate con la nostra."
@@ -1434,7 +1397,7 @@ _initialTutorial:
     title: "Il tutorial è finito! 🎉"
     description: "Queste sono solamente alcune delle funzionalità principali di Misskey. Per ulteriori informazioni, {link}."
 _timelineDescription:
-  home: "Nella Timeline Home, la tua cronologia principale, puoi vedere le Note provenienti dai profili che segui (Following)."
+  home: "Nella Timeline Home, la tua cronologia principale, puoi vedere le Note provenienti dai profili che segui (follow)."
   local: "La Timeline Locale, è una cronologia di Note pubblicate da tutti i profili iscritti su questo server."
   social: "La Timeline Sociale, unisce in ordine cronologico l'elenco di Note presenti nella Timeline Home e quella Locale."
   global: "La Timeline Federata ti consente di vedere le Note pubblicate dai profili di tutti gli altri server federati a questo."
@@ -1455,12 +1418,11 @@ _serverSettings:
   reactionsBufferingDescription: "Attivando questa opzione, puoi migliorare significativamente le prestazioni durante la creazione delle reazioni e ridurre il carico sul database. Tuttavia, aumenterà l'impiego di memoria Redis."
   inquiryUrl: "URL di contatto"
   inquiryUrlDescription: "Specificare l'URL al modulo di contatto, oppure le informazioni con i dati di contatto dell'amministrazione."
-  thisSettingWillAutomaticallyOffWhenModeratorsInactive: "Per prevenire SPAM, questa impostazione verrà disattivata automaticamente, se non si rileva alcuna attività di moderazione durante un certo periodo di tempo."
 _accountMigration:
   moveFrom: "Migra un altro profilo dentro a questo"
   moveFromSub: "Crea un alias verso un altro profilo remoto"
   moveFromLabel: "Profilo da cui migrare #{n}"
-  moveFromDescription: "Se desideri spostare i Follower da un altro profilo a questo, devi prima creare un alias qui. Assicurati averlo creato PRIMA di eseguire l'attività! Inserisci l'indirizzo del profilo mittente in questo modo: @persona@istanza.it"
+  moveFromDescription: "Se desideri spostare i profili follower da un altro profilo a questo, devi prima creare un alias qui. Assicurati averlo creato PRIMA di eseguire l'attività! Inserisci l'indirizzo del profilo mittente in questo modo: @persona@istanza.it"
   moveTo: "Migrare questo profilo verso un un altro"
   moveToLabel: "Profilo verso cui migrare"
   moveCannotBeUndone: "La migrazione è irreversibile, non può essere interrotta o annullata."
@@ -1469,7 +1431,7 @@ _accountMigration:
   startMigration: "Avvia la migrazione"
   migrationConfirm: "Vuoi davvero migrare questo profilo su {account}? L'azione è irreversibile e non potrai più utilizzare questo profilo nel suo stato originale.\nInoltre, assicurati di aver già creato un alias sull'account a cui ti stai trasferendo."
   movedAndCannotBeUndone: "Il tuo profilo è stato migrato.\nLa migrazione non può essere annullata."
-  postMigrationNote: "Questo profilo smetterà di seguire gli altri profili remoti a 24 ore dal termine della migrazione.\nSia i Following che i Follower scenderanno a zero. I tuoi Follower saranno comunque in grado di vedere le Note per soli Follower, poiché non smetteranno di seguirti."
+  postMigrationNote: "Questo profilo smetterà di seguire gli altri profili remoti a 24 ore dal termine della migrazione.\nSia i Follow che i Follower scenderanno a zero. I tuoi follower saranno comunque in grado di vedere le Note per soli follower, poiché non smetteranno di seguirti."
   movedTo: "Profilo verso cui migrare"
 _achievements:
   earnedAt: "Data di conseguimento"
@@ -1862,7 +1824,7 @@ _gallery:
   unlike: "Non mi piace più"
 _email:
   _follow:
-    title: "Follower aggiuntivo"
+    title: "Adesso ti segue"
   _receiveFollowRequest:
     title: "Hai ricevuto una richiesta di follow"
 _plugin:
@@ -1926,7 +1888,7 @@ _channel:
   removeBanner: "Rimuovi intestazione"
   featured: "Di tendenza"
   owned: "I miei canali"
-  following: "Following"
+  following: "Seguiti"
   usersCount: "{n} partecipanti"
   notesCount: "{n} note"
   nameAndDescription: "Nome e descrizione"
@@ -2009,6 +1971,7 @@ _theme:
     buttonBg: "Sfondo del pulsante"
     buttonHoverBg: "Sfondo del pulsante (sorvolato)"
     inputBorder: "Inquadra casella di testo"
+    listItemHoverBg: "Sfondo della voce di elenco (sorvolato)"
     driveFolderBg: "Sfondo della cartella di disco"
     wallpaperOverlay: "Sovrapposizione dello sfondo"
     badge: "Distintivo"
@@ -2092,7 +2055,7 @@ _permissions:
   "read:favorites": "Visualizza i tuoi preferiti"
   "write:favorites": "Gestisci i tuoi preferiti"
   "read:following": "Vedi le informazioni di follow"
-  "write:following": "Aggiungere e togliere Following"
+  "write:following": "Following di altri profili"
   "read:messaging": "Visualizzare la chat"
   "write:messaging": "Gestire la chat"
   "read:mutes": "Vedi i profili silenziati"
@@ -2175,14 +2138,11 @@ _auth:
   permissionAsk: "Questa app richiede le seguenti autorizzazioni:"
   pleaseGoBack: "Si prega di ritornare sulla app"
   callback: "Ritornando sulla app"
-  accepted: "Accesso concesso"
   denied: "Accesso negato"
-  scopeUser: "Sto funzionando per il seguente profilo"
   pleaseLogin: "Per favore accedi al tuo account per cambiare i permessi dell'applicazione"
-  byClickingYouWillBeRedirectedToThisUrl: "Consentendo l'accesso, si verrà reindirizzati presso questo indirizzo URL"
 _antennaSources:
   all: "Tutte le note"
-  homeTimeline: "Note dai tuoi Following"
+  homeTimeline: "Note dagli utenti che segui"
   users: "Note dagli utenti selezionati"
   userList: "Note dagli utenti della lista selezionata"
   userBlacklist: "Tutte le Note tranne quelle di uno o più profili specificati"
@@ -2224,7 +2184,7 @@ _widgets:
   _userList:
     chooseList: "Seleziona una lista"
   clicker: "Cliccaggio"
-  birthdayFollowings: "Compleanni del giorno"
+  birthdayFollowings: "Chi nacque oggi"
 _cw:
   hide: "Nascondere"
   show: "Continua la lettura..."
@@ -2288,14 +2248,11 @@ _profile:
   changeBanner: "Cambia intestazione"
   verifiedLinkDescription: "Puoi verificare il tuo profilo mostrando una icona. Devi inserire la URL alla pagina che contiene un link al tuo profilo."
   avatarDecorationMax: "Puoi aggiungere fino a {max} decorazioni."
-  followedMessage: "Messaggio, quando qualcuno ti segue"
-  followedMessageDescription: "Puoi impostare un breve messaggio da mostrare agli altri profili quando ti seguono."
-  followedMessageDescriptionForLockedAccount: "Quando approvi una richiesta di follow, verrà visualizzato questo testo."
 _exportOrImport:
   allNotes: "Tutte le note"
   favoritedNotes: "Note preferite"
   clips: "Clip"
-  followingList: "Following"
+  followingList: "Follow"
   muteList: "Elenco profili silenziati"
   blockingList: "Elenco profili bloccati"
   userLists: "Liste"
@@ -2411,7 +2368,7 @@ _notification:
   youGotReply: "{name} ti ha risposto"
   youGotQuote: "{name} ha citato la tua Nota e ha detto"
   youRenoted: "{name} ha rinotato"
-  youWereFollowed: "Follower aggiuntivo"
+  youWereFollowed: "Adesso ti segue"
   youReceivedFollowRequest: "Hai ricevuto una richiesta di follow"
   yourFollowRequestAccepted: "La tua richiesta di follow è stata accettata"
   pollEnded: "Risultati del sondaggio."
@@ -2430,11 +2387,10 @@ _notification:
   followedBySomeUsers: "{n} follower"
   flushNotification: "Azzera le notifiche"
   exportOfXCompleted: "Abbiamo completato l'esportazione di {x}"
-  login: "Autenticazione avvenuta"
   _types:
     all: "Tutto"
     note: "Nuove Note"
-    follow: "Follower"
+    follow: "Nuovi profili follower"
     mention: "Menzioni"
     reply: "Risposte"
     renote: "Rinota"
@@ -2446,11 +2402,10 @@ _notification:
     roleAssigned: "Ruolo concesso"
     achievementEarned: "Risultato raggiunto"
     exportCompleted: "Esportazione completata"
-    login: "Accedi"
     test: "Prova la notifica"
     app: "Notifiche da applicazioni"
   _actions:
-    followBack: "Following ricambiato"
+    followBack: "Segui"
     reply: "Rispondi"
     renote: "Rinota"
 _deck:
@@ -2502,7 +2457,7 @@ _webhookSettings:
   trigger: "Trigger"
   active: "Attivo"
   _events:
-    follow: "Quando aggiungi Following"
+    follow: "Quando segui un profilo"
     followed: "Quando ti segue un profilo"
     note: "Quando pubblichi una Nota"
     reply: "Quando rispondono ad una Nota"
@@ -2513,8 +2468,6 @@ _webhookSettings:
     abuseReport: "Quando arriva una segnalazione"
     abuseReportResolved: "Quando una segnalazione è risolta"
     userCreated: "Quando viene creato un profilo"
-    inactiveModeratorsWarning: "Quando un profilo moderatore rimane inattivo per un determinato periodo"
-    inactiveModeratorsInvitationOnlyChanged: "Quando la moderazione è rimasta inattiva per un determinato periodo e il sistema è cambiato in modalità \"solo inviti\""
   deleteConfirm: "Vuoi davvero eliminare il Webhook?"
   testRemarks: "Clicca il bottone a destra dell'interruttore, per provare l'invio di un webhook con dati fittizi."
 _abuseReport:
@@ -2560,8 +2513,6 @@ _moderationLogTypes:
   markSensitiveDriveFile: "File nel Drive segnato come esplicito"
   unmarkSensitiveDriveFile: "File nel Drive segnato come non esplicito"
   resolveAbuseReport: "Segnalazione risolta"
-  forwardAbuseReport: "Segnalazione inoltrata"
-  updateAbuseReportNote: "Ha aggiornato la segnalazione"
   createInvitation: "Genera codice di invito"
   createAd: "Banner creato"
   deleteAd: "Banner eliminato"
@@ -2731,9 +2682,3 @@ _embedCodeGen:
   generateCode: "Crea il codice di incorporamento"
   codeGenerated: "Codice generato"
   codeGeneratedDescription: "Incolla il codice appena generato sul tuo sito web."
-_selfXssPrevention:
-  warning: "Avviso"
-  title: "\"Incolla qualcosa su questa schermata\" è tutta una truffa."
-  description1: "Incollando qualcosa qui, malintenzionati potrebbero prendere il controllo del tuo profilo o rubare i tuoi dati personali."
-  description2: "Se non sai esattamente cosa stai facendo, %c smetti subito e chiudi questa finestra."
-  description3: "Per favore, controlla questo collegamento per avere maggiori dettagli. {link}"

locales/ja-JP.yml

@@ -8,9 +8,6 @@ search: "検索"
 notifications: "通知"
 username: "ユーザー名"
 password: "パスワード"
-initialPasswordForSetup: "初期設定開始用パスワード"
-initialPasswordIsIncorrect: "初期設定開始用のパスワードが違います。"
-initialPasswordForSetupDescription: "Misskeyを自分でインストールした場合は、設定ファイルに入力したパスワードを使用してください。\nMisskeyのホスティングサービスなどを使用している場合は、提供されたパスワードを使用してください。\nパスワードを設定していない場合は、空欄にしたまま続行してください。"
 forgotPassword: "パスワードを忘れた"
 fetchingAsApObject: "連合に照会中"
 ok: "OK"
@@ -454,7 +451,6 @@ totpDescription: "認証アプリを使ってワンタイムパスワードを
 moderator: "モデレーター"
 moderation: "モデレーション"
 moderationNote: "モデレーションノート"
-moderationNoteDescription: "モデレーター間でだけ共有されるメモを記入することができます。"
 addModerationNote: "モデレーションノートを追加する"
 moderationLogs: "モデログ"
 nUsersMentioned: "{n}人が投稿"
@@ -720,7 +716,10 @@ abuseReported: "内容が送信されました。ご報告ありがとうござ
 reporter: "通報者"
 reporteeOrigin: "通報先"
 reporterOrigin: "通報元"
+forwardReport: "リモートサーバーに通報を転送する"
+forwardReportIsAnonymous: "リモートサーバーからはあなたの情報は見れず、匿名のシステムアカウントとして表示されます。"
 send: "送信"
+abuseMarkAsResolved: "対応済みにする"
 openInNewTab: "新しいタブで開く"
 openInSideView: "サイドビューで開く"
 defaultNavigationBehaviour: "デフォルトのナビゲーション"
@@ -922,7 +921,6 @@ followersVisibility: "フォロワーの公開範囲"
 continueThread: "さらにスレッドを見る"
 deleteAccountConfirm: "アカウントが削除されます。よろしいですか？"
 incorrectPassword: "パスワードが間違っています。"
-incorrectTotp: "ワンタイムパスワードが間違っているか、期限切れになっています。"
 voteConfirm: "「{choice}」に投票しますか？"
 hide: "隠す"
 useDrawerReactionPickerForMobile: "モバイルデバイスのときドロワーで表示"
@@ -947,9 +945,6 @@ oneHour: "1時間"
 oneDay: "1日"
 oneWeek: "1週間"
 oneMonth: "1ヶ月"
-threeMonths: "3ヶ月"
-oneYear: "1年"
-threeDays: "3日"
 reflectMayTakeTime: "反映されるまで時間がかかる場合があります。"
 failedToFetchAccountInformation: "アカウント情報の取得に失敗しました"
 rateLimitExceeded: "レート制限を超えました"
@@ -1090,7 +1085,6 @@ retryAllQueuesConfirmTitle: "今すぐ再試行しますか？"
 retryAllQueuesConfirmText: "一時的にサーバーの負荷が増大することがあります。"
 enableChartsForRemoteUser: "リモートユーザーのチャートを生成"
 enableChartsForFederatedInstances: "リモートサーバーのチャートを生成"
-enableStatsForFederatedInstances: "リモートサーバーの情報を取得"
 showClipButtonInNoteFooter: "ノートのアクションにクリップを追加"
 reactionsDisplaySize: "リアクションの表示サイズ"
 limitWidthOfReaction: "リアクションの最大横幅を制限し、縮小して表示する"
@@ -1289,38 +1283,6 @@ signinWithPasskey: "パスキーでログイン"
 unknownWebAuthnKey: "登録されていないパスキーです。"
 passkeyVerificationFailed: "パスキーの検証に失敗しました。"
 passkeyVerificationSucceededButPasswordlessLoginDisabled: "パスキーの検証に成功しましたが、パスワードレスログインが無効になっています。"
-messageToFollower: "フォロワーへのメッセージ"
-target: "対象"
-testCaptchaWarning: "CAPTCHAのテストを目的とした機能です。<strong>本番環境で使用しないでください。</strong>"
-prohibitedWordsForNameOfUser: "禁止ワード（ユーザーの名前）"
-prohibitedWordsForNameOfUserDescription: "このリストに含まれる文字列がユーザーの名前に含まれる場合、ユーザーの名前の変更を拒否します。モデレーター権限を持つユーザーはこの制限の影響を受けません。"
-yourNameContainsProhibitedWords: "変更しようとした名前に禁止された文字列が含まれています"
-yourNameContainsProhibitedWordsDescription: "名前に禁止されている文字列が含まれています。この名前を使用したい場合は、サーバー管理者にお問い合わせください。"
-thisContentsAreMarkedAsSigninRequiredByAuthor: "投稿者により、表示にはログインが必要と設定されています"
-lockdown: "ロックダウン"
-pleaseSelectAccount: "アカウントを選択してください"
-availableRoles: "利用可能なロール"
-
-_accountSettings:
-  requireSigninToViewContents: "コンテンツの表示にログインを必須にする"
-  requireSigninToViewContentsDescription1: "あなたが作成した全てのノートなどのコンテンツを表示するのにログインを必須にします。クローラーに情報が収集されるのを防ぐ効果が期待できます。"
-  requireSigninToViewContentsDescription2: "URLプレビュー(OGP)、Webページへの埋め込み、ノートの引用に対応していないサーバーからの表示も不可になります。"
-  requireSigninToViewContentsDescription3: "リモートサーバーに連合されたコンテンツでは、これらの制限が適用されない場合があります。"
-  makeNotesFollowersOnlyBefore: "過去のノートをフォロワーのみ表示可能にする"
-  makeNotesFollowersOnlyBeforeDescription: "この機能が有効になっている間、設定された日時より過去、または設定された時間を経過しているノートがフォロワーのみ表示可能になります。無効に戻すと、ノートの公開状態も元に戻ります。"
-  makeNotesHiddenBefore: "過去のノートを非公開化する"
-  makeNotesHiddenBeforeDescription: "この機能が有効になっている間、設定された日時より過去、または設定された時間を経過しているノートが自分のみ表示可能(非公開化)になります。無効に戻すと、ノートの公開状態も元に戻ります。"
-  mayNotEffectForFederatedNotes: "リモートサーバーに連合されたノートには効果が及ばない場合があります。"
-  notesHavePassedSpecifiedPeriod: "指定した時間を経過しているノート"
-  notesOlderThanSpecifiedDateAndTime: "指定した日時より前のノート"
-
-_abuseUserReport:
-  forward: "転送"
-  forwardDescription: "匿名のシステムアカウントとして、リモートサーバーに通報を転送します。"
-  resolve: "解決"
-  accept: "是認"
-  reject: "否認"
-  resolveTutorial: "内容が正当である通報に対応した場合は「是認」を選択し、肯定的にケースが解決されたことをマークします。\n内容が正当でない通報の場合は「否認」を選択し、否定的にケースが解決されたことをマークします。"
 
 _delivery:
   status: "配信状態"
@@ -1466,7 +1428,6 @@ _serverSettings:
   reactionsBufferingDescription: "有効にすると、リアクション作成時のパフォーマンスが大幅に向上し、データベースへの負荷を軽減することが可能です。ただし、Redisのメモリ使用量は増加します。"
   inquiryUrl: "問い合わせ先URL"
   inquiryUrlDescription: "サーバー運営者へのお問い合わせフォームのURLや、運営者の連絡先等が記載されたWebページのURLを指定します。"
-  thisSettingWillAutomaticallyOffWhenModeratorsInactive: "一定期間モデレーターのアクティビティが検出されなかった場合、スパム防止のためこの設定は自動でオフになります。"
 
 _accountMigration:
   moveFrom: "別のアカウントからこのアカウントに移行"
@@ -2045,6 +2006,7 @@ _theme:
     buttonBg: "ボタンの背景"
     buttonHoverBg: "ボタンの背景 (ホバー)"
     inputBorder: "入力ボックスの縁取り"
+    listItemHoverBg: "リスト項目の背景 (ホバー)"
     driveFolderBg: "ドライブフォルダーの背景"
     wallpaperOverlay: "壁紙のオーバーレイ"
     badge: "バッジ"
@@ -2219,11 +2181,8 @@ _auth:
   permissionAsk: "このアプリは次の権限を要求しています"
   pleaseGoBack: "アプリケーションに戻ってやっていってください"
   callback: "アプリケーションに戻っています"
-  accepted: "アクセスを許可しました"
   denied: "アクセスを拒否しました"
-  scopeUser: "以下のユーザーとして操作しています"
   pleaseLogin: "アプリケーションにアクセス許可を与えるには、ログインが必要です。"
-  byClickingYouWillBeRedirectedToThisUrl: "アクセスを許可すると、自動で以下のURLに遷移します"
 
 _antennaSources:
   all: "全てのノート"
@@ -2471,7 +2430,7 @@ _notification:
   youGotMention: "{name}からのメンション"
   youGotReply: "{name}からのリプライ"
   youGotQuote: "{name}による引用"
-  youRenoted: "{name}がリノートしました"
+  youRenoted: "{name}がRenoteしました"
   youWereFollowed: "フォローされました"
   youReceivedFollowRequest: "フォローリクエストが来ました"
   yourFollowRequestAccepted: "フォローリクエストが承認されました"
@@ -2491,7 +2450,6 @@ _notification:
   followedBySomeUsers: "{n}人にフォローされました"
   flushNotification: "通知の履歴をリセットする"
   exportOfXCompleted: "{x}のエクスポートが完了しました"
-  login: "ログインがありました"
 
   _types:
     all: "すべて"
@@ -2499,7 +2457,7 @@ _notification:
     follow: "フォロー"
     mention: "メンション"
     reply: "リプライ"
-    renote: "リノート"
+    renote: "Renote"
     quote: "引用"
     reaction: "リアクション"
     pollEnded: "アンケートが終了"
@@ -2508,14 +2466,13 @@ _notification:
     roleAssigned: "ロールが付与された"
     achievementEarned: "実績の獲得"
     exportCompleted: "エクスポートが完了した"
-    login: "ログイン"
     test: "通知のテスト"
     app: "連携アプリからの通知"
 
   _actions:
     followBack: "フォローバック"
     reply: "返信"
-    renote: "リノート"
+    renote: "Renote"
 
 _deck:
   alwaysShowMainColumn: "常にメインカラムを表示"
@@ -2582,8 +2539,6 @@ _webhookSettings:
     abuseReport: "ユーザーから通報があったとき"
     abuseReportResolved: "ユーザーからの通報を処理したとき"
     userCreated: "ユーザーが作成されたとき"
-    inactiveModeratorsWarning: "モデレーターが一定期間非アクティブになったとき"
-    inactiveModeratorsInvitationOnlyChanged: "モデレーターが一定期間非アクティブだったため、システムにより招待制へと変更されたとき"
   deleteConfirm: "Webhookを削除しますか？"
   testRemarks: "スイッチの右にあるボタンをクリックするとダミーのデータを使用したテスト用Webhookを送信できます。"
 
@@ -2631,8 +2586,6 @@ _moderationLogTypes:
   markSensitiveDriveFile: "ファイルをセンシティブ付与"
   unmarkSensitiveDriveFile: "ファイルをセンシティブ解除"
   resolveAbuseReport: "通報を解決"
-  forwardAbuseReport: "通報を転送"
-  updateAbuseReportNote: "通報のモデレーションノート更新"
   createInvitation: "招待コードを作成"
   createAd: "広告を作成"
   deleteAd: "広告を削除"
@@ -2812,10 +2765,3 @@ _embedCodeGen:
   generateCode: "埋め込みコードを作成"
   codeGenerated: "コードが生成されました"
   codeGeneratedDescription: "生成されたコードをウェブサイトに貼り付けてご利用ください。"
-
-_selfXssPrevention:
-  warning: "警告"
-  title: "「この画面に何か貼り付けろ」はすべて詐欺です。"
-  description1: "ここに何かを貼り付けると、悪意のあるユーザーにアカウントを乗っ取られたり、個人情報を盗まれたりする可能性があります。"
-  description2: "貼り付けようとしているものが何なのかを正確に理解していない場合は、%c今すぐ作業を中止してこのウィンドウを閉じてください。"
-  description3: "詳しくはこちらをご確認ください。 {link}"

locales/ja-KS.yml

@@ -8,9 +8,6 @@ search: "探す"
 notifications: "通知"
 username: "ユーザー名"
 password: "パスワード"
-initialPasswordForSetup: "初期設定開始用パスワード"
-initialPasswordIsIncorrect: "初期設定開始用のパスワードがちゃうで。"
-initialPasswordForSetupDescription: "Miskkeyを自分でインストールしたんやったら、設定ファイルに入れたパスワードを使ってや。\nホスティングサービスを使っとるんやったら、サービスから言われたやつを使うんやで。\n別に何も設定しとらんのやったら、何も入れずに空けといてな。"
 forgotPassword: "パスワード忘れたん？"
 fetchingAsApObject: "今ちと連合に照会しとるで"
 ok: "ええで"
@@ -239,8 +236,6 @@ silencedInstances: "サーバーサイレンスされてんねん"
 silencedInstancesDescription: "サイレンスしたいサーバーのホストを改行で区切って設定すんで。サイレンスされたサーバーに所属するアカウントはすべて「サイレンス」として扱われ、フォローがすべてリクエストになり、フォロワーでないローカルアカウントにはメンションできなくなんねん。ブロックしたインスタンスには影響せーへんで。"
 mediaSilencedInstances: "メディアサイレンスしたサーバー"
 mediaSilencedInstancesDescription: "メディアサイレンスしたいサーバーのホストを改行で区切って設定するで。メディアサイレンスされたサーバーに所属するアカウントによるファイルはすべてセンシティブとして扱われてな、カスタム絵文字が使えへんようになるで。ブロックしたインスタンスには影響せえへんで。"
-federationAllowedHosts: "連合を許すサーバー"
-federationAllowedHostsDescription: "連合してもいいサーバーのホストを行ごとに区切って設定してや。"
 muteAndBlock: "ミュートとブロック"
 mutedUsers: "ミュートしとるユーザー"
 blockedUsers: "ブロックしとるユーザー"
@@ -339,7 +334,6 @@ renameFolder: "フォルダー名を変える"
 deleteFolder: "フォルダーをほかす"
 folder: "フォルダー"
 addFile: "ファイルを追加"
-showFile: "ファイル出す"
 emptyDrive: "ドライブは空っぽや"
 emptyFolder: "このフォルダーは空や"
 unableToDelete: "消せんかったわ"
@@ -454,7 +448,6 @@ totpDescription: "認証アプリ使うてワンタイムパスワードを入
 moderator: "モデレーター"
 moderation: "モデレーション"
 moderationNote: "モデレーションノート"
-moderationNoteDescription: "モデレーターの中だけで共有するメモを入れれるで。"
 addModerationNote: "モデレーションノートを追加するで"
 moderationLogs: "モデログ"
 nUsersMentioned: "{n}人が投稿"
@@ -516,10 +509,6 @@ uiLanguage: "UIの表示言語"
 aboutX: "{x}について"
 emojiStyle: "絵文字のスタイル"
 native: "ネイティブ"
-menuStyle: "メニューのスタイル"
-style: "スタイル"
-drawer: "ドロワー"
-popup: "ポップアップ"
 showNoteActionsOnlyHover: "ノートの操作部をホバー時のみ表示するで"
 showReactionsCount: "ノートのリアクション数を表示する"
 noHistory: "履歴はないわ。"
@@ -602,8 +591,6 @@ ascendingOrder: "小さい順"
 descendingOrder: "大きい順"
 scratchpad: "スクラッチパッド"
 scratchpadDescription: "スクラッチパッドではAiScriptを色々試すことができるんや。Misskeyに対して色々できるコードを書いて動かしてみたり、結果を見たりできるで。"
-uiInspector: "UIインスペクター"
-uiInspectorDescription: "メモリ上にあるUIコンポーネントのインスタンス一覧を見れるで。UIコンポーネントはUi:C:系関数で生成されるで。"
 output: "出力"
 script: "スクリプト"
 disablePagesScript: "Pagesのスクリプトを無効にしてや"
@@ -720,7 +707,10 @@ abuseReported: "無事内容が送信されたみたいやで。おおきに〜
 reporter: "通報者"
 reporteeOrigin: "通報先"
 reporterOrigin: "通報元"
+forwardReport: "リモートサーバーに通報を転送するで"
+forwardReportIsAnonymous: "リモートサーバーからはあんたの情報は見えんなって、匿名のシステムアカウントとして表示されるで。"
 send: "送信"
+abuseMarkAsResolved: "対応したで"
 openInNewTab: "新しいタブで開く"
 openInSideView: "サイドビューで開く"
 defaultNavigationBehaviour: "デフォルトのナビゲーション"
@@ -922,7 +912,6 @@ followersVisibility: "フォロワーの公開範囲"
 continueThread: "さらにスレッドを見るで"
 deleteAccountConfirm: "アカウントを消すで？ええんか？"
 incorrectPassword: "パスワードがちゃうわ。"
-incorrectTotp: "ワンタイムパスワードが間違っとるか、期限が切れとるみたいやな。"
 voteConfirm: "「{choice}」に投票するんか？"
 hide: "隠す"
 useDrawerReactionPickerForMobile: "ケータイとかのときドロワーで表示するで"
@@ -1087,7 +1076,6 @@ retryAllQueuesConfirmTitle: "もっかいやってみるか？"
 retryAllQueuesConfirmText: "一時的にサーバー重なるかもしれへんで。"
 enableChartsForRemoteUser: "リモートユーザーのチャートを作る"
 enableChartsForFederatedInstances: "リモートサーバーのチャートを作る"
-enableStatsForFederatedInstances: "リモートサーバの情報を取得"
 showClipButtonInNoteFooter: "ノートのアクションにクリップを追加"
 reactionsDisplaySize: "ツッコミの表示のでかさ"
 limitWidthOfReaction: "ツッコミの最大横幅を制限して、ちっさく表示するで"
@@ -1274,32 +1262,6 @@ confirmWhenRevealingSensitiveMedia: "センシティブなメディアを表示
 sensitiveMediaRevealConfirm: "センシティブなメディアやで。表示するんか？"
 createdLists: "作成したリスト"
 createdAntennas: "作成したアンテナ"
-fromX: "{x}から"
-genEmbedCode: "埋め込みコードを作る"
-noteOfThisUser: "このユーザーのノート全部"
-clipNoteLimitExceeded: "これ以上このクリップにノート追加でけへんわ。"
-performance: "パフォーマンス"
-modified: "変更あり"
-discard: "やめる"
-thereAreNChanges: "{n}個の変更があるみたいや"
-signinWithPasskey: "パスキーでログイン"
-unknownWebAuthnKey: "登録されてへんパスキーやな。"
-passkeyVerificationFailed: "パスキーの検証に失敗したで。"
-passkeyVerificationSucceededButPasswordlessLoginDisabled: "パスキーの検証は成功したんやけど、パスワードレスログインが無効になっとるわ。"
-messageToFollower: "フォロワーへのメッセージ"
-target: "対象"
-testCaptchaWarning: "CAPTCHAのテストを目的としてるで。<strong>絶対に本番環境で使わんといてな。絶対やで。</strong>"
-prohibitedWordsForNameOfUser: "禁止ワード（ユーザー名）"
-prohibitedWordsForNameOfUserDescription: "このリストの中にある文字列がユーザー名に入っとったら、その名前に変更できひんようになるで。モデレーター権限があるユーザーは除外や。"
-yourNameContainsProhibitedWords: "その名前は禁止した文字列が含まれとるで"
-yourNameContainsProhibitedWordsDescription: "その名前は禁止した文字列が含まれとるわ。どうしてもって言うなら、サーバー管理者に言うしかないで。"
-_abuseUserReport:
-  forward: "転送"
-  forwardDescription: "匿名のシステムアカウントってことにして、リモートサーバーに通報を転送するで。"
-  resolve: "解決"
-  accept: "ええよ"
-  reject: "あかんよ"
-  resolveTutorial: "内容がええなら「ええよ」を選ぶんや。肯定的に解決されたことにして記録するで。\n逆に、内容がだめなら「あかんよ」を選びいや。否定的に解決されたって記録しとくで。"
 _delivery:
   status: "配信状態"
   stop: "配信せぇへん"
@@ -1434,10 +1396,8 @@ _serverSettings:
   fanoutTimelineDescription: "入れると、おのおのタイムラインを取得するときにめちゃめちゃ動きが良うなって、データベースが軽くなるわ。でも、Redisのメモリ使う量が増えるから注意な。サーバーのメモリが足りんときとか、動きが変なときは切れるで。"
   fanoutTimelineDbFallback: "データベースにフォールバックする"
   fanoutTimelineDbFallbackDescription: "有効にしたら、タイムラインがキャッシュん中に入ってないときにDBにもっかい問い合わせるフォールバック処理ってのをやっとくで。切ったらフォールバック処理をやらんからサーバーはもっと軽くなんねんけど、タイムラインの取得範囲がちょっと減るで。"
-  reactionsBufferingDescription: "有効にしたら、リアクション作るときのパフォーマンスがすっごい上がって、データベースへの負荷が減るで。代わりに、Redisのメモリ使用は増えるで。"
   inquiryUrl: "問い合わせ先URL"
   inquiryUrlDescription: "サーバー運営者へのお問い合わせフォームのURLや、運営者の連絡先等が記載されたWebページのURLを指定するで。"
-  thisSettingWillAutomaticallyOffWhenModeratorsInactive: "一定期間モデレーターがおらんかったら、スパムを防ぐためにこの設定は勝手に切られるで。"
 _accountMigration:
   moveFrom: "別のアカウントからこのアカウントに引っ越す"
   moveFromSub: "別のアカウントへエイリアスを作る"
@@ -1769,11 +1729,6 @@ _role:
     canSearchNotes: "ノート探せるかどうか"
     canUseTranslator: "翻訳使えるかどうか"
     avatarDecorationLimit: "アイコンデコのいっちばんつけれる数"
-    canImportAntennas: "アンテナのインポートを許す"
-    canImportBlocking: "ブロックのインポートを許す"
-    canImportFollowing: "フォローのインポートを許す"
-    canImportMuting: "ミュートのインポートを許す"
-    canImportUserLists: "リストのインポートを許す"
   _condition:
     roleAssignedTo: "マニュアルロールにアサイン済み"
     isLocal: "ローカルユーザー"
@@ -1991,6 +1946,7 @@ _theme:
     buttonBg: "ボタンの背景"
     buttonHoverBg: "ボタンの背景 (ホバー)"
     inputBorder: "入力ボックスの縁取り"
+    listItemHoverBg: "リスト項目の背景 (ホバー)"
     driveFolderBg: "ドライブフォルダーの背景"
     wallpaperOverlay: "壁紙のオーバーレイ"
     badge: "バッジ"
@@ -2267,9 +2223,6 @@ _profile:
   changeBanner: "バナー画像を変更するで"
   verifiedLinkDescription: "内容をURLに設定すると、リンク先のwebサイトに自分のプロフのリンクが含まれてる場合に所有者確認済みアイコンを表示させることができるで。"
   avatarDecorationMax: "最大{max}つまでデコつけれんで"
-  followedMessage: "フォローされたら返すメッセージ"
-  followedMessageDescription: "フォローされたときに相手に返す短めのメッセージを決めれるで。"
-  followedMessageDescriptionForLockedAccount: "フォローが承認制なら、フォローリクエストをOKしたときに見せるで。"
 _exportOrImport:
   allNotes: "全てのノート"
   favoritedNotes: "お気に入りにしたノート"
@@ -2362,7 +2315,6 @@ _pages:
   eyeCatchingImageSet: "アイキャッチ画像を設定"
   eyeCatchingImageRemove: "アイキャッチ画像を削除"
   chooseBlock: "ブロックを追加"
-  enterSectionTitle: "セクションタイトルを入れる"
   selectType: "種類を選択"
   contentBlocks: "コンテンツ"
   inputBlocks: "入力"
@@ -2408,15 +2360,13 @@ _notification:
   renotedBySomeUsers: "{n}人がリノートしたで"
   followedBySomeUsers: "{n}人にフォローされたで"
   flushNotification: "通知の履歴をリセットする"
-  exportOfXCompleted: "{x}のエクスポートが終わったわ"
-  login: "ログインしとったで"
   _types:
     all: "すべて"
     note: "あんたらの新規投稿"
     follow: "フォロー"
     mention: "メンション"
     reply: "リプライ"
-    renote: "リノート"
+    renote: "Renote"
     quote: "引用"
     reaction: "ツッコミ"
     pollEnded: "アンケートが終了したで"
@@ -2424,14 +2374,11 @@ _notification:
     followRequestAccepted: "フォローが受理されたで"
     roleAssigned: "ロールが付与された"
     achievementEarned: "実績の獲得"
-    exportCompleted: "エクスポート終わった"
-    login: "ログイン"
-    test: "通知テスト"
     app: "連携アプリからの通知や"
   _actions:
     followBack: "フォローバック"
     reply: "返事"
-    renote: "リノート"
+    renote: "Renote"
 _deck:
   alwaysShowMainColumn: "いつもメインカラムを表示"
   columnAlign: "カラムの寄せ"
@@ -2492,10 +2439,7 @@ _webhookSettings:
     abuseReport: "ユーザーから通報があったとき"
     abuseReportResolved: "ユーザーからの通報を処理したとき"
     userCreated: "ユーザーが作成されたとき"
-    inactiveModeratorsWarning: "モデレーターがしばらくおらんかったとき"
-    inactiveModeratorsInvitationOnlyChanged: "モデレーターがしばらくおらんかったから、システムが招待制に変えたとき"
   deleteConfirm: "ほんまにWebhookをほかしてもええんか？"
-  testRemarks: "スイッチ右のボタンを押すとダミーデータを使ったテスト用Webhookを送れるで。"
 _abuseReport:
   _notificationRecipient:
     createRecipient: "通報の通知先を追加"
@@ -2539,8 +2483,6 @@ _moderationLogTypes:
   markSensitiveDriveFile: "ファイルをセンシティブ付与"
   unmarkSensitiveDriveFile: "ファイルをセンシティブ解除"
   resolveAbuseReport: "苦情を解決"
-  forwardAbuseReport: "通報を転送"
-  updateAbuseReportNote: "通報のモデレーションノート更新"
   createInvitation: "招待コード作る"
   createAd: "広告を作んで"
   deleteAd: "広告ほかす"
@@ -2552,14 +2494,6 @@ _moderationLogTypes:
   unsetUserBanner: "この子のバナー元に戻す"
   createSystemWebhook: "SystemWebhookを作成"
   updateSystemWebhook: "SystemWebhookを更新"
-  deleteSystemWebhook: "SystemWebhookを削除"
-  createAbuseReportNotificationRecipient: "通報の通知先作る"
-  updateAbuseReportNotificationRecipient: "通報の通知先更新"
-  deleteAbuseReportNotificationRecipient: "通報の通知先消す"
-  deleteAccount: "アカウント消す"
-  deletePage: "ページ消す"
-  deleteFlash: "Playをほかす"
-  deleteGalleryPost: "ギャラリーの投稿をほかす"
 _fileViewer:
   title: "ファイルの詳しい情報"
   type: "ファイルの種類"
@@ -2691,22 +2625,3 @@ _mediaControls:
   pip: "ピクチャインピクチャ"
   playbackRate: "再生速度"
   loop: "ループ再生"
-_contextMenu:
-  title: "コンテキストメニュー"
-  app: "アプリ"
-  appWithShift: "Shiftキーでアプリ"
-  native: "ブラウザのUI"
-_embedCodeGen:
-  title: "埋め込みコードをカスタム"
-  header: "ヘッダー出す"
-  autoload: "勝手に続きを読み込む（非推奨）"
-  maxHeight: "高さの最大値"
-  maxHeightDescription: "0は最大値を指定せえへんけど、ウィジェットが伸び続けるから絶対1以上にしといてや。"
-  maxHeightWarn: "高さの最大値が無効になっとるで。意図してへん変更なら、普通の値に戻してや。"
-  previewIsNotActual: "プレビュー画面で出せる範囲をはみ出したから、ホンマの表示とはちゃうとおもうで。"
-  rounded: "角丸める"
-  border: "外枠に枠線つける"
-  applyToPreview: "プレビューに反映"
-  generateCode: "埋め込みコード作る"
-  codeGenerated: "コード作ったで"
-  codeGeneratedDescription: "作ったコードはウェブサイトに貼っつけて使ってや。"

locales/kn-IN.yml

@@ -77,8 +77,6 @@ _profile:
   username: "ಬಳಕೆಹೆಸರು"
 _notification:
   youWereFollowed: "ಹಿಂಬಾಲಿಸಿದರು"
-  _types:
-    login: "ಪ್ರವೇಶ"
   _actions:
     reply: "ಉತ್ತರಿಸು"
 _deck:

locales/ko-GS.yml

@@ -468,7 +468,7 @@ tooShort: "억수로 짜립니다"
 tooLong: "억수로 집니다"
 passwordMatched: "맞십니다"
 passwordNotMatched: "안 맞십니다"
-signinWith: "{x} 서 로그인"
+signinWith: "{n}서 로그인"
 signinFailed: "로그인 몬 했십니다. 고 이름이랑 비밀번호 제대로 썼는가 확인해 주이소."
 or: "아니면"
 language: "언어"
@@ -601,6 +601,8 @@ reportAbuseOf: "{name}님얼 신고하기"
 reporter: "신고한 사람"
 reporteeOrigin: "신고덴 사람"
 reporterOrigin: "신고한 곳"
+forwardReport: "웬겍 서버에 신고 보내기"
+forwardReportIsAnonymous: "웬겍 서버서는 나으 정보럴 몬 보고 익멩으 시스템 게정어로 보입니다."
 waitingFor: "{x}(얼)럴 지달리고 잇십니다"
 random: "무작이"
 system: "시스템"
@@ -809,13 +811,10 @@ _notification:
   _types:
     follow: "팔로잉"
     mention: "멘션"
-    renote: "리노트"
     quote: "따오기"
     reaction: "반엉"
-    login: "로그인"
   _actions:
     reply: "답하기"
-    renote: "리노트"
 _deck:
   _columns:
     notifications: "알림"

locales/ko-KR.yml

@@ -8,9 +8,6 @@ search: "검색"
 notifications: "알림"
 username: "유저명"
 password: "비밀번호"
-initialPasswordForSetup: "초기 설정용 비밀번호"
-initialPasswordIsIncorrect: "초기 설정용 비밀번호가 올바르지 않습니다."
-initialPasswordForSetupDescription: "Misskey를 직접 설치하는 경우, 설정 파일에 입력해둔 비밀번호를 사용하세요.\nMisskey 설치를 도와주는 호스팅 서비스 등을 사용하는 경우, 서비스 제공자로부터 받은 비밀번호를 사용하세요.\n비밀번호를 따로 설정하지 않은 경우, 아무것도 입력하지 않아도 됩니다."
 forgotPassword: "비밀번호 재설정"
 fetchingAsApObject: "연합에서 찾아보는 중"
 ok: "확인"
@@ -454,7 +451,6 @@ totpDescription: "인증 앱을 사용하여 일회성 비밀번호 입력"
 moderator: "모더레이터"
 moderation: "조정"
 moderationNote: "조정 기록"
-moderationNoteDescription: "모더레이터 역할을 가진 유저만 보이는 메모를 적을 수 있습니다."
 addModerationNote: "조정 기록 추가하기"
 moderationLogs: "모더레이션 로그"
 nUsersMentioned: "{n}명이 언급함"
@@ -720,7 +716,10 @@ abuseReported: "신고를 보냈습니다. 신고해 주셔서 감사합니다."
 reporter: "신고자"
 reporteeOrigin: "피신고자"
 reporterOrigin: "신고자"
+forwardReport: "리모트 서버에도 신고 내용 보내기"
+forwardReportIsAnonymous: "리모트 서버에서는 나의 정보를 볼 수 없으며, 익명의 시스템 계정으로 표시됩니다."
 send: "전송"
+abuseMarkAsResolved: "해결됨으로 표시"
 openInNewTab: "새 탭에서 열기"
 openInSideView: "사이드뷰로 열기"
 defaultNavigationBehaviour: "기본 탐색 동작"
@@ -922,7 +921,6 @@ followersVisibility: "팔로워의 공개 범위"
 continueThread: "글타래 더 보기"
 deleteAccountConfirm: "계정이 삭제되고 되돌릴 수 없게 됩니다. 계속하시겠습니까? "
 incorrectPassword: "비밀번호가 올바르지 않습니다."
-incorrectTotp: "OTP 번호가 틀렸거나 유효기간이 만료되어 있을 수 있습니다."
 voteConfirm: "\"{choice}\"에 투표하시겠습니까?"
 hide: "숨기기"
 useDrawerReactionPickerForMobile: "모바일에서 드로어 메뉴로 표시"
@@ -1087,7 +1085,6 @@ retryAllQueuesConfirmTitle: "지금 다시 시도하시겠습니까?"
 retryAllQueuesConfirmText: "일시적으로 서버의 부하가 증가할 수 있습니다."
 enableChartsForRemoteUser: "리모트 유저의 차트를 생성"
 enableChartsForFederatedInstances: "리모트 서버의 차트를 생성"
-enableStatsForFederatedInstances: "리모트 서버 정보 받아오기"
 showClipButtonInNoteFooter: "노트 동작에 클립을 추가"
 reactionsDisplaySize: "리액션 표시 크기"
 limitWidthOfReaction: "리액션의 최대 폭을 제한하고 작게 표시하기"
@@ -1123,7 +1120,7 @@ preservedUsernames: "예약한 사용자 이름"
 preservedUsernamesDescription: "예약할 사용자명을 한 줄에 하나씩 입력합니다. 여기에서 지정한 사용자명으로는 계정을 생성할 수 없게 됩니다. 단, 관리자 권한으로 계정을 생성할 때에는 해당되지 않으며, 이미 존재하는 계정도 영향을 받지 않습니다."
 createNoteFromTheFile: "이 파일로 노트를 작성"
 archive: "아카이브"
-archived: "아카이브 됨"
+archived: "보관됨"
 unarchive: "보관 취소"
 channelArchiveConfirmTitle: "{name} 채널을 보존하시겠습니까?"
 channelArchiveConfirmDescription: "보존한 채널은 채널 목록과 검색 결과에 표시되지 않으며 새로운 노트도 작성할 수 없습니다."
@@ -1286,20 +1283,6 @@ signinWithPasskey: "패스키로 로그인"
 unknownWebAuthnKey: "등록되지 않은 패스키입니다."
 passkeyVerificationFailed: "패스키 검증을 실패했습니다."
 passkeyVerificationSucceededButPasswordlessLoginDisabled: "패스키를 검증했으나, 비밀번호 없이 로그인하기가 꺼져 있습니다."
-messageToFollower: "팔로워에 보낼 메시지"
-target: "대상"
-testCaptchaWarning: "CAPTCHA를 테스트하기 위한 기능입니다. <strong>실제 환경에서는 사용하지 마세요.</strong>"
-prohibitedWordsForNameOfUser: "금지 단어 (사용자 이름)"
-prohibitedWordsForNameOfUserDescription: "이 목록에 포함되는 키워드가 사용자 이름에 있는 경우, 일반 사용자는 이름을 바꿀 수 없습니다. 모더레이터 권한을 가진 사용자는 제한 대상에서 제외됩니다."
-yourNameContainsProhibitedWords: "바꾸려는 이름에 금지된 키워드가 포함되어 있습니다."
-yourNameContainsProhibitedWordsDescription: "이름에 금지된 키워드가 있습니다. 이름을 사용해야 하는 경우, 서버 관리자에 문의하세요."
-_abuseUserReport:
-  forward: "전달"
-  forwardDescription: "익명 시스템 계정을 사용하여 리모트 서버에 신고 내용을 전달할 수 있습니다."
-  resolve: "해결됨"
-  accept: "인용"
-  reject: "기각"
-  resolveTutorial: "적절한 신고 내용에 대응한 경우, \"인용\"을 선택하여 \"해결됨\"으로 기록합니다.\n적절하지 않은 신고를 받은 경우, \"기각\"을 선택하여 \"기각\"으로 기록합니다."
 _delivery:
   status: "전송 상태"
   stop: "정지됨"
@@ -1437,7 +1420,6 @@ _serverSettings:
   reactionsBufferingDescription: "활성화 한 경우, 리액션 작성 퍼포먼스가 대폭 향상되어 DB의 부하를 줄일 수 있으나, Redis의 메모리 사용량이 많아집니다."
   inquiryUrl: "문의처 URL"
   inquiryUrlDescription: "서버 운영자에게 보내는 문의 양식의 URL이나 운영자의 연락처 등이 적힌 웹 페이지의 URL을 설정합니다."
-  thisSettingWillAutomaticallyOffWhenModeratorsInactive: "일정 기간동안 모더레이터의 활동이 감지되지 않는 경우, 스팸 방지를 위해 이 설정은 자동으로 꺼집니다."
 _accountMigration:
   moveFrom: "다른 계정에서 이 계정으로 이사"
   moveFromSub: "다른 계정에 대한 별칭을 생성"
@@ -1991,6 +1973,7 @@ _theme:
     buttonBg: "버튼 배경"
     buttonHoverBg: "버튼 배경 (호버)"
     inputBorder: "입력 필드 테두리"
+    listItemHoverBg: "리스트 항목 배경 (호버)"
     driveFolderBg: "드라이브 폴더 배경"
     wallpaperOverlay: "배경화면 오버레이"
     badge: "배지"
@@ -2006,7 +1989,7 @@ _sfx:
 _soundSettings:
   driveFile: "드라이브에 있는 오디오를 사용"
   driveFileWarn: "드라이브에 있는 파일을 선택하세요."
-  driveFileTypeWarn: "이 파이"
+  driveFileTypeWarn: "이 파일은 지원되지 않습니다."
   driveFileTypeWarnDescription: "오디오 파일을 선택하세요."
   driveFileDurationWarn: "오디오가 너무 깁니다"
   driveFileDurationWarnDescription: "긴 오디오로 설정할 경우 미스키 사용에 지장이 갈 수도 있습니다. 그래도 괜찮습니까?"
@@ -2409,7 +2392,6 @@ _notification:
   followedBySomeUsers: "{n}명에게 팔로우됨"
   flushNotification: "알림 이력을 초기화"
   exportOfXCompleted: "{x} 추출에 성공했습니다."
-  login: "로그인 알림이 있습니다"
   _types:
     all: "전부"
     note: "사용자의 새 글"
@@ -2425,7 +2407,6 @@ _notification:
     roleAssigned: "역할이 부여 됨"
     achievementEarned: "도전 과제 획득"
     exportCompleted: "추출을 성공함"
-    login: "로그인"
     test: "알림 테스트"
     app: "연동된 앱을 통한 알림"
   _actions:
@@ -2489,11 +2470,9 @@ _webhookSettings:
     reaction: "누군가 내 노트에 리액션했을 때"
     mention: "누군가 나를 멘션했을 때"
   _systemEvents:
-    abuseReport: "유저롭"
+    abuseReport: "유저로부터 신고를 받았을 때"
     abuseReportResolved: "받은 신고를 처리했을 때"
     userCreated: "유저가 생성되었을 때"
-    inactiveModeratorsWarning: "모더레이터가 일정 기간동안 활동하지 않은 경우"
-    inactiveModeratorsInvitationOnlyChanged: "모더레이터가 일정 기간 활동하지 않아 시스템에 의해 초대제로 바뀐 경우"
   deleteConfirm: "Webhook을 삭제할까요?"
   testRemarks: "스위치 오른쪽에 있는 버튼을 클릭하여 더미 데이터를 사용한 테스트용 웹 훅을 보낼 수 있습니다."
 _abuseReport:
@@ -2539,8 +2518,6 @@ _moderationLogTypes:
   markSensitiveDriveFile: "파일에 열람주의를 설정"
   unmarkSensitiveDriveFile: "파일에 열람주의를 해제"
   resolveAbuseReport: "신고 처리"
-  forwardAbuseReport: "신고 전달"
-  updateAbuseReportNote: "신고 조정 노트 갱신"
   createInvitation: "초대 코드 생성"
   createAd: "광고 생성"
   deleteAd: "광고 삭제"
@@ -2680,7 +2657,7 @@ _urlPreviewSetting:
   timeoutDescription: "미리보기를 로딩하는데 걸리는 시간이 정한 시간보다 오래 걸리는 경우, 미리보기를 생성하지 않습니다."
   maximumContentLength: "Content-Length의 최대치 (byte)"
   maximumContentLengthDescription: "Content-Length가 이 값을 넘어서면 미리보기를 생성하지 않습니다."
-  requireContentLength: "Content-Length를 받아온 경우에만 "
+  requireContentLength: "Content-Length를 얻었을 때만 미리보기 만들기"
   requireContentLengthDescription: "상대 서버가 Content-Length를 되돌려주지 않는다면 미리보기를 만들지 않습니다."
   userAgent: "User-Agent"
   userAgentDescription: "미리보기를 얻을 때 사용한 User-Agent를 설정합니다. 비어 있다면 기본값의 User-Agent를 사용합니다."

locales/lo-LA.yml

@@ -456,7 +456,6 @@ _notification:
     renote: "Renote"
     quote: "ອ້າງອີງ"
     reaction: "Reaction"
-    login: "ເຂົ້າ​ສູ່​ລະ​ບົບ"
   _actions:
     reply: "ຕອບ​ກັບ"
     renote: "Renote"

locales/nl-NL.yml

@@ -486,7 +486,6 @@ _notification:
     renote: "Herdelen"
     quote: "Quote"
     reaction: "Reacties"
-    login: "Inloggen"
   _actions:
     reply: "Antwoord"
     renote: "Herdelen"

locales/no-NO.yml

@@ -701,7 +701,6 @@ _notification:
     renote: "Renotes"
     quote: "Sitater"
     reaction: "Reaksjoner"
-    login: "Logg inn"
   _actions:
     reply: "Svar"
     renote: "Renote"

locales/pl-PL.yml

@@ -689,7 +689,10 @@ abuseReported: "Twoje zgłoszenie zostało wysłane. Dziękujemy."
 reporter: "Zgłaszający"
 reporteeOrigin: "Pochodzenie zgłoszonego"
 reporterOrigin: "Pochodzenie zgłaszającego"
+forwardReport: "Przekaż zgłoszenie do innej instancji"
+forwardReportIsAnonymous: "Zamiast twojego konta, anonimowe konto systemowe będzie wyświetlone jako zgłaszający na instancji zdalnej."
 send: "Wyślij"
+abuseMarkAsResolved: "Oznacz zgłoszenie jako rozwiązane"
 openInNewTab: "Otwórz w nowej karcie"
 openInSideView: "Otwórz w bocznym widoku"
 defaultNavigationBehaviour: "Domyślne zachowanie nawigacji"
@@ -1205,6 +1208,7 @@ _theme:
     buttonBg: "Tło przycisku"
     buttonHoverBg: "Tło przycisku (po najechaniu)"
     inputBorder: "Obramowanie pola wejścia"
+    listItemHoverBg: "Tło elementu listy (po najechaniu)"
     driveFolderBg: "Tło folderu na dysku"
     wallpaperOverlay: "Nakładka tapety"
     badge: "Odznaka"
@@ -1505,7 +1509,6 @@ _notification:
     reaction: "Reakcja"
     receiveFollowRequest: "Otrzymano prośbę o możliwość obserwacji"
     followRequestAccepted: "Przyjęto prośbę o możliwość obserwacji"
-    login: "Zaloguj się"
     app: "Powiadomienia z aplikacji"
   _actions:
     followBack: "zaobserwował cię z powrotem"

locales/pt-PT.yml

@@ -1,5 +1,5 @@
 ---
-_lang_: "Português"
+_lang_: "日本語"
 headlineMisskey: "Uma rede ligada por notas"
 introMisskey: "Bem-vindo! O Misskey é um serviço de microblog descentralizado de código aberto.\nCrie \"notas\" para compartilhar o que está acontecendo agora ou para se expressar com todos à sua volta 📡\nVocê também pode adicionar rapidamente reações às notas de outras pessoas usando a função \"Reações\" 👍\nVamos explorar um novo mundo 🚀"
 poweredByMisskeyDescription: "{name} é uma instância da plataforma de código aberto <b>Misskey</b>."
@@ -25,7 +25,7 @@ basicSettings: "Configurações básicas"
 otherSettings: "Outras configurações"
 openInWindow: "Abrir em um janela"
 profile: "Perfil"
-timeline: "Linha do tempo"
+timeline: "Cronologia"
 noAccountDescription: "Este usuário não tem uma descrição."
 login: "Iniciar sessão"
 loggingIn: "Iniciando sessão…"
@@ -707,7 +707,10 @@ abuseReported: "Denúncia enviada. Obrigado por sua ajuda."
 reporter: "Denunciante"
 reporteeOrigin: "Origem da denúncia"
 reporterOrigin: "Origem do denunciante"
+forwardReport: "Encaminhar a denúncia para o servidor remoto"
+forwardReportIsAnonymous: "No servidor remoto, suas informações não serão visíveis, e você será apresentado como uma conta do sistema anônima."
 send: "Enviar"
+abuseMarkAsResolved: "Marcar denúncia como resolvida"
 openInNewTab: "Abrir em nova aba"
 openInSideView: "Abrir em visão lateral"
 defaultNavigationBehaviour: "Navegação padrão"
@@ -1058,7 +1061,7 @@ resetPasswordConfirm: "Deseja realmente mudar a sua senha?"
 sensitiveWords: "Palavras sensíveis"
 sensitiveWordsDescription: "A visibilidade de todas as notas contendo as palavras configuradas será colocadas como \"Início\" automaticamente. Você pode listar várias delas separando-as por linha."
 sensitiveWordsDescription2: "Utilizar espaços irá criar expressões aditivas (AND) e cercar palavras-chave com barras irá transformá-las em expressões regulares (RegEx)"
-prohibitedWords: "Palavras proibidas"
+prohibitedWords: "Palavras proibídas"
 prohibitedWordsDescription: "Habilita um erro ao tentar publicar uma nota contendo as palavras escolhidas. Várias palavras podem ser escolhidas, separando-as por linha."
 prohibitedWordsDescription2: "Utilizar espaços irá criar expressões aditivas (AND) e cercar palavras-chave com barras irá transformá-las em expressões regulares (RegEx)"
 hiddenTags: "Hashtags escondidas"
@@ -1416,7 +1419,7 @@ _achievements:
   _types:
     _notes1:
       title: "Configurando o meu misskey"
-      description: "Poste uma nota pela primeira vez"
+      description: "Post uma nota pela primeira vez"
       flavor: "Divirta-se com o Misskey!"
     _notes10:
       title: "Algumas notas"
@@ -1944,6 +1947,7 @@ _theme:
     buttonBg: "Plano de fundo de botão"
     buttonHoverBg: "Plano de fundo de botão (Selecionado)"
     inputBorder: "Borda de campo digitável"
+    listItemHoverBg: "Plano de fundo do item de uma lista (Selecionado)"
     driveFolderBg: "Plano de fundo da pasta no Drive"
     wallpaperOverlay: "Sobreposição do papel de parede."
     badge: "Emblema"
@@ -2372,7 +2376,6 @@ _notification:
     followRequestAccepted: "Aceitou pedidos de seguidor"
     roleAssigned: "Cargo dado"
     achievementEarned: "Conquista desbloqueada"
-    login: "Iniciar sessão"
     app: "Notificações de aplicativos conectados"
   _actions:
     followBack: "te seguiu de volta"

locales/ro-RO.yml

@@ -625,7 +625,10 @@ abuseReported: "Raportul tău a fost trimis. Mulțumim."
 reporter: "Raportorul"
 reporteeOrigin: "Originea raportatului"
 reporterOrigin: "Originea raportorului"
+forwardReport: "Redirecționează raportul către instanța externă"
+forwardReportIsAnonymous: "În locul contului tău, va fi afișat un cont anonim, de sistem, ca raportor către instanța externă."
 send: "Trimite"
+abuseMarkAsResolved: "Marchează raportul ca rezolvat"
 openInNewTab: "Deschide în tab nou"
 openInSideView: "Deschide în vedere laterală"
 defaultNavigationBehaviour: "Comportament de navigare implicit"
@@ -711,7 +714,6 @@ _notification:
     renote: "Re-notează"
     quote: "Citează"
     reaction: "Reacție"
-    login: "Autentifică-te"
   _actions:
     reply: "Răspunde"
     renote: "Re-notează"

locales/ru-RU.yml

@@ -8,9 +8,6 @@ search: "Поиск"
 notifications: "Уведомления"
 username: "Имя пользователя"
 password: "Пароль"
-initialPasswordForSetup: "Пароль для начала настройки"
-initialPasswordIsIncorrect: "Пароль для запуска настройки неверен"
-initialPasswordForSetupDescription: "Если вы установили Misskey самостоятельно, используйте пароль, который вы указали в файле конфигурации.\nЕсли вы используете что-то вроде хостинга Misskey, используйте предоставленный пароль.\nЕсли вы не установили пароль, оставьте его пустым и продолжайте."
 forgotPassword: "Забыли пароль?"
 fetchingAsApObject: "Приём с других сайтов"
 ok: "Подтвердить"
@@ -235,7 +232,6 @@ clearCachedFilesConfirm: "Удалить все закэшированные ф
 blockedInstances: "Заблокированные инстансы"
 blockedInstancesDescription: "Введите список инстансов, которые хотите заблокировать. Они больше не смогут обмениваться с вашим инстансом."
 silencedInstances: "Заглушённые инстансы"
-federationAllowedHosts: "Серверы, поддерживающие федерацию"
 muteAndBlock: "Скрытие и блокировка"
 mutedUsers: "Скрытые пользователи"
 blockedUsers: "Заблокированные пользователи"
@@ -334,7 +330,6 @@ renameFolder: "Переименовать папку"
 deleteFolder: "Удалить папку"
 folder: "Папка"
 addFile: "Добавить файл"
-showFile: "Посмотреть файл"
 emptyDrive: "Диск пуст"
 emptyFolder: "Папка пуста"
 unableToDelete: "Удаление невозможно"
@@ -448,7 +443,6 @@ totp: "Приложение-аутентификатор"
 totpDescription: "Описание приложения-аутентификатора"
 moderator: "Модератор"
 moderation: "Модерация"
-moderationNote: "Примечания модератора"
 moderationLogs: "Журнал модерации"
 nUsersMentioned: "Упомянуло пользователей: {n}"
 securityKeyAndPasskey: "Ключ безопасности и парольная фраза"
@@ -509,8 +503,6 @@ uiLanguage: "Язык интерфейса"
 aboutX: "Описание {x}"
 emojiStyle: "Стиль эмодзи"
 native: "Системные"
-menuStyle: "Стиль меню"
-style: "Стиль"
 showNoteActionsOnlyHover: "Показывать кнопки у заметок только при наведении"
 showReactionsCount: "Видеть количество реакций на заметках"
 noHistory: "История пока пуста"
@@ -708,7 +700,10 @@ abuseReported: "Жалоба отправлена. Большое спасибо
 reporter: "Сообщивший"
 reporteeOrigin: "О ком сообщено"
 reporterOrigin: "Кто сообщил"
+forwardReport: "Отправить жалобу на инстанс автора."
+forwardReportIsAnonymous: "Жалоба на удалённый инстанс будет отправлена анонимно. Вместо ваших данных у получателя будет отображена системная учётная запись."
 send: "Отправить"
+abuseMarkAsResolved: "Отметить жалобу как решённую"
 openInNewTab: "Открыть в новой вкладке"
 openInSideView: "Открывать в боковой колонке"
 defaultNavigationBehaviour: "Поведение навигации по умолчанию"
@@ -1702,6 +1697,7 @@ _theme:
     buttonBg: "Фон кнопки"
     buttonHoverBg: "Текст кнопки"
     inputBorder: "Рамка поля ввода"
+    listItemHoverBg: "Фон пункта списка (под указателем)"
     driveFolderBg: "Фон папки «Диска»"
     wallpaperOverlay: "Слой обоев"
     badge: "Значок"
@@ -2050,7 +2046,6 @@ _notification:
     receiveFollowRequest: "Получен запрос на подписку"
     followRequestAccepted: "Запрос на подписку одобрен"
     achievementEarned: "Получение достижений"
-    login: "Войти"
     app: "Уведомления из приложений"
   _actions:
     followBack: "отвечает взаимной подпиской"

locales/si-LK.yml

@@ -17,6 +17,3 @@ _sfx:
   note: "නෝට්"
 _profile:
   username: "පරිශීලක නාමය"
-_notification:
-  _types:
-    login: "පිවිසෙන්න"

locales/sk-SK.yml

@@ -631,7 +631,10 @@ abuseReported: "Vaše nahlásenie je odoslané. Veľmi pekne ďakujeme."
 reporter: "Nahlásil"
 reporteeOrigin: "Pôvod nahláseného"
 reporterOrigin: "Pôvod nahlasovača"
+forwardReport: "Preposlať nahlásenie na server"
+forwardReportIsAnonymous: "Namiesto vášho účtu bude zobrazený anonymný systémový účet na vzdialenom serveri ako autor nahlásenia."
 send: "Poslať"
+abuseMarkAsResolved: "Označiť nahlásenia ako vyriešené"
 openInNewTab: "Otvoriť v novom tabe"
 openInSideView: "Otvoriť v bočnom paneli"
 defaultNavigationBehaviour: "Predvolené správanie navigácie"
@@ -1108,6 +1111,7 @@ _theme:
     buttonBg: "Pozadie tlačidla"
     buttonHoverBg: "Pozadie tlačidla (pod kurzorom)"
     inputBorder: "Okraj vstupného poľa"
+    listItemHoverBg: "Pozadie položky zoznamu (pod kurzorom)"
     driveFolderBg: "Pozadie priečinu disku"
     wallpaperOverlay: "Vrstvenie pozadia"
     badge: "Odznak"
@@ -1405,7 +1409,6 @@ _notification:
     pollEnded: "Hlasovanie skončilo"
     receiveFollowRequest: "Doručené žiadosti o sledovanie"
     followRequestAccepted: "Schválené žiadosti o sledovanie"
-    login: "Prihlásiť sa"
     app: "Oznámenia z prepojených aplikácií"
   _actions:
     followBack: "Sledovať späť\n"

locales/sv-SE.yml

@@ -562,7 +562,6 @@ _notification:
     renote: "Omnotera"
     quote: "Citat"
     reaction: "Reaktioner"
-    login: "Logga in"
   _actions:
     reply: "Svara"
     renote: "Omnotera"

locales/th-TH.yml

@@ -8,9 +8,6 @@ search: "ค้นหา"
 notifications: "เเจ้งเตือน"
 username: "ชื่อผู้ใช้"
 password: "รหัสผ่าน"
-initialPasswordForSetup: "รหัสผ่านเริ่มต้นสำหรับการตั้งค่า"
-initialPasswordIsIncorrect: "รหัสผ่านเริ่มต้นสำหรับตั้งค่านั้นไม่ถูกต้องค่ะ"
-initialPasswordForSetupDescription: "ถ้าหากคุณติดตั้ง Misskey เอง ให้ใช้รหัสผ่านที่คุณป้อนในไฟล์กำหนดค่า \nถ้าหากคุณกำลังใช้บริการโฮสต์ Misskey ให้ใช้รหัสผ่านที่ได้รับมา\nถ้ายังไม่มีรหัสผ่าน ให้ข้ามช่องรหัสผ่านไป แล้วกดต่อไป"
 forgotPassword: "ลืมรหัสผ่าน"
 fetchingAsApObject: "กำลังดึงข้อมูลจากสหพันธ์..."
 ok: "ตกลง"
@@ -239,8 +236,6 @@ silencedInstances: "ปิดปากเซิร์ฟเวอร์นี้
 silencedInstancesDescription: "ระบุโฮสต์ของเซิร์ฟเวอร์ที่ต้องการปิดปาก คั่นด้วยการขึ้นบรรทัดใหม่, บัญชีทั้งหมดของเซิร์ฟเวอร์ดังกล่าวจะถือว่าถูกปิดปากเช่นกัน ทำได้เฉพาะคำขอติดตามเท่านั้น และไม่สามารถกล่าวถึงบัญชีในเซิร์ฟเวอร์นี้ได้หากไม่ได้ถูกติดตามกลับ | สิ่งนี้ไม่มีผลต่ออินสแตนซ์ที่ถูกบล็อก"
 mediaSilencedInstances: "เซิร์ฟเวอร์ที่ถูกปิดปากสื่อ"
 mediaSilencedInstancesDescription: "ระบุโฮสต์ของเซิร์ฟเวอร์ที่ต้องการปิดปากสื่อ คั่นด้วยการขึ้นบรรทัดใหม่, ไฟล์ที่ถูกส่งจากบัญชีของเซิร์ฟเวอร์ดังกล่าวจะถือว่าถูกปิดปาก แล้วจะถูกติดเครื่องหมายว่ามีเนื้อหาละเอียดอ่อน และเอโมจิแบบกำหนดเองก็จะใช้ไม่ได้ด้วย | สิ่งนี้ไม่มีผลต่ออินสแตนซ์ที่ถูกบล็อก"
-federationAllowedHosts: "เซิร์ฟเวอร์ที่เปิดให้บริการแบบเฟเดอเรชั่น"
-federationAllowedHostsDescription: "ระบุชื่อโฮสต์ของเซิร์ฟเวอร์ที่คุณต้องการอนุญาตให้เชื่อมต่อแบบเฟเดอเรชั่น โดยต้องเว้นวรรคแต่ละบรรทัด"
 muteAndBlock: "ปิดเสียงและบล็อก"
 mutedUsers: "ผู้ใช้ที่ถูกปิดเสียง"
 blockedUsers: "ผู้ใช้ที่ถูกบล็อก"
@@ -339,7 +334,6 @@ renameFolder: "เปลี่ยนชื่อโฟลเดอร์"
 deleteFolder: "ลบโฟลเดอร์"
 folder: "โฟลเดอร์"
 addFile: "เพิ่มไฟล์"
-showFile: "แสดงไฟล์"
 emptyDrive: "ไดรฟ์ของคุณว่างเปล่านะ"
 emptyFolder: "โฟลเดอร์นี้ว่างเปล่า"
 unableToDelete: "ไม่สามารถลบออกได้"
@@ -454,7 +448,6 @@ totpDescription: "ใช้แอปยืนยันตัวตนเพื
 moderator: "ผู้ควบคุม"
 moderation: "การกลั่นกรอง"
 moderationNote: "โน้ตการกลั่นกรอง"
-moderationNoteDescription: "คุณสามารถใส่โน้ตส่วนตัวที่เฉพาะผู้ดูแลระบบเท่านั้นที่สามารถเข้าถึงได้"
 addModerationNote: "เพิ่มโน้ตการกลั่นกรอง"
 moderationLogs: "ปูมการควบคุมดูแล"
 nUsersMentioned: "กล่าวถึงโดยผู้ใช้ {n} ราย"
@@ -516,10 +509,6 @@ uiLanguage: "ภาษาอินเทอร์เฟซผู้ใช้ง
 aboutX: "เกี่ยวกับ {x}"
 emojiStyle: "สไตล์ของเอโมจิ"
 native: "ภาษาแม่"
-menuStyle: "สไตล์เมนู"
-style: "สไตล์"
-drawer: "ตัววาด"
-popup: "ป๊อปอัพ"
 showNoteActionsOnlyHover: "แสดงการดำเนินการโน้ตเมื่อโฮเวอร์(วางเมาส์เหนือ)เท่านั้น"
 showReactionsCount: "แสดงจำนวนรีแอกชั่นในโน้ต"
 noHistory: "ไม่มีประวัติ"
@@ -602,8 +591,6 @@ ascendingOrder: "เรียงลำดับขึ้น"
 descendingOrder: "เรียงลำดับลง"
 scratchpad: "Scratchpad"
 scratchpadDescription: "Scratchpad ให้สภาพแวดล้อมสำหรับการทดลอง AiScript คุณสามารถเขียนโค้ด/สั่งดำเนินการ/ตรวจสอบผลลัพธ์ ของการโต้ตอบกับ Misskey ได้"
-uiInspector: "ตัวตรวจสอบ UI"
-uiInspectorDescription: "คุณสามารถตรวจสอบรายชื่อเซิร์ฟเวอร์ที่เกี่ยวข้องกับส่วนประกอบอินเตอร์เฟซผู้ใช้ (UI) บนหน่วยความจำของระบบ ส่วนประกอบ UI เหล่านี้จะถูกสร้างขึ้นโดยฟังก์ชัน Ui:C:"
 output: "เอาท์พุต"
 script: "สคริปต์"
 disablePagesScript: "ปิดการใช้งาน AiScript บนเพจ"
@@ -720,7 +707,10 @@ abuseReported: "เราได้ส่งรายงานของคุณ
 reporter: "ผู้รายงาน"
 reporteeOrigin: "ปลายทางรายงาน"
 reporterOrigin: "แหล่งผู้รายงาน"
+forwardReport: "ส่งต่อรายงานไปยังเซิร์ฟเวอร์ระยะไกล"
+forwardReportIsAnonymous: "ข้อมูลของคุณจะไม่ปรากฏบนเซิร์ฟเวอร์ระยะไกลและปรากฏเป็นบัญชีระบบที่ไม่ระบุชื่อ"
 send: "ส่ง"
+abuseMarkAsResolved: "ทำเครื่องหมายรายงานว่าแก้ไขแล้ว"
 openInNewTab: "เปิดในแท็บใหม่"
 openInSideView: "เปิดในมุมมองด้านข้าง"
 defaultNavigationBehaviour: "พฤติกรรมการนำทางที่เป็นค่าเริ่มต้น"
@@ -922,7 +912,6 @@ followersVisibility: "การมองเห็นผู้ที่กำล
 continueThread: "ดูความต่อเนื่องเธรด"
 deleteAccountConfirm: "การดำเนินการนี้จะลบบัญชีของคุณอย่างถาวรเลยนะ แน่ใจหรอดำเนินการ?"
 incorrectPassword: "รหัสผ่านไม่ถูกต้อง"
-incorrectTotp: "รหัสยืนยันตัวตนแบบใช้ครั้งเดียวที่ท่านได้ระบุมานั้น ไม่ถูกต้องหรือหมดอายุลงแล้วค่ะ"
 voteConfirm: "ต้องการโหวต “{choice}” ใช่ไหม?"
 hide: "ซ่อน"
 useDrawerReactionPickerForMobile: "แสดง ตัวจิ้มรีแอคชั่น เป็นแบบลิ้นชัก เมื่อใช้บนมือถือ"
@@ -1087,7 +1076,6 @@ retryAllQueuesConfirmTitle: "ลองใหม่ทั้งหมดจริ
 retryAllQueuesConfirmText: "สิ่งนี้จะเพิ่มการโหลดเซิร์ฟเวอร์ชั่วคราวนะ"
 enableChartsForRemoteUser: "สร้างแผนภูมิข้อมูลผู้ใช้ระยะไกล"
 enableChartsForFederatedInstances: "สร้างแผนภูมิของเซิร์ฟเวอร์ระยะไกล"
-enableStatsForFederatedInstances: "ดึงข้อมูลสถิติจากเซิร์ฟเวอร์ที่อยู่ห่างไกล"
 showClipButtonInNoteFooter: "เพิ่ม “คลิป” ไปยังเมนูสั่งการของโน้ต"
 reactionsDisplaySize: "ขนาดของรีแอคชั่น"
 limitWidthOfReaction: "จำกัดความกว้างสูงสุดของรีแอคชั่นและแสดงให้เล็กลง"
@@ -1274,32 +1262,6 @@ confirmWhenRevealingSensitiveMedia: "ตรวจสอบก่อนแสด
 sensitiveMediaRevealConfirm: "สื่อนี้มีเนื้อหาละเอียดอ่อน, ต้องการแสดงใช่ไหม?"
 createdLists: "รายชื่อที่ถูกสร้าง"
 createdAntennas: "เสาอากาศที่ถูกสร้าง"
-fromX: "จาก {x}"
-genEmbedCode: "สร้างรหัสฝัง"
-noteOfThisUser: "โน้ตโดยผู้ใช้นี้"
-clipNoteLimitExceeded: "ไม่สามารถเพิ่มโน้ตเพิ่มเติมในคลิปนี้ได้อีกแล้ว"
-performance: "ประสิทธิภาพ​"
-modified: "แก้ไข"
-discard: "ละทิ้ง"
-thereAreNChanges: "มีอยู่ {n} เปลี่ยนแปลง(s)"
-signinWithPasskey: "ลงชื่อเข้าใช้ด้วย Passkey"
-unknownWebAuthnKey: "พาสคีย์ไม่ถูกต้องค่ะ"
-passkeyVerificationFailed: "การยืนยันกุญแจดิจิทัลไม่สำเร็จค่ะ"
-passkeyVerificationSucceededButPasswordlessLoginDisabled: "การยืนยันพาสคีย์สำเร็จแล้ว แต่การลงชื่อเข้าใช้แบบไม่ต้องใส่รหัสผ่านถูกปิดใช้งานแล้ว"
-messageToFollower: "ข้อความถึงผู้ติดตาม"
-target: "เป้า"
-testCaptchaWarning: "ฟังก์ชันนี้มีไว้สำหรับทดสอบ CAPTCHA เท่านั้น\n<strong>ห้ามนำไปใช้ในระบบจริงโดยเด็ดขาด</strong>"
-prohibitedWordsForNameOfUser: "คำนี้ไม่สามารถใช้เป็นชื่อผู้ใช้ได้"
-prohibitedWordsForNameOfUserDescription: "หากมีสตริงใดๆ ในรายการนี้ปรากฏอยู่ในชื่อของผู้ใช้ ชื่อนั้นจะถูกปฏิเสธ ผู้ใช้ที่มีสิทธิ์แต่ผู้ดูแลระบบนั้นจะไม่ได้รับผลกระทบใดๆจากข้อจำกัดนี้ค่ะ"
-yourNameContainsProhibitedWords: "ชื่อของคุณนั้นมีคำที่ต้องห้าม"
-yourNameContainsProhibitedWordsDescription: "ถ้าหากคุณต้องการใช้ชื่อนี้ กรุณาติดต่อผู้ดูแลระบบของเซิร์ฟเวอร์นะค่ะ"
-_abuseUserReport:
-  forward: "ส่ง​ต่อ"
-  forwardDescription: "ส่งรายงานไปยังเซิร์ฟเวอร์ระยะไกลโดยใช้บัญชีระบบที่ไม่ระบุตัวตน"
-  resolve: "แก้ไข"
-  accept: "ยอมรับ"
-  reject: "ปฏิเสธ"
-  resolveTutorial: "ถ้าหากรายงานนี้มีเนื้อหาถูกต้อง ให้เลือก \"ยอมรับ\" เพื่อปิดเคสกรณีนี้โดยถือว่าได้รับการแก้ไขแล้ว\nถ้าหากเนื้อหาในรายงานนี้นั้นไม่ถูกต้อง ให้เลือก \"ปฏิเสธ\" เพื่อปิดเคสกรณีนี้โดยถือว่าไม่ได้รับการแก้ไข"
 _delivery:
   status: "สถานะการจัดส่ง"
   stop: "ระงับการส่ง"
@@ -1434,10 +1396,8 @@ _serverSettings:
   fanoutTimelineDescription: "เพิ่มประสิทธิภาพการดึงข้อมูลไทม์ไลน์อย่างมาก และลดภาระในฐานข้อมูลเมื่อเปิดใช้งาน ในทางกลับกัน การใช้หน่วยความจำของ Redis จะเพิ่มขึ้น ลองปิดการใช้งานนี้ในกรณีที่หน่วยความจำเซิร์ฟเวอร์เหลือน้อยหรือเซิร์ฟเวอร์ไม่เสถียร"
   fanoutTimelineDbFallback: "ฟอลแบ๊กกลับฐานข้อมูล"
   fanoutTimelineDbFallbackDescription: "เมื่อเปิดใช้งาน หากไม่ได้แคชไทม์ไลน์ ไทม์ไลน์จะฟอลแบ๊กไปยังฐานข้อมูลสำหรับการ query เพิ่มเติม การปิดใช้งานจะช่วยลดภาระของเซิร์ฟเวอร์ด้วยการกำจัดกระบวนฟอลแบ๊ก แต่มันก็จะจำกัดช่วงเวลาไทม์ไลน์ที่สามารถดึงข้อมูลได้"
-  reactionsBufferingDescription: "เมื่อเปิดใช้งานฟังก์ชันนี้ก็จะช่วยลด latency ในการสร้างปฏิกิริยา แต่อาจจะส่งผลให้ memory footprint ของ Redis เพิ่มขึ้นนะ"
   inquiryUrl: "URL สำหรับการติดต่อสอบถาม"
   inquiryUrlDescription: "ระบุ URL ของหน้าเว็บที่มีแบบฟอร์มสำหรับติดต่อผู้ดูแลเซิร์ฟเวอร์ หรือข้อมูลการติดต่อของผู้ดูแลเซิร์ฟเวอร์"
-  thisSettingWillAutomaticallyOffWhenModeratorsInactive: "ถ้าหากไม่มีการตรวจสอบจากผู้ดูแลระบบหรือไม่มีความเคลื่อนไหวมาเป็นระยะเวลาหนึ่ง ระบบจะทำการปิดใช้งานฟังก์ชันนี้โดยอัตโนมัติ เพื่อลดความเสี่ยงในการถูกโจมตีด้วยสแปมและอื่นๆ"
 _accountMigration:
   moveFrom: "ย้ายจากบัญชีอื่นมาที่บัญชีนี้"
   moveFromSub: "สร้างนามแฝงไปยังบัญชีอื่น"
@@ -1769,11 +1729,6 @@ _role:
     canSearchNotes: "การใช้การค้นหาโน้ต"
     canUseTranslator: "การใช้งานแปล"
     avatarDecorationLimit: "จำนวนการตกแต่งไอคอนสูงสุดที่สามารถติดตั้งได้"
-    canImportAntennas: "อนุญาตให้นำเข้าเสาอากาศ"
-    canImportBlocking: "อนุญาตให้นำเข้าการบล็อก"
-    canImportFollowing: "อนุญาตให้นำเข้ารายการต่อไปนี้"
-    canImportMuting: "อนุญาตให้นำเข้าการปิดกั้น"
-    canImportUserLists: "อนุญาตให้นำเข้ารายการ"
   _condition:
     roleAssignedTo: "มอบหมายให้มีบทบาทแบบทำมือ"
     isLocal: "ผู้ใช้ท้องถิ่น"
@@ -1991,6 +1946,7 @@ _theme:
     buttonBg: "ปุ่มพื้นหลัง"
     buttonHoverBg: "ปุ่มพื้นหลัง (โฮเวอร์)"
     inputBorder: "เส้นขอบของช่องป้อนข้อมูล"
+    listItemHoverBg: "รายการไอเทมพื้นหลัง (โฮเวอร์)"
     driveFolderBg: "พื้นหลังโฟลเดอร์ไดรฟ์"
     wallpaperOverlay: "วอลล์เปเปอร์ซ้อนทับ"
     badge: "ตรา"
@@ -2267,9 +2223,6 @@ _profile:
   changeBanner: "เปลี่ยนแบนเนอร์"
   verifiedLinkDescription: "หากป้อน URL ที่มีลิงก์ไปยังโปรไฟล์ของคุณ ไอคอนการยืนยันความเป็นเจ้าของจะแสดงถัดจากฟิลด์นั้น ๆ"
   avatarDecorationMax: "คุณสามารถเพิ่มการตกแต่งได้สูงสุด {max}"
-  followedMessage: "ส่งข้อความเมื่อมีคนกดติดตาม"
-  followedMessageDescription: "ส่งข้อความเมื่อมีคนกดติดตามแล้ว"
-  followedMessageDescriptionForLockedAccount: "ถ้าหากคุณตั้งค่าให้คนอื่นต้องขออนุญาตก่อนที่จะติดตามคุณ ระบบจะขึ้นข้อความนี้ในตอนที่คุณอนุมัติให้เขาติดตาม"
 _exportOrImport:
   allNotes: "โน้ตทั้งหมด"
   favoritedNotes: "โน้ตที่ถูกใจไว้"
@@ -2362,7 +2315,6 @@ _pages:
   eyeCatchingImageSet: "ตั้งค่าภาพขนาดย่อ"
   eyeCatchingImageRemove: "ลบภาพขนาดย่อ"
   chooseBlock: "เพิ่มบล็อค"
-  enterSectionTitle: "ป้อนชื่อหัวข้อ"
   selectType: "เลือกชนิด"
   contentBlocks: "เนื้อหา"
   inputBlocks: "ป้อนข้อมูล"
@@ -2408,8 +2360,6 @@ _notification:
   renotedBySomeUsers: "รีโน้ตจากผู้ใช้ {n} ราย"
   followedBySomeUsers: "มีผู้ติดตาม {n} ราย"
   flushNotification: "ล้างประวัติการแจ้งเตือน"
-  exportOfXCompleted: "การดำเนินการส่งออก {x} ได้เสร็จสิ้นลงแล้ว"
-  login: "มีคนล็อกอิน"
   _types:
     all: "ทั้งหมด"
     note: "โน้ตใหม่"
@@ -2424,9 +2374,6 @@ _notification:
     followRequestAccepted: "อนุมัติให้ติดตามแล้ว"
     roleAssigned: "ให้บทบาท"
     achievementEarned: "ปลดล็อกความสำเร็จแล้ว"
-    exportCompleted: "กระบวนการส่งออกข้อมูลได้เสร็จสิ้นสมบูรณ์แล้ว"
-    login: "เข้าสู่ระบบ"
-    test: "ทดสอบระบบแจ้งเตือน"
     app: "การแจ้งเตือนจากแอปที่มีลิงก์"
   _actions:
     followBack: "ติดตามกลับด้วย"
@@ -2492,10 +2439,7 @@ _webhookSettings:
     abuseReport: "เมื่อมีการรายงานจากผู้ใช้"
     abuseReportResolved: "เมื่อมีการจัดการกับการรายงานจากผู้ใช้"
     userCreated: "เมื่อผู้ใช้ถูกสร้างขึ้น"
-    inactiveModeratorsWarning: "เมื่อผู้ดูแลระบบไม่ได้ใช้งานมานานระยะหนึ่ง"
-    inactiveModeratorsInvitationOnlyChanged: "เมื่อผู้ดูแลระบบที่ไม่ได้ใช้งานมานาน และเซิร์ฟเวอร์เปลี่ยนเป็นแบบเชิญเข้าร่วมเท่านั้น"
   deleteConfirm: "ต้องการลบ Webhook ใช่ไหม?"
-  testRemarks: "คลิกปุ่มทางด้านขวาของสวิตช์เพื่อส่ง Webhook ทดสอบที่มีข้อมูลจำลอง"
 _abuseReport:
   _notificationRecipient:
     createRecipient: "เพิ่มปลายทางการแจ้งเตือนการรายงาน"
@@ -2539,8 +2483,6 @@ _moderationLogTypes:
   markSensitiveDriveFile: "ทำเครื่องหมายไฟล์ว่ามีเนื้อหาละเอียดอ่อน"
   unmarkSensitiveDriveFile: "ยกเลิกทำเครื่องหมายไฟล์ว่ามีเนื้อหาละเอียดอ่อน"
   resolveAbuseReport: "รายงานได้รับการแก้ไขแล้ว"
-  forwardAbuseReport: "ได้ส่งรายงานไปแล้ว"
-  updateAbuseReportNote: "โน้ตการกลั่นกรองที่รายงานไปนั้น ได้รับการอัปเดตแล้ว"
   createInvitation: "สร้างรหัสเชิญ"
   createAd: "สร้างโฆษณาแล้ว"
   deleteAd: "ลบโฆษณาออกแล้ว"
@@ -2556,10 +2498,6 @@ _moderationLogTypes:
   createAbuseReportNotificationRecipient: "สร้างปลายทางการแจ้งเตือนการรายงาน"
   updateAbuseReportNotificationRecipient: "อัปเดตปลายทางการแจ้งเตือนการรายงาน"
   deleteAbuseReportNotificationRecipient: "ลบปลายทางการแจ้งเตือนการรายงาน"
-  deleteAccount: "บัญชีถูกลบไปแล้ว"
-  deletePage: "เพจถูกลบออกไปแล้ว"
-  deleteFlash: "Play ถูกลบออกไปแล้ว"
-  deleteGalleryPost: "โพสต์แกลเลอรี่ถูกลบออกแล้ว"
 _fileViewer:
   title: "รายละเอียดไฟล์"
   type: "ประเภทไฟล์"
@@ -2696,17 +2634,3 @@ _contextMenu:
   app: "แอปพลิเคชัน"
   appWithShift: "แอปฟลิเคชันด้วยปุ่มยกแคร่ (Shift)"
   native: "UI ของเบราว์เซอร์"
-_embedCodeGen:
-  title: "ปรับแต่งโค้ดฝัง"
-  header: "แสดงส่วนหัว"
-  autoload: "โหลดเพิ่มโดยอัตโนมัติ (เลิกใช้แล้ว)"
-  maxHeight: "ความสูงสุด"
-  maxHeightDescription: "หากถ้าตั้งค่าเป็น 0 จะทำให้ไม่มีการจำกัดความสูงของวิดเจ็ต แต่ควรตั้งค่าเป็นตัวเลขอื่นๆ เพื่อไม่ให้วิดเจ็ตยืดตัวลงไปเรื่อยๆ"
-  maxHeightWarn: "การจำกัดความสูงสูงสุดถูกปิดใช้งาน (0) หากไม่ได้ตั้งใจให้เป็นเช่นนี้ โปรดตั้งค่าความสูงสูงสุดให้เป็นค่าอื่นๆแทน"
-  previewIsNotActual: "การแสดงผลนั้นต่างจากการฝังจริงเพราะเกินขอบเขตที่แสดงบนหน้าจอตัวอย่างนะ"
-  rounded: "ทำให้มันกลม"
-  border: "เพิ่มขอบให้กับกรอบด้านนอก"
-  applyToPreview: "นำไปใช้กับการแสดงตัวอย่าง"
-  generateCode: "สร้างโค้ดสำหรับการฝัง"
-  codeGenerated: "รหัสถูกสร้างขึ้นแล้ว"
-  codeGeneratedDescription: "นำโค้ดที่สร้างแล้วไปวางในเว็บไซต์ของคุณเพื่อฝังเนื้อหา"

locales/tr-TR.yml

@@ -446,7 +446,6 @@ _notification:
     reaction: "Tepkiler"
     receiveFollowRequest: "Takip isteği alındı"
     followRequestAccepted: "Takip isteği kabul edildi"
-    login: "Giriş Yap "
   _actions:
     reply: "yanıt"
     renote: "vazgeçme"

locales/ug-CN.yml

@@ -17,6 +17,3 @@ _2fa:
   renewTOTPCancel: "ئۇنى توختىتىڭ"
 _widgets:
   profile: "profile"
-_notification:
-  _types:
-    login: "كىرىش"

locales/uk-UA.yml

@@ -630,7 +630,10 @@ abuseReported: "Дякуємо, вашу скаргу було відправл
 reporter: "Репортер"
 reporteeOrigin: "Про кого повідомлено"
 reporterOrigin: "Хто повідомив"
+forwardReport: "Переслати звіт на віддалений інстанс"
+forwardReportIsAnonymous: "Замість вашого облікового запису анонімний системний обліковий запис буде відображатися як доповідач на віддаленому інстансі"
 send: "Відправити"
+abuseMarkAsResolved: "Позначити скаргу як вирішену"
 openInNewTab: "Відкрити в новій вкладці"
 openInSideView: "Відкрити збоку"
 defaultNavigationBehaviour: "Поведінка навігації за замовчуванням"
@@ -1302,6 +1305,7 @@ _theme:
     buttonBg: "Фон кнопки"
     buttonHoverBg: "Фон кнопки (при наведенні)"
     inputBorder: "Край поля вводу"
+    listItemHoverBg: "Фон елементу в списку (при наведенні)"
     driveFolderBg: "Фон папки на диску"
     wallpaperOverlay: "Накладання шпалер"
     badge: "Значок"
@@ -1583,7 +1587,6 @@ _notification:
     reaction: "Реакції"
     receiveFollowRequest: "Запити на підписку"
     followRequestAccepted: "Прийняті підписки"
-    login: "Увійти"
     app: "Сповіщення від додатків"
   _actions:
     reply: "Відповісти"

locales/uz-UZ.yml

@@ -629,7 +629,10 @@ abuseReported: "Shikoyatingiz yetkazildi. Ma'lumot uchun rahmat."
 reporter: "Shikoyat qiluvchi"
 reporteeOrigin: "Xabarning kelib chiqishi"
 reporterOrigin: "Xabarchining joylashuvi"
+forwardReport: "Xabarni masofadagi serverga yuborish"
+forwardReportIsAnonymous: "Sizning yuborayotgan xabaringiz o'z akkountingiz emas balki anonim tarzda qoladi"
 send: "Yuborish"
+abuseMarkAsResolved: "Yuborilgan xabarni hal qilingan deb belgilash"
 openInNewTab: "Yangi tab da ochish"
 openInSideView: "Yon panelda ochish"
 defaultNavigationBehaviour: "Standart navigatsiya harakati"
@@ -1054,7 +1057,6 @@ _notification:
     quote: "Iqtibos keltirish"
     reaction: "Reaktsiyalar"
     receiveFollowRequest: "Qabul qilingan kuzatuv so'rovlari"
-    login: "Kirish"
   _actions:
     reply: "Javob berish"
     renote: "Qayta qayd qilish"

locales/vi-VN.yml

@@ -675,7 +675,10 @@ abuseReported: "Báo cáo đã được gửi. Cảm ơn bạn nhiều."
 reporter: "Người báo cáo"
 reporteeOrigin: "Bị báo cáo"
 reporterOrigin: "Máy chủ người báo cáo"
+forwardReport: "Chuyển tiếp báo cáo cho máy chủ từ xa"
+forwardReportIsAnonymous: "Thay vì tài khoản của bạn, một tài khoản hệ thống ẩn danh sẽ được hiển thị dưới dạng người báo cáo ở máy chủ từ xa."
 send: "Gửi"
+abuseMarkAsResolved: "Đánh dấu đã xử lý"
 openInNewTab: "Mở trong tab mới"
 openInSideView: "Mở trong thanh bên"
 defaultNavigationBehaviour: "Thao tác điều hướng mặc định"
@@ -1546,6 +1549,7 @@ _theme:
     buttonBg: "Nền nút"
     buttonHoverBg: "Nền nút (Chạm)"
     inputBorder: "Đường viền khung soạn thảo"
+    listItemHoverBg: "Nền mục liệt kê (Chạm)"
     driveFolderBg: "Nền thư mục Ổ đĩa"
     wallpaperOverlay: "Lớp phủ hình nền"
     badge: "Huy hiệu"
@@ -1874,7 +1878,6 @@ _notification:
     receiveFollowRequest: "Yêu cầu theo dõi"
     followRequestAccepted: "Yêu cầu theo dõi được chấp nhận"
     achievementEarned: "Hoàn thành Achievement"
-    login: "Đăng nhập"
     app: "Từ app liên kết"
   _actions:
     followBack: "đã theo dõi lại bạn"

locales/zh-CN.yml

@@ -8,9 +8,6 @@ search: "搜索"
 notifications: "通知"
 username: "用户名"
 password: "密码"
-initialPasswordForSetup: "初始化密码"
-initialPasswordIsIncorrect: "初始化密码不正确"
-initialPasswordForSetupDescription: "如果是自己安装的 Misskey，请输入配置文件里设好的密码。\n如果使用的是 Misskey 的托管服务等，请输入服务商提供的密码。\n如果没有设置密码，请留空并继续。"
 forgotPassword: "忘记密码"
 fetchingAsApObject: "在联邦宇宙查询中..."
 ok: "OK"
@@ -93,7 +90,7 @@ followsYou: "正在关注你"
 createList: "创建列表"
 manageLists: "管理列表"
 error: "错误"
-somethingHappened: "出错了"
+somethingHappened: "出现了一些问题！"
 retry: "重试"
 pageLoadError: "页面加载失败。"
 pageLoadErrorDescription: "这通常是由于网络或浏览器缓存的原因。请清除缓存或等待片刻后重试。"
@@ -170,7 +167,7 @@ emojiUrl: "emoji 地址"
 addEmoji: "添加表情符号"
 settingGuide: "推荐配置"
 cacheRemoteFiles: "缓存远程文件"
-cacheRemoteFilesDescription: "启用此设定时，将在此服务器上缓存远程文件。虽然可以加快图片显示的速度，但是相对的会消耗大量的服务器存储空间。用户角色内的网盘容量决定了这个远程用户能在服务器上保留多少缓存。当超出了这个限制时，旧的文件将从缓存中被删除，成为链接。当禁用此设定时，则是从一开始就将远程文件保留为链接。此时推荐将 default.yml 的 proxyRemoteFiles 设置为 true 以优化缩略图生成及保护用户隐私。"
+cacheRemoteFilesDescription: "启用此设定时，将在此服务器上缓存远程文件。虽然可以加快图片显示的速度，但是相对的会消耗大量的服务器存储空间。用户角色内的网盘容量决定了这个远程用户能在服务器上保留保留多少缓存。当超出了这个限制时，旧的文件将从缓存中被删除，成为链接。当禁用此设定时，则是从一开始就将远程文件保留为链接。此时推荐将 default.yml 的 proxyRemoteFiles 设置为 true 以优化缩略图生成及保护用户隐私。"
 youCanCleanRemoteFilesCache: "可以使用文件管理的🗑️按钮来删除所有的缓存。"
 cacheRemoteSensitiveFiles: "缓存远程敏感媒体文件"
 cacheRemoteSensitiveFilesDescription: "如果禁用这项设定，远程服务器的敏感媒体将不会被缓存，而是直接链接。"
@@ -213,8 +210,8 @@ charts: "图表"
 perHour: "每小时"
 perDay: "每天"
 stopActivityDelivery: "停止发送活动"
-blockThisInstance: "封锁此服务器"
-silenceThisInstance: "静音此服务器"
+blockThisInstance: "阻止此服务器向本服务器推流"
+silenceThisInstance: "使服务器静音"
 mediaSilenceThisInstance: "隐藏此服务器的媒体文件"
 operations: "操作"
 software: "软件"
@@ -239,8 +236,6 @@ silencedInstances: "被静音的服务器"
 silencedInstancesDescription: "设置要静音的服务器，以换行分隔。被静音的服务器内所有的账户将默认处于「静音」状态，仅能发送关注请求，并且在未关注状态下无法提及本地账户。被阻止的实例不受影响。"
 mediaSilencedInstances: "已隐藏媒体文件的服务器"
 mediaSilencedInstancesDescription: "设置要隐藏媒体文件的服务器，以换行分隔。被设置为隐藏媒体文件服务器内所有账号的文件均按照「敏感内容」处理，且将无法使用自定义表情符号。被阻止的实例不受影响。"
-federationAllowedHosts: "允许联合的服务器"
-federationAllowedHostsDescription: "设定允许联合的服务器，以换行分隔。"
 muteAndBlock: "静音/拉黑"
 mutedUsers: "已静音用户"
 blockedUsers: "已拉黑的用户"
@@ -258,7 +253,7 @@ noCustomEmojis: "没有自定义表情符号"
 noJobs: "没有任务"
 federating: "联合中"
 blocked: "已拉黑"
-suspended: "停止投递"
+suspended: "停止推流"
 all: "全部"
 subscribing: "已订阅"
 publishing: "投递中"
@@ -454,7 +449,6 @@ totpDescription: "使用验证器输入一次性密码"
 moderator: "监察员"
 moderation: "管理"
 moderationNote: "管理笔记"
-moderationNoteDescription: "可以用来记录仅在管理员之间共享的笔记。"
 addModerationNote: "添加管理笔记"
 moderationLogs: "管理日志"
 nUsersMentioned: "{n} 被提到"
@@ -518,7 +512,6 @@ emojiStyle: "表情符号的样式"
 native: "原生"
 menuStyle: "菜单样式"
 style: "样式"
-drawer: "抽屉"
 popup: "弹窗"
 showNoteActionsOnlyHover: "仅在悬停时显示帖子操作"
 showReactionsCount: "显示帖子的回应数"
@@ -706,7 +699,7 @@ useGlobalSettingDesc: "启用时，将使用账户通知设置。关闭时，则
 other: "其他"
 regenerateLoginToken: "重新生成登录令牌"
 regenerateLoginTokenDescription: "重新生成用于登录的内部令牌。通常您不需要这样做。重新生成后，您将在所有设备上登出。"
-theKeywordWhenSearchingForCustomEmoji: "这将是搜索自定义表情符号时的关键词。"
+theKeywordWhenSearchingForCustomEmoji: "这将是搜素自定义表情符号时的关键词。"
 setMultipleBySeparatingWithSpace: "您可以使用空格分隔多个项目。"
 fileIdOrUrl: "文件 ID 或者 URL"
 behavior: "行为"
@@ -720,7 +713,10 @@ abuseReported: "内容已发送。感谢您提交信息。"
 reporter: "举报者"
 reporteeOrigin: "举报来源"
 reporterOrigin: "举报者来源"
+forwardReport: "将该举报信息转发给远程服务器"
+forwardReportIsAnonymous: "在远程实例上显示的报告者是匿名的系统账号，而不是您的账号。"
 send: "发送"
+abuseMarkAsResolved: "处理完毕"
 openInNewTab: "在新标签页中打开"
 openInSideView: "在侧边栏中打开"
 defaultNavigationBehaviour: "默认导航"
@@ -922,7 +918,6 @@ followersVisibility: "关注者的公开范围"
 continueThread: "查看更多帖子"
 deleteAccountConfirm: "将要删除账户。是否确认？"
 incorrectPassword: "密码错误"
-incorrectTotp: "一次性密码不正确或已过期"
 voteConfirm: "确定投给 “{choice}” ？"
 hide: "隐藏"
 useDrawerReactionPickerForMobile: "在移动设备上使用抽屉显示"
@@ -947,9 +942,6 @@ oneHour: "1 小时"
 oneDay: "1 天"
 oneWeek: "1 周"
 oneMonth: "1 个月"
-threeMonths: "3 个月"
-oneYear: "1 年"
-threeDays: "3 天"
 reflectMayTakeTime: "可能需要一些时间才能体现出效果。"
 failedToFetchAccountInformation: "获取账户信息失败"
 rateLimitExceeded: "已超过速率限制"
@@ -1073,7 +1065,7 @@ nonSensitiveOnlyForLocalLikeOnlyForRemote: "仅限非敏感内容（远程仅点
 rolesAssignedToMe: "指派给自己的角色"
 resetPasswordConfirm: "确定重置密码？"
 sensitiveWords: "敏感词"
-sensitiveWordsDescription: "包含这些词的帖子将只在首页可见。可用换行来设定多个词。"
+sensitiveWordsDescription: "将包含设置词的帖子的可见范围设置为首页。可以通过用换行符分隔来设置多个。"
 sensitiveWordsDescription2: "AND 条件用空格分隔，正则表达式用斜线包裹。"
 prohibitedWords: "禁用词"
 prohibitedWordsDescription: "发布包含设定词汇的帖子时将出错。可用换行设定多个关键字"
@@ -1090,7 +1082,6 @@ retryAllQueuesConfirmTitle: "要再尝试一次吗？"
 retryAllQueuesConfirmText: "可能会使服务器负荷在一定时间内增加"
 enableChartsForRemoteUser: "生成远程用户的图表"
 enableChartsForFederatedInstances: "生成远程服务器的图表"
-enableStatsForFederatedInstances: "获取远程服务器的信息"
 showClipButtonInNoteFooter: "在贴文下方显示便签按钮"
 reactionsDisplaySize: "回应显示大小"
 limitWidthOfReaction: "限制回应的最大宽度，并将其缩小显示"
@@ -1203,10 +1194,10 @@ followingOrFollower: "关注中或关注者"
 fileAttachedOnly: "仅限媒体"
 showRepliesToOthersInTimeline: "在时间线中包含给别人的回复"
 hideRepliesToOthersInTimeline: "在时间线中隐藏给别人的回复"
-showRepliesToOthersInTimelineAll: "在时间线中显示所有现在关注的人的回复"
-hideRepliesToOthersInTimelineAll: "在时间线中隐藏所有现在关注的人的回复"
-confirmShowRepliesAll: "此操作不可撤销。确认要在时间线中显示所有现在关注的人的回复吗？"
-confirmHideRepliesAll: "此操作不可撤销。确认要在时间线中隐藏所有现在关注的人的回复吗？"
+showRepliesToOthersInTimelineAll: "在时间线中包含现在关注的所有人的回复"
+hideRepliesToOthersInTimelineAll: "在时间线中隐藏现在关注的所有人的回复"
+confirmShowRepliesAll: "此操作不可撤销。确认要在时间线中包含现在关注的所有人的回复吗？"
+confirmHideRepliesAll: "此操作不可撤销。确认要在时间线中隐藏现在关注的所有人的回复吗？"
 externalServices: "外部服务"
 sourceCode: "源代码"
 sourceCodeIsNotYetProvided: "还未提供源代码。要解决此问题请联系管理员。"
@@ -1282,42 +1273,10 @@ genEmbedCode: "生成嵌入代码"
 noteOfThisUser: "此用户的帖子"
 clipNoteLimitExceeded: "无法再往此便签内添加更多帖子"
 performance: "性能"
-modified: "有变更"
-discard: "取消"
-thereAreNChanges: "有 {n} 处更改"
 signinWithPasskey: "使用通行密钥登录"
 unknownWebAuthnKey: "此通行密钥未注册。"
 passkeyVerificationFailed: "验证通行密钥失败。"
 passkeyVerificationSucceededButPasswordlessLoginDisabled: "通行密钥验证成功，但账户未开启无密码登录。"
-messageToFollower: "给关注者的消息"
-target: "对象"
-testCaptchaWarning: "此功能为测试 CAPTCHA 用。<strong>请勿在正式环境中使用。</strong>"
-prohibitedWordsForNameOfUser: "用户名中禁止的词"
-prohibitedWordsForNameOfUserDescription: "更改用户名时，如果用户名中包含此列表里的词汇，用户的改名请求将被拒绝。持有管理员权限的用户不受此限制。"
-yourNameContainsProhibitedWords: "目标用户名包含违禁词"
-yourNameContainsProhibitedWordsDescription: "用户名内含有违禁词。若想使用此用户名，请联系服务器管理员。"
-thisContentsAreMarkedAsSigninRequiredByAuthor: "根据发帖者的设定，需要登录才能显示"
-lockdown: "锁定"
-pleaseSelectAccount: "请选择帐户"
-_accountSettings:
-  requireSigninToViewContents: "需要登录才能显示内容"
-  requireSigninToViewContentsDescription1: "您发布的所有帖子将变成需要登入后才会显示。有望防止爬虫收集各种信息。"
-  requireSigninToViewContentsDescription2: "没有 URL 预览（OGP）、内嵌网页、引用帖子的功能的服务器也将无法显示。"
-  requireSigninToViewContentsDescription3: "这些限制可能不适用于联合到远程服务器的内容。"
-  makeNotesFollowersOnlyBefore: "可将过去的帖子设为仅关注者可见"
-  makeNotesFollowersOnlyBeforeDescription: "开启此设定时，超过设定的时间或日期后，帖子将变为仅关注者可见。关闭后帖子的公开状态将恢复成原本的设定。"
-  makeNotesHiddenBefore: "将过去的帖子设为私密"
-  makeNotesHiddenBeforeDescription: "开启此设定时，超过设定的时间或日期后，帖子将变为仅自己可见。关闭后帖子的公开状态将恢复成原本的设定。"
-  mayNotEffectForFederatedNotes: "与远程服务器联合的帖子在远端可能会没有效果。"
-  notesHavePassedSpecifiedPeriod: "超过指定时间的帖子"
-  notesOlderThanSpecifiedDateAndTime: "指定日期前的帖子"
-_abuseUserReport:
-  forward: "转发"
-  forwardDescription: "目标是匿名系统账户，将把举报转发给远程服务器。"
-  resolve: "解决"
-  accept: "确认"
-  reject: "拒绝"
-  resolveTutorial: "如果举报内容有理且已解决，选择「确认」将案件以肯定的态度标记为已解决。\n如果举报内容站不住脚，选择「拒绝」将案件以否定的态度标记为已解决。"
 _delivery:
   status: "投递状态"
   stop: "停止投递"
@@ -1455,7 +1414,6 @@ _serverSettings:
   reactionsBufferingDescription: "开启时可显著提高发送回应时的性能，及减轻数据库负荷。但 Redis 的内存用量会相应增加。"
   inquiryUrl: "联络地址"
   inquiryUrlDescription: "用来指定诸如向服务运营商咨询的论坛地址，或记载了运营商联系方式之类的网页地址。"
-  thisSettingWillAutomaticallyOffWhenModeratorsInactive: "若在一段时间内没有检测到管理活动，为防止垃圾信息，此设定将自动关闭。"
 _accountMigration:
   moveFrom: "从别的账号迁移到此账户"
   moveFromSub: "为另一个账户建立别名"
@@ -1655,7 +1613,7 @@ _achievements:
     _postedAt0min0sec:
       title: "报时"
       description: "在 0 点发布一篇帖子"
-      flavor: "嘟 · 嘟 · 嘟 · 哔——"
+      flavor: "报时信号最后一响，零点整"
     _selfQuote:
       title: "自我引用"
       description: "引用了自己的帖子"
@@ -2009,6 +1967,7 @@ _theme:
     buttonBg: "按钮背景"
     buttonHoverBg: "按钮背景（悬停）"
     inputBorder: "输入框边框"
+    listItemHoverBg: "下拉列表项目背景（悬停）"
     driveFolderBg: "网盘的文件夹背景"
     wallpaperOverlay: "壁纸叠加层"
     badge: "徽章"
@@ -2175,11 +2134,8 @@ _auth:
   permissionAsk: "这个应用程序需要以下权限"
   pleaseGoBack: "请返回到应用程序"
   callback: "回到应用程序"
-  accepted: "已允许访问"
   denied: "拒绝访问"
-  scopeUser: "以下面的用户进行操作"
   pleaseLogin: "在对应用进行授权许可之前，请先登录"
-  byClickingYouWillBeRedirectedToThisUrl: "允许访问后将会自动重定向到以下 URL"
 _antennaSources:
   all: "所有帖子"
   homeTimeline: "已关注用户的帖子"
@@ -2288,9 +2244,6 @@ _profile:
   changeBanner: "修改横幅"
   verifiedLinkDescription: "如果将内容设置为 URL，当链接所指向的网页内包含自己的个人资料链接时，可以显示一个已验证图标。"
   avatarDecorationMax: "最多可添加 {max} 个挂件"
-  followedMessage: "被关注时显示的消息"
-  followedMessageDescription: "可以设置被关注时向对方显示的短消息。"
-  followedMessageDescriptionForLockedAccount: "需要批准才能关注的情况下，消息是在请求被批准后显示。"
 _exportOrImport:
   allNotes: "所有帖子"
   favoritedNotes: "收藏的帖子"
@@ -2430,7 +2383,6 @@ _notification:
   followedBySomeUsers: "被 {n} 人关注"
   flushNotification: "重置通知历史"
   exportOfXCompleted: "已完成 {x} 个导出"
-  login: "有新的登录"
   _types:
     all: "全部"
     note: "用户的新帖子"
@@ -2446,7 +2398,6 @@ _notification:
     roleAssigned: "授予的角色"
     achievementEarned: "取得的成就"
     exportCompleted: "已完成导出"
-    login: "登录"
     test: "测试通知"
     app: "关联应用的通知"
   _actions:
@@ -2513,8 +2464,6 @@ _webhookSettings:
     abuseReport: "当收到举报时"
     abuseReportResolved: "当举报被处理时"
     userCreated: "当用户被创建时"
-    inactiveModeratorsWarning: "当管理员在一段时间内不活跃时"
-    inactiveModeratorsInvitationOnlyChanged: "当因为管理员在一段时间内不活跃，导致服务器变为邀请制时"
   deleteConfirm: "要删除 webhook 吗？"
   testRemarks: "点击开关右侧的按钮，可以发送使用假数据的测试 Webhook。"
 _abuseReport:
@@ -2560,8 +2509,6 @@ _moderationLogTypes:
   markSensitiveDriveFile: "标记网盘文件为敏感媒体"
   unmarkSensitiveDriveFile: "取消标记网盘文件为敏感媒体"
   resolveAbuseReport: "处理举报"
-  forwardAbuseReport: "转发举报"
-  updateAbuseReportNote: "更新举报用管理笔记"
   createInvitation: "生成邀请码"
   createAd: "创建了广告"
   deleteAd: "删除了广告"
@@ -2731,9 +2678,3 @@ _embedCodeGen:
   generateCode: "生成嵌入代码"
   codeGenerated: "已生成代码"
   codeGeneratedDescription: "将生成的代码贴到网站上来使用。"
-_selfXssPrevention:
-  warning: "警告"
-  title: "「在此处粘贴什么东西」是欺诈行为。"
-  description1: "如果在此处粘贴了什么，恶意用户可能会接管账户或者盗取个人资料。"
-  description2: "如果不能完全理解将要粘贴的内容，%c 请立即停止操作并关闭这个窗口。"
-  description3: "详情请看这里。{link}"

locales/zh-TW.yml

@@ -8,9 +8,6 @@ search: "搜尋"
 notifications: "通知"
 username: "使用者名稱"
 password: "密碼"
-initialPasswordForSetup: "初始設定用的密碼"
-initialPasswordIsIncorrect: "初始設定用的密碼錯誤。"
-initialPasswordForSetupDescription: "如果您自己安裝了 Misskey，請使用您在設定檔中輸入的密碼。\n如果您使用 Misskey 的託管服務之類的服務，請使用提供的密碼。\n如果您尚未設定密碼，請將其留空並繼續。"
 forgotPassword: "忘記密碼"
 fetchingAsApObject: "從聯邦宇宙取得中..."
 ok: "OK"
@@ -454,7 +451,6 @@ totpDescription: "以驗證應用程式輸入一次性密碼"
 moderator: "審查員"
 moderation: "審查"
 moderationNote: "管理筆記"
-moderationNoteDescription: "您可以編寫僅在審查員之間共用的註解。"
 addModerationNote: "新增管理筆記"
 moderationLogs: "管理日誌"
 nUsersMentioned: "被 {n} 個人提及"
@@ -520,7 +516,7 @@ menuStyle: "選單風格"
 style: "風格"
 drawer: "側邊欄"
 popup: "彈出式視窗"
-showNoteActionsOnlyHover: "僅在游標停留時顯示貼文的"
+showNoteActionsOnlyHover: "僅在游標停留時顯示貼文的操作選項"
 showReactionsCount: "顯示貼文的反應數目"
 noHistory: "沒有歷史紀錄"
 signinHistory: "登入歷史"
@@ -720,7 +716,10 @@ abuseReported: "檢舉完成。感謝您的報告。"
 reporter: "檢舉者"
 reporteeOrigin: "檢舉來源"
 reporterOrigin: "檢舉者來源"
+forwardReport: "將報告轉送給遠端伺服器"
+forwardReportIsAnonymous: "在遠端實例上看不到您的資訊，顯示的報告者是匿名的系统帳戶。"
 send: "發送"
+abuseMarkAsResolved: "處理完畢"
 openInNewTab: "在新分頁中開啟"
 openInSideView: "在側欄中開啟"
 defaultNavigationBehaviour: "預設導航"
@@ -922,7 +921,6 @@ followersVisibility: "追隨者的可見性"
 continueThread: "查看更多貼文"
 deleteAccountConfirm: "將要刪除帳戶。是否確定？"
 incorrectPassword: "密碼錯誤。"
-incorrectTotp: "一次性密碼錯誤，或者已過期。"
 voteConfirm: "確定投給「{choice}」？"
 hide: "隱藏"
 useDrawerReactionPickerForMobile: "在移動設備上使用抽屜顯示"
@@ -947,9 +945,6 @@ oneHour: "一小時"
 oneDay: "一天"
 oneWeek: "一週"
 oneMonth: "一個月"
-threeMonths: "3 個月"
-oneYear: "1 年"
-threeDays: "3 日"
 reflectMayTakeTime: "可能需要一些時間才會出現效果。"
 failedToFetchAccountInformation: "取得帳戶資訊失敗"
 rateLimitExceeded: "已超過速率限制"
@@ -1022,7 +1017,7 @@ show: "檢視"
 neverShow: "不再顯示"
 remindMeLater: "以後再說"
 didYouLikeMisskey: "您喜歡 Misskey 嗎？"
-pleaseDonate: "Misskey是由{host}使用的免費軟體。請贊助我們，讓開發的工作能夠持續！"
+pleaseDonate: "Misskey 是由 {host} 使用的免費軟體。請贊助我們，讓開發得以持續！"
 correspondingSourceIsAvailable: "對應的原始碼可以在 {anchor} 處找到。"
 roles: "角色"
 role: "角色"
@@ -1090,7 +1085,6 @@ retryAllQueuesConfirmTitle: "要現在重試嗎？"
 retryAllQueuesConfirmText: "伺服器的負荷可能會暫時增加。"
 enableChartsForRemoteUser: "生成遠端使用者的圖表"
 enableChartsForFederatedInstances: "生成遠端伺服器的圖表"
-enableStatsForFederatedInstances: "取得遠端伺服器資訊"
 showClipButtonInNoteFooter: "新增摘錄按鈕至貼文"
 reactionsDisplaySize: "反應的顯示尺寸"
 limitWidthOfReaction: "限制反應的最大寬度，並縮小顯示尺寸。"
@@ -1199,7 +1193,7 @@ showRenotes: "顯示其他人的轉發貼文"
 edited: "已編輯"
 notificationRecieveConfig: "接受通知的設定"
 mutualFollow: "互相追隨"
-followingOrFollower: "追隨中或者追隨者"
+followingOrFollower: "追隨中或追隨者"
 fileAttachedOnly: "只顯示包含附件的貼文"
 showRepliesToOthersInTimeline: "顯示給其他人的回覆"
 hideRepliesToOthersInTimeline: "在時間軸上隱藏給其他人的回覆"
@@ -1270,7 +1264,7 @@ useNativeUIForVideoAudioPlayer: "使用瀏覽器的 UI 播放影片與音訊"
 keepOriginalFilename: "保留原始檔名"
 keepOriginalFilenameDescription: "如果關閉此設置，上傳時檔案名稱會自動替換為隨機字串。"
 noDescription: "沒有說明文字"
-alwaysConfirmFollow: "跟隨時總是確認"
+alwaysConfirmFollow: "點擊追隨時總是顯示確認訊息"
 inquiry: "聯絡我們"
 tryAgain: "請再試一次。"
 confirmWhenRevealingSensitiveMedia: "要顯示敏感媒體時需確認"
@@ -1289,35 +1283,6 @@ signinWithPasskey: "使用密碼金鑰登入"
 unknownWebAuthnKey: "未註冊的金鑰。"
 passkeyVerificationFailed: "驗證金鑰失敗。"
 passkeyVerificationSucceededButPasswordlessLoginDisabled: "雖然驗證金鑰成功，但是無密碼登入的方式是停用的。"
-messageToFollower: "給追隨者的訊息"
-target: "目標 "
-testCaptchaWarning: "此功能用於 CAPTCHA 的測試。<strong>請勿在正式環境中使用。</strong>"
-prohibitedWordsForNameOfUser: "禁止使用的字詞（使用者名稱）"
-prohibitedWordsForNameOfUserDescription: "如果使用者名稱包含此清單中的任何字串，則拒絕重新命名使用者。 具有審查員權限的使用者不受此限制的影響。"
-yourNameContainsProhibitedWords: "您嘗試更改的名稱包含禁止的字串"
-yourNameContainsProhibitedWordsDescription: "名稱中包含禁止使用的字串。 如果您想使用此名稱，請聯絡您的伺服器管理員。"
-thisContentsAreMarkedAsSigninRequiredByAuthor: "作者將其設定為需要登入才能顯示。"
-lockdown: "鎖定"
-pleaseSelectAccount: "請選擇帳戶"
-_accountSettings:
-  requireSigninToViewContents: "須登入以顯示內容"
-  requireSigninToViewContentsDescription1: "必須登入才會顯示您建立的貼文等內容。可望有效防止資訊被爬蟲蒐集。"
-  requireSigninToViewContentsDescription2: "來自不支援 URL 預覽 (OGP)、 網頁嵌入和引用貼文的伺服器，也將停止顯示。"
-  requireSigninToViewContentsDescription3: "這些限制可能不適用於被聯邦發送至遠端伺服器的內容。"
-  makeNotesFollowersOnlyBefore: "讓過去的貼文僅對追隨者顯示"
-  makeNotesFollowersOnlyBeforeDescription: "啟用此功能後，超過設定的日期和時間或超過設定時間的貼文將僅對追隨者顯示。 如果您再次停用它，貼文的公開狀態也會恢復原狀。"
-  makeNotesHiddenBefore: "隱藏過去的貼文"
-  makeNotesHiddenBeforeDescription: "啟用此功能後，超過設定的日期和時間或超過設定時間的貼文將僅對自己顯示（私密化）。 如果您再次停用它，貼文的公開狀態也會恢復原狀。"
-  mayNotEffectForFederatedNotes: "聯邦發送至遠端伺服器的貼文可能會不受影響。"
-  notesHavePassedSpecifiedPeriod: "早於指定時間的貼文"
-  notesOlderThanSpecifiedDateAndTime: "指定時間和日期之前的貼文"
-_abuseUserReport:
-  forward: "轉發"
-  forwardDescription: "以匿名系統帳戶將檢舉轉發至遠端伺服器。"
-  resolve: "解決"
-  accept: "接受"
-  reject: "拒絕"
-  resolveTutorial: "如果您已回覆正當的檢舉，請選擇「接受」以將案件標記為已解決。\n 如果檢舉的內容不正當，請選擇「拒絕」將案件標記為已解決。"
 _delivery:
   status: "傳送狀態"
   stop: "停止發送"
@@ -1455,7 +1420,6 @@ _serverSettings:
   reactionsBufferingDescription: "啟用時，可以顯著提高建立反應時的效能並減少資料庫的負載。 但是，Redis 記憶體使用量會增加。"
   inquiryUrl: "聯絡表單網址"
   inquiryUrlDescription: "指定伺服器運營者的聯絡表單網址，或包含運營者聯絡資訊網頁的網址。"
-  thisSettingWillAutomaticallyOffWhenModeratorsInactive: "為了防止 spam，如果一段期間內沒有偵測到審查員的活動，此設定將自動關閉。"
 _accountMigration:
   moveFrom: "從其他帳戶遷移到這個帳戶"
   moveFromSub: "為另一個帳戶建立別名"
@@ -1469,7 +1433,7 @@ _accountMigration:
   startMigration: "遷移"
   migrationConfirm: "確定要將這個帳戶遷移至 {account} 嗎？一旦遷移就無法撤銷，也就無法以原來的狀態使用這個帳戶。\n另外，請確認在要遷移到的帳戶已經建立了一個別名。"
   movedAndCannotBeUndone: "帳戶已遷移。\n遷移無法撤消。"
-  postMigrationNote: "取消追蹤此帳戶將在遷移操作後 24 小時執行。\n 此帳戶有 0 個關注者/關注者。 您的關注者仍然可以看到此帳戶的關注者帖子，因為您不會被取消關注。"
+  postMigrationNote: "在完成遷移的 24 小時後解除此帳戶的追隨。此帳戶的追隨中、追隨者數量變為 0。由於不會解除追隨者，你的追隨者仍然可以繼續檢視這個帳戶發布給追隨者的貼文。"
   movedTo: "要遷移到的帳戶："
 _achievements:
   earnedAt: "獲得日期"
@@ -1589,7 +1553,7 @@ _achievements:
     _markedAsCat:
       title: "我是貓"
       description: "已將帳戶設定為貓"
-      flavor: "沒有名字。"
+      flavor: "還沒有名字。"
     _following1:
       title: "首次追隨"
       description: "首次追隨了"
@@ -1603,7 +1567,7 @@ _achievements:
       title: "一百位朋友"
       description: "追隨超過100人了"
     _following300:
-      title: "朋友太多"
+      title: "朋友過多"
       description: "追隨超過300人了"
     _followers1:
       title: "第一個追隨者"
@@ -1929,7 +1893,7 @@ _channel:
   following: "追隨中"
   usersCount: "有 {n} 人參與"
   notesCount: "有 {n} 篇貼文"
-  nameAndDescription: "名稱"
+  nameAndDescription: "名稱與說明"
   nameOnly: "僅名稱"
   allowRenoteToExternal: "允許在頻道外轉發和引用"
 _menuDisplay:
@@ -2009,6 +1973,7 @@ _theme:
     buttonBg: "按鈕背景"
     buttonHoverBg: "按鈕背景 (漂浮)"
     inputBorder: "輸入框邊框"
+    listItemHoverBg: "列表物品背景 (漂浮)"
     driveFolderBg: "雲端硬碟文件夾背景"
     wallpaperOverlay: "壁紙覆蓋層"
     badge: "徽章"
@@ -2175,11 +2140,8 @@ _auth:
   permissionAsk: "此應用程式需要以下權限"
   pleaseGoBack: "請返回至應用程式"
   callback: "回到應用程式"
-  accepted: "已授予存取權限"
   denied: "拒絕訪問"
-  scopeUser: "以下列使用者身分操作"
   pleaseLogin: "必須登入以提供應用程式的存取權限。"
-  byClickingYouWillBeRedirectedToThisUrl: "如果授予存取權限，就會自動導向到以下的網址"
 _antennaSources:
   all: "全部貼文"
   homeTimeline: "來自已追隨使用者的貼文"
@@ -2430,14 +2392,13 @@ _notification:
   followedBySomeUsers: "被{n}人追隨了"
   flushNotification: "重置通知歷史紀錄"
   exportOfXCompleted: "{x} 的匯出已完成。"
-  login: "已登入"
   _types:
     all: "全部 "
     note: "使用者的最新貼文"
     follow: "追隨中"
     mention: "提及"
     reply: "回覆"
-    renote: "轉發"
+    renote: "轉發貼文"
     quote: "引用"
     reaction: "反應"
     pollEnded: "問卷調查結束"
@@ -2446,7 +2407,6 @@ _notification:
     roleAssigned: "已授予角色"
     achievementEarned: "獲得成就"
     exportCompleted: "已完成匯出。"
-    login: "登入"
     test: "通知測試"
     app: "應用程式通知"
   _actions:
@@ -2513,8 +2473,6 @@ _webhookSettings:
     abuseReport: "當使用者檢舉時"
     abuseReportResolved: "當處理了使用者的檢舉時"
     userCreated: "使用者被新增時"
-    inactiveModeratorsWarning: "當審查員在一段時間內沒有活動時"
-    inactiveModeratorsInvitationOnlyChanged: "當審查員在一段時間內不活動時，系統會將模式變更為邀請制"
   deleteConfirm: "請問是否要刪除 Webhook？"
   testRemarks: "按下切換開關右側的按鈕，就會將假資料發送至 Webhook。"
 _abuseReport:
@@ -2529,7 +2487,7 @@ _abuseReport:
         mail: "寄送到擁有監察員權限的使用者電子郵件地址（僅在收到檢舉時）"
         webhook: "向指定的 SystemWebhook 發送通知（在收到檢舉和解決檢舉時發送）"
     keywords: "關鍵字"
-    notifiedUser: "通知的使用者"
+    notifiedUser: "被通知的使用者"
     notifiedWebhook: "使用的 Webhook"
     deleteConfirm: "確定要刪除通知對象嗎？"
 _moderationLogTypes:
@@ -2560,8 +2518,6 @@ _moderationLogTypes:
   markSensitiveDriveFile: "標記為敏感檔案"
   unmarkSensitiveDriveFile: "撤銷標記為敏感檔案"
   resolveAbuseReport: "解決檢舉"
-  forwardAbuseReport: "轉發檢舉"
-  updateAbuseReportNote: "更新檢舉的審查備註"
   createInvitation: "建立邀請碼"
   createAd: "建立廣告"
   deleteAd: "刪除廣告"
@@ -2731,9 +2687,3 @@ _embedCodeGen:
   generateCode: "建立嵌入程式碼"
   codeGenerated: "已產生程式碼"
   codeGeneratedDescription: "請將產生的程式碼貼到您的網站上。"
-_selfXssPrevention:
-  warning: "警告"
-  title: "「在此畫面貼上一些內容」完全是個騙局。"
-  description1: "如果您在此處貼上任何內容，惡意使用者可能會接管您的帳戶或竊取您的個人資訊。"
-  description2: "如果您不確切知道要貼上的內容，%c 請立即停止工作並關閉此視窗。"
-  description3: "細節請看這裡。{link}"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.11.0-alpha.0",
+	"version": "2024.9.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/backend/eslint.config.js

@@ -11,7 +11,7 @@ export default [
 		languageOptions: {
 			parserOptions: {
 				parser: tsParser,
-				project: ['./tsconfig.json', './test/tsconfig.json', './test-federation/tsconfig.json'],
+				project: ['./tsconfig.json', './test/tsconfig.json'],
 				sourceType: 'module',
 				tsconfigRootDir: import.meta.dirname,
 			},

packages/backend/jest.config.fed.cjs

@@ -1,13 +0,0 @@
-/*
- * For a detailed explanation regarding each configuration property and type check, visit:
- * https://jestjs.io/docs/en/configuration.html
- */
-
-const base = require('./jest.config.cjs');
-
-module.exports = {
-	...base,
-	testMatch: [
-		'<rootDir>/test-federation/test/**/*.test.ts',
-	],
-};

packages/backend/migration/1727318020265-enableStatsForFederatedInstances.js

@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class EnableStatsForFederatedInstances1727318020265 {
-    name = 'EnableStatsForFederatedInstances1727318020265'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "enableStatsForFederatedInstances" boolean NOT NULL DEFAULT true`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableStatsForFederatedInstances"`);
-    }
-}

packages/backend/migration/1728085812127-refine-abuse-user-report.js

@@ -1,18 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class RefineAbuseUserReport1728085812127 {
-    name = 'RefineAbuseUserReport1728085812127'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "moderationNote" character varying(8192) NOT NULL DEFAULT ''`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" ADD "resolvedAs" character varying(128)`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "resolvedAs"`);
-        await queryRunner.query(`ALTER TABLE "abuse_user_report" DROP COLUMN "moderationNote"`);
-    }
-}

packages/backend/migration/1728550878802-testcaptcha.js

@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class Testcaptcha1728550878802 {
-    name = 'Testcaptcha1728550878802'
-
-    async up(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "meta" ADD "enableTestcaptcha" boolean NOT NULL DEFAULT false`);
-    }
-
-    async down(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableTestcaptcha"`);
-    }
-}

packages/backend/migration/1728634286056-prohibitedWordsForNameOfUser.js

@@ -1,14 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class ProhibitedWordsForNameOfUser1728634286056 {
-		async up(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "meta" ADD "prohibitedWordsForNameOfUser" character varying(1024) array NOT NULL DEFAULT '{}'`);
-		}
-
-		async down(queryRunner) {
-			await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "prohibitedWordsForNameOfUser"`);
-		}
-}

packages/backend/migration/1729333924409-signinRequiredForShowContents.js

@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class SigninRequiredForShowContents1729333924409 {
-    name = 'SigninRequiredForShowContents1729333924409'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user" ADD "requireSigninToViewContents" boolean NOT NULL DEFAULT false`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "requireSigninToViewContents"`);
-    }
-}

packages/backend/migration/1729486255072-makeNotesHiddenBefore.js

@@ -1,18 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class MakeNotesHiddenBefore1729486255072 {
-    name = 'MakeNotesHiddenBefore1729486255072'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user" ADD "makeNotesFollowersOnlyBefore" integer`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "makeNotesHiddenBefore" integer`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "makeNotesHiddenBefore"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "makeNotesFollowersOnlyBefore"`);
-    }
-}

packages/backend/package.json

@@ -19,18 +19,16 @@
 		"watch": "node ./scripts/watch.mjs",
 		"restart": "pnpm build && pnpm start",
 		"dev": "node ./scripts/dev.mjs",
-		"typecheck": "tsc --noEmit && tsc -p test --noEmit && tsc -p test-federation --noEmit",
-		"eslint": "eslint --quiet \"{src,test-federation}/**/*.ts\"",
+		"typecheck": "tsc --noEmit && tsc -p test --noEmit",
+		"eslint": "eslint --quiet \"src/**/*.ts\"",
 		"lint": "pnpm typecheck && pnpm eslint",
 		"jest": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --forceExit --config jest.config.unit.cjs",
 		"jest:e2e": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --forceExit --config jest.config.e2e.cjs",
-		"jest:fed": "node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --forceExit --config jest.config.fed.cjs",
 		"jest-and-coverage": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --coverage --forceExit --config jest.config.unit.cjs",
 		"jest-and-coverage:e2e": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --coverage --forceExit --config jest.config.e2e.cjs",
 		"jest-clear": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --clearCache",
 		"test": "pnpm jest",
 		"test:e2e": "pnpm build && pnpm build:test && pnpm jest:e2e",
-		"test:fed": "pnpm jest:fed",
 		"test-and-coverage": "pnpm jest-and-coverage",
 		"test-and-coverage:e2e": "pnpm build && pnpm build:test && pnpm jest-and-coverage:e2e",
 		"generate-api-json": "node ./scripts/generate_api_json.js"
@@ -73,20 +71,20 @@
 		"@bull-board/fastify": "6.0.0",
 		"@bull-board/ui": "6.0.0",
 		"@discordapp/twemoji": "15.1.0",
-		"@fastify/accepts": "5.0.1",
-		"@fastify/cookie": "10.0.1",
-		"@fastify/cors": "10.0.1",
-		"@fastify/express": "4.0.1",
+		"@fastify/accepts": "5.0.0",
+		"@fastify/cookie": "10.0.0",
+		"@fastify/cors": "10.0.0",
+		"@fastify/express": "4.0.0",
 		"@fastify/http-proxy": "10.0.0",
-		"@fastify/multipart": "9.0.1",
-		"@fastify/static": "8.0.1",
-		"@fastify/view": "10.0.1",
+		"@fastify/multipart": "9.0.0",
+		"@fastify/static": "8.0.0",
+		"@fastify/view": "10.0.0",
 		"@misskey-dev/sharp-read-bmp": "1.2.0",
 		"@misskey-dev/summaly": "5.1.0",
 		"@napi-rs/canvas": "0.1.56",
-		"@nestjs/common": "10.4.4",
-		"@nestjs/core": "10.4.4",
-		"@nestjs/testing": "10.4.4",
+		"@nestjs/common": "10.4.3",
+		"@nestjs/core": "10.4.3",
+		"@nestjs/testing": "10.4.3",
 		"@peertube/http-signature": "1.7.0",
 		"@sentry/node": "8.20.0",
 		"@sentry/profiling-node": "8.20.0",
@@ -103,7 +101,7 @@
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
 		"body-parser": "1.20.3",
-		"bullmq": "5.15.0",
+		"bullmq": "5.13.2",
 		"cacheable-lookup": "7.0.0",
 		"cbor": "9.0.2",
 		"chalk": "5.3.0",
@@ -151,7 +149,7 @@
 		"oauth2orize": "1.12.0",
 		"oauth2orize-pkce": "0.1.2",
 		"os-utils": "0.0.14",
-		"otpauth": "9.3.4",
+		"otpauth": "9.3.2",
 		"parse5": "7.1.2",
 		"pg": "8.13.0",
 		"pkce-challenge": "4.1.0",
@@ -168,7 +166,7 @@
 		"rename": "1.0.4",
 		"rss-parser": "3.13.0",
 		"rxjs": "7.8.1",
-		"sanitize-html": "2.13.1",
+		"sanitize-html": "2.13.0",
 		"secure-json-parse": "2.7.0",
 		"sharp": "0.33.5",
 		"slacc": "0.0.10",
@@ -189,14 +187,14 @@
 	},
 	"devDependencies": {
 		"@jest/globals": "29.7.0",
-		"@nestjs/platform-express": "10.4.4",
+		"@nestjs/platform-express": "10.4.3",
 		"@simplewebauthn/types": "10.0.0",
 		"@swc/jest": "0.2.36",
 		"@types/accepts": "1.3.7",
 		"@types/archiver": "6.0.2",
 		"@types/bcryptjs": "2.4.6",
 		"@types/body-parser": "1.19.5",
-		"@types/color-convert": "2.0.4",
+		"@types/color-convert": "2.0.3",
 		"@types/content-disposition": "0.5.8",
 		"@types/fluent-ffmpeg": "2.1.26",
 		"@types/htmlescape": "1.1.3",

packages/backend/scripts/check_connect.js

@@ -5,52 +5,11 @@
 
 import Redis from 'ioredis';
 import { loadConfig } from '../built/config.js';
-import { createPostgresDataSource } from '../built/postgres.js';
 
 const config = loadConfig();
+const redis = new Redis(config.redis);
 
-async function connectToPostgres() {
-	const source = createPostgresDataSource(config);
-	await source.initialize();
-	await source.destroy();
-}
-
-async function connectToRedis(redisOptions) {
-	return await new Promise(async (resolve, reject) => {
-		const redis = new Redis({
-			...redisOptions,
-			lazyConnect: true,
-			reconnectOnError: false,
-			showFriendlyErrorStack: true,
-		});
-		redis.on('error', e => reject(e));
-
-		try {
-			await redis.connect();
-			resolve();
-
-		} catch (e) {
-			reject(e);
-
-		} finally {
-			redis.disconnect(false);
-		}
-	});
-}
-
-// If not all of these are defined, the default one gets reused.
-// so we use a Set to only try connecting once to each **uniq** redis.
-const promises = Array
-	.from(new Set([
-		config.redis,
-		config.redisForPubsub,
-		config.redisForJobQueue,
-		config.redisForTimelines,
-		config.redisForReactions,
-	]))
-	.map(connectToRedis)
-	.concat([
-		connectToPostgres()
-	]);
-
-await Promise.allSettled(promises);
+redis.on('connect', () => redis.disconnect());
+redis.on('error', (e) => {
+	throw e;
+});

packages/backend/src/config.ts

@@ -63,8 +63,6 @@ type Source = {
 
 	publishTarballInsteadOfProvideRepositoryUrl?: boolean;
 
-	setupPassword?: string;
-
 	proxy?: string;
 	proxySmtp?: string;
 	proxyBypassHosts?: string[];
@@ -154,7 +152,6 @@ export type Config = {
 
 	version: string;
 	publishTarballInsteadOfProvideRepositoryUrl: boolean;
-	setupPassword: string | undefined;
 	host: string;
 	hostname: string;
 	scheme: string;
@@ -235,7 +232,6 @@ export function loadConfig(): Config {
 	return {
 		version,
 		publishTarballInsteadOfProvideRepositoryUrl: !!config.publishTarballInsteadOfProvideRepositoryUrl,
-		setupPassword: config.setupPassword,
 		url: url.origin,
 		port: config.port ?? parseInt(process.env.PORT ?? '', 10),
 		socket: config.socket,

packages/backend/src/core/AbuseReportNotificationService.ts

@@ -22,7 +22,6 @@ import { RoleService } from '@/core/RoleService.js';
 import { RecipientMethod } from '@/models/AbuseReportNotificationRecipient.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
 import { SystemWebhookService } from '@/core/SystemWebhookService.js';
-import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { IdService } from './IdService.js';
 
 @Injectable()
@@ -43,7 +42,6 @@ export class AbuseReportNotificationService implements OnApplicationShutdown {
 		private emailService: EmailService,
 		private moderationLogService: ModerationLogService,
 		private globalEventService: GlobalEventService,
-		private userEntityService: UserEntityService,
 	) {
 		this.redisForSub.on('message', this.onMessage);
 	}
@@ -61,10 +59,7 @@ export class AbuseReportNotificationService implements OnApplicationShutdown {
 			return;
 		}
 
-		const moderatorIds = await this.roleService.getModeratorIds({
-			includeAdmins: true,
-			excludeExpire: true,
-		});
+		const moderatorIds = await this.roleService.getModeratorIds(true, true);
 
 		for (const moderatorId of moderatorIds) {
 			for (const abuseReport of abuseReports) {
@@ -140,26 +135,6 @@ export class AbuseReportNotificationService implements OnApplicationShutdown {
 			return;
 		}
 
-		const usersMap = await this.userEntityService.packMany(
-			[
-				...new Set([
-					...abuseReports.map(it => it.reporter ?? it.reporterId),
-					...abuseReports.map(it => it.targetUser ?? it.targetUserId),
-					...abuseReports.map(it => it.assignee ?? it.assigneeId),
-				].filter(x => x != null)),
-			],
-			null,
-			{ schema: 'UserLite' },
-		).then(it => new Map(it.map(it => [it.id, it])));
-		const convertedReports = abuseReports.map(it => {
-			return {
-				...it,
-				reporter: usersMap.get(it.reporterId),
-				targetUser: usersMap.get(it.targetUserId),
-				assignee: it.assigneeId ? usersMap.get(it.assigneeId) : null,
-			};
-		});
-
 		const recipientWebhookIds = await this.fetchWebhookRecipients()
 			.then(it => it
 				.filter(it => it.isActive && it.systemWebhookId && it.method === 'webhook')
@@ -167,7 +142,7 @@ export class AbuseReportNotificationService implements OnApplicationShutdown {
 				.filter(x => x != null));
 		for (const webhookId of recipientWebhookIds) {
 			await Promise.all(
-				convertedReports.map(it => {
+				abuseReports.map(it => {
 					return this.systemWebhookService.enqueueSystemWebhook(
 						webhookId,
 						type,
@@ -288,7 +263,8 @@ export class AbuseReportNotificationService implements OnApplicationShutdown {
 			.log(updater, 'createAbuseReportNotificationRecipient', {
 				recipientId: id,
 				recipient: created,
-			});
+			})
+			.then();
 
 		return created;
 	}
@@ -326,7 +302,8 @@ export class AbuseReportNotificationService implements OnApplicationShutdown {
 				recipientId: params.id,
 				before: beforeEntity,
 				after: afterEntity,
-			});
+			})
+			.then();
 
 		return afterEntity;
 	}
@@ -347,7 +324,8 @@ export class AbuseReportNotificationService implements OnApplicationShutdown {
 			.log(updater, 'deleteAbuseReportNotificationRecipient', {
 				recipientId: id,
 				recipient: entity,
-			});
+			})
+			.then();
 	}
 
 	/**
@@ -370,10 +348,7 @@ export class AbuseReportNotificationService implements OnApplicationShutdown {
 		}
 
 		// モデレータ権限の有無で通知先設定を振り分ける
-		const authorizedUserIds = await this.roleService.getModeratorIds({
-			includeAdmins: true,
-			excludeExpire: true,
-		});
+		const authorizedUserIds = await this.roleService.getModeratorIds(true, true);
 		const authorizedUserRecipients = Array.of<MiAbuseReportNotificationRecipient>();
 		const unauthorizedUserRecipients = Array.of<MiAbuseReportNotificationRecipient>();
 		for (const recipient of userRecipients) {

packages/backend/src/core/AbuseReportService.ts

@@ -20,10 +20,8 @@ export class AbuseReportService {
 	constructor(
 		@Inject(DI.abuseUserReportsRepository)
 		private abuseUserReportsRepository: AbuseUserReportsRepository,
-
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
-
 		private idService: IdService,
 		private abuseReportNotificationService: AbuseReportNotificationService,
 		private queueService: QueueService,
@@ -79,16 +77,16 @@ export class AbuseReportService {
 	 * - SystemWebhook
 	 *
 	 * @param params 通報内容. もし複数件の通報に対応した時のために、あらかじめ複数件を処理できる前提で考える
-	 * @param moderator 通報を処理したユーザ
+	 * @param operator 通報を処理したユーザ
 	 * @see AbuseReportNotificationService.notify
 	 */
 	@bindThis
 	public async resolve(
 		params: {
 			reportId: string;
-			resolvedAs: MiAbuseUserReport['resolvedAs'];
+			forward: boolean;
 		}[],
-		moderator: MiUser,
+		operator: MiUser,
 	) {
 		const paramsMap = new Map(params.map(it => [it.reportId, it]));
 		const reports = await this.abuseUserReportsRepository.findBy({
@@ -101,76 +99,30 @@ export class AbuseReportService {
 
 			await this.abuseUserReportsRepository.update(report.id, {
 				resolved: true,
-				assigneeId: moderator.id,
-				resolvedAs: ps.resolvedAs,
+				assigneeId: operator.id,
+				forwarded: ps.forward && report.targetUserHost !== null,
 			});
 
+			if (ps.forward && report.targetUserHost != null) {
+				const actor = await this.instanceActorService.getInstanceActor();
+				const targetUser = await this.usersRepository.findOneByOrFail({ id: report.targetUserId });
+
+				// eslint-disable-next-line
+				const flag = this.apRendererService.renderFlag(actor, targetUser.uri!, report.comment);
+				const contextAssignedFlag = this.apRendererService.addContext(flag);
+				this.queueService.deliver(actor, contextAssignedFlag, targetUser.inbox, false);
+			}
+
 			this.moderationLogService
-				.log(moderator, 'resolveAbuseReport', {
+				.log(operator, 'resolveAbuseReport', {
 					reportId: report.id,
 					report: report,
-					resolvedAs: ps.resolvedAs,
-				});
+					forwarded: ps.forward && report.targetUserHost !== null,
+				})
+				.then();
 		}
 
 		return this.abuseUserReportsRepository.findBy({ id: In(reports.map(it => it.id)) })
 			.then(reports => this.abuseReportNotificationService.notifySystemWebhook(reports, 'abuseReportResolved'));
 	}
-
-	@bindThis
-	public async forward(
-		reportId: MiAbuseUserReport['id'],
-		moderator: MiUser,
-	) {
-		const report = await this.abuseUserReportsRepository.findOneByOrFail({ id: reportId });
-
-		if (report.targetUserHost == null) {
-			throw new Error('The target user host is null.');
-		}
-
-		if (report.forwarded) {
-			throw new Error('The report has already been forwarded.');
-		}
-
-		await this.abuseUserReportsRepository.update(report.id, {
-			forwarded: true,
-		});
-
-		const actor = await this.instanceActorService.getInstanceActor();
-		const targetUser = await this.usersRepository.findOneByOrFail({ id: report.targetUserId });
-
-		const flag = this.apRendererService.renderFlag(actor, targetUser.uri!, report.comment);
-		const contextAssignedFlag = this.apRendererService.addContext(flag);
-		this.queueService.deliver(actor, contextAssignedFlag, targetUser.inbox, false);
-
-		this.moderationLogService
-			.log(moderator, 'forwardAbuseReport', {
-				reportId: report.id,
-				report: report,
-			});
-	}
-
-	@bindThis
-	public async update(
-		reportId: MiAbuseUserReport['id'],
-		params: {
-			moderationNote?: MiAbuseUserReport['moderationNote'];
-		},
-		moderator: MiUser,
-	) {
-		const report = await this.abuseUserReportsRepository.findOneByOrFail({ id: reportId });
-
-		await this.abuseUserReportsRepository.update(report.id, {
-			moderationNote: params.moderationNote,
-		});
-
-		if (params.moderationNote != null && report.moderationNote !== params.moderationNote) {
-			this.moderationLogService.log(moderator, 'updateAbuseReportNote', {
-				reportId: report.id,
-				report: report,
-				before: report.moderationNote,
-				after: params.moderationNote,
-			});
-		}
-	}
 }

packages/backend/src/core/AccountMoveService.ts

@@ -274,16 +274,14 @@ export class AccountMoveService {
 		}
 
 		// Update instance stats by decreasing remote followers count by the number of local followers who were following the old account.
-		if (this.meta.enableStatsForFederatedInstances) {
 		if (this.userEntityService.isRemoteUser(oldAccount)) {
-				this.federatedInstanceService.fetchOrRegister(oldAccount.host).then(async i => {
+			this.federatedInstanceService.fetch(oldAccount.host).then(async i => {
 				this.instancesRepository.decrement({ id: i.id }, 'followersCount', localFollowerIds.length);
 				if (this.meta.enableChartsForFederatedInstances) {
 					this.instanceChart.updateFollowers(i.host, false);
 				}
 			});
 		}
-		}
 
 		// FIXME: expensive?
 		for (const followerId of localFollowerIds) {

packages/backend/src/core/AnnouncementService.ts

@@ -209,13 +209,6 @@ export class AnnouncementService {
 			return;
 		}
 
-		const announcement = await this.announcementsRepository.findOneBy({ id: announcementId });
-		if (announcement != null && announcement.userId === user.id) {
-			await this.announcementsRepository.update(announcementId, {
-				isActive: false,
-			});
-		}
-
 		if ((await this.getUnreadAnnouncements(user)).length === 0) {
 			this.globalEventService.publishMainStream(user.id, 'readAllAnnouncements');
 		}

packages/backend/src/core/CaptchaService.ts

@@ -119,18 +119,5 @@ export class CaptchaService {
 			throw new Error(`turnstile-failed: ${errorCodes}`);
 		}
 	}
-
-	@bindThis
-	public async verifyTestcaptcha(response: string | null | undefined): Promise<void> {
-		if (response == null) {
-			throw new Error('testcaptcha-failed: no response provided');
-		}
-
-		const success = response === 'testcaptcha-passed';
-
-		if (!success) {
-			throw new Error('testcaptcha-failed');
-		}
-	}
 }
 

packages/backend/src/core/CoreModule.ts

@@ -14,7 +14,6 @@ import { AbuseReportNotificationService } from '@/core/AbuseReportNotificationSe
 import { SystemWebhookService } from '@/core/SystemWebhookService.js';
 import { UserSearchService } from '@/core/UserSearchService.js';
 import { WebhookTestService } from '@/core/WebhookTestService.js';
-import { FlashService } from '@/core/FlashService.js';
 import { AccountMoveService } from './AccountMoveService.js';
 import { AccountUpdateService } from './AccountUpdateService.js';
 import { AiService } from './AiService.js';
@@ -218,7 +217,6 @@ const $SystemWebhookService: Provider = { provide: 'SystemWebhookService', useEx
 const $WebhookTestService: Provider = { provide: 'WebhookTestService', useExisting: WebhookTestService };
 const $UtilityService: Provider = { provide: 'UtilityService', useExisting: UtilityService };
 const $FileInfoService: Provider = { provide: 'FileInfoService', useExisting: FileInfoService };
-const $FlashService: Provider = { provide: 'FlashService', useExisting: FlashService };
 const $SearchService: Provider = { provide: 'SearchService', useExisting: SearchService };
 const $ClipService: Provider = { provide: 'ClipService', useExisting: ClipService };
 const $FeaturedService: Provider = { provide: 'FeaturedService', useExisting: FeaturedService };
@@ -369,7 +367,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		WebhookTestService,
 		UtilityService,
 		FileInfoService,
-		FlashService,
 		SearchService,
 		ClipService,
 		FeaturedService,
@@ -516,7 +513,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$WebhookTestService,
 		$UtilityService,
 		$FileInfoService,
-		$FlashService,
 		$SearchService,
 		$ClipService,
 		$FeaturedService,
@@ -664,7 +660,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		WebhookTestService,
 		UtilityService,
 		FileInfoService,
-		FlashService,
 		SearchService,
 		ClipService,
 		FeaturedService,

packages/backend/src/core/CustomEmojiService.ts

@@ -103,33 +103,19 @@ export class CustomEmojiService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async update(data: (
-		{ id: MiEmoji['id'], name?: string; } | { name: string; id?: MiEmoji['id'], }
-	) & {
+	public async update(id: MiEmoji['id'], data: {
 		driveFile?: MiDriveFile;
+		name?: string;
 		category?: string | null;
 		aliases?: string[];
 		license?: string | null;
 		isSensitive?: boolean;
 		localOnly?: boolean;
 		roleIdsThatCanBeUsedThisEmojiAsReaction?: MiRole['id'][];
-	}, moderator?: MiUser): Promise<
-		null
-		| 'NO_SUCH_EMOJI'
-		| 'SAME_NAME_EMOJI_EXISTS'
-	> {
-		const emoji = data.id
-			? await this.getEmojiById(data.id)
-			: await this.getEmojiByName(data.name!);
-		if (emoji === null) return 'NO_SUCH_EMOJI';
-		const id = emoji.id;
-
-		// IDと絵文字名が両方指定されている場合は絵文字名の変更を行うため重複チェックが必要
-		const doNameUpdate = data.id && data.name && (data.name !== emoji.name);
-		if (doNameUpdate) {
-			const isDuplicate = await this.checkDuplicate(data.name!);
-			if (isDuplicate) return 'SAME_NAME_EMOJI_EXISTS';
-		}
+	}, moderator?: MiUser): Promise<void> {
+		const emoji = await this.emojisRepository.findOneByOrFail({ id: id });
+		const sameNameEmoji = await this.emojisRepository.findOneBy({ name: data.name, host: IsNull() });
+		if (sameNameEmoji != null && sameNameEmoji.id !== id) throw new Error('name already exists');
 
 		await this.emojisRepository.update(emoji.id, {
 			updatedAt: new Date(),
@@ -149,7 +135,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 
 		const packed = await this.emojiEntityService.packDetailed(emoji.id);
 
-		if (!doNameUpdate) {
+		if (emoji.name === data.name) {
 			this.globalEventService.publishBroadcastStream('emojiUpdated', {
 				emojis: [packed],
 			});
@@ -171,7 +157,6 @@ export class CustomEmojiService implements OnApplicationShutdown {
 				after: updated,
 			});
 		}
-		return null;
 	}
 
 	@bindThis

packages/backend/src/core/FederatedInstanceService.ts

@@ -47,7 +47,7 @@ export class FederatedInstanceService implements OnApplicationShutdown {
 	}
 
 	@bindThis
-	public async fetchOrRegister(host: string): Promise<MiInstance> {
+	public async fetch(host: string): Promise<MiInstance> {
 		host = this.utilityService.toPuny(host);
 
 		const cached = await this.federatedInstanceCache.get(host);
@@ -70,24 +70,6 @@ export class FederatedInstanceService implements OnApplicationShutdown {
 		}
 	}
 
-	@bindThis
-	public async fetch(host: string): Promise<MiInstance | null> {
-		host = this.utilityService.toPuny(host);
-
-		const cached = await this.federatedInstanceCache.get(host);
-		if (cached !== undefined) return cached;
-
-		const index = await this.instancesRepository.findOneBy({ host });
-
-		if (index == null) {
-			this.federatedInstanceCache.set(host, null);
-			return null;
-		} else {
-			this.federatedInstanceCache.set(host, index);
-			return index;
-		}
-	}
-
 	@bindThis
 	public async update(id: MiInstance['id'], data: Partial<MiInstance>): Promise<void> {
 		const result = await this.instancesRepository.createQueryBuilder().update()

packages/backend/src/core/FetchInstanceMetadataService.ts

@@ -82,7 +82,7 @@ export class FetchInstanceMetadataService {
 
 		try {
 			if (!force) {
-				const _instance = await this.federatedInstanceService.fetchOrRegister(host);
+				const _instance = await this.federatedInstanceService.fetch(host);
 				const now = Date.now();
 				if (_instance && _instance.infoUpdatedAt && (now - _instance.infoUpdatedAt.getTime() < 1000 * 60 * 60 * 24)) {
 					// unlock at the finally caluse

packages/backend/src/core/FlashService.ts

@@ -1,40 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { DI } from '@/di-symbols.js';
-import { type FlashsRepository } from '@/models/_.js';
-
-/**
- * MisskeyPlay関係のService
- */
-@Injectable()
-export class FlashService {
-	constructor(
-		@Inject(DI.flashsRepository)
-		private flashRepository: FlashsRepository,
-	) {
-	}
-
-	/**
-	 * 人気のあるPlay一覧を取得する.
-	 */
-	public async featured(opts?: { offset?: number, limit: number }) {
-		const builder = this.flashRepository.createQueryBuilder('flash')
-			.andWhere('flash.likedCount > 0')
-			.andWhere('flash.visibility = :visibility', { visibility: 'public' })
-			.addOrderBy('flash.likedCount', 'DESC')
-			.addOrderBy('flash.updatedAt', 'DESC')
-			.addOrderBy('flash.id', 'DESC');
-
-		if (opts?.offset) {
-			builder.skip(opts.offset);
-		}
-
-		builder.take(opts?.limit ?? 10);
-
-		return await builder.getMany();
-	}
-}

packages/backend/src/core/MfmService.ts

@@ -406,10 +406,8 @@ export class MfmService {
 			mention: (node) => {
 				const a = doc.createElement('a');
 				const { username, host, acct } = node.props;
-				const remoteUserInfo = mentionedRemoteUsers.find(remoteUser => remoteUser.username.toLowerCase() === username.toLowerCase() && remoteUser.host?.toLowerCase() === host?.toLowerCase());
-				a.setAttribute('href', remoteUserInfo
-					? (remoteUserInfo.url ? remoteUserInfo.url : remoteUserInfo.uri)
-					: `${this.config.url}/${acct.endsWith(`@${this.config.url}`) ? acct.substring(0, acct.length - this.config.url.length - 1) : acct}`);
+				const remoteUserInfo = mentionedRemoteUsers.find(remoteUser => remoteUser.username === username && remoteUser.host === host);
+				a.setAttribute('href', remoteUserInfo ? (remoteUserInfo.url ? remoteUserInfo.url : remoteUserInfo.uri) : `${this.config.url}/${acct}`);
 				a.className = 'u-url mention';
 				a.textContent = acct;
 				return a;

packages/backend/src/core/NoteCreateService.ts

@@ -218,7 +218,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		private utilityService: UtilityService,
 		private userBlockingService: UserBlockingService,
 	) {
-		this.updateNotesCountQueue = new CollapsedQueue(process.env.NODE_ENV !== 'test' ? 60 * 1000 * 5 : 0, this.collapseNotesCount, this.performUpdateNotesCount);
+		this.updateNotesCountQueue = new CollapsedQueue(60 * 1000 * 5, this.collapseNotesCount, this.performUpdateNotesCount);
 	}
 
 	@bindThis
@@ -511,16 +511,14 @@ export class NoteCreateService implements OnApplicationShutdown {
 		}
 
 		// Register host
-		if (this.meta.enableStatsForFederatedInstances) {
 		if (this.userEntityService.isRemoteUser(user)) {
-				this.federatedInstanceService.fetchOrRegister(user.host).then(async i => {
+			this.federatedInstanceService.fetch(user.host).then(async i => {
 				this.updateNotesCountQueue.enqueue(i.id, 1);
 				if (this.meta.enableChartsForFederatedInstances) {
 					this.instanceChart.updateNote(i.host, note, true);
 				}
 			});
 		}
-		}
 
 		// ハッシュタグ更新
 		if (data.visibility === 'public' || data.visibility === 'home') {

packages/backend/src/core/NoteDeleteService.ts

@@ -106,9 +106,8 @@ export class NoteDeleteService {
 				this.perUserNotesChart.update(user, note, false);
 			}
 
-			if (this.meta.enableStatsForFederatedInstances) {
 			if (this.userEntityService.isRemoteUser(user)) {
-					this.federatedInstanceService.fetchOrRegister(user.host).then(async i => {
+				this.federatedInstanceService.fetch(user.host).then(async i => {
 					this.instancesRepository.decrement({ id: i.id }, 'notesCount', 1);
 					if (this.meta.enableChartsForFederatedInstances) {
 						this.instanceChart.updateNote(i.host, note, false);
@@ -116,7 +115,6 @@ export class NoteDeleteService {
 				});
 			}
 		}
-		}
 
 		for (const cascadingNote of cascadingNotes) {
 			this.searchService.unindexNote(cascadingNote);

packages/backend/src/core/QueueService.ts

@@ -7,7 +7,7 @@ import { randomUUID } from 'node:crypto';
 import { Inject, Injectable } from '@nestjs/common';
 import type { IActivity } from '@/core/activitypub/type.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
-import type { MiWebhook, WebhookEventTypes, webhookEventTypes } from '@/models/Webhook.js';
+import type { MiWebhook, webhookEventTypes } from '@/models/Webhook.js';
 import type { MiSystemWebhook, SystemWebhookEventType } from '@/models/SystemWebhook.js';
 import type { Config } from '@/config.js';
 import { DI } from '@/di-symbols.js';
@@ -35,7 +35,6 @@ import type {
 } from './QueueModule.js';
 import type httpSignature from '@peertube/http-signature';
 import type * as Bull from 'bullmq';
-import { type UserWebhookPayload } from './UserWebhookService.js';
 
 @Injectable()
 export class QueueService {
@@ -94,13 +93,6 @@ export class QueueService {
 			repeat: { pattern: '0 0 * * *' },
 			removeOnComplete: true,
 		});
-
-		this.systemQueue.add('checkModeratorsActivity', {
-		}, {
-			// 毎時30分に起動
-			repeat: { pattern: '30 * * * *' },
-			removeOnComplete: true,
-		});
 	}
 
 	@bindThis
@@ -469,10 +461,10 @@ export class QueueService {
 	 * @see UserWebhookDeliverProcessorService
 	 */
 	@bindThis
-	public userWebhookDeliver<T extends WebhookEventTypes>(
+	public userWebhookDeliver(
 		webhook: MiWebhook,
-		type: T,
-		content: UserWebhookPayload<T>,
+		type: typeof webhookEventTypes[number],
+		content: unknown,
 		opts?: { attempts?: number },
 	) {
 		const data: UserWebhookDeliverJobData = {

packages/backend/src/core/RoleService.ts

@@ -101,7 +101,6 @@ export const DEFAULT_POLICIES: RolePolicies = {
 
 @Injectable()
 export class RoleService implements OnApplicationShutdown, OnModuleInit {
-	private rootUserIdCache: MemorySingleCache<MiUser['id']>;
 	private rolesCache: MemorySingleCache<MiRole[]>;
 	private roleAssignmentByUserIdCache: MemoryKVCache<MiRoleAssignment[]>;
 	private notificationService: NotificationService;
@@ -137,7 +136,6 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 		private moderationLogService: ModerationLogService,
 		private fanoutTimelineService: FanoutTimelineService,
 	) {
-		this.rootUserIdCache = new MemorySingleCache<MiUser['id']>(1000 * 60 * 60 * 24 * 7); // 1week. rootユーザのIDは不変なので長めに
 		this.rolesCache = new MemorySingleCache<MiRole[]>(1000 * 60 * 60); // 1h
 		this.roleAssignmentByUserIdCache = new MemoryKVCache<MiRoleAssignment[]>(1000 * 60 * 5); // 5m
 
@@ -418,42 +416,29 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 	}
 
 	@bindThis
-	public async isExplorable(role: { id: MiRole['id'] } | null): Promise<boolean> {
+	public async isExplorable(role: { id: MiRole['id']} | null): Promise<boolean> {
 		if (role == null) return false;
 		const check = await this.rolesRepository.findOneBy({ id: role.id });
 		if (check == null) return false;
 		return check.isExplorable;
 	}
 
-	/**
-	 * モデレーター権限のロールが割り当てられているユーザID一覧を取得する.
-	 *
-	 * @param opts.includeAdmins 管理者権限も含めるか(デフォルト: true)
-	 * @param opts.includeRoot rootユーザも含めるか(デフォルト: false)
-	 * @param opts.excludeExpire 期限切れのロールを除外するか(デフォルト: false)
-	 */
 	@bindThis
-	public async getModeratorIds(opts?: {
-		includeAdmins?: boolean,
-		includeRoot?: boolean,
-		excludeExpire?: boolean,
-	}): Promise<MiUser['id'][]> {
-		const includeAdmins = opts?.includeAdmins ?? true;
-		const includeRoot = opts?.includeRoot ?? false;
-		const excludeExpire = opts?.excludeExpire ?? false;
-
+	public async getModeratorIds(includeAdmins = true, excludeExpire = false): Promise<MiUser['id'][]> {
 		const roles = await this.rolesCache.fetch(() => this.rolesRepository.findBy({}));
 		const moderatorRoles = includeAdmins
 			? roles.filter(r => r.isModerator || r.isAdministrator)
 			: roles.filter(r => r.isModerator);
 
+		// TODO: isRootなアカウントも含める
 		const assigns = moderatorRoles.length > 0
 			? await this.roleAssignmentsRepository.findBy({ roleId: In(moderatorRoles.map(r => r.id)) })
 			: [];
 
-		// Setを経由して重複を除去（ユーザIDは重複する可能性があるので）
 		const now = Date.now();
-		const resultSet = new Set(
+		const result = [
+			// Setを経由して重複を除去（ユーザIDは重複する可能性があるので）
+			...new Set(
 				assigns
 					.filter(it =>
 						(excludeExpire)
@@ -461,35 +446,19 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 							: true,
 					)
 					.map(a => a.userId),
-		);
+			),
+		];
 
-		if (includeRoot) {
-			const rootUserId = await this.rootUserIdCache.fetch(async () => {
-				const it = await this.usersRepository.createQueryBuilder('users')
-					.select('id')
-					.where({ isRoot: true })
-					.getRawOne<{ id: string }>();
-				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-				return it!.id;
-			});
-			resultSet.add(rootUserId);
-		}
-
-		return [...resultSet].sort((x, y) => x.localeCompare(y));
+		return result.sort((x, y) => x.localeCompare(y));
 	}
 
 	@bindThis
-	public async getModerators(opts?: {
-		includeAdmins?: boolean,
-		includeRoot?: boolean,
-		excludeExpire?: boolean,
-	}): Promise<MiUser[]> {
-		const ids = await this.getModeratorIds(opts);
-		return ids.length > 0
-			? await this.usersRepository.findBy({
+	public async getModerators(includeAdmins = true): Promise<MiUser[]> {
+		const ids = await this.getModeratorIds(includeAdmins);
+		const users = ids.length > 0 ? await this.usersRepository.findBy({
 			id: In(ids),
-			})
-			: [];
+		}) : [];
+		return users;
 	}
 
 	@bindThis

packages/backend/src/core/SignupService.ts

@@ -150,8 +150,8 @@ export class SignupService {
 			}));
 		});
 
-		this.usersChart.update(account, true);
-		this.userService.notifySystemWebhook(account, 'userCreated');
+		this.usersChart.update(account, true).then();
+		this.userService.notifySystemWebhook(account, 'userCreated').then();
 
 		return { account, secret };
 	}

packages/backend/src/core/SystemWebhookService.ts

@@ -101,7 +101,8 @@ export class SystemWebhookService implements OnApplicationShutdown {
 			.log(updater, 'createSystemWebhook', {
 				systemWebhookId: webhook.id,
 				webhook: webhook,
-			});
+			})
+			.then();
 
 		return webhook;
 	}
@@ -138,7 +139,8 @@ export class SystemWebhookService implements OnApplicationShutdown {
 				systemWebhookId: beforeEntity.id,
 				before: beforeEntity,
 				after: afterEntity,
-			});
+			})
+			.then();
 
 		return afterEntity;
 	}
@@ -156,7 +158,8 @@ export class SystemWebhookService implements OnApplicationShutdown {
 			.log(updater, 'deleteSystemWebhook', {
 				systemWebhookId: webhook.id,
 				webhook,
-			});
+			})
+			.then();
 	}
 
 	/**

packages/backend/src/core/UserFollowingService.ts

@@ -305,23 +305,21 @@ export class UserFollowingService implements OnModuleInit {
 			//#endregion
 
 			//#region Update instance stats
-			if (this.meta.enableStatsForFederatedInstances) {
 			if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
-					this.federatedInstanceService.fetchOrRegister(follower.host).then(async i => {
+				this.federatedInstanceService.fetch(follower.host).then(async i => {
 					this.instancesRepository.increment({ id: i.id }, 'followingCount', 1);
 					if (this.meta.enableChartsForFederatedInstances) {
 						this.instanceChart.updateFollowing(i.host, true);
 					}
 				});
 			} else if (this.userEntityService.isLocalUser(follower) && this.userEntityService.isRemoteUser(followee)) {
-					this.federatedInstanceService.fetchOrRegister(followee.host).then(async i => {
+				this.federatedInstanceService.fetch(followee.host).then(async i => {
 					this.instancesRepository.increment({ id: i.id }, 'followersCount', 1);
 					if (this.meta.enableChartsForFederatedInstances) {
 						this.instanceChart.updateFollowers(i.host, true);
 					}
 				});
 			}
-			}
 			//#endregion
 
 			this.perUserFollowingChart.update(follower, followee, true);
@@ -439,23 +437,21 @@ export class UserFollowingService implements OnModuleInit {
 			//#endregion
 
 			//#region Update instance stats
-			if (this.meta.enableStatsForFederatedInstances) {
 			if (this.userEntityService.isRemoteUser(follower) && this.userEntityService.isLocalUser(followee)) {
-					this.federatedInstanceService.fetchOrRegister(follower.host).then(async i => {
+				this.federatedInstanceService.fetch(follower.host).then(async i => {
 					this.instancesRepository.decrement({ id: i.id }, 'followingCount', 1);
 					if (this.meta.enableChartsForFederatedInstances) {
 						this.instanceChart.updateFollowing(i.host, false);
 					}
 				});
 			} else if (this.userEntityService.isLocalUser(follower) && this.userEntityService.isRemoteUser(followee)) {
-					this.federatedInstanceService.fetchOrRegister(followee.host).then(async i => {
+				this.federatedInstanceService.fetch(followee.host).then(async i => {
 					this.instancesRepository.decrement({ id: i.id }, 'followersCount', 1);
 					if (this.meta.enableChartsForFederatedInstances) {
 						this.instanceChart.updateFollowers(i.host, false);
 					}
 				});
 			}
-			}
 			//#endregion
 
 			this.perUserFollowingChart.update(follower, followee, false);

packages/backend/src/core/UserWebhookService.ts

@@ -6,23 +6,11 @@
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
 import { type WebhooksRepository } from '@/models/_.js';
-import { MiWebhook, WebhookEventTypes } from '@/models/Webhook.js';
+import { MiWebhook } from '@/models/Webhook.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import { GlobalEvents } from '@/core/GlobalEventService.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
-import type { Packed } from '@/misc/json-schema.js';
-
-export type UserWebhookPayload<T extends WebhookEventTypes> =
-	T extends 'note' | 'reply' | 'renote' |'mention' ? {
-		note: Packed<'Note'>,
-	} :
-	T extends 'follow' | 'unfollow' ? {
-		user: Packed<'UserDetailedNotMe'>,
-	} :
-	T extends 'followed' ? {
-		user: Packed<'UserLite'>,
-	} : never;
 
 @Injectable()
 export class UserWebhookService implements OnApplicationShutdown {

packages/backend/src/core/WebhookTestService.ts

@@ -10,20 +10,13 @@ import { MiSystemWebhook, type SystemWebhookEventType } from '@/models/SystemWeb
 import { SystemWebhookService } from '@/core/SystemWebhookService.js';
 import { Packed } from '@/misc/json-schema.js';
 import { type WebhookEventTypes } from '@/models/Webhook.js';
-import { type UserWebhookPayload, UserWebhookService } from '@/core/UserWebhookService.js';
+import { UserWebhookService } from '@/core/UserWebhookService.js';
 import { QueueService } from '@/core/QueueService.js';
-import { ModeratorInactivityRemainingTime } from '@/queue/processors/CheckModeratorsActivityProcessorService.js';
 
 const oneDayMillis = 24 * 60 * 60 * 1000;
 
-type AbuseUserReportDto = Omit<MiAbuseUserReport, 'targetUser' | 'reporter' | 'assignee'> & {
-	targetUser: Packed<'UserLite'> | null,
-	reporter: Packed<'UserLite'> | null,
-	assignee: Packed<'UserLite'> | null,
-};
-
-function generateAbuseReport(override?: Partial<MiAbuseUserReport>): AbuseUserReportDto {
-	const result: MiAbuseUserReport = {
+function generateAbuseReport(override?: Partial<MiAbuseUserReport>): MiAbuseUserReport {
+	return {
 		id: 'dummy-abuse-report1',
 		targetUserId: 'dummy-target-user',
 		targetUser: null,
@@ -36,17 +29,8 @@ function generateAbuseReport(override?: Partial<MiAbuseUserReport>): AbuseUserRe
 		comment: 'This is a dummy report for testing purposes.',
 		targetUserHost: null,
 		reporterHost: null,
-		resolvedAs: null,
-		moderationNote: 'foo',
 		...override,
 	};
-
-	return {
-		...result,
-		targetUser: result.targetUser ? toPackedUserLite(result.targetUser) : null,
-		reporter: result.reporter ? toPackedUserLite(result.reporter) : null,
-		assignee: result.assignee ? toPackedUserLite(result.assignee) : null,
-	};
 }
 
 function generateDummyUser(override?: Partial<MiUser>): MiUser {
@@ -83,9 +67,6 @@ function generateDummyUser(override?: Partial<MiUser>): MiUser {
 		isExplorable: true,
 		isHibernated: false,
 		isDeleted: false,
-		requireSigninToViewContents: false,
-		makeNotesFollowersOnlyBefore: null,
-		makeNotesHiddenBefore: null,
 		emojis: [],
 		score: 0,
 		host: null,
@@ -287,8 +268,7 @@ const dummyUser3 = generateDummyUser({
 
 @Injectable()
 export class WebhookTestService {
-	public static NoSuchWebhookError = class extends Error {
-	};
+	public static NoSuchWebhookError = class extends Error {};
 
 	constructor(
 		private userWebhookService: UserWebhookService,
@@ -306,10 +286,10 @@ export class WebhookTestService {
 	 * - 送信対象イベント（on）に関する設定
 	 */
 	@bindThis
-	public async testUserWebhook<T extends WebhookEventTypes>(
+	public async testUserWebhook(
 		params: {
 			webhookId: MiWebhook['id'],
-			type: T,
+			type: WebhookEventTypes,
 			override?: Partial<Omit<MiWebhook, 'id'>>,
 		},
 		sender: MiUser | null,
@@ -321,7 +301,7 @@ export class WebhookTestService {
 		}
 
 		const webhook = webhooks[0];
-		const send = <U extends WebhookEventTypes>(type: U, contents: UserWebhookPayload<U>) => {
+		const send = (contents: unknown) => {
 			const merged = {
 				...webhook,
 				...params.override,
@@ -329,7 +309,7 @@ export class WebhookTestService {
 
 			// テスト目的なのでUserWebhookServiceの機能を経由せず直接キューに追加する（チェック処理などをスキップする意図）.
 			// また、Jobの試行回数も1回だけ.
-			this.queueService.userWebhookDeliver(merged, type, contents, { attempts: 1 });
+			this.queueService.userWebhookDeliver(merged, params.type, contents, { attempts: 1 });
 		};
 
 		const dummyNote1 = generateDummyNote({
@@ -361,40 +341,33 @@ export class WebhookTestService {
 
 		switch (params.type) {
 			case 'note': {
-				send('note', { note: toPackedNote(dummyNote1) });
+				send(toPackedNote(dummyNote1));
 				break;
 			}
 			case 'reply': {
-				send('reply', { note: toPackedNote(dummyReply1) });
+				send(toPackedNote(dummyReply1));
 				break;
 			}
 			case 'renote': {
-				send('renote', { note: toPackedNote(dummyRenote1) });
+				send(toPackedNote(dummyRenote1));
 				break;
 			}
 			case 'mention': {
-				send('mention', { note: toPackedNote(dummyMention1) });
+				send(toPackedNote(dummyMention1));
 				break;
 			}
 			case 'follow': {
-				send('follow', { user: toPackedUserDetailedNotMe(dummyUser1) });
+				send(toPackedUserDetailedNotMe(dummyUser1));
 				break;
 			}
 			case 'followed': {
-				send('followed', { user: toPackedUserLite(dummyUser2) });
+				send(toPackedUserLite(dummyUser2));
 				break;
 			}
 			case 'unfollow': {
-				send('unfollow', { user: toPackedUserDetailedNotMe(dummyUser3) });
+				send(toPackedUserDetailedNotMe(dummyUser3));
 				break;
 			}
-			// まだ実装されていない (#9485)
-			case 'reaction': return;
-			default: {
-				// eslint-disable-next-line @typescript-eslint/no-unused-vars
-				const _exhaustiveAssertion: never = params.type;
-				return;
-			}
 		}
 	}
 
@@ -457,22 +430,6 @@ export class WebhookTestService {
 				send(toPackedUserLite(dummyUser1));
 				break;
 			}
-			case 'inactiveModeratorsWarning': {
-				const dummyTime: ModeratorInactivityRemainingTime = {
-					time: 100000,
-					asDays: 1,
-					asHours: 24,
-				};
-
-				send({
-					remainingTime: dummyTime,
-				});
-				break;
-			}
-			case 'inactiveModeratorsInvitationOnlyChanged': {
-				send({});
-				break;
-			}
 		}
 	}
 }

packages/backend/src/core/activitypub/ApRendererService.ts

@@ -495,9 +495,6 @@ export class ApRendererService {
 			summary: profile.description ? this.mfmService.toHtml(mfm.parse(profile.description)) : null,
 			_misskey_summary: profile.description,
 			_misskey_followedMessage: profile.followedMessage,
-			_misskey_requireSigninToViewContents: user.requireSigninToViewContents,
-			_misskey_makeNotesFollowersOnlyBefore: user.makeNotesFollowersOnlyBefore,
-			_misskey_makeNotesHiddenBefore: user.makeNotesHiddenBefore,
 			icon: avatar ? this.renderImage(avatar) : null,
 			image: banner ? this.renderImage(banner) : null,
 			tag,

packages/backend/src/core/activitypub/misc/contexts.ts

@@ -555,9 +555,6 @@ const extension_context_definition = {
 	'_misskey_votes': 'misskey:_misskey_votes',
 	'_misskey_summary': 'misskey:_misskey_summary',
 	'_misskey_followedMessage': 'misskey:_misskey_followedMessage',
-	'_misskey_requireSigninToViewContents': 'misskey:_misskey_requireSigninToViewContents',
-	'_misskey_makeNotesFollowersOnlyBefore': 'misskey:_misskey_makeNotesFollowersOnlyBefore',
-	'_misskey_makeNotesHiddenBefore': 'misskey:_misskey_makeNotesHiddenBefore',
 	'isCat': 'misskey:isCat',
 	// vcard
 	vcard: 'http://www.w3.org/2006/vcard/ns#',

packages/backend/src/core/activitypub/models/ApPersonService.ts

@@ -232,12 +232,6 @@ export class ApPersonService implements OnModuleInit {
 		if (user == null) throw new Error('failed to create user: user is null');
 
 		const [avatar, banner] = await Promise.all([icon, image].map(img => {
-			// icon and image may be arrays
-			// see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-icon
-			if (Array.isArray(img)) {
-				img = img.find(item => item && item.url) ?? null;
-			}
-			
 			// if we have an explicitly missing image, return an
 			// explicitly-null set of values
 			if ((img == null) || (typeof img === 'object' && img.url == null)) {
@@ -362,9 +356,6 @@ export class ApPersonService implements OnModuleInit {
 					tags,
 					isBot,
 					isCat: (person as any).isCat === true,
-					requireSigninToViewContents: (person as any).requireSigninToViewContents === true,
-					makeNotesFollowersOnlyBefore: (person as any).makeNotesFollowersOnlyBefore ?? null,
-					makeNotesHiddenBefore: (person as any).makeNotesHiddenBefore ?? null,
 					emojis,
 				})) as MiRemoteUser;
 
@@ -417,15 +408,13 @@ export class ApPersonService implements OnModuleInit {
 		this.cacheService.uriPersonCache.set(user.uri, user);
 
 		// Register host
-		if (this.meta.enableStatsForFederatedInstances) {
-			this.federatedInstanceService.fetchOrRegister(host).then(i => {
+		this.federatedInstanceService.fetch(host).then(i => {
 			this.instancesRepository.increment({ id: i.id }, 'usersCount', 1);
+			this.fetchInstanceMetadataService.fetchInstanceMetadata(i);
 			if (this.meta.enableChartsForFederatedInstances) {
 				this.instanceChart.newUser(i.host);
 			}
-				this.fetchInstanceMetadataService.fetchInstanceMetadata(i);
 		});
-		}
 
 		this.usersChart.update(user, true);
 

packages/backend/src/core/activitypub/type.ts

@@ -14,9 +14,6 @@ export interface IObject {
 	summary?: string;
 	_misskey_summary?: string;
 	_misskey_followedMessage?: string | null;
-	_misskey_requireSigninToViewContents?: boolean;
-	_misskey_makeNotesFollowersOnlyBefore?: number | null;
-	_misskey_makeNotesHiddenBefore?: number | null;
 	published?: string;
 	cc?: ApObject;
 	to?: ApObject;

packages/backend/src/core/entities/AbuseUserReportEntityService.ts

@@ -53,8 +53,6 @@ export class AbuseUserReportEntityService {
 				schema: 'UserDetailedNotMe',
 			}) : null,
 			forwarded: report.forwarded,
-			resolvedAs: report.resolvedAs,
-			moderationNote: report.moderationNote,
 		});
 	}
 

packages/backend/src/core/entities/FlashEntityService.ts

@@ -5,8 +5,10 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
-import type { FlashLikesRepository, FlashsRepository } from '@/models/_.js';
+import type { FlashsRepository, FlashLikesRepository } from '@/models/_.js';
+import { awaitAll } from '@/misc/prelude/await-all.js';
 import type { Packed } from '@/misc/json-schema.js';
+import type { } from '@/models/Blocking.js';
 import type { MiUser } from '@/models/User.js';
 import type { MiFlash } from '@/models/Flash.js';
 import { bindThis } from '@/decorators.js';
@@ -18,8 +20,10 @@ export class FlashEntityService {
 	constructor(
 		@Inject(DI.flashsRepository)
 		private flashsRepository: FlashsRepository,
+
 		@Inject(DI.flashLikesRepository)
 		private flashLikesRepository: FlashLikesRepository,
+
 		private userEntityService: UserEntityService,
 		private idService: IdService,
 	) {
@@ -30,36 +34,25 @@ export class FlashEntityService {
 		src: MiFlash['id'] | MiFlash,
 		me?: { id: MiUser['id'] } | null | undefined,
 		hint?: {
-			packedUser?: Packed<'UserLite'>,
-			likedFlashIds?: MiFlash['id'][],
+			packedUser?: Packed<'UserLite'>
 		},
 	): Promise<Packed<'Flash'>> {
 		const meId = me ? me.id : null;
 		const flash = typeof src === 'object' ? src : await this.flashsRepository.findOneByOrFail({ id: src });
 
-		// { schema: 'UserDetailed' } すると無限ループするので注意
-		const user = hint?.packedUser ?? await this.userEntityService.pack(flash.user ?? flash.userId, me);
-
-		let isLiked = undefined;
-		if (meId) {
-			isLiked = hint?.likedFlashIds
-				? hint.likedFlashIds.includes(flash.id)
-				: await this.flashLikesRepository.exists({ where: { flashId: flash.id, userId: meId } });
-		}
-
-		return {
+		return await awaitAll({
 			id: flash.id,
 			createdAt: this.idService.parse(flash.id).date.toISOString(),
 			updatedAt: flash.updatedAt.toISOString(),
 			userId: flash.userId,
-			user: user,
+			user: hint?.packedUser ?? this.userEntityService.pack(flash.user ?? flash.userId, me), // { schema: 'UserDetailed' } すると無限ループするので注意
 			title: flash.title,
 			summary: flash.summary,
 			script: flash.script,
 			visibility: flash.visibility,
 			likedCount: flash.likedCount,
-			isLiked: isLiked,
-		};
+			isLiked: meId ? await this.flashLikesRepository.exists({ where: { flashId: flash.id, userId: meId } }) : undefined,
+		});
 	}
 
 	@bindThis
@@ -70,19 +63,7 @@ export class FlashEntityService {
 		const _users = flashes.map(({ user, userId }) => user ?? userId);
 		const _userMap = await this.userEntityService.packMany(_users, me)
 			.then(users => new Map(users.map(u => [u.id, u])));
-		const _likedFlashIds = me
-			? await this.flashLikesRepository.createQueryBuilder('flashLike')
-				.select('flashLike.flashId')
-				.where('flashLike.userId = :userId', { userId: me.id })
-				.getRawMany<{ flashLike_flashId: string }>()
-				.then(likes => [...new Set(likes.map(like => like.flashLike_flashId))])
-			: [];
-		return Promise.all(
-			flashes.map(flash => this.pack(flash, me, {
-				packedUser: _userMap.get(flash.userId),
-				likedFlashIds: _likedFlashIds,
-			})),
-		);
+		return Promise.all(flashes.map(flash => this.pack(flash, me, { packedUser: _userMap.get(flash.userId) })));
 	}
 }
 

packages/backend/src/core/entities/MetaEntityService.ts

@@ -96,7 +96,6 @@ export class MetaEntityService {
 			recaptchaSiteKey: instance.recaptchaSiteKey,
 			enableTurnstile: instance.enableTurnstile,
 			turnstileSiteKey: instance.turnstileSiteKey,
-			enableTestcaptcha: instance.enableTestcaptcha,
 			swPublickey: instance.swPublicKey,
 			themeColor: instance.themeColor,
 			mascotImageUrl: instance.mascotImageUrl ?? '/assets/ai.png',

packages/backend/src/core/entities/NoteEntityService.ts

@@ -22,30 +22,6 @@ import type { ReactionService } from '../ReactionService.js';
 import type { UserEntityService } from './UserEntityService.js';
 import type { DriveFileEntityService } from './DriveFileEntityService.js';
 
-// is-renote.tsとよしなにリンク
-function isPureRenote(note: MiNote): note is MiNote & { renoteId: MiNote['id']; renote: MiNote } {
-	return (
-		note.renote != null &&
-		note.reply == null &&
-		note.text == null &&
-		note.cw == null &&
-		(note.fileIds == null || note.fileIds.length === 0) &&
-		!note.hasPoll
-	);
-}
-
-function getAppearNoteIds(notes: MiNote[]): Set<string> {
-	const appearNoteIds = new Set<string>();
-	for (const note of notes) {
-		if (isPureRenote(note)) {
-			appearNoteIds.add(note.renoteId);
-		} else {
-			appearNoteIds.add(note.id);
-		}
-	}
-	return appearNoteIds;
-}
-
 @Injectable()
 export class NoteEntityService implements OnModuleInit {
 	private userEntityService: UserEntityService;
@@ -102,62 +78,34 @@ export class NoteEntityService implements OnModuleInit {
 	}
 
 	@bindThis
-	private async hideNote(packedNote: Packed<'Note'>, meId: MiUser['id'] | null): Promise<void> {
-		// FIXME: このvisibility変更処理が当関数にあるのは若干不自然かもしれない(関数名を treatVisibility とかに変える手もある)
-		if (packedNote.visibility === 'public' || packedNote.visibility === 'home') {
-			const followersOnlyBefore = packedNote.user.makeNotesFollowersOnlyBefore;
-			if ((followersOnlyBefore != null)
-				&& (
-					(followersOnlyBefore <= 0 && (Date.now() - new Date(packedNote.createdAt).getTime() > 0 - (followersOnlyBefore * 1000)))
-					|| (followersOnlyBefore > 0 && (new Date(packedNote.createdAt).getTime() < followersOnlyBefore * 1000))
-				)
-			) {
-				packedNote.visibility = 'followers';
-			}
-		}
-
-		if (meId === packedNote.userId) return;
-
+	private async hideNote(packedNote: Packed<'Note'>, meId: MiUser['id'] | null) {
 		// TODO: isVisibleForMe を使うようにしても良さそう(型違うけど)
 		let hide = false;
 
-		if (packedNote.user.requireSigninToViewContents && meId == null) {
-			hide = true;
-		}
-
-		if (!hide) {
-			const hiddenBefore = packedNote.user.makeNotesHiddenBefore;
-			if ((hiddenBefore != null)
-				&& (
-					(hiddenBefore <= 0 && (Date.now() - new Date(packedNote.createdAt).getTime() > 0 - (hiddenBefore * 1000)))
-					|| (hiddenBefore > 0 && (new Date(packedNote.createdAt).getTime() < hiddenBefore * 1000))
-				)
-			) {
-				hide = true;
-			}
-		}
-
 		// visibility が specified かつ自分が指定されていなかったら非表示
-		if (!hide) {
 		if (packedNote.visibility === 'specified') {
 			if (meId == null) {
 				hide = true;
+			} else if (meId === packedNote.userId) {
+				hide = false;
 			} else {
 				// 指定されているかどうか
-					const specified = packedNote.visibleUserIds!.some(id => meId === id);
+				const specified = packedNote.visibleUserIds!.some((id: any) => meId === id);
 
-					if (!specified) {
+				if (specified) {
+					hide = false;
+				} else {
 					hide = true;
 				}
 			}
 		}
-		}
 
 		// visibility が followers かつ自分が投稿者のフォロワーでなかったら非表示
-		if (!hide) {
 		if (packedNote.visibility === 'followers') {
 			if (meId == null) {
 				hide = true;
+			} else if (meId === packedNote.userId) {
+				hide = false;
 			} else if (packedNote.reply && (meId === packedNote.reply.userId)) {
 				// 自分の投稿に対するリプライ
 				hide = false;
@@ -166,7 +114,6 @@ export class NoteEntityService implements OnModuleInit {
 				hide = false;
 			} else {
 				// フォロワーかどうか
-					// TODO: 当関数呼び出しごとにクエリが走るのは重そうだからなんとかする
 				const isFollowing = await this.followingsRepository.exists({
 					where: {
 						followeeId: packedNote.userId,
@@ -177,7 +124,6 @@ export class NoteEntityService implements OnModuleInit {
 				hide = !isFollowing;
 			}
 		}
-		}
 
 		if (hide) {
 			packedNote.visibleUserIds = undefined;
@@ -187,7 +133,6 @@ export class NoteEntityService implements OnModuleInit {
 			packedNote.poll = undefined;
 			packedNote.cw = null;
 			packedNote.isHidden = true;
-			// TODO: hiddenReason みたいなのを提供しても良さそう
 		}
 	}
 
@@ -282,7 +227,7 @@ export class NoteEntityService implements OnModuleInit {
 				return true;
 			} else {
 				// 指定されているかどうか
-				return note.visibleUserIds.some(id => meId === id);
+				return note.visibleUserIds.some((id: any) => meId === id);
 			}
 		}
 
@@ -476,7 +421,7 @@ export class NoteEntityService implements OnModuleInit {
 	) {
 		if (notes.length === 0) return [];
 
-		const bufferedReactions = this.meta.enableReactionsBuffering ? await this.reactionsBufferingService.getMany([...getAppearNoteIds(notes)]) : null;
+		const bufferedReactions = this.meta.enableReactionsBuffering ? await this.reactionsBufferingService.getMany(notes.map(x => x.id)) : null;
 
 		const meId = me ? me.id : null;
 		const myReactionsMap = new Map<MiNote['id'], string | null>();
@@ -487,7 +432,7 @@ export class NoteEntityService implements OnModuleInit {
 			const oldId = this.idService.gen(Date.now() - 2000);
 
 			for (const note of notes) {
-				if (isPureRenote(note)) {
+				if (note.renote && (note.text == null && note.fileIds.length === 0)) { // pure renote
 					const reactionsCount = Object.values(this.reactionsBufferingService.mergeReactions(note.renote.reactions, bufferedReactions?.get(note.renote.id)?.deltas ?? {})).reduce((a, b) => a + b, 0);
 					if (reactionsCount === 0) {
 						myReactionsMap.set(note.renote.id, null);

packages/backend/src/core/entities/UserEntityService.ts

@@ -490,9 +490,6 @@ export class UserEntityService implements OnModuleInit {
 			}))) : [],
 			isBot: user.isBot,
 			isCat: user.isCat,
-			requireSigninToViewContents: user.requireSigninToViewContents === false ? undefined : true,
-			makeNotesFollowersOnlyBefore: user.makeNotesFollowersOnlyBefore ?? undefined,
-			makeNotesHiddenBefore: user.makeNotesHiddenBefore ?? undefined,
 			instance: user.host ? this.federatedInstanceService.federatedInstanceCache.fetch(user.host).then(instance => instance ? {
 				name: instance.name,
 				softwareName: instance.softwareName,
@@ -548,6 +545,11 @@ export class UserEntityService implements OnModuleInit {
 				publicReactions: this.isLocalUser(user) ? profile!.publicReactions : false, // https://github.com/misskey-dev/misskey/issues/12964
 				followersVisibility: profile!.followersVisibility,
 				followingVisibility: profile!.followingVisibility,
+				twoFactorEnabled: profile!.twoFactorEnabled,
+				usePasswordLessLogin: profile!.usePasswordLessLogin,
+				securityKeys: profile!.twoFactorEnabled
+					? this.userSecurityKeysRepository.countBy({ userId: user.id }).then(result => result >= 1)
+					: false,
 				roles: this.roleService.getUserRoles(user.id).then(roles => roles.filter(role => role.isPublic).sort((a, b) => b.displayOrder - a.displayOrder).map(role => ({
 					id: role.id,
 					name: role.name,
@@ -562,14 +564,6 @@ export class UserEntityService implements OnModuleInit {
 				moderationNote: iAmModerator ? (profile!.moderationNote ?? '') : undefined,
 			} : {}),
 
-			...(isDetailed && (isMe || iAmModerator) ? {
-				twoFactorEnabled: profile!.twoFactorEnabled,
-				usePasswordLessLogin: profile!.usePasswordLessLogin,
-				securityKeys: profile!.twoFactorEnabled
-					? this.userSecurityKeysRepository.countBy({ userId: user.id }).then(result => result >= 1)
-					: false,
-			} : {}),
-
 			...(isDetailed && isMe ? {
 				avatarId: user.avatarId,
 				bannerId: user.bannerId,

packages/backend/src/misc/is-renote.ts

@@ -6,8 +6,6 @@
 import type { MiNote } from '@/models/Note.js';
 import type { Packed } from '@/misc/json-schema.js';
 
-// NoteEntityService.isPureRenote とよしなにリンク
-
 type Renote =
 	MiNote & {
 		renoteId: NonNullable<MiNote['renoteId']>

packages/backend/src/misc/sql-like-escape.ts

@@ -4,5 +4,5 @@
  */
 
 export function sqlLikeEscape(s: string) {
-	return s.replace(/([\\%_])/g, '\\$1');
+	return s.replace(/([%_])/g, '\\$1');
 }

packages/backend/src/models/AbuseUserReport.ts

@@ -50,9 +50,6 @@ export class MiAbuseUserReport {
 	})
 	public resolved: boolean;
 
-	/**
-	 * リモートサーバーに転送したかどうか
-	 */
 	@Column('boolean', {
 		default: false,
 	})
@@ -63,21 +60,6 @@ export class MiAbuseUserReport {
 	})
 	public comment: string;
 
-	@Column('varchar', {
-		length: 8192, default: '',
-	})
-	public moderationNote: string;
-
-	/**
-	 * accept 是認 ... 通報内容が正当であり、肯定的に対応された
-	 * reject 否認 ... 通報内容が正当でなく、否定的に対応された
-	 * null ... その他
-	 */
-	@Column('varchar', {
-		length: 128, nullable: true,
-	})
-	public resolvedAs: 'accept' | 'reject' | null;
-
 	//#region Denormalized fields
 	@Index()
 	@Column('varchar', {

packages/backend/src/models/Flash.ts

@@ -7,9 +7,6 @@ import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typ
 import { id } from './util/id.js';
 import { MiUser } from './User.js';
 
-export const flashVisibility = ['public', 'private'] as const;
-export type FlashVisibility = typeof flashVisibility[number];
-
 @Entity('flash')
 export class MiFlash {
 	@PrimaryColumn(id())
@@ -66,5 +63,5 @@ export class MiFlash {
 	@Column('varchar', {
 		length: 512, default: 'public',
 	})
-	public visibility: FlashVisibility;
+	public visibility: 'public' | 'private';
 }

packages/backend/src/models/Meta.ts

@@ -81,11 +81,6 @@ export class MiMeta {
 	})
 	public prohibitedWords: string[];
 
-	@Column('varchar', {
-		length: 1024, array: true, default: '{}',
-	})
-	public prohibitedWordsForNameOfUser: string[];
-
 	@Column('varchar', {
 		length: 1024, array: true, default: '{}',
 	})
@@ -263,11 +258,6 @@ export class MiMeta {
 	})
 	public turnstileSecretKey: string | null;
 
-	@Column('boolean', {
-		default: false,
-	})
-	public enableTestcaptcha: boolean;
-
 	// chaptcha系を追加した際にはnodeinfoのレスポンスに追加するのを忘れないようにすること
 
 	@Column('enum', {
@@ -529,11 +519,6 @@ export class MiMeta {
 	})
 	public enableChartsForFederatedInstances: boolean;
 
-	@Column('boolean', {
-		default: true,
-	})
-	public enableStatsForFederatedInstances: boolean;
-
 	@Column('boolean', {
 		default: false,
 	})

packages/backend/src/models/Notification.ts

@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { userExportableEntities } from '@/types.js';
 import { MiUser } from './User.js';
 import { MiNote } from './Note.js';
 import { MiAccessToken } from './AccessToken.js';
 import { MiRole } from './Role.js';
 import { MiDriveFile } from './DriveFile.js';
+import { userExportableEntities } from '@/types.js';
 
 export type MiNotification = {
 	type: 'note';
@@ -86,10 +86,6 @@ export type MiNotification = {
 	createdAt: string;
 	exportedEntity: typeof userExportableEntities[number];
 	fileId: MiDriveFile['id'];
-} | {
-	type: 'login';
-	id: string;
-	createdAt: string;
 } | {
 	type: 'app';
 	id: string;

packages/backend/src/models/SystemWebhook.ts

@@ -14,10 +14,6 @@ export const systemWebhookEventTypes = [
 	'abuseReportResolved',
 	// ユーザが作成された時
 	'userCreated',
-	// モデレータが一定期間不在である警告
-	'inactiveModeratorsWarning',
-	// モデレータが一定期間不在のためシステムにより招待制へと変更された
-	'inactiveModeratorsInvitationOnlyChanged',
 ] as const;
 export type SystemWebhookEventType = typeof systemWebhookEventTypes[number];
 

packages/backend/src/models/User.ts

@@ -202,23 +202,6 @@ export class MiUser {
 	})
 	public isHibernated: boolean;
 
-	@Column('boolean', {
-		default: false,
-	})
-	public requireSigninToViewContents: boolean;
-
-	// in sec, マイナスで相対時間
-	@Column('integer', {
-		nullable: true,
-	})
-	public makeNotesFollowersOnlyBefore: number | null;
-
-	// in sec, マイナスで相対時間
-	@Column('integer', {
-		nullable: true,
-	})
-	public makeNotesHiddenBefore: number | null;
-
 	// アカウントが削除されたかどうかのフラグだが、完全に削除される際は物理削除なので実質削除されるまでの「削除が進行しているかどうか」のフラグ
 	@Column('boolean', {
 		default: false,